From 55ca4f80753c269cae7d82744d32b4e46b996fe0 Mon Sep 17 00:00:00 2001 From: wainstead Date: Sun, 8 Oct 2000 18:12:14 +0000 Subject: [PATCH] Changed occurances of *php3 to *php. git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@251 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- HISTORY | 1 + INSTALL | 10 +++++----- INSTALL.mSQL | 6 +++--- INSTALL.mysql | 4 ++-- INSTALL.pgsql | 6 +++--- README | 32 ++++++++++++++++---------------- lib/config.php | 6 +++--- lib/display.php | 4 ++-- lib/pageinfo.php | 4 ++-- pgsrc/MoreAboutMechanics | 2 +- pgsrc/TestPage | 4 ++-- templates/README | 8 ++++---- 12 files changed, 44 insertions(+), 43 deletions(-) diff --git a/HISTORY b/HISTORY index d0106aeeb..e312dfacc 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,5 @@ 1.1.8 +* All wiki_* files renamed to lib/*.php * MostPopular works for all implementations, except flat files * Flat file database support; it's not yet complete but the basic Wiki functionality is there, thanks to Ari diff --git a/INSTALL b/INSTALL index 676534ca2..2edb414a2 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ PhpWiki requires PHP version 3.0.9 or greater, since it uses the preg_*() family of functions. Untar/gzip this file into the directory where you want it to live. -That's it. To improve efficiency, edit wiki_config.php3 and set the +That's it. To improve efficiency, edit lib/config.php and set the $ServerAddress by hand; this will save a regexp call on every invocation. bash$ gzip -d phpwiki-X.XX.tar.gz @@ -14,9 +14,9 @@ Let's say you own the web server http://www.foo.com/. You untar in the server's root directory; then you should be able to just go to your new Wiki: -http://www.foo.com/wiki/index.php3 +http://www.foo.com/wiki/index.php -If you configure your server to recognize index.php3 as the index of a +If you configure your server to recognize index.php as the index of a directory, you can just do: http://www.foo.com/wiki/ @@ -32,7 +32,7 @@ live site, archived pages, and some additional information. If you don't want the DBM files to live in /tmp you must make sure the web server can read/write to your chosen location. It's probably a bad idea -to leave it in /tmp. (Again, edit wiki_config.php3). +to leave it in /tmp. (Again, edit lib/config.php). For example, you create a subdirectory called "pages" in the wiki directory made when you untarred PhpWiki. Move the DBM files there. @@ -63,7 +63,7 @@ This is necessary so that the server can also create/set the lock file PhpWiki ships with this featured disabled by default. According to CERT (http://www.cert.org/advisories/CA-2000-02.html) malicious users can embed HTML in your pages that allow pure evil to happen. You can uncomment the -"elseif" in wiki_transform.php3 to allow embedded HTML; but you should never +"elseif" in lib/transform.php to allow embedded HTML; but you should never do this if your Wiki is publically accessible. diff --git a/INSTALL.mSQL b/INSTALL.mSQL index 386f11017..4f2036b0d 100644 --- a/INSTALL.mSQL +++ b/INSTALL.mSQL @@ -36,14 +36,14 @@ Bye! [swain@localhost phpwiki]$ -Now the database is created; edit wiki_config.php3 and comment out the +Now the database is created; edit lib/config.php and comment out the DBM file settings. Uncomment the mSQL settings, making sure the values are correct. That should be all! Try accessing your Wiki now. Read INSTALL and -README for more information, plus the comments in wiki_config.php3. +README for more information, plus the comments in lib/config.php. --Steve Wainstead swain@panix.com -$Id: INSTALL.mSQL,v 1.1 2000-07-15 20:53:00 wainstead Exp $ \ No newline at end of file +$Id: INSTALL.mSQL,v 1.2 2000-10-08 18:12:13 wainstead Exp $ \ No newline at end of file diff --git a/INSTALL.mysql b/INSTALL.mysql index 931d9db44..a7ec216e1 100644 --- a/INSTALL.mysql +++ b/INSTALL.mysql @@ -30,7 +30,7 @@ For more information on mySQL go to http://www.mysql.org/ error. In that case remove existing tables manually and delete the "drop tables" lines from schemas/schema.mysql - it should work now -4. Edit wiki_config.php3 to reflect your settings. +4. Edit lib/config.php to reflect your settings. a) comment out the DBM settings b) uncomment the mySQL settings @@ -48,4 +48,4 @@ the necessary access rights for the phpwiki tables. /Arno ahollosi@iname.com -$Id: INSTALL.mysql,v 1.4 2000-09-21 19:44:31 ahollosi Exp $ +$Id: INSTALL.mysql,v 1.5 2000-10-08 18:12:13 wainstead Exp $ diff --git a/INSTALL.pgsql b/INSTALL.pgsql index 0e0c0e2bf..542072a7c 100644 --- a/INSTALL.pgsql +++ b/INSTALL.pgsql @@ -1,4 +1,4 @@ -$Id: INSTALL.pgsql,v 1.4 2000-07-11 02:57:05 wainstead Exp $ +$Id: INSTALL.pgsql,v 1.5 2000-10-08 18:12:13 wainstead Exp $ These instructions are not quite complete yet. If you find something I missed, please let me know (swain@panix.com). @@ -10,7 +10,7 @@ Installation of Postgresql will not be discussed here... you can get a copy from http://www.postgresql.org/. However if you are running Red Hat Linux, all you need to do is install the PHP RPM and the Postgresql RPM and edit your Apache httpd.conf file, and uncomment -the lines for all PHP files (and add index.php3 to the list of directory +the lines for all PHP files (and add index.php to the list of directory files while you're at it! :-) Also note that Postgresql by default has a hard limit of 8K per @@ -25,7 +25,7 @@ the Wiki. Once that's done and you have the basic stuff done that's listed in the INSTALL, the time comes to move to Postgresql. -Edit wiki_config.php3 and comment out the lines for DBM file usage; then +Edit lib/config.php and comment out the lines for DBM file usage; then uncomment the lines for Postgresql. The lines are clearly commented and you should have no problem with this. diff --git a/README b/README index 6c6c33bae..3471ff666 100644 --- a/README +++ b/README @@ -12,21 +12,21 @@ The out-of-the-box version uses a dbm file in the /tmp directory; you may wish a more permanent place for yours, but make sure it's read/writable by your web server! -index.php3: the "main page", really a set of branching instructions -wiki_config.php3: configuration options, constants, global variables -wiki_dbmlib.php3: database access functions for dbm files -wiki_display.php3: display a page (this calls "wiki_transform.php3") -wiki_editlinks.php3: edit the embedded links of a page -wiki_editpage.php3: edit a page -wiki_fullsearch.php3: full page text search -wiki_mysql.php3: database access functions for mySQL -wiki_pageinfo.php3: gives detailed low-level info on the page structure -wiki_pgsql.php3: database access functions for PostgreSQL -wiki_savepage.php3: save a page to db, thank user -wiki_search.php3: page title search -wiki_setupwiki.php3: load a set of pages from ./pgsrc/ directory -wiki_stdlib.php3: standard library of functions (non-db related) -wiki_transform.php3: convert wiki markup into HTML +index.php: the "main page", really a set of branching instructions +lib/config.php: configuration options, constants, global variables +lib/dbmlib.php: database access functions for dbm files +lib/display.php: display a page (this calls "lib/transform.php") +lib/editlinks.php: edit the embedded links of a page +lib/editpage.php: edit a page +lib/fullsearch.php: full page text search +lib/mysql.php: database access functions for mySQL +lib/pageinfo.php: gives detailed low-level info on the page structure +lib/pgsql.php: database access functions for PostgreSQL +lib/savepage.php: save a page to db, thank user +lib/search.php: page title search +lib/setupwiki.php: load a set of pages from ./pgsrc/ directory +lib/stdlib.php: standard library of functions (non-db related) +lib/transform.php: convert wiki markup into HTML admin/: index.php3: entry point for administration forms @@ -54,4 +54,4 @@ Steve Wainstead swain@wcsb.org http://wcsb.org/~swain/ -$Id: README,v 1.5 2000-07-15 20:56:45 wainstead Exp $ +$Id: README,v 1.6 2000-10-08 18:12:13 wainstead Exp $ diff --git a/lib/config.php b/lib/config.php index 9ab836fc1..3ae597da2 100644 --- a/lib/config.php +++ b/lib/config.php @@ -2,14 +2,14 @@ if (!function_exists('rcs_id')) { function rcs_id($id) { echo "\n"; }; } - rcs_id('$Id: config.php,v 1.1 2000-10-08 17:33:26 wainstead Exp $'); + rcs_id('$Id: config.php,v 1.2 2000-10-08 18:12:14 wainstead Exp $'); /* Constants and settings. Edit the values below for your site. You need two image files, a banner and a signature. The dbm file MUST be writable by the web server or this won't work. If you configure your - server to allow index.php3 as an index file, you + server to allow index.php as an index file, you can just give the URL without the script name. */ @@ -127,7 +127,7 @@ define('WIKI_PGSRC', './pgsrc'); // Default (old) behavior. //define('WIKI_PGSRC', './wiki.zip'); // New style. - $ScriptName = "index.php3"; + $ScriptName = "index.php"; // Template files (filenames are relative to script position) diff --git a/lib/display.php b/lib/display.php index 19deada88..0b50beb69 100644 --- a/lib/display.php +++ b/lib/display.php @@ -1,7 +1,7 @@ - + + Current version

"; - // $dbi = OpenDataBase($WikiPageStore); --- done by index.php3 + // $dbi = OpenDataBase($WikiPageStore); --- done by index.php $html .= ViewPageProps($info, $WikiPageStore); $html .= "

Archived version

"; diff --git a/pgsrc/MoreAboutMechanics b/pgsrc/MoreAboutMechanics index 2a3b1dd2a..bea82288c 100644 --- a/pgsrc/MoreAboutMechanics +++ b/pgsrc/MoreAboutMechanics @@ -2,7 +2,7 @@ PhpWiki is written in the server-side scripting language PHP, available from htt PhpWiki consists of a dozen or so files of mixed PHP and HTML. The web pages that make up a WikiWikiWeb based on PHP live in a DBM file with backup copies of previous versions of pages stored in a second DBM file. -Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php3, which then decides which other php files to include. +Every time a user hits the site the page requested is pulled from the DBM and rendered on the fly. The user only ever requests the file index.php, which then decides which other php files to include. Links to pages in the wiki are automatically linked: PhpWiki. This might be the single most compelling aspect of a wiki, the ability to add pages simply by linking to them. The next most compelling thing is how easily external URL's link: # http://www.wcsb.org/ diff --git a/pgsrc/TestPage b/pgsrc/TestPage index f8ab614b6..5e6f63a79 100644 --- a/pgsrc/TestPage +++ b/pgsrc/TestPage @@ -54,10 +54,10 @@ __Link tests__ # [FrontPage] # Link in brackets: [http://phpwiki.sourceforge.net] # Link outside brackets: http://phpwiki.sourceforge.net/ -# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php3?FrontPage +# Link with Wiki word: http://phpwiki.sourceforge.net/phpwiki/index.php?FrontPage # Two consecutive links: http://phpwiki.sourceforge.net/ http://phpwiki.sourceforge.net/phpwiki/ # [PhpWiki on Sourceforge | http://phpwiki.sourceforge.net/] -# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php3?RecentChanges] +# [URL with a WikiWord | http://phpwiki.sourceforge.net/phpwiki/index.php?RecentChanges] # Javascript: [boo! | javascript:alert('oops') ] # A [[Link] produces a [Link] # A [Link] looks like this: [[link] diff --git a/templates/README b/templates/README index 97c90c5f9..c35bb200f 100644 --- a/templates/README +++ b/templates/README @@ -1,4 +1,4 @@ -$Id: README,v 1.1 2000-06-18 16:05:34 ahollosi Exp $ +$Id: README,v 1.2 2000-10-08 18:12:14 wainstead Exp $ PhpWiki distinguishes between four different templates: @@ -18,8 +18,8 @@ PhpWiki distinguishes between four different templates: displaying error messages. -The location of the template files is defined in wiki_config.php3 -The specification is relative to the index.php3 script. +The location of the template files is defined in lib/config.php +The specification is relative to the index.php script. Template files are regular HTML files, which contain special placeholders. Placeholders are surrounded by '###'. @@ -72,7 +72,7 @@ The following placeholders are not available for the 'MESSAGE' template: Only for EditLinks: ###1###, ###2###, .... Placeholder for references. Up to NUM_LINKS placeholders will be - substituted. NUM_LINKS is defined in wiki_config.php3 + substituted. NUM_LINKS is defined in lib/config.php -- 2.45.0