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

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.50,1.51

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17899

Modified Files:
	transforms.php 
Log Message:
Fixed TaviBug:862761 regarding (((free link)) and missing left parenthesis

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- transforms.php	1 Mar 2004 13:04:09 -0000	1.50
+++ transforms.php	1 Mar 2004 14:44:04 -0000	1.51
@@ -124,11 +124,11 @@
 
   if($validate)
   {
-    $ptn = "/\\(\\(([^\\|\\)]+)()()\\)\\)/e";
+    $ptn = "/\\(\\(([^\\|\\(\\)]+)()()\\)\\)/e";
   }
   else
   {
-    $ptn = "/(!?\\(\\(([^\\|\\)]+)(\\|[^\\)#]+)?(\\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\))/e";
+    $ptn = "/(!?\\(\\(([^\\|\\(\\)]+)(\\|[^\\(#]+)?(\\#[A-Za-z][-A-Za-z0-9_:.]*)?()\\)\\))/e";
   }
 
   return preg_replace($ptn,

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

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14354

Modified Files:
	page.php 
Log Message:
Fixed TaviBug:907471 regarding missing quotes around setting of a time variable in MySQL. Is a problem in MySQL 4.x

Index: page.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- page.php	30 Nov 2001 22:10:15 -0000	1.3
+++ page.php	1 Mar 2004 14:27:39 -0000	1.4
@@ -88,7 +88,7 @@
 
     if($this->version > 1)
     {
-      $this->db->query("UPDATE $PgTbl SET time=$this->time, " .
+      $this->db->query("UPDATE $PgTbl SET time='$this->time', " .
                        "supercede=NULL WHERE title='$this->dbname' " .
                        "AND version=" . ($this->version - 1));
     }

[Tavi-cvs-commit] CVS: tavi/action admin.php,1.3,1.4

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/action
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12433

Modified Files:
	admin.php 
Log Message:
Fixed TaviBug:907481 regarding hardcoded template-directory

Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- admin.php	16 Dec 2003 20:23:08 -0000	1.3
+++ admin.php	1 Mar 2004 14:17:13 -0000	1.4
@@ -7,7 +7,7 @@
 require('lib/init.php');
 require('parse/html.php');
 require('parse/transforms.php');
-require('template/admin.php');
+require(TemplateDir . '/admin.php');
 
 if($AdminEnabled != 1)
   { die(ACTION_ErrorAdminDisabled); }

[Tavi-cvs-commit] CVS: tavi/parse macros.php,1.19,1.20

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7355

Modified Files:
	macros.php 
Log Message:
Fixed TaviBug:907512 regarding allowing numbers in TitleSearch. And whilst at it I added some functionality as well... See page on website (in a few minutes) ;-)

Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- macros.php	16 Dec 2003 20:25:01 -0000	1.19
+++ macros.php	1 Mar 2004 13:51:52 -0000	1.20
@@ -280,13 +280,15 @@
   // Check for illegal characters to make search pattern safer against exploits
   if ($search == '*') {  // Match every title 
     $pattern = "."; 
-  } else if ( !preg_match("/^\^?(\/|$AlphaPtn)+\\$?$/", $search)) {
-     // Search can be locked at ^start and/or end$, and elsewise only
-     // contain Alpha-characters, digits not included
+  } else if ( !preg_match("/^\^?(\/|$AlphaPtn|[-_0-9:;\*\(\)])+\\$?$/", $search)) {
+     // Search can be locked at ^start and/or end$, contain alphanumeric
+     // characters, or characters: :;-_
+     // In addition the characters: (*)  have special syntactic meanings
      return "[[TitleSearch $args]]";
   } else {
-    // $search validates, so use as is
-    $pattern=$search;
+    // $search validates, replace special characters
+    $pattern=preg_replace("|\*|", ".*", $search);
+    $useAlternateLinknames = (preg_match("|\(.*\)|", $pattern));
   }
 
   if (!isset($useList) or !$useList) {
@@ -304,7 +306,7 @@
   $list = $pagestore->allpages();
   foreach($list as $page)
   {
-    if (preg_match("|$pattern|", $page[1])) {
+    if (preg_match("|$pattern|", $page[1], $match)) {
       if ($showIndex && ($lastIndexChar != $page[1][$indexCharNo])) {
         if ($lastIndexChar != '') {  // End previous list
           if ($useDelim) {
@@ -327,7 +329,10 @@
       }
 
       if ($useList) { $text .= entity_listitem("*", "start"); };
-      $text .= sprintf("%s".$useDelim, html_ref($page[1], $page[1]));
+
+      // Produce link, with or without alternate name on link       
+      $text .= sprintf("%s".$useDelim, html_ref($page[1], 
+                          ($useAlternateLinknames) ? $match[1] : $page[1]));
     }
   }
 

[Tavi-cvs-commit] CVS: tavi/template prefs.php,1.13,1.14

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv361

Modified Files:
	prefs.php 
Log Message:
Fixed TaviBug:907484 regarding no use of $AuthorDiff


Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- prefs.php	16 Dec 2003 20:29:27 -0000	1.13
+++ prefs.php	1 Mar 2004 13:16:15 -0000	1.14
@@ -7,7 +7,7 @@
 function template_prefs()
 {
   global $PrefsScript, $HTTP_REFERER, $HistMax, $TimeZoneOff;
-  global $AuthorDiff, $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
+  global $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
 
   template_common_prologue(array('norobots' => 1,
                                  'title'    => TMPL_Prefs,
@@ -62,10 +62,6 @@
   <em>But</em> display at least this many entries in RecentChanges and other
   subscription lists:<br /><br />
   <input type="text" name="min" value="<?php print $MinEntries; ?>" /><br /><br />
-  <input type="checkbox" name="auth"<?php
-    if($AuthorDiff) { print ' checked="checked"'; } ?> />
-  History display should show <em>all</em> changes made by the latest
-  author.  Otherwise, show only the last change made.<br />
 
   <hr /><br />
   <input type="submit" name="Save" value="Save" />

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.18,1.19 init.php,1.14,1.15

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32658

Modified Files:
	defaults.php init.php 
Log Message:
Fixed TaviBug:907484 regarding no use of $AuthorDiff

Also fixed missing quotes on LANGUAGE_CODES in init.php

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- defaults.php	2 Dec 2003 22:33:14 -0000	1.18
+++ defaults.php	1 Mar 2004 13:15:41 -0000	1.19
@@ -96,11 +96,6 @@
 //   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;

Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- init.php	16 Dec 2003 20:33:59 -0000	1.14
+++ init.php	1 Mar 2004 13:15:42 -0000	1.15
@@ -40,7 +40,7 @@
            ? $HTTP_COOKIE_VARS[$CookieName] : '';
 
 // Choose a textual language for this wiki
-if (defined(LANGUAGE_CODE)) {
+if (defined('LANGUAGE_CODE')) {
   require('lang/lang_'. LANGUAGE_CODE . '.php');
 } else {
   require('lang/default.php');
@@ -56,8 +56,6 @@
     { $UserName = urldecode($result[1]); }
   if(ereg("days=([[:digit:]]+)", $prefstr, $result))
     { $DayLimit = $result[1]; }
-  if(ereg("auth=([[:digit:]]+)", $prefstr, $result))
-    { $AuthorDiff = $result[1]; }
   if(ereg("min=([[:digit:]]+)", $prefstr, $result))
     { $MinEntries = $result[1]; }
   if(ereg("hist=([[:digit:]]+)", $prefstr, $result))

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.49,1.50

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30396

Modified Files:
	transforms.php 
Log Message:
Fixed TaviBug:907512 regarding timestamps showing as links... Hope it doesn't introduce other errors.

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- transforms.php	10 Feb 2004 23:01:52 -0000	1.49
+++ transforms.php	1 Mar 2004 13:04:09 -0000	1.50
@@ -235,7 +235,7 @@
            { $display = $value; }
        }
      else
-       { $value = "[$match[1]:$match[2] $display]"; }
+       { return $value; } 
   }
 
   if($display == '')

[Tavi-cvs-commit] CVS: tavi/lang default.php,1.2,1.3

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25731

Modified Files:
	default.php 
Log Message:
Errors in the translation modules... 

Index: default.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lang/default.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- default.php	16 Dec 2003 21:15:28 -0000	1.2
+++ default.php	10 Feb 2004 23:30:25 -0000	1.3
@@ -81,14 +81,16 @@
 define('PARSE_EmptyToBeDeleted',
        ' ** Empty, scheduled for deletion ** ');
 define('PARSE_From', 'from'); //ie. SomeThing *from* WantedPages, MacroSomePage
-define('PARSE_ButtonButton', 'Block');
-define('PARSE_ButtonBlock', 'Unblock');
+define('PARSE_ButtonBlock', 'Block');
+define('PARSE_ButtonUnblock', 'Unblock');
 define('PARSE_ButtonSave', 'Save');
 define('PARSE_ButtonPreview', 'Preview');
+define('PARSE_Preferences', 'Preferences');
+define('PARSE_History', 'history'); // note lowercase first character
 
 /* Template directory */
 // Note the change to use only TMPL_ as prefix instead of full TEMPLATE_
-define('TMPL_Adminstration', 'Administration');
+define('TMPL_Administration', 'Administration');
 define('TMPL_EditDocument', 'Edit this document');
 define('TMPL_NoEditDocument', 'This document can\'t be edited');
 define('TMPL_EditArchiveVersion', 

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.34,1.35 latex.php,1.3,1.4

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25673

Modified Files:
	html.php latex.php 
Log Message:
Errors in the translation modules... 

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- html.php	16 Dec 2003 20:25:01 -0000	1.34
+++ html.php	10 Feb 2004 23:30:05 -0000	1.35
@@ -305,7 +305,8 @@
   global $pagestore;
 
   $text = '(' . html_timestamp($time) . ') (' .
-          '<a href="' . historyURL($page) . '">history</a>) ' .
+          '<a href="' . historyURL($page) . '">' .
+          PARSE_History . '</a>) ' .
           html_ref($page, $page);
 
   if(count($twin = $pagestore->twinpages($page)))
@@ -353,7 +354,7 @@
   return html_ref($HomePage, $HomePage) . ' | ' .
          html_ref(PARSE_RecentChanges, PARSE_RecentChanges) . ' | ' .
          (($path!="")? html_parents_top($path) . ' | ' : '') .
-         '<a href="' . $PrefsScript . '">Preferences</a>';
+         '<a href="' . $PrefsScript . '">'. PARSE_Preferences . '</a>';
 }
 function html_history_entry($page, $version, $time, $host, $user, $c1, $c2,
                             $comment)

Index: latex.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/latex.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- latex.php	16 Dec 2003 20:25:01 -0000	1.3
+++ latex.php	10 Feb 2004 23:30:05 -0000	1.4
@@ -215,7 +215,7 @@
   global $HomePage, $PrefsScript;
   return latex_ref($HomePage, $HomePage) . ' | ' .
          latex_ref(PARSE_RecentChanges, PARSE_RecentChanges) . ' | ' .
-         '<a href="' . $PrefsScript . '">Preferences</a>';
+         '<a href="' . $PrefsScript . '">' . PARSE_Preferences . '</a>';
 }
 function latex_history_entry($page, $version, $time, $host, $user, $c1, $c2,
                              $comment)

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.48,1.49

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19791

Modified Files:
	transforms.php 
Log Message:
And another bug regarding <code>/<phpcode> at the start of the text

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- transforms.php	10 Feb 2004 22:41:26 -0000	1.48
+++ transforms.php	10 Feb 2004 23:01:52 -0000	1.49
@@ -41,7 +41,7 @@
 // need to be parsed in this section as well
 
   // Parse the code sections, to escape them from the line control
-  $text = preg_replace("/\n\s*<((?:php)?code)>\s*\n(.*\n)\s*<\\/\\1>\s*(?=\n|$)/Usei", 
+  $text = preg_replace("/(?:^|\n)\s*<((?:php)?code)>\s*\n(.*\n)\s*<\\/\\1>\s*(?=\n|$)/Usei", 
                        "q1('\n').code_token('\\1',q1('\\2'))", $text); 
   
   // Insert page breaks to lines ending in a double \

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.47,1.48

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15373

Modified Files:
	transforms.php 
Log Message:
Fixed some bugs regarding line continuation and erasing of characters.

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- transforms.php	2 Dec 2003 22:20:16 -0000	1.47
+++ transforms.php	10 Feb 2004 22:41:26 -0000	1.48
@@ -43,13 +43,14 @@
   // Parse the code sections, to escape them from the line control
   $text = preg_replace("/\n\s*<((?:php)?code)>\s*\n(.*\n)\s*<\\/\\1>\s*(?=\n|$)/Usei", 
                        "q1('\n').code_token('\\1',q1('\\2'))", $text); 
-
-  // Concatenate lines ending in a single \
-  $text = preg_replace("/([^\\\])\\\\\n\s*/s", " ", $text);
-
+  
   // Insert page breaks to lines ending in a double \
   $text = preg_replace("/\\\\\\\\\n\s*/se", "new_entity(array('newline'))", 
                        $text);
+  
+  // Concatenate lines ending in a single \
+  $text = preg_replace("/\\\\\n[ \t]*/s", " ", $text);
+
   return $text;
 }
 

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

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv4560

Modified Files:
	NEWS.txt 
Log Message:
Here comes version 0.25... ;-)

Index: NEWS.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/NEWS.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- NEWS.txt	8 Sep 2003 12:38:16 -0000	1.9
+++ NEWS.txt	16 Dec 2003 21:24:25 -0000	1.10
@@ -4,6 +4,14 @@
 ---------------------
 See also ChangeLog.txt for more details of changes.
 
+2003-12-16  Even Holen <eve...@pv...
+  WikkiTikkiTavi version 0.25 is released. A lot has been changed and added
+  since the last releases, but some of the most prominient changes are better
+  support of TaviSubpages, fully compliant xthml-coding including proper
+  handling of paragraphs, better and wider support of UTF-8, and quite a few
+  bug fixes which has been long overdue. 
+  
+
 2003-09-08  Even Holen <eve...@pv...>
   WikkiTikkiTavi version 0.24 is released. And this file hasn't been updated
   in a while. Changes since version 0.21 includes lots of bug fixes and minor

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.16,1.17

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi
In directory sc8-pr-cvs1:/tmp/cvs-serv3486

Modified Files:
	ChangeLog.txt 
Log Message:
Here comes version 0.25... ;-)

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog.txt	28 Oct 2003 16:54:45 -0000	1.16
+++ ChangeLog.txt	16 Dec 2003 21:20:12 -0000	1.17
@@ -2,6 +2,20 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+2003-12-16 Even Holen <evenh+tavi$pvv.ntnu.no>
+  * ** Version 0.25 released **
+  * Added system to allow for translation of user interface
+  
+2003-12-01 Even Holen <eve...@pv...>
+  * Implemented text enhancement, optionally controlled by $EnableTextEnhance
+  * Improved diff compatability regarding safe mode and detection of diff-cmd
+  * Allowed for file in URLs and InterWikis
+
+2003-11-12 Even Holen <eve...@pv...>
+  * Fixed another validation bug regarding interwiki and sisterwiki
+  * Fixed bug regarding $ExpireLen=0
+  * Fixed bug regarding negative timezone offset
+
 2003-10-28 Even Holen <eve...@pv...>
   * Fixed validation bugs, and now it validates as XHtml 1.0 strict again
 

[Tavi-cvs-commit] CVS: tavi/lang default.php,1.1,1.2

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv2333

Modified Files:
	default.php 
Log Message:
The default version of the user interface

Index: default.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lang/default.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- default.php	16 Dec 2003 17:22:04 -0000	1.1
+++ default.php	16 Dec 2003 21:15:28 -0000	1.2
@@ -1,25 +1,129 @@
 <?php
-/** This file provides the textual interface of WikkiTikkiTavi
- * For more information see http://tavi.sourceforge.net
+/** 
+ *   This file provides the textual interface of WikkiTikkiTavi
+ * For more information see http://tavi.sourceforge.net/TaviTranslation
  *
- * On translation:
- *   If you want to translate 'Tavi into another language, please use this
- * as basis and translate the second parameter in each and every define()
- * The first part of the name indicates which directory the constant are
- * used, and the second part the meaning.
- *   I.e. define(PARSE_RecentChanges, 'RecentChanges') indicates that this
- * value is used within the parse subdirectory, and that it's value is 
- * something regarding RecentChanges. This example aptly names the 
- * RecentChanges page...
+ *   This file is divided into the sections according to subdirectories of 
+ * where the constants are used. So that the constant PARSE_RecentChanges are
+ * to be found somewhere within the parse-subdirectory.
+ *
+ *   See http://tavi.sourceforge.net/TaviTranslation for notes on how to 
+ * translate the file into another language, and how to publish your changes.
+ * Please do contribute to make 'Tavi available in multiple languages. 
+ *   The gist of translation, is to copy this file and translate it. Store the
+ * resulting work as lang_XX.php, where XX denotes the two characters used to
+ * describe the language. And after that to add a line like the following to
+ * your config.php:
+ *   define(LANGUAGE_CODE, 'fr');
+ * Using 'fr' for the french version, if available.
  */
 
-/* This file is divided into the sections provided by the different 
- * subdirectories, and if needed by the file where the constants are used
- * /
+/* General messages */
+define('GEN_ErrorSuffix', 
+       '<br />Please contact the <a href="mailto:' . 
+       $Admin . '">administrator</a> for assistance.');
+
+/* action-directory */
+define('ACTION_RateControlIpBlocking', 'Rate control / IP blocking disabled');
+define('ACTION_LockUnlockPages', 'Lock / unlock pages');
+define('ACTION_BLockUnblockHosts', 'Block / unblock hosts');
+define('ACTION_ErrorNameMatch',
+       'You have entered an invalid user name.' . GEN_ErrorSuffix);
+define('ACTION_ErrorAdminDisabled',
+       'Administration features are disabled for this wiki.'.GEN_ErrorSuffix);
+define('ACTION_ErrorPageLocked',
+       'The page you have tried to edit is locked.' . GEN_ErrorSuffix);
 
 /* lib-directory */
-define('LIB_RateControlIpBlocking', 'Rate control / IP blocking disabled');
-define('LIB_LockUnlockPages', 'Lock / unlock pages');
-define('LIB_BLockUnblockHosts', 'Block / unblock hosts');
+define('LIB_ErrorDatabaseQuery', 
+       'Error executing database query.' . GEN_ErrorSuffix);
+define('LIB_ErrorDatabaseConnect', 
+       'Error connecting to database.' . GEN_ErrorSuffix); 
+define('LIB_ErrorDatabaseSelect', 
+       'Error selecting database.' . GEN_ErrorSuffix); 
+define('LIB_ErrorCreatingTemp', 
+       'Error creating temporary file.' . GEN_ErrorSuffix);
+define('LIB_ErrorWritingTemp',
+       'Error writing to temporary file.' . GEN_ErrorSuffix);
+// The next two entries are parsed through the wiki engine, so leave the \'\'
+// to get bolded entries... And the escaping of $!DiffCmd...   ;)
+define('LIB_NoDiffAvailableSafeMode',
+       '\'\'No diff available, due to wrong location of diffcmd. It should '.
+       'have been inside '. ini_get("safe_mode_exec_dir") .
+       'but is located at '. $DiffCmd .'. Please relocate diffcmd or '.
+       'make sysAdmins create symbolic links into this directory. Also '.
+       'remember to change configuration of $!DiffCmd accordingly.\'\'');       
+define('LIB_NoDiffAvailable',
+       '\'\'No diff available. $!DiffCmd points to ' . $DiffCmd .
+       ' which doesn\'t exist or isn\'t readable\'\'');
+define('LIB_ErrorDeniedAccess',
+       'You have been denied access to this site.' . GEN_ErrorSuffix);
+define('LIB_ErrorRateExceeded',
+       'You have exeeded the number of pages you are allowed to visit in a '.
+       'given period of time.  Please return later.' . GEN_ErrorSuffix);
+define('LIB_ErrorInvalidPage',
+       'Invalid page name.' . GEN_ErrorSuffix);
 
-/* action-directory */
\ No newline at end of file
+/* parse-directory */
+define('PARSE_Added', 'Added: ');
+define('PARSE_Changed', 'Changed: ');
+define('PARSE_Deleted', 'Deleted: ');
+define('PARSE_Never', 'Never'); 
+// The next two entries, are joined with a counting variable inbetween
+define('PARSE_CompleteListStart', 'See complete list (');
+define('PARSE_CompleteListEnd',   ' entries)');
+define('PARSE_RecentChanges', 'RecentChanges');
+define('PARSE_Locked', 'Locked');
+define('PARSE_BlockedRange', 'Blocked IP address ranges');
+define('PARSE_EnterIpRange', 
+       'Enter IP address range in form <tt>12.*</tt>, <tt>34.56.*</tt>, or ' .
+       '<tt>78.90.123.*</tt>');
+define('PARSE_EmptyToBeDeleted',
+       ' ** Empty, scheduled for deletion ** ');
+define('PARSE_From', 'from'); //ie. SomeThing *from* WantedPages, MacroSomePage
+define('PARSE_ButtonButton', 'Block');
+define('PARSE_ButtonBlock', 'Unblock');
+define('PARSE_ButtonSave', 'Save');
+define('PARSE_ButtonPreview', 'Preview');
+
+/* Template directory */
+// Note the change to use only TMPL_ as prefix instead of full TEMPLATE_
+define('TMPL_Adminstration', 'Administration');
+define('TMPL_EditDocument', 'Edit this document');
+define('TMPL_NoEditDocument', 'This document can\'t be edited');
+define('TMPL_EditArchiveVersion', 
+       'Edit this <em>ARCHIVE VERSION</em> of this document');
+// Next entry is followed by a date as produced by html_time()
+define('TMPL_ViewDocHistory', 'View document history');
+define('TMPL_DocLastModified', 'Document last modified');
+define('TMPL_TwinPages', 'Twin pages:');
+define('TMPL_Search', 'Search:');
+define('TMPL_Editing', 'Editing');
+define('TMPL_WarningOtherEditing',
+       'Warning: since you started editing, this document has been changed '.
+       'by someone else.  Please merge your edits into the current version '.
+       'of this document.' );
+define('TMPL_CurrentVersion', 'Current Version');
+define('TMPL_ButtonSave', 'Save');
+define('TMPL_ButtonPreview', 'Preview');
+define('TMPL_YourUsername', 'Your user name is');
+define('TMPL_VisitPrefs', 
+       'Visit <a href="'. $PrefsScript. '">Preferences</a> to set '.
+       'your user name');
+define('TMPL_SummaryOfChange', 'Summary of change:');
+define('TMPL_AddToCategory', 'Add document to category:');
+define('TMPL_YourChanges', 'Your changes');
+define('TMPL_PreviewCurrentVersion', 'Preview of Current Version');
+define('TMPL_DifferencesIn', 'Differences In');
+define('TMPL_DifferenceBetweenVersions', 'Difference between versions:');
+define('TMPL_Find', 'Find');
+define('TMPL_HistoryOf', 'History of');
+define('TMPL_Older', 'Older');
+define('TMPL_Newer', 'Newer');
+define('TMPL_ButtonComputeDifference', 'Compute Difference');
+define('TMPL_ChangesLastAuthor', 'Changes by last author:');
+define('TMPL_Prefs', 'Preferences');
+define('TMPL_Previewing', 'Previewing');
+define('TMPL_Preview', 'Preview');
+
+?>

[Tavi-cvs-commit] CVS: tavi/lib init.php,1.13,1.14

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv24058

Modified Files:
	init.php 
Log Message:
Changed into using the constants of the new language system, and changed the require section used to match the online documentation of http://tavi.sourceforge.net/TaviTranslation


Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- init.php	16 Dec 2003 18:07:46 -0000	1.13
+++ init.php	16 Dec 2003 20:33:59 -0000	1.14
@@ -41,9 +41,9 @@
 
 // Choose a textual language for this wiki
 if (defined(LANGUAGE_CODE)) {
-  require("lang/". LANGUAGE_CODE);
+  require('lang/lang_'. LANGUAGE_CODE . '.php');
 } else {
-  require("lang/default.php");
+  require('lang/default.php');
 }
 
 if(!empty($prefstr))

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

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/template
In directory sc8-pr-cvs1:/tmp/cvs-serv22489

Modified Files:
	admin.php common.php conflict.php diff.php edit.php find.php 
	history.php prefs.php preview.php 
Log Message:
Changed into using the constants of the new language system

Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/admin.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- admin.php	22 Feb 2002 14:46:09 -0000	1.11
+++ admin.php	16 Dec 2003 20:29:27 -0000	1.12
@@ -12,8 +12,8 @@
 function template_admin($args)
 {
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Administration',
-                                 'heading'  => 'Administration',
+                                 'title'    => TMPL_Administration,
+                                 'heading'  => TMPL_Administration,
                                  'headlink' => '',
                                  'headsufx' => '',
                                  'toolbar'  => 0));

Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- common.php	28 Oct 2003 16:47:34 -0000	1.12
+++ common.php	16 Dec 2003 20:29:27 -0000	1.13
@@ -120,18 +120,16 @@
   {
     if($args['editver'] == 0)
     {
-?>  <a href="<?php print editURL($args['edit']); ?>">Edit this document</a><?php
+      echo '<a href="'. editUrl($args['edit']) . '">'.TMPL_EditDocument.'</a>'; 
     }
     else if($args['editver'] == -1)
     {
-?>    This document cannot be edited <?php
+      echo TMPL_NoEditDocument;
     }
     else
     {
-?>
-  <a href="<?php print editURL($args['edit'], $args['editver']); ?>">
-  Edit this <em>ARCHIVE VERSION</em> of this document</a>
-<?php
+      echo '<a href="' . editUrl($args['edit'], $args['editver']) . '">'.
+           TMPL_EditArchiveVersion . '</a>';
     }
 
     if($args['history'])
@@ -139,25 +137,21 @@
   }
   if($args['history'])
   {
-?>
-    <a href="<?php print historyURL($args['history']); ?>">View document history</a><br />
-<?php
+    echo '<a href="'. historyURL($args['history']). '">'.
+         TMPL_ViewDocHistory . '</a><br />';
   }
   if($args['timestamp'])
   {
-?>
-</div>
-  Document last modified <?php print html_time($args['timestamp']); ?><br />
-<?php
+    echo "\n</div>\n". TMPL_DocLastModified . ' '. 
+         html_time($args['timestamp']) . '<br />';
   }
   if($args['twin'] != '')
   {
     if(count($twin = $pagestore->twinpages($args['twin'])))
     {
-?>Twin pages: <?php
+      echo TMPL_TwinPages . ' ';
       for($i = 0; $i < count($twin); $i++)
-        { print html_twin($twin[$i][0], $twin[$i][1]) . ' '; } ?>
-<br /><?php
+        { print html_twin($twin[$i][0], $twin[$i][1]) . ' <br />'; } 
     }
   }
   if(!$args['nosearch'])
@@ -166,7 +160,7 @@
 <form method="get" action="<?php print $FindScript; ?>">
 <div class="form">
   <input type="hidden" name="action" value="find" />
-  Search: <input type="text" name="find" size="20" />
+  <?php print TMPL_Search; ?> <input type="text" name="find" size="20" />
 </div>
 </form>
 <?php

Index: conflict.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/conflict.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- conflict.php	22 Feb 2002 14:46:09 -0000	1.10
+++ conflict.php	16 Dec 2003 20:29:27 -0000	1.11
@@ -21,30 +21,24 @@
   global $EditRows, $EditCols, $UserName, $PrefsScript;
 
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Editing ' . $args['page'],
-                                 'heading'  => 'Editing ',
+                                 'title'    => TMPL_Editing .' '. $args['page'],
+                                 'heading'  => TMPL_Editing .' ',
                                  'headlink' => $args['page'],
                                  'headsufx' => '',
                                  'toolbar'  => 1));
 ?>
 <div id="body">
-<p class="warning">
-  Warning: since you started editing, this document has been changed by someone
-  else.  Please merge your edits into the current version of this document.
-</p>
-<h1>Current Version</h1>
+<p class="warning"><?php print TMPL_WarningOtherEditing; ?></p>
+<h1><?php print TMPL_CurrentVersion; ?></h1>
 <form method="post" action="<?php print saveURL($args['page']); ?>">
 <div class="form">
-  <input type="submit" name="Save" value="Save" />
-  <input type="submit" name="Preview" value="Preview" />
+  <input type="submit" name="Save" value="<?php print TMPL_ButtonSave; ?>" />
+  <input type="submit" name="Preview" value="<?php print TMPL_ButtonPreview; ?>" />
 <?php
   if($UserName != '')
-    { print 'Your user name is ' . html_ref($UserName, $UserName); }
+    { print TMPL_YourUsername .' '. html_ref($UserName, $UserName); }
   else
-  {
-?>  Visit <a href="<?php print $PrefsScript; ?>">Preferences</a> to set your
-user name<?php
-  }
+    { echo TMPL_VisitPrefs . "\n"; }
 ?><br />
   <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" />
   <textarea name="document" rows="<?php
@@ -52,12 +46,12 @@
     print $EditCols; ?>" wrap="virtual"><?php
   print str_replace('<', '&lt;', str_replace('&', '&amp;', $args['text']));
 ?></textarea><br />
-  Summary of change:
+  <?php echo TMPL_SummaryOfChange; ?>
   <input type="text" name="comment" size="40" value="" /><br />
-  Add document to category:
+  <?php echo TMPL_AddToCategory; ?> 
   <input type="text" name="categories" size="40" value="" />
 <hr />
-<h1>Your changes</h1>
+<h1><?php echo TMPL_YourChanges; ?></h1>
   <textarea name="discard" rows="<?php
     print $EditRows; ?>" cols="<?php
     print $EditCols; ?>" wrap="virtual"><?php
@@ -65,7 +59,7 @@
 ?></textarea><br />
 </div>
 </form>
-<h1>Preview of Current Version</h1>
+<h1><?php echo TMPL_PreviewCurrentVersion; ?></h1>
 <?php
   print $args['html'];
 ?>

Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/diff.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- diff.php	22 Feb 2002 14:46:09 -0000	1.11
+++ diff.php	16 Dec 2003 20:29:27 -0000	1.12
@@ -15,14 +15,14 @@
 function template_diff($args)
 {
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Differences in ' . $args['page'],
-                                 'heading'  => 'Differences in ',
+                                 'title'    => TMPL_DifferencesIn .' '. $args['page'],
+                                 'heading'  => TMPL_DifferencesIn .' ',
                                  'headlink' => $args['page'],
                                  'headsufx' => '',
                                  'toolbar'  => 1));
 ?>
 <div id="body">
-<strong>Difference between versions:</strong><br /><br />
+<strong><?php echo TMPL_DifferenceBetweenVersions; ?></strong><br /><br />
 <?php print $args['diff_html']; ?>
 <hr />
 <?php print $args['html']; ?>

Index: edit.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/edit.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- edit.php	22 Feb 2002 14:46:09 -0000	1.10
+++ edit.php	16 Dec 2003 20:29:27 -0000	1.11
@@ -18,8 +18,8 @@
   global $EditRows, $EditCols, $UserName, $PrefsScript;
 
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Editing ' . $args['page'],
-                                 'heading'  => 'Editing ',
+                                 'title'    => TMPL_Editing .' '. $args['page'],
+                                 'heading'  => TMPL_Editing .' ',
                                  'headlink' => $args['page'],
                                  'headsufx' => '',
                                  'toolbar'  => 1));
@@ -27,17 +27,14 @@
 <div id="body">
 <form method="post" action="<?php print saveURL($args['page']); ?>">
 <div class="form">
-  <input type="submit" name="Save" value="Save" />
-  <input type="submit" name="Preview" value="Preview" />
+<input type="submit" name="Save" value="<?php echo TMPL_ButtonSave; ?>" />
+<input type="submit" name="Preview" value="<?php echo TMPL_ButtonPreview; ?>" />
 <?php
   if($UserName != '')
-    { print 'Your user name is ' . html_ref($UserName, $UserName); }
+    { print TMPL_YourUsername .' '. html_ref($UserName, $UserName); }
   else
-  {
-?>  Visit <a href="<?php print $PrefsScript; ?>">Preferences</a> to set your
-user name<?php
-  }
-?><br />
+  { echo TMPL_VisitPrefs . "\n"; }
+ ?><br />
   <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" />
 <?php  if($args['archive'])
     {?>
@@ -48,9 +45,9 @@
     print $EditCols; ?>" wrap="virtual"><?php
   print str_replace('<', '&lt;', str_replace('&', '&amp;', $args['text']));
 ?></textarea><br />
-  Summary of change:
+  <?php echo TMPL_SummaryOfChange; ?>
   <input type="text" name="comment" size="40" value="" /><br />
-  Add document to category:
+  <?php echo TMPL_AddToCategory; ?>
   <input type="text" name="categories" size="40" value="" />
 </div>
 </form>

Index: find.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/find.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- find.php	22 Feb 2002 14:46:09 -0000	1.11
+++ find.php	16 Dec 2003 20:29:27 -0000	1.12
@@ -13,8 +13,8 @@
 function template_find($args)
 {
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Find ' . $args['find'],
-                                 'heading'  => 'Find ' . $args['find'],
+                                 'title'    => TMPL_Find .' '. $args['find'],
+                                 'heading'  => TMPL_Find .' '. $args['find'],
                                  'headlink' => '',
                                  'headsufx' => '',
                                  'toolbar'  => 1));

Index: history.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/history.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- history.php	22 Feb 2002 14:46:09 -0000	1.12
+++ history.php	16 Dec 2003 20:29:27 -0000	1.13
@@ -15,8 +15,8 @@
   global $DiffScript;
 
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'History of ' . $args['page'],
-                                 'heading'  => 'History of ',
+                                 'title'    => TMPL_HistoryOf .' '. $args['page'],
+                                 'heading'  => TMPL_HistoryOf .' ',
                                  'headlink' => $args['page'],
                                  'headsufx' => '',
                                  'toolbar'  => 1));
@@ -27,20 +27,20 @@
     <input type="hidden" name="action" value="diff" />
     <input type="hidden" name="page" value="<?php print $args['page']; ?>" />
 <table border="0">
-  <tr><td><strong>Older</strong></td>
-      <td><strong>Newer</strong></td><td></td></tr>
+  <tr><td><strong><?php echo TMPL_Older; ?></strong></td>
+      <td><strong><?php echo TMPL_Newer; ?></strong></td><td></td></tr>
 <?php
   print $args['history'];
 
 ?>
   <tr><td colspan="3">
-    <input type="submit" value="Compute Difference" /></td></tr>
+    <input type="submit" value="<?php echo TMPL_ButtonComputeDifference; ?>" /></td></tr>
 </table>
   </div>
   </form>
 <hr /><br />
 
-<strong>Changes by last author:</strong><br /><br />
+<strong><?php echo TMPL_ChangesLastAuthor; ?></strong><br /><br />
 
 <?php print $args['diff']; ?>
 </div>

Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- prefs.php	22 Feb 2002 14:46:09 -0000	1.12
+++ prefs.php	16 Dec 2003 20:29:27 -0000	1.13
@@ -10,8 +10,8 @@
   global $AuthorDiff, $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
 
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Preferences',
-                                 'heading'  => 'Preferences',
+                                 'title'    => TMPL_Prefs,
+                                 'heading'  => TMPL_Prefs,
                                  'headlink' => '',
                                  'headsufx' => '',
                                  'toolbar'  => 0));

Index: preview.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/preview.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- preview.php	22 Feb 2002 14:46:09 -0000	1.10
+++ preview.php	16 Dec 2003 20:29:27 -0000	1.11
@@ -19,8 +19,8 @@
   global $EditRows, $EditCols, $categories, $UserName, $comment, $PrefsScript;
 
   template_common_prologue(array('norobots' => 1,
-                                 'title'    => 'Previewing ' . $args['page'],
-                                 'heading'  => 'Previewing ',
+                                 'title'    => TMPL_Previewing .' '. $args['page'],
+                                 'heading'  => TMPL_Previewing .' ',
                                  'headlink' => $args['page'],
                                  'headsufx' => '',
                                  'toolbar'  => 1));
@@ -28,16 +28,13 @@
 <div id="body">
 <form method="post" action="<?php print saveURL($args['page']); ?>">
 <div class="form">
-  <input type="submit" name="Save" value="Save" />
-  <input type="submit" name="Preview" value="Preview" />
+  <input type="submit" name="Save" value="<?php echo TMPL_ButtonSave; ?>" />
+  <input type="submit" name="Preview" value="<?php echo TMPL_ButtonPreview; ?>" />
 <?php
   if($UserName != '')
-    { print 'Your user name is ' . html_ref($UserName, $UserName); }
+    { print TMPL_YourUsername . ' '. html_ref($UserName, $UserName); }
   else
-  {
-?>  Visit <a href="<?php print $PrefsScript; ?>">Preferences</a> to set your
-user name<?php
-  }
+    { echo TMPL_VisitPrefs . "\n"; }
 ?><br />
   <input type="hidden" name="nextver" value="<?php print $args['nextver']; ?>" />
 <?php  if($args['archive'])
@@ -49,15 +46,15 @@
     print $EditCols; ?>" wrap="virtual"><?php
   print str_replace('<', '&lt;', str_replace('&', '&amp;', $args['text']));
 ?></textarea><br />
-  Summary of change:
+  <?php echo TMPL_SummaryOfChange; ?>
   <input type="text" name="comment" size="40" value="<?php
     print $comment; ?>" /><br />
-  Add document to category:
+  <?php echo TMPL_AddToCategory; ?>
   <input type="text" name="categories" size="40" value="<?php
     print $categories; ?>" />
 </div>
 </form>
-<h1>Preview</h1>
+<h1><?php echo TMPL_Preview; ?></h1>
 <hr />
 <?php print $args['html']; ?>
 </div>

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.33,1.34 latex.php,1.2,1.3 macros.php,1.18,1.19

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv21458

Modified Files:
	html.php latex.php macros.php 
Log Message:
Changed into using the constants of the new language system

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- html.php	2 Dec 2003 22:20:16 -0000	1.33
+++ html.php	16 Dec 2003 20:25:01 -0000	1.34
@@ -117,11 +117,11 @@
 function html_diff_end()
   { return '</td></tr></table>'; }
 function html_diff_add()
-  { return html_bold_start() . 'Added:' . html_bold_end(); }
+  { return html_bold_start() . PARSE_Added . html_bold_end(); }
 function html_diff_change()
-  { return html_bold_start() . 'Changed:' . html_bold_end(); }
+  { return html_bold_start() . PARSE_Changed . html_bold_end(); }
 function html_diff_delete()
-  { return html_bold_start() . 'Deleted:' . html_bold_end(); }
+  { return html_bold_start() . PARSE_Deleted . html_bold_end(); }
 function html_table_start($args)
 {
   if ($args != '') {
@@ -228,7 +228,7 @@
 function html_time($timestamp)
 {
   global $TimeZoneOff;
-  if($timestamp == '') { return 'never'; }
+  if($timestamp == '') { return PARSE_Never; }
   $time = mktime(substr($timestamp, 8, 2),  substr($timestamp, 10, 2),
                  substr($timestamp, 12, 2), substr($timestamp, 4, 2),
                  substr($timestamp, 6, 2),  substr($timestamp, 0, 4));
@@ -329,13 +329,14 @@
 function html_fulllist($page, $count)
 {
   return '<strong><a href="' . viewURL($page, '', 1) . '">' .
-         'See complete list (' . $count . ' entries)</a></strong>';
+         PARSE_CompleteListStart . $count . PARSE_CompleteListEnd .
+         '</a></strong>';
 }
 function html_fullhistory($page, $count)
 {
-  return '<tr><td colspan="3"><strong><a href="' . historyURL($page, 1) .
-         '">' .  'See complete list (' . $count .
-         ' entries)</a></strong></td></tr>';
+  return '<tr><td colspan="3"><strong><a href="' . historyURL($page, 1) . '">'.
+         PARSE_CompleteListStart . $count . PARSE_CompleteListEnd .
+         '</a></strong></td></tr>';
 }
 function html_parents_top($path)
 {
@@ -350,7 +351,7 @@
 {
   global $HomePage, $PrefsScript;
   return html_ref($HomePage, $HomePage) . ' | ' .
-         html_ref('RecentChanges', 'RecentChanges') . ' | ' .
+         html_ref(PARSE_RecentChanges, PARSE_RecentChanges) . ' | ' .
          (($path!="")? html_parents_top($path) . ' | ' : '') .
          '<a href="' . $PrefsScript . '">Preferences</a>';
 }
@@ -379,13 +380,13 @@
   return '<form method="post" action="' . $AdminScript . "\">\n" .
          '<div class="form">' . "\n" .
          '<input type="hidden" name="locking" value="1" />' . "\n" .
-         html_bold_start() . 'Locked' . html_bold_end() . html_newline();
+         html_bold_start() . PARSE_Locked . html_bold_end() . html_newline();
 }
 function html_lock_end($count)
 {
   return '<input type="hidden" name="count" value="' . $count . '" />' . "\n" .
-         '<input type="submit" name="Save" value="Save" />' . "\n" .
-         '</div>' . "\n" .
+         '<input type="submit" name="Save" value="'. PARSE_ButtonSave .'" />'.
+         "\n" . '</div>' . "\n" .
          '</form>' . "\n";
 }
 function html_lock_page($page, $mutable)
@@ -400,8 +401,7 @@
 }
 function html_rate_start()
 {
-  return '<br /><strong>Blocked IP address ranges</strong>' .
-         "\n<dl>\n";
+  return '<br /><strong>'. PARSE_BlockedRange. "</strong>\n<dl>\n";
 }
 function html_rate_end()
 {
@@ -411,12 +411,13 @@
          '<form method="post" action="' . $AdminScript . "\">\n" .
          '<div class="form">' . "\n" .
          '<input type="hidden" name="blocking" value="1" />' . "\n" .
-         'Enter IP address range in form <tt>12.*</tt>, <tt>34.56.*</tt>, or ' .
-         '<tt>78.90.123.*</tt><br />' . "\n" .
+         PARSE_EnterIpRange . "<br />\n" . 
          '<input type="text" name="address" value="" size="40" /><br />' .
          "\n" .
-         '<input type="submit" name="Block" value="Block" />' . "\n" .
-         '<input type="submit" name="Unblock" value="Unblock" />' . "\n" .
+         '<input type="submit" name="Block" value="'.PARSE_ButtonBlock.'" />'.
+         "\n" .
+         '<input type="submit" name="Unblock" value="'. PARSE_ButtonUnblock.
+         '" />' . "\n" .
          '</div>' . "\n";
          '</form>' . "\n";
 }

Index: latex.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/latex.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- latex.php	28 Apr 2003 00:23:01 -0000	1.2
+++ latex.php	16 Dec 2003 20:25:01 -0000	1.3
@@ -201,19 +201,20 @@
 function latex_fulllist($page, $count)
 {
   return '<strong><a href="' . viewURL($page, '', 1) . '">' .
-         'See complete list (' . $count . ' entries)</a></strong>';
+         PARSE_CompleteListStart . $count . PARSE_CompleteListEnd .
+         '</a></strong>';
 }
 function latex_fullhistory($page, $count)
 {
-  return '<tr><td colspan="3"><strong><a href="' . historyURL($page, 1) .
-         '">' .  'See complete list (' . $count .
-         ' entries)</a></strong></td></tr>';
+  return '<tr><td colspan="3"><strong><a href="' . historyURL($page, 1) .'">'. 
+         PARSE_CompleteListStart . $count . PARSE_CompleteListEnd .
+         '</a></strong></td></tr>';
 }
 function latex_toolbar_top()
 {
   global $HomePage, $PrefsScript;
   return latex_ref($HomePage, $HomePage) . ' | ' .
-         latex_ref('RecentChanges', 'RecentChanges') . ' | ' .
+         latex_ref(PARSE_RecentChanges, PARSE_RecentChanges) . ' | ' .
          '<a href="' . $PrefsScript . '">Preferences</a>';
 }
 function latex_history_entry($page, $version, $time, $host, $user, $c1, $c2,
@@ -240,13 +241,13 @@
 
   return '<form method="post" action="' . $AdminScript . "\">\n" .
          '<input type="hidden" name="locking" value="1" />' . "\n" .
-         latex_bold_start() . 'Locked' . latex_bold_end() . latex_newline();
+         latex_bold_start() . PARSE_Locked . latex_bold_end() . latex_newline();
 }
 function latex_lock_end($count)
 {
   return '<input type="hidden" name="count" value="' . $count . '" />' . "\n" .
-         '<input type="submit" name="Save" value="Save" />' . "\n" .
-         '</form>' . "\n";
+         '<input type="submit" name="Save" value="'.PARSE_ButtonSave.'" />' . 
+         "\n" . '</form>' . "\n";
 }
 function latex_lock_page($page, $mutable)
 {
@@ -260,8 +261,7 @@
 }
 function latex_rate_start()
 {
-  return '<br /><strong>Blocked IP address ranges</strong>' .
-         "\n<dl>\n";
+  return '<br /><strong>' . PARSE_BlockedRange. "</strong>\n<dl>\n";
 }
 function latex_rate_end()
 {
@@ -270,12 +270,13 @@
   return "</dl>\n" .
          '<form method="post" action="' . $AdminScript . "\">\n" .
          '<input type="hidden" name="blocking" value="1" />' . "\n" .
-         'Enter IP address range in form <tt>12.*</tt>, <tt>34.56.*</tt>, or ' .
-         '<tt>78.90.123.*</tt><br />' . "\n" .
+         PARSE_EnterIpRange . "<br />\n" .
          '<input type="text" name="address" value="" size="40" /><br />' .
          "\n" .
-         '<input type="submit" name="Block" value="Block" />' . "\n" .
-         '<input type="submit" name="Unblock" value="Unblock" />' . "\n" .
+         '<input type="submit" name="Block" value="'. PARSE_ButtonBlock . 
+         '" />' . "\n" .
+         '<input type="submit" name="Unblock" value="'. PARSE_ButtonUnblock . 
+         '" />' . "\n" .
          '</form>' . "\n";
 }
 function latex_rate_entry($address)

Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- macros.php	20 Sep 2003 21:10:52 -0000	1.18
+++ macros.php	16 Dec 2003 20:25:01 -0000	1.19
@@ -143,7 +143,7 @@
 
       $text = $text . html_ref($page[1], $page[1]);
       if ($page[4] == 0 ) {
-        $text .= " ** Empty, scheduled for deletion ** ";
+        $text .= PARSE_EmptyToBeDeleted;
       }
     }
   }
@@ -196,14 +196,15 @@
          $q2 = $pagestore->dbh->query("SELECT l.page, l.link from $LkTbl as l ".
                                       "WHERE l.link = '". $result[0] ."'");
 
-         $deref = ' from ';
+         $deref = ' ' . PARSE_From . ' ';
          while (($res2 = $pagestore->dbh->result($q2))) {
            $deref .= html_url(editUrl($res2[0]), '?'.$res2[0]) . ', ';
          }
 
          $deref = preg_replace("/, $/", "", $deref);
       } else {
-         $deref = ' from '. html_url(editURL($result[2]), '?'.$result[2]);
+         $deref = ' ' . PARSE_From . ' ' . 
+                  html_url(editURL($result[2]), '?'.$result[2]);
       }
     } else {
       $deref = '';

[Tavi-cvs-commit] CVS: tavi/action admin.php,1.2,1.3 edit.php,1.6,1.7 prefs.php,1.6,1.7 save.php,1.9,1.10

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/action
In directory sc8-pr-cvs1:/tmp/cvs-serv21000

Modified Files:
	admin.php edit.php prefs.php save.php 
Log Message:
Changed into using the constants of the new language system

Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- admin.php	22 Feb 2002 14:46:08 -0000	1.2
+++ admin.php	16 Dec 2003 20:23:08 -0000	1.3
@@ -10,7 +10,7 @@
 require('template/admin.php');
 
 if($AdminEnabled != 1)
-  { die($ErrorAdminDisabled); }
+  { die(ACTION_ErrorAdminDisabled); }
 
 // Harvest script parameters.
 
@@ -106,7 +106,7 @@
     if($RatePeriod == 0)
     {
       $html = $html . html_bold_start() .
-              'Rate control / IP blocking disabled' .
+              ACTION_RateControlIpBlocking .
               html_bold_end() . html_newline();
     }
 
@@ -131,10 +131,10 @@
 else                                    // Display main menu for admin.
 {
   template_admin(array('html' => html_url($AdminScript . '?locking=1',
-                                          'Lock / unlock pages') .
+                                          ACTION_LockUnlockPages) .
                                  html_newline() .
                                  html_url($AdminScript . '?blocking=1',
-                                          'Block / unblock hosts') .
+                                          ACTION_BLockUnblockHosts) .
                                  html_newline()));
 }
 

Index: edit.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/edit.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- edit.php	7 Jan 2002 16:28:32 -0000	1.6
+++ edit.php	16 Dec 2003 20:23:08 -0000	1.7
@@ -7,13 +7,13 @@
 // Edit a page (possibly an archive version).
 function action_edit()
 {
-  global $page, $pagestore, $ParseEngine, $version, $ErrorPageLocked;
+  global $page, $pagestore, $ParseEngine, $version;
 
   $pg = $pagestore->page($page);
   $pg->read();
 
   if(!$pg->mutable)
-    { die($ErrorPageLocked); }
+    { die(ACTION_ErrorPageLocked); }
 
   $archive = 0;
   if($version != '')

Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/prefs.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prefs.php	7 Jan 2002 16:28:32 -0000	1.6
+++ prefs.php	16 Dec 2003 20:23:08 -0000	1.7
@@ -7,14 +7,14 @@
 function action_prefs()
 {
   global $Save, $referrer, $user, $rows, $cols, $days, $min, $auth, $hist;
-  global $CookieName, $ErrorNameMatch, $tzoff;
+  global $CookieName, $tzoff;
 
   if(!empty($Save))
   {
     if(!empty($user))
     {
       if(!validate_page($user))
-        { die($ErrorNameMatch); }
+        { die(ACTION_ErrorNameMatch); }
     }
 
     ereg("([[:digit:]]*)", $rows, $result);

Index: save.php
===================================================================
RCS file: /cvsroot/tavi/tavi/action/save.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- save.php	30 Jun 2003 10:47:00 -0000	1.9
+++ save.php	16 Dec 2003 20:23:08 -0000	1.10
@@ -10,7 +10,7 @@
 {
   global $pagestore, $comment, $categories, $archive;
   global $Save, $page, $document, $nextver, $REMOTE_ADDR;
-  global $MaxPostLen, $UserName, $SaveMacroEngine, $ErrorPageLocked;
+  global $MaxPostLen, $UserName, $SaveMacroEngine;
 
   if(empty($Save))                      // Didn't click the save button.
   {
@@ -25,7 +25,7 @@
   $pg->read();
 
   if(!$pg->mutable)                     // Edit disallowed.
-    { die($ErrorPageLocked); }
+    { die(ACTION_ErrorPageLocked); }
 
   if($pg->exists()                      // Page already exists.
      && $pg->version >= $nextver        // Someone has changed it.

[Tavi-cvs-commit] CVS: tavi/lib db.php,1.4,1.5 diff.php,1.10,1.11 init.php,1.12,1.13 main.php,1.8,1.9 pagestore.php,1.9,1.10 rate.php,1.3,1.4

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv17399

Modified Files:
	db.php diff.php init.php main.php pagestore.php rate.php 
Log Message:
Changed into using the constants of the new language system

Index: db.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/db.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db.php	30 Jun 2003 10:47:00 -0000	1.4
+++ db.php	16 Dec 2003 18:07:46 -0000	1.5
@@ -9,26 +9,22 @@
 
   function WikiDB($persistent, $server, $user, $pass, $database)
   {
-    global $ErrorDatabaseConnect, $ErrorDatabaseSelect;
-
     if($persistent)
       { $this->handle = mysql_pconnect($server, $user, $pass); }
     else
       { $this->handle = mysql_connect($server, $user, $pass); }
 
     if($this->handle <= 0)
-      { die($ErrorDatabaseConnect); }
+      { die(LIB_ErrorDatabaseConnect); }
 
     if(mysql_select_db($database, $this->handle) == false)
-      { die($ErrorDatabaseSelect); }
+      { die(LIB_ErrorDatabaseSelect); }
   }
 
   function query($text)
   {
-    global $ErrorDatabaseQuery;
-
     if(!($qid = mysql_query($text, $this->handle)))
-      { die("<strong>$ErrorDatabaseQuery</strong><p>$text</p>"); }
+      { die("<strong>".LIB_ErrorDatabaseQuery."</strong><p>$text</p>"); }
     return $qid;
   }
 

Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/diff.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- diff.php	2 Dec 2003 21:03:10 -0000	1.10
+++ diff.php	16 Dec 2003 18:07:46 -0000	1.11
@@ -4,7 +4,7 @@
 // Compute the difference between two sets of text.
 function diff_compute($text1, $text2)
 {
-  global $TempDir, $DiffCmd, $ErrorCreatingTemp, $ErrorWritingTemp;
+  global $TempDir, $DiffCmd;
 
   $num = function_exists('posix_getpid') ? posix_getpid() : rand();
 
@@ -12,25 +12,20 @@
   $temp2 = $TempDir . '/wiki_' . $num . '_2.txt';
 
   if(!($h1 = fopen($temp1, 'w')) || !($h2 = fopen($temp2, 'w')))
-    { die($ErrorCreatingTemp); }
+    { die(LIB_ErrorCreatingTemp); }
 
   if(fwrite($h1, $text1) < 0 || fwrite($h2, $text2) < 0)
-    { die($ErrorWritingTemp); }
+    { die(LIB_ErrorWritingTemp); }
 
   fclose($h1);
   fclose($h2);
 
   if (ini_get('safe_mode') and
-     (ini_get('safe_mode_exec_dir') != dirname($DiffCmd))) {
-    $diff = "''No diff available, due to wrong location of diffcmd. ".
-            "It should have been inside ". ini_get("safe_mode_exec_dir") .
-            "but is located at $DiffCmd. Please relocate diffcmd or ".
-            "make sysAdmins create symbolic links into this directory. Also remember to ".
-            "change configuration of \$!DiffCmd accordingly.''.";
-  } else if (!file_exists($DiffCmd) or !is_readable($DiffCmd)) {
-    $diff = "''No diff available. \$!DiffCmd points to $DiffCmd which ".
-            "doesn't exist or isn't readable''";
-  } else {
+     (ini_get('safe_mode_exec_dir') != dirname($DiffCmd))) 
+    { $diff = LIB_NoDiffAvailableSafeMode; }
+  else if (!file_exists($DiffCmd) or !is_readable($DiffCmd)) 
+    { $diff = LIB_NoDiffAvailable; }
+  else {
     $output = array();
     exec("$DiffCmd $temp1 $temp2", $output);
     $diff = join("\n", $output);

Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- init.php	16 Dec 2003 17:24:20 -0000	1.12
+++ init.php	16 Dec 2003 18:07:46 -0000	1.13
@@ -6,7 +6,6 @@
 require('lib/defaults.php');
 require('config.php');
 require('lib/url.php');
-require('lib/messages.php');
 require('lib/pagestore.php');
 require('lib/rate.php');
 

Index: main.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/main.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- main.php	20 Sep 2003 12:35:13 -0000	1.8
+++ main.php	16 Dec 2003 18:07:46 -0000	1.9
@@ -100,7 +100,7 @@
 
 // Confirm we have a valid page name.
 if(!validate_page($page))
-  { die($ErrorInvalidPage); }
+  { die(LIB_ErrorInvalidPage); }
 
 // Don't let people do too many things too quickly.
 if($ActionList[$action][2] != '')

Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pagestore.php	12 Nov 2003 12:07:32 -0000	1.9
+++ pagestore.php	16 Dec 2003 18:07:46 -0000	1.10
@@ -152,14 +152,11 @@
     {
       $this->dbh->query("UPDATE $IwTbl SET where_defined='$where_defined', " .
                         "url='$url' WHERE prefix='$prefix'");
-      echo "<pre>InterWikiUpd: $prefix, $where_defined, $url</pre>\n";
     }
     else
     {
       $this->dbh->query("INSERT INTO $IwTbl(prefix, where_defined, url) " .
                         "VALUES('$prefix', '$where_defined', '$url')");
-
-      echo "<pre>InterWiki: $prefix, $where_defined, $url</pre>\n";
     }
   }
 

Index: rate.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/rate.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rate.php	30 Nov 2001 22:10:15 -0000	1.3
+++ rate.php	16 Dec 2003 18:07:46 -0000	1.4
@@ -4,9 +4,8 @@
 // Perform a lookup on an IP addresses edit-rate.
 function rateCheck($db, $type)
 {
-  global $RatePeriod, $RateView, $RateSearch, $RateEdit, $REMOTE_ADDR;
-  global $ErrorDeniedAccess, $ErrorRateExceeded, $RtTbl;
-
+  global $RatePeriod, $RateView, $RateSearch, $RateEdit, $REMOTE_ADDR, $RtTbl;
+  
   $fields = explode(".", $REMOTE_ADDR);
   if($RatePeriod == 0)
     { return; }
@@ -17,14 +16,14 @@
 
   $qid = $db->query("SELECT * FROM $RtTbl WHERE ip='$fields[0].*'");
   if($db->result($qid))
-    { die($ErrorDeniedAccess); }
+    { die(LIB_ErrorDeniedAccess); }
   $qid = $db->query("SELECT * FROM $RtTbl WHERE ip='$fields[0].$fields[1].*'");
   if($db->result($qid))
-    { die($ErrorDeniedAccess); }
+    { die(LIB_ErrorDeniedAccess); }
   $qid = $db->query("SELECT * FROM $RtTbl " .
                     "WHERE ip='$fields[0].$fields[1].$fields[2].*'");
   if($db->result($qid))
-    { die($ErrorDeniedAccess); }
+    { die(LIB_ErrorDeniedAccess); }
 
   // Now check how many more actions we can perform.
 
@@ -53,7 +52,7 @@
     { $result[3]--; }
 
   if($result[1] < 0 || $result[2] < 0 || $result[3] < 0)
-    { die($ErrorRateExceeded); }
+    { die(LIB_ErrorRateExceeded); }
 
   // Record this action.
 

[Tavi-cvs-commit] CVS: tavi/lib messages.php,1.3,NONE

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv17058

Removed Files:
	messages.php 
Log Message:
This file removed. It's contents are replaced in the lang/default.php-file, and structure is otherwise not needed.

--- messages.php DELETED ---

[Tavi-cvs-commit] CVS: tavi/lib init.php,1.11,1.12

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv7710

Modified Files:
	init.php 
Log Message:
Provide defaults for translation files

Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- init.php	12 Nov 2003 12:01:39 -0000	1.11
+++ init.php	16 Dec 2003 17:24:20 -0000	1.12
@@ -40,6 +40,13 @@
 $prefstr = isset($HTTP_COOKIE_VARS[$CookieName])
            ? $HTTP_COOKIE_VARS[$CookieName] : '';
 
+// Choose a textual language for this wiki
+if (defined(LANGUAGE_CODE)) {
+  require("lang/". LANGUAGE_CODE);
+} else {
+  require("lang/default.php");
+}
+
 if(!empty($prefstr))
 {
   if(ereg("rows=([[:digit:]]+)", $prefstr, $result))

[Tavi-cvs-commit] CVS: tavi/lang default.php,NONE,1.1

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv7267

Added Files:
	default.php 
Log Message:
This file provides the textual interface of WikkiTikkiTavi

--- NEW FILE: default.php ---
<?php
/** This file provides the textual interface of WikkiTikkiTavi
 * For more information see http://tavi.sourceforge.net
 *
 * On translation:
 *   If you want to translate 'Tavi into another language, please use this
 * as basis and translate the second parameter in each and every define()
 * The first part of the name indicates which directory the constant are
 * used, and the second part the meaning.
 *   I.e. define(PARSE_RecentChanges, 'RecentChanges') indicates that this
 * value is used within the parse subdirectory, and that it's value is 
 * something regarding RecentChanges. This example aptly names the 
 * RecentChanges page...
 */

/* This file is divided into the sections provided by the different 
 * subdirectories, and if needed by the file where the constants are used
 * /

/* lib-directory */
define('LIB_RateControlIpBlocking', 'Rate control / IP blocking disabled');
define('LIB_LockUnlockPages', 'Lock / unlock pages');
define('LIB_BLockUnblockHosts', 'Block / unblock hosts');

/* action-directory */

[Tavi-cvs-commit] CVS: tavi/lang - New directory

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lang
In directory sc8-pr-cvs1:/tmp/cvs-serv374/lang

Log Message:
Directory /cvsroot/tavi/tavi/lang added to the repository

[Tavi-cvs-commit] CVS: tavi/parse save.php,1.8,1.9

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/parse
In directory sc8-pr-cvs1:/tmp/cvs-serv12581

Modified Files:
	save.php 
Log Message:
Allowing file in urls and interwikis

Index: save.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/save.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- save.php	1 Jul 2003 19:26:59 -0000	1.8
+++ save.php	2 Dec 2003 22:34:14 -0000	1.9
@@ -67,7 +67,7 @@
     $called = 1;
   }
 
-  if(preg_match('/^\*InterWiki:\s+\!?([A-Za-z]+)\s+(https?:[^\s]+)/',
+  if(preg_match('/^\*InterWiki:\s+\!?([A-Za-z]+)\s+((?:https?|file):[^\s]+)/',
                 $text, $result))
   {
     $pagestore->new_interwiki($page, $result[1], $result[2]);

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.17,1.18

[Even H. <ho...@us...>]

Update of /cvsroot/tavi/tavi/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv12489

Modified Files:
	defaults.php 
Log Message:
Allowing file in urls and interwikis

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- defaults.php	2 Dec 2003 22:21:03 -0000	1.17
+++ defaults.php	2 Dec 2003 22:33:14 -0000	1.18
@@ -22,7 +22,7 @@
            $UpperPtn . $AlphaPtn . '*(?:(?:\\/' . $UpperPtn . $AlphaPtn . '*)+)?';
 
 // $UrlPtn establishes the format for URLs in this wiki.
-$UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
+$UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:|file:)" .
            "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
 
 // $InterWikiPtn establishes the format for InterWiki links in this wiki.