[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.5,1.6 diff.php,1.3,1.4 e
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.5,1.6 diff.php,1.3,1.4 edit.php,1.4,1.5 save.php,1.3,1.4 view.php,1.3,1.4 |
Date: |
Thu, 06 Mar 2003 19:19:18 -0500 |
Update of /cvsroot/phpgroupware/wiki/action
In directory subversions:/tmp/cvs-serv22386/action
Modified Files:
admin.php diff.php edit.php save.php view.php
Log Message:
some new features and some fixes
- wiki is now configurable to run anonymous, access can be restricted to ro
- admin's are always able to edit a page
- fixed blocking of hosts
Index: admin.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin.php 6 Mar 2003 17:38:19 -0000 1.5
--- admin.php 7 Mar 2003 00:19:13 -0000 1.6
***************
*** 5,14 ****
$document = $categories = $comment = $page = '';
! require('lib/init.php');
require('parse/html.php');
! require('parse/transforms.php');
require('template/admin.php');
! if(!$GLOBALS['phpgw']['user']['apps']['admin'])
{ die($ErrorAdminDisabled); }
--- 5,14 ----
$document = $categories = $comment = $page = '';
! //require('lib/init.php');
require('parse/html.php');
! //require('parse/transforms.php');
require('template/admin.php');
! if(!$GLOBALS['phpgw_info']['user']['apps']['admin'])
{ die($ErrorAdminDisabled); }
***************
*** 59,62 ****
--- 59,64 ----
if(empty($Save)) // Not saving results; display form.
{
+ $GLOBALS['phpgw']->common->phpgw_header();
+
$html = html_lock_start();
$pagelist = $pagestore->allpages();
***************
*** 103,107 ****
if(empty($Block) && empty($Unblock)) // Not saving results; display form.
{
! $html = '';
if($RatePeriod == 0)
{
--- 105,111 ----
if(empty($Block) && empty($Unblock)) // Not saving results; display form.
{
! $GLOBALS['phpgw']->common->phpgw_header();
!
! $html = '';
if($RatePeriod == 0)
{
***************
*** 131,138 ****
else // Display main menu for admin.
{
! template_admin(array('html' => html_url($AdminScript . '?locking=1',
'Lock / unlock pages') .
html_newline() .
! html_url($AdminScript . '?blocking=1',
'Block / unblock hosts') .
html_newline()));
--- 135,144 ----
else // Display main menu for admin.
{
! $GLOBALS['phpgw']->common->phpgw_header();
!
! template_admin(array('html' => html_url($AdminScript . '&locking=1',
'Lock / unlock pages') .
html_newline() .
! html_url($AdminScript . '&blocking=1',
'Block / unblock hosts') .
html_newline()));
Index: diff.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/diff.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** diff.php 3 Mar 2003 14:16:23 -0000 1.3
--- diff.php 7 Mar 2003 00:19:13 -0000 1.4
***************
*** 1,28 ****
! <?php
! // $Id$
!
! require('parse/main.php');
! require('parse/macros.php');
! require('parse/html.php');
! require(TemplateDir . '/diff.php');
! require('lib/diff.php');
!
! // Compute difference between two versions of a page.
! function action_diff()
! {
! global $pagestore, $page, $ver1, $ver2, $ParseEngine;
!
! $p1 = $pagestore->page($page);
! $p1->version = $ver1;
! $p2 = $pagestore->page($page);
! $p2->version = $ver2;
!
! $diff = diff_compute($p1->read(), $p2->read());
!
! template_diff(array('page' => $page,
! 'diff_html' => diff_parse($diff),
! 'html' => parseText($p2->text, $ParseEngine,
$page),
! 'editable' => $p2->mutable,
! 'timestamp' => $p2->time));
! }
! ?>
--- 1,28 ----
! <?php
! // $Id$
!
! require('parse/main.php');
! require('parse/macros.php');
! require('parse/html.php');
! require(TemplateDir . '/diff.php');
! require('lib/diff.php');
!
! // Compute difference between two versions of a page.
! function action_diff()
! {
! global $pagestore, $page, $ver1, $ver2, $ParseEngine;
!
! $p1 = $pagestore->page($page);
! $p1->version = $ver1;
! $p2 = $pagestore->page($page);
! $p2->version = $ver2;
!
! $diff = diff_compute($p1->read(), $p2->read());
!
! template_diff(array('page' => $page,
! 'diff_html' => diff_parse($diff),
! 'html' => parseText($p2->text, $ParseEngine,
$page),
! 'editable' => isEditable($p2->mutable),
! 'timestamp' => $p2->time));
! }
! ?>
Index: edit.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/edit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** edit.php 4 Mar 2003 22:56:10 -0000 1.4
--- edit.php 7 Mar 2003 00:19:13 -0000 1.5
***************
*** 10,19 ****
function action_edit()
{
! global $page, $pagestore, $ParseEngine, $version, $ErrorPageLocked,
$EditWithPreview;
$pg = $pagestore->page($page);
$pg->read();
! if(!$pg->mutable)
{ die($ErrorPageLocked); }
--- 10,19 ----
function action_edit()
{
! global $page, $pagestore, $ParseEngine, $version, $ErrorPageLocked,
$EditWithPreview,$anonymous;
$pg = $pagestore->page($page);
$pg->read();
! if(!isEditable($pg->mutable))
{ die($ErrorPageLocked); }
Index: save.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/save.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** save.php 3 Mar 2003 14:16:23 -0000 1.3
--- save.php 7 Mar 2003 00:19:13 -0000 1.4
***************
*** 27,31 ****
$pg->read();
! if(!$pg->mutable) // Edit disallowed.
{ die($ErrorPageLocked); }
--- 27,31 ----
$pg->read();
! if(!isEditable($pg->mutable)) // Edit disallowed.
{ die($ErrorPageLocked); }
Index: view.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/action/view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** view.php 3 Mar 2003 14:16:23 -0000 1.3
--- view.php 7 Mar 2003 00:19:13 -0000 1.4
***************
*** 1,29 ****
! <?php
! // $Id$
!
! require('parse/main.php');
! require('parse/macros.php');
! require('parse/html.php');
! require(TemplateDir . '/view.php');
! require('lib/headers.php');
!
! // Parse and display a page.
! function action_view()
! {
! global $page, $pagestore, $ParseEngine, $version;
!
! $pg = $pagestore->page($page);
! if($version != '')
! { $pg->version = $version; }
! $pg->read();
!
! gen_headers($pg->time);
!
! template_view(array('page' => $page,
! 'html' => parseText($pg->text, $ParseEngine,
$page),
! 'editable' => $pg->mutable,
! 'timestamp' => $pg->time,
! 'archive' => $version != '',
! 'version' => $pg->version));
! }
! ?>
--- 1,29 ----
! <?php
! // $Id$
!
! require('parse/main.php');
! require('parse/macros.php');
! require('parse/html.php');
! require(TemplateDir . '/view.php');
! require('lib/headers.php');
!
! // Parse and display a page.
! function action_view()
! {
! global $page, $pagestore, $ParseEngine, $version;
!
! $pg = $pagestore->page($page);
! if($version != '')
! { $pg->version = $version; }
! $pg->read();
!
! gen_headers($pg->time);
!
! template_view(array('page' => $page,
! 'html' => parseText($pg->text, $ParseEngine,
$page),
! 'editable' => isEditable($pg->mutable),
! 'timestamp' => $pg->time,
! 'archive' => $version != '',
! 'version' => $pg->version));
! }
! ?>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/action admin.php,1.5,1.6 diff.php,1.3,1.4 edit.php,1.4,1.5 save.php,1.3,1.4 view.php,1.3,1.4,
Ralf Becker <address@hidden> <=