phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki index.php,1.11,1.12

[Steve W. <wai...@us...>]

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

Modified Files:
	index.php 
Log Message:
Missing semicolon on line 49, fixed.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** index.php	2001/02/16 04:43:07	1.11
--- index.php	2001/02/17 18:05:47	1.12
***************
*** 47,51 ****
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
  // for you.  If you want one, define this to the name of the log file.
! define('ACCESS_LOG', '/tmp/wiki_access_log')
  
  /////////////////////////////////////////////////////////////////////
--- 47,51 ----
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
  // for you.  If you want one, define this to the name of the log file.
! define('ACCESS_LOG', '/tmp/wiki_access_log');
  
  /////////////////////////////////////////////////////////////////////

[phpwiki-checkins] CVS: phpwiki/lib dbalib.php,1.3,1.4 dbmlib.php,1.8,1.9

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2640/lib

Modified Files:
	dbalib.php dbmlib.php 
Log Message:
Fix typo.


Index: dbalib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbalib.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** dbalib.php	2001/02/12 01:43:10	1.3
--- dbalib.php	2001/02/17 05:36:21	1.4
***************
*** 42,46 ****
  		'hitcount'	=> _dbname('hitcountdb'));
  
! if (preg_match('@%/tmp\b@', $DBParams['directory']))
     $DBWarning = "DBA files are in the /tmp directory.";
  
--- 42,46 ----
  		'hitcount'	=> _dbname('hitcountdb'));
  
! if (preg_match('@^/tmp\b@', $DBParams['directory']))
     $DBWarning = "DBA files are in the /tmp directory.";
  

Index: dbmlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/dbmlib.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** dbmlib.php	2001/02/12 01:43:10	1.8
--- dbmlib.php	2001/02/17 05:36:21	1.9
***************
*** 37,41 ****
  		'hitcount'	=> _dbname('hitcountdb'));
  
! if (preg_match('@%/tmp\b@', $DBParams['directory']))
     $DBWarning = "DBM files are in the /tmp directory.";
  
--- 37,41 ----
  		'hitcount'	=> _dbname('hitcountdb'));
  
! if (preg_match('@^/tmp\b@', $DBParams['directory']))
     $DBWarning = "DBM files are in the /tmp directory.";
  

[phpwiki-checkins] CVS: phpwiki DBLIB.txt,1.8,1.9

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

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

Modified Files:
	DBLIB.txt 
Log Message:
Remove notes about $pagehash['refs'].


Index: DBLIB.txt
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/DBLIB.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** DBLIB.txt	2000/12/12 21:53:20	1.8
--- DBLIB.txt	2001/02/17 05:35:56	1.9
***************
*** 29,34 ****
       lastmodified => integer (also Unix time),
       pagename     => string,
!      version      => integer,
!      refs         => array (where each element is a reference)
    };
  
--- 29,33 ----
       lastmodified => integer (also Unix time),
       pagename     => string,
!      version      => integer
    };
  

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.34,1.35

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9040/lib

Modified Files:
	stdlib.php 
Log Message:
Fixed my bug: date header in RecentChanges not updating correctly.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** stdlib.php	2001/02/16 04:43:08	1.34
--- stdlib.php	2001/02/17 00:47:08	1.35
***************
*** 610,620 ****
  		  '----');
     }
-    $recentchanges['lastmodified'] = $now;
  
!    if (date($dateformat, $recentchanges['lastmodified']) != $today) {
!       $isNewDay = TRUE;
!    } else {
!       $isNewDay = FALSE;
!    }
  
     $numlines = sizeof($recentchanges['content']);
--- 610,616 ----
  		  '----');
     }
  
!    $isNewDay = date($dateformat, $recentchanges['lastmodified']) != $today;
!    $recentchanges['lastmodified'] = $now;
  
     $numlines = sizeof($recentchanges['content']);

[phpwiki-checkins] CVS: phpwiki/lib main.php,1.5,1.6

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv11072/lib

Modified Files:
	main.php 
Log Message:
Small bug fix


Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** main.php	2001/02/16 04:43:08	1.5
--- main.php	2001/02/16 05:10:54	1.6
***************
*** 4,11 ****
  include "lib/stdlib.php";
  include "lib/userauth.php";
  
  if (ACCESS_LOG)
  {
-    include "lib/logger.php";
     $LogEntry = new AccessLogEntry;
  
--- 4,11 ----
  include "lib/stdlib.php";
  include "lib/userauth.php";
+ include "lib/logger.php";
  
  if (ACCESS_LOG)
  {
     $LogEntry = new AccessLogEntry;
  
***************
*** 17,21 ****
  {
     $LogEntry->status = 302;	// "302 Found"
!    header("Location: " . SERVER_URL . $REQUEST_URI);
     exit;
  }
--- 17,21 ----
  {
     $LogEntry->status = 302;	// "302 Found"
!    header("Location: " . SERVER_URL . $REQUEST_URI . '/');
     exit;
  }
***************
*** 85,89 ****
     
  $user = new WikiUser(get_auth_mode($action));
! if (ACCESS_LOG and $user->is_authenticated())
     $LogEntry->user = $user->id;
  
--- 85,89 ----
     
  $user = new WikiUser(get_auth_mode($action));
! if ($user->is_authenticated())
     $LogEntry->user = $user->id;
  

[phpwiki-checkins] CVS: phpwiki/lib logger.php,NONE,1.1 config.php,1.33,1.34 main.php,1.4,1.5 stdlib.php,1.33,1.34 userauth.php,1.3,1.4

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv7439/lib

Modified Files:
	config.php main.php stdlib.php userauth.php 
Added Files:
	logger.php 
Log Message:
Added support for creating our own NCSA style access_log's.


***** Error reading new file: [Errno 2] No such file or directory: 'logger.php'
Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** config.php	2001/02/15 05:57:18	1.33
--- config.php	2001/02/16 04:43:07	1.34
***************
*** 27,31 ****
  // Set up localization
  //
- 
  if (empty($LANG))
     $LANG = "C";
--- 27,30 ----
***************
*** 232,235 ****
--- 231,243 ----
  }
  
+ // Access log
+ if (!defined('ACCESS_LOG'))
+    define('ACCESS_LOG', '');
+    
+ // Get remote host name, if apache hasn't done it for us
+ if (empty($REMOTE_HOST) && ENABLE_REVERSE_DNS)
+    $REMOTE_HOST = gethostbyaddr($REMOTE_ADDR);
+ 
+    
  // For emacs users
  // Local Variables:

Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** main.php	2001/02/15 19:32:34	1.4
--- main.php	2001/02/16 04:43:08	1.5
***************
*** 5,10 ****
--- 5,20 ----
  include "lib/userauth.php";
  
+ if (ACCESS_LOG)
+ {
+    include "lib/logger.php";
+    $LogEntry = new AccessLogEntry;
+ 
+    function _write_log () { $GLOBALS['LogEntry']->write(ACCESS_LOG); }
+    register_shutdown_function('_write_log');
+ }
+ 
  if (USE_PATH_INFO && !isset($PATH_INFO))
  {
+    $LogEntry->status = 302;	// "302 Found"
     header("Location: " . SERVER_URL . $REQUEST_URI);
     exit;
***************
*** 73,77 ****
--- 83,92 ----
  }
  
+    
  $user = new WikiUser(get_auth_mode($action));
+ if (ACCESS_LOG and $user->is_authenticated())
+    $LogEntry->user = $user->id;
+ 
+ 
  
  // All requests require the database

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** stdlib.php	2001/02/15 21:35:03	1.33
--- stdlib.php	2001/02/16 04:43:08	1.34
***************
*** 4,8 ****
     /*
        Standard functions for Wiki functionality
-          ExitWiki($errormsg)
           WikiURL($pagename, $args, $abs)
  	 
--- 4,7 ----
***************
*** 29,45 ****
     return $text;
  }
- 
- 
- function get_remote_host () {
-    // Apache won't show REMOTE_HOST unless the admin configured it
-    // properly. We'll be nice and see if it's there.
-    if (getenv('REMOTE_HOST'))
-       return getenv('REMOTE_HOST');
-    $host = getenv('REMOTE_ADDR');
-    if (ENABLE_REVERSE_DNS)
-       return gethostbyaddr($host);
-    return $host;
- }
- 
  
  function arrays_equal ($a, $b) 
--- 28,31 ----

Index: userauth.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/userauth.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** userauth.php	2001/02/13 05:54:38	1.3
--- userauth.php	2001/02/16 04:43:08	1.4
***************
*** 19,23 ****
     function WikiUser ($auth_mode = '') {
        // Restore from cookie.
!       global $WIKI_AUTH;
        if (empty($WIKI_AUTH)) 
        {
--- 19,23 ----
     function WikiUser ($auth_mode = '') {
        // Restore from cookie.
!       global $WIKI_AUTH, $REMOTE_HOST, $REMOTE_ADDR;
        if (empty($WIKI_AUTH)) 
        {
***************
*** 50,54 ****
  	    $this->realm++;
  	 $this->state = 'loggedout';
! 	 $this->userid = get_remote_host(); // Anonymous user id is hostname.
        }
        else
--- 50,54 ----
  	    $this->realm++;
  	 $this->state = 'loggedout';
! 	 $this->userid = empty($REMOTE_HOST) ? $REMOTE_ADDR : $REMOTE_HOST;
        }
        else
***************
*** 154,157 ****
--- 154,159 ----
        header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
        header("HTTP/1.0 401 Unauthorized");
+       if (ACCESS_LOG)
+ 	 $LogEntry->status = 401;
        echo gettext ("You entered an invalid login or password.");
        ExitWiki();

[phpwiki-checkins] CVS: phpwiki index.php,1.10,1.11

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

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

Modified Files:
	index.php 
Log Message:
Added support for creating our own NCSA style access_log's.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** index.php	2001/02/14 22:02:05	1.10
--- index.php	2001/02/16 04:43:07	1.11
***************
*** 45,48 ****
--- 45,52 ----
  //$DisabledActions = array('dumpserial', 'loadfile');
  
+ // PhpWiki can generate an access_log (in "NCSA combined log" format)
+ // for you.  If you want one, define this to the name of the log file.
+ define('ACCESS_LOG', '/tmp/wiki_access_log')
+ 
  /////////////////////////////////////////////////////////////////////
  //

[phpwiki-checkins] CVS: phpwiki/lib transform.php,1.16,1.17

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29361/lib

Modified Files:
	transform.php 
Log Message:
wtm_table: Make LEFT, rather than CENTERED the default alignment
for table cells.  I just went and edited some tables, and left
justification was what I wanted most often.  Also agrees with HTML.


Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** transform.php	2001/02/14 05:22:49	1.16
--- transform.php	2001/02/15 21:37:08	1.17
***************
*** 554,563 ****
  	 $td['rowspan'] = strlen($m[2]) + 1;
        
!       if ($m[3] == '<')
! 	 $td['align'] = 'left';
        else if ($m[3] == '>')
  	 $td['align'] = 'right';
        else
! 	 $td['align'] = 'center';
        
        $row .= $trfrm->token(StartTag('td', $td) . "&nbsp;");
--- 554,563 ----
  	 $td['rowspan'] = strlen($m[2]) + 1;
        
!       if ($m[3] == '^')
! 	 $td['align'] = 'center';
        else if ($m[3] == '>')
  	 $td['align'] = 'right';
        else
! 	 $td['align'] = 'left';
        
        $row .= $trfrm->token(StartTag('td', $td) . "&nbsp;");

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.13,1.14 editpage.html,1.14,1.15 message.html,1.8,1.9

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

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv29121/templates

Modified Files:
	browse.html editpage.html message.html 
Log Message:
New template token ###ROBOTS_META### to (attempt to) keep robots from
indexing pages other than the 'action=browse' page.


Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** browse.html	2001/02/14 22:02:05	1.13
--- browse.html	2001/02/15 21:35:03	1.14
***************
*** 6,9 ****
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ ###ROBOTS_META###
  <base href="###BASE_URL###">
  <title>###PAGE###</title>

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** editpage.html	2001/02/15 19:32:55	1.14
--- editpage.html	2001/02/15 21:35:03	1.15
***************
*** 6,9 ****
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ ###ROBOTS_META###
  <base href="###BASE_URL###">
  <title>###PAGE###</title>

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** message.html	2001/02/14 22:02:05	1.8
--- message.html	2001/02/15 21:35:03	1.9
***************
*** 6,9 ****
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ ###ROBOTS_META###
  <base href="###BASE_URL###">
  <title>###PAGE###</title>

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.32,1.33

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29121/lib

Modified Files:
	stdlib.php 
Log Message:
New template token ###ROBOTS_META### to (attempt to) keep robots from
indexing pages other than the 'action=browse' page.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** stdlib.php	2001/02/15 19:32:55	1.32
--- stdlib.php	2001/02/15 21:35:03	1.33
***************
*** 564,567 ****
--- 564,576 ----
        else
  	 _dotoken('BASE_URL', SERVER_URL . SCRIPT_NAME, $page);
+ 
+       if ($GLOBALS['action'] != 'browse')
+ 	 _dotoken('ROBOTS_META',
+ 		  Element('meta', array('name' => 'robots',
+ 					'content' => 'noindex, nofollow')),
+ 		  $page);
+       else
+ 	 _dotoken('ROBOTS_META', '', $page);
+       
        
        // invalid for messages (search results, error messages)

[phpwiki-checkins] CVS: phpwiki/lib editpage.php,1.13,1.14

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28998/lib

Modified Files:
	editpage.php 
Log Message:
When creating default contents for non-existant pages, put [brackets]
around page names which aren't BumpyWords.


Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** editpage.php	2001/02/14 05:22:49	1.13
--- editpage.php	2001/02/15 21:33:40	1.14
***************
*** 38,43 ****
        }
     } else {
!       $textarea = sprintf(gettext ("Describe %s here."),
! 				htmlspecialchars($pagename));
        unset($pagehash);
        $pagehash["version"] = 0;
--- 38,49 ----
        }
     } else {
!       if (preg_match("/^${WikiNameRegexp}\$/", $pagename))
! 	 $newpage = $pagename;
!       else
! 	 $newpage = "[$pagename]";
! 
!       $textarea = htmlspecialchars(
! 	 sprintf(gettext ("Describe %s here."), $newpage));
! 
        unset($pagehash);
        $pagehash["version"] = 0;

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.1,1.2

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

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

Modified Files:
	phpwiki.css 
Log Message:
Remove alternate colors for links, per Steve's request.


Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** phpwiki.css	2001/02/14 05:22:49	1.1
--- phpwiki.css	2001/02/15 21:33:06	1.2
***************
*** 70,76 ****
  .footnote-rev    
  {
!     text-decoration: none;
!     color: #600;
  }
  
  /*
--- 70,82 ----
  .footnote-rev    
  {
!   text-decoration: none;
!   /* color: #600; */
  }
+ .wikiunknown,
+ .wikiunknown U
+ {
+    color: #600;
+ }
+ 
  
  /*
***************
*** 102,110 ****
  .wikilink:link
  {
!     color: #c00;
  }
  .wikilink:visited,
  {
!     color: #600;
  }
  
--- 108,116 ----
  .wikilink:link
  {
!   /* color: #c00; */
  }
  .wikilink:visited,
  {
!   /* color: #600; */
  }
  

[phpwiki-checkins] CVS: phpwiki/lib editpage.php,1.8,1.8.2.1

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27660/lib

Modified Files:
      Tag: release-1_2-branch
	editpage.php 
Log Message:
When creating the default contents for non-existant pages,
put [brackets] around page names which aren't BumpyWords.


Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** editpage.php	2001/01/01 23:13:32	1.8
--- editpage.php	2001/02/15 21:25:02	1.8.2.1
***************
*** 48,53 ****
        }
     } else {
!       $textarea = sprintf(gettext ("Describe %s here."),
! 				htmlspecialchars($pagename));
        unset($pagehash);
        $pagehash["version"] = 0;
--- 48,59 ----
        }
     } else {
!       if (preg_match("/^${WikiNameRegexp}\$/", $pagename))
! 	 $newpage = $pagename;
!       else
! 	 $newpage = "[$pagename]";
! 
!       $textarea = htmlspecialchars(
! 	 sprintf(gettext ("Describe %s here."), $newpage));
! 
        unset($pagehash);
        $pagehash["version"] = 0;

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.13,1.14

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

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14832/templates

Modified Files:
	editpage.html 
Log Message:
Minor bug/warning fixes.


Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** editpage.html	2001/02/14 22:02:05	1.13
--- editpage.html	2001/02/15 19:32:55	1.14
***************
*** 49,53 ****
  
  <input type="hidden" name="action" value="save">
! <input type="hidden" name="pagename" value="###PAGEURL###">
  <input type="hidden" name="editversion" value="###VERSION###">
  </form>
--- 49,53 ----
  
  <input type="hidden" name="action" value="save">
! <input type="hidden" name="pagename" value="###PAGE###">
  <input type="hidden" name="editversion" value="###VERSION###">
  </form>

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.31,1.32

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14832/lib

Modified Files:
	stdlib.php 
Log Message:
Minor bug/warning fixes.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** stdlib.php	2001/02/14 22:02:05	1.31
--- stdlib.php	2001/02/15 19:32:55	1.32
***************
*** 308,312 ****
        }
  
!       if ($args['action'] == 'browse')
  	 unset($args['action']);
  
--- 308,312 ----
        }
  
!       if (isset($args['action']) && $args['action'] == 'browse')
  	 unset($args['action']);
  

[phpwiki-checkins] CVS: phpwiki/admin removepage.php,1.2,1.3

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

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

Modified Files:
	removepage.php 
Log Message:
Minor bug/warning fixes.


Index: removepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/removepage.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** removepage.php	2001/02/13 05:54:38	1.2
--- removepage.php	2001/02/15 19:32:55	1.3
***************
*** 12,16 ****
     $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>";
--- 12,16 ----
     $html .= "\n<P>";
     $html .= sprintf(gettext ("Click <a href=\"%s\">here</a> to remove the page now."),
! 		    htmlspecialchars(WikiURL($pagename, array('action' => 'remove',
  								  'verify' => 'okay'))));
     $html .= "\n<P>";

[phpwiki-checkins] CVS: phpwiki/lib main.php,1.3,1.4

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv14520/lib

Modified Files:
	main.php 
Log Message:
If we're expecting PATH_INFO, and don't get it, redirect to REQUEST_URI
with a trailing '/' added.   This is to make the index.php script look
more like a 'directory', for consistencies sake.

Also apparently $PATH_INFO gets magic-quoted, so un-magic that.


Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** main.php	2001/02/14 22:02:05	1.3
--- main.php	2001/02/15 19:32:34	1.4
***************
*** 5,8 ****
--- 5,14 ----
  include "lib/userauth.php";
  
+ if (USE_PATH_INFO && !isset($PATH_INFO))
+ {
+    header("Location: " . SERVER_URL . $REQUEST_URI);
+    exit;
+ }
+ 
  function DeducePagename () 
  {
***************
*** 12,18 ****
        return fix_magic_quotes_gpc($pagename);
  
!    if (USE_PATH_INFO)
        if (ereg('^' . PATH_INFO_PREFIX . '(..*)$', $PATH_INFO, $m))
  	 return $m[1];
  
     return gettext("FrontPage");
--- 18,27 ----
        return fix_magic_quotes_gpc($pagename);
  
!    if (USE_PATH_INFO && isset($PATH_INFO))
!    {
!       fix_magic_quotes_gpc($PATH_INFO);
        if (ereg('^' . PATH_INFO_PREFIX . '(..*)$', $PATH_INFO, $m))
  	 return $m[1];
+    }
  
     return gettext("FrontPage");

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.6,1.6.2.1

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

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14262/templates

Modified Files:
      Tag: release-1_2-branch
	editpage.html 
Log Message:
Arguments to <input> tag should not be urlencoded().


Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** editpage.html	2000/11/08 15:50:57	1.6
--- editpage.html	2001/02/15 19:28:36	1.6.2.1
***************
*** 39,43 ****
  </small>
  
! <input type="hidden" name="post" value="###PAGEURL###">
  <input type="hidden" name="editversion" value="###VERSION###">
  </form>
--- 39,43 ----
  </small>
  
! <input type="hidden" name="post" value="###PAGE###">
  <input type="hidden" name="editversion" value="###VERSION###">
  </form>

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.32,1.33

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21734/lib

Modified Files:
	config.php 
Log Message:
Fixed (I think) SF bug #132469.  The problem was that the value
for VIRTUAL_PATH being auto-deduced by lib/config.php was wrong.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** config.php	2001/02/14 22:02:05	1.32
--- config.php	2001/02/15 05:57:18	1.33
***************
*** 121,127 ****
        define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
  }
  if (!defined('VIRTUAL_PATH'))
  {
!    if (USE_PATH_INFO and isset($REDIRECT_URL))
     {
        // FIXME: This is a hack, and won't work if the requested
--- 121,167 ----
        define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
  }
+ 
+ 
+ function IsProbablyRedirectToIndex () 
+ {
+    // This might be a redirect to the DirectoryIndex,
+    // e.g. REQUEST_URI = /dir/  got redirected
+    // to SCRIPT_NAME = /dir/index.php
+    
+    // In this case, the proper virtual path is still
+    // $SCRIPT_NAME, since pages appear at
+    // e.g. /dir/index.php/FrontPage.
+    
+    global $REQUEST_URI, $SCRIPT_NAME;
+    
+    $requri = preg_quote($REQUEST_URI, '%');
+    return preg_match("%^${requri}[^/]*$%", $SCRIPT_NAME);
+ }
+ 
+    
  if (!defined('VIRTUAL_PATH'))
  {
!    // We'd like to auto-detect when the cases where apaches
!    // 'Action' directive (or similar means) is used to
!    // redirect page requests to a cgi-handler.
!    //
!    // In cases like this, requests for e.g. /wiki/FrontPage
!    // get redirected to a cgi-script called, say,
!    // /path/to/wiki/index.php.  The script gets all
!    // of /wiki/FrontPage as it's PATH_INFO.
!    //
!    // The problem is:
!    //   How to detect when this has happened reliably?
!    //   How to pick out the "virtual path" (in this case '/wiki')?
!    //
!    // (Another time an redirect might occur is to a DirectoryIndex
!    // -- the requested URI is '/wikidir/', the request gets
!    // passed to '/wikidir/index.php'.  In this case, the
!    // proper VIRTUAL_PATH is '/wikidir/index.php', since the
!    // pages will appear at e.g. '/wikidir/index.php/FrontPage'.
!    //
! 
!    if (USE_PATH_INFO and isset($REDIRECT_URL)
!        and ! IsProbablyRedirectToIndex())
     {
        // FIXME: This is a hack, and won't work if the requested

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.31,1.32 diff.php,1.8,1.9 interwiki.php,1.3,1.4 loadsave.php,1.3,1.4 main.php,1.2,1.3 prepend.php,1.2,1.3 stdlib.php,1.30,1.31

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

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9783/lib

Modified Files:
	config.php diff.php interwiki.php loadsave.php main.php 
	prepend.php stdlib.php 
Log Message:
Various minor bug fixes and cleanups.

Also added the following new minor featurelets:
  Comments in index.php indicating how to set the PHP include_path if
  necessary.

  New config variable $DisabledActions --- one can list actions (eg. 
  dumpserial) which should not be allowed, even by the administrator.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** config.php	2001/02/13 05:54:38	1.31
--- config.php	2001/02/14 22:02:05	1.32
***************
*** 27,30 ****
--- 27,77 ----
  // Set up localization
  //
+ 
+ if (empty($LANG))
+    $LANG = "C";
+ 
+    
+ // Search PHP's include_path to find file or directory.
+ function FindFile ($file, $missing_okay = false)
+ {
+    // FIXME: This wont work for DOS filenames.
+    if (ereg('^/', $file))
+    {
+       // absolute path.
+       if (file_exists($file))
+ 	 return $file;
+    }
+    else
+    {
+       $include_path = ini_get('include_path');
+       if (empty($include_path))
+ 	 $include_path = '.';
+       // FIXME: This wont work for DOS filenames.
+       $path = explode(':', $include_path);
+       while (list($i, $dir) = each ($path))
+ 	 if (file_exists("$dir/$file"))
+ 	    return "$dir/$file";
+    }
+    
+    if (!$missing_okay)
+       ExitWiki("$file: file not found");
+    return false;
+ }
+ 
+ // Search PHP's include_path to find file or directory.
+ // Searches for "locale/$LANG/$file", then for "$file".
+ function FindLocalizedFile ($file, $missing_okay = false)
+ {
+    global $LANG;
+    
+    // FIXME: This wont work for DOS filenames.
+    if (!ereg('^/', $file))
+    {
+       if ( ($path = FindFile("locale/$LANG/$file", 'missing_is_okay')) )
+ 	 return $path;
+    }
+    return FindFile($file, $missing_okay);
+ }
+ 
  if (!function_exists ('gettext'))
  {
***************
*** 38,42 ****
     }
  
!    if ( ($lcfile = SearchPath("LC_MESSAGES/phpwiki.php", 'missing_ok')) )
     {
        include($lcfile);
--- 85,89 ----
     }
  
!    if ( ($lcfile = FindLocalizedFile("LC_MESSAGES/phpwiki.php", 'missing_ok')) )
     {
        include($lcfile);
***************
*** 69,73 ****
      * php script is...)
      */
!    define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
  }
  if (!defined('VIRTUAL_PATH'))
--- 116,123 ----
      * php script is...)
      */
!    if (php_sapi_name() == 'apache')
!       define('USE_PATH_INFO', true);
!    else
!       define('USE_PATH_INFO', ereg('\.(php3?|cgi)$', $SCRIPT_NAME));
  }
  if (!defined('VIRTUAL_PATH'))

Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** diff.php	2001/02/13 05:54:38	1.8
--- diff.php	2001/02/14 22:02:05	1.9
***************
*** 934,938 ****
  	    $line = rtrim($line);
  	    $line = empty($line) ? ' ' : htmlspecialchars($line);
! 	    $html .= Element('tr', 
  			     $prefix . Element('td', array('bgcolor' => $color),
  					       Element('tt', $line)));
--- 934,938 ----
  	    $line = rtrim($line);
  	    $line = empty($line) ? ' ' : htmlspecialchars($line);
! 	    $html .= Element('tr', array('valign' => 'top'), 
  			     $prefix . Element('td', array('bgcolor' => $color),
  					       Element('tt', $line)));
***************
*** 975,979 ****
  						   'bgcolor' => 'white',
  						   'cellspacing' => 0,
! 						   'cellpadding' => 4,
  						   'border' => 0),
  					     $header. $diff)));
--- 975,979 ----
  						   'bgcolor' => 'white',
  						   'cellspacing' => 0,
! 						   'cellpadding' => 1,
  						   'border' => 0),
  					     $header. $diff)));

Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** interwiki.php	2001/02/14 05:22:49	1.3
--- interwiki.php	2001/02/14 22:02:05	1.4
***************
*** 5,9 ****
     global $interwikimap_file, $InterWikiLinkRegexp, $interwikimap;
  
!    $intermap_data = file(INTERWIKI_MAP_FILE);
     $wikiname_regexp = "";
     for ($i=0; $i<count($intermap_data); $i++)
--- 5,9 ----
     global $interwikimap_file, $InterWikiLinkRegexp, $interwikimap;
  
!    $intermap_data = file(INTERWIKI_MAP_FILE, 1);
     $wikiname_regexp = "";
     for ($i=0; $i<count($intermap_data); $i++)
***************
*** 25,31 ****
     global $interwikimap;
  
!    list( $wiki, $page ) = split( ":", $link );
  
!    $url = $interwikimap[$wiki] . urlencode($page);
  
     if ($linktext)
--- 25,31 ----
     global $interwikimap;
  
!    list( $wiki, $page ) = split( ":", $link, 2 );
  
!    $url = $interwikimap[$wiki] . rawurlencode($page);
  
     if ($linktext)
***************
*** 45,50 ****
  function wtt_interwikilinks($match, &$trfrm)
  {
-    global $InterWikiLinkRegexp, $WikiNameRegexp;
- 
     if ($match[0] == "!")
        return htmlspecialchars(substr($match,1));
--- 45,48 ----

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** loadsave.php	2001/02/14 05:22:49	1.3
--- loadsave.php	2001/02/14 22:02:05	1.4
***************
*** 375,381 ****
     $ignore = array(gettext('RecentChanges'));
  
!    LoadAny($dbi, SearchPath(WIKI_PGSRC), false, $ignore);
     if ($LANG != "C")
!       LoadAny($dbi, SearchPath(DEFAULT_WIKI_PGSRC), $GenericPages, $ignore);
  
     echo "</dl>\n";
--- 375,381 ----
     $ignore = array(gettext('RecentChanges'));
  
!    LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC), false, $ignore);
     if ($LANG != "C")
!       LoadAny($dbi, FindLocalizedFile(DEFAULT_WIKI_PGSRC), $GenericPages, $ignore);
  
     echo "</dl>\n";

Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** main.php	2001/02/13 05:54:38	1.2
--- main.php	2001/02/14 22:02:05	1.3
***************
*** 5,9 ****
  include "lib/userauth.php";
  
- 
  function DeducePagename () 
  {
--- 5,8 ----
***************
*** 14,18 ****
  
     if (USE_PATH_INFO)
!       if (ereg('^' . PATH_INFO_PREFIX . '(.*)$', $PATH_INFO, $m))
  	 return $m[1];
  
--- 13,17 ----
  
     if (USE_PATH_INFO)
!       if (ereg('^' . PATH_INFO_PREFIX . '(..*)$', $PATH_INFO, $m))
  	 return $m[1];
  
***************
*** 39,43 ****
  }
  
- 
  function IsSafeAction ($action)
  {
--- 38,41 ----
***************
*** 82,91 ****
  if (!IsSafeAction($action))
     $user->must_be_admin($action);
! 
  // Enable the output of most of the warning messages.
  // The warnings will screw up zip files and setpref though.
  if ($action != 'zip' && $action != 'setprefs')
     PostponeErrorMessages(E_NOTICE);
!    
  switch ($action) {
     case 'edit':
--- 80,91 ----
  if (!IsSafeAction($action))
     $user->must_be_admin($action);
! if (isset($DisabledActions) && in_array($action, $DisabledActions))
!    ExitWiki(gettext("Action $action is disabled in this wiki."));
!    
  // Enable the output of most of the warning messages.
  // The warnings will screw up zip files and setpref though.
  if ($action != 'zip' && $action != 'setprefs')
     PostponeErrorMessages(E_NOTICE);
! 
  switch ($action) {
     case 'edit':

Index: prepend.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/prepend.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** prepend.php	2001/02/14 05:22:49	1.2
--- prepend.php	2001/02/14 22:02:05	1.3
***************
*** 114,136 ****
  PostponeErrorMessages(E_ALL);
  
- 
- function SearchPath ($file, $missing_ok = false, $path = false) 
- {
-    if (ereg('^/', $file))
-       return $file;		// absolute path.
- 
-    if (!$path)
-       $path = $GLOBALS['DataPath'];
-    
-    while (list($i, $dir) = each($path))
-    {
-       if (file_exists("$dir/$file"))
- 	 return "$dir/$file";
-    }
-    if ($missing_ok)
-       return false;
-    ExitWiki("$file: file not found");
- }
- 
  // For emacs users
  // Local Variables:
--- 114,117 ----

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** stdlib.php	2001/02/14 05:22:49	1.30
--- stdlib.php	2001/02/14 22:02:05	1.31
***************
*** 525,529 ****
        }
  
!       $page = join('', file(SearchPath($templates[$template])));
        $page = str_replace('###', "$FieldSeparator#", $page);
  
--- 525,529 ----
        }
  
!       $page = join('', file(FindLocalizedFile($templates[$template])));
        $page = str_replace('###', "$FieldSeparator#", $page);
  

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.12,1.13 editpage.html,1.12,1.13 message.html,1.7,1.8

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

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv9783/templates

Modified Files:
	browse.html editpage.html message.html 
Log Message:
Various minor bug fixes and cleanups.

Also added the following new minor featurelets:
  Comments in index.php indicating how to set the PHP include_path if
  necessary.

  New config variable $DisabledActions --- one can list actions (eg. 
  dumpserial) which should not be allowed, even by the administrator.


Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** browse.html	2001/02/14 05:22:49	1.12
--- browse.html	2001/02/14 22:02:05	1.13
***************
*** 6,10 ****
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <base href="###BASE_URL###">
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** editpage.html	2001/02/14 05:22:49	1.12
--- editpage.html	2001/02/14 22:02:05	1.13
***************
*** 6,10 ****
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <base href="###BASE_URL###">
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
***************
*** 30,34 ****
  Please <a class="wikilink" href="###BROWSE###ConvertSpacesToTabs"><span class="wikiword">ConvertSpacesToTabs</span></a>
  for me when I save.
! <p><a class="wikilink" href="###BROWSE###GoodStyle"><span class="wikiword">GoodStyle</span></a> tips for editing.
  
  ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditCopy</a> from previous author
--- 30,36 ----
  Please <a class="wikilink" href="###BROWSE###ConvertSpacesToTabs"><span class="wikiword">ConvertSpacesToTabs</span></a>
  for me when I save.
! <p>You can change the size of the editing area.
! See <a class="wikilink" href="###BROWSE###UserPreferences"><span class="wikiword">UserPreferences</span></a>.</p>
! <p><a class="wikilink" href="###BROWSE###GoodStyle"><span class="wikiword">GoodStyle</span></a> tips for editing.</p>
  
  ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditCopy</a> from previous author

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** message.html	2001/02/14 05:22:49	1.7
--- message.html	2001/02/14 22:02:05	1.8
***************
*** 6,10 ****
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
--- 6,10 ----
  -->
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <base href="###BASE_URL###">
  <title>###PAGE###</title>
  <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">

[phpwiki-checkins] CVS: phpwiki index.php,1.9,1.10

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

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

Modified Files:
	index.php 
Log Message:
Various minor bug fixes and cleanups.

Also added the following new minor featurelets:
  Comments in index.php indicating how to set the PHP include_path if
  necessary.

  New config variable $DisabledActions --- one can list actions (eg. 
  dumpserial) which should not be allowed, even by the administrator.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** index.php	2001/02/14 05:22:49	1.9
--- index.php	2001/02/14 22:02:05	1.10
***************
*** 1,6 ****
  <?php
  /////////////////////////////////////////////////////////////////////
! // Part Zero: Don't touch this!
  /////////////////////////////////////////////////////////////////////
  define ('PHPWIKI_VERSION', '1.3.0pre');
  require "lib/prepend.php";
--- 1,13 ----
  <?php
  /////////////////////////////////////////////////////////////////////
! // Part Zero: If PHP needs help in finding where you installed the
! //   rest of the PhpWiki code, you can set the include_path here.
  /////////////////////////////////////////////////////////////////////
+ 
+ //ini_set('include_path', '.:/where/you/installed/phpwiki');
+ 
+ /////////////////////////////////////////////////////////////////////
+ // Part Null: Don't touch this!
+ /////////////////////////////////////////////////////////////////////
  define ('PHPWIKI_VERSION', '1.3.0pre');
  require "lib/prepend.php";
***************
*** 35,38 ****
--- 42,48 ----
  define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
  
+ // Actions listed in this array will not be allowed.
+ //$DisabledActions = array('dumpserial', 'loadfile');
+ 
  /////////////////////////////////////////////////////////////////////
  //
***************
*** 121,128 ****
  define("NUM_RELATED_PAGES", 5);
  
- // This path is searched when trying to read WIKI_PGSRC
- // or template files.
- $DataPath = array(".", "locale/$LANG");
- 
  // Template files (filenames are relative to script position)
  // (These filenames will be passed through gettext() before use.)
--- 131,134 ----
***************
*** 130,134 ****
  		   "EDITPAGE" =>  "templates/editpage.html",
  		   "MESSAGE" =>   "templates/message.html");
- 
  
  /* WIKI_PGSRC -- specifies the source for the initial page contents
--- 136,139 ----

[phpwiki-checkins] CVS: phpwiki/admin dumpserial.php,1.1,1.1.2.1 loadserial.php,1.1,1.1.2.1

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

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

Modified Files:
      Tag: release-1_2-branch
	dumpserial.php loadserial.php 
Log Message:
Added extra paranoid security checks.

Without these checks, if the admin directory is not protected
(e.g. via .htaccess) then loadserial.php and dumpserial.php can
be run directly and used to probe for and create directories
on the http server.


Index: dumpserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/Attic/dumpserial.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** dumpserial.php	2000/11/08 15:30:16	1.1
--- dumpserial.php	2001/02/14 06:32:19	1.1.2.1
***************
*** 6,10 ****
        directory as serialized data structures.
     */
! 
     $directory = $dumpserial;
     $pages = GetAllWikiPagenames($dbi);
--- 6,12 ----
        directory as serialized data structures.
     */
!    if (!defined('WIKI_ADMIN'))
!       die("You must be logged in as the administrator to dump serialized pages.");
!   
     $directory = $dumpserial;
     $pages = GetAllWikiPagenames($dbi);

Index: loadserial.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/admin/Attic/loadserial.php,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** loadserial.php	2000/11/08 15:30:16	1.1
--- loadserial.php	2001/02/14 06:32:19	1.1.2.1
***************
*** 5,8 ****
--- 5,10 ----
        wiki_dumpserial.php.
     */
+    if (!defined('WIKI_ADMIN'))
+       die("You must be logged in as the administrator to load serialized pages.");
  
     $directory = $loadserial;

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.11,1.12 editpage.html,1.11,1.12 message.html,1.6,1.7

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

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv4186/templates

Modified Files:
	browse.html editpage.html message.html 
Log Message:
log

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** browse.html	2001/02/13 05:54:38	1.11
--- browse.html	2001/02/14 05:22:49	1.12
***************
*** 8,60 ****
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
! <!-- <link rel="stylesheet" title="phpwiki" href="" type="text/css"> -->
! <style type="text/css">
! <!--
! .wikiword, .unknownwikiword {
!     font-family: sans-serif;
!     font-size: 12pt;
!     text-decoration: none;
! /*    background-color: #e8e8d8 */
! } 
! 
! .wikiword:link {
!     color: #c00 ;
! }
! .wikiword:visited {
!     color: #600;
! }
! .unknownwikiword { color: #000; background-color: #ddc }
! A.unknownwikiword { color: ivory; background-color: #663333 }
! 
! -->
! </style>
  </head>
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###ACTION###search&amp;searchtype=full&amp;searchterm=###PAGEURL###">###PAGE###</a></h1>
  ###IF:!ANONYMOUS###
  <p>You are logged in as <em>###USERID###</em>.
! [<a href="###ACTION###logout">Log Out</a>]</p>
  ###IF:ADMIN###
! ###IF LOCK###[<a href="###ACTION###unlock">Unlock page</a>]
! ###IF !LOCK###[<a href="###ACTION###lock">Lock page</a>]
  - - 
! [<a href="###ACTION###remove">Remove page</a>]
  ###ENDIF:ADMIN###
  <hr noshade>
  ###ENDIF:!ANONYMOUS###
! <P>
! ###CONTENT###
  <hr noshade>
! ###IF ADMIN###<a href="###ACTION###edit">EditText</a> of this page
  ###IF:!ADMIN###
  ###IF LOCK###Page locked
! ###IF !LOCK###<a href="###ACTION###edit">EditText</a> of this page
  ###ENDIF:!ADMIN###
  (last edited ###LASTMODIFIED###)
! [<a href="###ACTION###info">info</a>]
! [<a href="###ACTION###diff">diff</a>])
  <br>
! <a href="###BROWSE###FindPage">FindPage</a> by browsing or searching
  <hr noshade>
  <small>###RELATEDPAGES###</small>
--- 8,46 ----
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
! <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a class='wikiaction'
!   href="###ACTION###search&amp;searchtype=full&amp;searchterm=###PAGEURL###"
! ><span class='wikiword'>###PAGE###</span></a></h1>
  ###IF:!ANONYMOUS###
  <p>You are logged in as <em>###USERID###</em>.
! [<a class="wikiaction" href="###ACTION###logout">Log Out</a>]</p>
  ###IF:ADMIN###
! ###IF LOCK###[<a class="wikiadmin" href="###ACTION###unlock">Unlock page</a>]
! ###IF !LOCK###[<a class="wikiadmin" href="###ACTION###lock">Lock page</a>]
  - - 
! [<a class="wikiadmin" href="###ACTION###remove">Remove page</a>]
  ###ENDIF:ADMIN###
  <hr noshade>
  ###ENDIF:!ANONYMOUS###
! <table class="outer" width="100%" cellspacing=2 border=0>
! <tr><td><table class="inner" width="100%" border=0 cellspacing=0 cellpadding=5>
! <tr><td class="wikitext">###CONTENT###</td></tr>
! </table></td></tr>
! </table>
  <hr noshade>
! ###IF ADMIN###<a class="wikiaction" href="###ACTION###edit">EditText</a> of this page
  ###IF:!ADMIN###
  ###IF LOCK###Page locked
! ###IF !LOCK###<a class="wikiaction" href="###ACTION###edit">EditText</a> of this page
  ###ENDIF:!ADMIN###
  (last edited ###LASTMODIFIED###)
! [<a class="wikiaction" href="###ACTION###info">info</a>]
! [<a class="wikiaction" href="###ACTION###diff">diff</a>])
  <br>
! <a class="wikilink" href="###BROWSE###FindPage"><span class="wikiword">FindPage</span></a>
! by browsing or searching
  <hr noshade>
  <small>###RELATEDPAGES###</small>

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** editpage.html	2001/02/13 05:54:38	1.11
--- editpage.html	2001/02/14 05:22:49	1.12
***************
*** 8,19 ****
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
  </head>
  
! <body>
! 
! <form method="POST" action="###BROWSE_PAGE###">
! 
! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! Edit ###PAGE###
  <input type="submit" value=" Save "></h1>
  
--- 8,18 ----
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
+ <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
  
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <form class="wikiaction" method="POST" action="###BROWSE_PAGE###">
! <h1><a class="wikilink" href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
! Edit <span="wikiword">###PAGE###</span>
  <input type="submit" value=" Save "></h1>
  
***************
*** 29,37 ****
  <input type="checkbox" name="convert" value="tabs" >
  I can't type tabs.
! Please <a href="###BROWSE###ConvertSpacesToTabs">ConvertSpacesToTabs</a>
  for me when I save.
! <p><a href="###BROWSE###GoodStyle">GoodStyle</a> tips for editing.
  
! ###IF COPY###<br><a href="###ACTION###edit&amp;version=archive">EditCopy</a> from previous author
  
  <hr noshade>
--- 28,36 ----
  <input type="checkbox" name="convert" value="tabs" >
  I can't type tabs.
! Please <a class="wikilink" href="###BROWSE###ConvertSpacesToTabs"><span class="wikiword">ConvertSpacesToTabs</span></a>
  for me when I save.
! <p><a class="wikilink" href="###BROWSE###GoodStyle"><span class="wikiword">GoodStyle</span></a> tips for editing.
  
! ###IF COPY###<br><a class="wikiaction" href="###ACTION###edit&amp;version=archive">EditCopy</a> from previous author
  
  <hr noshade>
***************
*** 44,48 ****
  "%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[["
  <br>more on
! <a href="###BROWSE###?TextFormattingRules"><b>TextFormattingRules</b></a>
  </small>
  
--- 43,47 ----
  "%%%" makes a linebreak, "- - - -" makes a horizontal rule, escape "[" with "[["
  <br>more on
! <a class="wikilink" href="###BROWSE###TextFormattingRules"><b><span class="wikiword">TextFormattingRules</span></b></a>
  </small>
  

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** message.html	2001/02/13 05:54:38	1.6
--- message.html	2001/02/14 05:22:49	1.7
***************
*** 8,16 ****
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
  </head>
  
  <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  ###PAGE###</h1>
  
--- 8,16 ----
  <!-- <base href="###BASE_URL###"> -->
  <title>###PAGE###</title>
+ <link rel="stylesheet" title="phpwiki" href="###CSS_URL###" type="text/css">
  </head>
  
  <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a class="wikilink" href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a>
  ###PAGE###</h1>
  

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.11,1.12 RecentChanges,1.14,NONE

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

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv4186/pgsrc

Modified Files:
	TextFormattingRules 
Removed Files:
	RecentChanges 
Log Message:
log

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** TextFormattingRules	2001/02/10 22:15:08	1.11
--- TextFormattingRules	2001/02/14 05:22:49	1.12
***************
*** 53,61 ****
  * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | FrontPage]
  * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.
  * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
  * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
  
  ! HTML Mark-Up Language
  
--- 53,76 ----
  * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | FrontPage]
  * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
! * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
  * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
  * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
  
+ ! Tables
  
+ * Simple tables are available.  A table row is introduced by a __|__ in the first column.  It is best described by example:
+       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v _''''_Notes_''''_
+       | _''''_First_''''_   | _''''_Last_''''_
+       |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+       |> Marco      |< Polo      | Cheaper     |< Not available
+ ;: will generate
+ ||  __Name__               |v __Cost__   |v __Notes__
+ | __First__   | __Last__
+ |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
+ |> Marco      |< Polo      | Cheaper     |< Not available
+ 
+ ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows.  A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.)
+ 
+ 
  ! HTML Mark-Up Language
  
***************
*** 67,71 ****
  ! More detail than you want to know
  
! See MagicPhpWikiURLs for gory details on how to write
  various kind of wiki maintainance links.
  
--- 82,86 ----
  ! More detail than you want to know
  
! See [MagicPhpWikiURLs] for gory details on how to write
  various kind of wiki maintainance links.
  
***************
*** 74,76 ****
  Footnotes:
  
! [1] By using [[1] a second time the footnote itself is defined.
--- 89,91 ----
  Footnotes:
  
! [1] By using [[1] a second time (in the first column) the footnote itself is ''defined''.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references.  (References which come ''after'' the footnote ''definition'' will not be linked to.)

--- RecentChanges DELETED ---