[phpwiki-checkins] CVS: phpwiki/admin removepage.php,NONE,1.1 dumpserial.php,1.1,1.2 loadserial.php,1.1,1.2 lockpage.php,1.1,1.2 zip.php,1.2,1.3

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/admin
In directory usw-pr-cvs1:/tmp/cvs-serv20420/admin

Modified Files:
	dumpserial.php loadserial.php lockpage.php zip.php 
Added Files:
	removepage.php 
Log Message:
Jeff hacks again: LOT's of changes.  
Highlights:
  * Pagename in PATH_INFO support added.
  * Redid the user (admin)  authentication stuff.
    All access now through index.php.

See HISTORY for (a few) more details.


--- NEW FILE ---
<?php

if (!function_exists('RemovePage'))
{
   $html = gettext ("Function not yet implemented.");
}
else if (empty($verify) || $verify != 'okay')
{
   $html = sprintf(gettext ("You are about to remove '%s' permanently!"),
		    htmlspecialchars($pagename));
   $html .= "\n<P>";
   $html .= sprintf(gettext ("Click <a href=\"%s\">here</a> to remove the page now."),
		    htmlspecialchars(MakeWikiURL($pagename, array('action' => 'remove',
								  'verify' => 'okay'))));
   $html .= "\n<P>";
   $html .= gettext ("Otherwise press the \"Back\" button of your browser.");
}
else   
{
   RemovePage($dbi, $pagename);
   $html = sprintf(gettext ("Removed page '%s' succesfully."),
		   htmlspecialchars($pagename));
}

GeneratePage('MESSAGE', $html, gettext ("Remove page"), 0);
?>   

Index: dumpserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/dumpserial.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dumpserial.php	2000/11/08 15:30:16	1.1
--- dumpserial.php	2001/02/10 22:15:07	1.2
***************
*** 6,11 ****
        directory as serialized data structures.
     */
! 
!    $directory = $dumpserial;
     $pages = GetAllWikiPagenames($dbi);
  
--- 6,14 ----
        directory as serialized data structures.
     */
!    if (empty($directory))
!       ExitWiki(gettext("You must specify a directory to dump to"));
!    
!    fix_magic_quotes_gpc($directory);
!    
     $pages = GetAllWikiPagenames($dbi);
  
***************
*** 39,42 ****
     $html .= "<p><b>Dump complete.</b>";
     GeneratePage('MESSAGE', $html, 'Dump serialized pages', 0);
-    ExitWiki('');
  ?>
--- 42,44 ----

Index: loadserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/loadserial.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** loadserial.php	2000/11/08 15:30:16	1.1
--- loadserial.php	2001/02/10 22:15:07	1.2
***************
*** 6,10 ****
     */
  
!    $directory = $loadserial;
     $html = "Loading serialized pages from '$directory'.<p>\n";
  
--- 6,11 ----
     */
  
!    fix_magic_quotes_gpc($directory);
! 
     $html = "Loading serialized pages from '$directory'.<p>\n";
  

Index: lockpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/lockpage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lockpage.php	2000/11/08 15:30:16	1.1
--- lockpage.php	2001/02/10 22:15:07	1.2
***************
*** 1,22 ****
  <!-- $Id$ -->
  <?php
!    if(isset($lock)) $page = $lock;
!    elseif(isset($unlock)) $page = $unlock;
  
!    $argv[0] = $page;  // necessary for displaying the page afterwards
!    $pagename = rawurldecode($page);
  
!    $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
!    if (! is_array($pagehash))
!       ExitWiki("Unknown page '".htmlspecialchars($pagename)."'\n");
  
!    if (isset($lock)) {
!       $pagehash['flags'] |= FLAG_PAGE_LOCKED;
!       InsertPage($dbi, $pagename, $pagehash);
!       // echo htmlspecialchars($page) . " locked\n";
!    } elseif(isset($unlock)) {
!       $pagehash['flags'] &= ~FLAG_PAGE_LOCKED;
!       InsertPage($dbi, $pagename, $pagehash);
!       // echo htmlspecialchars($page) . " unlocked\n";
!    }
  ?>
--- 1,16 ----
  <!-- $Id$ -->
  <?php
! $user->must_be_admin("lock or unlock pages");
  
! $pagehash = RetrievePage($dbi, $pagename, $WikiPageStore);
  
! if (! is_array($pagehash))
!    ExitWiki("Unknown page '".htmlspecialchars($pagename)."'\n");
  
! if ($action == 'lock')
!    $pagehash['flags'] |= FLAG_PAGE_LOCKED;
! else
!    $pagehash['flags'] &= ~FLAG_PAGE_LOCKED;
! 
! InsertPage($dbi, $pagename, $pagehash);
  ?>

Index: zip.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/zip.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** zip.php	2001/02/07 02:23:24	1.2
--- zip.php	2001/02/10 22:15:07	1.3
***************
*** 1,3 ****
--- 1,4 ----
  <?php // $Id$
+ include 'lib/ziplib.php';
  
  function MailifyPage ($pagehash, $oldpagehash = false)
***************
*** 68,75 ****
  }
  
! if(defined('WIKI_ADMIN'))
!    MakeWikiZip(($zip == 'all'));
  
! CloseDataBase($dbi);
! exit;
  ?>
--- 69,75 ----
  }
  
! if (ZIPDUMP_AUTH)
!    $user->must_be_admin("make zip archives");
  
! MakeWikiZip(isset($include) && $include == 'all');
  ?>