tavi-cvs-commit — CVS commit changelogs should be forwarded to this list

[Tavi-cvs-commit] CVS: tavi/template wiki.css,1.7,1.8

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv6585/template

Modified Files:
	wiki.css 
Log Message:
Slight color tweak.


Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wiki.css	2002/01/09 21:29:48	1.7
+++ wiki.css	2002/01/15 16:02:43	1.8
@@ -42,3 +42,9 @@
     background: transparent; }
 span.twin
   { font-size: smaller; }
+tt
+  { background: transparent;
+    color:      #383838; }
+pre
+  { background: transparent;
+    color:      #383838; }

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.23,1.24

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv30762/parse

Modified Files:
	html.php 
Log Message:
Minor tweaks


Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- html.php	2002/01/10 17:56:19	1.23
+++ html.php	2002/01/15 15:38:07	1.24
@@ -114,7 +114,7 @@
 function html_url($url, $text)
 {
   if($url == $text
-     && preg_match('/(.jpe?g|.png|.gif)$/i', $text))
+     && preg_match('/(.jpe?g|.png|.gif|.bmp)$/i', $text))
   {
     return "<img src=\"$url\" alt=\"" . basename($url) . "\" />";
   }

[Tavi-cvs-commit] CVS: tavi/install settings.cnf,1.7,1.8

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv30762/install

Modified Files:
	settings.cnf 
Log Message:
Minor tweaks


Index: settings.cnf
===================================================================
RCS file: /cvsroot/tavi/tavi/install/settings.cnf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- settings.cnf	2002/01/14 21:54:08	1.7
+++ settings.cnf	2002/01/15 15:38:06	1.8
@@ -145,7 +145,7 @@
 // is useful to aid search engines in indexing your wiki.
 ----
 noprompt_const TemplateDir 'template'
-// $TemplateDir indicates what directory your wiki templates are located in.
+// TemplateDir indicates what directory your wiki templates are located in.
 // You may use this to install other templates than the default template.
 ----
 noprompt_var $AdminEnabled 0

[Tavi-cvs-commit] CVS: tavi/install settings.cnf,1.6,1.7

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv552/install

Modified Files:
	settings.cnf 
Log Message:
Put $AdminEnabled in config.php


Index: settings.cnf
===================================================================
RCS file: /cvsroot/tavi/tavi/install/settings.cnf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- settings.cnf	2002/01/08 17:43:00	1.6
+++ settings.cnf	2002/01/14 21:54:08	1.7
@@ -147,3 +147,13 @@
 noprompt_const 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_var $AdminEnabled 0
+// !!!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.

[Tavi-cvs-commit] CVS: tavi INSTALL.txt,1.9,1.10

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv32053

Modified Files:
	INSTALL.txt 
Log Message:
Tweak installation instructions.


Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- INSTALL.txt	2002/01/09 17:01:15	1.9
+++ INSTALL.txt	2002/01/14 21:51:20	1.10
@@ -18,153 +18,167 @@
 more detailed instructions dealing with virtual hosts, 'Tavi templates,
 URL rewriting, etc.
 
-See below, under "Installation Suggestions" for some recommendations as
-to how to ensure your installation is secure.
-
-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:
+1.  Choose a location in which to install 'Tavi.  You do not need to
+    install 'Tavi under your webspace; in fact, it is recommended that
+    you do not do so.  While there are no known security exploits in
+    'Tavi 0.21, it is best for security purposes to leave as few
+    scripts exposed to the web as possible.
 
-   Its first parameter should be the name of the (already created) MySQL
-   database where the tables will be created.  If you have not yet
-   created the database, you should do so before running the script.
+    Additionally, if you install 'Tavi in a central location, you can
+    use it once for multiple wikis on your web server.  This makes
+    administration of virtual hosts or wiki farms much simpler.  Upgrading
+    to a later version of 'Tavi also is simplified, as you can upgrade
+    multiple wikis in one step.
 
-   Its second and third parameters are the user name and password to use
-   to access the database.
+    For the sake of example, the following assumes that you have chosen
+    to install 'Tavi in the following directory:
 
-   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.
+      /usr/local/lib/tavi/
 
-   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.
+    Alternatively, you can install 'Tavi directly in your webspace and
+    use it without complication; there is no reason that 'Tavi *must* be
+    installed in a central location, although it is recommended.
 
-   Examples:
+2.  Download the 'Tavi archive into the installation directory.  You can
+    find it at http://prdownloads.sourceforge.net/tavi/
 
-     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 "" mysql.example.com
+3.  Unpack the archive in the installation directory.  It should create
+    a subdirectory named 'tavi-0.21'.
 
-3. In the install/ directory, run the "configure.pl" script to generate a
-   configuration file for your wiki.  It takes one parameter, the location
-   of the configuration file.  For example:
+4.  [Not necessary, but recommended.]
 
-     perl ./configure.pl /home/u/user12/tavi/config.php
-     perl ./configure.pl ../config.php
+    Create a symbolic link in the installation directory that points to
+    the archive subdirectory.  For example, create a symbolic link in
+    /usr/local/lib/tavi/ called 'tavi-current', that points to
+    '/usr/local/lib/tavi/tavi-0.21'.  This allows your wikis to point
+    to 'tavi-current', allowing you to automatically upgrade them to
+    a newer release by simply pointing 'tavi-current' to the new
+    release's location.
 
-   You will be prompted for such things as the URL to the wiki script,
-   the name of your wiki, database information, etc.
+5.  Run install/create-db.pl to create the database tables for your wiki:
 
-4. Examine the file 'config.php' that was created by the configuration
-   script, to make sure the settings are correct.
+    Its first parameter should be the name of the (already created) MySQL
+    database where the tables will be created.  If you have not yet
+    created the database, you should do so before running the script.
 
-5. Visit your wiki and start creating pages!
+    Its second and third parameters are the user name and password to use
+    to access the database.
 
-   Apart from your wiki's home page, you should also create RecentChanges,
-   containing (at minimum) a wildcard subscription list like so:
+    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.
 
-     [[! *]]
+    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.
 
-   You should also create some InterWiki entries.  See
-   http://tavi.sourceforge.net/InterWiki for help.
+    Examples:
 
-6. Advertise your wiki.  Feel free to put a link to your wiki on
-   http://tavi.sourceforge.net/TaviSites.
+      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 "" mysql.example.com
 
+6.  In the install/ directory, run the "configure.pl" script to generate a
+    configuration file for your wiki.  It takes one parameter, the location
+    of the configuration file.  For example:
 
-Installation Suggestions
-========================
+      perl ./configure.pl /home/u/user12/tavi/config.php
+      perl ./configure.pl ../config.php
 
-There are several steps you should take to add additional security and
-flexibility to your installation.  Note, however, that none of the
-following suggestions are *required*.  If you follow the above steps for
-a simple installation, 'Tavi will work just as well.
+    You will be prompted for such things as the URL to the wiki script,
+    the name of your wiki, database information, etc.
 
-1. It is not necessary to install 'Tavi in a location that can be
-   accessed from the web.  Indeed, if you install it in a central location,
-   you realize several benefits:
+    As with the 'Tavi source, it is recommended that you keep your
+    configuration file in a location that cannot be accessed from the web.
 
-   * Automatic upgrading becomes easier.
-   * One installed copy can serve multiple scripts on a wiki farm or
-     virtual host.
-   * Your installation is less susceptible to undiscovered PHP exploits,
-     since the various 'Tavi scripts are not accessible from a browser.
+    You may wish to double-check the 'config.php' file that was created by
+    the configuration script, to make sure that the settings are correct.
 
-   In order to do this, simply install 'Tavi in a non-web-accessible
-   directory on your server.  For example, you might install it in
-   /usr/local/lib/tavi/tavi-0.21 and create a symbolic link called
-   /usr/local/lib/tavi/tavi-current that points to it.
+7.  If you installed 'Tavi in your webspace, then skip this step, since
+    index.php is already accessible from the web.
 
-   You must then:
+    A. Now you have to create an entry point to your wiki.  Choose a directory
+       in your webspace to be the base point for your wiki.  For sake of
+       example, we will use /home/joe/public_html/mywiki/.
 
-     A. Choose a web directory from which to access 'Tavi.
+    B. Create a subdirectory named 'admin/' in this directory.  E.g.,
+       /home/joe/public_html/mywiki/admin.
 
-     B. Create an 'admin/' subdirectory off of that directory.
+    C. In the base directory, create a symbolic link to the index.php in the
+       'Tavi installation.  For example, create
+       /home/joe/public_html/mywiki/index.php that is a link to
+       /usr/local/lib/tavi/tavi-current/index.php.
 
-     C. (In Apache), edit your .htaccess file to add the 'Tavi installation
-        to the include directories.  For example, place the following in
-        .htaccess:
+    D. In the admin/ subdirectory, create a symbolic link to the index.php in
+       the admin subdirectory in the 'Tavi installation.  For example, create:
+       /home/joe/public_html/mywiki/admin/index.php that is a link to
+       /usr/local/lib/tavi/tavi-current/admin/index.php.
 
-          php_value include_path "/usr/local/lib/tavi/tavi-current"
+8.  Configure your script so that it can access the 'Tavi scripts and so that
+    it can access your configuration file.  If you have installed 'Tavi in
+    your webspace, and you have placed the config.php file in the root of
+    that location, then you can skip this step.  Otherwise, continue:
 
-        If you are using php.cgi instead of mod_php, you may have to edit
-        your php.ini file instead to change the include_path.
+    A. Locate the directories for your 'Tavi installation and for your
+       config.php file.  For example, they might be:
 
-        Note also that you need to allow Apache FollowSymlinks if you use
-        symbolic links as here suggested.
+         /usr/local/lib/tavi/tavi-current
+         /home/joe/tavi/mywiki
 
-     D. Create a symbolic link in your web directory to the index.php
-        file in the 'Tavi installation (in this example, to
-        /usr/local/lib/tavi/tavi-current/index.php).
+    B. If you are running PHP as mod_php under Apache, add the directories
+       to the .htaccess file in the directory where the wiki resides.
+       Separate them with colons:
 
-        (You will need to allow Apache FollowSymlinks for this to work;
-        otherwise, you could perhaps copy index.php to your web directory.)
+         php_value include_path "/home/joe/tavi/mywiki:/usr/local/lib/tavi/tavi-current"
 
-     E. Create a symbolic link in 'admin/' on your webspace to the
-        admin/index.php file in the 'Tavi installation
+    C. If, instead, you are running PHP as a CGI program, then you will have to
+       similarly change the include_path in your php.ini file to point to the
+       given directories.  (To prevent this from affecting your other PHP
+       scripts, see http://tavi.sourceforge.net/CGI+Wrapping.)
 
-     F. Make sure your config.php file is accessible from the PHP include
-        path (see below).
+9.  [Optional, but recommended.]
 
-2. For added security, you should try to place your config.php file in a
-   location that is not accessible from the web.  While no one will probably
-   be able to read its contents, it is still a good idea to prevent it from
-   being web-accessible.
+    Turn off register_globals for 'Tavi.  While there are no known security
+    exploits in 'Tavi 0.21, this is generally a good idea to make your scripts
+    less liable to undiscovered exploits.
 
-   To do so, create a .htaccess file in your web directory that adds the
-   location of config.php to the PHP include_path.  For example, suppose you
-   placed config.php in /home/u/user12/tavi/.  Your .htaccess files might
-   look like:
+    A. If you are running PHP as mod_php under Apache, add the following line
+       to the .htaccess file in the directory where the wiki resides:
 
-     php_value include_path "/home/u/user12/tavi"
+         php_flag register_globals off
 
-   Or, if you followed the steps above to also place the 'Tavi script in a
-   central location:
+    B. If, instead, you are running PHP as a CGI program, then you will have
+       to similarly change the register_globals setting in your php.ini file.
+       (To prevent this from affecting your other PHP scripts, see
+       http://tavi.sourceforge.net/CGI+Wrapping.)
 
-     php_value include_path "/home/u/user12/tavi:/usr/local/lib/tavi/tavi-current"
+10. Visit your wiki and start creating pages!
 
-   If you are using the CGI version of PHP, instead of mod_php, you would
-   similarly configure php.ini to change your include path.
+    Apart from your wiki's home page, you should also create RecentChanges,
+    containing (at minimum) a wildcard subscription list like so:
 
-3. For added security, you should turn off register_globals.  While there
-   are no known register_globals exploits in 'Tavi, it is always a good idea
-   to protect against the unknown by disabling register_globals.  If you are
-   using mod_php, you would add the following line to your .htaccess file in
-   your web directory:
+      [[! *]]
 
-     php_flag register_globals off
+    You should also create some InterWiki entries.  See
+    http://tavi.sourceforge.net/InterWiki for help.
 
-   You should do similarly in php.ini if you are using the CGI version of PHP.
+11. Advertise your wiki.  Feel free to put a link to your wiki on
+    http://tavi.sourceforge.net/TaviSites.
 
 
 Advanced
 ========
 
+   * Customizing Your Wiki
+
+     See http://tavi.sourceforge.net/CustomizingTavi for help on how you can
+     tweak your wiki's behavior and appearance to your heart's content.
+
    * 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.
+     If you installed 'Tavi as suggested above, this will be easy to achieve.
      See http://tavi.sourceforge.net/VirtualHosts for help.
 
    * Using Templates
@@ -193,11 +207,6 @@
      '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

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.23,1.24

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv23967/parse

Modified Files:
	transforms.php 
Log Message:
Fix token.


Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- transforms.php	2002/01/14 18:01:04	1.23
+++ transforms.php	2002/01/14 18:07:55	1.24
@@ -70,7 +70,7 @@
 {
   if($name[0] == '!')                   // No-link escape sequence.
     { return substr($name, 1); }        // Trim leading '!'.
-  return new_entity(array('ref', $name, $name, $anchor, $anchor));
+  return new_entity(array('ref', $name, $name, '', $anchor, $anchor));
 }
 
 function parse_freelink($text, $validate = 0)

[Tavi-cvs-commit] CVS: tavi NEWS.txt,1.6,1.7

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv22741

Modified Files:
	NEWS.txt 
Log Message:
Mention time-zone preference.


Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NEWS.txt	2002/01/10 17:59:49	1.6
+++ NEWS.txt	2002/01/14 18:03:37	1.7
@@ -13,7 +13,8 @@
   security fix) and several minor new features, such as HTML anchors;
   arbitrary link text for free links; RSS syndication; the use of style
   sheets and XHTML-Strict markup; compatibility with register_globals=off;
-  and the option to split words in page titles, headers, and links.
+  the option to split words in page titles, headers, and links; and a time
+  zone preference for visitors.
 
   Users should note that the transclude syntax, %%PageName%%, has been
   deprecated for this release.  It is superseded by the

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.22,1.23

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv22002/parse

Modified Files:
	transforms.php 
Log Message:
Introduce '!' no-link prefix.


Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- transforms.php	2002/01/04 20:35:27	1.22
+++ transforms.php	2002/01/14 18:01:04	1.23
@@ -59,11 +59,18 @@
   if($validate)
     { $ptn = "/(^|[^A-Za-z])($LinkPtn)(())(\"\")?/e"; }
   else
-    { $ptn = "/(^|[^A-Za-z])($LinkPtn)((\#[-A-Za-z0-9]+)?)(\"\")?/e"; }
+    { $ptn = "/(^|[^A-Za-z])(!?$LinkPtn)((\#[-A-Za-z0-9]+)?)(\"\")?/e"; }
 
   return preg_replace($ptn,
-                      "q1('\\1').new_entity(array('ref',q1('\\2'),q1('\\2'),'','\\4','\\4'))",
+                      "q1('\\1').wikiname_token(q1('\\2'),'\\4')",
                       $text, -1);
+}
+
+function wikiname_token($name, $anchor)
+{
+  if($name[0] == '!')                   // No-link escape sequence.
+    { return substr($name, 1); }        // Trim leading '!'.
+  return new_entity(array('ref', $name, $name, $anchor, $anchor));
 }
 
 function parse_freelink($text, $validate = 0)

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.4,1.5

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv22002

Modified Files:
	ChangeLog.txt 
Log Message:
Introduce '!' no-link prefix.


Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ChangeLog.txt	2002/01/10 17:56:18	1.4
+++ ChangeLog.txt	2002/01/14 18:01:04	1.5
@@ -3,6 +3,11 @@
 WikkiTikkiTavi - ChangeLog
 --------------------------
 
+2002-01-14  Scott Moonen  <sm...@an...>
+
+   * Introduce '!' as a no-link escape.  E.g., !SandBox renders
+     as SandBox, without linking to the given page.
+
 2002-01-10  Scott Moonen  <sm...@an...>
 
    * Added $SeparateLinkWords configurable to insert spaces in

[Tavi-cvs-commit] CVS: tavi NEWS.txt,1.5,1.6

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv32684

Modified Files:
	NEWS.txt 
Log Message:
Revise NEWS.


Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NEWS.txt	2002/01/08 20:15:39	1.5
+++ NEWS.txt	2002/01/10 17:59:49	1.6
@@ -10,10 +10,10 @@
 2002-01-??  Scott Moonen  <sm...@an...>
 
   WikkiTikkiTavi version 0.21 is released.  Several bug fixes (including a
-  security fix), and several minor new features, such as HTML anchors,
-  arbitrary link text for free links, RSS syndication, the use of style
-  sheets and XHTML-Strict markup, and full compatibility with
-  register_globals=off.
+  security fix) and several minor new features, such as HTML anchors;
+  arbitrary link text for free links; RSS syndication; the use of style
+  sheets and XHTML-Strict markup; compatibility with register_globals=off;
+  and the option to split words in page titles, headers, and links.
 
   Users should note that the transclude syntax, %%PageName%%, has been
   deprecated for this release.  It is superseded by the

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.3,1.4

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv31725

Modified Files:
	ChangeLog.txt 
Log Message:
Add $SeparateLinkWords


Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ChangeLog.txt	2002/01/08 17:31:00	1.3
+++ ChangeLog.txt	2002/01/10 17:56:18	1.4
@@ -3,6 +3,11 @@
 WikkiTikkiTavi - ChangeLog
 --------------------------
 
+2002-01-10  Scott Moonen  <sm...@an...>
+
+   * Added $SeparateLinkWords configurable to insert spaces in
+     links to wiki pages.  Default is off.
+
 2002-01-08  Scott Moonen  <sm...@an...>
 
    * Worked on streamlining installation, providing instructions for

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.22,1.23

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv31725/parse

Modified Files:
	html.php 
Log Message:
Add $SeparateLinkWords


Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- html.php	2002/01/09 21:29:48	1.22
+++ html.php	2002/01/10 17:56:19	1.23
@@ -122,7 +122,7 @@
 }
 function html_ref($page, $appearance, $hover = '', $anchor = '', $anchor_appearance = '')
 {
-  global $db;
+  global $db, $SeparateLinkWords;
 
   if($hover != '')
     { $hover = ' title="' . $hover . '"'; }
@@ -131,6 +131,8 @@
 
   if($p->exists())
   {
+    if($SeparateLinkWords && $page == $appearance)
+      { $appearance = html_split_name($page); }
     return '<a href="' . viewURL($page) . $anchor . '"' . $hover . '>'
            . $appearance . $anchor_appearance . '</a>';
   }

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.3,1.4

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31725/lib

Modified Files:
	defaults.php 
Log Message:
Add $SeparateLinkWords


Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- defaults.php	2002/01/08 17:31:01	1.3
+++ defaults.php	2002/01/10 17:56:19	1.4
@@ -68,6 +68,12 @@
 //   instead.  Pages that have free link names would not have changed headers.
 $SeparateHeaderWords = 0;
 
+// $SeparateLinkWords determines whether spaces should be inserted in links
+//   to pages.  If nonzero, all links to pages such as WikiName would display
+//   as 'Wiki Name'.  Pages that have free link names would not have changed
+//   links.
+$SeparateLinkWords = 0;
+
 // $CookieName determines the name of the cookie that browser preferences
 //   (like user name, etc.) are stored in.
 $CookieName = 'prefs';

[Tavi-cvs-commit] CVS: tavi/template admin.php,1.9,1.10 conflict.php,1.8,1.9 diff.php,1.9,1.10 edit.php,1.8,1.9 find.php,1.9,1.10 history.php,1.10,1.11 prefs.php,1.10,1.11 preview.php,1.8,1.9 view.php,1.8,1.9

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv1840/template

Modified Files:
	admin.php conflict.php diff.php edit.php find.php history.php 
	prefs.php preview.php view.php 
Log Message:
Use require_once for common template functions.


Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/admin.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- admin.php	2002/01/07 16:28:32	1.9
+++ admin.php	2002/01/10 01:31:04	1.10
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The admin template is passed an associative array with the following
 // elements:

Index: conflict.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/conflict.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conflict.php	2002/01/07 16:28:32	1.8
+++ conflict.php	2002/01/10 01:31:04	1.9
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The conflict template is passed an associative array with the following
 // elements:

Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/diff.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- diff.php	2002/01/07 16:28:32	1.9
+++ diff.php	2002/01/10 01:31:04	1.10
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The diff template is passed an associative array with the following
 // elements:

Index: edit.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/edit.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- edit.php	2002/01/07 16:28:32	1.8
+++ edit.php	2002/01/10 01:31:04	1.9
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The edit template is passed an associative array with the following
 // elements:

Index: find.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/find.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- find.php	2002/01/07 16:28:32	1.9
+++ find.php	2002/01/10 01:31:04	1.10
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The find template is passed an associative array with the following
 // elements:

Index: history.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/history.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- history.php	2002/01/07 16:28:32	1.10
+++ history.php	2002/01/10 01:31:04	1.11
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The history template is passed an associative array with the following
 // elements:

Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- prefs.php	2002/01/07 16:28:32	1.10
+++ prefs.php	2002/01/10 01:31:04	1.11
@@ -2,7 +2,7 @@
 // $Id$
 
 require('parse/html.php');
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 function template_prefs()
 {

Index: preview.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/preview.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- preview.php	2002/01/07 16:28:32	1.8
+++ preview.php	2002/01/10 01:31:04	1.9
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The preview template is passed an associative array with the following
 // elements:

Index: view.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/view.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- view.php	2002/01/07 16:28:32	1.8
+++ view.php	2002/01/10 01:31:04	1.9
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 
-require(TemplateDir . '/common.php');
+require_once(TemplateDir . '/common.php');
 
 // The view template is passed an associative array with the following
 // elements:

[Tavi-cvs-commit] CVS: tavi/lib diff.php,1.4,1.5

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv31807/lib

Modified Files:
	diff.php 
Log Message:
Oops; global vars.


Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/diff.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- diff.php	2002/01/03 16:33:26	1.4
+++ diff.php	2002/01/09 21:48:46	1.5
@@ -4,7 +4,7 @@
 // Compute the difference between two sets of text.
 function diff_compute($text1, $text2)
 {
-  global $TempDir, $DiffCmd;
+  global $TempDir, $DiffCmd, $ErrorCreatingTemp, $ErrorWritingTemp;
 
   $num = posix_getpid();                // Comment if running on Windows.
   // $num = rand();                     // Uncomment if running on Windows.

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.21,1.22

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv25282/parse

Modified Files:
	html.php 
Log Message:
CSS conceptual conformity


Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- html.php	2002/01/09 21:26:22	1.21
+++ html.php	2002/01/09 21:29:48	1.22
@@ -152,7 +152,7 @@
   global $pagestore;
 
   return '<a href="' . $pagestore->interwiki($base) . $ref . '">' .
-         '<span class="small"><em>[' . $base . ']</em></span></a>';
+         '<span class="twin"><em>[' . $base . ']</em></span></a>';
 }
 function html_category($time, $page, $host, $user, $comment)
 {

[Tavi-cvs-commit] CVS: tavi/template wiki.css,1.6,1.7

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv25282/template

Modified Files:
	wiki.css 
Log Message:
CSS conceptual conformity


Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wiki.css	2002/01/09 21:26:22	1.6
+++ wiki.css	2002/01/09 21:29:48	1.7
@@ -40,5 +40,5 @@
 p.warning
   { color:      #ff3f3f;
     background: transparent; }
-span.small
+span.twin
   { font-size: smaller; }

[Tavi-cvs-commit] CVS: tavi/template wiki.css,1.5,1.6

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv24333/template

Modified Files:
	wiki.css 
Log Message:
XHTML/CSS tweaks.


Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wiki.css	2002/01/01 20:13:19	1.5
+++ wiki.css	2002/01/09 21:26:22	1.6
@@ -38,4 +38,7 @@
 form
   { margin-top: 0px; }
 p.warning
-  { color: #ff3f3f; }
+  { color:      #ff3f3f;
+    background: transparent; }
+span.small
+  { font-size: smaller; }

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.20,1.21

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv24333/parse

Modified Files:
	html.php 
Log Message:
XHTML/CSS tweaks.


Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- html.php	2002/01/08 17:31:01	1.20
+++ html.php	2002/01/09 21:26:22	1.21
@@ -152,7 +152,7 @@
   global $pagestore;
 
   return '<a href="' . $pagestore->interwiki($base) . $ref . '">' .
-         '<font size="-1"><em>[' . $base . ']</em></font></a>';
+         '<span class="small"><em>[' . $base . ']</em></span></a>';
 }
 function html_category($time, $page, $host, $user, $comment)
 {

[Tavi-cvs-commit] CVS: tavi INSTALL.txt,1.8,1.9

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv25356

Modified Files:
	INSTALL.txt 
Log Message:
Tweak INSTALL.txt


Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- INSTALL.txt	2002/01/08 19:40:36	1.8
+++ INSTALL.txt	2002/01/09 17:01:15	1.9
@@ -1,5 +1,15 @@
 $Id$
 
+
+Feedback
+--------
+
+Your feedback is welcome to help make these installation instructions
+more useful, understandable, and complete.  If you have any suggestions,
+criticisms, questions, or other comments, please send them to
+ta...@li....  Thanks!
+
+
 WikkiTikkiTavi - Installation
 -----------------------------
 
@@ -16,7 +26,8 @@
 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.
+   database where the tables will be created.  If you have not yet
+   created the database, you should do so before running the script.
 
    Its second and third parameters are the user name and password to use
    to access the database.
@@ -33,7 +44,7 @@
 
      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
+     perl ./create-db.pl common jim key "" mysql.example.com
 
 3. In the install/ directory, run the "configure.pl" script to generate a
    configuration file for your wiki.  It takes one parameter, the location

[Tavi-cvs-commit] CVS: tavi/install configure.pl,1.6,1.7

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv26504/install

Modified Files:
	configure.pl 
Log Message:
Change " -> '


Index: configure.pl
===================================================================
RCS file: /cvsroot/tavi/tavi/install/configure.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- configure.pl	2002/01/07 18:35:49	1.6
+++ configure.pl	2002/01/08 20:36:44	1.7
@@ -37,7 +37,7 @@
     $variable = $2;
     $value    = $3;
     print CONFIG $comment;
-    print CONFIG "define(\"$variable\", $value);\n\n";
+    print CONFIG "define('$variable', $value);\n\n";
   }
   elsif($descriptor =~ /^comment/)      # Write out just a comment.
   {

[Tavi-cvs-commit] CVS: tavi NEWS.txt,1.4,1.5

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv19903

Modified Files:
	NEWS.txt 
Log Message:
Mention register_globals=off compatibility.


Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NEWS.txt	2002/01/08 17:40:16	1.4
+++ NEWS.txt	2002/01/08 20:15:39	1.5
@@ -11,8 +11,9 @@
 
   WikkiTikkiTavi version 0.21 is released.  Several bug fixes (including a
   security fix), and several minor new features, such as HTML anchors,
-  arbitrary link text for free links, RSS syndication, and the use of style
-  sheets and XHTML-Strict markup.
+  arbitrary link text for free links, RSS syndication, the use of style
+  sheets and XHTML-Strict markup, and full compatibility with
+  register_globals=off.
 
   Users should note that the transclude syntax, %%PageName%%, has been
   deprecated for this release.  It is superseded by the

[Tavi-cvs-commit] CVS: tavi INSTALL.txt,1.7,1.8

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv8339

Modified Files:
	INSTALL.txt 
Log Message:
Procedural fix (thanks, Kim!)


Index: INSTALL.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/INSTALL.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- INSTALL.txt	2002/01/08 17:31:00	1.7
+++ INSTALL.txt	2002/01/08 19:40:36	1.8
@@ -100,9 +100,6 @@
         If you are using php.cgi instead of mod_php, you may have to edit
         your php.ini file instead to change the include_path.
 
-        Do the same for a .htaccess file in the 'admin/' subdirectory you
-        created.
-
         Note also that you need to allow Apache FollowSymlinks if you use
         symbolic links as here suggested.
 
@@ -124,10 +121,10 @@
    be able to read its contents, it is still a good idea to prevent it from
    being web-accessible.
 
-   To do so, create a .htaccess file in your web directory and in the 'admin/'
-   sub-directory that adds the location of config.php to the PHP include_path.
-   For example, suppose you placed config.php in /home/u/user12/tavi/.  Your
-   .htaccess files might look like:
+   To do so, create a .htaccess file in your web directory that adds the
+   location of config.php to the PHP include_path.  For example, suppose you
+   placed config.php in /home/u/user12/tavi/.  Your .htaccess files might
+   look like:
 
      php_value include_path "/home/u/user12/tavi"
 
@@ -143,7 +140,7 @@
    are no known register_globals exploits in 'Tavi, it is always a good idea
    to protect against the unknown by disabling register_globals.  If you are
    using mod_php, you would add the following line to your .htaccess file in
-   your web directory and in the 'admin/' subdirectory:
+   your web directory:
 
      php_flag register_globals off
 

[Tavi-cvs-commit] CVS: tavi/install settings.cnf,1.5,1.6

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi/install
In directory usw-pr-cvs1:/tmp/cvs-serv3773/install

Modified Files:
	settings.cnf 
Log Message:
Syntax edit.


Index: settings.cnf
===================================================================
RCS file: /cvsroot/tavi/tavi/install/settings.cnf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- settings.cnf	2002/01/08 17:31:01	1.5
+++ settings.cnf	2002/01/08 17:43:00	1.6
@@ -147,4 +147,3 @@
 noprompt_const TemplateDir 'template'
 // $TemplateDir indicates what directory your wiki templates are located in.
 // You may use this to install other templates than the default template.
-----

[Tavi-cvs-commit] CVS: tavi NEWS.txt,1.3,1.4

[Scott M. <sm...@us...>]

Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv2817

Modified Files:
	NEWS.txt 
Log Message:
Spelling.


Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NEWS.txt	2002/01/08 17:37:59	1.3
+++ NEWS.txt	2002/01/08 17:40:16	1.4
@@ -15,7 +15,7 @@
   sheets and XHTML-Strict markup.
 
   Users should note that the transclude syntax, %%PageName%%, has been
-  deprecated for this release.  It is superceded by the
+  deprecated for this release.  It is superseded by the
   [[Transclude PageName]] macro.  The double-% syntax will be removed
   as of version 0.30.