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

[Tavi-cvs-commit] CVS: tavi/install settings.cnf,1.9,1.10

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

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

Modified Files:
	settings.cnf 
Log Message:
Implementing TaviPatches/TextEnhance. It's optional and controlled by $EnableTextEnhance.


Index: settings.cnf
===================================================================
RCS file: /cvsroot/tavi/tavi/install/settings.cnf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- settings.cnf	16 Jan 2002 16:31:40 -0000	1.9
+++ settings.cnf	2 Dec 2003 22:21:48 -0000	1.10
@@ -94,7 +94,8 @@
 boolean $EnableWikiLinks 1
 Would you like traditional wiki links to be enabled on your wiki?
 Traditional links are of the form 'WikiName'.  It is recommended that
-you leave traditional wiki links enabled on your wiki.
+you leave traditional wiki links enabled on your wiki. With the exception of
+sites using UTF-8, where these links might be break occasionally.
 
 Note that you should enable free links if you wish to disable traditional
 links.  If you disable both, then users will not be able to create links
@@ -102,6 +103,15 @@
 // If $EnableWikiLinks is set to 1, normal WikiNames will be treated as links
 // in this wiki.  If it is set to 0, they will not be treated as links
 // (in which case you should be careful to enable free links!).
+----
+boolean $EnableTextEnhance 1
+Would you like the enhanced operators for making text bold, italic, super-/
+subscript, added/deleted? If so, enable text enhancement. If you however
+prefer only to use the traditional '' and ''' for italic/bold, then disable
+this one.
+// When $EnableTextEnhance is set to 1, the extended operators allowing you
+// to do both bold, italic, super-/subscript, ins/del are available. When
+// set to 0, only the traditional ''italic'' and '''bold'' are available.
 ----
 string $ScriptBase ''
 Enter the fully-qualified URL for the wiki script you have installed.

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

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

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

Modified Files:
	defaults.php 
Log Message:
Implementing TaviPatches/TextEnhance. It's optional and controlled by $EnableTextEnhance.

Also provided default for $EnableWikiLinks and $EnableFreeLinks within defaults.php

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- defaults.php	12 Nov 2003 15:30:31 -0000	1.16
+++ defaults.php	2 Dec 2003 22:21:03 -0000	1.17
@@ -148,6 +148,16 @@
 // $MaxHeading determines the maximum allowed heading level in headings.
 $MaxHeading = 6;
 
+// $EnableWikiLinks determines if WikiLinks are available
+$EnableWikiLinks = 1;
+
+// $EnableFreeLinks determines if ((free links)) are available
+$EnableFreeLinks = 1;
+
+// $EnableTextEnhance determines if the enhanced text markers for bold, 
+// italic, super-/sub-script, ins/del are available
+$EnableTextEnhance = 1;
+
 // $ParseEngine indicates what parsing rules will be run when displaying a
 //   wiki page.  To disable a particular rule, you can place a comment at the
 //   beginning of its line.  The order of this list is important.
@@ -168,6 +178,7 @@
                  'parse_freelink',
                  'parse_interwiki',
                  'parse_wikiname',
+                 'parse_textenhance',
                  'parse_bold',
                  'parse_italic',
                  'parse_teletype',
@@ -195,6 +206,7 @@
                 'parse_freelink',
                 'parse_interwiki',
                 'parse_wikiname',
+                'parse_textenhance',
                 'parse_bold',
                 'parse_italic',
                 'parse_teletype',
@@ -209,6 +221,14 @@
                    'bold_end'     => 'html_bold_end',
                    'italic_start' => 'html_italic_start',
                    'italic_end'   => 'html_italic_end',
+                   'superscript_start' => 'html_superscript_start', 
+                   'superscript_end' => 'html_superscript_end', 
+                   'subscript_start' => 'html_subscript_start', 
+                   'subscript_end'   => 'html_subscript_end', 
+                   'del_start'       => 'html_del_start', 
+                   'del_end'         => 'html_del_end', 
+                   'ins_start'       => 'html_ins_start', 
+                   'ins_end'         => 'html_ins_end', 
                    'tt_start'     => 'html_tt_start',
                    'tt_end'       => 'html_tt_end',
                    'head_start'   => 'html_head_start',

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.32,1.33 transforms.php,1.46,1.47

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

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

Modified Files:
	html.php transforms.php 
Log Message:
Implementing TaviPatches/TextEnhance. It's optional and controlled by $EnableTextEnhance

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- html.php	28 Oct 2003 16:49:28 -0000	1.32
+++ html.php	2 Dec 2003 22:20:16 -0000	1.33
@@ -14,6 +14,22 @@
   { return '<em>'; }
 function html_italic_end()
   { return '</em>'; }
+function html_superscript_start()
+  { return '<sup>'; }
+function html_superscript_end()
+  { return '</sup>'; }
+function html_subscript_start()
+  { return '<sub>'; }
+function html_subscript_end()
+  { return '</sub>'; }
+function html_del_start()
+  { return '<del>'; }
+function html_del_end()
+  { return '</del>'; }
+function html_ins_start()
+  { return '<ins>'; }
+function html_ins_end()
+  { return '</ins>'; }
 function html_tt_start()
   { return '<tt>'; }
 function html_tt_end()

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- transforms.php	28 Oct 2003 16:49:28 -0000	1.46
+++ transforms.php	2 Dec 2003 22:20:16 -0000	1.47
@@ -312,6 +312,40 @@
   return $result;
 }
 
+function parse_textenhance($text) 
+{
+  global $EnableTextEnhance;
+
+  if ($EnableTextEnhance) 
+  {
+    if (preg_match("/^(\*+)([^*].*)$/", $text, $match)) 
+    {
+       // Special case, since *'s at start of line is markup for lists
+       $return = $match[1] . 
+                 preg_replace("/(\*\*)([^*]+)\\1/e", 
+                              "pair_tokens('bold', q1('\\2'))", $match[2], -1);
+    } 
+    else 
+    {
+       $return = preg_replace("/(\*\*)([^*]+)\\1/e", 
+                              "pair_tokens('bold', q1('\\2'))", $text, -1);
+    }
+    $return = preg_replace( "/(\/\/)([^\/]+)\\1/e", 
+                             "pair_tokens('italic', q1('\\2'))", $return, -1);
+    $return = preg_replace( "/(--)([^-]+)\\1/e", 
+                             "pair_tokens('del', q1('\\2'))", $return, -1);
+    $return = preg_replace( "/(\+\+)([^\+]+)\\1/e", 
+                             "pair_tokens('ins', q1('\\2'))", $return, -1);
+    $return = preg_replace( "/(\^\^)([^^]+)\\1/e", 
+                             "pair_tokens('superscript', q1('\\2'))", $return, -1);
+    $return = preg_replace( "/(,,)([^,]+)\\1/e", 
+                            "pair_tokens('subscript', q1('\\2'))", $return, -1);
+    return $return; 
+  } else { 
+    return $text; 
+  }
+} 
+
 function parse_bold($text)
 {
   return preg_replace("/'''(()|[^'].*)'''/Ue", "pair_tokens('bold', q1('\\1'))",

[Tavi-cvs-commit] CVS: tavi/lib diff.php,1.9,1.10

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

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

Modified Files:
	diff.php 
Log Message:
Yet another try to make the diff available in safe mode...

Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/diff.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- diff.php	9 Sep 2003 11:32:34 -0000	1.9
+++ diff.php	2 Dec 2003 21:03:10 -0000	1.10
@@ -31,7 +31,9 @@
     $diff = "''No diff available. \$!DiffCmd points to $DiffCmd which ".
             "doesn't exist or isn't readable''";
   } else {
-    $diff = passthru("$DiffCmd $temp1 $temp2");
+    $output = array();
+    exec("$DiffCmd $temp1 $temp2", $output);
+    $diff = join("\n", $output);
   }
 
   unlink($temp1);

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.15,1.16

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

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

Modified Files:
	defaults.php 
Log Message:
Reverted change to $UrlPtn, as it more likely to use ; as sentence separator than end of an URL. And then we'll see if someone complains... ;-)

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- defaults.php	12 Nov 2003 10:09:24 -0000	1.15
+++ defaults.php	12 Nov 2003 15:30:31 -0000	1.16
@@ -23,7 +23,7 @@
 
 // $UrlPtn establishes the format for URLs in this wiki.
 $UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
-           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_;]";
+           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
 
 // $InterWikiPtn establishes the format for InterWiki links in this wiki.
 $InterwikiPtn = "([A-Za-z0-9]+):" .

Re: [Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.14,1.15 pagestore.php,1.7,1.8

[Even H. <ev...@pv...>]

On Wed, Nov 12, 2003 at 05:56:22AM -0800, Scott Moonen wrote:
> I'm far more likely to write "http:///xyz;" than I am to write "http://xyz?abc&".
> It's probably a good idea to revert the UrlPtn change.

I was thinking about that issue... 
 
> Alternatively, you could add a "(&[a-z]+;)?" to the end of the pattern, to ensure
> that it matches semicolons in entities but not as punctuation.

This doesn't work, nor did some variations such as:
  (?:[A-Za-z0-9\\/?=&~_]|&[A-Za-z]+;)

On a side note: Is it natural to have URLs ending in [~_] ? I
discovered the 'problem' with ';' at end when doing some testing on
validation using & within URLs, and I think the only place it's likely
to be used at end of and URL is within interwiki entries. But that may
go for the aforementioned characters, [~_], as well?

I'm getting somewhat inclined to reverting the change to UrlPtn, and wait
until somebody complain about not being able to enter URLs ending with a
question mark. (Do you think we should remove [~_] as well? )

Regards,
Even Holen
-- 
<><   Even Holen, eve...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)

Re: [Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.14,1.15 pagestore.php,1.7,1.8

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

Even,

I'm far more likely to write "http:///xyz;" than I am to write "http://xyz?abc&".
It's probably a good idea to revert the UrlPtn change.

Alternatively, you could add a "(&[a-z]+;)?" to the end of the pattern, to ensure
that it matches semicolons in entities but not as punctuation.

  -- Scott


On Wed, Nov 12, 2003 at 02:09:27AM -0800, Even Holen wrote:
> Update of /cvsroot/tavi/tavi/lib
> In directory sc8-pr-cvs1:/tmp/cvs-serv3271
> 
> Modified Files:
> 	defaults.php pagestore.php 
> Log Message:
> Made interwiki's and sisterwiki's containing &'s also validate, by changing all occurences of "&" after "?" to "&"  
> 
> This also forced a change to defaults.php regarding url's ending in & which was not recognised as a url (missed the last ";")
> 
> Index: defaults.php
> ===================================================================
> RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -d -r1.14 -r1.15
> --- defaults.php	22 Oct 2003 13:17:28 -0000	1.14
> +++ defaults.php	12 Nov 2003 10:09:24 -0000	1.15
> @@ -23,7 +23,7 @@
>  
>  // $UrlPtn establishes the format for URLs in this wiki.
>  $UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
> -           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
> +           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_;]";
>  
>  // $InterWikiPtn establishes the format for InterWiki links in this wiki.
>  $InterwikiPtn = "([A-Za-z0-9]+):" .
> 
> Index: pagestore.php
> ===================================================================
> RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -d -r1.7 -r1.8
> --- pagestore.php	1 Jul 2003 19:25:30 -0000	1.7
> +++ pagestore.php	12 Nov 2003 10:09:24 -0000	1.8
> @@ -138,8 +138,12 @@
>      global $IwTbl;
>  
>      $url = str_replace("'", "\\'", $url);
> -    $url = str_replace("&", "&", $url);
> -
> +    if (preg_match("/(.*)\?(.*)/", $url, $match)) 
> +    {
> +      $match[2] = preg_replace("/&(?!amp;)/", '&', $match[2]);
> +      $url = $match[1] . '?'. $match[2];
> +    }
> +    
>      $where_defined = addslashes($where_defined);
>  
>      $qid = $this->dbh->query("SELECT where_defined FROM $IwTbl " .
> @@ -165,7 +169,11 @@
>      global $SwTbl;
>  
>      $url = str_replace("'", "\\'", $url);
> -    $url = str_replace("&", "&", $url);
> +    if (preg_match("/(.*)\?(.*)/", $url, $match)) 
> +    {
> +      $match[2] = preg_replace("/&(?!amp;)/", '&', $match[2]);
> +      $url = $match[1] . '?'. $match[2];
> +    }
>  
>      $where_defined = addslashes($where_defined);
>  
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: ApacheCon 2003,
> 16-19 November in Las Vegas. Learn firsthand the latest
> developments in Apache, PHP, Perl, XML, Java, MySQL,
> WebDAV, and more! http://www.apachecon.com/
> _______________________________________________
> Tavi-cvs-commit mailing list
> Tav...@li...
> https://lists.sourceforge.net/lists/listinfo/tavi-cvs-commit
> 

-- 
http://scott.andstuff.org/

[Tavi-cvs-commit] CVS: tavi/lib pagestore.php,1.8,1.9

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

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

Modified Files:
	pagestore.php 
Log Message:
Fixed TaviBug:829113: Pages was deleted even when $ExpireLen=0.

Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pagestore.php	12 Nov 2003 10:09:24 -0000	1.8
+++ pagestore.php	12 Nov 2003 12:07:32 -0000	1.9
@@ -318,12 +318,15 @@
     $qid = $this->dbh->query("SELECT title, MAX(version) FROM $PgTbl " .
                              "GROUP BY title");
 
-    while(($result = $this->dbh->result($qid)))
+    if ($ExpireLen != 0) 
     {
-      $result[0] = addslashes($result[0]);
-      $this->dbh->query("DELETE FROM $PgTbl WHERE title='$result[0]' AND " .
-                        "(version < $result[1] OR body='') AND " .
-                        "TO_DAYS(NOW()) - TO_DAYS(supercede) > $ExpireLen");
+      while(($result = $this->dbh->result($qid)))
+      {
+        $result[0] = addslashes($result[0]);
+        $this->dbh->query("DELETE FROM $PgTbl WHERE title='$result[0]' AND " .
+                          "(version < $result[1] OR body='') AND " .
+                          "TO_DAYS(NOW()) - TO_DAYS(supercede) > $ExpireLen");
+      }
     }
 
     if($RatePeriod)

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

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

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

Modified Files:
	init.php 
Log Message:
Fixed TaviBug:836525 : Allow for negative timezones. How long has this error been here? 

Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- init.php	20 Sep 2003 21:09:01 -0000	1.10
+++ init.php	12 Nov 2003 12:01:39 -0000	1.11
@@ -56,7 +56,7 @@
     { $MinEntries = $result[1]; }
   if(ereg("hist=([[:digit:]]+)", $prefstr, $result))
     { $HistMax = $result[1]; }
-  if(ereg("tzoff=([[:digit:]]+)", $prefstr, $result))
+  if(ereg("tzoff=(-?[[:digit:]]+)", $prefstr, $result))
     { $TimeZoneOff = $result[1]; }
 }
 

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.14,1.15 pagestore.php,1.7,1.8

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

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

Modified Files:
	defaults.php pagestore.php 
Log Message:
Made interwiki's and sisterwiki's containing &'s also validate, by changing all occurences of "&" after "?" to "&"  

This also forced a change to defaults.php regarding url's ending in & which was not recognised as a url (missed the last ";")

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- defaults.php	22 Oct 2003 13:17:28 -0000	1.14
+++ defaults.php	12 Nov 2003 10:09:24 -0000	1.15
@@ -23,7 +23,7 @@
 
 // $UrlPtn establishes the format for URLs in this wiki.
 $UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
-           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
+           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_;]";
 
 // $InterWikiPtn establishes the format for InterWiki links in this wiki.
 $InterwikiPtn = "([A-Za-z0-9]+):" .

Index: pagestore.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/pagestore.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pagestore.php	1 Jul 2003 19:25:30 -0000	1.7
+++ pagestore.php	12 Nov 2003 10:09:24 -0000	1.8
@@ -138,8 +138,12 @@
     global $IwTbl;
 
     $url = str_replace("'", "\\'", $url);
-    $url = str_replace("&", "&", $url);
-
+    if (preg_match("/(.*)\?(.*)/", $url, $match)) 
+    {
+      $match[2] = preg_replace("/&(?!amp;)/", '&', $match[2]);
+      $url = $match[1] . '?'. $match[2];
+    }
+    
     $where_defined = addslashes($where_defined);
 
     $qid = $this->dbh->query("SELECT where_defined FROM $IwTbl " .
@@ -165,7 +169,11 @@
     global $SwTbl;
 
     $url = str_replace("'", "\\'", $url);
-    $url = str_replace("&", "&", $url);
+    if (preg_match("/(.*)\?(.*)/", $url, $match)) 
+    {
+      $match[2] = preg_replace("/&(?!amp;)/", '&', $match[2]);
+      $url = $match[1] . '?'. $match[2];
+    }
 
     $where_defined = addslashes($where_defined);
 

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

[Even H. <eve...@pv...>]

On Tue, Oct 28, 2003 at 08:54:47AM -0800, Even Holen wrote:
> Update of /cvsroot/tavi/tavi
> In directory sc8-pr-cvs1:/tmp/cvs-serv17831
> 
> Modified Files:
> 	ChangeLog.txt 
> Log Message:
> Today I've mainly focused on making 'Tavi validate again. To make this happen three steps where necessary:
> 
> 1) Had to change coding of URLs after '?'.  Now every url uses & instead of '&', and the behaviour is not duplicated if user writes the correct one from the start.

And sadly, I've just realised that I need to apply this fix some other
places as well... But don't have time for that now. Will look into this
next time I'll code on 'Tavi.

Not every url is handled through html_url(), some are also generated
from InterWiki-entries. And if those aren't correctly entered there, 
then these produce validation errors...   

Oh well, will need to look more deeply into this one.

Regards,
Even Holen
-- 
<><   Even Holen, eve...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)

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

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

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

Modified Files:
	ChangeLog.txt 
Log Message:
Today I've mainly focused on making 'Tavi validate again. To make this happen three steps where necessary:

1) Had to change coding of URLs after '?'.  Now every url uses & instead of '&', and the behaviour is not duplicated if user writes the correct one from the start.

2) Flipped <div> and <form> on the bottom of each page.

3) In the newly added <phpcode>, replaced all <font>-entries with <span class=...>-entries, and added some code to wiki.css. (Also fixed bug regarding a page ending with either </code> or </phpcode>

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ChangeLog.txt	22 Oct 2003 15:06:06 -0000	1.15
+++ ChangeLog.txt	28 Oct 2003 16:54:45 -0000	1.16
@@ -2,6 +2,9 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+2003-10-28 Even Holen <eve...@pv...>
+  * Fixed validation bugs, and now it validates as XHtml 1.0 strict again
+
 2003-10-22 Even Holen <eve...@pv...>
   * Added use of \ and \\ at end of lines for line break/continuation
   * Added <phpcode> to highlight php-code

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.31,1.32 transforms.php,1.45,1.46

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

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

Modified Files:
	html.php transforms.php 
Log Message:
Changes to make 'Tavi validate, again.


Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- html.php	22 Oct 2003 13:34:48 -0000	1.31
+++ html.php	28 Oct 2003 16:49:28 -0000	1.32
@@ -64,7 +64,31 @@
   highlight_string($text);
   $text = ob_get_contents();
   ob_end_clean();
-  return $text;
+
+  $text = preg_replace("/^<code>/", "<pre class=\"phpsource\">", $text);
+  $text = preg_replace("/<\/code>$/", "</pre>", $text);
+  
+  // Make it valid xhtml...
+  $search[0] = '<font color="'.ini_get('highlight.html').'">';
+  $search[1] = '<font color="'.ini_get('highlight.default').'">';
+  $search[2] = '<font color="'.ini_get('highlight.keyword').'">';
+  $search[3] = '<font color="'.ini_get('highlight.string').'">';
+  $search[4] = '<font color="'.ini_get('highlight.comment').'">';
+  $search[5] = '</font>';
+  $search[6] = '\r';
+  $search[7] = '<br />';
+  $search[8] = '&nbsp;';
+  $replace[0] = '<span class="html">';
+  $replace[1] = '<span class="default">';
+  $replace[2] = '<span class="keyword">';
+  $replace[3] = '<span class="string">';
+  $replace[4] = '<span class="comment">';
+  $replace[5] = '</span>';
+  $replace[6] = '';
+  $replace[7] = "\n";
+  $replace[8] = ' ';
+ 
+  return str_replace($search,$replace,$text);
 }
 function html_raw($text)
   { return $text; }
@@ -216,6 +240,11 @@
      && preg_match("/($ImgPtn)$/i", $text))
   {
     return "<img src=\"$url\" alt=\"" . basename($url) . "\" />";
+  }
+  if (preg_match("/(.*)\?(.*)/", $url, $match)) 
+  {
+    $match[2] = preg_replace("/&(amp;amp;|!?amp;)/", '&amp;', $match[2]);
+    $url = $match[1] . '?'. $match[2];
   }
   return "<a href=\"$url\">$text</a>";
 }

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- transforms.php	22 Oct 2003 14:47:13 -0000	1.45
+++ transforms.php	28 Oct 2003 16:49:28 -0000	1.46
@@ -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)\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); 
 
   // Concatenate lines ending in a single \

[Tavi-cvs-commit] CVS: tavi/template common.php,1.11,1.12 wiki.css,1.12,1.13

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

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

Modified Files:
	common.php wiki.css 
Log Message:
Changes to make 'Tavi validate

Index: common.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/common.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- common.php	29 Aug 2003 15:03:13 -0000	1.11
+++ common.php	28 Oct 2003 16:47:34 -0000	1.12
@@ -163,12 +163,12 @@
   if(!$args['nosearch'])
   {
 ?>
-<div class="form">
 <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" />
-</form>
 </div>
+</form>
 <?php
   }
 ?>

Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- wiki.css	8 Sep 2003 11:10:51 -0000	1.12
+++ wiki.css	28 Oct 2003 16:47:34 -0000	1.13
@@ -65,6 +65,17 @@
 div#header hr
   { clear: both; }
 
+/* Some php-syntax highlighting defaults */
+pre.phpsource { border-width: 1px; border-style: solid;  border-color: #000000; 
+                background-color: #d5d5d5; 
+                padding: 0.3em;  } 
+
+.phpsource span.html    { color: #000000; }
+.phpsource span.default { color: #0000CC; }
+.phpsource span.keyword { color: #11cc11; }
+.phpsource span.string  { color: #CC0000; }
+.phpsource span.comment { color: #FF9900; }
+
 @media print {
  body                       { background-color: #ffffff; color: #000000; }
  div#header #toolbar-top    { display: none; }

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.44,1.45

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

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

Modified Files:
	transforms.php 
Log Message:
Fixing the fix... Was a wee bit early in commit the last one... ;)

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- transforms.php	22 Oct 2003 14:36:44 -0000	1.44
+++ transforms.php	22 Oct 2003 14:47:13 -0000	1.45
@@ -42,7 +42,7 @@
 
   // Parse the code sections, to escape them from the line control
   $text = preg_replace("/\n\s*<((?:php)?code)>\s*(.*\n)\s*<\\/\\1>\s*(?=\n)/Usei", 
-                       "code_token('\\1',q1('\\2'))", $text); 
+                       "q1('\n').code_token('\\1',q1('\\2'))", $text); 
 
   // Concatenate lines ending in a single \
   $text = preg_replace("/([^\\\])\\\\\n\s*/s", " ", $text);

[Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.14,1.15

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

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

Modified Files:
	ChangeLog.txt 
Log Message:
Forgot to commit the change log yesterday. Here is a fresh new version, including changes from yesterday and today.

Lots of interesting changes... See diff below... ;-)

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog.txt	20 Sep 2003 21:11:25 -0000	1.14
+++ ChangeLog.txt	22 Oct 2003 15:06:06 -0000	1.15
@@ -2,10 +2,19 @@
 
 WikkiTikkiTavi - ChangeLog
 --------------------------
+2003-10-22 Even Holen <eve...@pv...>
+  * Added use of \ and \\ at end of lines for line break/continuation
+  * Added <phpcode> to highlight php-code
+  * Changed handling of <code>/<phpcode> 
+
+2003-10-21 Even Holen <eve...@pv...>
+  * Fixed possibility to use images/text as descriptions with WikiNames
+  * Fixed bug regarding no display of second URLs with one character between
+
 2003-09-20 Even Holen <eve...@pv...>
-  * Fixed bugs regarding use of add category field
-  * Relaxed rule for characters appearaing in free links, and added no-link
-  * Fixed bugs not allowing 0 as a free links page name
+  * Fixed bug regarding use of add category field
+  * Relaxed rule for characters appearing in free links, and added no-link
+  * Fixed bug not allowing 0 as a free links page name
   * Changed /SomeThing to refer to a page on same level, not below
   * Added $ExtRef to change text around external refs, see lib/defaults.php
   * Added possibility to use images as descriptions of hyperlinks. 

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.42,1.43

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

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

Modified Files:
	transforms.php 
Log Message:
This commit is simply an unindenting of code, as explained in previous commit. Helps keeping the previous commit easier to understand. No actual code has been changed in this commit.

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- transforms.php	22 Oct 2003 13:34:48 -0000	1.42
+++ transforms.php	22 Oct 2003 13:38:04 -0000	1.43
@@ -423,80 +423,80 @@
   $last_len   = strlen($last_prefix);
   $prefix_len = strlen($result[1]);
 
-    $text = $result[4];
+  $text = $result[4];
 
-    $fixup = '';
+  $fixup = '';
 
 // Loop through and look for prefix characters in common with the
 // previous line.
 
-    for($i = 0;
-        $i < $MaxNesting && ($i < $last_len || $i < $prefix_len);
-        $i++)
-    {
-      // If equal, continue.
-      if($i < $last_len && $i < $prefix_len     // Neither past end.
-         && $last_prefix[$i] == $result[1][$i]) // Equal content.
-        { continue; }
+  for($i = 0;
+      $i < $MaxNesting && ($i < $last_len || $i < $prefix_len);
+      $i++)
+  {
+    // If equal, continue.
+    if($i < $last_len && $i < $prefix_len     // Neither past end.
+       && $last_prefix[$i] == $result[1][$i]) // Equal content.
+      { continue; }
 
-      // If we've gone deeper than the previous line, we're done.
-      if($i >= $last_len)
-        { break; }
+    // If we've gone deeper than the previous line, we're done.
+    if($i >= $last_len)
+      { break; }
 
-      // If last line goes further than us, end its dangling lists.
-      if($i >= $prefix_len                      // Current line ended.
-         || $last_prefix[$i] != $result[1][$i]) // Or not, but they differ.
+    // If last line goes further than us, end its dangling lists.
+    if($i >= $prefix_len                      // Current line ended.
+       || $last_prefix[$i] != $result[1][$i]) // Or not, but they differ.
+    {
+      for($j = $i; $j < $MaxNesting && $j < $last_len; $j++)
       {
-        for($j = $i; $j < $MaxNesting && $j < $last_len; $j++)
-        {
-          $fixup = entity_listitem($last_prefix[$j], 'end')
-                   . entity_list($last_prefix[$j], 'end')
-                   . $fixup;
-        }
-        break;
+        $fixup = entity_listitem($last_prefix[$j], 'end')
+                 . entity_list($last_prefix[$j], 'end')
+                 . $fixup;
       }
+      break;
     }
+  }
 
 // End the preceding line's list item if we're starting another one
 // at the same level.
 
-    if($i > 0 && $i >= $prefix_len)
-      { $fixup = $fixup . entity_listitem($last_prefix[$i - 1], 'end'); }
+  if($i > 0 && $i >= $prefix_len)
+    { $fixup = $fixup . entity_listitem($last_prefix[$i - 1], 'end'); }
 
 // Start fresh new lists for this line as needed.
 // We start all but the last one as *indents* (definition lists)
 // instead of what they really may appear as, since their function is
 // really just to indent.
 
-    for(; $i < $MaxNesting - 1 && $i + 1 < $prefix_len; $i++)
-    {
-      $result[1][$i] = ':';             // Pretend to be an indent.
-      $fixup = $fixup
-               . entity_list(':', 'start')
-               . entity_listitem(':', 'start');
-    }
-    if($i < $prefix_len)                // Start the list itself.
-    {
-      $fixup = $fixup
-               . entity_list($result[1][$i], 'start');
-    }
+  for(; $i < $MaxNesting - 1 && $i + 1 < $prefix_len; $i++)
+  {
+    $result[1][$i] = ':';             // Pretend to be an indent.
+    $fixup = $fixup
+             . entity_list(':', 'start')
+             . entity_listitem(':', 'start');
+  }
+  if($i < $prefix_len)                // Start the list itself.
+  {
+    $fixup = $fixup
+             . entity_list($result[1][$i], 'start');
+  }
 
 // Start the list *item*.
 
-    if($result[2] != '')                // Definition list.
-    {
-      $fixup = $fixup
-               . new_entity(array('term_item_start'))
-               . $result[3]
-               . new_entity(array('term_item_end'));
-    }
+  if($result[2] != '')                // Definition list.
+  {
+    $fixup = $fixup
+             . new_entity(array('term_item_start'))
+             . $result[3]
+             . new_entity(array('term_item_end'));
+  }
 
-    if($result[1] != '')
-      { $text = entity_listitem(substr($result[1], -1), 'start') . $text; }
+  if($result[1] != '')
+    { $text = entity_listitem(substr($result[1], -1), 'start') . $text; }
 
-    $text = $fixup . $text;
+  $text = $fixup . $text;
 
-    $last_prefix = $result[1];
+  $last_prefix = $result[1];
 
   return $text;
 }

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.43,1.44

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

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

Modified Files:
	transforms.php 
Log Message:
A fix not to allow <(php)?code>-sections to start in the middle of paragraph. <code>/<phpcode> needs to be on its own line!

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- transforms.php	22 Oct 2003 13:38:04 -0000	1.43
+++ transforms.php	22 Oct 2003 14:36:44 -0000	1.44
@@ -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("/<((?:php)?code)>(.*)<\\/\\1>/Usei", 
+  $text = preg_replace("/\n\s*<((?:php)?code)>\s*(.*\n)\s*<\\/\\1>\s*(?=\n)/Usei", 
                        "code_token('\\1',q1('\\2'))", $text); 
 
   // Concatenate lines ending in a single \

[Tavi-cvs-commit] CVS: tavi/parse html.php,1.30,1.31 main.php,1.4,1.5 transforms.php,1.41,1.42

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

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

Modified Files:
	html.php main.php transforms.php 
Log Message:
In accordance with the change of proper paragraphing there arises a need of handling line breaks/continuation on a different level than before. The changes made within this commit are to accomodate this.

It's now possible to end a line using \\ to insert a line break, and if only using a single \ the line is joined with the following. This is done in a pre-parsing step to ease the coding structure, and as a side effect the parse_code is included in this step. And thusly is parse_code() removed.

Also as a consequence the stealing of lines in parse_indents isn't needed anymore, so it's removed. Note however that in this commit the section of code within the  "if ($steal ='') { ... } " is _not_ unindented for you to more easily see the actual changes.

Will in the next commit unintend the code section in question, as the only change. 

Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- html.php	20 Sep 2003 21:10:52 -0000	1.30
+++ html.php	22 Oct 2003 13:34:48 -0000	1.31
@@ -58,6 +58,14 @@
   { return $text; }
 function html_code($text)
   { return '<pre>' . $text . '</pre>'; }
+function html_phpcode($text) 
+{ 
+  ob_start();
+  highlight_string($text);
+  $text = ob_get_contents();
+  ob_end_clean();
+  return $text;
+}
 function html_raw($text)
   { return $text; }
 function html_anchor($name)

Index: main.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/main.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.php	3 Jan 2002 16:33:26 -0000	1.4
+++ main.php	22 Oct 2003 13:34:48 -0000	1.5
@@ -12,6 +12,9 @@
   $count  = count($parsers);
   $result = '';
 
+  $text = parse_elem_flag($text);    // Escape $FlgChr before pre-parsing
+  $text = pre_parser($text);  // Fix line continuation/breaks and code-sections 
+
   // Run each parse element in turn on each line of text.
 
   foreach(explode("\n", $text) as $line)

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- transforms.php	21 Oct 2003 17:32:08 -0000	1.41
+++ transforms.php	22 Oct 2003 13:34:48 -0000	1.42
@@ -34,6 +34,37 @@
   return 0;
 }
 
+function pre_parser($text)
+{
+// Before parsing the whole text, do check for line continuation and forced
+// line breaks. To achieve this, and still have code-sections, code-sections
+// need to be parsed in this section as well
+
+  // Parse the code sections, to escape them from the line control
+  $text = preg_replace("/<((?:php)?code)>(.*)<\\/\\1>/Usei", 
+                       "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);
+  return $text;
+}
+
+function code_token($codetype, $code) 
+{
+  global $FlgChr, $Entity;
+
+  if (stristr("code", $codetype))
+    { $Entity[count($Entity)] = array('code', parse_htmlisms($code)); } 
+  else if (stristr("phpcode", $codetype))
+    { $Entity[count($Entity)] = array('phpcode', $code); }
+
+  return $FlgChr . (count($Entity)-1) . $FlgChr; //Is a blockelement
+}
+
 function parse_elem_flag($text)
 {
   global $FlgChr;
@@ -339,37 +370,6 @@
                       $text, -1);
 }
 
-function parse_code($text)
-{
-  global $Entity, $FlgChr;
-  static $in_code = 0;
-  static $buffer  = '';
-
-  if($in_code)
-  {
-    if(preg_match("|^\s*&lt;/code>\s*|", $text))
-    {
-      $Entity[count($Entity)] = array('code', $buffer);
-      $buffer  = '';
-      $in_code = 0;
-      return $FlgChr . (count($Entity) - 1) . $FlgChr; //$blockElem=true
-    }
-
-    $buffer = $buffer . parse_elements($text);
-    return '';
-  }
-  else
-  {
-    if(preg_match("|^\s*&lt;code>\s*|", $text))
-    {
-      $in_code = 1;
-      return '';
-    }
-
-    return $text;
-  }
-}
-
 function parse_raw_html($text)
 {
   global $Entity, $FlgChr;
@@ -405,7 +405,6 @@
 {
   global $MaxNesting;
   static $last_prefix = '';             // Last line's prefix.
-  static $steal = '';                   // Stealing the next line?
 
 // Locate the indent prefix characters.
 
@@ -416,7 +415,7 @@
 
 // No list on last line, no list on this line.  Bail out:
 
-  if($steal == '' && $last_prefix == '' && $result[1] == '')
+  if($last_prefix == '' && $result[1] == '') 
     { return $text; }                   // Common case fast.
 
 // Remember lengths of strings.
@@ -424,8 +423,6 @@
   $last_len   = strlen($last_prefix);
   $prefix_len = strlen($result[1]);
 
-  if($steal == '')                      // Not slurping up line.
-  {
     $text = $result[4];
 
     $fixup = '';
@@ -500,27 +497,6 @@
     $text = $fixup . $text;
 
     $last_prefix = $result[1];
-  }
-
-  if($steal != '' || $result[1] != '')
-  {
-// Check if a previous line used a trailing '\' to "steal" us;
-// i.e., to insert a new line while continuing with the same list item.
-
-    if($steal == '')
-      { $steal = substr($result[1], -1); }
-
-// Check if *we* have a trailing '\' to "steal" the next line.  If not,
-// end ourselves right here.
-
-    if(preg_match('/(^|[^\\\\])(\\\\\\\\)*\\\\$/', $text))
-      { $text = preg_replace('/\\\\$/', "\n", $text); }
-    else
-    {
-      $text = str_replace("\n", '', $text);
-      $steal = '';
-    }
-  }
 
   return $text;
 }

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

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

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

Modified Files:
	defaults.php 
Log Message:
Removed two entries from ParseEngine, which are hardcoded into lib/main.php's line control scheme. See next entry for a longer explanation

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- defaults.php	21 Oct 2003 17:26:23 -0000	1.13
+++ defaults.php	22 Oct 2003 13:17:28 -0000	1.14
@@ -157,10 +157,8 @@
 // Raw HTML parsing is turned off by default, since this is a potential
 //   security hole.
 $ParseEngine = array(
-                 'parse_elem_flag',
 //                 'parse_raw_html',
                  'parse_htmlisms',
-                 'parse_code',
                  'parse_nowiki',
                  'parse_hyperlink_ref',
                  'parse_hyperlink_description',
@@ -223,6 +221,7 @@
                    'interwiki'    => 'html_interwiki',
                    'raw'          => 'html_raw',
                    'code'         => 'html_code',
+                   'phpcode'      => 'html_phpcode',
                    'hr'           => 'html_hr',
                    'nowiki'       => 'html_nowiki',
                    'anchor'       => 'html_anchor',

[Tavi-cvs-commit] CVS: tavi/tools tavidoc.php,1.2,1.3

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

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

Modified Files:
	tavidoc.php 
Log Message:
Attempted to correct it accordingly to new line control scheme

Index: tavidoc.php
===================================================================
RCS file: /cvsroot/tavi/tavi/tools/tavidoc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tavidoc.php	28 Apr 2003 00:22:26 -0000	1.2
+++ tavidoc.php	22 Oct 2003 13:16:05 -0000	1.3
@@ -29,7 +29,6 @@
 // Tavi defaults
 static 	$CustomParseEngine 	= array('parse_elem_flag',
 					'parse_raw_html',
-					'parse_code',
 					'custom_parse_hyperlink_description',
 					'parse_hyperlink',
 					'custom_parse_freelink',

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.40,1.41

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

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

Modified Files:
	transforms.php 
Log Message:
Forgot to remove debug-line... ;-/

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- transforms.php	21 Oct 2003 17:28:23 -0000	1.40
+++ transforms.php	21 Oct 2003 17:32:08 -0000	1.41
@@ -106,7 +106,6 @@
 
 function freelink_token($link, $appearance, $anchor, $anchor_appearance, $nolink)
 {
-  echo "<pre>$link, $appearance, $anchor, $anchor_appearance, $nolink</pre>";
   global $ParseObject, $FlgChr;
   if($nolink[0] == '!')                              // No-link escape sequence.
     { return new_entity(array('raw', substr($nolink, 1))); } // Trim leading '!'

[Tavi-cvs-commit] CVS: tavi/parse transforms.php,1.39,1.40

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

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

Modified Files:
	transforms.php 
Log Message:
Fixed bug 827658: Second URL not recognized. Did also disallow | to be a part of an URL. And made fixes to allow for InterWikis being replaced by other text or images within (())

Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- transforms.php	20 Sep 2003 21:10:52 -0000	1.39
+++ transforms.php	21 Oct 2003 17:28:23 -0000	1.40
@@ -106,14 +106,19 @@
 
 function freelink_token($link, $appearance, $anchor, $anchor_appearance, $nolink)
 {
-  global $ParseObject;
+  echo "<pre>$link, $appearance, $anchor, $anchor_appearance, $nolink</pre>";
+  global $ParseObject, $FlgChr;
   if($nolink[0] == '!')                              // No-link escape sequence.
     { return new_entity(array('raw', substr($nolink, 1))); } // Trim leading '!'
   
   if($appearance == '')
     { $appearance = $link; }
   else
-    { $appearance = substr($appearance, 1); }   // Trim leading '|'.
+  { 
+    $appearance = substr($appearance, 1);    // Trim leading '|'.
+    if (preg_match("/$FlgChr/", $appearance)) 
+      { $appearance = parse_elements($appearance); }
+  }
 
   // translate sub-page markup into a qualified wikiword
   if ($link[0] == '/')
@@ -123,9 +128,13 @@
       else
         { $link = substr($link,1); } 
     }
- 
-  return new_entity(array('ref', $link, $appearance, '',
+  if (preg_match("/$FlgChr/", $link)) 
+    { return $nolink; }
+  else 
+  {
+    return new_entity(array('ref', $link, $appearance, '',
                           $anchor, $anchor_appearance), false);
+  }
 }
 
 function parse_interwiki($text)
@@ -176,7 +185,7 @@
 {
   global $UrlPtn, $InterwikiPtn;
 
-  return preg_replace("/(^|[^A-Za-z])($UrlPtn|$InterwikiPtn)(\$|[^\\/?=&~A-Za-z0-9])/e",
+  return preg_replace("/(^|[^A-Za-z])($UrlPtn|$InterwikiPtn)(?=\$|[^\\/?=&~A-Za-z0-9])/e",
                       "q1('\\1').url_token(q1('\\2'), q1('\\2')).q1('\\5')", $text, -1);
 }
 

[Tavi-cvs-commit] CVS: tavi/lib defaults.php,1.12,1.13

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

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

Modified Files:
	defaults.php 
Log Message:
Fixed bug 827658: Second URL not recognized. Did also disallow | to be a part of an URL.

Index: defaults.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/defaults.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- defaults.php	20 Sep 2003 21:09:00 -0000	1.12
+++ defaults.php	21 Oct 2003 17:26:23 -0000	1.13
@@ -23,11 +23,11 @@
 
 // $UrlPtn establishes the format for URLs in this wiki.
 $UrlPtn  = "(?:https?:|mailto:|ftp:|gopher:|news:)" .
-           "(?:[^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
+           "(?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[A-Za-z0-9\\/?=&~_]";
 
 // $InterWikiPtn establishes the format for InterWiki links in this wiki.
 $InterwikiPtn = "([A-Za-z0-9]+):" .
-                "((?:[^ \\/\"\']*\\/)*[^ \\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])";
+                "((?:[^ |\\/\"\']*\\/)*[^ |\\t\\n\\/\"\']*[\\/=&~A-Za-z0-9])";
 // Note: To avoid side effect of using parentheses in both $LinkPtn, $UrlPtn and
 //       $InterwikiPtn the special syntax (?: is used. This hides the parentheses
 //       from respectively parse_wikinames, parse_hyperlinkXXX and parse_interwiki

Re: [Tavi-cvs-commit] CVS: tavi ChangeLog.txt,1.13,1.14

[Even H. <eve...@pv...>]

For those who find the amount of mails on this list rather overwhelming,
I give you this advice: Skip most of them, and look for the messages
regarding ChangeLog.txt. At the end of each work day I will commit this
file once, to document what I've done today.

Then you could use that as a guide line to see if any of the other
commits are interesting for you or not.

But I feel that it's better to commit changes along the way, rather than
implementing a lot of stuff and then do one really big commit. 

And if I introduce errors along the way, I will have the opportunity to
fix them.  

That being said it sure looks like I'm going to release a version
0.25pr1 before actually releasing version 0.25 due to a lot of code
being added and some rather large changes as well...  When? Hopefully
within the next week...

Regards,
Even Holen
-- 
<><   Even Holen, eve...@pv..., http://www.pvv.ntnu.no/~evenh/   :-)