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

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.6,1.7

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

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

Modified Files:
	interwiki.map 
Log Message:
Added php-function and php-lookup.

Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** interwiki.map	2001/12/06 22:44:42	1.6
--- interwiki.map	2001/12/07 23:52:34	1.7
***************
*** 41,44 ****
--- 41,46 ----
  OrgPatterns http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
  PersonalTelco http://www.personaltelco.net/index.cgi/
+ php-function http://www.php.net/manual/en/function.%s.php
+ php-lookup http://www.php.net/manual-lookup.php?pattern=
  PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
  Pikie http://pikie.darktech.org/cgi/pikie?

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

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

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

Modified Files:
	RecentChanges.php 
Log Message:
Change plugin arg syntax from 'rss=1' to 'format=rss'.


Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RecentChanges.php	2001/12/07 22:15:43	1.2
--- RecentChanges.php	2001/12/07 22:28:21	1.3
***************
*** 16,20 ****
                       'show_all'		=> false,
                       'limit'		=> false,
!                      'rss'		=> false);
      }
  
--- 16,20 ----
                       'show_all'		=> false,
                       'limit'		=> false,
!                      'format'		=> false);
      }
  
***************
*** 35,39 ****
          $changes = $dbi->mostRecent($params);
  
!         if ($rss && $request->getArg('action') == 'browse') {
              header("Content-Type: application/xml; charset=" . RSS_ENCODING);
              
--- 35,45 ----
          $changes = $dbi->mostRecent($params);
  
!         if ($request->getArg('action') != 'browse')
!             $format = false;    // default -> HTML
!         switch ($format) {
!         case 'rss':
!             if (!$args['limit'])
!                 $args['limit'] = 15;
! 
              header("Content-Type: application/xml; charset=" . RSS_ENCODING);
              
***************
*** 43,49 ****
              echo $xml;
              ExitWiki();
!         }
!         else {
              return $this->__format_as_html($changes, $title, $args);
          }
      }
--- 49,56 ----
              echo $xml;
              ExitWiki();
!             break;
!         default:
              return $this->__format_as_html($changes, $title, $args);
+             break;
          }
      }
***************
*** 150,157 ****
  
          $limit = $args['limit'];
!         if (! $limit)
!             $limit = 15;
! 
!         while ($limit-- > 0 && $rev = $changes->next()) {
              $page = $rev->getPage();
  
--- 157,161 ----
  
          $limit = $args['limit'];
!         while ($rev = $changes->next()) {
              $page = $rev->getPage();
  
***************
*** 186,189 ****
--- 190,196 ----
              $uri = WikiURL($pagename, array('version' => $rev->getVersion()), 'absurl');
              $rss->addItem($item, $uri);
+ 
+             if ($limit && --$limit <= 0)
+                 break;
          }
  

[phpwiki-checkins] CVS: phpwiki/lib RssWriter.php,NONE,1.1

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

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

Added Files:
	RssWriter.php 
Log Message:
Add support for generation of RSSified RecentChanges.


***** Error reading new file: [Errno 2] No such file or directory: 'RssWriter.php'

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

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

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

Modified Files:
	RecentChanges.php 
Log Message:
Add support for generation of RSSified RecentChanges.


Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** RecentChanges.php	2001/09/18 19:19:05	1.1
--- RecentChanges.php	2001/12/07 22:15:43	1.2
***************
*** 3,6 ****
--- 3,8 ----
  /**
   */
+ define('RSS_ENCODING', 'ISO-8859-1');
+ 
  class WikiPlugin_RecentChanges
  extends WikiPlugin
***************
*** 12,20 ****
                       'show_minor'	=> false,
                       'show_major'	=> true,
!                      'show_all'		=> false);
      }
  
      function run($dbi, $argstr, $request) {
!         extract($this->getArgs($argstr, $request));
          $params = array('include_minor_revisions' => $show_minor,
                          'exclude_major_revisions' => !$show_major,
--- 14,25 ----
                       'show_minor'	=> false,
                       'show_major'	=> true,
!                      'show_all'		=> false,
!                      'limit'		=> false,
!                      'rss'		=> false);
      }
  
      function run($dbi, $argstr, $request) {
!         $args = $this->getArgs($argstr, $request);
!         extract($args);
          $params = array('include_minor_revisions' => $show_minor,
                          'exclude_major_revisions' => !$show_major,
***************
*** 22,33 ****
          if ($days > 0.0) {
              $params['since'] = time() - 24 * 3600 * $days;
!             $html = "<h3>RecentChanges in the last $days days</h3>\n";
          }
          else {
!             $html = sprintf("<h3>RecentChanges</h3>\n", $days);
          }
!              
          $changes = $dbi->mostRecent($params);
  
          global $dateformat;
          global $WikiNameRegexp;
--- 27,54 ----
          if ($days > 0.0) {
              $params['since'] = time() - 24 * 3600 * $days;
!             $title = sprintf(_("RecentChanges in the past %.1f days"), $args['days']);
          }
          else {
!             $title = _("RecentChanges");
          }
!         
          $changes = $dbi->mostRecent($params);
  
+         if ($rss && $request->getArg('action') == 'browse') {
+             header("Content-Type: application/xml; charset=" . RSS_ENCODING);
+             
+             $xml =  $this->__format_as_rss($changes, $title, $args, $request);
+             printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", RSS_ENCODING);
+             printf("<!-- Generated by PhpWiki:\n%s-->\n", $GLOBALS['RCS_IDS']);
+             echo $xml;
+             ExitWiki();
+         }
+         else {
+             return $this->__format_as_html($changes, $title, $args);
+         }
+     }
+ 
+     function __format_as_html($changes, $title, $args) {
+ 
          global $dateformat;
          global $WikiNameRegexp;
***************
*** 38,41 ****
--- 59,66 ----
          $diffargs = array('action' => 'diff');
  
+         // FIXME: add XML icon (and link) to title?
+         $html = QElement('h3', $title);
+ 
+         $limit = $args['limit'];
          while ($rev = $changes->next()) {
              $created = $rev->get('mtime');
***************
*** 54,58 ****
              $pagename = $page->getName();
  
!             if ($show_all) {
                  // FIXME: should set previous, too, if showing only minor or major revs.
                  //  or maybe difftype.
--- 79,83 ----
              $pagename = $page->getName();
  
!             if ($args['show_all']) {
                  // FIXME: should set previous, too, if showing only minor or major revs.
                  //  or maybe difftype.
***************
*** 78,81 ****
--- 103,109 ----
              $lines[] = Element('li',
                                 "$diff $wikipage $time $summary ... $author");
+ 
+             if ($limit && --$limit <= 0)
+                 break;
          }
          if ($lines)
***************
*** 84,89 ****
          return $html;
      }
! };
          
  // (c-file-style: "gnu")
  // Local Variables:
--- 112,196 ----
          return $html;
      }
! 
!     function __format_as_rss($changes, $title, $args, $request) {
!         include_once('lib/RssWriter.php');
!         $rss = new RssWriter;
!         $rc_url = WikiURL($request->getArg('pagename'), false, 'absurl');
!         
!         $chan = array('title' => 'PhpWiki', // FIXME: this should be a config define
!                       'dc:description' => $title,
!                       'link' => $rc_url,
!                       'dc:date' => Iso8601DateTime(time()));
! 
!         /* FIXME: other things one might like in <channel>:                   
!          * sy:updateFrequency
!          * sy:updatePeriod
!          * sy:updateBase
!          * dc:subject
!          * dc:publisher
!          * dc:language
!          * dc:rights
!          * rss091:language
!          * rss091:managingEditor
!          * rss091:webmaster
!          * rss091:lastBuildDate
!          * rss091:copyright
!          */
! 
!         $rss->channel($chan, $rc_url);
! 
!         $rss->image(array('title' => 'PhpWiki', // FIXME: this should be a config define
!                           'link' => WikiURL(_("HomePage"), false, 'absurl'),
!                           'url' => DataURL($GLOBALS['logo'])));
          
+         $rss->textinput(array('title' => _("Search"),
+                               'description' => _("Title Search"),
+                               'name' => 's',
+                               'link' => WikiURL(_("TitleSearch"), false, 'absurl')));
+ 
+         $limit = $args['limit'];
+         if (! $limit)
+             $limit = 15;
+ 
+         while ($limit-- > 0 && $rev = $changes->next()) {
+             $page = $rev->getPage();
+ 
+             $urlargs = array();
+             if ($args['show_all']) {
+                 // FIXME: should set previous, too, if showing only minor or major revs.
+                 //  or maybe difftype.
+                 $urlargs['version'] = $rev->getVersion();
+             }
+             
+             $pagename = $page->getName();
+             
+             $item = array('title' => split_pagename($pagename),
+                           'description' => $rev->get('summary'),
+                           'link' => WikiURL($pagename, $urlargs, 'absurl'),
+                           'dc:date' => Iso8601DateTime($rev->get('mtime')),
+                           'dc:contributor' => $rev->get('author'),
+                           'wiki:version' => $rev->getVersion(),
+                           'wiki:importance' => $rev->get('is_minor_edit') ? 'minor' : 'major',
+                           // wiki:status = 'new' | 'updated' | 'deleted'
+                           'wiki:diff' => WikiURL($pagename,
+                                                  array_merge($urlargs,
+                                                              array('action' => 'diff',
+                                                                    'previous' => 'major')),
+                                                  'absurl'),
+                           'wiki:history' => WikiURL($pagename,
+                                                     array('action' => 'info'),
+                                                     'absurl')
+                           );
+ 
+ 
+             $uri = WikiURL($pagename, array('version' => $rev->getVersion()), 'absurl');
+             $rss->addItem($item, $uri);
+         }
+ 
+         return $rss->asXML();
+     }
+ };
+ 
+ 
  // (c-file-style: "gnu")
  // Local Variables:

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.55,1.56

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

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

Modified Files:
	stdlib.php 
Log Message:
TimezoneOffset, Iso8601DateTime, Rfc822DateTime: New functions
to support RSS generation.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** stdlib.php	2001/12/06 19:15:05	1.55
--- stdlib.php	2001/12/07 22:14:32	1.56
***************
*** 525,528 ****
--- 525,579 ----
  
  
+ /**
+  * Get time offset for local time zone.
+  *
+  * @param $time time_t Get offset for this time.  Default: now.
+  * @param $no_colon boolean Don't put colon between hours and minutes.
+  * @return string Offset as a string in the format +HH:MM.
+  */
+ function TimezoneOffset ($time = false, $no_colon = false) {
+     if ($time === false)
+         $time = time();
+     $secs = date('Z', $time);
+     if ($secs < 0) {
+         $sign = '-';
+         $secs = -$secs;
+     }
+     else {
+         $sign = '+';
+     }
+     $colon = $no_colon ? '' : ':';
+     $mins = intval(($secs + 30) / 60);
+     return sprintf("%s%02d%s%02d",
+                    $sign, $mins / 60, $colon, $mins % 60);
+ }
+     
+ /**
+  * Format time in ISO-8601 format.
+  *
+  * @param $time time_t Time.  Default: now.
+  * @return string Date and time in ISO-8601 format.
+  */
+ function Iso8601DateTime ($time = false) {
+     if ($time === false)
+         $time = time();
+     $tzoff = TimezoneOffset($time);
+     $date = date('Y-m-d', $time);
+     $time=date('H:i:s', $time);
+     return $date . 'T' . $time . $tzoff;
+ }
+ 
+ /**
+  * Format time in RFC-2822 format.
+  *
+  * @param $time time_t Time.  Default: now.
+  * @return string Date and time in RFC-2822 format.
+  */
+ function Rfc822DateTime ($time = false) {
+     if ($time === false)
+         $time = time();
+     return date('D, d F H:i:s ', $time) . TimezoneOffset($time, 'no colon');
+ }
+ 
  // (c-file-style: "gnu")
  // Local Variables:

[phpwiki-checkins] CVS: phpwiki/lib main.php,1.18,1.19

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

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

Modified Files:
	main.php 
Log Message:
Ensure the 'action' argument in $request is set.


Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** main.php	2001/11/26 22:43:24	1.18
--- main.php	2001/12/07 22:13:51	1.19
***************
*** 68,74 ****
      
      $action = $request->getArg('action');
!     if (!$action)
          $action = 'browse';
! 
      global $user;               // FIXME: can we make this non-global?
      $user = new WikiUser($request, get_auth_mode($action));
--- 68,76 ----
      
      $action = $request->getArg('action');
!     if (!$action) {
          $action = 'browse';
!         $request->setArg('action', $action);
!     }
!     
      global $user;               // FIXME: can we make this non-global?
      $user = new WikiUser($request, get_auth_mode($action));

[phpwiki-checkins] CVS: phpwiki/lib logger.php,1.3,NONE

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

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

Removed Files:
	logger.php 
Log Message:
Obsolete.  This code is now in lib/Request.php.



--- logger.php DELETED ---

[phpwiki-checkins] CVS: phpwiki/lib diff.php,1.14,1.15

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

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

Modified Files:
	diff.php 
Log Message:
Fix for PHP warning: "lib/diff.php:197: Notice[8]: Undefined index: ..."


Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** diff.php	2001/11/14 21:05:38	1.14
--- diff.php	2001/12/07 17:39:45	1.15
***************
*** 186,191 ****
  	$numer = $xlim - $xoff + $nchunks - 1;
  	$x = $xoff;
! 	for ($chunk = 0; $chunk < $nchunks; $chunk++)
! 	  {
  	    if ($chunk > 0)
  		for ($i = 0; $i <= $this->lcs; $i++)
--- 186,190 ----
  	$numer = $xlim - $xoff + $nchunks - 1;
  	$x = $xoff;
! 	for ($chunk = 0; $chunk < $nchunks; $chunk++) {
  	    if ($chunk > 0)
  		for ($i = 0; $i <= $this->lcs; $i++)
***************
*** 193,202 ****
  
  	    $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
! 	    for ( ; $x < $x1; $x++)
! 	      {
! 		$matches = $ymatches[$flip ? $this->yv[$x] : $this->xv[$x]];
! 		if (!$matches)
  		    continue;
! 		reset($matches);
  		while (list ($junk, $y) = each($matches))
  		    if (empty($this->in_seq[$y]))
--- 192,201 ----
  
  	    $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
! 	    for ( ; $x < $x1; $x++) {
!                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
!                 if (empty($ymatches[$line]))
  		    continue;
! 		$matches = $ymatches[$line];
!                 reset($matches);
  		while (list ($junk, $y) = each($matches))
  		    if (empty($this->in_seq[$y]))
***************
*** 225,230 ****
  		      }
  		  }
! 	      }
! 	  }
  
  	$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
--- 224,229 ----
  		      }
  		  }
!             }
!         }
  
  	$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.6,1.7

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

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

Modified Files:
	phpwiki.css 
Log Message:
Note re: invisible ? in OmniWeb4 (MacOSX)

Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** phpwiki.css	2001/12/06 19:15:05	1.6
--- phpwiki.css	2001/12/07 06:57:08	1.7
***************
*** 24,29 ****
  */
  
! /* NS4 doesn't grok @import.  This allows us to put things which break NS4
!  * in another file.
   */
  @import url(phpwiki-heavy.css);
--- 24,29 ----
  */
  
! /* NS4 & OmniWeb 4 don't grok @import.  This allows us to put things which
!  * break NS4 and OW4 in another file.
   */
  @import url(phpwiki-heavy.css);
***************
*** 144,147 ****
--- 144,148 ----
  .wikiunknown, .named-wikiunknown
  {color: #600; }
+ /* This renders the ? invisible in OW4 */
  .wikiunknown A, .named-wikiunknown
  { color: white; background-color: #600; }

[phpwiki-checkins] CVS: phpwiki index.php,1.37,1.38

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

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

Modified Files:
	index.php 
Log Message:
InterWiki link-icon added.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** index.php	2001/12/07 05:27:03	1.37
--- index.php	2001/12/07 05:37:13	1.38
***************
*** 270,273 ****
--- 270,275 ----
  // but ONLY for the AllowedProtocols specified in in part four!
  // 'interwiki' icon indicates a Wiki listed in lib/interwiki.map
+ // If you want icons just to differentiate between urls and Wikis then
+ // turn on only 'interwiki' and '*', comment out the other four.
  /*
  $URL_LINK_ICONS = array(

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

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

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

Modified Files:
	interwiki.php 
Log Message:
InterWiki link-icon added.

Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** interwiki.php	2001/12/06 18:36:51	1.9
--- interwiki.php	2001/12/07 05:27:20	1.10
***************
*** 48,51 ****
--- 48,62 ----
      }
  
+     $linkproto='interwiki';
+     $ICONS = &$GLOBALS['URL_LINK_ICONS'];
+     
+     $linkimg = isset($ICONS[$linkproto]) ? $ICONS[$linkproto] : $ICONS['*'];
+     if (!empty($linkimg)) {
+         $imgtag = Element('img', array('src' => DataURL($linkimg),
+                                        'alt' => $linkproto,
+                                        'class' => 'linkicon'));
+         $linktext = $imgtag . $linktext;
+     }
+ 
      return Element('a', array('href' => $url,
                                'class' => $class),

[phpwiki-checkins] CVS: phpwiki index.php,1.36,1.37

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

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

Modified Files:
	index.php 
Log Message:
InterWiki link-icon added.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** index.php	2001/12/06 22:11:23	1.36
--- index.php	2001/12/07 05:27:03	1.37
***************
*** 267,271 ****
  
  // this turns on url indicator icons, inserted before embedded links
! // FIXME: need a special icon (question mark?) for unknown protocols.
  /*
  $URL_LINK_ICONS = array(
--- 267,273 ----
  
  // this turns on url indicator icons, inserted before embedded links
! // '*' icon is shown when the link type has no icon listed here,
! // but ONLY for the AllowedProtocols specified in in part four!
! // 'interwiki' icon indicates a Wiki listed in lib/interwiki.map
  /*
  $URL_LINK_ICONS = array(
***************
*** 274,277 ****
--- 276,280 ----
                      'ftp'	=> 'images/ftp.png',
                      'mailto'	=> 'images/mailto.png',
+                     'interwiki' => 'images/interwiki.png',
                      '*'		=> 'images/zapg.png'
                      );

[phpwiki-checkins] CVS: phpwiki/images interwiki.png,NONE,1.1

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

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

Added Files:
	interwiki.png 
Log Message:
InterWiki link-icon added.

--- NEW FILE ---
‰PNG


50”Á@!Æ4ø8ˆ­Äd€¸M]:OÅ0¤€x9ßâ@ˆ¤i1ÿ
P± þc‚яdXšóAbñ@<“¨tDi‚¤

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.5,1.6

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

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

Modified Files:
	interwiki.map 
Log Message:
Category:Category links to the CategoryCategory page, yet this page won't show up in the back-links listing of CategoryCategory.

Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** interwiki.map	2001/12/06 21:53:41	1.5
--- interwiki.map	2001/12/06 22:44:42	1.6
***************
*** 8,11 ****
--- 8,12 ----
  BridgesWiki http://c2.com/w2/bridges/
  C2find http://c2.com/cgi/wiki?FindPage&value=
+ Category Category
  CLiki http://www.telent.net/cliki/
  CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?

[phpwiki-checkins] CVS: phpwiki index.php,1.35,1.36

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

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

Modified Files:
	index.php 
Log Message:
typo URL_LINK_ICONS

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** index.php	2001/12/06 21:13:30	1.35
--- index.php	2001/12/06 22:11:23	1.36
***************
*** 269,273 ****
  // FIXME: need a special icon (question mark?) for unknown protocols.
  /*
! $LINK_ICONS = array(
                      'http'	=> 'images/http.png',
                      'https'	=> 'images/https.png',
--- 269,273 ----
  // FIXME: need a special icon (question mark?) for unknown protocols.
  /*
! $URL_LINK_ICONS = array(
                      'http'	=> 'images/http.png',
                      'https'	=> 'images/https.png',

[phpwiki-checkins] CVS: phpwiki/images https.png,1.2,1.3

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

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

Modified Files:
	https.png 
Log Message:
*** empty log message ***

Index: https.png
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/images/https.png,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Binary files /tmp/cvsq4ScVw and /tmp/cvsAtZWyT differ

[phpwiki-checkins] CVS: phpwiki/lib interwiki.map,1.4,1.5

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

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

Modified Files:
	interwiki.map 
Log Message:
Additions from list at "http://usemod.com/intermap.txt" December 5, 2001.

Index: interwiki.map
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.map,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** interwiki.map	2001/11/14 18:50:54	1.4
--- interwiki.map	2001/12/06 21:53:41	1.5
***************
*** 1,11 ****
  AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
  Advogato http://www.advogato.org/
  AndStuff http://andstuff.org/wiki.php?
  BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
  BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
- BrainBench http://www.brainbench.com/transcript.jsp?pid=
  BridgesWiki http://c2.com/w2/bridges/
  C2find http://c2.com/cgi/wiki?FindPage&value=
- Category Category
  CLiki http://www.telent.net/cliki/
  CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
--- 1,11 ----
+ AbbeNormal http://www.ourpla.net/cgi-bin/pikie.cgi?
  AcadWiki http://xarch.tu-graz.ac.at/autocad/wiki/
+ Acronym http://www.acronymfinder.com/af-query.asp?String=exact&Acronym=
  Advogato http://www.advogato.org/
  AndStuff http://andstuff.org/wiki.php?
  BcWireless http://www.bcwireless.net/wiki-moinmoin/moin.cgi/
  BenefitsWiki http://www.benefitslink.com/cgi-bin/wiki.cgi?
  BridgesWiki http://c2.com/w2/bridges/
  C2find http://c2.com/cgi/wiki?FindPage&value=
  CLiki http://www.telent.net/cliki/
  CmWiki http://www.ourpla.net/cgi-bin/wiki.pl?
***************
*** 19,32 ****
  EfnetXmlWiki http://purl.net/wiki/xml/
  EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
  FoxWiki http://fox.wikis.com/wc.dll?Wiki~
  FreeNetworks http://www.freenetworks.org/index.cgi/
  FreshMeat http://freshmeat.net/
- Google http://www.google.com/search?q=
  GoogleGroups http://groups.google.com/groups?q=
  HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
  IMDB http://us.imdb.com/Title?
  ISBN http://www.amazon.com/exec/obidos/ISBN=
  JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
  JiniWiki http://www.cdegroot.com/cgi-bin/jini?
  LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
  MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
--- 19,35 ----
  EfnetXmlWiki http://purl.net/wiki/xml/
  EmacsWiki http://www.emacswiki.org/cgi-bin/wiki.pl?
+ Foldoc http://www.foldoc.org/foldoc/foldoc.cgi?
  FoxWiki http://fox.wikis.com/wc.dll?Wiki~
  FreeNetworks http://www.freenetworks.org/index.cgi/
  FreshMeat http://freshmeat.net/
  GoogleGroups http://groups.google.com/groups?q=
+ Google http://www.google.com/search?q=
  HammondWiki http://www.dairiki.org/HammondWiki/index.php3?
+ IAwiki http://www.IAwiki.net/
  IMDB http://us.imdb.com/Title?
  ISBN http://www.amazon.com/exec/obidos/ISBN=
  JargonFile http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=
  JiniWiki http://www.cdegroot.com/cgi-bin/jini?
+ KnowHow http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
  LegoWiki http://www.object-arts.com/wiki/html/Lego-Robotics/
  MbTest http://www.usemod.com/cgi-bin/mbtest.pl?
***************
*** 38,41 ****
--- 41,45 ----
  PersonalTelco http://www.personaltelco.net/index.cgi/
  PhpWiki http://phpwiki.sourceforge.net/phpwiki/index.php?
+ Pikie http://pikie.darktech.org/cgi/pikie?
  PolitizenWiki http://www.politizen.com/wiki.asp?
  PPR http://c2.com/cgi/wiki?
***************
*** 48,54 ****
  Squeak http://minnow.cc.gatech.edu/squeak/
  StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
- TWiki http://twiki.sourceforge.net/cgi-bin/view/
  Tavi http://tavi.sourceforge.net/index.php?
  Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
  UseMod http://www.usemod.com/cgi-bin/wiki.pl?
  VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/
--- 52,58 ----
  Squeak http://minnow.cc.gatech.edu/squeak/
  StrikiWiki http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
  Tavi http://tavi.sourceforge.net/index.php?
  Thinki http://www.thinkware.se/cgi-bin/thinki.cgi/
+ TWiki http://twiki.sourceforge.net/cgi-bin/view/
  UseMod http://www.usemod.com/cgi-bin/wiki.pl?
  VisualWorks http://wiki.cs.uiuc.edu/VisualWorks/

[phpwiki-checkins] CVS: phpwiki index.php,1.34,1.35

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

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

Modified Files:
	index.php 
Log Message:
New icon for unknown link protocols, a hollow arrow (a question mark could be confused with unknown-WikiWords).

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** index.php	2001/12/06 19:15:05	1.34
--- index.php	2001/12/06 21:13:30	1.35
***************
*** 274,278 ****
                      'ftp'	=> 'images/ftp.png',
                      'mailto'	=> 'images/mailto.png',
!                     '*'		=> 'images/http.png'
                      );
  */                    
--- 274,278 ----
                      'ftp'	=> 'images/ftp.png',
                      'mailto'	=> 'images/mailto.png',
!                     '*'		=> 'images/zapg.png'
                      );
  */                    

[phpwiki-checkins] CVS: phpwiki/images zapg.png,NONE,1.1

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

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

Added Files:
	zapg.png 
Log Message:
Tweaks to linkicons.

--- NEW FILE ---
‰PNG


Ýz$á(Ëw‹0¶¨ÇYö¢*•
Z­Öµ*
ÈårÄä­-Y™(L(9^Ü6W/šÆðð°K “É •J±“oò(Y‰Ÿ@˜ ¥t|ù­¸J¥ÒuY"‘@,cGÖHX>þÑ|é7áÃt÷ôBÚۇ®n)::%ho!ì°Á£„Á‰Ú—rªßš1

[phpwiki-checkins] CVS: phpwiki/images mailto.png,1.1,1.2

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

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

Modified Files:
	mailto.png 
Log Message:
Tweaks to linkicons.

Index: mailto.png
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/images/mailto.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsoNBIct and /tmp/cvsCwGz7L differ

[phpwiki-checkins] CVS: phpwiki/images http.png,1.1,1.2

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

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

Modified Files:
	http.png 
Log Message:
Tweaks to linkicons.

Index: http.png
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/images/http.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsyVa2FJ and /tmp/cvswDI03i differ

[phpwiki-checkins] CVS: phpwiki/lib WikiUser.php,1.4,1.5

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

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

Modified Files:
	WikiUser.php 
Log Message:
Kludgy patch to close a potential security hole.
(I think a carefully constructed cookie could be used to 
log in (as admin, even) without a password.)

I'll work on a longer term fix...



Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** WikiUser.php	2001/12/02 02:34:48	1.4
--- WikiUser.php	2001/12/06 20:44:13	1.5
***************
*** 23,26 ****
--- 23,37 ----
  
          // don't check for HTTP auth if there's nothing to worry about
+         //
+         // FIXME: the addition of this short-cut introduced a security hole.
+         //        Since $this->_restore can potentially restore $this from a
+         //        user provided cookie, a carefully constructed cookie can
+         //        be used to effectively log in (even as admin) without
+         //        a password.
+         //
+         //        For now, I'm disabling the code which saves/restores $this
+         //        in a cookie.  (Login state is still preserved in session vars.)
+         //        I'll work on a longer term solution.
+         
          if (  $this->state == 'authorized' 
                && $auth_mode != 'LOGIN' 
***************
*** 206,212 ****
          
          if ( $this->_copy($req->getSessionVar('auth_state')) )
-             return;
-         elseif ( $this->_copy($req->getCookieVar('WIKI_AUTH')) )
              return;
          else {
              // Default state.
--- 217,224 ----
          
          if ( $this->_copy($req->getSessionVar('auth_state')) )
              return;
+         // FIXME: Disable restore from cookie (see note in WikiUser().)
+         //elseif ( $this->_copy($req->getCookieVar('WIKI_AUTH')) )
+         //    return;
          else {
              // Default state.
***************
*** 221,225 ****
  
          $req->setSessionVar('auth_state', $this);
!         $req->setCookieVar('WIKI_AUTH', $this);
      }
  }
--- 233,238 ----
  
          $req->setSessionVar('auth_state', $this);
!         // FIXME: Disable restore from cookie (see note in WikiUser().)
!         //$req->setCookieVar('WIKI_AUTH', $this);
      }
  }

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

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

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

Modified Files:
	stdlib.php 
Log Message:
Cleaned up the external URL link icon code a bit.


Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** stdlib.php	2001/12/06 18:29:15	1.54
--- stdlib.php	2001/12/06 19:15:05	1.55
***************
*** 102,153 ****
  }
     
!    function LinkURL($url, $linktext='') {
!       // FIXME: Is this needed (or sufficient?)
!       if(ereg("[<>\"]", $url)) {
!           return Element('strong',
!                          QElement('u', array('class' => 'baduri'),
!                                   'BAD URL -- remove all of <, >, "')); //"
!       }
  
!       if (empty($linktext)) {
!           $linktext = $url;
!           $class = 'rawurl';
!       }
!       else {
!           $class = 'namedurl';
!       }
  
!       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, ":"));
!           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);
!       }
!    }
  
  function LinkWikiWord($wikiword, $linktext='') {
--- 102,137 ----
  }
     
! function LinkURL($url, $linktext = '') {
!     // FIXME: Is this needed (or sufficient?)
!     if(ereg("[<>\"]", $url)) {
!         return Element('strong',
!                        QElement('u', array('class' => 'baduri'),
!                                 _('BAD URL -- remove all of <, >, "'))); //"
!     }
  
!     $attr['href'] = $url;
  
!     if (empty($linktext)) {
!         $linktext = $url;
!         $attr['class'] = 'rawurl';
!     }
!     else {
!         $attr['class'] = 'namedurl';
!     }
!     $linktext = htmlspecialchars($linktext);
!       
!     $linkproto = substr($url, 0, strpos($url, ":"));
!     $ICONS = &$GLOBALS['URL_LINK_ICONS'];
!       
!     $linkimg = isset($ICONS[$linkproto]) ? $ICONS[$linkproto] : $ICONS['*'];
!     if (!empty($linkimg)) {
!         $imgtag = Element('img', array('src' => DataURL($linkimg),
!                                        'alt' => $linkproto,
!                                        'class' => 'linkicon'));
!         $linktext = $imgtag . $linktext;
!     }
! 
!     return Element('a', $attr, $linktext);
! }
  
  function LinkWikiWord($wikiword, $linktext='') {

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.5,1.6 index.php,1.33,1.34

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

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

Modified Files:
	phpwiki.css index.php 
Log Message:
Cleaned up the external URL link icon code a bit.


Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** phpwiki.css	2001/12/06 18:25:41	1.5
--- phpwiki.css	2001/12/06 19:15:05	1.6
***************
*** 169,172 ****
--- 169,182 ----
  
  /*
+  * No border on external link icons.
+  */
+ img.linkicon {
+   border: none;
+   margin-right: 0.5ex;
+   margin-left: 0.25ex;
+   vertical-align: bottom;
+ }
+    
+ /*
   * Put a border around wikiaction forms:
   * This doesn't work for NS4.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** index.php	2001/12/06 08:15:38	1.33
--- index.php	2001/12/06 19:15:05	1.34
***************
*** 267,271 ****
  
  // this turns on url indicator icons, inserted before embedded links
! //define("USE_LINK_ICONS", 1);
  
  // Date & time formats used to display modification times, etc.
--- 267,280 ----
  
  // this turns on url indicator icons, inserted before embedded links
! // FIXME: need a special icon (question mark?) for unknown protocols.
! /*
! $LINK_ICONS = array(
!                     'http'	=> 'images/http.png',
!                     'https'	=> 'images/https.png',
!                     'ftp'	=> 'images/ftp.png',
!                     'mailto'	=> 'images/mailto.png',
!                     '*'		=> 'images/http.png'
!                     );
! */                    
  
  // Date & time formats used to display modification times, etc.

[phpwiki-checkins] CVS: phpwiki/lib transform.php,1.27,1.28

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

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

Modified Files:
	transform.php 
Log Message:
Add parentheses to the list of punctuation not allowed in un-bracketed
InterWiki links.


Index: transform.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/transform.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** transform.php	2001/11/16 22:59:02	1.27
--- transform.php	2001/12/06 18:41:21	1.28
***************
*** 330,334 ****
     $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
  			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:[^\\s.,;?]+");
  }
  $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");
--- 330,334 ----
     $transform->register(WT_TOKENIZER, 'wtt_interwikilinks',
  			pcre_fix_posix_classes("!?(?<![[:alnum:]])") .
! 			"$InterWikiLinkRegexp:[^\\s.,;?()]+");
  }
  $transform->register(WT_TOKENIZER, 'wtt_bumpylinks', "!?$WikiNameRegexp");