Menu
▾
▴
tavi-cvs-commit — CVS commit changelogs should be forwarded to this list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(107) |
Feb
(48) |
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
(29) |
Jul
(14) |
Aug
(9) |
Sep
(34) |
Oct
(14) |
Nov
(6) |
Dec
(18) |
| 2004 |
Jan
|
Feb
(4) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(43) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Scott M. <sm...@us...> - 2002-01-04 19:15:08
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv11074/install
Modified Files:
configure.pl
Log Message:
Fix configure script
Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.pl 2002/01/04 15:54:42 1.3
+++ configure.pl 2002/01/04 19:15:05 1.4
@@ -20,7 +20,7 @@
print CONFIG $comment;
print CONFIG "$variable = $value;\n\n";
}
- if($descriptor =~ /^comment/) # Write out just a comment.
+ elsif($descriptor =~ /^comment/) # Write out just a comment.
{
print CONFIG "$comment\n";
}
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:54:45
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv16057/install
Modified Files:
configure.pl create-db.pl
Log Message:
Installation/configuration tweaks
Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.pl 2002/01/03 21:54:26 1.2
+++ configure.pl 2002/01/04 15:54:42 1.3
@@ -1,5 +1,10 @@
#!/usr/bin/perl
+# $Id$
+
+if(!(-t))
+ { die "You must execute this script from the command line.\n"; }
+
# This subroutine prompts the user for a variable's value and writes
# that variable to config.php.
sub do_variable
Index: create-db.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/create-db.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- create-db.pl 2002/01/04 15:11:11 1.2
+++ create-db.pl 2002/01/04 15:54:42 1.3
@@ -2,18 +2,21 @@
# $Id$
+if(!(-t))
+ { die "You must execute this script from the command line.\n"; }
+
# This script is used to create the initial database for WikkiTikkiTavi
# to use for page storage.
if($#ARGV < 2)
{
print "Usage: \n";
- print " ./create-db.pl dbname dbuser dbpassword [table_prefix [dbserver]]\n";
+ print " perl ./create-db.pl dbname dbuser dbpassword [table_prefix [dbserver]]\n";
print "\n";
print "Examples:\n\n";
- print " ./create-db.pl wiki joe passwd\n";
- print " ./create-db.pl project sally pass wiki_ database.example.com\n";
- print " ./create-db.pl common jim key \"\" database.example.com\n";
+ print " perl ./create-db.pl wiki joe passwd\n";
+ print " perl ./create-db.pl project sally pass wiki_ database.example.com\n";
+ print " perl ./create-db.pl common jim key \"\" database.example.com\n";
exit;
}
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:54:45
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv16057
Modified Files:
INSTALL.txt
Log Message:
Installation/configuration tweaks
Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- INSTALL.txt 2002/01/04 15:36:02 1.5
+++ INSTALL.txt 2002/01/04 15:54:42 1.6
@@ -28,14 +28,14 @@
Examples:
- ./create-db.pl wiki joe passwd
- ./create-db.pl project sally pass wiki_ database.example.com
- ./create-db.pl common jim key "" database.example.com
+ perl ./create-db.pl wiki joe passwd
+ perl ./create-db.pl project sally pass wiki_ database.example.com
+ perl ./create-db.pl common jim key "" database.example.com
3. In the install/ directory, run the "configure.pl" script to configure
your wiki:
- ./configure.pl
+ perl ./configure.pl
You will be prompted for such things as the URL to the wiki script,
the name of your wiki, database information, etc.
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:38:57
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv11589/parse
Modified Files:
transforms.php
Log Message:
Fix free-link page name validation
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- transforms.php 2002/01/03 16:33:26 1.18
+++ transforms.php 2002/01/04 15:38:54 1.19
@@ -74,7 +74,7 @@
if($validate)
{
- $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,']+)(\|([-A-Za-z0-9 _+\\/.,']+))?()\\)\\)/e";
+ $ptn = "/\\(\\(([-A-Za-z0-9 _+\\/.,']+)(())()\\)\\)/e";
}
else
{
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:36:05
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv10717
Modified Files:
INSTALL.txt README.txt
Log Message:
Installation instructions
Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- INSTALL.txt 2002/01/04 15:11:11 1.4
+++ INSTALL.txt 2002/01/04 15:36:02 1.5
@@ -54,13 +54,75 @@
You should also create some InterWiki entries. See
http://tavi.sourceforge.net/InterWiki for help.
+5. Advertise your wiki. Feel free to put a link to your wiki on
+ http://tavi.sourceforge.net/TaviSites.
+
Advanced
========
-To be completed...
+ * Virtual Hosts and Wiki Farms
+
+ If you are running a virtual host server, or a wiki farm, you might
+ wish to install 'Tavi a single time, rather than once for each wiki.
+ See http://tavi.sourceforge.net/VirtualHosts for help.
+
+ * Using Templates
+
+ 'Tavi allows you to configure templates to customize your wiki's
+ appearance. To make things easier on yourself if you upgrade 'Tavi
+ in the future, you should *copy* rather than directly edit the default
+ template. See http://tavi.sourceforge.net/CustomizingTemplates for
+ help.
+
+ * URL Rewriting
+
+ With a few simple tricks you can set up your wiki so the pages appear
+ like http://example.com/wiki/PageName. See
+ http://tavi.sourceforge.net/URL+Rewriting for help.
+
+ * Sister Wikis
+
+ 'Tavi allows you to set up *sister wikis*. 'Tavi will recognize pages
+ on sister wikis that have the same names as pages on your wiki. It
+ will display links to the sister wiki pages on your wiki's pages.
+ See http://tavi.sourceforge.net/SisterWiki for help.
+
+ * Automated Upgrades
+
+ 'Tavi's configuration has been re-organized so that upgrades in the
+ future should be nearly effortless. See
+ http://tavi.sourceforge.net/AutomatedUpgrades for help.
+
+ * Enabling Raw HTML
+
+ By default, raw HTML support is disabled in 'Tavi. To enable it,
+ see http://tavi.sourceforge.net/EnablingRawHTML.
+
WikkiTikkiTavi - Upgrading
==========================
-To be completed...
+'Tavi version 0.21 has rearranged its configuration somewhat, to allow for
+more effortless upgrades in the future.
+
+Unfortunately, this means that upgrading from version 0.20 to version 0.21
+will not quite be effortless. Fortunately, no database changes need to be
+made; the only changes are in configuration.
+
+config.php is no longer in the distribution. Instead, you create config.php
+when you install 'Tavi, and it is never overwritten, even if you later upgrade
+to a newer release.
+
+The simplest way to upgrade to 'Tavi 0.21 is to scrap your existing config.php
+and use install/configure.pl to generate a new one for you, as described
+above in "WikkiTikkiTavi - Installation". It will prompt you for all the
+relevant configuration values.
+
+If you have been using a customized template, we recommend that you place
+it in a directory other than template/. This will prevent it from being
+overwritten when you reinstall 'Tavi, or should you choose to upgrade again
+later. (However, you may wish to consider using the new template as a
+starting point for your custom template, as it has been tweaked to be
+compliant with the XHTML-Strict standard.)
+
Index: README.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/README.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- README.txt 2002/01/03 22:06:23 1.3
+++ README.txt 2002/01/04 15:36:02 1.4
@@ -26,7 +26,7 @@
README.txt
-------------
-README.txt is the file you are currently reading. It contiains general
+README.txt is the file you are currently reading. It contains general
information on WikkiTikkiTavi, including how the code is organized and
what is included with it.
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:11:14
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv2443/install
Modified Files:
create-db.pl
Log Message:
Configuration and installation tweaks.
Index: create-db.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/create-db.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- create-db.pl 2002/01/03 21:46:23 1.1
+++ create-db.pl 2002/01/04 15:11:11 1.2
@@ -5,62 +5,86 @@
# This script is used to create the initial database for WikkiTikkiTavi
# to use for page storage.
-if($#ARGV == -1)
+if($#ARGV < 2)
{
- print "Please specify the database name as follows: \n";
- print " ./create_db-0.20.pl dbname [table_prefix]\n";
+ print "Usage: \n";
+ print " ./create-db.pl dbname dbuser dbpassword [table_prefix [dbserver]]\n";
+ print "\n";
+ print "Examples:\n\n";
+ print " ./create-db.pl wiki joe passwd\n";
+ print " ./create-db.pl project sally pass wiki_ database.example.com\n";
+ print " ./create-db.pl common jim key \"\" database.example.com\n";
exit;
}
-print "You will be prompted for your MySQL password. Please enter it.\n";
+$database = $ARGV[0]; # Database name.
+$user = $ARGV[1]; # Database user name.
+$pass = $ARGV[2]; # Database password.
+if($#ARGV > 2) # Table prefix.
+ { $prefix = $ARGV[3]; }
+else
+ { $prefix = ""; }
+if($#ARGV > 3) # Database host.
+ { $dbhost = $ARGV[4]; }
+else
+ { $dbhost = ""; }
-open PIPE, "| mysql -p $ARGV[0]";
+use DBI;
-print PIPE "CREATE TABLE $ARGV[1]" . "links ( ";
-print PIPE " page varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " link varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " count int(10) unsigned DEFAULT '0' NOT NULL, ";
-print PIPE " PRIMARY KEY (page,link) );\n";
+$dbh = DBI->connect("DBI:mysql:$database:$dbhost", $user, $pass)
+ or die "Connecting: $DBI::errstr\n";
-print PIPE "CREATE TABLE $ARGV[1]" . "pages ( ";
-print PIPE " title varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " version int(10) unsigned DEFAULT '1' NOT NULL, ";
-print PIPE " time timestamp(14), ";
-print PIPE " supercede timestamp(14), ";
-print PIPE " mutable set('off','on') DEFAULT 'on' NOT NULL, ";
-print PIPE " username varchar(80), ";
-print PIPE " author varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " comment varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " body text, ";
-print PIPE " PRIMARY KEY (title,version) );\n";
+print "Creating database...\n";
-print PIPE "CREATE TABLE $ARGV[1]" . "rate ( ";
-print PIPE " ip char(20) DEFAULT '' NOT NULL, ";
-print PIPE " time timestamp(14), ";
-print PIPE " viewLimit smallint(5) unsigned, ";
-print PIPE " searchLimit smallint(5) unsigned, ";
-print PIPE " editLimit smallint(5) unsigned, ";
-print PIPE " PRIMARY KEY (ip) );\n";
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "links ( "
+ . "page varchar(80) DEFAULT '' NOT NULL, "
+ . "link varchar(80) DEFAULT '' NOT NULL, "
+ . "count int(10) unsigned DEFAULT '0' NOT NULL, "
+ . "PRIMARY KEY (page, link) )");
+$qid->execute or die "Error creating table\n";
-print PIPE "CREATE TABLE $ARGV[1]" . "interwiki ( ";
-print PIPE " prefix varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " where_defined varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " url varchar(255) DEFAULT '' NOT NULL, ";
-print PIPE " PRIMARY KEY (prefix) );\n";
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "pages ( "
+ . "title varchar(80) DEFAULT '' NOT NULL, "
+ . "version int(10) unsigned DEFAULT '1' NOT NULL, "
+ . "time timestamp(14), "
+ . "supercede timestamp(14), "
+ . "mutable set('off', 'on') DEFAULT 'on' NOT NULL, "
+ . "username varchar(80), "
+ . "author varchar(80) DEFAULT '' NOT NULL, "
+ . "comment varchar(80) DEFAULT '' NOT NULL, "
+ . "body text, "
+ . "PRIMARY KEY (title, version) )");
+$qid->execute or die "Error creating table\n";
-print PIPE "CREATE TABLE $ARGV[1]" . "sisterwiki ( ";
-print PIPE " prefix varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " where_defined varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " url varchar(255) DEFAULT '' NOT NULL, ";
-print PIPE " PRIMARY KEY (prefix) );\n";
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "rate ( "
+ . "ip char(20) DEFAULT '' NOT NULL, "
+ . "time timestamp(14), "
+ . "viewLimit smallint(5) unsigned, "
+ . "searchLimit smallint(5) unsigned, "
+ . "editLimit smallint(5) unsigned, "
+ . "PRIMARY KEY (ip) )");
+$qid->execute or die "Error creating table\n";
-print PIPE "CREATE TABLE $ARGV[1]" . "remote_pages ( ";
-print PIPE " page varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " site varchar(80) DEFAULT '' NOT NULL, ";
-print PIPE " PRIMARY KEY (page, site) );\n";
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "interwiki ( "
+ . "prefix varchar(80) DEFAULT '' NOT NULL, "
+ . "where_defined varchar(80) DEFAULT '' NOT NULL, "
+ . "url varchar(255) DEFAULT '' NOT NULL, "
+ . "PRIMARY KEY (prefix ) )");
+$qid->execute or die "Error creating table\n";
-close PIPE;
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "sisterwiki ( "
+ . "prefix varchar(80) DEFAULT '' NOT NULL, "
+ . "where_defined varchar(80) DEFAULT '' NOT NULL, "
+ . "url varchar(255) DEFAULT '' NOT NULL, "
+ . "PRIMARY KEY (prefix ) )");
+$qid->execute or die "Error creating table\n";
-print "Your tables were created. Next you should edit the wiki script\n";
+$qid = $dbh->prepare("CREATE TABLE " . $prefix . "remote_pages ( "
+ . "page varchar(80) DEFAULT '' NOT NULL, "
+ . "site varchar(80) DEFAULT '' NOT NULL, "
+ . "PRIMARY KEY (page, site) )");
+$qid->execute or die "Error creating table\n";
+
+print "Your tables were created. Next you should run configure.pl\n";
print "to configure your preferences.\n";
|
|
From: Scott M. <sm...@us...> - 2002-01-04 15:11:13
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv2443
Modified Files:
INSTALL.txt
Log Message:
Configuration and installation tweaks.
Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL.txt 2002/01/03 22:19:53 1.3
+++ INSTALL.txt 2002/01/04 15:11:11 1.4
@@ -15,18 +15,22 @@
Its first parameter should be the name of the (already created) MySQL
database where the tables will be created.
- Optionally, you can include a second parameter to specify a prefix to
+ Its second and third parameters are the user name and password to use
+ to access the database.
+
+ Optionally, you can include a fourth parameter to specify a prefix to
be prepended to the table names. If you have access to only one MySQL
database, you can use this feature to install multiple wikis in the same
database.
- Examples:
+ You may also include a fifth parameter to specify the hostname or IP
+ address of the database server, if it is not the local host.
- ./create-db.pl mydatabase
- ./create-db.pl systemdatabase wiki_
+ Examples:
- You will be prompted to enter your MySQL password in order to create
- the tables. Type your password and press [Enter].
+ ./create-db.pl wiki joe passwd
+ ./create-db.pl project sally pass wiki_ database.example.com
+ ./create-db.pl common jim key "" database.example.com
3. In the install/ directory, run the "configure.pl" script to configure
your wiki:
|
|
From: Scott M. <sm...@us...> - 2002-01-04 14:02:06
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv12867
Modified Files:
index.php
Log Message:
Harvest $REMOTE_ADDR.
Index: index.php
===================================================================
RCS file: /cvsroot/tavi/tavi/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- index.php 2002/01/04 13:56:43 1.9
+++ index.php 2002/01/04 14:02:01 1.10
@@ -8,6 +8,7 @@
{
$HTTP_REFERER = $HTTP_SERVER_VARS['HTTP_REFERER'];
$QUERY_STRING = $HTTP_SERVER_VARS['QUERY_STRING'];
+ $REMOTE_ADDR = $HTTP_SERVER_VARS['REMOTE_ADDR'];
$action = $HTTP_GET_VARS['action'];
$page = $HTTP_GET_VARS['page'];
|
|
From: Scott M. <sm...@us...> - 2002-01-04 13:56:46
|
Update of /cvsroot/tavi/tavi In directory usw-pr-cvs1:/tmp/cvs-serv11226 Modified Files: index.php Log Message: Additional HTTP GET parameters. Index: index.php =================================================================== RCS file: /cvsroot/tavi/tavi/index.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- index.php 2002/01/02 21:07:21 1.8 +++ index.php 2002/01/04 13:56:43 1.9 @@ -14,6 +14,8 @@ $ver1 = $HTTP_GET_VARS['ver1']; $ver2 = $HTTP_GET_VARS['ver2']; $find = $HTTP_GET_VARS['find']; + $version = $HTTP_GET_VARS['version']; + $full = $HTTP_GET_VARS['full']; $Preview = $HTTP_POST_VARS['Preview']; $Save = $HTTP_POST_VARS['Save']; |
|
From: Scott M. <sm...@us...> - 2002-01-03 22:19:56
|
Update of /cvsroot/tavi/tavi In directory usw-pr-cvs1:/tmp/cvs-serv11484/tavi Modified Files: INSTALL.txt Log Message: Add example. Index: INSTALL.txt =================================================================== RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- INSTALL.txt 2002/01/03 22:04:23 1.2 +++ INSTALL.txt 2002/01/03 22:19:53 1.3 @@ -6,7 +6,7 @@ (See below, under "WikkiTikkiTavi - Upgrading", if you are upgrading an existing 'Tavi installation.) See http://tavi.sourceforge.net/ for more detailed instructions dealing with virtual hosts, 'Tavi templates, -etc. +URL rewriting, etc. 1. Extract tavi-0.21.tar to the location you wish the script to reside. |
|
From: Scott M. <sm...@us...> - 2002-01-03 22:06:27
|
Update of /cvsroot/tavi/tavi In directory usw-pr-cvs1:/tmp/cvs-serv7307 Modified Files: README.txt Log Message: Grammar Index: README.txt =================================================================== RCS file: /cvsroot/tavi/tavi/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- README.txt 2002/01/03 22:04:23 1.2 +++ README.txt 2002/01/03 22:06:23 1.3 @@ -26,7 +26,7 @@ README.txt ------------- -The README.txt is the file you are currently reading. It contiains general +README.txt is the file you are currently reading. It contiains general information on WikkiTikkiTavi, including how the code is organized and what is included with it. @@ -57,7 +57,7 @@ ChangeLog.txt ------------- -The ChangeLog.txt contains a date history of changes and updates made to +ChangeLog.txt contains a date history of changes and updates made to WikkiTikkiTavi. index.php |
|
From: Scott M. <sm...@us...> - 2002-01-03 22:04:26
|
Update of /cvsroot/tavi/tavi/install In directory usw-pr-cvs1:/tmp/cvs-serv6668/install Modified Files: maint.pl Log Message: More instalaltion tweaks. Index: maint.pl =================================================================== RCS file: /cvsroot/tavi/tavi/install/maint.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- maint.pl 2001/11/17 10:23:20 1.2 +++ maint.pl 2002/01/03 22:04:24 1.3 @@ -6,6 +6,8 @@ # the list of known remote pages. This is used by the TwinPages feature. # Typically, it will be set up as a cron job to run periodically (e.g., # once per week). +# +# See http://tavi.sourceforge.net/SisterWiki for more information. $database = ""; # Database name. $user = ""; # Database use name. |
|
From: Scott M. <sm...@us...> - 2002-01-03 22:04:26
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv6668
Modified Files:
ChangeLog.txt INSTALL.txt README.txt
Log Message:
More instalaltion tweaks.
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ChangeLog.txt 2002/01/03 21:46:22 1.1
+++ ChangeLog.txt 2002/01/03 22:04:23 1.2
@@ -7,6 +7,8 @@
* Changed transclusion behavior so that recursive transclusions beyond
one level are allowed, but circular transclusions are disallowed.
+ * Streamline installation, configuration, and maintenance process
+ by refactoring the configuration scheme.
2002-01-02 Scott Moonen <sm...@an...>
Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- INSTALL.txt 2002/01/03 21:46:22 1.1
+++ INSTALL.txt 2002/01/03 22:04:23 1.2
@@ -3,7 +3,14 @@
WikkiTikkiTavi - Installation
-----------------------------
-1. Run ./create_db-0.20.pl to create your tables:
+(See below, under "WikkiTikkiTavi - Upgrading", if you are upgrading an
+existing 'Tavi installation.) See http://tavi.sourceforge.net/ for
+more detailed instructions dealing with virtual hosts, 'Tavi templates,
+etc.
+
+1. Extract tavi-0.21.tar to the location you wish the script to reside.
+
+2. Run install/create-db.pl to create your tables:
Its first parameter should be the name of the (already created) MySQL
database where the tables will be created.
@@ -15,17 +22,24 @@
Examples:
- ./create_db-0.20.pl mydatabase
- ./create_db-0.20.pl systemdatabase wiki_
+ ./create-db.pl mydatabase
+ ./create-db.pl systemdatabase wiki_
You will be prompted to enter your MySQL password in order to create
the tables. Type your password and press [Enter].
-2. Expand the tavi-0.20.tar archive to your HTML directory.
+3. In the install/ directory, run the "configure.pl" script to configure
+ your wiki:
-3. Edit the config.php script in the base directory to configure the
- wiki.
+ ./configure.pl
+ You will be prompted for such things as the URL to the wiki script,
+ the name of your wiki, database information, etc.
+
+4. Examine the file 'config.php' that was created by the configuration
+ script, to make sure the settings are correct. 'config.php' is located
+ in the base directory of the wiki install.
+
4. Visit your wiki and start creating pages!
Apart from your wiki's home page, you should also create RecentChanges,
@@ -35,4 +49,14 @@
You should also create some InterWiki entries. See
http://tavi.sourceforge.net/InterWiki for help.
+
+Advanced
+========
+
+To be completed...
+
+WikkiTikkiTavi - Upgrading
+==========================
+
+To be completed...
Index: README.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README.txt 2002/01/03 21:46:23 1.1
+++ README.txt 2002/01/03 22:04:23 1.2
@@ -23,41 +23,41 @@
[Information about general setup]
-README
+README.txt
-------------
-The README is the file you are currently reading. It contiains general
+The README.txt is the file you are currently reading. It contiains general
information on WikkiTikkiTavi, including how the code is organized and
what is included with it.
-INSTALL
+INSTALL.txt
-------------
-The INSTALL file contains information and instructions on installing and
+The INSTALL.txt file contains information and instructions on installing and
setting up your own Wiki using the WikkiTikkiTavi WikiEngine.
-LICENSE
+LICENSE.txt
-------------
-The LICENSE file contains a copy of the GNU General Public License,
+The LICENSE.txt file contains a copy of the GNU General Public License,
which WikkiTikkiTavi is licensed under.
-TODO
+TODO.txt
-------------
-The TODO file lists the developers current TODO list.
+The TODO.txt file lists the developers current TODO list.
-NEWS
+NEWS.txt
-------------
-The NEWS file contains important information, news, or events regarding
+The NEWS.txt file contains important information, news, or events regarding
WikkiTikkiTavi. This could include new release information, major new
features, or anything else the developers feel warrants mention.
-ChangeLog
+ChangeLog.txt
-------------
-The ChangeLog contains a date history of changes and updates made to
+The ChangeLog.txt contains a date history of changes and updates made to
WikkiTikkiTavi.
index.php
@@ -69,9 +69,9 @@
config.php
-------------
-The config.php file contains configuration settings for your Wiki. Here
-you set the name of your wiki, as well as numerous options and settings
-for how you want it to operate.
+config.php is not present in the 'Tavi distribution. It is created when
+you install 'Tavi using the install/configure.pl script. It contains
+various vital configuration settings for the wiki.
action/
-------------
|
|
From: Scott M. <sm...@us...> - 2002-01-03 21:54:29
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv3739/install
Modified Files:
configure.pl settings.cnf
Log Message:
Add comment to top of config.php to be generated by configure.pl
Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.pl 2002/01/03 21:46:23 1.1
+++ configure.pl 2002/01/03 21:54:26 1.2
@@ -15,6 +15,10 @@
print CONFIG $comment;
print CONFIG "$variable = $value;\n\n";
}
+ if($descriptor =~ /^comment/) # Write out just a comment.
+ {
+ print CONFIG "$comment\n";
+ }
else # Prompt user for value.
{
system "clear"; # Clear screen.
Index: settings.cnf
===================================================================
RCS file: /cvsroot/tavi/tavi/install/settings.cnf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- settings.cnf 2002/01/03 21:46:23 1.1
+++ settings.cnf 2002/01/03 21:54:26 1.2
@@ -1,4 +1,20 @@
----
+comment
+// config.php
+//
+// This file was generated by the install/configure.pl script based
+// on values entered by the administrator. It contains the most
+// common (and vital) configuration parameters for WikkiTikkiTavi to
+// run.
+//
+// You may edit this file by hand or use configure.pl to generate a
+// new copy.
+//
+// Certain other settings may be configured; look in lib/defaults.php
+// to see them. Rather than changing them in lib/defaults.php, you
+// should copy them from there to here. The settings here will safely
+// over-ride those in lib/defaults.php.
+----
string $Admin ''
Enter the administrator's e-mail address. This address will be printed
in error messages so wiki visitors can contact the administrator if a
|
|
From: Scott M. <sm...@us...> - 2002-01-03 21:46:29
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv1564
Added Files:
ChangeLog.txt INSTALL.txt LICENSE.txt NEWS.txt README.txt
TODO.txt
Removed Files:
ChangeLog INSTALL LICENSE NEWS README TODO config_defaults.php
Log Message:
Big instalability and maintainability changes, renames, moves, etc.
--- NEW FILE: ChangeLog.txt ---
$Id: ChangeLog.txt,v 1.1 2002/01/03 21:46:22 smoonen Exp $
WikkiTikkiTavi - ChangeLog
--------------------------
2002-01-03 Scott Moonen <sm...@an...>
* Changed transclusion behavior so that recursive transclusions beyond
one level are allowed, but circular transclusions are disallowed.
2002-01-02 Scott Moonen <sm...@an...>
* Introduced new option to $SeparateTitleWords in page titles.
* Refactored common code in default template.
* Fixed security hole in template system.
* Tweak macro behavior wrt newlines to better facilitate in-line
macros.
* Applied patch from Kimmo Suominen to accomodate
register_globals=off.
* Implemented HTML anchor macro, [[Anchor name]].
* Implemented anchor reference syntax: PageName#anchor and
((free links))#anchor.
2002-01-01 Scott Moonen <sm...@an...>
* Change raw HTML processing to allow <html> tags to be uppercase.
* Rework templates so parameters are passed as an associative array,
rather than a hard-coded set of parameters. This will allow for
much more flexible extensibility.
2001-12-31 Scott Moonen <sm...@an...>
* Fix rendering of {{ .. }} so that it slurps up braces within
the outer braces. I.e., {{{abc}}} now renders as <tt>{abc}</tt>.
2001-12-28 Scott Moonen <sm...@an...>
* Removed formatting markup to bring 'Tavi from XHTML-Transitional
to XHTML-Strict.
* Moved formatting information to 'template/wiki.css'.
* 'Tavi now validates as XTHML-Strict and CSS compliant (except for
wrap="virtual" attribute on text areas, which I don't think can
be accomplished using CSS).
2001-12-19 Scott Moonen <sm...@an...>
* Thoroughly rework list (indent, bullet, numbered) parsing.
Engine output is now entirely XHTML-Transitional-compliant.
* Add definition lists (syntax is ";term:definition").
* Change $Unicode configuration option to $Charset configuration
option, to allow engine to always emit a character set.
2001-12-18 Scott Moonen <sm...@an...>
* Fix minor formatting glitches in the parse engine.
Code now uses chr(255) to flag elements, rather than '\{n}'.
* Include 'alt=' property on img tags, since this is a required
XHTML attribute. The property's value is set to the basename of
the image's URL.
2001-12-14 Scott Moonen <sm...@an...>
* Implement table syntax in the rendering engine.
* Implement RSS output for syndication.
* Implement time-zone option in user preferences.
2001-12-03 Scott Moonen <sm...@an...>
* Implement a slight variation of Mark Kimes's tweak to display
arbitrary link text for free links. Syntax is:
((page name|appears as this))
* Fix parse_diff_message, which sometimes generated false matches
for the diff pattern.
* Fix html_time so that it returns 'never' for a timestamp that
is empty (i.e., for an unedited page).
* Remove 'document last modified' message from template/history.php,
as the time was never passed to the history template.
2001-11-30 Scott Moonen <sm...@an...>
* Fix bug in validate_page wherein it would fail to recognize some
valid free link page names.
2001-11-29 Christopher Cashell <to...@zy...>
* Replace '<?' with '<?php' in all files.
2001-11-29 Scott Moonen <sm...@an...>
* Fix lack of hash ('#') in colors for diff table cells.
2001-09-10 Scott Moonen <sm...@an...>
* Officially released 0.20, a complete rewrite. A full description of
its new functionality is forthcoming, as time permits.
2001-02-20 Scott Moonen <sm...@an...>
* Squashed a few bugs in preparation for the 0.10 release.
- mailto: links now display with a "mailto:" prefix.
- Race condition when saving pages eliminated.
- Multiple lines of whitespace are folded into one.
- Small glitch in generation of link table fixed.
* Version 0.10 released. See TaviDownload.
2001-02-06 Scott Moonen <sm...@an...>
* Added to version 0.10 code:
- A META tag forbidding search engines to index history,
- old-version, diff, and edit pages.
2001-01-6 Scott Moonen <sm...@an...>
* Completed changes adding sisterwiki, interwiki, and remote_pages
tables to the database schema. The first two define relationships
with external wikis, which are now community-accessible through
SisterWiki and InterWiki statement. The latter table is the list
of known external pages.
* Tweaked URL regex to handle a few extra terminating characters.
* This constitutes at least part of version 0.1. Will release soon.
2001-01-15 Scott Moonen <sm...@an...>
* Version 0.05.
* Added configuration variable $Persistence, which specifies
whether to create a persistent MySQL connection. Default is not
to do so.
2001-01-07 Scott Moonen <sm...@an...>
* Version 0.04.
* Fixed a bug introduced in version 0.03 where a PageWithA/SubPage?
was rendered improperly (whenever the sub-page was itself a valid
page name).
2001-01-04 Scott Moonen <sm...@an...>
* Version 0.03.
* Fixed bug whereby some_text_preceding_a_non_alpha.FollowedByALink?
was rendered improperly.
2000-12-27 Scott Moonen <sm...@an...>
* Version 0.02 released.
--- NEW FILE: INSTALL.txt ---
$Id: INSTALL.txt,v 1.1 2002/01/03 21:46:22 smoonen Exp $
WikkiTikkiTavi - Installation
-----------------------------
1. Run ./create_db-0.20.pl to create your tables:
Its first parameter should be the name of the (already created) MySQL
database where the tables will be created.
Optionally, you can include a second parameter to specify a prefix to
be prepended to the table names. If you have access to only one MySQL
database, you can use this feature to install multiple wikis in the same
database.
Examples:
./create_db-0.20.pl mydatabase
./create_db-0.20.pl systemdatabase wiki_
You will be prompted to enter your MySQL password in order to create
the tables. Type your password and press [Enter].
2. Expand the tavi-0.20.tar archive to your HTML directory.
3. Edit the config.php script in the base directory to configure the
wiki.
4. Visit your wiki and start creating pages!
Apart from your wiki's home page, you should also create RecentChanges,
containing (at minimum) a wildcard subscription list like so:
[[! *]]
You should also create some InterWiki entries. See
http://tavi.sourceforge.net/InterWiki for help.
--- NEW FILE: LICENSE.txt ---
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.
--- NEW FILE: NEWS.txt ---
$Id: NEWS.txt,v 1.1 2002/01/03 21:46:23 smoonen Exp $
WikkiTikkiTavi - News
---------------------
See ChangeLog.
---------------------
2001-11-17 Christopher Cashell <to...@zy...>
WikkiTikkiTavi has had a CVS reorganization, intending to bring it to a
more "normal" state (as defined by common CVS usage conventions).
--- NEW FILE: README.txt ---
$Id: README.txt,v 1.1 2002/01/03 21:46:23 smoonen Exp $
WikkiTikkiTavi - README
-----------------------
Copyright (C) 2000-2001 Scott Moonen and others.
WikkiTikkiTavi is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Comments are welcome.
[Information about general setup]
README
-------------
The README is the file you are currently reading. It contiains general
information on WikkiTikkiTavi, including how the code is organized and
what is included with it.
INSTALL
-------------
The INSTALL file contains information and instructions on installing and
setting up your own Wiki using the WikkiTikkiTavi WikiEngine.
LICENSE
-------------
The LICENSE file contains a copy of the GNU General Public License,
which WikkiTikkiTavi is licensed under.
TODO
-------------
The TODO file lists the developers current TODO list.
NEWS
-------------
The NEWS file contains important information, news, or events regarding
WikkiTikkiTavi. This could include new release information, major new
features, or anything else the developers feel warrants mention.
ChangeLog
-------------
The ChangeLog contains a date history of changes and updates made to
WikkiTikkiTavi.
index.php
-------------
The index.php file is the "default" page loaded when accessing a Wiki
run by WikkiTikkiTavi.
config.php
-------------
The config.php file contains configuration settings for your Wiki. Here
you set the name of your wiki, as well as numerous options and settings
for how you want it to operate.
action/
-------------
admin/
-------------
contrib/
-------------
The contrib/ directory contains scripts, patches, and other add-ons or
extras that are not part of the "official" code base (and thus, not
maintained by us, nor supported by us) but might be useful to you.
Please note that these extras may not work, or may require tweaking on
your part to get them working with the latest releases of
WikkiTikkiTavi.
install/
-------------
The install/ directory contains scripts and utilities to aid with the
installation and setup of the WikkiTikkiTavi engine. You can find a
database creation script, as well as conversion scripts to help you
upgrade your Wiki from an older release of 'Tavi.
lib/
-------------
parse/
-------------
template/
-------------
--- NEW FILE: TODO.txt ---
$Id: TODO.txt,v 1.1 2002/01/03 21:46:23 smoonen Exp $
WikkiTikkiTavi - Todo
---------------------
o Come up with alternate templates for people to play with.
o Meta-categories??
o Macro for search boxes
See also: http://tavi.sourceforge.net/TaviToDo
--- ChangeLog DELETED ---
--- INSTALL DELETED ---
--- LICENSE DELETED ---
--- NEWS DELETED ---
--- README DELETED ---
--- TODO DELETED ---
--- config_defaults.php DELETED ---
|
|
From: Scott M. <sm...@us...> - 2002-01-03 21:46:29
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv1564/lib
Modified Files:
init.php
Added Files:
defaults.php url.php
Log Message:
Big instalability and maintainability changes, renames, moves, etc.
--- NEW FILE: defaults.php ---
<?php
// $Id: defaults.php,v 1.1 2002/01/03 21:46:23 smoonen Exp $
//**********************************************************************
// DO NOT EDIT THIS FILE.
//
// This file contains configuration defaults for 'Tavi that are over-
// written on installation. Instead, you should edit 'config.php' to
// re-set these options, or use the 'configure.pl' script to create a
// 'config.php' for yourself.
//
// If you see options in here that are not present in 'config.php',
// you can safely copy them to 'config.php' and set them to a new
// value. This will override the default set here.
//**********************************************************************
// The following variables establish the format for WikiNames in this wiki.
// Note that changing this might require a change to parse/transforms.php so
// that parse_wikiname knows how many parentheses are included in $LinkPtn.
$UpperPtn = "[A-Z\xc0-\xde]";
$LowerPtn = "[a-z\xdf-\xff]";
$AlphaPtn = "[A-Za-z\xc0-\xff]";
$LinkPtn = $UpperPtn . $AlphaPtn . '*' . $LowerPtn . '+' .
$UpperPtn . $AlphaPtn . '*(\\/' . $UpperPtn . $AlphaPtn . '*)?';
// $UrlPtn establishes the format for URLs in this wiki.
// Note that changing this requires a change to parse/transforms.php so
// that parse_hyperlinkxxx know how many parentheses are included in $UrlPtn.
$UrlPtn = "(http:|mailto:|https:|ftp:|gopher:|news:)" .
"([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~]";
// $InterWikiPtn establishes the format for InterWiki links in this wiki.
// Note that changing this requires a change to parse/transforms.php so
// that parse_interwiki knows how many parentheses are in $InterwikiPtn.
$InterwikiPtn = "([A-Za-z0-9]+):" .
"(([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])";
// !!!WARNING!!!
// If $AdminEnabled is set to 1, the script admin/index.php will be accessible.
// This allows administrators to lock pages and block IP addresses. If you
// want to use this feature, YOU SHOULD FIRST BLOCK ACCESS TO THE admin/
// DIRECTORY BY OTHER MEANS, such as Apache's authorization directives.
// If you do not do so, any visitor to your wiki will be able to lock pages
// and block others from accessing the wiki.
// If $AdminEnabled is set to 0, administrator control will be disallowed.
$AdminEnabled = 0;
// Old versions of pages will be deleted after $ExpireLen days. If $ExpireLen
// is set to 0, old versions of pages (and pages set to empty) will never
// be removed from the database.
$ExpireLen = 14;
// Set $Charset to indicate the character set used for storage, editing,
// and display in your wiki. The default is "ISO-8859-1" (Latin-1).
// "utf-8" is supported, and is recommended for international text;
// however you should be cautioned that Netscape does not behave correctly
// when editing utf-8 text. Hence, "utf-8" is not currently the default.
$Charset = 'ISO-8859-1';
// $SeparateTitleWords determines whether spaces should be inserted in page
// titles. If nonzero, the page title (but not header) of WikiName would
// show 'Wiki Name' instead. Pages that have free link titles will not
// be changed.
$SeparateTitleWords = 1;
// $CookieName determines the name of the cookie that browser preferences
// (like user name, etc.) are stored in.
$CookieName = 'prefs';
// $EditRows and $EditCols determine the default dimensions of the wiki edit
// box for users that have not set their preferences.
$EditRows = 20;
$EditCols = 65;
// Initialize the default user name to empty.
$UserName = '';
// Default time zone offset (in minutes) for visitors who haven't yet set their
// preferences.
$TimeZoneOff = 0;
// $AuthorDiff indicates whether history pages should show a diff for the last
// edit (zero), or for all edits made by the same author (not zero). The
// default here is used if the user has not set their preferences.
$AuthorDiff = 1;
// $DayLimit determines how many days worth of changes show in a category list.
// This default is used if the user has not set their preferences.
$DayLimit = 14;
// $MinEntries determines the absolute minimum size of a category list (unless
// there are fewer pages *in* the category). This default is used if the
// user has not set their preferences.
$MinEntries = 20;
// $HistMax determines the maximum number of entries on a page's history list.
// This default is used if the user has not set their preferences.
$HistMax = 8;
// $RatePeriod determines how many seconds of time to record a visitor's access
// to the site. If it is set to zero, ALL RATE CHECKING AND IP ADDRESS
// BLOCKING WILL BE DISABLED.
$RatePeriod = 300;
// $RateView determines how many pages a visitor can view in $RatePeriod
// amount of time.
$RateView = 100;
// $RateSearch determines how many processor-intensive operations (search,
// diff, etc.) a visitor can perform in $RatePeriod amount of time.
$RateSearch = 50;
// $RateEdit determines how many edits a visitor can make in $RatePeriod
// amount of time.
$RateEdit = 20;
// $TempDir determines the location of temp files used for computing diffs.
$TempDir = '/tmp';
// $DiffCmd determines what command to run to compute diffs.
$DiffCmd = '/usr/bin/diff';
// $MaxPostLen determines the size, in bytes, of the largest edit allowed.
$MaxPostLen = 204800;
// $MaxNesting determines the maximum allowed nesting of lists.
$MaxNesting = 20;
// $MaxHeading determines the maximum allowed heading level in headings.
$MaxHeading = 6;
// $ParseEngine indicates what parsing rules will be run when displaying a
// wiki page. To disable a particular rule, you can place a comment at the
// beginning of its line. The order of this list is important.
// Note that free links and wiki names are disabled above, using config
// variables. This is because wiki names are parsed in other places than
// just the wiki page.
// Raw HTML parsing is turned off by default, since this is a potential
// security hole.
$ParseEngine = array(
'parse_elem_flag',
// 'parse_raw_html',
'parse_htmlisms',
'parse_code',
'parse_nowiki',
'parse_hyperlink_ref',
'parse_hyperlink_description',
'parse_hyperlink',
'parse_macros',
'parse_transclude',
'parse_freelink',
'parse_interwiki',
'parse_wikiname',
'parse_bold',
'parse_italic',
'parse_teletype',
'parse_heading',
'parse_table',
'parse_horiz',
'parse_indents',
'parse_newline',
'parse_elements'
);
// $DiffEngine indicates what parsing rules will be run to display differences
// between versions. This should be a shorter list than $ParseEngine,
// since we just want minimal things like bold and italic and wiki links.
$DiffEngine = array(
'parse_elem_flag',
'parse_diff_skip',
'parse_diff_message',
'parse_diff_color',
'parse_htmlisms',
'parse_nowiki',
'parse_hyperlink_ref',
'parse_hyperlink_description',
'parse_hyperlink',
'parse_freelink',
'parse_interwiki',
'parse_wikiname',
'parse_bold',
'parse_italic',
'parse_teletype',
'parse_newline',
'parse_elements'
);
// $DisplayEngine indicates what functions will be used to translate wiki
// markup elements into actual HTML. See parse/html.php
$DisplayEngine = array(
'bold_start' => 'html_bold_start',
'bold_end' => 'html_bold_end',
'italic_start' => 'html_italic_start',
'italic_end' => 'html_italic_end',
'tt_start' => 'html_tt_start',
'tt_end' => 'html_tt_end',
'head_start' => 'html_head_start',
'head_end' => 'html_head_end',
'newline' => 'html_newline',
'ref' => 'html_ref',
'url' => 'html_url',
'interwiki' => 'html_interwiki',
'raw' => 'html_raw',
'code' => 'html_code',
'hr' => 'html_hr',
'nowiki' => 'html_nowiki',
'anchor' => 'html_anchor',
'bullet_list_start' => 'html_ul_start',
'bullet_list_end' => 'html_ul_end',
'bullet_item_start' => 'html_li_start',
'bullet_item_end' => 'html_li_end',
'indent_list_start' => 'html_dl_start',
'indent_list_end' => 'html_dl_end',
'indent_item_start' => 'html_dd_start',
'indent_item_end' => 'html_dd_end',
'term_item_start' => 'html_dt_start',
'term_item_end' => 'html_dt_end',
'numbered_list_start' => 'html_ol_start',
'numbered_list_end' => 'html_ol_end',
'numbered_item_start' => 'html_li_start',
'numbered_item_end' => 'html_li_end',
'diff_old_start' => 'html_diff_old_start',
'diff_old_end' => 'html_diff_end',
'diff_new_start' => 'html_diff_new_start',
'diff_new_end' => 'html_diff_end',
'diff_change' => 'html_diff_change',
'diff_add' => 'html_diff_add',
'diff_delete' => 'html_diff_delete'
);
// $ViewMacroEngine determines what macro names will be processed when
// displaying a page. For each name, a function must be provided.
// See parse/macros.php
$ViewMacroEngine = array(
'!' => 'view_macro_category',
'Anchor' => 'view_macro_anchor',
'PageSize' => 'view_macro_pagesize',
'LinkTable' => 'view_macro_linktab',
'OrphanedPages' => 'view_macro_orphans',
'WantedPages' => 'view_macro_wanted',
'PageLinks' => 'view_macro_outlinks',
'PageRefs' => 'view_macro_refs'
);
// $SaveMacroEngine determines what save macros will be called after a
// page is saved. See parse/save.php
$SaveMacroEngine = array(
'parse_define_interwiki',
'parse_define_sisterwiki',
'parse_define_links'
);
?>
--- NEW FILE: url.php ---
<?php
// Users may redefine these functions if they wish to change the
// URL scheme, e.g., to enable links like:
//
// http://somewiki.org/PageName
//
// The new versions of the relevant functions should be defined in
// config.php. Those functions that are redefined will not be
// redefined here.
$ViewBase = $ScriptBase . '?page=';
$EditBase = $ScriptBase . '?action=edit&page=';
$HistoryBase = $ScriptBase . '?action=history&page=';
$FindScript = $ScriptBase . '?action=find';
$FindBase = $FindScript . '&find=';
$SaveBase = $ScriptBase . '?action=save&page=';
$DiffScript = $ScriptBase . '?action=diff';
$PrefsScript = $ScriptBase . '?action=prefs';
if(!function_exists('viewURL'))
{
function viewURL($page, $version = '', $full = '')
{
global $ViewBase;
return $ViewBase . urlencode($page) .
($version == '' ? '' : "&version=$version") .
($full == '' ? '' : '&full=1');
}
}
if(!function_exists('editURL'))
{
function editURL($page, $version = '')
{
global $EditBase;
return $EditBase . urlencode($page) .
($version == '' ? '' : "&version=$version");
}
}
if(!function_exists('historyURL'))
{
function historyURL($page, $full = '')
{
global $HistoryBase;
return $HistoryBase . urlencode($page) .
($full == '' ? '' : '&full=1');
}
}
if(!function_exists('findURL'))
{
function findURL($page)
{
global $FindBase;
return $FindBase . urlencode($page);
}
}
if(!function_exists('saveURL'))
{
function saveURL($page)
{
global $SaveBase;
return $SaveBase . urlencode($page);
}
}
?>
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- init.php 2002/01/03 19:07:07 1.7
+++ init.php 2002/01/03 21:46:23 1.8
@@ -3,8 +3,9 @@
// General initialization code.
-require('config_defaults.php');
+require('lib/defaults.php');
require('config.php');
+require('lib/url.php');
require('lib/messages.php');
require('lib/pagestore.php');
require('lib/rate.php');
|
|
From: Scott M. <sm...@us...> - 2002-01-03 21:46:29
|
Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv1564/install
Added Files:
configure.pl create-db.pl settings.cnf
Removed Files:
create_db-0.20.pl upgrade0.10-0.20.pl
Log Message:
Big instalability and maintainability changes, renames, moves, etc.
--- NEW FILE: configure.pl ---
#!/usr/bin/perl
# This subroutine prompts the user for a variable's value and writes
# that variable to config.php.
sub do_variable
{
my ($descriptor, $prompt, $comment) = @_;
my ($variable, $value);
if($descriptor =~ /^noprompt/) # Write out value without question.
{
$descriptor =~ /(\S+)\s+(\S+)\s+(.+)/;
$variable = $2;
$value = $3;
print CONFIG $comment;
print CONFIG "$variable = $value;\n\n";
}
else # Prompt user for value.
{
system "clear"; # Clear screen.
print "$prompt\n";
if($descriptor =~ /^string/)
{
print 'Enter value: ';
$value = <STDIN>;
chop $value;
$value = "'" . $value . "'";
}
elsif($descriptor =~ /^boolean/)
{
if($descriptor =~ /0\s*$/) # Default is off.
{
print 'Enter setting (y/N): ';
$value = <STDIN>;
chop $value;
if($value =~ /[Yy]/) # Value is on.
{ $value = 1; }
else
{ $value = 0; }
}
else
{
print 'Enter setting (Y/n): ';
$value = <STDIN>;
chop $value;
if($value =~ /[Nn]/) # Value is off.
{ $value = 0; }
else
{ $value = 1; }
}
}
$descriptor =~ /(\S+)\s+(\S+)\s+(.+)/;
$variable = $2;
print CONFIG $comment;
print CONFIG "$variable = $value;\n\n";
}
}
if(!(open SETTINGS , "settings.cnf"))
{ die "Error opening settings.cnf!\n"; }
if(!(open CONFIG , ">../config.php"))
{ die "Error opening config.php for writing!\n"; }
print CONFIG "<?php\n\n";
$descriptor = '';
while(<SETTINGS>)
{
if(/^----$/) # New variable.
{
if($descriptor ne '')
{ do_variable($descriptor, $prompt, $comment); }
$descriptor = <SETTINGS>; # Read descriptor.
$prompt = '';
$comment = '';
}
elsif(/^\/\//) # Comment for variablle.
{ $comment = $comment . $_; }
else # Prompt for variable.
{ $prompt = $prompt . $_; }
}
if($descriptor ne '')
{ do_variable($descriptor, $prompt, $comment); }
print CONFIG "?>";
close SETTINGS;
close CONFIG;
print "\n\nconfig.php has been written. Please examine it to verify\n";
print "it is accurate.\n";
--- NEW FILE: create-db.pl ---
#!/usr/bin/perl
# $Id: create-db.pl,v 1.1 2002/01/03 21:46:23 smoonen Exp $
# This script is used to create the initial database for WikkiTikkiTavi
# to use for page storage.
if($#ARGV == -1)
{
print "Please specify the database name as follows: \n";
print " ./create_db-0.20.pl dbname [table_prefix]\n";
exit;
}
print "You will be prompted for your MySQL password. Please enter it.\n";
open PIPE, "| mysql -p $ARGV[0]";
print PIPE "CREATE TABLE $ARGV[1]" . "links ( ";
print PIPE " page varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " link varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " count int(10) unsigned DEFAULT '0' NOT NULL, ";
print PIPE " PRIMARY KEY (page,link) );\n";
print PIPE "CREATE TABLE $ARGV[1]" . "pages ( ";
print PIPE " title varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " version int(10) unsigned DEFAULT '1' NOT NULL, ";
print PIPE " time timestamp(14), ";
print PIPE " supercede timestamp(14), ";
print PIPE " mutable set('off','on') DEFAULT 'on' NOT NULL, ";
print PIPE " username varchar(80), ";
print PIPE " author varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " comment varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " body text, ";
print PIPE " PRIMARY KEY (title,version) );\n";
print PIPE "CREATE TABLE $ARGV[1]" . "rate ( ";
print PIPE " ip char(20) DEFAULT '' NOT NULL, ";
print PIPE " time timestamp(14), ";
print PIPE " viewLimit smallint(5) unsigned, ";
print PIPE " searchLimit smallint(5) unsigned, ";
print PIPE " editLimit smallint(5) unsigned, ";
print PIPE " PRIMARY KEY (ip) );\n";
print PIPE "CREATE TABLE $ARGV[1]" . "interwiki ( ";
print PIPE " prefix varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " where_defined varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " url varchar(255) DEFAULT '' NOT NULL, ";
print PIPE " PRIMARY KEY (prefix) );\n";
print PIPE "CREATE TABLE $ARGV[1]" . "sisterwiki ( ";
print PIPE " prefix varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " where_defined varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " url varchar(255) DEFAULT '' NOT NULL, ";
print PIPE " PRIMARY KEY (prefix) );\n";
print PIPE "CREATE TABLE $ARGV[1]" . "remote_pages ( ";
print PIPE " page varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " site varchar(80) DEFAULT '' NOT NULL, ";
print PIPE " PRIMARY KEY (page, site) );\n";
close PIPE;
print "Your tables were created. Next you should edit the wiki script\n";
print "to configure your preferences.\n";
--- NEW FILE: settings.cnf ---
----
string $Admin ''
Enter the administrator's e-mail address. This address will be printed
in error messages so wiki visitors can contact the administrator if a
problem occurs.
// $Admin specifies the administrator e-mail address used in error messages.
----
boolean $DBPersist 0
Should persistent database connections be used? Not all hosting providers
allow persistent connections, so you should check before you turn this on.
// If $DBPersist is not 0, persistent database connections will be used.
// Note that this is not supported by all hosting providers.
----
string $DBServer ''
Enter the host name or IP address of your database server. If it is the
local host, you may leave it blank.
// $DBServer indicates the hostname of the database server. It may be
// set to '' for the local host.
----
string $DBName ''
Enter the name of the database to be used by the wiki.
// $DBName indicates the name of the database that the wiki should use.
----
string $DBUser ''
Enter the name of the database user.
// $DBUser indicates the name of the database user.
----
string $DBPasswd ''
Enter the password for database access.
// $DBPasswd indicates the password to use for database access.
----
string $DBTablePrefix ''
Some hosting providers only allow you to have a single database. In order
to run multiple wikis in a single database, you have to make sure their
table names don't conflict.
'Tavi allows you to specify a 'table prefix' to be prepended to the table
names for each wiki. For example, one wiki's prefix might be 'project_',
while another's might be 'personal_'.
Enter the table prefix you wish to use for this wiki. You may leave it
blank for no prefix.
// $DBTablePrefix is used to start table names for the wiki's tables. If your
// hosting provider only allows you one database, you can set up multiple
// wikis in the same database by creating tables that have different prefixes.
----
string $WikiName ''
Enter the name of your wiki. This will appear in the browser title bar.
Typically, it is a WikiName, such as AcmeProjectWiki.
// $WikiName determines the name of your wiki. This name is used in the
// browser title bar. Often, it will be the same as $HomePage.
----
string $HomePage ''
Enter the 'home page' of your wiki. This is the wiki page that is the
default page if no page name is given. It is almost always a WikiName,
such as AcmeProjectWiki. Usually, it is the same as your wiki name.
// $HomePage determines the "main" page of your wiki. If browsers do not ask
// to see a specific page they will be shown the home page. This should be
// a wiki page name, like 'AcmeProjectWiki'.
----
string $InterWikiPrefix ''
Enter the inter-wiki prefix for your wiki. This is the prefix that you
suggest other wikis use when they link to your wiki. For example, an
inter-wiki prefix of 'AcmeProject' will yield inter-wiki links of the
form AcmeProject:WidgetBrainstorming.
Typically the inter-wiki prefix is a variation of your wiki name.
// $InterWikiPrefix determines what interwiki prefix you recommend other
// wikis use to link to your wiki. Usually it is similar to your WikiName.
----
boolean $EnableFreeLinks 1
Would you like free links to be enabled on your wiki? Free links are links
of the form '((my page))', and allow you to escape the confines of the
traditional WikiName syntax.
// If $EnableFreeLinks is set to 1, links of the form "((page name))" will be
// turned on for this wiki. If it is set to 0, they will be disallowed.
----
boolean $EnableWikiLinks 1
Would you like traditional wiki links to be enabled on your wiki?
Traditional links are of the form 'WikiName'. It is recommended that
you leave traditional wiki links enabled on your wiki.
Note that you should enable free links if you wish to disable traditional
links. If you disable both, then users will not be able to create links
of any form to other pages on your wiki.
// If $EnableWikiLinks is set to 1, normal WikiNames will be treated as links
// in this wiki. If it is set to 0, they will not be treated as links
// (in which case you should be careful to enable free links!).
----
string $ScriptBase ''
Enter the fully-qualified URL for the wiki script you have installed.
For example, you might enter 'http://example.com/wiki/index.php'.
// $ScriptBase determines the location of your wiki script. It should indicate
// the full URL of the main index.php script itself.
----
string $AdminBase ''
Enter the fully-qualified URL for the administration script for this wiki.
For example, if the wiki script itself is located at the URL
'http://example.com/wiki/index.php', then your admin script will be
located at 'http://example.com/wiki/admin/index.php'.
// $AdminScript indicates the location of your admin wiki script. It should
// indicate the full URL of the admin/index.php script itself.
----
string $WikiLogo ''
Enter the URL for your wiki's logo.
For example, this might be 'http://example.com/logo.png', or it might be
'/images/jpeg/wiki.jpg'.
// $WikiLogo determines the location of your wiki logo.
----
string $MetaKeywords ''
Enter a list of keywords that describe your wiki, separated by spaces.
These keywords will be reported in a <meta> tag to aid search engines that
index your wiki.
For example, you might choose 'acme project widgets wiki development'.
// $MetaKeywords indicates what keywords to report on the meta-keywords tag.
// This is useful to aid search engines in indexing your wiki.
----
string $MetaDescription ''
Enter a sentence or two that describes your wiki. This will be reported
in a <meta> tag to aid search engines that index your wiki.
For example, you might choose 'Wiki discussion site for the development
and production of the ACME Widget project.'
// $MetaDescription should be a sentence or two describing your wiki. This
// is useful to aid search engines in indexing your wiki.
----
noprompt $TemplateDir 'template'
// $TemplateDir indicates what directory your wiki templates are located in.
// You may use this to install other templates than the default template.
----
noprompt $StyleSheet dirname($ScriptBase) . '/' . $TemplateDir . '/wiki.css'
// $StyleSheet contains the URL for your wiki's CSS style sheet. It is
// typically a relative URL, such as '/wiki/wiki.css'.
--- create_db-0.20.pl DELETED ---
--- upgrade0.10-0.20.pl DELETED ---
|
|
From: Scott M. <sm...@us...> - 2002-01-03 19:07:10
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20825/lib
Modified Files:
init.php
Log Message:
Rename config.php -> config_defaults.php
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- init.php 2001/12/19 16:16:13 1.6
+++ init.php 2002/01/03 19:07:07 1.7
@@ -3,6 +3,7 @@
// General initialization code.
+require('config_defaults.php');
require('config.php');
require('lib/messages.php');
require('lib/pagestore.php');
|
|
From: Scott M. <sm...@us...> - 2002-01-03 19:07:10
|
Update of /cvsroot/tavi/tavi In directory usw-pr-cvs1:/tmp/cvs-serv20825 Added Files: config_defaults.php Removed Files: config.php Log Message: Rename config.php -> config_defaults.php --- NEW FILE: config_defaults.php --- <?php // $Id: config_defaults.php,v 1.1 2002/01/03 19:07:07 smoonen Exp $ // $Admin specifies the administrator e-mail address used in error messages. $Admin = 'us...@ho...'; // If $DBPersist is not set to 0, then *persistent* database connections will // be used. Note that this will not work with all hosting providers. $DBPersist = 1; // $DBServer indicates the hostname of the server on which your database is // located. Normally this is the same host as the script is on, in which // case set it to ''. $DBServer = ''; // $DBName indicates what database name the wiki should use. $DBName = ''; // $DBUser indicates the username for database operations. $DBUser = ''; // $DBPasswd indicates the pasword to use for database access. $DBPasswd = ''; // $DBTablePrefix is used to start table names for the wiki's tables. If your // hosting provider only allows you one database, you can set up multiple // wikis in the same database by creating tables that have different prefixes. $DBTablePrefix = ''; // $ScriptBase determines the location of your wiki script. It should indicate // the full URL of the main index.php script itself. $ScriptBase = 'http://host.net/wiki/index.php'; // $AdminScript indicates the location of your admin wiki script. It should // indicate the full URL of the admin/index.php script itself. $AdminScript = 'http://host.net/wiki/admin/index.php'; // $WikiName determines the name of your wiki. This name is used in the // browser title bar. Often, it will be the same as $HomePage. $WikiName = 'MyWiki'; // $HomePage determines the "main" page of your wiki. If browsers do not ask // to see a specific page they will be shown the home page. This should be // a wiki page name, like 'ProjectWiki'. $HomePage = 'MyWiki'; // $InterWikiPrefix determines what interwiki prefix you recommend other // wikis use to link to your wiki. Usually it is similar to your WikiName. $InterWikiPrefix = 'MyWiki'; // If $EnableFreeLinks is set to 1, links of the form "((page name))" will be // turned on for this wiki. If it is set to 0, they will be disallowed. $EnableFreeLinks = 1; // If $EnableWikiLinks is set to 1, normal WikiNames will be treated as links // in this wiki. If it is set to 0, they will not be treated as links // (forcing all pages to be linked to using free links). $EnableWikiLinks = 1; // $WikiLogo determines the location of your wiki logo. If you use a template // other than the default wiki template, you may have to set other variables // to configure it. $WikiLogo = '/images/logo.png'; // $MetaKeywords indicates what keywords to report on the meta-keywords tag. // This is useful to indicate to help search engines find your wiki. $MetaKeywords = 'me project wiki experiment doodle'; // $MetaDescription should be a sentence or two describing your wiki. Like // $MetaKeywords, it helps search engines find your wiki. $MetaDescription = 'Wiki devoted to my project.'; // $TemplateDir indicates what directory your wiki templates are located in. // You may use this to install other templates than the default template. $TemplateDir = 'template'; // $StyleSheet contains the URL for your wiki's CSS style sheet. It is // typically a relative URL, such as '/wiki/wiki.css'. $StyleSheet = $TemplateDir . '/wiki.css'; // The following variables establish the format for WikiNames in this wiki. // Note that changing this might require a change to parse/transforms.php so // that parse_wikiname knows how many parentheses are included in $LinkPtn. $UpperPtn = "[A-Z\xc0-\xde]"; $LowerPtn = "[a-z\xdf-\xff]"; $AlphaPtn = "[A-Za-z\xc0-\xff]"; $LinkPtn = $UpperPtn . $AlphaPtn . '*' . $LowerPtn . '+' . $UpperPtn . $AlphaPtn . '*(\\/' . $UpperPtn . $AlphaPtn . '*)?'; // $UrlPtn establishes the format for URLs in this wiki. // Note that changing this requires a change to parse/transforms.php so // that parse_hyperlinkxxx know how many parentheses are included in $UrlPtn. $UrlPtn = "(http:|mailto:|https:|ftp:|gopher:|news:)" . "([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~]"; // $InterWikiPtn establishes the format for InterWiki links in this wiki. // Note that changing this requires a change to parse/transforms.php so // that parse_interwiki knows how many parentheses are in $InterwikiPtn. $InterwikiPtn = "([A-Za-z0-9]+):" . "(([^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])"; // !!!WARNING!!! // If $AdminEnabled is set to 1, the script admin/index.php will be accessible. // This allows administrators to lock pages and block IP addresses. If you // want to use this feature, YOU SHOULD FIRST BLOCK ACCESS TO THE admin/ // DIRECTORY BY OTHER MEANS, such as Apache's authorization directives. // If you do not do so, any visitor to your wiki will be able to lock pages // and block others from accessing the wiki. // If $AdminEnabled is set to 0, administrator control will be disallowed. $AdminEnabled = 0; // Old versions of pages will be deleted after $ExpireLen days. If $ExpireLen // is set to 0, old versions of pages (and pages set to empty) will never // be removed from the database. $ExpireLen = 14; // Set $Charset to indicate the character set used for storage, editing, // and display in your wiki. The default is "ISO-8859-1" (Latin-1). // "utf-8" is supported, and is recommended for international text; // however you should be cautioned that Netscape does not behave correctly // when editing utf-8 text. Hence, "utf-8" is not currently the default. $Charset = 'ISO-8859-1'; // $SeparateTitleWords determines whether spaces should be inserted in page // titles. If nonzero, the page title (but not header) of WikiName would // show 'Wiki Name' instead. Pages that have free link titles will not // be changed. $SeparateTitleWords = 1; // $CookieName determines the name of the cookie that browser preferences // (like user name, etc.) are stored in. $CookieName = 'prefs'; // $EditRows and $EditCols determine the default dimensions of the wiki edit // box for users that have not set their preferences. $EditRows = 20; $EditCols = 65; // Initialize the default user name to empty. $UserName = ''; // Default time zone offset (in minutes) for visitors who haven't yet set their // preferences. $TimeZoneOff = 0; // $AuthorDiff indicates whether history pages should show a diff for the last // edit (zero), or for all edits made by the same author (not zero). The // default here is used if the user has not set their preferences. $AuthorDiff = 1; // $DayLimit determines how many days worth of changes show in a category list. // This default is used if the user has not set their preferences. $DayLimit = 14; // $MinEntries determines the absolute minimum size of a category list (unless // there are fewer pages *in* the category). This default is used if the // user has not set their preferences. $MinEntries = 20; // $HistMax determines the maximum number of entries on a page's history list. // This default is used if the user has not set their preferences. $HistMax = 8; // $RatePeriod determines how many seconds of time to record a visitor's access // to the site. If it is set to zero, ALL RATE CHECKING AND IP ADDRESS // BLOCKING WILL BE DISABLED. $RatePeriod = 300; // $RateView determines how many pages a visitor can view in $RatePeriod // amount of time. $RateView = 100; // $RateSearch determines how many processor-intensive operations (search, // diff, etc.) a visitor can perform in $RatePeriod amount of time. $RateSearch = 50; // $RateEdit determines how many edits a visitor can make in $RatePeriod // amount of time. $RateEdit = 20; // $TempDir determines the location of temp files used for computing diffs. $TempDir = '/tmp'; // $DiffCmd determines what command to run to compute diffs. $DiffCmd = '/usr/bin/diff'; // $MaxPostLen determines the size, in bytes, of the largest edit allowed. $MaxPostLen = 204800; // $MaxNesting determines the maximum allowed nesting of lists. $MaxNesting = 20; // $MaxHeading determines the maximum allowed heading level in headings. $MaxHeading = 6; // $ParseEngine indicates what parsing rules will be run when displaying a // wiki page. To disable a particular rule, you can place a comment at the // beginning of its line. The order of this list is important. // Note that free links and wiki names are disabled above, using config // variables. This is because wiki names are parsed in other places than // just the wiki page. // Raw HTML parsing is turned off by default, since this is a potential // security hole. $ParseEngine = array( 'parse_elem_flag', // 'parse_raw_html', 'parse_htmlisms', 'parse_code', 'parse_nowiki', 'parse_hyperlink_ref', 'parse_hyperlink_description', 'parse_hyperlink', 'parse_macros', 'parse_transclude', 'parse_freelink', 'parse_interwiki', 'parse_wikiname', 'parse_bold', 'parse_italic', 'parse_teletype', 'parse_heading', 'parse_table', 'parse_horiz', 'parse_indents', 'parse_newline', 'parse_elements' ); // $DiffEngine indicates what parsing rules will be run to display differences // between versions. This should be a shorter list than $ParseEngine, // since we just want minimal things like bold and italic and wiki links. $DiffEngine = array( 'parse_elem_flag', 'parse_diff_skip', 'parse_diff_message', 'parse_diff_color', 'parse_htmlisms', 'parse_nowiki', 'parse_hyperlink_ref', 'parse_hyperlink_description', 'parse_hyperlink', 'parse_freelink', 'parse_interwiki', 'parse_wikiname', 'parse_bold', 'parse_italic', 'parse_teletype', 'parse_newline', 'parse_elements' ); // $DisplayEngine indicates what functions will be used to translate wiki // markup elements into actual HTML. See parse/html.php $DisplayEngine = array( 'bold_start' => 'html_bold_start', 'bold_end' => 'html_bold_end', 'italic_start' => 'html_italic_start', 'italic_end' => 'html_italic_end', 'tt_start' => 'html_tt_start', 'tt_end' => 'html_tt_end', 'head_start' => 'html_head_start', 'head_end' => 'html_head_end', 'newline' => 'html_newline', 'ref' => 'html_ref', 'url' => 'html_url', 'interwiki' => 'html_interwiki', 'raw' => 'html_raw', 'code' => 'html_code', 'hr' => 'html_hr', 'nowiki' => 'html_nowiki', 'anchor' => 'html_anchor', 'bullet_list_start' => 'html_ul_start', 'bullet_list_end' => 'html_ul_end', 'bullet_item_start' => 'html_li_start', 'bullet_item_end' => 'html_li_end', 'indent_list_start' => 'html_dl_start', 'indent_list_end' => 'html_dl_end', 'indent_item_start' => 'html_dd_start', 'indent_item_end' => 'html_dd_end', 'term_item_start' => 'html_dt_start', 'term_item_end' => 'html_dt_end', 'numbered_list_start' => 'html_ol_start', 'numbered_list_end' => 'html_ol_end', 'numbered_item_start' => 'html_li_start', 'numbered_item_end' => 'html_li_end', 'diff_old_start' => 'html_diff_old_start', 'diff_old_end' => 'html_diff_end', 'diff_new_start' => 'html_diff_new_start', 'diff_new_end' => 'html_diff_end', 'diff_change' => 'html_diff_change', 'diff_add' => 'html_diff_add', 'diff_delete' => 'html_diff_delete' ); // $ViewMacroEngine determines what macro names will be processed when // displaying a page. For each name, a function must be provided. // See parse/macros.php $ViewMacroEngine = array( '!' => 'view_macro_category', 'Anchor' => 'view_macro_anchor', 'PageSize' => 'view_macro_pagesize', 'LinkTable' => 'view_macro_linktab', 'OrphanedPages' => 'view_macro_orphans', 'WantedPages' => 'view_macro_wanted', 'PageLinks' => 'view_macro_outlinks', 'PageRefs' => 'view_macro_refs' ); // $SaveMacroEngine determines what save macros will be called after a // page is saved. See parse/save.php $SaveMacroEngine = array( 'parse_define_interwiki', 'parse_define_sisterwiki', 'parse_define_links' ); //----- // Variables and functions below this line are used to generate links to // pages. You should only change these if you plan to change the URL // scheme, e.g., to enable links like: // // http://somewiki.org/PageName // // You can do this using Apache's mod_rewrite extension. If you do so, you // may change the code below to generate appropriate URLs. $ViewBase = $ScriptBase . '?page='; $EditBase = $ScriptBase . '?action=edit&page='; $HistoryBase = $ScriptBase . '?action=history&page='; $FindScript = $ScriptBase . '?action=find'; $FindBase = $FindScript . '&find='; $SaveBase = $ScriptBase . '?action=save&page='; $DiffScript = $ScriptBase . '?action=diff'; $PrefsScript = $ScriptBase . '?action=prefs'; function viewURL($page, $version = '', $full = '') { global $ViewBase; return $ViewBase . urlencode($page) . ($version == '' ? '' : "&version=$version") . ($full == '' ? '' : '&full=1'); } function editURL($page, $version = '') { global $EditBase; return $EditBase . urlencode($page) . ($version == '' ? '' : "&version=$version"); } function historyURL($page, $full = '') { global $HistoryBase; return $HistoryBase . urlencode($page) . ($full == '' ? '' : '&full=1'); } function findURL($page) { global $FindBase; return $FindBase . urlencode($page); } function saveURL($page) { global $SaveBase; return $SaveBase . urlencode($page); } ?> --- config.php DELETED --- |
|
From: Scott M. <sm...@us...> - 2002-01-03 18:16:05
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv5880/template
Modified Files:
common.php
Log Message:
Tweak title-splitting.
Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- common.php 2002/01/03 15:23:44 1.2
+++ common.php 2002/01/03 18:16:01 1.3
@@ -27,7 +27,7 @@
if($SeparateTitleWords
&& validate_page($args['title']) == 1)
{
- $args['title'] = preg_replace("/(.)($UpperPtn)/", "\\1 \\2",
+ $args['title'] = preg_replace("/([^\\/])($UpperPtn)/", "\\1 \\2",
$args['title'], -1);
}
?>
|
|
From: Scott M. <sm...@us...> - 2002-01-03 16:33:30
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9260/lib
Modified Files:
category.php diff.php
Log Message:
Change transclusion behavior.
Index: category.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/category.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- category.php 2001/12/18 16:57:20 1.4
+++ category.php 2002/01/03 16:33:25 1.5
@@ -9,7 +9,7 @@
global $pagestore, $Entity, $UserName, $REMOTE_ADDR, $FlgChr;
// Parse the category list for category names.
- $parsed = parseText($catlist, array('parse_wikiname', 'parse_freelink'));
+ $parsed = parseText($catlist, array('parse_wikiname', 'parse_freelink'), '');
$pagenames = array();
preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e',
'$pagenames[]=$Entity[$1][1]', $parsed);
Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/diff.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- diff.php 2001/11/30 22:10:15 1.3
+++ diff.php 2002/01/03 16:33:26 1.4
@@ -34,7 +34,7 @@
{
global $DiffEngine;
- return parseText($text, $DiffEngine);
+ return parseText($text, $DiffEngine, '');
}
?>
|
|
From: Scott M. <sm...@us...> - 2002-01-03 16:33:30
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv9260/parse
Modified Files:
macros.php main.php save.php transforms.php
Log Message:
Change transclusion behavior.
Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- macros.php 2002/01/02 20:20:30 1.6
+++ macros.php 2002/01/03 16:33:26 1.7
@@ -22,7 +22,7 @@
}
else // Ordinary list of pages.
{
- $parsed = parseText($args, array('parse_wikiname', 'parse_freelink'));
+ $parsed = parseText($args, array('parse_wikiname', 'parse_freelink'), '');
$pagenames = array();
preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e', '$pagenames[]=$Entity[$1][1]', $parsed);
$list = $pagestore->givenpages($pagenames);
Index: main.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/main.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- main.php 2001/11/30 22:10:16 1.3
+++ main.php 2002/01/03 16:33:26 1.4
@@ -2,10 +2,13 @@
// $Id$
// Master parser for 'Tavi.
-function parseText($text, $parsers)
+function parseText($text, $parsers, $object_name)
{
- global $Entity;
+ global $Entity, $ParseObject;
+ $old_parse_object = $ParseObject;
+ $ParseObject = $object_name; // So parsers know what they're parsing.
+
$count = count($parsers);
$result = '';
@@ -25,6 +28,8 @@
$line = '';
for($i = 0; $i < $count; $i++)
{ $line = $parsers[$i]($line); }
+
+ $ParseObject = $old_parse_object;
return $result . $line;
}
Index: save.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/save.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- save.php 2001/11/30 22:10:16 1.3
+++ save.php 2002/01/03 16:33:26 1.4
@@ -9,16 +9,22 @@
// Define the link table.
function parse_define_links($text)
{
- global $pagestore, $page, $ParseEngine, $Entity;
+ global $pagestore, $page, $ParseEngine, $Entity, $ParseObject;
static $called = 0;
+ $macros_index = -1;
+ $transclude_index = -1;
for($i = 0; $i < count($ParseEngine); $i++)
{
if($ParseEngine[$i] == 'parse_macros')
- { break; }
+ { $macros_index = $i; }
+ if($ParseEngine[$i] == 'parse_transclude')
+ { $transclude_index = $i; }
}
- if($i != 0)
- { $ParseEngine[$i] = 'parse_noop'; }
+ if($macros_index != -1)
+ { $ParseEngine[$macros_index] = 'parse_noop'; }
+ if($transclude_index != -1)
+ { $ParseEngine[$transclude_index] = 'parse_noop'; }
if(!$called)
{
@@ -27,7 +33,7 @@
}
$j = count($Entity);
- parseText($text, $ParseEngine);
+ parseText($text, $ParseEngine, $ParseObject);
for(; $j < count($Entity); $j++)
{
@@ -35,8 +41,10 @@
{ $pagestore->new_link($page, $Entity[$j][1]); }
}
- if($i != 0)
- { $ParseEngine[$i] = 'parse_macros'; }
+ if($macros_index != -1)
+ { $ParseEngine[$macros_index] = 'parse_macros'; }
+ if($transclude_index != -1)
+ { $ParseEngine[$transclude_index] = 'parse_transclude'; }
return $text;
}
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- transforms.php 2002/01/02 21:30:17 1.17
+++ transforms.php 2002/01/03 16:33:26 1.18
@@ -169,30 +169,43 @@
function parse_transclude($text)
{
- static $reenter = 1;
-
- if(!$reenter)
- { return $text; }
- $reenter = 0;
- $text2 = preg_replace('/%%([^%]+)%%/e', "transclude_token(q1('\\1'))", $text, -1);
+ $text2 = preg_replace('/%%([^%]+)%%/e',
+ "transclude_token(q1('\\1'))", $text, -1);
if($text2 != $text)
{ $text2 = str_replace("\n", '', $text2); }
- $reenter = 1;
return $text2;
}
function transclude_token($text)
{
- global $pagestore, $ParseEngine;
+ global $pagestore, $ParseEngine, $ParseObject;
+ static $visited_array = array();
+ static $visited_count = 0;
if(!validate_page($text))
{ return '%%' . $text . '%%'; }
+
+ $visited_array[$visited_count++] = $ParseObject;
+ for($i = 0; $i < $visited_count; $i++)
+ {
+ if($visited_array[$i] == $text)
+ {
+ $visited_count--;
+ return '%%' . $text . '%%';
+ }
+ }
+
$pg = $pagestore->page($text);
$pg->read();
if(!$pg->exists)
- { return '%%' . $text . '%%'; }
-
- return new_entity(array('raw', parseText($pg->text, $ParseEngine)));
+ {
+ $visited_count--;
+ return '%%' . $text . '%%';
+ }
+
+ $result = new_entity(array('raw', parseText($pg->text, $ParseEngine, $text)));
+ $visited_count--;
+ return $result;
}
function parse_bold($text)
|
|
From: Scott M. <sm...@us...> - 2002-01-03 16:33:29
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv9260
Modified Files:
ChangeLog
Log Message:
Change transclusion behavior.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ChangeLog 2002/01/02 21:07:21 1.22
+++ ChangeLog 2002/01/03 16:33:25 1.23
@@ -3,6 +3,11 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2002-01-03 Scott Moonen <sm...@an...>
+
+ * Changed transclusion behavior so that recursive transclusions beyond
+ one level are allowed, but circular transclusions are disallowed.
+
2002-01-02 Scott Moonen <sm...@an...>
* Introduced new option to $SeparateTitleWords in page titles.
|
|
From: Scott M. <sm...@us...> - 2002-01-03 16:33:29
|
Update of /cvsroot/tavi/tavi/action
In directory usw-pr-cvs1:/tmp/cvs-serv9260/action
Modified Files:
conflict.php diff.php preview.php rss.php save.php view.php
Log Message:
Change transclusion behavior.
Index: conflict.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/conflict.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- conflict.php 2002/01/02 17:43:24 1.5
+++ conflict.php 2002/01/03 16:33:25 1.6
@@ -17,7 +17,8 @@
template_conflict(array('page' => $page,
'text' => $pg->text,
- 'html' => parseText($pg->text, $ParseEngine),
+ 'html' => parseText($pg->text,
+ $ParseEngine, $page),
'usertext' => $document,
'timestamp' => $pg->time,
'nextver' => $pg->version + 1));
Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/diff.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- diff.php 2002/01/02 17:43:24 1.5
+++ diff.php 2002/01/03 16:33:25 1.6
@@ -24,7 +24,7 @@
template_diff(array('page' => $page,
'diff_html' => diff_parse($diff),
- 'html' => parseText($p2->text, $ParseEngine),
+ 'html' => parseText($p2->text, $ParseEngine, $page),
'editable' => $p2->mutable,
'timestamp' => $p2->time));
}
Index: preview.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/preview.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- preview.php 2002/01/02 17:43:24 1.5
+++ preview.php 2002/01/03 16:33:25 1.6
@@ -18,7 +18,8 @@
template_preview(array('page' => $page,
'text' => $document,
- 'html' => parseText($document, $ParseEngine),
+ 'html' => parseText($document,
+ $ParseEngine, $page),
'timestamp' => $pg->time,
'nextver' => $nextver,
'archive' => $archive));
Index: rss.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rss.php 2002/01/02 18:25:28 1.3
+++ rss.php 2002/01/03 16:33:25 1.4
@@ -25,9 +25,12 @@
for($i = 0; $i < count($pages); $i++)
{
- $editTime = mktime(substr($pages[$i][0], 8, 2), substr($pages[$i][0], 10, 2),
- substr($pages[$i][0], 12, 2), substr($pages[$i][0], 4, 2),
- substr($pages[$i][0], 6, 2), substr($pages[$i][0], 0, 4));
+ $editTime = mktime(substr($pages[$i][0], 8, 2),
+ substr($pages[$i][0], 10, 2),
+ substr($pages[$i][0], 12, 2),
+ substr($pages[$i][0], 4, 2),
+ substr($pages[$i][0], 6, 2),
+ substr($pages[$i][0], 0, 4));
if($days >= 0 && ($now - $editTime) > $days * 24 * 60 * 60 && $i >= $min)
{ break; }
Index: save.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/save.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- save.php 2002/01/02 17:43:24 1.5
+++ save.php 2002/01/03 16:33:25 1.6
@@ -71,7 +71,8 @@
template_save(array('page' => $page,
'text' => $document));
- parseText($document, $SaveMacroEngine); // Save processing (e.g., interwiki).
+ // Process save macros (e.g., to define interwiki entries).
+ parseText($document, $SaveMacroEngine, $page);
$pagestore->unlock(); // End "transaction".
}
Index: view.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/view.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- view.php 2002/01/02 17:43:24 1.5
+++ view.php 2002/01/03 16:33:25 1.6
@@ -23,7 +23,7 @@
gen_headers($pg->time);
template_view(array('page' => $page,
- 'html' => parseText($pg->text, $ParseEngine),
+ 'html' => parseText($pg->text, $ParseEngine, $page),
'editable' => $pg->mutable,
'timestamp' => $pg->time,
'archive' => $version != '',
|
|
From: Scott M. <sm...@us...> - 2002-01-03 15:23:47
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv24999/template
Modified Files:
admin.php common.php prefs.php
Log Message:
Use common epilogue for *all* template routines.
Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/admin.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- admin.php 2002/01/02 17:43:24 1.7
+++ admin.php 2002/01/03 15:23:44 1.8
@@ -24,10 +24,7 @@
<div id="body">
<?php print $args['html']; ?>
</div>
-<hr />
-</div>
-</body>
-</html>
<?php
+ template_common_epilogue(array('nosearch' => 1));
}
?>
Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- common.php 2002/01/02 17:43:24 1.1
+++ common.php 2002/01/03 15:23:44 1.2
@@ -95,6 +95,7 @@
// a history link will be printed.
// 'timestamp' => Timestamp for the page. If not empty, a 'document
// last modified' note will be printed.
+// 'nosearch' => An integer; if nonzero, the search form will not appear.
function template_common_epilogue($args)
{
@@ -103,9 +104,14 @@
?>
<div id="footer">
<hr />
+<?php
+ if(!$args['nosearch'])
+ {
+?>
<form method="get" action="<?php print $FindScript; ?>">
<div class="form">
<?php
+ }
if($args['edit'])
{
if($args['editver'] == 0)
@@ -149,11 +155,16 @@
<br /><?php
}
}
+ if(!$args['nosearch'])
+ {
?>
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
</div>
</form>
+<?php
+ }
+?>
</div>
</body>
</html>
Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- prefs.php 2002/01/02 17:43:24 1.7
+++ prefs.php 2002/01/03 15:23:44 1.8
@@ -74,8 +74,7 @@
</div>
</form>
</div>
-</body>
-</html>
<?php
+ template_common_epilogue(array('nosearch' => 1));
}
?>
|
12 messages has been excluded from this view by a project administrator.
