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

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.18,1.19

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

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

Modified Files:
	TextFormattingRules 
Log Message:
Titled the Synopsis section so that templates/editpage.html can find it.


Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** TextFormattingRules	2001/12/16 16:52:50	1.18
--- TextFormattingRules	2001/12/17 16:49:48	1.19
***************
*** 9,12 ****
--- 9,14 ----
  Content-Transfer-Encoding: quoted-printable
  
+ ! Synopsis
+ 
  __Emphasis:__ '____' for ''italics'', _''''_ for __bold__, '____'_''''_ =
  for ''__both__''%%%
***************
*** 21,26 ****
  "-''''-''''-''''-" makes a horizontal rule
  
- ''[[__Note:__ the first six lines of this page will appear on the Edit =
- page.]''
  ----
  ! Paragraphs
--- 23,26 ----

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.15,1.16

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

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

Modified Files:
	phpwiki.css 
Log Message:
Style fixes for TextFormattingRules Synopsis on templates/editpage.html.


Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** phpwiki.css	2001/12/15 11:42:39	1.15
--- phpwiki.css	2001/12/17 16:41:54	1.16
***************
*** 222,225 ****
--- 222,237 ----
  }
  
+ /* The transclusion of the TextEditingRules Synopsis on templates/editpage.html */
+ div.wiki-edithelp .transclusion {
+   font-size: smaller;
+   background: inherit;
+   padding: 0.5ex 0.5em;
+   margin: 0.2ex 5%;
+ }
+ div.wiki-edithelp .transclusion p {
+   margin: 0;
+ }
+ 
+   
  /****************************************************************
   **

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.27,1.28

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

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

Modified Files:
	editpage.html 
Log Message:
Include the 'Synopsis' section of TextFormattingRules, rather than just
the first 6 lines.



Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** editpage.html	2001/12/16 16:52:58	1.27
--- editpage.html	2001/12/17 16:41:25	1.28
***************
*** 81,88 ****
  </p>
  <hr noshade="noshade" />
! <small>
! <?php echo LinkExistingWikiWord(_("TextFormattingRules")) ?>
! <?plugin IncludePage page=_("TextFormattingRules") lines=6 quiet=true ?>
! </small>
  
  <input type="hidden" name="action" value="save" />
--- 81,87 ----
  </p>
  <hr noshade="noshade" />
! <div class="wiki-edithelp">
! <?plugin IncludePage page=_("TextFormattingRules") section=_("Synopsis") ?>
! </div>
  
  <input type="hidden" name="action" value="save" />

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

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

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

Modified Files:
	IncludePage.php 
Log Message:
Added plugin argument 'section', which allows one to include a particular
named section of a file.


Index: IncludePage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** IncludePage.php	2001/12/16 18:33:25	1.4
--- IncludePage.php	2001/12/17 16:40:43	1.5
***************
*** 21,25 ****
                        'quiet' => false,    // if set, inclusion appears as normal content
                        'words' => false,    // maximum number of words to include
!                       'lines' => false     // maximum number of lines to include
                                          );
      }
--- 21,26 ----
                        'quiet' => false,    // if set, inclusion appears as normal content
                        'words' => false,    // maximum number of words to include
!                       'lines' => false,    // maximum number of lines to include
!                       'section'=> false    // include a named section
                                          );
      }
***************
*** 42,45 ****
--- 43,63 ----
      }
  
+     function extractSection ($section, $content) {
+         $qsection = preg_replace('/\s+/', '\s+', preg_quote($section, '/'));
+ 
+         if (preg_match("/ ^(!{1,})\\s*$qsection" // section header
+                        . "  \\s*$\\n?"           // possible blank lines
+                        . "  ( (?: ^.*\\n? )*? )" // some lines
+                        . "  (?= ^\\1 | \\Z)/xm", // sec header (same or higher level) (or EOF)
+                        implode("\n", $content),
+                        $match)) {
+             // Strip trailing blanks lines and ---- <hr>s
+             $text = preg_replace("/\\s*^-{4,}\\s*$/m", "", $match[2]);
+             return explode("\n", $text);
+         }
+         return array(sprintf(_("<%s: no such section>"), $section));
+     }
+     
+                 
      function error($msg) {
          // FIXME: better error reporting?
***************
*** 76,80 ****
  
          $c = $r->getContent();
!         
          if ($lines)
              $c = array_slice($c, 0, $lines);
--- 94,100 ----
  
          $c = $r->getContent();
! 
!         if ($section)
!             $c = $this->extractSection($section, $c);
          if ($lines)
              $c = array_slice($c, 0, $lines);

[phpwiki-checkins] CVS: phpwiki/lib/plugin RecentChanges.php,1.12,1.13

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

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

Modified Files:
	RecentChanges.php 
Log Message:
 Colon (':') not allowed is CSS class names.


Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** RecentChanges.php	2001/12/16 19:04:12	1.12
--- RecentChanges.php	2001/12/17 16:13:00	1.13
***************
*** 186,190 ****
      function format_revision ($rev) {
          if ( ($summary = $this->summary($rev)) )
!             $summary = QElement('b', array('class' => 'wiki:summary'), "[$summary]");
          
          $class = 'rc-' . $this->importance($rev);
--- 186,190 ----
      function format_revision ($rev) {
          if ( ($summary = $this->summary($rev)) )
!             $summary = QElement('b', array('class' => 'wiki-summary'), "[$summary]");
          
          $class = 'rc-' . $this->importance($rev);

[phpwiki-checkins] CVS: phpwiki/lib config.php,1.47,1.48

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

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

Modified Files:
	config.php 
Log Message:
(pcre_fix_posix_classes): Fix test for working posix character classes.
Carsten reports that on Mac OS X, character class seem to work with
ASCII chars, but they don't ever work with the international characters.
This fix activates the kluge/workaround in that case.


Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** config.php	2001/12/11 22:41:39	1.47
--- config.php	2001/12/17 02:08:58	1.48
***************
*** 131,135 ****
      // First check to see if our PCRE lib supports POSIX character
      // classes.  If it does, there's nothing to do.
!     if (preg_match('/[[:upper:]]/', 'A'))
          return $regexp;
  
--- 131,135 ----
      // First check to see if our PCRE lib supports POSIX character
      // classes.  If it does, there's nothing to do.
!     if (preg_match('/[[:upper:]]/', 'Ä'))
          return $regexp;
  

[phpwiki-checkins] CVS: phpwiki/lib/plugin LikePages.php,1.3,1.4

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

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

Modified Files:
	LikePages.php 
Log Message:
Fix to split words at certain punctuation, so that e.g. LikePages
for 'Calendar:2001-10-02' finds 'Calendar'.


Index: LikePages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/LikePages.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** LikePages.php	2001/12/16 18:33:25	1.3
--- LikePages.php	2001/12/16 19:35:35	1.4
***************
*** 46,53 ****
          }
          elseif ($page) {
!             $words = explode(" ", split_pagename($page));
!             assert($words);
!             $prefix = $words[0];
!             list($suffix) = array_reverse($words);
              $exclude = $page;
              
--- 46,55 ----
          }
          elseif ($page) {
!             $words = preg_split('/[\s:-;.,]+/',
!                                 split_pagename($page));
!             $words = preg_grep('/\S/', $words);
!             
!             $prefix = reset($words);
!             $suffix = end($words);
              $exclude = $page;
              
***************
*** 59,63 ****
  
          // Search for pages containing either the suffix or the prefix.
!         $search = array();
          if (!empty($prefix)) {
              $search[] = $this->_quote($prefix);
--- 61,65 ----
  
          // Search for pages containing either the suffix or the prefix.
!         $search = $match = array();
          if (!empty($prefix)) {
              $search[] = $this->_quote($prefix);
***************
*** 68,72 ****
              $match[] = preg_quote($suffix, '/') . '$';
          }
!         $query = new TextSearchQuery(join(' OR ', $search));
          $match_re = '/' . join('|', $match) . '/';
  
--- 70,79 ----
              $match[] = preg_quote($suffix, '/') . '$';
          }
! 
!         if ($search)
!             $query = new TextSearchQuery(join(' OR ', $search));
!         else
!             $query = new NullTextSearchQuery; // matches nothing
!         
          $match_re = '/' . join('|', $match) . '/';
  

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

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

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

Modified Files:
	TextSearchQuery.php 
Log Message:
New convenience class NullTextSearchQuery: a TextSearchQuery
which doesn't match anything.


Index: TextSearchQuery.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/TextSearchQuery.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TextSearchQuery.php	2001/11/21 19:48:15	1.2
--- TextSearchQuery.php	2001/12/16 19:35:12	1.3
***************
*** 171,174 ****
--- 171,191 ----
  }
  
+ /**
+  * This is a TextSearchQuery which matches nothing.
+  */
+ class NullTextSearchQuery extends TextSearchQuery {
+     /**
+      * Create a new query.
+      *
+      * @see TextSearchQuery
+      */
+     function NullTextSearchQuery() {}
+     function asRegexp()		{ return '/^(?!a)a/x'; }
+     function match($string)	{ return false; }
+     function getHighlightRegexp() { return ""; }
+     function makeSqlClause($make_sql_clause_cb) { return "(1 = 0)"; }
+     function asString() { return "NullTextSearchQuery"; }
+ };
+ 
  
  ////////////////////////////////////////////////////////////////

[phpwiki-checkins] CVS: phpwiki/lib/plugin RecentChanges.php,1.11,1.12

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

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

Modified Files:
	RecentChanges.php 
Log Message:
Brackets back inside bold (Carsten has recanted his preference for
non-bold brackets :-) ).
Lowercase time (AM -> am).


Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** RecentChanges.php	2001/12/16 18:33:25	1.11
--- RecentChanges.php	2001/12/16 19:04:12	1.12
***************
*** 27,32 ****
  
      function time ($rev) {
!         // FIXME: Make configurable.
!         return strftime("%l:%M %p", $rev->get('mtime'));
      }
  
--- 27,31 ----
  
      function time ($rev) {
!         return strtolower(strftime("%l:%M %p", $rev->get('mtime')));
      }
  
***************
*** 187,192 ****
      function format_revision ($rev) {
          if ( ($summary = $this->summary($rev)) )
!             $summary = "[" . QElement('b', array('class' => 'wiki:summary'), $summary) . "]";
! 
          $class = 'rc-' . $this->importance($rev);
          
--- 186,191 ----
      function format_revision ($rev) {
          if ( ($summary = $this->summary($rev)) )
!             $summary = QElement('b', array('class' => 'wiki:summary'), "[$summary]");
!         
          $class = 'rc-' . $this->importance($rev);
          

[phpwiki-checkins] CVS: phpwiki/lib/plugin BackLinks.php,1.3,1.4 Calendar.php,1.3,1.4 FullTextSearch.php,1.3,1.4 HelloWorld.php,1.3,1.4 IncludePage.php,1.3,1.4 LikePages.php,1.2,1.3 MostPopular.php,1.3,1.4 PageHistory.php,1.3,1.4 RecentChanges.php,1.10,1.11 TitleSearch.php,1.3,1.4 _BackendInfo.php,1.2,1.3 text2png.php,1.4,1.5

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

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

Modified Files:
	BackLinks.php Calendar.php FullTextSearch.php HelloWorld.php 
	IncludePage.php LikePages.php MostPopular.php PageHistory.php 
	RecentChanges.php TitleSearch.php _BackendInfo.php 
	text2png.php 
Log Message:
Refactor $WikiPlugin::name and $WikiPlugin::description stuff.

It is best if all calls to gettext have constant, double-quoted strings
as their arguments.  (Otherwise xgettext won't find the strings
for translation.)

Also, a few other gettext cleanups.



Index: BackLinks.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/BackLinks.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BackLinks.php	2001/12/15 10:54:36	1.3
--- BackLinks.php	2001/12/16 18:33:25	1.4
***************
*** 6,11 ****
  extends WikiPlugin
  {
!     var $name = 'BackLinks';
!     var $description = "Get BackLinks for [pagename]";
    
      function getDefaultArguments() {
--- 6,16 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("BackLinks");
!     }
! 
!     function getDescription () {
!         return _("Get BackLinks for [pagename]");
!     }
    
      function getDefaultArguments() {
***************
*** 37,43 ****
          $html = '';
          if (!$noheader) {
!             $fs = $lines
!                  ? gettext("These pages link to %s:")
!                  : gettext("No pages link to %s.");
              $header = sprintf(htmlspecialchars($fs),
                                LinkExistingWikiWord($page));
--- 42,46 ----
          $html = '';
          if (!$noheader) {
!             $fs = $lines ? _("These pages link to %s:") : _("No pages link to %s.");
              $header = sprintf(htmlspecialchars($fs),
                                LinkExistingWikiWord($page));

Index: Calendar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Calendar.php	2001/12/15 10:54:40	1.3
--- Calendar.php	2001/12/16 18:33:25	1.4
***************
*** 21,27 ****
  extends WikiPlugin
  {
!     var $name = 'Calendar';
!     var $description = 'Calendar';
!   
      function getDefaultArguments() {
          // FIXME: how to exclude multiple pages?
--- 21,32 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("Calendar");
!     }
! 
!     function getDescription () {
!         return _("Calendar");
!     }
!     
      function getDefaultArguments() {
          // FIXME: how to exclude multiple pages?
***************
*** 107,111 ****
                                          'href'  => WikiURL($page_for_date,
                                                             array('action' => 'edit')),
!                                         'title' => "Edit $page_for_date"),
                               $t['tm_mday']);
          }
--- 112,116 ----
                                          'href'  => WikiURL($page_for_date,
                                                             array('action' => 'edit')),
!                                         'title' => sprintf(_("Edit %s"), $page_for_date)),
                               $t['tm_mday']);
          }

Index: FullTextSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/FullTextSearch.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** FullTextSearch.php	2001/12/16 11:52:30	1.3
--- FullTextSearch.php	2001/12/16 18:33:25	1.4
***************
*** 9,14 ****
  extends WikiPlugin
  {
!     var $name = 'FullTextSearch';
!     var $description = 'FullTextSearch';
  
      function getDefaultArguments() {
--- 9,19 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("FullTextSearch");
!     }
! 
!     function getDescription () {
!         return _("Full Text Search");
!     }
  
      function getDefaultArguments() {
***************
*** 18,26 ****
      }
  
-     function getDefaultFormArguments() {
-         $defaults = parent::getDefaultFormArguments();
-         $defaults['description'] = gettext('Full Text Search');
-         return $defaults;
-     }
          
      function run($dbi, $argstr, $request) {
--- 23,26 ----
***************
*** 50,56 ****
          if (!$noheader)
              $html .= QElement('p',
!                               sprintf(gettext("Full text search results for '%s'"), $s));
          if (!$lines)
!             $lines[] = QElement('dd', gettext("<no matches>"));
  
          $html .= Element('dl', join("\n", $lines));
--- 50,56 ----
          if (!$noheader)
              $html .= QElement('p',
!                               sprintf(_("Full text search results for '%s'"), $s));
          if (!$lines)
!             $lines[] = QElement('dd', _("<no matches>"));
  
          $html .= Element('dl', join("\n", $lines));
***************
*** 72,81 ****
          }
          return $html;
-     }
- 
-     function make_form($args) {
-         // FIXME: need more thought about this whole interface.
-         $args['search'] = '()';
-         return MakeWikiForm(_($GLOBALS['pagename']), $args, 'wikiaction','Full Text Search');
      }
  };
--- 72,75 ----

Index: HelloWorld.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/HelloWorld.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** HelloWorld.php	2001/12/15 10:54:49	1.3
--- HelloWorld.php	2001/12/16 18:33:25	1.4
***************
*** 7,20 ****
  extends WikiPlugin
  {
!     var $name = "HelloWorld";
!     var $description = "PhpWiki";
      
      function getDefaultArguments() {
!         return array('salutation'	=> 'Hello,',
!                      'name'			=> 'World');
      }
  
!     function run($argstr) {
!         extract($this->parseArgs($argstr));
          
          return sprintf("<tt>%s %s</tt>", $salutation, $name);
--- 7,25 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("HelloWorld");
!     }
! 
!     function getDescription () {
!         return _("Simple Sample Plugin");
!     }
      
      function getDefaultArguments() {
!         return array('salutation'	=> "Hello,",
!                      'name'		=> "World");
      }
  
!     function run($dbi, $argstr, $request) {
!         extract($this->getArgs($argstr, $request));
          
          return sprintf("<tt>%s %s</tt>", $salutation, $name);

Index: IncludePage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePage.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** IncludePage.php	2001/12/16 16:52:45	1.3
--- IncludePage.php	2001/12/16 18:33:25	1.4
***************
*** 12,18 ****
  extends WikiPlugin
  {
!     var $name='IncludePage';
!     var $description='Embeds text from another page.';
! 
      function getDefaultArguments() {
          return array( 'page'  => false,    // the page to include
--- 12,19 ----
  extends WikiPlugin
  {
!     function getName() {
!         return _("IncludePage");
!     }
!     
      function getDefaultArguments() {
          return array( 'page'  => false,    // the page to include

Index: LikePages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/LikePages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LikePages.php	2001/12/15 10:54:54	1.2
--- LikePages.php	2001/12/16 18:33:25	1.3
***************
*** 9,15 ****
  extends WikiPlugin
  {
!     var $name = 'LikePages';
!     var $description = "List LikePages for [pagename]";
! 
      function getDefaultArguments() {
          // FIXME: how to exclude multiple pages?
--- 9,20 ----
  extends WikiPlugin
  {
!     function getName() {
!         return _("LikePages");
!     }
!     
!     function getDescription() {
!         return _("List LikePages for [pagename]");
!     }
!     
      function getDefaultArguments() {
          // FIXME: how to exclude multiple pages?
***************
*** 32,41 ****
              $suffix = false;
              if (!$noheader)
!                 $html .= QElement('p', sprintf(gettext("Page names with prefix '%s'"),
                                                 $prefix));
          }
          elseif ($suffix) {
              if (!$noheader)
!                 $html .= QElement('p', sprintf(gettext("Page names with suffix '%s'"),
                                                 $suffix));
          }
--- 37,46 ----
              $suffix = false;
              if (!$noheader)
!                 $html .= QElement('p', sprintf(_("Page names with prefix '%s'"),
                                                 $prefix));
          }
          elseif ($suffix) {
              if (!$noheader)
!                 $html .= QElement('p', sprintf(_("Page names with suffix '%s'"),
                                                 $suffix));
          }
***************
*** 46,53 ****
              list($suffix) = array_reverse($words);
              $exclude = $page;
! 
!             $fs = gettext("These pages share an initial or final title word with '%s'");
!             if (!$noheader)
                  $html .= Element('p', sprintf(htmlspecialchars($fs), LinkWikiWord($page)));
          }
  
--- 51,59 ----
              list($suffix) = array_reverse($words);
              $exclude = $page;
!             
!             if (!$noheader) {
!                 $fs = _("These pages share an initial or final title word with '%s'");
                  $html .= Element('p', sprintf(htmlspecialchars($fs), LinkWikiWord($page)));
+             }
          }
  

Index: MostPopular.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/MostPopular.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** MostPopular.php	2001/12/16 07:33:56	1.3
--- MostPopular.php	2001/12/16 18:33:25	1.4
***************
*** 6,11 ****
  extends WikiPlugin
  {
!     var $name = 'MostPopular';
!     var $description = 'MostPopular';
      
      function getDefaultArguments() {
--- 6,16 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("MostPopular");
!     }
! 
!     function getDescription () {    
!         return _("List the most popular pages");
!     }
      
      function getDefaultArguments() {
***************
*** 20,25 ****
          $pages = $dbi->mostPopular($limit);
  
!         $lines[] = $this->_tr(QElement('u', gettext("Hits")),
!                               QElement('u', gettext("Page Name")));
          
          while ($page = $pages->next()) {
--- 25,30 ----
          $pages = $dbi->mostPopular($limit);
  
!         $lines[] = $this->_tr(QElement('u', _("Hits")),
!                               QElement('u', _("Page Name")));
          
          while ($page = $pages->next()) {

Index: PageHistory.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageHistory.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PageHistory.php	2001/12/15 10:55:02	1.3
--- PageHistory.php	2001/12/16 18:33:25	1.4
***************
*** 197,202 ****
  extends WikiPlugin_RecentChanges
  {
!     var $name = 'PageHistory';
!     var $description = "List PageHistory for [pagename]";
      
      function getDefaultArguments() {
--- 197,207 ----
  extends WikiPlugin_RecentChanges
  {
!     function getName () {
!         return _("PageHistory");
!     }
! 
!     function getDescription () {
!         return _("List PageHistory for [pagename]");
!     }
      
      function getDefaultArguments() {

Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** RecentChanges.php	2001/12/15 17:03:45	1.10
--- RecentChanges.php	2001/12/16 18:33:25	1.11
***************
*** 304,310 ****
  extends WikiPlugin
  {
!     var $name = 'RecentChanges';
!     var $description = 'RecentChanges';
!     
      function getDefaultArguments() {
          return array('days'		=> 2,
--- 304,311 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("RecentChanges");
!     }
! 
      function getDefaultArguments() {
          return array('days'		=> 2,

Index: TitleSearch.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/TitleSearch.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** TitleSearch.php	2001/12/15 10:55:16	1.3
--- TitleSearch.php	2001/12/16 18:33:25	1.4
***************
*** 9,14 ****
  extends WikiPlugin
  {
!     var $name = 'TitleSearch';
!     var $description = 'TitleSearch';
      
      function getDefaultArguments() {
--- 9,19 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("TitleSearch");
!     }
! 
!     function getDescription () {
!         return _("Title Search");
!     }
      
      function getDefaultArguments() {
***************
*** 18,27 ****
      }
  
-     function getDefaultFormArguments() {
-         $defaults = parent::getDefaultFormArguments();
-         $defaults['description'] = 'Title Search';
-         return $defaults;
-     }
-     
      function run($dbi, $argstr, $request) {
  
--- 23,26 ----
***************
*** 47,55 ****
          if (!$noheader)
              $html .= QElement('p',
!                               sprintf(gettext("Title search results for '%s'"), $s));
          if ($lines)
              $html .= Element('ul', join("\n", $lines));
          else
!             $html .= Element('dl', QElement('dd', gettext("<no matches>")));
          
          return $html;
--- 46,54 ----
          if (!$noheader)
              $html .= QElement('p',
!                               sprintf(_("Title search results for '%s'"), $s));
          if ($lines)
              $html .= Element('ul', join("\n", $lines));
          else
!             $html .= Element('dl', QElement('dd', _("<no matches>")));
          
          return $html;

Index: _BackendInfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/_BackendInfo.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** _BackendInfo.php	2001/12/15 10:54:31	1.2
--- _BackendInfo.php	2001/12/16 18:33:25	1.3
***************
*** 7,12 ****
  extends WikiPlugin
  {
!     var $name = '_BackendInfo';
!     var $description = "Get debugging information for [pagename].";
      
      function WikiPlugin__BackendInfo() {
--- 7,17 ----
  extends WikiPlugin
  {
!     function getName () {
!         return _("DebugInfo");
!     }
! 
!     function getDescription () {
!         return _("Get debugging information for [pagename].");
!     }
      
      function WikiPlugin__BackendInfo() {
***************
*** 38,42 ****
  
          $html = QElement('h3',
!                          "Querying backend directly for '$page'");
  
          
--- 43,47 ----
  
          $html = QElement('h3',
!                          sprintf(_("Querying backend directly for '%s'"), $page));
  
          
***************
*** 44,48 ****
          $pagedata = $backend->get_pagedata($page);
          if (!$pagedata)
!             $html .= QElement('p', "No pagedata for $page\n");
          else {
              ksort($pagedata);
--- 49,53 ----
          $pagedata = $backend->get_pagedata($page);
          if (!$pagedata)
!             $html .= QElement('p', sprintf(_("No pagedata for %s\n"), $page));
          else {
              ksort($pagedata);

Index: text2png.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/text2png.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** text2png.php	2001/12/15 10:55:12	1.4
--- text2png.php	2001/12/16 18:33:25	1.5
***************
*** 7,17 ****
  extends WikiPlugin
  {
! 	var $name = 'text2png';
! 	var $description = 'text2png';
  	
  	function getDefaultArguments() {
!     global $LANG;
! 	return array('text'	=> "Hello WikiWorld!",
! 	             'l'    => $LANG );
  	}
  
--- 7,18 ----
  extends WikiPlugin
  {
!     function getName () {
!         return "text2png";
!     }
  	
  	function getDefaultArguments() {
!         global $LANG;
!         return array('text'	=> "Hello WikiWorld!",
!                      'l'    => $LANG );
  	}
  

[phpwiki-checkins] CVS: phpwiki/lib WikiPlugin.php,1.5,1.6 diff.php,1.20,1.21 loadsave.php,1.15,1.16 main.php,1.20,1.21 stdlib.php,1.59,1.60

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

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

Modified Files:
	WikiPlugin.php diff.php loadsave.php main.php stdlib.php 
Log Message:
Refactor $WikiPlugin::name and $WikiPlugin::description stuff.

It is best if all calls to gettext have constant, double-quoted strings
as their arguments.  (Otherwise xgettext won't find the strings
for translation.)

Also, a few other gettext cleanups.



Index: WikiPlugin.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiPlugin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** WikiPlugin.php	2001/12/16 11:52:35	1.5
--- WikiPlugin.php	2001/12/16 18:33:25	1.6
***************
*** 15,24 ****
      }
  
      function getName() {
!         return gettext($this->name);
      }
  
      function getDescription() {
!         return gettext($this->description);
      }
  
--- 15,39 ----
      }
  
+     /**
+      * Get name of plugin.
+      *
+      * This is used (by default) by getDefaultLinkArguments and
+      * getDefaultFormArguments to compute the default link/form
+      * targets.
+      *
+      * If you want to gettextify the name (probably a good idea),
+      * override this method in your plugin class, like:
+      * <pre>
+      *   function getName() { return _("MyPlugin"); }
+      * </pre>
+      *
+      * @return string plugin name/target.
+      */
      function getName() {
!         return preg_replace('/^.*_/', '',  get_class($this));
      }
  
      function getDescription() {
!         return $this->getName();
      }
  

Index: diff.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/diff.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** diff.php	2001/12/15 02:40:42	1.20
--- diff.php	2001/12/16 18:33:25	1.21
***************
*** 170,183 ****
         $linked_version = QElement('a', array('href' => $url), $rev->getVersion());
         $cols .= Element('td',
!                         gettext("version") . " " . $linked_version);
  
         $cols .= QElement('td',
!                          sprintf(gettext ("last modified on %s"),
                                   strftime($datetimeformat, $rev->get('mtime'))));
         $cols .= QElement('td',
!                          sprintf(gettext ("by %s"), $rev->get('author')));
     } else {
!        $cols .= QElement('td', array('colspan' => '3'),
!                          gettext ("None"));
     }
     return Element('tr', $cols);
--- 170,182 ----
         $linked_version = QElement('a', array('href' => $url), $rev->getVersion());
         $cols .= Element('td',
!                         _("version") . " " . $linked_version);
  
         $cols .= QElement('td',
!                          sprintf(_("last modified on %s"),
                                   strftime($datetimeformat, $rev->get('mtime'))));
         $cols .= QElement('td',
!                          sprintf(_("by %s"), $rev->get('author')));
     } else {
!        $cols .= QElement('td', array('colspan' => '3'), _("None"));
     }
     return Element('tr', $cols);
***************
*** 200,208 ****
          if (!($new = $page->getRevision($version)))
              NoSuchRevision($page, $version);
!         $new_version = sprintf(gettext("version %d"), $version);
      }
      else {
          $new = $page->getCurrentRevision();
!         $new_version = gettext('current version');
      }
  
--- 199,207 ----
          if (!($new = $page->getRevision($version)))
              NoSuchRevision($page, $version);
!         $new_version = sprintf(_("version %d"), $version);
      }
      else {
          $new = $page->getCurrentRevision();
!         $new_version = _("current version");
      }
  
***************
*** 210,214 ****
          if ( !($old = $page->getRevision($previous)) )
              NoSuchRevision($page, $previous);
!         $old_version = sprintf(gettext("version %d"), $previous);
          $others = array('major', 'minor', 'author');
      }
--- 209,213 ----
          if ( !($old = $page->getRevision($previous)) )
              NoSuchRevision($page, $previous);
!         $old_version = sprintf(_("version %d"), $previous);
          $others = array('major', 'minor', 'author');
      }
***************
*** 221,225 ****
                      break;
              }
!             $old_version = gettext("previous major revision");
              $others = array('minor', 'author');
              break;
--- 220,224 ----
                      break;
              }
!             $old_version = _("previous major revision");
              $others = array('minor', 'author');
              break;
***************
*** 230,234 ****
                      break;
              }
!             $old_version = gettext("revision by previous author");
              $others = array('major', 'minor');
              break;
--- 229,233 ----
                      break;
              }
!             $old_version = _("revision by previous author");
              $others = array('major', 'minor');
              break;
***************
*** 237,241 ****
              $previous='minor';
              $old = $page->getRevisionBefore($new);
!             $old_version = gettext("previous revision");
              $others = array('major', 'author');
              break;
--- 236,240 ----
              $previous='minor';
              $old = $page->getRevisionBefore($new);
!             $old_version = _("previous revision");
              $others = array('major', 'author');
              break;
***************
*** 250,260 ****
      
      $html = Element('p',
!                     sprintf(htmlspecialchars(gettext("Differences between %s and %s of %s.")),
                              $new_link, $old_link, $page_link));
  
      $otherdiffs='';
!     $label = array('major' => gettext("Previous Major Revision"),
!                    'minor' => gettext("Previous Revision"),
!                    'author'=> gettext("Previous Author"));
      foreach ($others as $other) {
          $args = array('action' => 'diff', 'previous' => $other);
--- 249,259 ----
      
      $html = Element('p',
!                     sprintf(htmlspecialchars(_("Differences between %s and %s of %s.")),
                              $new_link, $old_link, $page_link));
  
      $otherdiffs='';
!     $label = array('major' => _("Previous Major Revision"),
!                    'minor' => _("Previous Revision"),
!                    'author'=> _("Previous Author"));
      foreach ($others as $other) {
          $args = array('action' => 'diff', 'previous' => $other);
***************
*** 266,270 ****
      }
      $html .= Element('p',
!                      htmlspecialchars(gettext("Other diffs:"))
                       . $otherdiffs);
              
--- 265,269 ----
      }
      $html .= Element('p',
!                      htmlspecialchars(_("Other diffs:"))
                       . $otherdiffs);
              
***************
*** 274,279 ****
      
      $html .= Element('table',
!                     PageInfoRow($pagename, gettext ("Newer page:"), $new)
!                     . PageInfoRow($pagename, gettext ("Older page:"), $old));
  
  
--- 273,278 ----
      
      $html .= Element('table',
!                     PageInfoRow($pagename, _("Newer page:"), $new)
!                     . PageInfoRow($pagename, _("Older page:"), $old));
  
  
***************
*** 283,287 ****
          if ($diff->isEmpty()) {
              $html .= Element('hr');
!             $html .= QElement('p', '[' . gettext ("Versions are identical") . ']');
          }
          else {
--- 282,286 ----
          if ($diff->isEmpty()) {
              $html .= Element('hr');
!             $html .= QElement('p', '[' . _("Versions are identical") . ']');
          }
          else {
***************
*** 297,301 ****
      include_once('lib/Template.php');
      echo GeneratePage('MESSAGE', $html,
!                       sprintf(gettext ("Diff: %s"), $pagename));
  }
    
--- 296,300 ----
      include_once('lib/Template.php');
      echo GeneratePage('MESSAGE', $html,
!                       sprintf(_("Diff: %s"), $pagename));
  }
    

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** loadsave.php	2001/12/14 22:17:24	1.15
--- loadsave.php	2001/12/16 18:33:25	1.16
***************
*** 414,418 ****
     StartLoadDump("Loading '$source'");
     echo "<dl>\n";
!    LoadAny($dbi, $source/*, false, array(gettext('RecentChanges'))*/);
     echo "</dl>\n";
     EndLoadDump();
--- 414,418 ----
     StartLoadDump("Loading '$source'");
     echo "<dl>\n";
!    LoadAny($dbi, $source/*, false, array(gettext("RecentChanges"))*/);
     echo "</dl>\n";
     EndLoadDump();
***************
*** 450,454 ****
      $fd = $upload->open();
      if (IsZipFile($fd))
!         LoadZip($dbi, $fd, false, array(gettext('RecentChanges')));
      else
          Loadfile($dbi, $upload->getName(), $upload->getContents());
--- 450,454 ----
      $fd = $upload->open();
      if (IsZipFile($fd))
!         LoadZip($dbi, $fd, false, array(_("RecentChanges")));
      else
          Loadfile($dbi, $upload->getName(), $upload->getContents());

Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** main.php	2001/12/14 20:28:02	1.20
--- main.php	2001/12/16 18:33:25	1.21
***************
*** 118,125 ****
          // FIXME: this whole section should probably be deleted.
          if ($request->getArg('searchtype') == 'full') {
!             $search_page = gettext('FullTextSearch');
          }
          else {
!             $search_page = gettext('TitleSearch');
          }
          $request->redirect(WikiURL($search_page,
--- 118,125 ----
          // FIXME: this whole section should probably be deleted.
          if ($request->getArg('searchtype') == 'full') {
!             $search_page = _("FullTextSearch");
          }
          else {
!             $search_page = _("TitleSearch");
          }
          $request->redirect(WikiURL($search_page,

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** stdlib.php	2001/12/12 23:51:25	1.59
--- stdlib.php	2001/12/16 18:33:25	1.60
***************
*** 128,132 ****
          return Element('strong',
                         QElement('u', array('class' => 'baduri'),
!                                 _('BAD URL -- remove all of <, >, "'))); //"
      }
  
--- 128,132 ----
          return Element('strong',
                         QElement('u', array('class' => 'baduri'),
!                                 _("BAD URL -- remove all of <, >, \""))); //"
      }
  
***************
*** 334,338 ****
  		if (!$page->get('locked'))
  			return QElement('u', array('class' => 'wikiunsafe'),
! 							gettext('Lock page to enable link'));
  
  		$class = 'wikiadmin';
--- 334,338 ----
  		if (!$page->get('locked'))
  			return QElement('u', array('class' => 'wikiunsafe'),
!                                         _("Lock page to enable link"));
  
  		$class = 'wikiadmin';

[phpwiki-checkins] CVS: phpwiki/doc README.coding,1.1,1.2

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

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

Modified Files:
	README.coding 
Log Message:
Refactor $WikiPlugin::name and $WikiPlugin::description stuff.

It is best if all calls to gettext have constant, double-quoted strings
as their arguments.  (Otherwise xgettext won't find the strings
for translation.)

Also, a few other gettext cleanups.



Index: README.coding
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/doc/README.coding,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** README.coding	2001/12/01 22:01:48	1.1
--- README.coding	2001/12/16 18:33:25	1.2
***************
*** 1,27 ****
  Here are the coding guidelines for PhpWiki.
  
! ! Follow the style of the PEAR Coding Standards: 
! * http://www.php.net/manual/en/pear.standards.php
! There's code snippets for configuring Emacs and Vim as well as several
! other text editors.
  
! ! I18N: Using gettext()
  
! String literals which end up making it into the HTML output should be wrapped
! with a call to ''gettext()''.  This allows translations to be substituted when 
! PhpWiki is run in non-english environments.
  
! It is important that the argument of ''gettext()'' be a constant string
! literal, in double quotes (").
  
!  OKAY:  gettext("This is a message.");
!  OKAY:  gettext ("Fazool."); 
!  OKAY:  sprintf(gettext("Hello %s"), $name);
  
-  BAD:   gettext('This will be ignored by xgettext.');
-  BAD:   gettext("Howdy" . ", wazoo");
-  BAD:   gettext("Hello $name");
-  BAD:   define("MES", "howdy");  gettext(MES);
- 
  For editing files in Emacs, set indent-tabs-mode to nil. Some people
  argue that it's better to use tabs and let people set their tab width,
--- 1,17 ----
+ $Id$
+ 
  Here are the coding guidelines for PhpWiki.
  
! !!! Code Indentation Style
  
! We follow, for the most part, the PEAR coding standards:
  
! * http://www.php.net/manual/en/pear.standards.php
  
! There's code snippets for configuring Emacs and Vim as well as several
! other text editors at the above URL.
  
! !! Emacs Users
  
  For editing files in Emacs, set indent-tabs-mode to nil. Some people
  argue that it's better to use tabs and let people set their tab width,
***************
*** 29,49 ****
  comments in the right region will not align correctly. For a detailed
  argument see http://www.jwz.org/doc/tabs-vs-spaces.html.
  
  Use php-mode as well. This is freely available on the net
! (http://www.ontosys.com/src/php-mode.el). Put something like this
  in your .emacs file:
  
!  (load "your-path-to-lisp-files/php-mode")
!  (setq auto-mode-alist
!        (append '(
!                  ("\\.php\\d?\\'" . php-mode)) auto-mode-alist))
  
! so when you open .php files in Emacs it will start PHP mode
! automatically.
  
! There is another php-mode.el I have not tried:
! http://sourceforge.net/projects/php-mode/
  
! I'm sure Vim has a similar mode, if someone would let us know I'll add
! it to this README.
  
--- 19,68 ----
  comments in the right region will not align correctly. For a detailed
  argument see http://www.jwz.org/doc/tabs-vs-spaces.html.
+ Also use a tab-width of eight, so that just in case tabs do creep
+ into the source code, they have a standard width.
  
  Use php-mode as well. This is freely available on the net
! (http://sourceforge.net/projects/php-mode/). Put something like this
  in your .emacs file:
+ 
+  (autoload 'php-mode "php-mode" "PHP editing mode" t)
+  (add-to-list 'auto-mode-alist '("\\.php\\d?$" . php-mode))
+  (add-hook 'php-mode-hook
+ 	   (lambda ()
+ 	     (c-set-style "gnu")
+ 	     ;; This syntax table mod makes the second line in:
+ 	     ;; 
+ 	     ;;   function( $arg1,
+ 	     ;;             $arg2 );
+ 	     ;;
+ 	     ;; Line up correctly.
+ 	     ;;
+ 	     (modify-syntax-entry ?$ "'" php-mode-syntax-table)
+ 	     (set (make-local-variable 'tab-width) 8)
+ 	     (set (make-local-variable 'c-basic-offset) 4)
+ 	     (set (make-local-variable 'c-hanging-comment-ender-p) 'nil)
+ 	     (set (make-local-variable 'indent-tabs-mode) 'nil)))
+ 
  
! !!! I18N: Using gettext()
! 
! String literals which end up making it into the HTML output should be wrapped
! with a call to ''gettext()''.  This allows translations to be substituted when 
! PhpWiki is run in non-english environments.
  
! Since xgettext (part of the "GNU gettext utilities") is used to find strings
! for translation, It is important that the argument of ''gettext()'' be a constant
! string literal, in double quotes (").
  
! (You can now use _("foo") as an alias for gettext("foo").)
  
!  OKAY:  gettext("This is a message.");
!  OKAY:  _("Fazool."); 
!  OKAY:  sprintf(gettext("Hello %s"), $name);
!  OKAY:  sprintf(_("Hello %s"), $name);
  
+  BAD:   gettext('This will be ignored by xgettext.');
+  BAD:   _("Howdy" . ", wazoo");
+  BAD:   gettext("Hello $name");
+  BAD:   define("MES", "howdy");  gettext(MES);
+  BAD:   gettext($string);

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc TextFormatierungsRegeln,1.4,1.5

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

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

Modified Files:
	TextFormatierungsRegeln 
Log Message:
Die erste 6 Zeile von dieser Seite wird aufgezeigt beim TextEditeren. (Moved TextFormattingRules from Edit page template to TFR page).

Index: TextFormatierungsRegeln
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/TextFormatierungsRegeln,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** TextFormatierungsRegeln	2001/12/16 07:44:01	1.4
--- TextFormatierungsRegeln	2001/12/16 18:06:04	1.5
***************
*** 1,6 ****
! From [no address given]  Sun Dec 16 02:19:07 2001
  Subject: TextFormatierungsRegeln
  From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 01:18:40 -0500
  Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
--- 1,6 ----
! From [no address given]  Sun Dec 16 13:01:04 2001
  Subject: TextFormatierungsRegeln
  From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 12:57:30 -0500
  Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
***************
*** 9,14 ****
  Content-Transfer-Encoding: quoted-printable
  
! ! Tip
  
  Schau dir am besten auch den =ABQuelltext=BB dieser Seite an, indem du =
  unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele =
--- 9,30 ----
  Content-Transfer-Encoding: quoted-printable
  
! __Hervorhebung:__ '____' f=FCr ''kursiv'', _''''_ f=FCr __starke =
! Betonung__, '____'_''''_ f=FCr ''__fett u. kursiv__''%%%
! __Listen:__* f=FCr Ebenen, # f=FCr numerierte Listen, =AB; Das Wort : Die =
! Wortbestimmung=BB f=FCr glossar=E4hnliche Listen%%%
! __Querverweise:__ in Gro=DFbuchstabenZusammensto=DFen oder in =
! einschlie=DFende Klammern [[ein Link] oder URL [[!http://cool.wiki.int/].%%%
! __Fu=DFnoten:__ Benutze [[1],[[2],[[3],...%%%
! __Das Erstellen eines Links verhindern:__ das Wort mit ein =AB!=BB =
! beginnen: !!NichtLinken, Links so angeben: [[Text | URL] (zweimal =
! =AB[=BB)%%%
! __Verschiedenes:__ =AB!=BB, =AB!!=BB, =AB!!!=BB f=FCr =FCberschriften, =
! =AB%%''''%=BB f=FCr Zeilenvorschubzeichen, u. =AB---''''-=BB zeichnet eine =
! Linie.
  
+ ''[[__Anmerkung:__ die erste 6 Zeile von dieser Seite wird aufgezeigt beim =
+ !TextEditeren.]''
+ ----
+ ! Tip
  Schau dir am besten auch den =ABQuelltext=BB dieser Seite an, indem du =
  unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele =

[phpwiki-checkins] CVS: phpwiki/locale/de/LC_MESSAGES phpwiki.php,1.13,1.14

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

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

Modified Files:
	phpwiki.php 
Log Message:
Die erste 6 Zeile von dieser Seite wird aufgezeigt beim TextEditeren. (Moved TextFormattingRules from Edit page template to TFR page).

Index: phpwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/LC_MESSAGES/phpwiki.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** phpwiki.php	2001/12/16 11:49:36	1.13
--- phpwiki.php	2001/12/16 18:05:59	1.14
***************
*** 30,33 ****
--- 30,35 ----
  $locale["tips for editing."] =
     "tips fürs Editieren.";
+ $locale["TextFormattingRules"] =
+    "TextFormatierungsRegeln";
  
  $locale["Thank you for editing %s."] =

[phpwiki-checkins] CVS: phpwiki/templates message.html,1.15,1.16

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

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

Modified Files:
	message.html 
Log Message:
gettext _ typo

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** message.html	2001/12/16 11:54:35	1.15
--- message.html	2001/12/16 16:56:18	1.16
***************
*** 16,20 ****
  <body>
  <div><a class="wikilink" 
!        href="${BROWSE}$("HomePage")"
         ><img src="${LOGO}" align="right"
               border="0" alt="[phpwiki]"
--- 16,20 ----
  <body>
  <div><a class="wikilink" 
!        href="${BROWSE}$_("HomePage")"
         ><img src="${LOGO}" align="right"
               border="0" alt="[phpwiki]"

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.26,1.27

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

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

Modified Files:
	editpage.html 
Log Message:
Moved the TextFormattingRules from the editpage template to the actual TFR page. The IncludePage plugin is now used to insert the first 6 lines of the TFR page for reference. This eliminates any requirement to modify the templates when localizing for another language, and allows for easy online customization (the TFR page is still locked by default).

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** editpage.html	2001/12/16 11:54:31	1.26
--- editpage.html	2001/12/16 16:52:58	1.27
***************
*** 82,105 ****
  <hr noshade="noshade" />
  <small>
! <?php echo LinkExistingWikiWord(_("TextFormattingRules")) ?><br>
! <b>$_("Emphasis:")</b>
!   '' $_("for italics"),
!   __ $_("for bold"),
!   ''__ $_("for both")
! <br /><b>$_("Lists:")</b>
!   * $_("for bullet lists"), #
!               $_("for numbered lists"),
!   ''; $_("term") : $_("definition")'' $_("for definition lists")
! <br /><b>$_("References:")</b>
!   $_("JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/].")
! <br /><b>$_("Footnotes:")</b>
!    $_("Use [1],[2],[3],...")
! <br /><b>$_("Preventing linking:")</b>
!    $_("Prefix with '!': !DoNotHyperlink,")
!    $_("name links like [[text | URL] (double up on the '[')")
! <br /><b>$_("Misc:")</b>
!    "!", "!!", "!!!" $_("make headings"),
!    "%%%" $_("makes a linebreak"),
!    "- - - -" $_("makes a horizontal rule")
  </small>
  
--- 82,87 ----
  <hr noshade="noshade" />
  <small>
! <?php echo LinkExistingWikiWord(_("TextFormattingRules")) ?>
! <?plugin IncludePage page=_("TextFormattingRules") lines=6 quiet=true ?>
  </small>
  

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.17,1.18

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

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

Modified Files:
	TextFormattingRules 
Log Message:
Moved the TextFormattingRules from the editpage template to the actual TFR page. The IncludePage plugin is now used to insert the first 6 lines of the TFR page for reference. This eliminates any requirement to modify the templates when localizing for another language, and allows for easy online customization (the TFR page is still locked by default).

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** TextFormattingRules	2001/12/16 15:49:26	1.17
--- TextFormattingRules	2001/12/16 16:52:50	1.18
***************
*** 1,7 ****
! From [no address given]  Sun Dec 16 07:34:01 2001
  Subject: TextFormattingRules
  From: [no address given] (PhpWiki)
! Date: Wed, 12 Dec 2001 07:56:52 -0800
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2pre)
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
--- 1,7 ----
! From [no address given]  Sun Dec 16 11:36:09 2001
  Subject: TextFormattingRules
  From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 11:34:12 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
***************
*** 9,12 ****
--- 9,27 ----
  Content-Transfer-Encoding: quoted-printable
  
+ __Emphasis:__ '____' for ''italics'', _''''_ for __bold__, '____'_''''_ =
+ for ''__both__''%%%
+ __Lists:__ * for bullet lists, # for numbered lists, "; term : definition" =
+ for definition lists%%%
+ __References:__ !JoinCapitalizedWords or use square brackets for a [[page =
+ link] or URL [[!http://cool.wiki.int/].%%%
+ __Footnotes:__ Use [[1],[[2],[[3],...%%%
+ __Preventing linking__ Prefix with "!": !!DoNotHyperlink, name links like =
+ [[text | URL] (double up on the "[")%%%
+ __Misc__ "!", "!!", "!!!" make headings, "%%''''%" makes a linebreak, =
+ "-''''-''''-''''-" makes a horizontal rule
+ 
+ ''[[__Note:__ the first six lines of this page will appear on the Edit =
+ page.]''
+ ----
  ! Paragraphs
  

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

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

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

Modified Files:
	IncludePage.php 
Log Message:
Moved the TextFormattingRules from the editpage template to the actual TFR page. The IncludePage plugin is now used to insert the first 6 lines of the TFR page for reference. This eliminates any requirement to modify the templates when localizing for another language, and allows for easy online customization (the TFR page is still locked by default).

Index: IncludePage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/IncludePage.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IncludePage.php	2001/12/06 18:26:50	1.2
--- IncludePage.php	2001/12/16 16:52:45	1.3
***************
*** 12,15 ****
--- 12,18 ----
  extends WikiPlugin
  {
+     var $name='IncludePage';
+     var $description='Embeds text from another page.';
+ 
      function getDefaultArguments() {
          return array( 'page'  => false,    // the page to include

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc GaesteBuch,1.3,NONE

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

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

Removed Files:
	GaesteBuch 
Log Message:
Deleted, per Carsten's request.


--- GaesteBuch DELETED ---

[phpwiki-checkins] CVS: phpwiki/lib diff3.php,NONE,1.1 difflib.php,1.3,1.4

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

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

Modified Files:
	difflib.php 
Added Files:
	diff3.php 
Log Message:
Added three-way diff engine.  (Beginning of support for
MergeConflictingEdits.)


***** Error reading new file: [Errno 2] No such file or directory: 'diff3.php'
Index: difflib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/difflib.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** difflib.php	2001/12/15 02:39:43	1.3
--- difflib.php	2001/12/16 16:47:17	1.4
***************
*** 22,25 ****
--- 22,33 ----
          trigger_error("pure virtual", E_USER_ERROR);
      }
+ 
+     function norig() {
+         return $this->orig ? sizeof($this->orig) : 0;
+     }
+ 
+     function nfinal() {
+         return $this->final ? sizeof($this->final) : 0;
+     }
  }
  
***************
*** 101,111 ****
  class _DiffEngine
  {
-     var $xv = array(), $yv = array();
- 
      function diff ($from_lines, $to_lines) {
          $n_from = sizeof($from_lines);
          $n_to = sizeof($to_lines);
- 
  
          // Skip leading common lines.
          for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
--- 109,123 ----
  class _DiffEngine
  {
      function diff ($from_lines, $to_lines) {
          $n_from = sizeof($from_lines);
          $n_to = sizeof($to_lines);
  
+         $this->xchanged = $this->ychanged = array();
+         $this->xv = $this->yv = array();
+         $this->xind = $this->yind = array();
+         unset($this->seq);
+         unset($this->in_seq);
+         unset($this->lcs);
+          
          // Skip leading common lines.
          for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
***************
*** 580,584 ****
          return $lines;
      }
!         
      /**
       * Check a Diff for validity. 
--- 592,596 ----
          return $lines;
      }
! 
      /**
       * Check a Diff for validity. 
***************
*** 610,623 ****
      }
  }
- 
  
! if (!function_exists('array_map')) {
!     function array_map($map_func, $array) {
!         $result = array();
!         foreach ($array as $x)
!             $result[] = call_user_func($map_func, $x);
!         return $result;
!     }
! }
  
              
--- 622,627 ----
      }
  }
  
!             
  
              

[phpwiki-checkins] CVS: phpwiki/pgsrc TextFormattingRules,1.16,1.17

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

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

Modified Files:
	TextFormattingRules 
Log Message:
Restored previous revision with correct line-endings (and resaved in new mime format).

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** TextFormattingRules	2001/12/01 14:53:41	1.16
--- TextFormattingRules	2001/12/16 15:49:26	1.17
***************
*** 1,182 ****
! ! Paragraphs
! 
  
  
  * Don't indent paragraphs
- 
  * Words wrap and fill as needed
- 
  * Use blank lines as separators
- 
  * Four or more minus signs make a horizontal rule
- 
  * %%''''% makes a linebreak (in headings and lists too)
  
  
- 
- 
- 
  ! Lists
  
- 
- 
  * asterisk for first level
- 
  ** asterisk-asterisk for second level, etc.
- 
  * Use * for bullet lists, # for numbered lists (mix at will)
- 
  * semicolon-term-colon-definition for definition lists:
- 
  ;term here:definition here, as in the <DL><DT><DD> list
- 
  * One line for each item
- 
  * Other leading whitespace signals preformatted text, changes font.
  
- 
- 
  ! Headings
  
- 
- 
  * '!' at the start of a line makes a small heading
! 
! * '!!' at the start of a line makes a medium heading 
! 
  * '!!!' at the start of a line makes a large heading
  
- 
- 
  ! Fonts
  
- 
- 
  * Indent with one or more spaces to use a monospace font:
  
- 
- 
   This is in monospace
- 
  This is not
  
- 
- 
  !Indented Paragraphs
  
- 
- 
  * semicolon-colon -- works like <BLOCKQUOTE>
  
- 
- 
  ;: this is an indented block of text
  
- 
- 
  ! Emphasis
  
- 
- 
  * Use doubled single-quotes ('____') for emphasis (usually ''italics'')
- 
  * Use doubled underscores (_''''_) for strong emphasis (usually __bold__)
- 
  * Mix them at will: __''bold italics''__
! 
! * ''Emphasis'' can be used ''multiple'' times within a line, but ''cannot'' cross line boundaries:
! 
! 
  
  ''this
- 
  will not work''
  
- 
- 
  ! References
! 
! * Hyperlinks to other pages within the Wiki are made by placing the page name in square brackets: [this is a page link] or UsingWikiWords (preferred)
! 
  * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
  
- * You can name the links by providing a name, a bar (|) and then the hyperlink or pagename: [PhpWiki home page | http://phpwiki.sourceforge.net/]  - [the front page | HomePage]
- 
- * You can suppress linking to old-style references and URIs by preceding the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
- 
- * You can create footnotes by using [[1], [[2], [[3], ... like this here [1]. See footnote for counterpart.  (If the [[ is in the first column, it is a footnote ''definition'' rather than a footnote ''reference'' [1].)
- 
- * Also, the old way of linking URL's is still supported: precede URLs with "http:", "ftp:" or "mailto:" to create links automatically as in: http://c2.com/
- 
- * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, by themselves: [http://phpwiki.sourceforge.net/phpwiki/images/png.png]
- * Provide alternate text for inlined images using a bar(|) [Burn all GIFs!|http://phpwiki.sourceforge.net/phpwiki/images/png.png]
- 
- 
- 
- 
  ! Tables
- 
- 
  
! * Simple tables are available.  A table row is introduced by a __|__ in the first column.  It is best described by example:
! 
!       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v _''''_Notes_''''_
! 
        | _''''_First_''''_   | _''''_Last_''''_
- 
        |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
- 
        |> Marco      |< Polo      | Cheaper     |< Not available
- 
  ;: will generate
- 
  ||  __Name__               |v __Cost__   |v __Notes__
- 
  | __First__   | __Last__
- 
  |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
- 
  |> Marco      |< Polo      | Cheaper     |< Not available
- 
- 
- 
- ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be used to span rows.  A __>__ generates a right justified column, __<__ a left justified column and __^__ a centered column (which is the default.)
- 
- 
  
  
  
  ! HTML Mark-Up Language
  
- 
- 
  * Don't bother
- 
  * < and > are themselves
- 
  * The & characters will not work
  
- * If you really must use HTML, your system administrator can enable this feature. Start each line with a bar (|). Note that this feature is disabled by default.
- 
- 
- 
  ! More detail than you want to know
  
- 
- 
  See [MagicPhpWikiURLs] for gory details on how to write
- 
  various kind of wiki maintainance links.
  
- 
- 
  -----
  
- 
- 
  Footnotes:
- 
- 
- 
- [1] By using [[1] a second time (in the first column) the footnote itself is ''defined''.  You may refer to a footnote as many times as you want, but you may only define it once on the page.  Note the the [[1] in the footnote links back to the first reference, if there are multiple references there will be +'s after the [[1] which will link to the other references.  (References which come ''after'' the footnote ''definition'' will not be linked to.)
  
--- 1,123 ----
! From [no address given]  Sun Dec 16 07:34:01 2001
! Subject: TextFormattingRules
! From: [no address given] (PhpWiki)
! Date: Wed, 12 Dec 2001 07:56:52 -0800
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2pre)
! Content-Type: application/x-phpwiki;
!   pagename=TextFormattingRules;
!   flags=PAGE_LOCKED;
! Content-Transfer-Encoding: quoted-printable
  
+ ! Paragraphs
  
  * Don't indent paragraphs
  * Words wrap and fill as needed
  * Use blank lines as separators
  * Four or more minus signs make a horizontal rule
  * %%''''% makes a linebreak (in headings and lists too)
  
  
  ! Lists
  
  * asterisk for first level
  ** asterisk-asterisk for second level, etc.
  * Use * for bullet lists, # for numbered lists (mix at will)
  * semicolon-term-colon-definition for definition lists:
  ;term here:definition here, as in the <DL><DT><DD> list
  * One line for each item
  * Other leading whitespace signals preformatted text, changes font.
  
  ! Headings
  
  * '!' at the start of a line makes a small heading
! * '!!' at the start of a line makes a medium heading
  * '!!!' at the start of a line makes a large heading
  
  ! Fonts
  
  * Indent with one or more spaces to use a monospace font:
  
   This is in monospace
  This is not
  
  !Indented Paragraphs
  
  * semicolon-colon -- works like <BLOCKQUOTE>
  
  ;: this is an indented block of text
  
  ! Emphasis
  
  * Use doubled single-quotes ('____') for emphasis (usually ''italics'')
  * Use doubled underscores (_''''_) for strong emphasis (usually __bold__)
  * Mix them at will: __''bold italics''__
! * ''Emphasis'' can be used ''multiple'' times within a line, but =
! ''cannot'' cross line boundaries:
  
  ''this
  will not work''
  
  ! References
! * Hyperlinks to other pages within the Wiki are made by placing the page =
! name in square brackets: [this is a page link] or UsingWikiWords (preferred)
  * Hyperlinks to external pages are done like this: [http://www.wcsb.org/]
+ * You can name the links by providing a name, a bar (|) and then the =
+ hyperlink or pagename: [PhpWiki home page | =
+ http://phpwiki.sourceforge.net/]  - [the front page | HomePage]
+ * You can suppress linking to old-style references and URIs by preceding =
+ the word with a '!', e.g. !NotLinkedAsWikiName, !http://not.linked.to/
+ * You can create footnotes by using [[1], [[2], [[3], ... like this here =
+ [1]. See footnote for counterpart.  (If the [[ is in the first column, it =
+ is a footnote ''definition'' rather than a footnote ''reference'' [1].)
+ * Also, the old way of linking URL's is still supported: precede URLs with =
+ "http:", "ftp:" or "mailto:" to create links automatically as in: =
+ http://c2.com/
+ * URLs ending with .png, .gif, or .jpg are inlined if in square brackets, =
+ by themselves: =
+ [http://phpwiki.sourceforge.net/phpwiki-wiki(1.3)/images/png.png]
  
  ! Tables
  
! * Simple tables are available.  A table row is introduced by a __|__ in =
! the first column.  It is best described by example:
!       ||  _''''_Name_''''_               |v _''''_Cost_''''_   |v =
! _''''_Notes_''''_
        | _''''_First_''''_   | _''''_Last_''''_
        |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
        |> Marco      |< Polo      | Cheaper     |< Not available
  ;: will generate
  ||  __Name__               |v __Cost__   |v __Notes__
  | __First__   | __Last__
  |> Jeff       |< Dairiki   |^  Cheap     |< Not worth it
  |> Marco      |< Polo      | Cheaper     |< Not available
  
+ ;: Note that multiple __|__'s lead to spanned columns, and __v__'s can be =
+ used to span rows.  A __>__ generates a right justified column, __<__ a =
+ left justified column and __^__ a centered column (which is the default.)
  
  
  ! HTML Mark-Up Language
  
  * Don't bother
  * < and > are themselves
  * The & characters will not work
+ * If you really must use HTML, your system administrator can enable this =
+ feature. Start each line with a bar (|). Note that this feature is =
+ disabled by default.
  
  ! More detail than you want to know
  
  See [MagicPhpWikiURLs] for gory details on how to write
  various kind of wiki maintainance links.
  
  -----
  
  Footnotes:
  
+ [1] By using [[1] a second time (in the first column) the footnote itself =
+ is ''defined''.  You may refer to a footnote as many times as you want, =
+ but you may only define it once on the page.  Note the the [[1] in the =
+ footnote links back to the first reference, if there are multiple =
+ references there will be +'s after the [[1] which will link to the other =
+ references.  (References which come ''after'' the footnote ''definition'' =
+ will not be linked to.)

GleicheSeiten

[[no a. g. (PhpWiki)]

GleicheSeiten haben ein identiches Wort im Namen.

Besuche Wiki:LikePages und MeatBall:LikePages.
----
<?plugin LikePages?>

[phpwiki-checkins] CVS: phpwiki/templates message.html,1.14,1.15

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

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

Modified Files:
	message.html 
Log Message:
Wiki logo now links to correct HomePage with non-english Wikis.

Index: message.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** message.html	2001/11/14 21:25:32	1.14
--- message.html	2001/12/16 11:54:35	1.15
***************
*** 16,20 ****
  <body>
  <div><a class="wikilink" 
!        href="${BROWSE}HomePage"
         ><img src="${LOGO}" align="right"
               border="0" alt="[phpwiki]"
--- 16,20 ----
  <body>
  <div><a class="wikilink" 
!        href="${BROWSE}$("HomePage")"
         ><img src="${LOGO}" align="right"
               border="0" alt="[phpwiki]"

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.25,1.26

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

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

Modified Files:
	editpage.html 
Log Message:
Wiki logo now links to correct HomePage with non-english Wikis.

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** editpage.html	2001/12/10 20:53:46	1.25
--- editpage.html	2001/12/16 11:54:31	1.26
***************
*** 18,22 ****
  <body>
  <div><a class="wikilink"
!         href="${BROWSE}HomePage"
          ><img src="${LOGO}" border="0" align="right"
  	     alt="[phpwiki]" width="50" height="50" /></a></div>
--- 18,22 ----
  <body>
  <div><a class="wikilink"
!         href="${BROWSE}$_("HomePage")"
          ><img src="${LOGO}" border="0" align="right"
  	     alt="[phpwiki]" width="50" height="50" /></a></div>

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc Volltextsuche,NONE,1.1

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

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

Added Files:
	Volltextsuche 
Log Message:
Updated plugins for a more complete localized experience.

--- NEW FILE ---