phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki/lib interwiki.php,1.8,1.9

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv15195/lib

Modified Files:
	interwiki.php 
Log Message:
Don't urlencode page name for use as link text.


Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** interwiki.php	2001/11/14 18:48:47	1.8
--- interwiki.php	2001/12/06 18:36:51	1.9
***************
*** 30,40 ****
  
      // Urlencode page only if it's a query arg.
!     if (strstr($url, '?'))
!         $page = rawurlencode($page);
! 
      if (strstr($url, '%s'))
!         $url = sprintf($url, $page);
      else
!         $url .= $page;
  
      if ($linktext) {
--- 30,40 ----
  
      // Urlencode page only if it's a query arg.
!     // FIXME: this is a somewhat broken heuristic.
!     $page_enc = strstr($url, '?') ? rawurlencode($page) : $page;
!     
      if (strstr($url, '%s'))
!         $url = sprintf($url, $page_enc);
      else
!         $url .= $page_enc;
  
      if ($linktext) {

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.53,1.54

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13176/lib

Modified Files:
	stdlib.php 
Log Message:
Fix broken switch statement (which cause my PHP to segfault ?!?)


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** stdlib.php	2001/12/06 06:24:44	1.53
--- stdlib.php	2001/12/06 18:29:15	1.54
***************
*** 123,145 ****
                       $linktext);
        } else {
!             //ideally the link image would be specified by a map file
!             //similar to the interwiki.map
!             $linkproto = substr($url, 0, strrpos($url, ":"));
! 			switch($linkproto) {
!             case "mailto":
!                 $linkimg = "/images/mailto.png";
!             case "http":
!                 $linkimg = "/images/http.png";
!             case "https":
!                 $linkimg = "/images/https.png";
!             case "ftp":
!                 $linkimg = "/images/ftp.png";
!             else
!                 $linkimg = "/images/http.png";
!             }
        return Element('a',
!                  array('href' => $url, 'class' => $class),
!                  Element('img', array('src' => DATA_PATH . $linkimg, 'alt' => $linkproto)) . $linktext);
!     }
     }
  
--- 123,152 ----
                       $linktext);
        } else {
!           //ideally the link image would be specified by a map file
!           //similar to the interwiki.map
!           $linkproto = substr($url, 0, strrpos($url, ":"));
!           switch($linkproto) {
!           case "mailto":
!               $linkimg = "/images/mailto.png";
!               break;
!           case "http":
!               $linkimg = "/images/http.png";
!               break;
!           case "https":
!               $linkimg = "/images/https.png";
!               break;
!           case "ftp":
!               $linkimg = "/images/ftp.png";
!               break;
!           default:
!               $linkimg = "/images/http.png";
!               break;
!           }
        return Element('a',
!                      array('href' => $url, 'class' => $class),
!                      Element('img', array('src' => DATA_PATH . $linkimg,
!                                           'alt' => $linkproto))
!                      . $linktext);
!       }
     }
  
***************
*** 386,394 ****
  	    $link['type'] = "url-$linktype";
              $link['link'] = LinkURL($URL, $linkname);
-             
-         
-            $link['link'] = LinkURL($URL, $linkname);
-         
- 
  	 }
        } elseif (preg_match("#^phpwiki:(.*)#", $URL, $match)) {
--- 393,396 ----

[phpwiki-checkins] CVS: phpwiki/lib/plugin IncludePage.php,1.1,1.2

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv12400/lib/plugin

Modified Files:
	IncludePage.php 
Log Message:
Detect and bail upon recursive inclusions.
Add rudimentary error reporting.
Gettextify.


Index: IncludePage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePage.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** IncludePage.php	2001/12/02 02:12:21	1.1
--- IncludePage.php	2001/12/06 18:26:50	1.2
***************
*** 37,49 ****
          return $new;
      }
      
      function run($dbi, $argstr, $request) {
          extract($this->getArgs($argstr, $request));
!         if (!$page) return '';         // FIXME:  error reporting?
          $p = $dbi->getPage($page); 
          
          if ($rev) {
              $r = $p->getRevision($rev);
!             if (!$r) return '';        // FIXME:  error reporting?
          } else {
              $r = $p->getCurrentRevision();
--- 37,70 ----
          return $new;
      }
+ 
+     function error($msg) {
+         // FIXME: better error reporting?
+         trigger_error($msg, E_USER_NOTICE);
+     }
      
      function run($dbi, $argstr, $request) {
+         
          extract($this->getArgs($argstr, $request));
! 
!         if (!$page) {
!             $this->error(_("no page specified"));
!             return '';
!         }
! 
!         static $included_pages = array();
!         if ($page == $request->getArg('pagename')
!             || in_array($page, $included_pages)) {
!             $this->error(sprintf(_("recursive inclusion of page %s"), $page));
!             return '';
!         }
!         
          $p = $dbi->getPage($page); 
          
          if ($rev) {
              $r = $p->getRevision($rev);
!             if (!$r) {
!                 $this->error(sprintf(_("%s(%d): no such revision"), $page, $rev));
!                 return '';
!             }
          } else {
              $r = $p->getCurrentRevision();
***************
*** 56,68 ****
          if ($words) 
              $c = $this->firstNWordsOfContent($words, $c);
!                     
          $content = do_transform($c);
          if ($quiet) return $content;
!         return 
!                  '<p class="transclusion-title">Included from '
!                . LinkExistingWikiWord($page)
!                . '</p>'
!                . '<div class="transclusion">'  . $content 
!                . '</div>';
      }
  };
--- 77,91 ----
          if ($words) 
              $c = $this->firstNWordsOfContent($words, $c);
! 
!         array_push($included_pages, $page);
          $content = do_transform($c);
+         array_pop($included_pages);
+         
          if ($quiet) return $content;
! 
!         return Element('p', array('class' => 'transclusion-title'),
!                        sprintf(_("Included from %s"), LinkExistingWikiWord($page)))
!             . Element('div', array('class' => 'transclusion'),
!                       $content);
      }
  };

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.4,1.5

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv12100

Modified Files:
	phpwiki.css 
Log Message:
Added Joe Edelman's suggested styles for his IncludePage plugin.


Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** phpwiki.css	2001/11/10 04:56:18	1.4
--- phpwiki.css	2001/12/06 18:25:41	1.5
***************
*** 195,198 ****
--- 195,218 ----
  table.cal { border: thin solid black; } 
  
+ 
+ /* IncludePage plugin */
+ .transclusion-title {
+   font-style: oblique;
+   font-size: smaller; /* 0.75em; */
+   text-decoration: underline;
+   text-align: right;
+ } 
+ 
+ div.transclusion { 
+   background: lightgreen;
+   border: thin;
+   border-style: solid;
+   padding-left: 0.8em; 
+   padding-right: 0.8em; 
+   padding-top: 0px;
+   padding-bottom: 0px;
+   margin: 0.5ex 0px;
+ }
+  
  /* For emacs users
   *

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.Mac_OS_X,NONE,1.1 INSTALL.Mac OS X,1.3,NONE

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv26745/doc

Added Files:
	INSTALL.Mac_OS_X 
Removed Files:
	INSTALL.Mac OS X 
Log Message:
Renamed Mac OS X notes.  (Filenames with spaces tend to give some unix
utilities gas...)



--- NEW FILE ---
Using PhpWiki 1.3 with Mac OS X / Darwin

PhpWiki works quite well and retains almost complete functionality when used with a default installation of Mac OS X 10.1 (or greater), with only a few minor exceptions as noted below. Setting up a database for the Wiki backend is probably the most difficult part of the PhpWiki installation as it will require use of the Terminal utility; therefore it is recommended that you at least have some familiarity with the unix command prompt. However, the setup is straightforward and you should be able to complete the install by following the instructions in the INSTALL document included with the PhpWiki download.

If you intend to compile the required database software or PHP module yourself you should download and install the Developer tools from Apple, which includes the necessary cc compiler, and at least temporarily activate the superuser (root) account. The steps necessary to do this are relatively more complicated and are beyond the scope of this document.

In any case you may find Project Builder to be an attractive alternative to TextEdit, especially if you are intent on heavily customizing PhpWiki, working with PHP or doing any other code development. Among other niceties it provides line numbering and syntax coloring, but don't rely on PB's text colors too much, it doesn't yet properly deal with escaped (\") quotes which are frequently called for in PHP when generating HTML code.


Database
--------
A suitable database for PhpWiki is not included with Mac OS X 10.1. If you decide to use one of the more popular (and free) database packages such as mySQL or PostgreSQL with PhpWiki, fortunately there are precompiled versions of the software available. Some distributions even come with Mac OS X installers which will significantly reduce the amount of work you will have to do in the unix environment.

The MySQL 3.23.46 binary installation works well with Mac OS X 10.1 and PhpWiki. After you install and test mySQL follow the instructions given in INSTALL.mysql to prepare a new database for use with PhpWiki.


Apache PHP Module
-----------------
The default PHP module for Apache as supplied by Apple does work with PhpWiki but is missing support for the zlib and GD libraries. Wiki will still produce a valid ZIP file when an administrator saves a ZIP dump of the database but it will not use any compression.

If you want compressed ZIP dumps you will have to install a version of PHP which does support the zlib library, or compile PHP yourself and replace the default /usr/libexec/httpd/libphp4.so (part of the Apple-supplied Apache installation).

PHP with GD library support is required to use "text2png", an experimental plugin for Wiki 1.3.


Obtaining and Installing mySQL and libphp4.so
---------------------------------------------
Mark Liyanage has graciously provided precompiled Mac OS X versions of mySQL, an updated PHP module for Apache and some installation instructions on his web site. He has also written some tips if you want to compile these programs for yourself.

    <http://www.entropy.ch/software/macosx/>

Note that whether you use the built-in PHP module or another PHP module, it must be activated in Apache's httpd.conf before you can use PHP. Take a look at Mark's PHP installation instructions or read the Apache documentation for more information. 

A good place to find other distributions of mySQL or PostgreSQL which can be used with Mac OS X are listed at <http://versiontracker.com/macosx/>.


PhpWiki Configuration Notes
---------------------------
Move the phpwiki folder into the directory used by the web server. In Mac OS X 10.1 this folder will be "/Library/WebServer/Documents" (unless you previously changed it to somewhere else in the configuration file "/private/etc/httpd/httpd.conf").

Follow the generalized installation instructions described in INSTALL but with the changes below.

0. PhpWiki 1.3 needs to know where to find PEAR.php. Edit line 31 of index.php to match the following:

ini_set('include_path', '.: /System/Library/PHP');

If you compiled a version of PHP yourself (perhaps newer than the 4.0.6 version included by Apple) this step may be omitted--unless you changed the default PHP installation directories from /usr/local/. In that case you will have to substitute the appropriate location of PEAR.php according to your PHP installation.

1. The Mac OS X Apache web server runs as user "www" and this works fine with PhpWiki so long as "Everyone" has at least read-only access in the phpwiki folder's Get Info.

If you want to perform serial dumps instead of ZIP dumps you need to set at least one directory to be accessible read-write by the http server. The easiest solution is probably to create a new folder called "dumps" inside the phpwiki folder, then give the user "www" read-write access to it in the terminal:

sudo chown www:www /System/Library/phpwiki/dumps
sudo chmod u+wrx /System/Library/phpwiki/dumps

2. A few lines need to be inserted into Apache's configuration in order to use "nice" URLs with PhpWiki such as:

    http://somehost/wiki?GoodStyle

Open the terminal and type in the following to edit the web server configuration file (enter your administration password when prompted):

sudo pico /etc/httpd/httpd.conf

Scroll down to the <IfModule mod-alias.c> section. Copy the comment line "#PhpWiki 1.3 aliases" and the four lines below it, then paste it into the mod_alias section as shown below.

<IfModule mod_alias.c>

    #
    # Note that if you include a trailing / on fakename then the server will
    # require it to be present in the URL.  So "/icons" isn't aliased in this
    # example, only "/icons/".  If the fakename is slash-terminated, then the 
    # realname must also be slash terminated, and if the fakename omits the 
    # trailing slash, the realname must also omit it.
    #
    Alias /icons/ "/usr/share/httpd/icons/"

#PhpWiki 1.3 aliases
    Alias /wiki/images/ "/Library/WebServer/Documents/phpwiki/images/"
    Alias /wiki/images "/Library/WebServer/Documents/phpwiki/images"
    Alias /wiki/ "/Library/WebServer/Documents/phpwiki/index.php?"
    Alias /wiki "/Library/WebServer/Documents/phpwiki/index.php"


To save your changes and exit, press 'control-x', then 'y' followed by the 'return' key.

Restart the Web Sharing server from the System Preferences "Sharing" control panel or from the terminal:

sudo apachectl graceful

Next, edit the following lines 379, 387 and 412 of index.php to match the following:

define('DATA_PATH', '/wiki');
define('USE_PATH_INFO', true);
define('VIRTUAL_PATH', '/wiki');

3. To retain your PhpWiki logs between system restarts you should specify a non-temporary directory. I recommend you use the same folder where the web-server stores it's logs. Change the following (line 73) in index.php from:

define('ACCESS_LOG', '/tmp/wiki_access_log');

to something like:

define('ACCESS_LOG', '/private/var/log/httpd/wiki_access.log');

Note that the automatic /etc/daily and weekly cron cleanup routines will not touch the Wiki log file--even if it is in the same directory as the httpd logs--it will be up to you to Trash it once in a while or write your own /etc/daily.local file to include it as part of a server log rotation.


If you have problems after all of this, try contacting the
phpwiki-talk list at php...@li....

Carsten Klapp
car...@ma...

***** Bogus filespec: INSTALL.Mac
***** Bogus filespec: OS
--- X DELETED ---

[phpwiki-checkins] CVS: phpwiki/images phpwiki-heavy.css,1.1,NONE phpwiki.css,1.1,NONE

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/images
In directory usw-pr-cvs1:/tmp/cvs-serv25661/images

Removed Files:
	phpwiki-heavy.css phpwiki.css 
Log Message:
I think these are cruft now, so I'm deleting them.


--- phpwiki-heavy.css DELETED ---

--- phpwiki.css DELETED ---

[phpwiki-checkins] CVS: phpwiki index.php,1.32,1.33

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv8922/phpwiki

Modified Files:
	index.php 
Log Message:
Added unobtrusive hook for upcoming theme support.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** index.php	2001/12/02 07:53:47	1.32
--- index.php	2001/12/06 08:15:38	1.33
***************
*** 290,293 ****
--- 290,302 ----
  		   "MESSAGE" =>   "templates/message.html");
  
+ // The themeinfo file can be used to override default settings above this line
+ // (i.e. templates, logo, signature etc.)
+ $theme="";
+ if ( !$theme == "" ) {
+     if ( file_exists( "themes/$theme/themeinfo.php" ) ) {
+         include "themes/$theme/themeinfo.php";
+     }
+ }
+ 
  /* WIKI_PGSRC -- specifies the source for the initial page contents
   * of the Wiki.  The setting of WIKI_PGSRC only has effect when

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.52,1.53

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13790/phpwiki/lib

Modified Files:
	stdlib.php 
Log Message:
Cleaned up linkimage code.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** stdlib.php	2001/12/03 23:37:25	1.52
--- stdlib.php	2001/12/06 06:24:44	1.53
***************
*** 23,31 ****
  	 return $url;
        return SERVER_URL . DATA_PATH . "/$url";
-       // Beginnings of theme support by Carsten Klapp:
-       /*
-       global $theme;
-       return SERVER_URL . DATA_PATH . "/templates/$theme/$url";
-       */
     }
  	  
--- 23,26 ----
***************
*** 112,116 ****
            return Element('strong',
                           QElement('u', array('class' => 'baduri'),
!                                   'BAD URL -- remove all of <, >, "'));
        }
  
--- 107,111 ----
            return Element('strong',
                           QElement('u', array('class' => 'baduri'),
!                                   'BAD URL -- remove all of <, >, "')); //"
        }
  
***************
*** 131,145 ****
              //similar to the interwiki.map
              $linkproto = substr($url, 0, strrpos($url, ":"));
!             if ($linkproto == "mailto") {
                  $linkimg = "/images/mailto.png";
!             } elseif ($linkproto == "http") { 
                  $linkimg = "/images/http.png";
!             } elseif ($linkproto == "https") { 
                  $linkimg = "/images/https.png";
!             } elseif ($linkproto == "ftp") { 
                  $linkimg = "/images/ftp.png";
!             } else {
                  $linkimg = "/images/http.png";
!       }
        return Element('a',
                   array('href' => $url, 'class' => $class),
--- 126,141 ----
              //similar to the interwiki.map
              $linkproto = substr($url, 0, strrpos($url, ":"));
! 			switch($linkproto) {
!             case "mailto":
                  $linkimg = "/images/mailto.png";
!             case "http":
                  $linkimg = "/images/http.png";
!             case "https":
                  $linkimg = "/images/https.png";
!             case "ftp":
                  $linkimg = "/images/ftp.png";
!             else
                  $linkimg = "/images/http.png";
!             }
        return Element('a',
                   array('href' => $url, 'class' => $class),

[phpwiki-checkins] CVS: phpwiki/lib/plugin text2png.php,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv14700/phpwiki/lib/plugin

Modified Files:
	text2png.php 
Log Message:
*** empty log message ***

Index: text2png.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/text2png.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** text2png.php	2001/12/06 00:21:45	1.2
--- text2png.php	2001/12/06 01:26:31	1.3
***************
*** 25,33 ****
  		//you MUST delete the image cache yourself if you change the drawing routines!
  		
!         //to show debug string, whether image was saved or loaded from cache
! 		//and what the path is
!         
  		$filename = $text . ".png";
!         if ($l == "C") { $l = "en"; } //FIXME: hack for english, C=en
  		$filepath = getcwd() . "/images/$l";
   
--- 25,45 ----
  		//you MUST delete the image cache yourself if you change the drawing routines!
  		
!         //uncomment debug string above to see whether image was saved to or loaded from cache
! 		//and what the path is.
! 		
!         //locale test
! 		//http://download.php.net/manual/en/function.dcgettext.php
! 		//dcgettext and dgettext aren't available functions on my system.?? -carsten
! 		//this doesn't seem to work anyway, always get english. ??
!         //$oldlang=$LANG;
! 		//putenv("LANG=$l");
!         //$LANG=$l;
!         //if (!$l == "C") {include("locale/$l/LC_MESSAGES/phpwiki.php");}
! 		//$text = gettext($text);
!         //putenv("LANG=$oldlang");
! 		
  		$filename = $text . ".png";
! 		
!         if ($l == "C") { $l = "en"; } //FIXME: hack for english, C=en ??
  		$filepath = getcwd() . "/images/$l";
   
***************
*** 60,63 ****
--- 72,77 ----
  		    $text_color = ImageColorAllocate($im, 0, 0, 0);
  		    ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
+ 
+             //maybe an alternate text drawing method in case ImageTTFText doesn't work
  		    //ImageString($im, 2, 10, 40, $text, $text_color);
  

[phpwiki-checkins] CVS: phpwiki/lib/plugin text2png.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv16615/phpwiki/lib/plugin

Modified Files:
	text2png.php 
Log Message:
text2png plug now really works! (accepts a text= argument, and does cache the image in /image/$lang/ instead of redrawing each time)

Index: text2png.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/text2png.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** text2png.php	2001/12/01 10:01:42	1.1
--- text2png.php	2001/12/06 00:21:45	1.2
***************
*** 1,51 ****
  <?php // -*-php-*-
  
  class WikiPlugin_text2png
  extends WikiPlugin
  {
!     var $name = 'text2png';
!     function getDefaultArguments() {
!         return array('text'    => 'Hello WikiWorld!');
!     }
!    function run($args) {
!         //FIXME: are quotes needed for the argument string text= or no?
!         //FIXME: the next two lines aren't the correct way to extract a text argument for a WikiPlugin
!         $args = &$this->args;
!         $t = $args['text'];
!         return $this->text2png($t);
          
! //        return sprintf("<tt>%s %s</tt>", $salutation, $name);
!     }
! 
!     function text2png($text) {
!         //FIXME: once this accepts a text argument the next line should be removed
!         $text="Hello WikiWorld!";
!         
!         $text or die ("?text string required");
!         $im = @ImageCreate(150, 75) or die ("Cannot Initialize new GD image stream. PHP must be compiled with support for GD 1.6 or later to create png files.");
! 
!         $bg_color   = ImageColorAllocate($im, 255, 255, 255);
!         $text_color = ImageColorAllocate($im, 50, 50, 200);
!         $ttfont     = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
! 
!         ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
!         ImageString($im, 2, 10, 40, $text, $text_color);
! 
!         // dump directly to browser:
!         //        header("Content-type: image/png");
!         //        ImagePng($im);
! 
!         // save to file:
!         $filename = $text . ".png";
!         $success = ImagePng($im, "../" . $filename);
! 
!         //FIXME: the link generated doesn't work. The image file is dumped in the same directory as index.php
!         if($success = 1) {
!             $s = "<p>png image saved as <a href=\"/$filename\">$filename</a>.</p>";
!          } else {
!             $s = "<p>Error creating png file.</p>";
!         }  
!         return $s;
!     }
  };
  
--- 1,96 ----
  <?php // -*-php-*-
  
+ define('text2png_debug', true);
+ 
+ 
  class WikiPlugin_text2png
  extends WikiPlugin
  {
! 	var $name = 'text2png';
! 	
! 	function getDefaultArguments() {
!     global $LANG;
! 	return array('text'	=> "Hello WikiWorld!",
! 	             'l'    => $LANG );
! 	}
! 
! 	function run($dbi, $argstr, $request) {
! 		extract($this->getArgs($argstr, $request));
! 		return $this->text2png($text,$l);
! 	}
! 
! 	function text2png($text,$l) {
! 
!         //basic image creation and caching
! 		//you MUST delete the image cache yourself if you change the drawing routines!
! 		
!         //to show debug string, whether image was saved or loaded from cache
! 		//and what the path is
          
! 		$filename = $text . ".png";
!         if ($l == "C") { $l = "en"; } //FIXME: hack for english, C=en
! 		$filepath = getcwd() . "/images/$l";
!  
!         if (!file_exists($filepath ."/". $filename)) {
!             
!             if (!file_exists($filepath)) {
! 			    $oldumask = umask(0);
!                 mkdir($filepath, 0777);    //permissions affected by user the www server is running as
!                 umask($oldumask);
!             }
!             
! 			// add trailing slash to save some keystrokes later
!             $filepath .= "/";
!             
! 			// prepare a new image
!             $im = @ImageCreate(150, 50) or die ("Cannot Initialize new GD image stream. PHP must be compiled with support for GD 1.6 or later to create png files.");
! 
!             // get ready to draw
! 		    $bg_color   = ImageColorAllocate($im, 255, 255, 255);
! 		    $ttfont     = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/LucidaSansRegular.ttf";
! 
!             // http://download.php.net/manual/en/function.imagettftext.php
! 			// array imagettftext (int im, int size, int angle, int x, int y, int col, string fontfile, string text)
! 
!             //draw shadow
! 		    $text_color = ImageColorAllocate($im, 175, 175, 175);
!             //shadow is 1 pixel down and 2 pixels right
! 		    ImageTTFText($im, 10, 0, 12, 31, $text_color, $ttfont, $text);
!             //draw text
! 		    $text_color = ImageColorAllocate($im, 0, 0, 0);
! 		    ImageTTFText($im, 10, 0, 10, 30, $text_color, $ttfont, $text);
! 		    //ImageString($im, 2, 10, 40, $text, $text_color);
! 
! 		    // to dump directly to browser:
! 		    //header("Content-type: image/png");
! 		    //ImagePng($im);
! 
! 		    // to save to file:
!             $success = ImagePng($im, $filepath . $filename);
! 
!         } else {
!             $filepath .= "/";
!             $success = 2;
!         }
! 
!         // create an <img src= tag to show the image!
!         // this could use some better error reporting
! 		$html = "";
! 		if ($success > 0) {
!             if (defined('text2png_debug')) {
!                    switch($success) { 
!                    case 1:
!                         $html .= Element('p', "Image saved to cache file: " . $filepath . $filename) . "\n" ;
!                    case 2:
!                         $html .= Element('p', "Image loaded from cache file: " . $filepath . $filename) . "\n" ;
!                      }
!             }
!             $urlpath = DATA_PATH . "/images/$l/";
!             $html .= Element('img', array('src' => $urlpath . $filename, 'alt' => $text));
! 		} else {
! 			$html .= Element('p', "Error writing png file: " . $filepath . $filename) . "\n";
! 		}
! 		return $html;
! 	}
  };
  
***************
*** 53,57 ****
  // Local Variables:
  // mode: php
! // tab-width: 8
  // c-basic-offset: 4
  // c-hanging-comment-ender-p: nil
--- 98,102 ----
  // Local Variables:
  // mode: php
! // tab-width: 4
  // c-basic-offset: 4
  // c-hanging-comment-ender-p: nil

[phpwiki-checkins] CVS: phpwiki/schemas mysql.sql,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/schemas
In directory usw-pr-cvs1:/tmp/cvs-serv10439/phpwiki/schemas

Modified Files:
	mysql.sql 
Log Message:
Converted tabs to spaces, mysql doesn't like tabs :-(

Index: mysql.sql
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/schemas/mysql.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql.sql	2001/12/03 04:05:38	1.1
--- mysql.sql	2001/12/04 23:49:33	1.2
***************
*** 3,10 ****
  drop table if exists page;
  CREATE TABLE page (
! 	id		INT NOT NULL,
!         pagename	VARCHAR(100) BINARY NOT NULL,
! 	hits		INT NOT NULL DEFAULT 0,
!         pagedata	MEDIUMTEXT NOT NULL DEFAULT '',
          PRIMARY KEY (id),
  	UNIQUE KEY (pagename)
--- 3,10 ----
  drop table if exists page;
  CREATE TABLE page (
! 	id              INT NOT NULL,
!         pagename        VARCHAR(100) BINARY NOT NULL,
! 	hits            INT NOT NULL DEFAULT 0,
!         pagedata        MEDIUMTEXT NOT NULL DEFAULT '',
          PRIMARY KEY (id),
  	UNIQUE KEY (pagename)
***************
*** 13,22 ****
  drop table if exists version;
  CREATE TABLE version (
! 	id		INT NOT NULL,
!         version		INT NOT NULL,
! 	mtime		INT NOT NULL,
! 	minor_edit	TINYINT DEFAULT 0,
!         content		MEDIUMTEXT NOT NULL DEFAULT '',
!         versiondata	MEDIUMTEXT NOT NULL DEFAULT '',
          PRIMARY KEY (id,version),
  	INDEX (mtime)
--- 13,22 ----
  drop table if exists version;
  CREATE TABLE version (
! 	id              INT NOT NULL,
!         version         INT NOT NULL,
! 	mtime           INT NOT NULL,
! 	minor_edit      TINYINT DEFAULT 0,
!         content         MEDIUMTEXT NOT NULL DEFAULT '',
!         versiondata     MEDIUMTEXT NOT NULL DEFAULT '',
          PRIMARY KEY (id,version),
  	INDEX (mtime)
***************
*** 25,32 ****
  drop table if exists recent;
  CREATE TABLE recent (
! 	id		INT NOT NULL,
! 	latestversion	INT,
! 	latestmajor	INT,
! 	latestminor	INT,
          PRIMARY KEY (id)
  );
--- 25,32 ----
  drop table if exists recent;
  CREATE TABLE recent (
! 	id              INT NOT NULL,
! 	latestversion   INT,
! 	latestmajor     INT,
! 	latestminor     INT,
          PRIMARY KEY (id)
  );
***************
*** 34,38 ****
  drop table if exists nonempty;
  CREATE TABLE nonempty (
! 	id		INT NOT NULL,
  	PRIMARY KEY (id)
  );
--- 34,38 ----
  drop table if exists nonempty;
  CREATE TABLE nonempty (
! 	id              INT NOT NULL,
  	PRIMARY KEY (id)
  );
***************
*** 40,45 ****
  drop table if exists link;
  CREATE TABLE link (
!         linkfrom	INT NOT NULL,
!         linkto		INT NOT NULL,
  	INDEX (linkfrom),
          INDEX (linkto)
--- 40,45 ----
  drop table if exists link;
  CREATE TABLE link (
!         linkfrom        INT NOT NULL,
!         linkto          INT NOT NULL,
  	INDEX (linkfrom),
          INDEX (linkto)

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.9.2.2,1.9.2.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2995/phpwiki/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -r1.9.2.2 -r1.9.2.3
*** browse.html	2001/08/18 00:35:10	1.9.2.2
--- browse.html	2001/12/04 23:18:46	1.9.2.3
***************
*** 2,11 ****
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
--- 2,11 ----
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###SPLIT_PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###SPLIT_PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]

[phpwiki-checkins] CVS: phpwiki/locale/nl/templates browse.html,1.3.2.2,1.3.2.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/nl/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2933/phpwiki/locale/nl/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/nl/templates/browse.html,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** browse.html	2001/08/18 00:35:10	1.3.2.2
--- browse.html	2001/12/04 23:18:32	1.3.2.3
***************
*** 2,11 ****
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]
--- 2,11 ----
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###SPLIT_PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###SPLIT_PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>]

[phpwiki-checkins] CVS: phpwiki/locale/it/templates browse.html,1.1.2.3,1.1.2.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/it/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2884/phpwiki/locale/it/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/it/templates/browse.html,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** browse.html	2001/08/18 00:35:10	1.1.2.3
--- browse.html	2001/12/04 23:18:11	1.1.2.4
***************
*** 2,11 ****
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Sblocca la pagina</a>]
--- 2,11 ----
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###SPLIT_PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###SPLIT_PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Sblocca la pagina</a>]

[phpwiki-checkins] CVS: phpwiki/locale/es/templates browse.html,1.3.2.3,1.3.2.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/es/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2816/phpwiki/locale/es/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/es/templates/browse.html,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** browse.html	2001/08/18 00:35:10	1.3.2.3
--- browse.html	2001/12/04 23:17:54	1.3.2.4
***************
*** 1,33 ****
! <html>
! <head>
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
! </head>
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###PAGE###</a></h1>
! ###IF:ADMIN###
!   ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Desbloquear p&aacute;gina</a>] 
!   ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Bloquear p&aacute;gina</a>] 
!   - - [<a href="###SCRIPTURL###?remove=###PAGEURL###">Borrar p&aacute;gina</A>] 
!   <hr noshade>
! ###ENDIF:ADMIN###
! <P>
! ###CONTENT###
! <hr noshade>
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina 
! ###IF:!ADMIN###
! ###IF LOCK###P&aacute;gina bloqueada
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina
! ###ENDIF:!ADMIN###
! (editada por &uacute;ltima vez ###LASTMODIFIED###) 
! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] 
! [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
! <br>
! <a href="###SCRIPTURL###?BuscarPagina">BuscarP&aacute;gina</a> navegando o buscando 
! <hr noshade>
! <small>###RELATEDPAGES###</small>
! 
! </body>
! </html>
--- 1,66 ----
! <html>
! 
! <head>
! 
! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! 
! <title>###SPLIT_PAGE###</title>
! 
! </head>
! 
! 
! 
! <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
! 
! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! 
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###SPLIT_PAGE###</a></h1>
! 
! ###IF:ADMIN###
! 
!   ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Desbloquear p&aacute;gina</a>] 
! 
!   ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Bloquear p&aacute;gina</a>] 
! 
!   - - [<a href="###SCRIPTURL###?remove=###PAGEURL###">Borrar p&aacute;gina</A>] 
! 
!   <hr noshade>
! 
! ###ENDIF:ADMIN###
! 
! <P>
! 
! ###CONTENT###
! 
! <hr noshade>
! 
! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina 
! 
! ###IF:!ADMIN###
! 
! ###IF LOCK###P&aacute;gina bloqueada
! 
! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditarElTexto</a> de esta p&aacute;gina
! 
! ###ENDIF:!ADMIN###
! 
! (editada por &uacute;ltima vez ###LASTMODIFIED###) 
! 
! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] 
! 
! [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) 
! 
! <br>
! 
! <a href="###SCRIPTURL###?BuscarPagina">BuscarP&aacute;gina</a> navegando o buscando 
! 
! <hr noshade>
! 
! <small>###RELATEDPAGES###</small>
! 
! 
! 
! </body>
! 
! </html>
! 

[phpwiki-checkins] CVS: phpwiki/locale/de/templates browse.html,1.3.2.2,1.3.2.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale/de/templates
In directory usw-pr-cvs1:/tmp/cvs-serv2784/phpwiki/locale/de/templates

Modified Files:
      Tag: release-1_2-branch
	browse.html 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/templates/browse.html,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** browse.html	2001/08/18 00:35:10	1.3.2.2
--- browse.html	2001/12/04 23:17:45	1.3.2.3
***************
*** 2,11 ****
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]
--- 2,11 ----
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
! <title>###SPLIT_PAGE###</title>
  </head>
  
  <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta>
  <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a>
! <a href="###SCRIPTURL###?refs=###PAGEURL###">###SPLIT_PAGE###</a></h1>
  ###IF:ADMIN###
  ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Seite freigeben</a>]

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.21.2.10,1.21.2.11

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv2707/phpwiki/lib

Modified Files:
      Tag: release-1_2-branch
	stdlib.php 
Log Message:
Fixed page title, now uses SPLIT_PAGE to prevent editing the wrong page (Bug introduced Dec 2&3).

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21.2.10
retrieving revision 1.21.2.11
diff -C2 -r1.21.2.10 -r1.21.2.11
*** stdlib.php	2001/12/04 21:32:06	1.21.2.10
--- stdlib.php	2001/12/04 23:17:27	1.21.2.11
***************
*** 577,580 ****
--- 577,581 ----
        _dotoken('SCRIPTURL', $ScriptUrl, $page);
        _dotoken('PAGE', htmlspecialchars($name), $page);
+       _dotoken('SPLIT_PAGE', htmlspecialchars(split_pagename($name)), $page);
        _dotoken('ALLOWEDPROTOCOLS', $AllowedProtocols, $page);
        _dotoken('LOGO', $logo, $page);

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.21.2.9,1.21.2.10

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6441/phpwiki/lib

Modified Files:
      Tag: release-1_2-branch
	stdlib.php 
Log Message:
Removed split_pagename for the page's <h1> until a better solution can be found. This was causing the page name to incorrectly always be stored in the database with a space (%20) in the name, instead of just outputting the split page name in the html.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21.2.9
retrieving revision 1.21.2.10
diff -C2 -r1.21.2.9 -r1.21.2.10
*** stdlib.php	2001/12/03 23:33:21	1.21.2.9
--- stdlib.php	2001/12/04 21:32:06	1.21.2.10
***************
*** 576,580 ****
  
        _dotoken('SCRIPTURL', $ScriptUrl, $page);
!       _dotoken('PAGE', split_pagename(htmlspecialchars($name)), $page);
        _dotoken('ALLOWEDPROTOCOLS', $AllowedProtocols, $page);
        _dotoken('LOGO', $logo, $page);
--- 576,580 ----
  
        _dotoken('SCRIPTURL', $ScriptUrl, $page);
!       _dotoken('PAGE', htmlspecialchars($name), $page);
        _dotoken('ALLOWEDPROTOCOLS', $AllowedProtocols, $page);
        _dotoken('LOGO', $logo, $page);

[phpwiki-checkins] CVS: phpwiki/lib/plugin Calendar.php,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory usw-pr-cvs1:/tmp/cvs-serv27498/phpwiki/lib/plugin

Modified Files:
	Calendar.php 
Log Message:
*** empty log message ***

Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Calendar.php	2001/11/10 04:56:18	1.1
--- Calendar.php	2001/12/04 05:59:45	1.2
***************
*** 21,25 ****
  extends WikiPlugin
  {
!     var $name = 'BackLinks';
    
      function getDefaultArguments() {
--- 21,25 ----
  extends WikiPlugin
  {
!     var $name = 'Calendar';
    
      function getDefaultArguments() {

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.51,1.52

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv28430/phpwiki/lib

Modified Files:
	stdlib.php 
Log Message:
Linkimages now show for unbracketed urls. Optimized linkimage code.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** stdlib.php	2001/12/03 23:12:04	1.51
--- stdlib.php	2001/12/03 23:37:25	1.52
***************
*** 144,148 ****
        return Element('a',
                   array('href' => $url, 'class' => $class),
!                  Element('img', array('src' => DATA_PATH . $linkimg, 'alt' => $linkproto)) ." ". $linktext);
      }
     }
--- 144,148 ----
        return Element('a',
                   array('href' => $url, 'class' => $class),
!                  Element('img', array('src' => DATA_PATH . $linkimg, 'alt' => $linkproto)) . $linktext);
      }
     }

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.21.2.8,1.21.2.9

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv27333/phpwiki/lib

Modified Files:
      Tag: release-1_2-branch
	stdlib.php 
Log Message:
Linkicons now work for unbracketed links. Optimized Linkicon code.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.21.2.8
retrieving revision 1.21.2.9
diff -C2 -r1.21.2.8 -r1.21.2.9
*** stdlib.php	2001/12/02 21:30:36	1.21.2.8
--- stdlib.php	2001/12/03 23:33:21	1.21.2.9
***************
*** 134,138 ****
        if(empty($linktext))
           $linktext = htmlspecialchars($url);
!       return "<a href=\"$url\">$linktext</a>";
     }
  
--- 134,156 ----
        if(empty($linktext))
           $linktext = htmlspecialchars($url);
!       if (!defined('USE_LINK_ICONS')) {
!           return "<a href=\"$url\">$linktext</a>";
!       } else {
!             //ideally the link image would be specified by a map file
!             //similar to the interwiki.map
!             $linkproto = substr($url, 0, strrpos($url, ":"));
!             if ($linkproto == "mailto") {
!                 $linkimg = "/images/mailto.png";
!             } elseif ($linkproto == "http") { 
!                 $linkimg = "/images/http.png";
!             } elseif ($linkproto == "https") { 
!                 $linkimg = "/images/https.png";
!             } elseif ($linkproto == "ftp") { 
!                 $linkimg = "/images/ftp.png";
!             } else {
!                 $linkimg = "/images/http.png";
!             }
!       return "<a href=\"$url\"><img src=\"" . DATA_PATH . $linkimg . "\" alt=\"" . $linkproto . "\">$linktext</a>";
!       }
     }
  
***************
*** 389,412 ****
           } else {
  	    $link['type'] = "url-$linktype";
!         
!         if (!defined("USE_LINK_ICONS")) {
!            $link['link'] = LinkURL($URL, $linkname);
!         } else {
!            //preg_split((.*?):(.*)$, $URL, $matches);
!            //preg_split("[:]", $URL, $matches);
!            //$protoc = $matches[1]
!            $protoc = substr($URL, 0, strrpos($URL, ":"));
!            if ($protoc == "mailto") {
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/mailto.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "http") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/http.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "https") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/https.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "ftp") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/ftp.png\"> " . LinkURL($URL, $linkname);
!             } else {
!                $link['link'] = LinkURL($URL, $linkname);
!            }
! 	 }}
        } elseif (preg_match("#^phpwiki:(.*)#", $URL, $match)) {
  	 $link['type'] = "url-wiki-$linktype";
--- 407,412 ----
           } else {
  	    $link['type'] = "url-$linktype";
!             $link['link'] = LinkURL($URL, $linkname);
! 	 }
        } elseif (preg_match("#^phpwiki:(.*)#", $URL, $match)) {
  	 $link['type'] = "url-wiki-$linktype";

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.50,1.51

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20953/phpwiki/lib

Modified Files:
	stdlib.php 
Log Message:
Linkimages now show for unbracketed urls. Optimized linkimage code.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** stdlib.php	2001/12/02 07:53:59	1.50
--- stdlib.php	2001/12/03 23:12:04	1.51
***************
*** 123,129 ****
        }
  
!       return QElement('a',
!                       array('href' => $url, 'class' => $class),
!                       $linktext);
     }
  
--- 123,149 ----
        }
  
!       if (!defined('USE_LINK_ICONS')) {
!           return QElement('a',
!                      array('href' => $url, 'class' => $class),
!                      $linktext);
!       } else {
!             //ideally the link image would be specified by a map file
!             //similar to the interwiki.map
!             $linkproto = substr($url, 0, strrpos($url, ":"));
!             if ($linkproto == "mailto") {
!                 $linkimg = "/images/mailto.png";
!             } elseif ($linkproto == "http") { 
!                 $linkimg = "/images/http.png";
!             } elseif ($linkproto == "https") { 
!                 $linkimg = "/images/https.png";
!             } elseif ($linkproto == "ftp") { 
!                 $linkimg = "/images/ftp.png";
!             } else {
!                 $linkimg = "/images/http.png";
!       }
!       return Element('a',
!                  array('href' => $url, 'class' => $class),
!                  Element('img', array('src' => DATA_PATH . $linkimg, 'alt' => $linkproto)) ." ". $linktext);
!     }
     }
  
***************
*** 140,146 ****
        if (empty($linktext)) {
            $linktext = $wikiword;
!       if (defined("autosplit_wikiwords"))
!           $linktext=split_pagename($linktext);
!           $class = 'wiki';
        }
        else
--- 160,166 ----
        if (empty($linktext)) {
            $linktext = $wikiword;
!           if (defined("autosplit_wikiwords"))
!               $linktext=split_pagename($linktext);
!          $class = 'wiki';
        }
        else
***************
*** 155,160 ****
        if (empty($linktext)) {
            $linktext = $wikiword;
!       if (defined("autosplit_wikiwords"))
!           $linktext=split_pagename($linktext);
            $class = 'wikiunknown';
        }
--- 175,180 ----
        if (empty($linktext)) {
            $linktext = $wikiword;
!           if (defined("autosplit_wikiwords"))
!               $linktext=split_pagename($linktext);
            $class = 'wikiunknown';
        }
***************
*** 371,393 ****
              $link['link'] = LinkURL($URL, $linkname);
              
!         if (!defined("USE_LINK_ICONS")) {
             $link['link'] = LinkURL($URL, $linkname);
!         } else {
!            //preg_split((.*?):(.*)$, $URL, $matches);
!            //preg_split("[:]", $URL, $matches);
!            //$protoc = $matches[0] . "-" . $matches[1];
!            $protoc = substr($URL, 0, strrpos($URL, ":"));
!            if ($protoc == "mailto") {
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/mailto.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "http") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/http.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "https") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/https.png\"> " . LinkURL($URL, $linkname);
!            } elseif ($protoc == "ftp") { 
!                $link['link'] = "<img src=\"" . DATA_PATH . "/images/ftp.png\"> " . LinkURL($URL, $linkname);
!             } else {
!                $link['link'] = LinkURL($URL, $linkname);
!            }
!         }
  
  	 }
--- 391,397 ----
              $link['link'] = LinkURL($URL, $linkname);
              
!         
             $link['link'] = LinkURL($URL, $linkname);
!         
  
  	 }

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.Mac OS X,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv11465/phpwiki/doc

Modified Files:
	INSTALL.Mac OS X 
Log Message:
typos & minor adj.

***** Bogus filespec: INSTALL.Mac
***** Bogus filespec: OS

[phpwiki-checkins] CVS: phpwiki INSTALL.Mac OS X,1.1.2.3,1.1.2.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv11390/phpwiki

Modified Files:
      Tag: release-1_2-branch
	INSTALL.Mac OS X 
Log Message:
typos & minor adj.

***** Bogus filespec: INSTALL.Mac
***** Bogus filespec: OS

[phpwiki-checkins] CVS: phpwiki/doc INSTALL.Mac OS X,1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/doc
In directory usw-pr-cvs1:/tmp/cvs-serv7052/phpwiki/doc

Modified Files:
	INSTALL.Mac OS X 
Log Message:
Added ProjectBuilder info, hint about libphp4.so and logging instructions.

***** Bogus filespec: INSTALL.Mac
***** Bogus filespec: OS