phpwiki-checkins Mailing List for PhpWiki

In message <E14...@us...>,"Geoffrey T. Dairiki
" writes:
>Log Message:
>Minor type correction.
 ^^^^
That's "typo" -- haha.
Jeff

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20011/lib
Modified Files:
	main.php 
Log Message:
Minor type correction.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** main.php	2001年02月21日 17:16:44	1.9
--- main.php	2001年02月28日 20:54:18	1.10
***************
*** 90,94 ****
 $user = new WikiUser(get_auth_mode($action));
 if ($user->is_authenticated())
! $LogEntry->user = $user->id;
 
 
--- 90,94 ----
 $user = new WikiUser(get_auth_mode($action));
 if ($user->is_authenticated())
! $LogEntry->user = $user->id();
 
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv758/lib
Modified Files:
	editpage.php 
Log Message:
Fix SF bug #404646. Must quote htmlspecialchars in <textarea>.
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** editpage.php	2001年02月15日 21:33:40	1.14
--- editpage.php	2001年02月27日 23:22:30	1.15
***************
*** 28,32 ****
 }
 
! $textarea = implode("\n", $pagehash["content"]);
 if ($editing_copy) {
 $pagehash["version"] = $currentpage["version"];
--- 28,32 ----
 }
 
! $textarea = htmlspecialchars(implode("\n", $pagehash["content"]));
 if ($editing_copy) {
 $pagehash["version"] = $currentpage["version"];

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32345/lib
Modified Files:
 Tag: release-1_2-branch
	editpage.php 
Log Message:
Fix SF bug #404646. Must quote htmlspecialchars in <textarea>.
Index: editpage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** editpage.php	2001年02月15日 21:25:02	1.8.2.1
--- editpage.php	2001年02月27日 23:16:12	1.8.2.2
***************
*** 37,41 ****
 }
 
! $textarea = implode("\n", $pagehash["content"]);
 if (isset($copy)) {
 	 // $cdbi = OpenDataBase($WikiPageStore);
--- 37,41 ----
 }
 
! $textarea = htmlspecialchars(implode("\n", $pagehash["content"]));
 if (isset($copy)) {
 	 // $cdbi = OpenDataBase($WikiPageStore);

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv23751/lib
Modified Files:
	main.php 
Log Message:
Recursive bug fix. (Ie. fix stupid bug introduced in the last bug fix.)
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** main.php	2001年02月20日 13:44:03	1.8
--- main.php	2001年02月21日 17:16:44	1.9
***************
*** 36,40 ****
 }
 
! if (isset($QUERY_STRING) && !preg_match('/[&=]/', $QUERY_STRING))
 return urldecode(fix_magic_quotes_gpc($QUERY_STRING));
 
--- 36,40 ----
 }
 
! if (isset($QUERY_STRING) && preg_match('/^[^&=]+$/', $QUERY_STRING))
 return urldecode(fix_magic_quotes_gpc($QUERY_STRING));
 

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv29310/lib
Modified Files:
	main.php 
Log Message:
Fix SF bug #132843 some more. Also add code to properly glean the
page name from obsolete 'index.php?PageName' style URLS.
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** main.php	2001年02月17日 21:52:08	1.7
--- main.php	2001年02月20日 13:44:03	1.8
***************
*** 18,22 ****
 {
 $LogEntry->status = 302;	// "302 Found"
! header("Location: " . SERVER_URL . $REQUEST_URI . '/');
 exit;
 }
--- 18,22 ----
 {
 $LogEntry->status = 302;	// "302 Found"
! header("Location: " . SERVER_URL . preg_replace('/(\?|$)/', '/1円', $REQUEST_URI, 1));
 exit;
 }
***************
*** 24,28 ****
 function DeducePagename () 
 {
! global $pagename, $PATH_INFO;
 
 if (isset($pagename))
--- 24,28 ----
 function DeducePagename () 
 {
! global $pagename, $PATH_INFO, $QUERY_STRING;
 
 if (isset($pagename))
***************
*** 36,39 ****
--- 36,42 ----
 }
 
+ if (isset($QUERY_STRING) && !preg_match('/[&=]/', $QUERY_STRING))
+ return urldecode(fix_magic_quotes_gpc($QUERY_STRING));
+ 
 return gettext("FrontPage");
 }

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20470/lib
Modified Files:
	main.php 
Log Message:
Fix infinite redirect bug. (SF bug #132843.)
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** main.php	2001年02月16日 05:10:54	1.6
--- main.php	2001年02月17日 21:52:08	1.7
***************
*** 14,18 ****
 }
 
! if (USE_PATH_INFO && !isset($PATH_INFO))
 {
 $LogEntry->status = 302;	// "302 Found"
--- 14,19 ----
 }
 
! if (USE_PATH_INFO && !isset($PATH_INFO)
! && (!isset($REDIRECT_URL) || !preg_match(',/,ドル', $REDIRECT_URL)))
 {
 $LogEntry->status = 302;	// "302 Found"

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');
 
 /////////////////////////////////////////////////////////////////////

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.";
 

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
 };
 

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']);

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;
 

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();

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')
+ 
 /////////////////////////////////////////////////////////////////////
 //

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;");

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>

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)

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;

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; */
 }
 

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;

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>

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']);
 

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>";

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");

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>