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

[phpwiki-checkins] CVS: phpwiki index.php,1.24,1.25

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

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

Modified Files:
	index.php 
Log Message:
Add comment: setting $LANG to '' will cause systems default language
to be used.


Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** index.php	2001/09/19 19:12:16	1.24
--- index.php	2001/11/09 16:25:02	1.25
***************
*** 206,209 ****
--- 206,213 ----
  // Swedish "sv", and Italian, "it".
  //
+ // If you set $LANG to the empty string, your systems default
+ // language (as determined by the applicable environment variables)
+ // will be used.
+ //
  // Note that on some systems, apprently using these short forms for
  // the locale won't work.  On my home system 'LANG=de' won't result

[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.9,1.10

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

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

Modified Files:
	loadsave.php 
Log Message:
Encode leading '.' in filenames for both zip dumps and dumps to
directories.  (See SF bug #478449).


Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** loadsave.php	2001/09/19 02:58:00	1.9
--- loadsave.php	2001/11/09 16:23:37	1.10
***************
*** 53,56 ****
--- 53,75 ----
  }
  
+ /***
+  * Compute filename to used for storing contents of a wiki page.
+  *
+  * Basically we do a rawurlencode() which encodes everything
+  * except ASCII alphanumerics and '.', '-', and '_'.
+  *
+  * But we also want to encode leading dots to avoid filenames
+  * like '.', and '..'.  (Also, there's no point in generating
+  * "hidden" file names, like '.foo'.)
+  *
+  * @param $pagename string Pagename.
+  * @return string Filename for page.
+  */
+ function FilenameForPage ($pagename)
+ {
+     $enc = rawurlencode($pagename);
+     return preg_replace('/^\./', '%2e', $enc);
+ }
+ 
  /**
   * The main() function which generates a zip archive of a PhpWiki.
***************
*** 94,98 ****
              $content = MailifyPage($page);
  		     
!         $zip->addRegularFile( rawurlencode($page->getName()),
                                $content, $attrib);
      }
--- 113,117 ----
              $content = MailifyPage($page);
  		     
!         $zip->addRegularFile( FilenameForPage($page->getName()),
                                $content, $attrib);
      }
***************
*** 123,127 ****
          
          $enc_name = htmlspecialchars($page->getName());
!         $filename = rawurlencode($page->getName());
  
          echo "<br>$enc_name ... ";
--- 142,146 ----
          
          $enc_name = htmlspecialchars($page->getName());
!         $filename = FilenameForPage($page->getName());
  
          echo "<br>$enc_name ... ";

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.44,1.45

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

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

Modified Files:
	config.php 
Log Message:
Comment out putenv(LANG) which causes trouble when PHP's safe_mode
is enabled.  I hope this putenv() is not really necessary --- I
don't think it is.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** config.php	2001/10/29 21:08:09	1.44
--- config.php	2001/11/09 16:22:43	1.45
***************
*** 46,50 ****
  // Setup localisation
  setlocale(LC_ALL, "$LANG");
! putenv("LC_ALL=$LANG");
  
  if (!function_exists ('gettext'))
--- 46,53 ----
  // Setup localisation
  setlocale(LC_ALL, "$LANG");
! 
! // I think this putenv is unnecessary, and it causes trouble
! // if PHP's safe_mode is enabled:
! //putenv("LC_ALL=$LANG");
  
  if (!function_exists ('gettext'))

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.7,1.24.2.8

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

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

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
Fix SF bug #424811: putenv(LANG) fails when safe_mode is on.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.7
retrieving revision 1.24.2.8
diff -C2 -r1.24.2.7 -r1.24.2.8
*** config.php	2001/11/09 03:13:00	1.24.2.7
--- config.php	2001/11/09 15:36:03	1.24.2.8
***************
*** 221,225 ****
        }
     } else {
!       putenv ("LANG=$LANG");
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
--- 221,227 ----
        }
     } else {
!       // This putenv() fails when safe_mode is on.
!       // I think it is unnecessary. 
!       //putenv ("LANG=$LANG");
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
***************
*** 228,232 ****
           define("LC_ALL", "LC_ALL");
        }   
!       setlocale(LC_ALL, "");
     }
     // end of localization function
--- 230,234 ----
           define("LC_ALL", "LC_ALL");
        }   
!       setlocale(LC_ALL, "$LANG");
     }
     // end of localization function

[phpwiki-checkins] CVS: phpwiki INSTALL.mysql,1.8,1.9

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

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

Modified Files:
	INSTALL.mysql 
Log Message:
Documentation fixes based on SF patch #479791 by Carsten Klapp.


Index: INSTALL.mysql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL.mysql,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** INSTALL.mysql	2001/09/18 19:16:23	1.8
--- INSTALL.mysql	2001/11/09 04:50:30	1.9
***************
*** 8,19 ****
  For more information on mySQL go to http://www.mysql.org/
  
! 1. If you do not have a suitable database already, create one.
  
  	mysqladmin -uuser -ppassword create phpwiki
  
! 2. If necessary create a user for that database which has the rights to
!    select, insert, update, delete. A mySQL grant statment for this user
!    would look like this:
!     
  	GRANT select, insert, update, delete
  	ON phpwiki.*
--- 8,25 ----
  For more information on mySQL go to http://www.mysql.org/
  
! 1. If you do not have a suitable database already, create one (using
!    the root or other privileged account you set up when mySQL was
!    installed.)
  
  	mysqladmin -uuser -ppassword create phpwiki
  
! 2. If necessary create a user for that database which has the rights
!    to select, insert, update, delete (again using the root
!    administration account).
! 
! 	mysql -uuser -ppassword phpwiki
! 
!    A mySQL grant statement for this user would look like this:
! 
  	GRANT select, insert, update, delete
  	ON phpwiki.*
***************
*** 21,25 ****
  	IDENTIFIED BY 'password';
  
! 3. Create tables inside your database.
  
  	mysql -uuser -ppassword phpwiki <schemas/schema.mysql
--- 27,31 ----
  	IDENTIFIED BY 'password';
  
! 3. Create tables inside your database (still using the root account).
  
  	mysql -uuser -ppassword phpwiki <schemas/schema.mysql
***************
*** 31,43 ****
     error. In that case remove existing tables manually and delete
     the "drop tables" lines from schemas/schema.mysql - it should work now
- 
- 4. Edit index.php to reflect your settings.
  
! 	a) comment out the DBM settings
! 	b) uncomment the mySQL settings
! 	c) set $mysql_user to "wikiuser" as used in step 2
! 	d) set $mysql_pwd to "password" as used in step 2
! 	e) set $mysql_db to "phpwiki" as used in step 1
  
  
  That's it. phpwiki should now work.
--- 37,51 ----
     error. In that case remove existing tables manually and delete
     the "drop tables" lines from schemas/schema.mysql - it should work now
  
! 4. Edit $DBParams in index.php to reflect your settings.
  
+ 	a) $DBParams['dbtype'] should be set to 'SQL'.
+ 	b) $DBParams['dsn'] should be set to something like
+            'mysql://username:password@host/phpwiki'.
+ 	   (where 'phpwiki' is the mysql database name.)
+         c) Note that if you set $DBParams['prefix'] to a 
+            non-empty string, you will have to edit
+            schemas/schema.mysql before you perform step
+            three (above).  (Sorry.)
  
  That's it. phpwiki should now work.

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.6,1.24.2.7

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

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

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
SF patch #479791 by Carsten Klapp:
Improvements to the mysql installation documentation.



Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.6
retrieving revision 1.24.2.7
diff -C2 -r1.24.2.6 -r1.24.2.7
*** config.php	2001/11/08 23:15:43	1.24.2.6
--- config.php	2001/11/09 03:13:00	1.24.2.7
***************
*** 85,88 ****
--- 85,105 ----
     // MySQL settings -- see INSTALL.mysql for details on using MySQL
     } elseif ($WhichDatabase == 'mysql') {
+       // MySQL server host:
+       $mysql_server = 'localhost';
+ 
+       // username as used in step 2 of INSTALL.mysql:
+       $mysql_user = 'wikiuser';
+ 
+       // password of above user (or leave blank if none):
+       $mysql_pwd = '';
+ 
+       // name of the mysql database
+       //  (this used to default to 'wiki' prior to phpwiki-1.2.2)
+       $mysql_db = 'phpwiki';
+ 
+       // Names of the tables.
+       // You probably don't need to change these.  If you do change
+       // them you will also have to make corresponding changes in
+       // schemas/schema.mysql before you initialize the database.
        $WikiPageStore = "wiki";
        $ArchivePageStore = "archive";
***************
*** 90,97 ****
        $WikiScoreStore = "wikiscore";
        $HitCountStore = "hitcount";
!       $mysql_server = 'localhost';
!       $mysql_user = 'root';
!       $mysql_pwd = '';
!       $mysql_db = 'wiki';
        include "lib/mysql.php";
  
--- 107,111 ----
        $WikiScoreStore = "wikiscore";
        $HitCountStore = "hitcount";
! 
        include "lib/mysql.php";
  

[phpwiki-checkins] CVS: phpwiki INSTALL.mysql,1.6,1.6.2.1

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

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

Modified Files:
      Tag: release-1_2-branch
	INSTALL.mysql 
Log Message:
SF patch #479791 by Carsten Klapp:
Improvements to the mysql installation documentation.



Index: INSTALL.mysql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/INSTALL.mysql,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** INSTALL.mysql	2001/01/24 18:36:17	1.6
--- INSTALL.mysql	2001/11/09 03:13:00	1.6.2.1
***************
*** 7,18 ****
  For more information on mySQL go to http://www.mysql.org/
  
! 1. If you do not have a suitable database already, create one.
  
  	mysqladmin -uuser -ppassword create phpwiki
  
! 2. If necessary create a user for that database which has the rights to
!    select, insert, update, delete. A mySQL grant statment for this user
!    would look like this:
!     
  	GRANT select, insert, update, delete
  	ON phpwiki.*
--- 7,24 ----
  For more information on mySQL go to http://www.mysql.org/
  
! 1. If you do not have a suitable database already, create one (using
!    the root or other privileged account you set up when mySQL was
!    installed.)
  
  	mysqladmin -uuser -ppassword create phpwiki
  
! 2. If necessary create a user for that database which has the rights
!    to select, insert, update, delete (again using the root
!    administration account).
! 
! 	mysql -uuser -ppassword phpwiki
! 
!    A mySQL grant statement for this user would look like this:
! 
  	GRANT select, insert, update, delete
  	ON phpwiki.*
***************
*** 20,24 ****
  	IDENTIFIED BY 'password';
  
! 3. Create tables inside your database.
  
  	mysql -uuser -ppassword phpwiki <schemas/schema.mysql
--- 26,30 ----
  	IDENTIFIED BY 'password';
  
! 3. Create tables inside your database (still using the root account).
  
  	mysql -uuser -ppassword phpwiki <schemas/schema.mysql

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.5,1.24.2.6

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

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

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
Fix SF bug #420986: Fix PHP "Warning: Passing locale category name
as string is deprecated...."



Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -C2 -r1.24.2.5 -r1.24.2.6
*** config.php	2001/11/08 22:39:26	1.24.2.5
--- config.php	2001/11/08 23:15:43	1.24.2.6
***************
*** 210,214 ****
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
!       setlocale("LC_ALL", "");
     }
     // end of localization function
--- 210,218 ----
        bindtextdomain ("phpwiki", "./locale");
        textdomain ("phpwiki");
!       if (!defined("LC_ALL")) {
!          // Backwards compatibility (for PHP < 4.0.5)
!          define("LC_ALL", "LC_ALL");
!       }   
!       setlocale(LC_ALL, "");
     }
     // end of localization function

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.24.2.4,1.24.2.5

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

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

Modified Files:
      Tag: release-1_2-branch
	config.php 
Log Message:
Fixes based on SF patch #479769:
Sse https: rather than http: in the autogenerated $ScriptUrl when
mod_ssl is in use.



Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.24.2.4
retrieving revision 1.24.2.5
diff -C2 -r1.24.2.4 -r1.24.2.5
*** config.php	2001/11/07 03:23:20	1.24.2.4
--- config.php	2001/11/08 22:39:26	1.24.2.5
***************
*** 248,255 ****
     //////////////////////////////////////////////////////////////////////
     // you shouldn't have to edit anyting below this line
  
     if (empty($ScriptUrl)) {
!       $port = ($SERVER_PORT == 80) ? '' : ":$SERVER_PORT";
!       $ScriptUrl = "http://$SERVER_NAME$port$SCRIPT_NAME";
     }
     if (defined('WIKI_ADMIN') && !empty($AdminUrl))
--- 248,267 ----
     //////////////////////////////////////////////////////////////////////
     // you shouldn't have to edit anyting below this line
+    function compute_default_scripturl() {
+       global $SERVER_PORT, $SERVER_NAME, $SCRIPT_NAME, $HTTPS;
+       if (!empty($HTTPS) && $HTTPS != 'off') {
+          $proto = 'https';
+          $dflt_port = 443;
+       }
+       else {
+          $proto = 'http';
+          $dflt_port = 80;
+       }
+       $port = ($SERVER_PORT == $dflt_port) ? '' : ":$SERVER_PORT";
+       return $proto . '://' . $SERVER_NAME . $port . $SCRIPT_NAME;
+    }
  
     if (empty($ScriptUrl)) {
!       $ScriptUrl = compute_default_scripturl();
     }
     if (defined('WIKI_ADMIN') && !empty($AdminUrl))

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.21.2.5,1.21.2.6

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

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

Modified Files:
      Tag: release-1_2-branch
	stdlib.php 
Log Message:
Applied SF patch #479753 from Carsten Klapp: Eliminate trailing
commans in the LinkRelatedpages section at the bottom of each page.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21.2.5
retrieving revision 1.21.2.6
diff -C2 -r1.21.2.5 -r1.21.2.6
*** stdlib.php	2001/08/18 01:50:47	1.21.2.5
--- stdlib.php	2001/11/08 22:20:19	1.21.2.6
***************
*** 391,395 ****
           if(isset($links['in'][$i])) {
              list($name, $score) = $links['in'][$i];
! 	    $txt .= LinkExistingWikiWord($name) . " ($score), ";
           }
        }
--- 391,398 ----
           if(isset($links['in'][$i])) {
              list($name, $score) = $links['in'][$i];
!             if($i>0) {
!                $txt .= ", ";
!             }
! 	    $txt .= LinkExistingWikiWord($name) . " ($score)";
           }
        }
***************
*** 402,406 ****
              list($name, $score) = $links['out'][$i];
  	    if(IsWikiPage($dbi, $name))
! 	       $txt .= LinkExistingWikiWord($name) . " ($score), ";
           }
        }
--- 405,412 ----
              list($name, $score) = $links['out'][$i];
  	    if(IsWikiPage($dbi, $name))
!                if($i>0) {
!                   $txt .= ", ";
!                }
! 	       $txt .= LinkExistingWikiWord($name) . " ($score)";
           }
        }
***************
*** 412,416 ****
           if(isset($links['popular'][$i])) {
              list($name, $score) = $links['popular'][$i];
! 	    $txt .= LinkExistingWikiWord($name) . " ($score), ";
           }
        }
--- 418,425 ----
           if(isset($links['popular'][$i])) {
              list($name, $score) = $links['popular'][$i];
!             if($i>0) {
!                $txt .= ", ";
!             }
! 	    $txt .= LinkExistingWikiWord($name) . " ($score)";
           }
        }

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.2,1.3

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

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

Modified Files:
	interwiki.map 
Log Message:
Merge changes from http://usemod.com/intermap.txt


Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** interwiki.map	2001/03/03 19:29:48	1.2
--- interwiki.map	2001/11/08 19:07:43	1.3
***************
*** 15,22 ****
  HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
  Advogato http://www.advogato.org/
! MoinMoin http://www.encrypted.net/~jh/moinmoin/moin.cgi/
! EfnetPythonWiki http://www.encrypted.net/~jh/python-wiki/moin.cgi/
! EfnetCppWiki http://www.encrypted.net/~jh/cpp-wiki/moin.cgi/
! EfnetXmlWiki http://www.encrypted.net/~jh/xml-wiki/moin.cgi/
  PolitizenWiki http://www.politizen.com/wiki.asp?
  DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
--- 15,22 ----
  HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
  Advogato http://www.advogato.org/
! MoinMoin http://purl.net/wiki/moin/
! EfnetPythonWiki http://purl.net/wiki/python/
! EfnetCppWiki http://purl.net/wiki/cpp/
! EfnetXmlWiki http://purl.net/wiki/xml/
  PolitizenWiki http://www.politizen.com/wiki.asp?
  DolphinWiki http://www.object-arts.com/wiki/html/Dolphin/
***************
*** 42,43 ****
--- 42,49 ----
  JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
  WikiPedia http://www.wikipedia.com/wiki.cgi?
+ SeattleWireless http://seattlewireless.net/?
+ Tavi http://tavi.sourceforge.net/index.php?
+ PersonalTelco http://www.personaltelco.net/index.cgi/
+ Google http://www.google.com/search?q=
+ GoogleGroups http://groups.google.com/groups?q=
+ EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?

[phpwiki-checkins] CVS: phpwiki/pgsrc LikePages,1.1,1.2

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

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

Modified Files:
	LikePages 
Log Message:
Update plugin args for latest version.


Index: LikePages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/LikePages,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** LikePages	2001/09/18 19:16:23	1.1
--- LikePages	2001/11/08 19:06:34	1.2
***************
*** 3,6 ****
  See also Wiki:LikePages and MeatBall:LikePages.
  ----
! <?plugin LikePages page ?>
  
--- 3,6 ----
  See also Wiki:LikePages and MeatBall:LikePages.
  ----
! <?plugin LikePages?>
  

[phpwiki-checkins] CVS: phpwiki/templates .htaccess,1.1,1.2

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:00:39	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  order allow,deny
  Deny from all

[phpwiki-checkins] CVS: phpwiki/schemas .htaccess,1.1,1.2

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:00:38	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  order allow,deny
  Deny from all

[phpwiki-checkins] CVS: phpwiki/locale .htaccess,1.1,1.2

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:00:38	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  order allow,deny
  Deny from all

[phpwiki-checkins] CVS: phpwiki/pgsrc .htaccess,1.1,1.2

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:00:38	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  order allow,deny
  Deny from all

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

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:26:08	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  <IfModule mod_php4.c>
    php_flag register_globals off

[phpwiki-checkins] CVS: phpwiki/lib .htaccess,1.1,1.2

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

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

Modified Files:
	.htaccess 
Log Message:
Added RCS $Id$ tags.


Index: .htaccess
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/.htaccess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** .htaccess	2001/11/08 16:00:38	1.1
--- .htaccess	2001/11/08 16:35:05	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ # $Id$
  order allow,deny
  Deny from all

[phpwiki-checkins] CVS: phpwiki .htaccess,NONE,1.1

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

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

Added Files:
	.htaccess 
Log Message:
New file.

For people with (suitably configured) apache servers, this sets some
of PHP's configuration variables to safer values. In particular,
register_globals and allow_url_fopen are turned off.




--- NEW FILE ---
<IfModule mod_php4.c>
  php_flag register_globals off
  php_flag track_vars on

  php_flag allow_url_fopen off
</IfModule>

[phpwiki-checkins] CVS: phpwiki/lib removepage.php,NONE,1.1 main.php,1.14,1.15

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

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

Modified Files:
	main.php 
Added Files:
	removepage.php 
Log Message:
Move admin/removepage.php to lib/removepage.php.

(Removepage.php was the only file in admin/ which was part
of the main phpwiki app.)


***** Error reading new file: [Errno 2] No such file or directory: 'removepage.php'
Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** main.php	2001/09/18 19:16:23	1.14
--- main.php	2001/11/08 16:02:40	1.15
***************
*** 174,178 ****
  
      case 'remove':
!         include 'admin/removepage.php';
          break;
      
--- 174,178 ----
  
      case 'remove':
!         include 'lib/removepage.php';
          break;
      

[phpwiki-checkins] CVS: phpwiki/admin removepage.php,1.6,NONE

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

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

Removed Files:
	removepage.php 
Log Message:
Move admin/removepage.php to lib/removepage.php.

(Removepage.php was the only file in admin/ which was part
of the main phpwiki app.)


--- removepage.php DELETED ---

[phpwiki-checkins] CVS: phpwiki/templates .htaccess,NONE,1.1

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

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

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all

[phpwiki-checkins] CVS: phpwiki/schemas .htaccess,NONE,1.1

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

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

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all

[phpwiki-checkins] CVS: phpwiki/pgsrc .htaccess,NONE,1.1

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

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

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all

[phpwiki-checkins] CVS: phpwiki/lib .htaccess,NONE,1.1

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

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

Added Files:
	.htaccess 
Log Message:
For security add .htaccess files to subdirectories.

For people with (suitably configured) apache web servers, these
will deny direct web access to the files in the subdirectories:
lib, locale, pgsrc, schemas, and templates.



--- NEW FILE ---
order allow,deny
Deny from all