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

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

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

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

Modified Files:
	interwiki.php 
Log Message:
Minor reindenting and rewrapping in emacs.

Index: interwiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/interwiki.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** interwiki.php	2001/12/11 17:47:10	1.11
--- interwiki.php	2002/01/09 17:09:31	1.12
***************
*** 32,36 ****
      // FIXME: this is a somewhat broken heuristic.
      $page_enc = strstr($url, '?') ? rawurlencode($page) : $page;
!     
      if (strstr($url, '%s'))
          $url = sprintf($url, $page_enc);
--- 32,36 ----
      // FIXME: this is a somewhat broken heuristic.
      $page_enc = strstr($url, '?') ? rawurlencode($page) : $page;
! 
      if (strstr($url, '%s'))
          $url = sprintf($url, $page_enc);
***************
*** 40,52 ****
      if ($linktext) {
          $linktext = htmlspecialchars($linktext);
!         $class = 'named-interwiki';
      }
      else {
!         $linktext = ( htmlspecialchars("$wiki:")
!                       . QElement('span', array('class' => 'wikipage'), $page) );
          $class = 'interwiki';
      }
  
!     return Element('a', array('href' => $url,
                                'class' => $class),
                     IconForLink('interwiki') . $linktext);
--- 40,52 ----
      if ($linktext) {
          $linktext = htmlspecialchars($linktext);
!         $class    = 'named-interwiki';
      }
      else {
!         $linktext = (htmlspecialchars("$wiki:")
!                      . QElement('span', array('class' => 'wikipage'), $page));
          $class = 'interwiki';
      }
  
!     return Element('a', array('href'  => $url,
                                'class' => $class),
                     IconForLink('interwiki') . $linktext);
***************
*** 71,74 ****
  // indent-tabs-mode: nil
  // End:
- 
  ?>
--- 71,73 ----

[phpwiki-checkins] CVS: phpwiki/lib loadsave.php,1.21,1.22

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

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

Modified Files:
	loadsave.php 
Log Message:
Added comment "FIXME: better message?". Reindenting and rewrapping in emacs.

Index: loadsave.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/loadsave.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** loadsave.php	2002/01/09 04:01:09	1.21
--- loadsave.php	2002/01/09 17:04:51	1.22
***************
*** 6,24 ****
  function StartLoadDump($title, $html = '')
  {
!    // FIXME: This is a hack
!    echo ereg_replace('</body>.*', '',
!                      GeneratePage('MESSAGE', $html, $title, 0));
  }
  
  function EndLoadDump()
  {
!    // FIXME: This is a hack
      
!    echo Element('p', QElement('b', _("Complete.")));
!    echo Element('p', sprintf( _("Return to %s"),LinkExistingWikiWord($GLOBALS['pagename']) ) );
!    echo "</body></html>\n";
  }
  
!    
  ////////////////////////////////////////////////////////////////
  //
--- 6,25 ----
  function StartLoadDump($title, $html = '')
  {
!     // FIXME: This is a hack
!     echo ereg_replace('</body>.*', '',
!                       GeneratePage('MESSAGE', $html, $title, 0));
  }
  
  function EndLoadDump()
  {
!     // FIXME: This is a hack
      
!     echo Element('p', QElement('b', _("Complete.")));
!     echo Element('p', sprintf( _("Return to %s"), 
!                                LinkExistingWikiWord($GLOBALS['pagename']) ) );
!     echo "</body></html>\n";
  }
  
! 
  ////////////////////////////////////////////////////////////////
  //
***************
*** 29,59 ****
  function MailifyPage ($page, $nversions = 1)
  {
!    global $SERVER_ADMIN, $pagedump_format;
! 
!    $current = $page->getCurrentRevision();
!    $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
!    $head = "";
!    if ($pagedump_format == 'quoted-printable') {
!        $head = "From $from  " . CTime(time()) . "\r\n";
!        $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
!        $head .= "From: $from (PhpWiki)\r\n";
!        $head .= "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";
!        $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION);
!    } else {
!        $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n", PHPWIKI_VERSION."+carsten's-binary-hack");
!    }
!    $head .= "X-RCS_ID: $" ."Id" ."$" ."\r\n";
! 
!    $iter = $page->getAllRevisions();
!    $parts = array();
!    while ($revision = $iter->next()) {
!        $parts[] = MimeifyPageRevision($revision);
!        if ($nversions > 0 && count($parts) >= $nversions)
!            break;
!    }
!    if (count($parts) > 1)
!        return $head . MimeMultipart($parts);
!    assert($parts);
!    return $head . $parts[0];
  }
  
--- 30,62 ----
  function MailifyPage ($page, $nversions = 1)
  {
!     global $SERVER_ADMIN, $pagedump_format;
!     
!     $current = $page->getCurrentRevision();
!     $from = isset($SERVER_ADMIN) ? $SERVER_ADMIN : 'foo@bar';
!     $head = "";
!     if ($pagedump_format == 'quoted-printable') {
!         $head = "From $from  " . CTime(time()) . "\r\n";
!         $head .= "Subject: " . rawurlencode($page->getName()) . "\r\n";
!         $head .= "From: $from (PhpWiki)\r\n";
!         $head .= "Date: " . Rfc2822DateTime($current->get('mtime')) . "\r\n";
!         $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n",
!                          PHPWIKI_VERSION);
!     } else {
!         $head .= sprintf("Mime-Version: 1.0 (Produced by PhpWiki %s)\r\n",
!                          PHPWIKI_VERSION."+carsten's-binary-hack");
!     }
!     $head .= "X-RCS_ID: $" ."Id" ."$" ."\r\n";
!     
!     $iter = $page->getAllRevisions();
!     $parts = array();
!     while ($revision = $iter->next()) {
!         $parts[] = MimeifyPageRevision($revision);
!         if ($nversions > 0 && count($parts) >= $nversions)
!             break;
!     }
!     if (count($parts) > 1)
!         return $head . MimeMultipart($parts);
!     assert($parts);
!     return $head . $parts[0];
  }
  
***************
*** 61,70 ****
   * Compute filename to used for storing contents of a wiki page.
   *
!  * Basically we do a rawurlencode() which encodes everything
!  * except ASCII alphanumerics and '.', '-', and '_'.
   *
!  * But we also want to encode leading dots to avoid filenames
!  * like '.', and '..'.  (Also, there's no point in generating
!  * "hidden" file names, like '.foo'.)
   *
   * @param $pagename string Pagename.
--- 64,73 ----
   * Compute filename to used for storing contents of a wiki page.
   *
!  * Basically we do a rawurlencode() which encodes everything except
!  * ASCII alphanumerics and '.', '-', and '_'.
   *
!  * But we also want to encode leading dots to avoid filenames like
!  * '.', and '..'. (Also, there's no point in generating "hidden" file
!  * names, like '.foo'.)
   *
   * @param $pagename string Pagename.
***************
*** 87,99 ****
  {
      if ($request->getArg('include') == 'all') {
!         $zipname = "wikidb.zip";
          $include_archive = true;
      }
      else {
!         $zipname = "wiki.zip";
          $include_archive = false;
      }
      
!         
  
      $zip = new ZipWriter("Created by PhpWiki", $zipname);
--- 90,102 ----
  {
      if ($request->getArg('include') == 'all') {
!         $zipname         = "wikidb.zip";
          $include_archive = true;
      }
      else {
!         $zipname         = "wiki.zip";
          $include_archive = false;
      }
      
!     
  
      $zip = new ZipWriter("Created by PhpWiki", $zipname);
***************
*** 102,121 ****
      while ($page = $pages->next()) {
          set_time_limit(30);	// Reset watchdog.
! 
          $current = $page->getCurrentRevision();
          if ($current->getVersion() == 0)
              continue;
          
! 
!         $attrib = array('mtime' => $current->get('mtime'),
                          'is_ascii' => 1);
          if ($page->get('locked'))
              $attrib['write_protected'] = 1;
! 
          if ($include_archive)
              $content = MailifyPage($page, 0);
          else
              $content = MailifyPage($page);
! 		     
          $zip->addRegularFile( FilenameForPage($page->getName()),
                                $content, $attrib);
--- 105,124 ----
      while ($page = $pages->next()) {
          set_time_limit(30);	// Reset watchdog.
!         
          $current = $page->getCurrentRevision();
          if ($current->getVersion() == 0)
              continue;
          
!         
!         $attrib = array('mtime'    => $current->get('mtime'),
                          'is_ascii' => 1);
          if ($page->get('locked'))
              $attrib['write_protected'] = 1;
!         
          if ($include_archive)
              $content = MailifyPage($page, 0);
          else
              $content = MailifyPage($page);
!         
          $zip->addRegularFile( FilenameForPage($page->getName()),
                                $content, $attrib);
***************
*** 129,145 ****
      if (empty($directory))
          ExitWiki(_("You must specify a directory to dump to"));
!    
      // see if we can access the directory the user wants us to use
      if (! file_exists($directory)) {
          if (! mkdir($directory, 0755))
!             ExitWiki( sprintf(_("Cannot create directory '%s'"),$directory) . "<br>\n");
          else
!             $html = sprintf(_("Created directory '%s' for the page dump..."),$directory) . "<br>\n";
      } else {
          $html = sprintf(_("Using directory '%s'"),$directory) . "<br>\n";
      }
! 
      StartLoadDump( _("Dumping Pages"), $html);
!    
      $pages = $dbi->getAllPages();
      
--- 132,150 ----
      if (empty($directory))
          ExitWiki(_("You must specify a directory to dump to"));
!     
      // see if we can access the directory the user wants us to use
      if (! file_exists($directory)) {
          if (! mkdir($directory, 0755))
!             ExitWiki( sprintf(_("Cannot create directory '%s'"), 
!                               $directory) . "<br>\n");
          else
!             $html = sprintf(_("Created directory '%s' for the page dump..."),
!                             $directory) . "<br>\n";
      } else {
          $html = sprintf(_("Using directory '%s'"),$directory) . "<br>\n";
      }
!     
      StartLoadDump( _("Dumping Pages"), $html);
!     
      $pages = $dbi->getAllPages();
      
***************
*** 148,169 ****
          $enc_name = htmlspecialchars($page->getName());
          $filename = FilenameForPage($page->getName());
! 
          echo "<br>$enc_name ... ";
          if($page->getName() != $filename)
!             echo "<small>" . sprintf(_("saved as %s"),$filename) . "</small> ... ";
! 
          $data = MailifyPage($page);
!       
          if ( !($fd = fopen("$directory/$filename", "w")) )
!             ExitWiki("<b>" . sprintf(_("couldn't open file '%s' for writing"),"$directory/$filename") . "</b>\n");
!       
          $num = fwrite($fd, $data, strlen($data));
          echo "<small>" . sprintf(_("%s bytes written"),$num) . "</small>\n";
          flush();
!       
          assert($num == strlen($data));
          fclose($fd);
      }
! 
      EndLoadDump();
  }
--- 153,176 ----
          $enc_name = htmlspecialchars($page->getName());
          $filename = FilenameForPage($page->getName());
!         
          echo "<br>$enc_name ... ";
          if($page->getName() != $filename)
!             echo "<small>" . sprintf(_("saved as %s"),$filename)
!                 . "</small> ... ";
!         
          $data = MailifyPage($page);
!         
          if ( !($fd = fopen("$directory/$filename", "w")) )
!             ExitWiki("<b>" . sprintf(_("couldn't open file '%s' for writing"),
!                                      "$directory/$filename") . "</b>\n");
!         
          $num = fwrite($fd, $data, strlen($data));
          echo "<small>" . sprintf(_("%s bytes written"),$num) . "</small>\n";
          flush();
!         
          assert($num == strlen($data));
          fclose($fd);
      }
!     
      EndLoadDump();
  }
***************
*** 177,196 ****
  function SavePage ($dbi, $pageinfo, $source, $filename)
  {
!     $pagedata = $pageinfo['pagedata']; // Page level meta-data.
      $versiondata = $pageinfo['versiondata']; // Revision level meta-data.
! 
      if (empty($pageinfo['pagename'])) {
!         echo Element('dd'). Element('dt', QElement('b', _("Empty pagename!") ));
          return;
      }
! 
      if (empty($versiondata['author_id']))
          $versiondata['author_id'] = $versiondata['author'];
      
      $pagename = $pageinfo['pagename'];
!     $content = $pageinfo['content'];
! 
      $page = $dbi->getPage($pagename);
! 
      foreach ($pagedata as $key => $value) {
          if (!empty($value))
--- 184,204 ----
  function SavePage ($dbi, $pageinfo, $source, $filename)
  {
!     $pagedata    = $pageinfo['pagedata'];    // Page level meta-data.
      $versiondata = $pageinfo['versiondata']; // Revision level meta-data.
!     
      if (empty($pageinfo['pagename'])) {
!         echo Element('dd'). Element('dt', QElement('b',
!                                                    _("Empty pagename!") ));
          return;
      }
!     
      if (empty($versiondata['author_id']))
          $versiondata['author_id'] = $versiondata['author'];
      
      $pagename = $pageinfo['pagename'];
!     $content  = $pageinfo['content'];
!     
      $page = $dbi->getPage($pagename);
!     
      foreach ($pagedata as $key => $value) {
          if (!empty($value))
***************
*** 218,230 ****
          $isnew = false;
      }
! 
      if (! $skip) {
          $new = $page->createRevision(WIKIDB_FORCE_CREATE, $content,
                                       $versiondata,
                                       ExtractWikiPageLinks($content));
! 
!         $mesg[] = sprintf(_("- saved to database as version %d"), $new->getVersion());
      }
!    
      print( Element('dt', LinkExistingWikiWord($pagename))
             . QElement('dd', join(" ", $mesg))
--- 226,239 ----
          $isnew = false;
      }
!     
      if (! $skip) {
          $new = $page->createRevision(WIKIDB_FORCE_CREATE, $content,
                                       $versiondata,
                                       ExtractWikiPageLinks($content));
!         
!         $mesg[] = sprintf(_("- saved to database as version %d"),
!                           $new->getVersion());
      }
!     
      print( Element('dt', LinkExistingWikiWord($pagename))
             . QElement('dd', join(" ", $mesg))
***************
*** 237,243 ****
      if (!preg_match('/^a:\d+:{[si]:\d+/', $text))
          return false;
! 
      $pagehash = unserialize($text);
! 
      // Split up pagehash into four parts:
      //   pagename
--- 246,252 ----
      if (!preg_match('/^a:\d+:{[si]:\d+/', $text))
          return false;
!     
      $pagehash = unserialize($text);
!     
      // Split up pagehash into four parts:
      //   pagename
***************
*** 248,257 ****
      if (!defined('FLAG_PAGE_LOCKED'))
          define('FLAG_PAGE_LOCKED', 1);
!     $pageinfo = array('pagedata' => array(),
                        'versiondata' => array());
! 
      $pagedata = &$pageinfo['pagedata'];
      $versiondata = &$pageinfo['versiondata'];
! 
      // Fill in defaults.
      if (empty($pagehash['pagename']))
--- 257,266 ----
      if (!defined('FLAG_PAGE_LOCKED'))
          define('FLAG_PAGE_LOCKED', 1);
!     $pageinfo = array('pagedata'    => array(),
                        'versiondata' => array());
!     
      $pagedata = &$pageinfo['pagedata'];
      $versiondata = &$pageinfo['versiondata'];
!     
      // Fill in defaults.
      if (empty($pagehash['pagename']))
***************
*** 260,264 ****
          $pagehash['author'] = $GLOBALS['user']->id();
      
! 
      foreach ($pagehash as $key => $value) {
          switch($key) {
--- 269,273 ----
          $pagehash['author'] = $GLOBALS['user']->id();
      
!     
      foreach ($pagehash as $key => $value) {
          switch($key) {
***************
*** 288,292 ****
   
  function SortByPageVersion ($a, $b) {
!    return $a['version'] - $b['version'];
  }
  
--- 297,301 ----
   
  function SortByPageVersion ($a, $b) {
!     return $a['version'] - $b['version'];
  }
  
***************
*** 295,305 ****
      if (!is_string($text)) {
          // Read the file.
!         $stat = stat($filename);
          $mtime = $stat[9];
!         $text = implode("", file($filename));
      }
     
      set_time_limit(30);	// Reset watchdog.
! 
      // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
      $basename = basename("/dummy/" . $filename);
--- 304,314 ----
      if (!is_string($text)) {
          // Read the file.
!         $stat  = stat($filename);
          $mtime = $stat[9];
!         $text  = implode("", file($filename));
      }
     
      set_time_limit(30);	// Reset watchdog.
!     
      // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
      $basename = basename("/dummy/" . $filename);
***************
*** 307,314 ****
      if (!$mtime)
          $mtime = time();	// Last resort.
! 
!     $defaults = array('author' => $GLOBALS['user']->id(),
                        'pagename' => rawurldecode($basename));
! 
      $default_pagename = rawurldecode($basename);
      
--- 316,323 ----
      if (!$mtime)
          $mtime = time();	// Last resort.
!     
!     $defaults = array('author'   => $GLOBALS['user']->id(),
                        'pagename' => rawurldecode($basename));
!     
      $default_pagename = rawurldecode($basename);
      
***************
*** 316,323 ****
          usort($parts, 'SortByPageVersion');
          foreach ($parts as $pageinfo)
!             SavePage($dbi, $pageinfo, sprintf(_("MIME file %s"),$filename), $basename);
      }
      else if ( ($pageinfo = ParseSerializedPage($text, $default_pagename)) ) {
!         SavePage($dbi, $pageinfo, sprintf(_("Serialized file %s"),$filename), $basename);
      }
      else {
--- 325,334 ----
          usort($parts, 'SortByPageVersion');
          foreach ($parts as $pageinfo)
!             SavePage($dbi, $pageinfo, sprintf(_("MIME file %s"),$filename),
!                      $basename);
      }
      else if ( ($pageinfo = ParseSerializedPage($text, $default_pagename)) ) {
!         SavePage($dbi, $pageinfo, sprintf(_("Serialized file %s"),$filename),
!                  $basename);
      }
      else {
***************
*** 327,334 ****
                            'versiondata'
                            => array('author' => $GLOBALS['user']->id()),
!                           'content'
!                           => preg_replace('/[ \t\r]*\n/', "\n", chop($text))
                            );
!         SavePage($dbi, $pageinfo, sprintf(_("plain file %s"),$filename), $basename);
      }
  }
--- 338,346 ----
                            'versiondata'
                            => array('author' => $GLOBALS['user']->id()),
!                           'content'  => preg_replace('/[ \t\r]*\n/', "\n",
!                                                      chop($text))
                            );
!         SavePage($dbi, $pageinfo, sprintf(_("plain file %s"),$filename),
!                  $basename);
      }
  }
***************
*** 338,352 ****
     $zip = new ZipReader($zipfile);
     while (list ($fn, $data, $attrib) = $zip->readFile())
!    {
!       // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
!       $fn = basename("/dummy/" . $fn);
!       if ( ($files && !in_array($fn, $files))
! 	   || ($exclude && in_array($fn, $exclude)) )
!       {
!          print Element('dt', LinkExistingWikiWord($fn)) . QElement('dd', _("Skipping"));
!          continue;
!       }
! 
!       LoadFile($dbi, $fn, $data, $attrib['mtime']);
     }
  }
--- 350,365 ----
     $zip = new ZipReader($zipfile);
     while (list ($fn, $data, $attrib) = $zip->readFile())
!        {
!            // FIXME: basename("filewithnoslashes") seems to return garbage sometimes.
!            $fn = basename("/dummy/" . $fn);
!            if ( ($files && !in_array($fn, $files))
!                 || ($exclude && in_array($fn, $exclude)) )
!                {
!                    print Element('dt', LinkExistingWikiWord($fn))
!                        . QElement('dd', _("Skipping"));
!                    continue;
!                }
!            
!            LoadFile($dbi, $fn, $data, $attrib['mtime']);
     }
  }
***************
*** 354,430 ****
  function LoadDir ($dbi, $dirname, $files = false, $exclude = false)
  {
!    $handle = opendir($dir = $dirname);
!    while ($fn = readdir($handle))
!    {
!       if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
! 	 continue;
! 
!       if ( ($files && !in_array($fn, $files))
! 	   || ($exclude && in_array($fn, $exclude)) )
!       {
! 	 print Element('dt', LinkExistingWikiWord($fn)) . QElement('dd', _("Skipping"));
! 	 continue;
!       }
!       
!       LoadFile($dbi, "$dir/$fn");
!    }
!    closedir($handle);
  }
  
  function IsZipFile ($filename_or_fd)
  {
!    // See if it looks like zip file
!    if (is_string($filename_or_fd))
!    {
!       $fd = fopen($filename_or_fd, "rb");
!       $magic = fread($fd, 4);
!       fclose($fd);
!    }
!    else
!    {
!       $fpos = ftell($filename_or_fd);
!       $magic = fread($filename_or_fd, 4);
!       fseek($filename_or_fd, $fpos);
!    }
!    
!    return $magic == ZIP_LOCHEAD_MAGIC || $magic == ZIP_CENTHEAD_MAGIC;
  }
  
!    
  function LoadAny ($dbi, $file_or_dir, $files = false, $exclude = false)
  {
      // FIXME: This is a partial workaround for sf bug #501145
!     if (substr_count($file_or_dir,"/") < 1)
          $type = filetype(rawurlencode($file_or_dir));
!     else {
! 	$type = filetype($file_or_dir);
      }
! 
!    if ($type == 'dir')
!    {
!       LoadDir($dbi, $file_or_dir, $files, $exclude);
!    }
!    else if ($type != 'file' && !preg_match('/^(http|ftp):/', $file_or_dir))
!    {
!       ExitWiki( sprintf(_("Bad file type: %s"),$type) );
!    }
!    else if (IsZipFile($file_or_dir))
!    {
!       LoadZip($dbi, $file_or_dir, $files, $exclude);
!    }
!    else /* if (!$files || in_array(basename($file_or_dir), $files)) */
!    {
!       LoadFile($dbi, $file_or_dir);
!    }
  }
  
  function LoadFileOrDir ($dbi, $request)
  {
!    $source = $request->getArg('source');
!    StartLoadDump( sprintf(_("Loading '%s'"),$source) );
!    echo "<dl>\n";
!    LoadAny($dbi, $source/*, false, array(gettext("RecentChanges"))*/);
!    echo "</dl>\n";
!    EndLoadDump();
  }
  
--- 367,442 ----
  function LoadDir ($dbi, $dirname, $files = false, $exclude = false)
  {
!     $handle = opendir($dir = $dirname);
!     while ($fn = readdir($handle))
!         {
!             if ($fn[0] == '.' || filetype("$dir/$fn") != 'file')
!                 continue;
!             
!             if ( ($files && !in_array($fn, $files))
!                  || ($exclude && in_array($fn, $exclude)) )
!                 {
!                     print Element('dt', LinkExistingWikiWord($fn))
!                         . QElement('dd', _("Skipping"));
!                     continue;
!                 }
!             
!             LoadFile($dbi, "$dir/$fn");
!         }
!     closedir($handle);
  }
  
  function IsZipFile ($filename_or_fd)
  {
!     // See if it looks like zip file
!     if (is_string($filename_or_fd))
!         {
!             $fd    = fopen($filename_or_fd, "rb");
!             $magic = fread($fd, 4);
!             fclose($fd);
!         }
!     else
!         {
!             $fpos  = ftell($filename_or_fd);
!             $magic = fread($filename_or_fd, 4);
!             fseek($filename_or_fd, $fpos);
!         }
!     
!     return $magic == ZIP_LOCHEAD_MAGIC || $magic == ZIP_CENTHEAD_MAGIC;
  }
  
! 
  function LoadAny ($dbi, $file_or_dir, $files = false, $exclude = false)
  {
      // FIXME: This is a partial workaround for sf bug #501145
!     if (substr_count($file_or_dir,"/") < 1) {
          $type = filetype(rawurlencode($file_or_dir));
!     } else {
!         $type = filetype($file_or_dir);
      }
!     
!     if ($type == 'dir') {
!         LoadDir($dbi, $file_or_dir, $files, $exclude);
!     }
!     else if ($type != 'file' && !preg_match('/^(http|ftp):/', $file_or_dir))
!     {
!         ExitWiki( sprintf(_("Bad file type: %s"),$type) );
!     }
!     else if (IsZipFile($file_or_dir)) {
!         LoadZip($dbi, $file_or_dir, $files, $exclude);
!     }
!     else /* if (!$files || in_array(basename($file_or_dir), $files)) */
!     {
!         LoadFile($dbi, $file_or_dir);
!     }
  }
  
  function LoadFileOrDir ($dbi, $request)
  {
!     $source = $request->getArg('source');
!     StartLoadDump( sprintf(_("Loading '%s'"),$source) );
!     echo "<dl>\n";
!     LoadAny($dbi, $source/*, false, array(gettext("RecentChanges"))*/);
!     echo "</dl>\n";
!     EndLoadDump();
  }
  
***************
*** 432,446 ****
  {
      global $GenericPages, $LANG, $user;
! 
      //FIXME: This is a hack
      $user->userid = _("The PhpWiki programming team");
!    
      StartLoadDump(_("Loading up virgin wiki"));
      echo "<dl>\n";
! 
      LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC)/*, false, $ignore*/);
      if ($LANG != "C")
!         LoadAny($dbi, FindFile(DEFAULT_WIKI_PGSRC), $GenericPages/*, $ignore*/);
! 
      echo "</dl>\n";
      EndLoadDump();
--- 444,459 ----
  {
      global $GenericPages, $LANG, $user;
!     
      //FIXME: This is a hack
      $user->userid = _("The PhpWiki programming team");
!     
      StartLoadDump(_("Loading up virgin wiki"));
      echo "<dl>\n";
!     
      LoadAny($dbi, FindLocalizedFile(WIKI_PGSRC)/*, false, $ignore*/);
      if ($LANG != "C")
!         LoadAny($dbi, FindFile(DEFAULT_WIKI_PGSRC),
!                 $GenericPages/*, $ignore*/);
!     
      echo "</dl>\n";
      EndLoadDump();
***************
*** 450,461 ****
  {
      $upload = $request->getUploadedFile('file');
! 
      if (!$upload)
          ExitWiki(_("No uploaded file to upload?"));
! 
      // Dump http headers.
      StartLoadDump( sprintf(_("Uploading %s"),$upload->getName()) );
      echo "<dl>\n";
!    
      $fd = $upload->open();
      if (IsZipFile($fd))
--- 463,475 ----
  {
      $upload = $request->getUploadedFile('file');
!     
      if (!$upload)
+         // FIXME: better message?
          ExitWiki(_("No uploaded file to upload?"));
!     
      // Dump http headers.
      StartLoadDump( sprintf(_("Uploading %s"),$upload->getName()) );
      echo "<dl>\n";
!     
      $fd = $upload->open();
      if (IsZipFile($fd))
***************
*** 463,467 ****
      else
          Loadfile($dbi, $upload->getName(), $upload->getContents());
! 
      echo "</dl>\n";
      EndLoadDump();
--- 477,481 ----
      else
          Loadfile($dbi, $upload->getName(), $upload->getContents());
!     
      echo "</dl>\n";
      EndLoadDump();

[phpwiki-checkins] CVS: phpwiki/lib main.php,1.22,1.23 Request.php,1.6,1.7

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

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

Modified Files:
	main.php Request.php 
Log Message:
Minor reindenting and rewrapping in emacs.

Index: main.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/main.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** main.php	2001/12/28 09:53:15	1.22
--- main.php	2002/01/09 16:57:20	1.23
***************
*** 30,37 ****
      if (! ZIPDUMP_AUTH and ($action == 'zip' || $action == 'xmldump'))
          return true;
!     return in_array ( $action, array('browse',
!                                      'info', 'diff', 'search',
!                                      'edit', 'save',
!                                      'login', 'logout',
                                       'setprefs') );
  }
--- 30,37 ----
      if (! ZIPDUMP_AUTH and ($action == 'zip' || $action == 'xmldump'))
          return true;
!     return in_array ( $action, array('browse', 'info',
!                                      'diff',   'search',
!                                      'edit',   'save',
!                                      'login',  'logout',
                                       'setprefs') );
  }
***************
*** 52,56 ****
  
  function main ($request) {
! 
      
      if (USE_PATH_INFO && ! $request->get('PATH_INFO')
--- 52,56 ----
  
  function main ($request) {
!     
      
      if (USE_PATH_INFO && ! $request->get('PATH_INFO')
***************
*** 78,82 ****
      //if ($user->is_authenticated())
      //  $LogEntry->user = $user->id();
! 
      // All requests require the database
      global $dbi;                // FIXME: can we keep this non-global?
--- 78,82 ----
      //if ($user->is_authenticated())
      //  $LogEntry->user = $user->id();
!     
      // All requests require the database
      global $dbi;                // FIXME: can we keep this non-global?
***************
*** 95,99 ****
      if (!is_safe_action($action))
          $user->must_be_admin($action);
! 
      if (isset($DisabledActions) && in_array($action, $DisabledActions))
          ExitWiki(sprintf(_("Action %s is disabled in this wiki."), $action));
--- 95,99 ----
      if (!is_safe_action($action))
          $user->must_be_admin($action);
!     
      if (isset($DisabledActions) && in_array($action, $DisabledActions))
          ExitWiki(sprintf(_("Action %s is disabled in this wiki."), $action));
***************
*** 105,110 ****
          $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
      }
- 
      
      switch ($action) {
      case 'edit':
--- 105,110 ----
          $ErrorManager->setPostponedErrorMask(E_NOTICE|E_USER_NOTICE);
      }
      
+     
      switch ($action) {
      case 'edit':
***************
*** 127,131 ****
                                     'absolute_url'));
          break;
!       
      case 'save':
          $request->compress_output();
--- 127,131 ----
                                     'absolute_url'));
          break;
!         
      case 'save':
          $request->compress_output();
***************
*** 156,160 ****
          $xmlwriter = new WikiXmlWriter;
          $xmlwriter->begin();
!         $xmlwriter->writeComment("PhpWiki " . PHPWIKI_VERSION . " source:\n$RCS_IDS\n");
          $xmlwriter->writeDatabase($dbi, $limit);
          $xmlwriter->end();
--- 156,161 ----
          $xmlwriter = new WikiXmlWriter;
          $xmlwriter->begin();
!         $xmlwriter->writeComment("PhpWiki " . PHPWIKI_VERSION
!                                  . " source:\n$RCS_IDS\n");
          $xmlwriter->writeDatabase($dbi, $limit);
          $xmlwriter->end();

Index: Request.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Request.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Request.php	2001/12/11 22:45:38	1.6
--- Request.php	2002/01/09 16:57:20	1.7
***************
*** 8,12 ****
          $this->_fix_magic_quotes_gpc();
          $this->_fix_multipart_form_data();
! 
          switch($this->get('REQUEST_METHOD')) {
          case 'GET':
--- 8,12 ----
          $this->_fix_magic_quotes_gpc();
          $this->_fix_multipart_form_data();
!         
          switch($this->get('REQUEST_METHOD')) {
          case 'GET':
***************
*** 24,30 ****
          $this->session = new Request_SessionVars;
          $this->cookies = new Request_CookieVars;
! 
          if (ACCESS_LOG)
!             $this->_log_entry = & new Request_AccessLogEntry($this, ACCESS_LOG);
          
          $TheRequest = $this;
--- 24,31 ----
          $this->session = new Request_SessionVars;
          $this->cookies = new Request_CookieVars;
!         
          if (ACCESS_LOG)
!             $this->_log_entry = & new Request_AccessLogEntry($this,
!                                                              ACCESS_LOG);
          
          $TheRequest = $this;
***************
*** 159,163 ****
              $var = stripslashes($var);
      }
! 
      function _fix_multipart_form_data () {
          if (preg_match('|^multipart/form-data|', $this->get('CONTENT_TYPE')))
--- 160,164 ----
              $var = stripslashes($var);
      }
!     
      function _fix_multipart_form_data () {
          if (preg_match('|^multipart/form-data|', $this->get('CONTENT_TYPE')))
***************
*** 179,183 ****
          session_start();
      }
! 
      function get($key) {
          $vars = &$GLOBALS['HTTP_SESSION_VARS'];
--- 180,184 ----
          session_start();
      }
!     
      function get($key) {
          $vars = &$GLOBALS['HTTP_SESSION_VARS'];
***************
*** 186,190 ****
          return false;
      }
! 
      function set($key, $val) {
          $vars = &$GLOBALS['HTTP_SESSION_VARS'];
--- 187,191 ----
          return false;
      }
!     
      function set($key, $val) {
          $vars = &$GLOBALS['HTTP_SESSION_VARS'];
***************
*** 207,211 ****
  
  class Request_CookieVars {
! 
      function get($key) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
--- 208,212 ----
  
  class Request_CookieVars {
!     
      function get($key) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
***************
*** 220,224 ****
      function set($key, $val, $persist_days = false) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
! 
          if (is_numeric($persist_days)) {
              $expires = time() + (24 * 3600) * $persist_days;
--- 221,225 ----
      function set($key, $val, $persist_days = false) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
!         
          if (is_numeric($persist_days)) {
              $expires = time() + (24 * 3600) * $persist_days;
***************
*** 232,236 ****
          setcookie($key, $packedval, $expires, '/');
      }
! 
      function delete($key) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
--- 233,237 ----
          setcookie($key, $packedval, $expires, '/');
      }
!     
      function delete($key) {
          $vars = &$GLOBALS['HTTP_COOKIE_VARS'];
***************
*** 243,247 ****
      function getUploadedFile($postname) {
          global $HTTP_POST_FILES;
! 
          if (!isset($HTTP_POST_FILES[$postname]))
              return false;
--- 244,248 ----
      function getUploadedFile($postname) {
          global $HTTP_POST_FILES;
!         
          if (!isset($HTTP_POST_FILES[$postname]))
              return false;
***************
*** 332,336 ****
          $this->logfile = $logfile;
          
!         $this->host = $request->get('REMOTE_HOST');
          $this->ident = $request->get('REMOTE_IDENT');
          if (!$this->ident)
--- 333,337 ----
          $this->logfile = $logfile;
          
!         $this->host  = $request->get('REMOTE_HOST');
          $this->ident = $request->get('REMOTE_IDENT');
          if (!$this->ident)
***************
*** 339,344 ****
          $this->time = time();
          $this->request = join(' ', array($request->get('REQUEST_METHOD'),
!                                        $request->get('REQUEST_URI'),
!                                        $request->get('SERVER_PROTOCOL')));
          $this->status = 200;
          $this->size = 0;
--- 340,345 ----
          $this->time = time();
          $this->request = join(' ', array($request->get('REQUEST_METHOD'),
!                                          $request->get('REQUEST_URI'),
!                                          $request->get('SERVER_PROTOCOL')));
          $this->status = 200;
          $this->size = 0;
***************
*** 388,392 ****
          }
          $offhours = floor($offset / 3600);
!         $offmins = $offset / 60 - $offhours * 60;
          return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
      }
--- 389,393 ----
          }
          $offhours = floor($offset / 3600);
!         $offmins  = $offset / 60 - $offhours * 60;
          return sprintf("%s%02d%02d", $negoffset, $offhours, $offmins);
      }

[phpwiki-checkins] CVS: phpwiki/lib Toolbar.php,1.10,1.11

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

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

Modified Files:
	Toolbar.php 
Log Message:
Reindenting and rewrapping in emacs.

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Toolbar.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Toolbar.php	2002/01/08 00:06:45	1.10
--- Toolbar.php	2002/01/09 16:34:35	1.11
***************
*** 15,22 ****
          break;
      case "image" :
!         $separator = "<img alt=\" | \" src=\"" .DATA_URL( '$placeholder' ) ."\" />";
          break;
!     }
!     return $separator;
  */
      // just using a hardcoded separator for now
--- 15,23 ----
          break;
      case "image" :
!         $separator = "<img alt=\" | \" src=\"" .DATA_URL( '$placeholder' )
!         ."\" />";
          break;
!         }
!         return $separator;
  */
      // just using a hardcoded separator for now
***************
*** 25,53 ****
  
  /*
! 
! These functions will replace the PHP logic currently embedded in the
! html templates, used to build the Wiki commands and navigation links
! at the bottom of the screen.
! 
! If you feel inspired please contribute here!
! 
! (This is all in a state of flux, so don't count on any of this being
! the same tomorrow...)
! 
! 
! Some of these functions are already to be used as ${tokens} in the
! xhtml templates.
! 
! FIXME: IncludePage plugin for EditHelp needs to be dealt with.
! 
! Plugins shuold be cleaned up, in this state they won't display any
! mouseover text.
! 
! The raw html should be replaced with calls to Element(QElement()) or
! QElement().
! 
! Reminder: xgettext only knows about c/c++ line-continuation strings,
!           it does not know about php's dot operator.
! 
  */
  
--- 26,54 ----
  
  /*
!   
!   These functions will replace the PHP logic currently embedded in the
!   html templates, used to build the Wiki commands and navigation links
!   at the bottom of the screen.
!   
!   If you feel inspired please contribute here!
!   
!   (This is all in a state of flux, so don't count on any of this being
!   the same tomorrow...)
!   
!   
!   Some of these functions are already to be used as ${tokens} in the
!   xhtml templates.
!   
!   FIXME: IncludePage plugin for EditHelp needs to be dealt with.
!   
!   Plugins shuold be cleaned up, in this state they won't display any
!   mouseover text.
!   
!   The raw html should be replaced with calls to Element(QElement()) or
!   QElement().
!   
!   Reminder: xgettext only knows about c/c++ line-continuation strings,
!             it does not know about php's dot operator.
!   
  */
  
***************
*** 137,143 ****
      } else {
  	if ($is_current) {
!             $html .= "<a class=\"wikiaction\" href=\"" .WikiURL($pagename, array('action' => 'edit')) ."\">" ._("Edit") ."</a>";
          } else {
!             $html .= "<a class=\"wikiaction\" href=\"" .WikiURL($pagename, array('action' => 'edit&amp;version=' .$version));
              $html .= ">" ._("Edit old revision") ."</a>";
          }
--- 138,148 ----
      } else {
  	if ($is_current) {
!             $html .= "<a class=\"wikiaction\" href=\""
!                 .WikiURL($pagename, array('action' => 'edit')) ."\">"
!                 ._("Edit") ."</a>";
          } else {
!             $html .= "<a class=\"wikiaction\" href=\""
!                 .WikiURL($pagename, array('action' => 'edit&amp;version='
!                                           .$version));
              $html .= ">" ._("Edit old revision") ."</a>";
          }
***************
*** 145,165 ****
      if ($userisadmin) {
  	if ($pagelocked) {
!             $html .= separator() ."<a class=\"wikiadmin\" href=\"" .WikiURL($pagename, array('action' => 'unlock')) ."\">" ._("Unlock page") ."</a>";
          } else {
!             $html .= separator() ."<a class=\"wikiadmin\" href=\"" .WikiURL($pagename, array('action' => 'lock')) ."\">" ._("Lock page") ."</a>";
          }
!         $html .= separator() ."<a class=\"wikiadmin\" href=\"" .WikiURL($pagename, array('action' => 'remove')) ."\">" ._("Remove page") ."</a>";
      }
!         //$html .= separator() ."<plugin-link PageHistory page=\"" .$pagename ."\"";
!         $html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL(_("PageHistory"), array('page' => $pagename)) ."\">" ._("PageHistory") ."</a>";
  
      if ($is_current) {
!         $html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL($pagename, array('action' => 'diff&amp;previous=major')) ."\">" ._("Diff") ."</a>";
      } else {
          $html .= separator() ."<a class=\"wikiaction\"";
!         $html .= "href=\"" . WikiURL($pagename, array('action' => 'diff&amp;version=' .$version .'&amp;previous=major')) ."\">" ._("Diff") ."</a>";
      }
!         //$html .= separator() ."<plugin-link BackLinks page=\"" .$pagename ."\"";
!         $html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL(_("BackLinks"), array('page' => $pagename)) ."\">" ._("BackLinks") ."</a>";
  
      return $html;
--- 150,185 ----
      if ($userisadmin) {
  	if ($pagelocked) {
!             $html .= separator() ."<a class=\"wikiadmin\" href=\""
!                 .WikiURL($pagename, array('action' => 'unlock')) ."\">"
!                 ._("Unlock page") ."</a>";
          } else {
!             $html .= separator() ."<a class=\"wikiadmin\" href=\""
!                 .WikiURL($pagename, array('action' => 'lock')) ."\">"
!                 ._("Lock page") ."</a>";
          }
!         $html .= separator() ."<a class=\"wikiadmin\" href=\""
!             .WikiURL($pagename, array('action' => 'remove')) ."\">"
!             ._("Remove page") ."</a>";
      }
!     //$html .= separator() ."<plugin-link PageHistory page=\"" .$pagename ."\"";
!     $html .= separator() ."<a class=\"wikiaction\" href=\"" .
!         WikiURL(_("PageHistory"), array('page' => $pagename)) ."\">"
!         ._("PageHistory") ."</a>";
  
      if ($is_current) {
!         $html .= separator() ."<a class=\"wikiaction\" href=\""
!             . WikiURL($pagename, array('action' => 'diff&amp;previous=major'))
!             ."\">" ._("Diff") ."</a>";
      } else {
          $html .= separator() ."<a class=\"wikiaction\"";
!         $html .= "href=\""
!             . WikiURL($pagename, array('action' => 'diff&amp;version='
!                                        .$version .'&amp;previous=major'))
!             ."\">" ._("Diff") ."</a>";
      }
!     //$html .= separator() ."<plugin-link BackLinks page=\"" .$pagename ."\"";
!     $html .= separator() ."<a class=\"wikiaction\" href=\""
!         . WikiURL(_("BackLinks"), array('page' => $pagename)) ."\">"
!         ._("BackLinks") ."</a>";
  
      return $html;
***************
*** 181,196 ****
  function toolbar_action_SearchActions($pagename, $charset) {
      $html = "";
!     $html .= "<form action=\"" .WikiURL(_("TitleSearch")) ."\" method=\"get\" accept-charset=\"" .$charset ."\">";
!     $html .= toolbar_action_Navigation($pagename) .separator() .LinkExistingWikiWord(_("FindPage"));
!     $html .= separator() ."<span><input type=\"hidden\" name=\"auto_redirect\" value=\"1\" />";
      $html .= "<input type=\"text\"  name=\"s\" size=\"12\"";
      $html .= " title=" ._("Quick Search");
!     $html .= " onmouseover=\"window.status='" ._("Quick Search") ."'; return true;";
      $html .= " onmouseout=\"window.status=''; return true;\" /></span>";
  
      //$html .= separator() ."<plugin-link LikePages page=\"" .$pagename ."\" >";
!     $html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL(_("LikePages"), array('page' => $pagename)) ."\">" ._("LikePages") ."</a>";
  
! //    $html .= "</form>";
      return $html;
  }
--- 201,222 ----
  function toolbar_action_SearchActions($pagename, $charset) {
      $html = "";
!     $html .= "<form action=\"" .WikiURL(_("TitleSearch"))
!         ."\" method=\"get\" accept-charset=\"" .$charset ."\">";
!     $html .= toolbar_action_Navigation($pagename) .separator()
!         .LinkExistingWikiWord(_("FindPage"));
!     $html .= separator()
!         ."<span><input type=\"hidden\" name=\"auto_redirect\" value=\"1\" />";
      $html .= "<input type=\"text\"  name=\"s\" size=\"12\"";
      $html .= " title=" ._("Quick Search");
!     $html .= " onmouseover=\"window.status='" ._("Quick Search")
!         ."'; return true;";
      $html .= " onmouseout=\"window.status=''; return true;\" /></span>";
  
      //$html .= separator() ."<plugin-link LikePages page=\"" .$pagename ."\" >";
!     $html .= separator() ."<a class=\"wikiaction\" href=\""
!         . WikiURL(_("LikePages"), array('page' => $pagename)) ."\">"
!         ._("LikePages") ."</a>";
  
!     //$html .= "</form>";
      return $html;
  }
***************
*** 212,218 ****
      if ($userauth) {
          $html .= sprintf(_("You are signed in as %s"), LinkWikiWord($userid));
!         $html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL($pagename, array('action' => 'logout')) ."\">" ._("SignOut") ."</a>";
      } else {
!         $html .= "<a class=\"wikiaction\" href=\"" . WikiURL($pagename, array('action' => 'login')) ."\">" ._("SignIn") ."</a>";
      }
      return $html;
--- 238,248 ----
      if ($userauth) {
          $html .= sprintf(_("You are signed in as %s"), LinkWikiWord($userid));
!         $html .= separator() ."<a class=\"wikiaction\" href=\""
!             . WikiURL($pagename, array('action' => 'logout')) ."\">"
!             ._("SignOut") ."</a>";
      } else {
!         $html .= "<a class=\"wikiaction\" href=\""
!             . WikiURL($pagename, array('action' => 'login')) ."\">"
!             ._("SignIn") ."</a>";
      }
      return $html;
***************
*** 239,245 ****
  
      // FIXME: What to use instead of WikiURL()?
!     //$html .= separator() ."<a class=\"wikiaction\" href=\"" .WikiURL('_("RandomPage")', array('page' => $pagename)) ."\">" ._("RandomPage") ."</a>";
      //$html .= separator() ."<plugin-link WantedPages >";
!     //$html .= separator() ."<a class=\"wikiaction\" href=\"" . WikiURL(_("WantedPages")) ."\">" ._("WantedPages") ."</a>";
      //$html .= separator() .LinkExistingWikiWord(_("SandBox"));
  
--- 269,278 ----
  
      // FIXME: What to use instead of WikiURL()?
!     //$html .= separator() ."<a class=\"wikiaction\" href=\""
!     //    .WikiURL('_("RandomPage")', array('page' => $pagename)) ."\">"
!     //    ._("RandomPage") ."</a>";
      //$html .= separator() ."<plugin-link WantedPages >";
!     //$html .= separator() ."<a class=\"wikiaction\" href=\""
!     //    .WikiURL(_("WantedPages")) ."\">" ._("WantedPages") ."</a>";
      //$html .= separator() .LinkExistingWikiWord(_("SandBox"));
  
***************
*** 292,298 ****
          $html .= sprintf(_("You are signed in as %s."), LinkWikiWord($userid));
      } else {
!         $html .= sprintf(_("Author will be logged as %s."),"<em>" .$userid ."</em>");
!         $html .= separator() ."<a class=\"wikiaction\" href=\"" .WikiURL($pagename, array('action' => 'login')) ."\">" ._("SignIn") ."</a>";
!         $html .= "<small>*</small><br><small>*backup and reload after signing in</small>";
      }
      return $html;
--- 325,335 ----
          $html .= sprintf(_("You are signed in as %s."), LinkWikiWord($userid));
      } else {
!         $html .= sprintf(_("Author will be logged as %s."),
!                          Element('em', $userid));
!         $html .= separator() ."<a class=\"wikiaction\" href=\""
!             .WikiURL($pagename, array('action' => 'login')) ."\">"
!             ._("SignIn") ."</a>";
!         $html .= "<small>*</small><br><small>"
!             ."*backup and reload after signing in</small>";
      }
      return $html;

[phpwiki-checkins] CVS: phpwiki/lib ziplib.php,1.15,1.16

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

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

Modified Files:
	ziplib.php 
Log Message:
Reindenting and rewrapping in emacs.

Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ziplib.php	2002/01/09 04:01:09	1.15
--- ziplib.php	2002/01/09 16:14:49	1.16
***************
*** 5,72 ****
   * GZIP stuff.
   *
!  * Note that we use gzopen()/gzwrite() instead of gzcompress() even
!  * if gzcompress() is available.  Gzcompress() puts out data with different
!  * headers --- in particular it includes an "adler-32" checksum rather than
!  * a "CRC32" checksum.  Since we need the CRC-32 checksum, and since not
!  * all PHP's have gzcompress(), we'll just stick with gzopen(). 
   */
  function gzip_cleanup () {
!   global $gzip_tmpfile;
[...1286 lines suppressed...]
      $data .= GenerateFootnotesFromRefs($params);
! 
      $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data));
      $page['pagedata'] = $pagedata;
      $page['versiondata'] = $versiondata;
! 
      return array($page);
  }
--- 720,730 ----
      else if ($encoding && $encoding != 'binary')
          ExitWiki( sprintf(_("Unknown %s"), 'encoding type: $encoding') );
!     
      $data .= GenerateFootnotesFromRefs($params);
!     
      $page['content'] = preg_replace('/[ \t\r]*\n/', "\n", chop($data));
      $page['pagedata'] = $pagedata;
      $page['versiondata'] = $versiondata;
!     
      return array($page);
  }

[phpwiki-checkins] CVS: phpwiki index.php,1.55,1.56

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

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

Modified Files:
	index.php 
Log Message:
Added names to copyright notice from docs/CREDITS, please add any missing names. Removed question in comment for SCRIPT_NAME (this constant is in fact still used on the alpha server). Some text rewrapping in emacs.

Index: index.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** index.php	2002/01/09 04:01:08	1.55
--- index.php	2002/01/09 15:52:14	1.56
***************
*** 3,8 ****
  /*
  Copyright 2000??, 2001, 2002 $ThePhpWikiProgrammingTeam = array(
! "Steve Wainstead",
! );
  
  This file is part of PhpWiki.
--- 3,12 ----
  /*
  Copyright 2000??, 2001, 2002 $ThePhpWikiProgrammingTeam = array(
! "Steve Wainstead", "Arno Hollosi", "Jeff Dairiki",
! "Aredridel Niothke", "Jan Nieuwenhuizen", "Sandino Araico Sánchez",
! "Jon Åslund", "Marco Milanesi", "Carsten Klapp", "Joel Uckelman",
! "Pablo Roca Rozas", "Scott R. Anderson", "Neil Brown", "Jan Hidders",
! "Antti Kaihola", "Jeremie Kass", "John Jorgensen", "Tim Voght",
! "Grant Morgan", "Clifford A. Adams");
  
  This file is part of PhpWiki.
***************
*** 26,37 ****
  /////////////////////////////////////////////////////////////////////
  /*
!   This is the starting file for PhpWiki. All this file does
!    is set configuration options, and at the end of the file 
!    it includes() the file lib/main.php, where the real action begins.
! 
!    This file is divided into six parts: Parts Zero, One, Two, Three,
!    Four and Five. Each one has different configuration settings you 
!    can change; in all cases the default should work on your system, 
!    however, we recommend you tailor things to your particular setting.
  */
  
--- 30,41 ----
  /////////////////////////////////////////////////////////////////////
  /*
!   This is the starting file for PhpWiki. All this file does is set
!   configuration options, and at the end of the file it includes() the
!   file lib/main.php, where the real action begins.
! 
!   This file is divided into six parts: Parts Zero, One, Two, Three,
!   Four and Five. Each one has different configuration settings you can
!   change; in all cases the default should work on your system,
!   however, we recommend you tailor things to your particular setting.
  */
  
***************
*** 41,49 ****
  
  // NOTE: phpwiki uses the PEAR library of php code for SQL database
! // access.  Your PHP is probably already configured to set include_path
! // so that PHP can find the pear code.  If not (or if you change
! // include_path here) make sure you include the path to the PEAR
! // code in include_path.  (To find the PEAR code on your system, search
! // for a file named 'PEAR.php'.   Some common locations are:
  //
  //   Unixish systems:
--- 45,53 ----
  
  // NOTE: phpwiki uses the PEAR library of php code for SQL database
! // access. Your PHP is probably already configured to set
! // include_path so that PHP can find the pear code. If not (or if you
! // change include_path here) make sure you include the path to the
! // PEAR code in include_path. (To find the PEAR code on your system,
! // search for a file named 'PEAR.php'. Some common locations are:
  //
  //   Unixish systems:
***************
*** 52,59 ****
  //   Mac OS X:
  //     /System/Library/PHP
  //
! // The above examples are already included by PhpWiki.
! // You shouldn't have to change this unless you see a WikiFatalError:
! //   lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
  //ini_set('include_path', '.:/where/you/installed/phpwiki');
--- 56,64 ----
  //   Mac OS X:
  //     /System/Library/PHP
+ //
+ // The above examples are already included by PhpWiki. You shouldn't
+ // have to change this unless you see a WikiFatalError:
  //
! //     lib/FileFinder.php:82: Fatal[256]: DB.php: file not found
  //
  //ini_set('include_path', '.:/where/you/installed/phpwiki');
***************
*** 78,83 ****
  //define('WIKI_NAME', 'PhpWiki');
  
! // If set, we will perform reverse dns lookups to try to convert the users
! // IP number to a host name, even if the http server didn't do it for us.
  define('ENABLE_REVERSE_DNS', true);
  
--- 83,89 ----
  //define('WIKI_NAME', 'PhpWiki');
  
! // If set, we will perform reverse dns lookups to try to convert the
! // users IP number to a host name, even if the http server didn't do
! // it for us.
  define('ENABLE_REVERSE_DNS', true);
  
***************
*** 88,93 ****
  define('ADMIN_PASSWD', "");
  
! // If true, only the admin user can make zip dumps, else
! // zip dumps require no authentication.
  define('ZIPDUMP_AUTH', false);
  
--- 94,99 ----
  define('ADMIN_PASSWD', "");
  
! // If true, only the admin user can make zip dumps, else zip dumps
! // require no authentication.
  define('ZIPDUMP_AUTH', false);
  
***************
*** 99,104 ****
  define('MAX_UPLOAD_SIZE', 16 * 1024 * 1024);
  
! // If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the default
! // state for the "minor edit" checkbox on the edit page form will be off.
  define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
  
--- 105,111 ----
  define('MAX_UPLOAD_SIZE', 16 * 1024 * 1024);
  
! // If the last edit is older than MINOR_EDIT_TIMEOUT seconds, the
! // default state for the "minor edit" checkbox on the edit page form
! // will be off.
  define("MINOR_EDIT_TIMEOUT", 7 * 24 * 3600);
  
***************
*** 107,125 ****
  
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
! // for you.  If you want one, define this to the name of the log file.
  //define('ACCESS_LOG', '/tmp/wiki_access_log');
  
  
! // If ALLOW_BOGO_LOGIN is true, users are allowed to login
! // (with any/no password) using any userid which: 1) is not
! // the ADMIN_USER, 2) is a valid WikiWord (matches $WikiNameRegexp.)
  define('ALLOW_BOGO_LOGIN', true);
  
! // The login code now uses PHP's session support.  Usually, the default
  // configuration of PHP is to store the session state information in
! // /tmp.  That probably will work fine, but fails e.g. on clustered
! // servers where each server has their own distinct /tmp (this
! // is the case on SourceForge's project web server.)  You can specify
! // an alternate directory in which to store state information like so
  // (whatever user your httpd runs as must have read/write permission
  // in this directory):
--- 114,132 ----
  
  // PhpWiki can generate an access_log (in "NCSA combined log" format)
! // for you. If you want one, define this to the name of the log file.
  //define('ACCESS_LOG', '/tmp/wiki_access_log');
  
  
! // If ALLOW_BOGO_LOGIN is true, users are allowed to login (with
! // any/no password) using any userid which: 1) is not the ADMIN_USER,
! // 2) is a valid WikiWord (matches $WikiNameRegexp.)
  define('ALLOW_BOGO_LOGIN', true);
  
! // The login code now uses PHP's session support. Usually, the default
  // configuration of PHP is to store the session state information in
! // /tmp. That probably will work fine, but fails e.g. on clustered
! // servers where each server has their own distinct /tmp (this is the
! // case on SourceForge's project web server.) You can specify an
! // alternate directory in which to store state information like so
  // (whatever user your httpd runs as must have read/write permission
  // in this directory):
***************
*** 143,147 ****
     // Select the database type:
     //'dbtype' => 'SQL',
!    'dbtype' => 'dba',
     
     // For SQL based backends, specify the database as a DSN
--- 150,154 ----
     // Select the database type:
     //'dbtype' => 'SQL',
!    'dbtype'   => 'dba',
     
     // For SQL based backends, specify the database as a DSN
***************
*** 154,159 ****
     //   mysql://user:password@host/databasename
     //
!    // FIXME: My version Pear::DB seems to be broken enough that there is
!    //    no way to connect to a mysql server over a socket right now.
     //'dsn' => 'mysql://guest@:/var/lib/mysql/mysql.sock/test',
     //'dsn' => 'mysql://guest@localhost/test',
--- 161,166 ----
     //   mysql://user:password@host/databasename
     //
!    // FIXME: My version Pear::DB seems to be broken enough that there
!    //        is no way to connect to a mysql server over a socket right now.
     //'dsn' => 'mysql://guest@:/var/lib/mysql/mysql.sock/test',
     //'dsn' => 'mysql://guest@localhost/test',
***************
*** 164,179 ****
     // prefix for filenames or table names
     /* 
!     * currently you MUST EDIT THE SQL file too (in the schemas/ directory
!     * because we aren't doing on the fly sql generation during the
!     * installation.
     */
     //'prefix' => 'phpwiki_',
     
     // Used by 'dba'
!    'directory' => "/tmp",
!    'dba_handler' => 'gdbm',   // Either of 'gdbm' or 'db2' work great for me.
     //'dba_handler' => 'db2',
     //'dba_handler' => 'db3',    // doesn't work at all for me....
!    'timeout' => 20,
     //'timeout' => 5
  );
--- 171,186 ----
     // prefix for filenames or table names
     /* 
!     * currently you MUST EDIT THE SQL file too (in the schemas/
!     * directory because we aren't doing on the fly sql generation
!     * during the installation.
     */
     //'prefix' => 'phpwiki_',
     
     // Used by 'dba'
!    'directory'     => "/tmp",
!    'dba_handler'   => 'gdbm',   // Either of 'gdbm' or 'db2' work great for me.
     //'dba_handler' => 'db2',
     //'dba_handler' => 'db3',    // doesn't work at all for me....
!    'timeout'   => 20,
     //'timeout' => 5
  );
***************
*** 181,213 ****
  /////////////////////////////////////////////////////////////////////
  //
! // The next section controls how many old revisions of each page
! // are kept in the database.
  //
! // There are two basic classes of revisions: major and minor.
! // Which class a revision belongs in is determined by whether the
! // author checked the "this is a minor revision" checkbox when they
! // saved the page.
  // 
! // There is, additionally, a third class of revisions: author revisions.
! // The most recent non-mergable revision from each distinct author is
! // and author revision.
  //
  // The expiry parameters for each of those three classes of revisions
! // can be adjusted seperately.   For each class there are five
! // parameters (usually, only two or three of the five are actually set)
! // which control how long those revisions are kept in the database.
! //
! //   max_keep: If set, this specifies an absolute maximum for the number
! //             of archived revisions of that class.  This is meant to be
! //             used as a safety cap when a non-zero min_age is specified.
! //             It should be set relatively high, and it's purpose is to
! //             prevent malicious or accidental database overflow due
! //             to someone causing an unreasonable number of edits in a short
! //             period of time.
! //
! //   min_age:  Revisions younger than this (based upon the supplanted date)
! //             will be kept unless max_keep is exceeded.  The age should
! //             be specified in days.  It should be a non-negative,
! //             real number,
  //
  //   min_keep: At least this many revisions will be kept.
--- 188,221 ----
  /////////////////////////////////////////////////////////////////////
  //
! // The next section controls how many old revisions of each page are
! // kept in the database.
  //
! // There are two basic classes of revisions: major and minor. Which
! // class a revision belongs in is determined by whether the author
! // checked the "this is a minor revision" checkbox when they saved the
! // page.
  // 
! // There is, additionally, a third class of revisions: author
! // revisions. The most recent non-mergable revision from each distinct
! // author is and author revision.
  //
  // The expiry parameters for each of those three classes of revisions
! // can be adjusted seperately. For each class there are five
! // parameters (usually, only two or three of the five are actually
! // set) which control how long those revisions are kept in the
! // database.
! //
! //   max_keep: If set, this specifies an absolute maximum for the
! //             number of archived revisions of that class. This is
! //             meant to be used as a safety cap when a non-zero
! //             min_age is specified. It should be set relatively high,
! //             and it's purpose is to prevent malicious or accidental
! //             database overflow due to someone causing an
! //             unreasonable number of edits in a short period of time.
! //
! //   min_age:  Revisions younger than this (based upon the supplanted
! //             date) will be kept unless max_keep is exceeded. The age
! //             should be specified in days. It should be a
! //             non-negative, real number,
  //
  //   min_keep: At least this many revisions will be kept.
***************
*** 217,229 ****
  //   max_age:  No revision older than this age will be kept.
  //
! // Supplanted date:  Revisions are timestamped at the instant that they cease
! // being the current revision.  Revision age is computed using this timestamp,
! // not the edit time of the page.
! //
! // Merging: When a minor revision is deleted, if the preceding revision is by
! // the same author, the minor revision is merged with the preceding revision
! // before it is deleted.  Essentially: this replaces the content (and supplanted
! // timestamp) of the previous revision with the content after the merged minor
! // edit, the rest of the page metadata for the preceding version (summary, mtime, ...)
  // is not changed.
  //
--- 225,238 ----
  //   max_age:  No revision older than this age will be kept.
  //
! // Supplanted date: Revisions are timestamped at the instant that they
! // cease being the current revision. Revision age is computed using
! // this timestamp, not the edit time of the page.
! //
! // Merging: When a minor revision is deleted, if the preceding
! // revision is by the same author, the minor revision is merged with
! // the preceding revision before it is deleted. Essentially: this
! // replaces the content (and supplanted timestamp) of the previous
! // revision with the content after the merged minor edit, the rest of
! // the page metadata for the preceding version (summary, mtime, ...)
  // is not changed.
  //
***************
*** 235,242 ****
                                 'keep'    => 4);
  // Keep the latest contributions of the last 8 authors up to a year.
! // Additionally, (in the case of a particularly active page) try to keep the
! // latest contributions of all authors in the last week (even if there are
! // more than eight of them,) but in no case keep more than twenty unique
! // author revisions.
  $ExpireParams['author'] = array('max_age'  => 365,
                                  'keep'     => 8,
--- 244,251 ----
                                 'keep'    => 4);
  // Keep the latest contributions of the last 8 authors up to a year.
! // Additionally, (in the case of a particularly active page) try to
! // keep the latest contributions of all authors in the last week (even
! // if there are more than eight of them,) but in no case keep more
! // than twenty unique author revisions.
  $ExpireParams['author'] = array('max_age'  => 365,
                                  'keep'     => 8,
***************
*** 252,265 ****
  
  // Select a valid charset name to be inserted into the xml/html pages.
! // For more info see: <http://www.iana.org/assignments/character-sets>.
  // Note that PhpWiki has been extensively tested only with the latin1
! // (iso-8859-1) character set.
! // If you change the default from iso-8859-1 PhpWiki may not work
! // properly and it will require code modifications. However, character
! // sets similar to iso-8859-1 may work with little or no modification
! // depending on your setup. The database must also support the same
! // charset, and of course the same is true for the web browser.
! // (Some work is in progress hopefully to allow more flexibility in
! // this area in the future).
  define("CHARSET", "iso-8859-1");
  
--- 261,273 ----
  
  // Select a valid charset name to be inserted into the xml/html pages.
! // For more info see:<http://www.iana.org/assignments/character-sets>.
  // Note that PhpWiki has been extensively tested only with the latin1
! // (iso-8859-1) character set. If you change the default from
! // iso-8859-1 PhpWiki may not work properly and it will require code
! // modifications. However, character sets similar to iso-8859-1 may
! // work with little or no modification depending on your setup. The
! // database must also support the same charset, and of course the same
! // is true for the web browser. (Some work is in progress hopefully to
! // allow more flexibility in this area in the future).
  define("CHARSET", "iso-8859-1");
  
***************
*** 273,284 ****
  // Italian "it" (Italiano   - PaginaPrincipale)
  //
! // If you set $LANG to the empty string, your systems default
! // language (as determined by the applicable environment variables)
! // will be used.
  //
  // Note that on some systems, apprently using these short forms for
! // the locale won't work.  On my home system 'LANG=de' won't result
! // in german pages.  Somehow the system must recognize the locale
! // as a valid locale before gettext() will work, i.e., use 'de_DE',
  // 'nl_NL'.
  $LANG='C';
--- 281,292 ----
  // Italian "it" (Italiano   - PaginaPrincipale)
  //
! // If you set $LANG to the empty string, your systems default language
! // (as determined by the applicable environment variables) will be
! // used.
  //
  // Note that on some systems, apprently using these short forms for
! // the locale won't work. On my home system 'LANG=de' won't result in
! // german pages. Somehow the system must recognize the locale as a
! // valid locale before gettext() will work, i.e., use 'de_DE',
  // 'nl_NL'.
  $LANG='C';
***************
*** 287,291 ****
  // Setting the LANG environment variable (accomplished above) may or
  // may not be sufficient to cause PhpWiki to produce dates in your
! // native language.  (It depends on the configuration of the operating
  // system on your http server.)  The problem is that, e.g. 'de' is
  // often not a valid locale.
--- 295,299 ----
  // Setting the LANG environment variable (accomplished above) may or
  // may not be sufficient to cause PhpWiki to produce dates in your
! // native language. (It depends on the configuration of the operating
  // system on your http server.)  The problem is that, e.g. 'de' is
  // often not a valid locale.
***************
*** 297,322 ****
  // ISO-8859-1 or UTF-8.
  //
! // You can tailor the locale used for time and date formatting by setting
! // the LC_TIME environment variable.  You'll have to experiment to find
! // the correct setting:
  //putenv('LC_TIME=de_DE');
  
! // If you specify a relative URL for the CSS and images,
! // the are interpreted relative to DATA_PATH (see below).
! // (The default value of DATA_PATH is the directory in which
! // index.php (this file) resides.)
  
  // CSS location
  //
  // Note that if you use the stock phpwiki style sheet, 'phpwiki.css',
! // you should make sure that it's companion 'phpwiki-heavy.css'
! // is installed in the same directory that the base style file is.
  // FIXME: These default CSS key names could use localization, but
! // gettext() is not available at this point yet 
! $CSS_URLS = array(
!     'PhpWiki' => "phpwiki.css",
!     'Printer' => "phpwiki-printer.css",
!     'Modern'  => "phpwiki-modern.css"
! );
  
  $CSS_DEFAULT = "PhpWiki";
--- 305,328 ----
  // ISO-8859-1 or UTF-8.
  //
! // You can tailor the locale used for time and date formatting by
! // setting the LC_TIME environment variable. You'll have to experiment
! // to find the correct setting:
  //putenv('LC_TIME=de_DE');
  
! // If you specify a relative URL for the CSS and images, the are
! // interpreted relative to DATA_PATH (see below). (The default value
! // of DATA_PATH is the directory in which index.php (this file)
! // resides.)
  
  // CSS location
  //
  // Note that if you use the stock phpwiki style sheet, 'phpwiki.css',
! // you should make sure that it's companion 'phpwiki-heavy.css' is
! // installed in the same directory that the base style file is.
  // FIXME: These default CSS key names could use localization, but
! // gettext() is not available at this point yet
! $CSS_URLS = array('PhpWiki' => "phpwiki.css",
!                   'Printer' => "phpwiki-printer.css",
!                   'Modern'  => "phpwiki-modern.css");
  
  $CSS_DEFAULT = "PhpWiki";
***************
*** 335,357 ****
  
  // 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
! // 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(
!                     'http'	=> 'images/http.png',
!                     'https'	=> 'images/https.png',
!                     'ftp'	=> 'images/ftp.png',
!                     'mailto'	=> 'images/mailto.png',
!                     'interwiki' => 'images/interwiki.png',
!                     '*'		=> 'images/zapg.png'
!                     );
  */                    
  
  // Date & time formats used to display modification times, etc.
! // Formats are given as format strings to PHP strftime() function
! // See http://www.php.net/manual/en/function.strftime.php for details.
  $datetimeformat = "%B %e, %Y";	// may contain time of day
  $dateformat = "%B %e, %Y";	// must not contain time
--- 341,363 ----
  
  // 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! The
! // '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(
!                         'http'	    => 'images/http.png',
!                         'https'     => 'images/https.png',
!                         'ftp'	    => 'images/ftp.png',
!                         'mailto'    => 'images/mailto.png',
!                         'interwiki' => 'images/interwiki.png',
!                         '*'	    => 'images/zapg.png'
!                         );
  */                    
  
  // Date & time formats used to display modification times, etc.
! // Formats are given as format strings to PHP strftime() function See
! // http://www.php.net/manual/en/function.strftime.php for details.
  $datetimeformat = "%B %e, %Y";	// may contain time of day
  $dateformat = "%B %e, %Y";	// must not contain time
***************
*** 373,379 ****
  // However, if a LANG is set, they we be searched for in a locale
  // specific location first.
! $templates = array("BROWSE" =>    "templates/browse.html",
! 		   "EDITPAGE" =>  "templates/editpage.html",
! 		   "MESSAGE" =>   "templates/message.html");
  
  // The themeinfo file can be used to override default settings above this line
--- 379,385 ----
  // However, if a LANG is set, they we be searched for in a locale
  // specific location first.
! $templates = array("BROWSE"   => "templates/browse.html",
!                    "EDITPAGE" => "templates/editpage.html",
!                    "MESSAGE"  => "templates/message.html");
  
  // The themeinfo file can be used to override default settings above this line
***************
*** 389,403 ****
          include "themes/$theme/themeinfo.php";
      } else {
!       //FIXME: gettext doesn't work in index.php or themeinfo.php
          trigger_error(sprintf(("Unable to open file '%s' for reading"),
!                                "themes/$theme/themeinfo.php"), E_USER_NOTICE);
      }
  }
  
! /* WIKI_PGSRC -- specifies the source for the initial page contents
!  * of the Wiki.  The setting of WIKI_PGSRC only has effect when
!  * the wiki is accessed for the first time (or after clearing the
!  * database.) WIKI_PGSRC can either name a directory or a zip file.
!  * In either case WIKI_PGSRC is scanned for files --- one file per page.
   */
  define('WIKI_PGSRC', "pgsrc"); // Default (old) behavior.
--- 395,409 ----
          include "themes/$theme/themeinfo.php";
      } else {
!         // FIXME: gettext doesn't work in index.php or themeinfo.php
          trigger_error(sprintf(("Unable to open file '%s' for reading"),
!                               "themes/$theme/themeinfo.php"), E_USER_NOTICE);
      }
  }
  
! /* WIKI_PGSRC -- specifies the source for the initial page contents of
! * the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is
! * accessed for the first time (or after clearing the database.)
! * WIKI_PGSRC can either name a directory or a zip file. In either case
! * WIKI_PGSRC is scanned for files -- one file per page.
   */
  define('WIKI_PGSRC', "pgsrc"); // Default (old) behavior.
***************
*** 405,414 ****
  //define('WIKI_PGSRC', '../../../Logs/Hamwiki/hamwiki-20010830.zip'); // New style.
  
! // DEFAULT_WIKI_PGSRC is only used when the language is *not*
! // the default (English) and when reading from a directory:
! // in that case some English pages are inserted into the wiki as well
! // DEFAULT_WIKI_PGSRC defines where the English pages reside 
! // FIXME: is this really needed?  Can't we just copy
! //  these pages into the localized pgsrc?
  define('DEFAULT_WIKI_PGSRC', "pgsrc");
  // These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.	
--- 411,420 ----
  //define('WIKI_PGSRC', '../../../Logs/Hamwiki/hamwiki-20010830.zip'); // New style.
  
! // DEFAULT_WIKI_PGSRC is only used when the language is *not* the
! // default (English) and when reading from a directory: in that case
! // some English pages are inserted into the wiki as well
! // DEFAULT_WIKI_PGSRC defines where the English pages reside FIXME: is
! // this really needed?  Can't we just copy these pages into the
! // localized pgsrc?
  define('DEFAULT_WIKI_PGSRC', "pgsrc");
  // These are the pages which will get loaded from DEFAULT_WIKI_PGSRC.	
***************
*** 453,470 ****
   *
   * The following section contains settings which you can use to tailor
!  * the URLs which PhpWiki generates. 
   *
!  * Any of these parameters which are left undefined will be
!  * deduced automatically.  You need only set them explicitly
!  * if the auto-detected values prove to be incorrect.
   *
!  * In most cases the auto-detected values should work fine,
!  * so hopefully you don't need to mess with this section.
   *
   ******************************************************************/
  
  /*
!  * Canonical name and httpd port of the server on which this
!  * PhpWiki resides.
   */
  //define('SERVER_NAME', 'some.host.com');
--- 459,476 ----
   *
   * The following section contains settings which you can use to tailor
!  * the URLs which PhpWiki generates.
   *
!  * Any of these parameters which are left undefined will be deduced
!  * automatically. You need only set them explicitly if the
!  * auto-detected values prove to be incorrect.
   *
!  * In most cases the auto-detected values should work fine, so
!  * hopefully you don't need to mess with this section.
   *
   ******************************************************************/
  
  /*
!  * Canonical name and httpd port of the server on which this PhpWiki
!  * resides.
   */
  //define('SERVER_NAME', 'some.host.com');
***************
*** 475,487 ****
   * script.
   */
- // Is this still required? Wiki seems to work fine without it,
- // both with the server configured using alias directives
- // or using SetHandler + virtual & data paths.
  //define('SCRIPT_NAME', '/some/where/index.php');
  
  /*
!  * Relative URL (from the server root) of the directory
!  * in which relative URL's for images and other support files
!  * are interpreted.
   */
  //define('DATA_PATH', '/some/where');
--- 481,490 ----
   * script.
   */
  //define('SCRIPT_NAME', '/some/where/index.php');
  
  /*
!  * Relative URL (from the server root) of the directory from which
!  * other relative URL's for images and other support files are
!  * interpreted.
   */
  //define('DATA_PATH', '/some/where');
***************
*** 496,503 ****
  
  /*
!  * VIRTUAL_PATH is the canonical URL path under which your
!  * your wiki appears.  Normally this is the same as
!  * dirname(SCRIPT_NAME), however using, e.g. apaches mod_actions
!  * (or mod_rewrite), you can make it something different.
   *
   * If you do this, you should set VIRTUAL_PATH here.
--- 499,506 ----
  
  /*
!  * VIRTUAL_PATH is the canonical URL path under which your your wiki
!  * appears. Normally this is the same as dirname(SCRIPT_NAME), however
!  * using, e.g. apaches mod_actions (or mod_rewrite), you can make it
!  * something different.
   *
   * If you do this, you should set VIRTUAL_PATH here.
***************
*** 507,511 ****
   *
   * One way to do this is to create a directory named 'wiki' in your
!  * server root.  The directory contains only one file: an .htaccess
   * file which reads something like:
   *
--- 510,514 ----
   *
   * One way to do this is to create a directory named 'wiki' in your
!  * server root. The directory contains only one file: an .htaccess
   * file which reads something like:
   *

[phpwiki-checkins] CVS: phpwiki/pgsrc LinkIcons,NONE,1.1

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

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

Added Files:
	LinkIcons 
Log Message:
new page

***** Error reading new file: [Errno 2] No such file or directory: 'LinkIcons'

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

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

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

Added Files:
	SchaueQuelltext 
Log Message:
New page for the ViewMarkup plugin.

***** Error reading new file: [Errno 2] No such file or directory: 'SchaueQuelltext'

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc GleicheSeiten,1.4,1.5 MeistBesucht,1.7,1.8 SeiteProtokoll,1.2,1.3 StartSeite,1.7,1.8 TextFormatierungsRegeln,1.10,1.11 Titelsuche,1.4,1.5 Volltextsuche,1.4,1.5

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

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

Modified Files:
	GleicheSeiten MeistBesucht SeiteProtokoll StartSeite 
	TextFormatierungsRegeln Titelsuche Volltextsuche 
Log Message:
Added PAGE_LOCKED flag.

Index: GleicheSeiten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GleicheSeiten,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** GleicheSeiten	2002/01/09 05:21:48	1.4
--- GleicheSeiten	2002/01/09 06:40:51	1.5
***************
*** 3,13 ****
  Content-Type: application/x-phpwiki;
    pagename=GleicheSeiten;
!   flags="";
    lastmodified=1008736718;
  Content-Transfer-Encoding: binary
  
! GleicheSeiten haben ein identiches Wort im Namen.
! 
! Besuche Wiki:LikePages und MeatBall:LikePages.
  ----
  <?plugin LikePages?>
--- 3,11 ----
  Content-Type: application/x-phpwiki;
    pagename=GleicheSeiten;
!   flags=PAGE_LOCKED;
    lastmodified=1008736718;
  Content-Transfer-Encoding: binary
  
! GleicheSeiten haben ein identiches Wort im Namen. Besuche Wiki:LikePages und MeatBall:LikePages.
  ----
  <?plugin LikePages?>

Index: MeistBesucht
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/MeistBesucht,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** MeistBesucht	2002/01/09 05:21:48	1.7
--- MeistBesucht	2002/01/09 06:40:51	1.8
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=MeistBesucht;
!   flags="";
    lastmodified=1009939563;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=MeistBesucht;
!   flags=PAGE_LOCKED;
    lastmodified=1009939563;
  Content-Transfer-Encoding: binary

Index: SeiteProtokoll
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SeiteProtokoll,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** SeiteProtokoll	2002/01/09 05:21:48	1.2
--- SeiteProtokoll	2002/01/09 06:40:51	1.3
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=SeiteProtokoll;
!   flags="";
    lastmodified=1008658582;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=SeiteProtokoll;
!   flags=PAGE_LOCKED;
    lastmodified=1008658582;
  Content-Transfer-Encoding: binary

Index: StartSeite
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/StartSeite,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** StartSeite	2002/01/09 05:21:48	1.7
--- StartSeite	2002/01/09 06:40:51	1.8
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=StartSeite;
!   flags="";
    lastmodified=1010445995;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=StartSeite;
!   flags=PAGE_LOCKED;
    lastmodified=1010445995;
  Content-Transfer-Encoding: binary

Index: TextFormatierungsRegeln
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/TextFormatierungsRegeln,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** TextFormatierungsRegeln	2002/01/09 05:21:48	1.10
--- TextFormatierungsRegeln	2002/01/09 06:40:51	1.11
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=TextFormatierungsRegeln;
!   flags="";
    lastmodified=1008736719;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=TextFormatierungsRegeln;
!   flags=PAGE_LOCKED;
    lastmodified=1008736719;
  Content-Transfer-Encoding: binary

Index: Titelsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Titelsuche,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Titelsuche	2002/01/09 05:21:48	1.4
--- Titelsuche	2002/01/09 06:40:51	1.5
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=Titelsuche;
!   flags="";
    lastmodified=1009931535;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=Titelsuche;
!   flags=PAGE_LOCKED;
    lastmodified=1009931535;
  Content-Transfer-Encoding: binary

Index: Volltextsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Volltextsuche,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Volltextsuche	2002/01/09 05:21:48	1.4
--- Volltextsuche	2002/01/09 06:40:51	1.5
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=Volltextsuche;
!   flags="";
    lastmodified=1008736719;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=Volltextsuche;
!   flags=PAGE_LOCKED;
    lastmodified=1008736719;
  Content-Transfer-Encoding: binary

[phpwiki-checkins] CVS: phpwiki/pgsrc ViewMarkup,1.2,1.3

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

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

Modified Files:
	ViewMarkup 
Log Message:
Added PAGE_LOCKED flag.

Index: ViewMarkup
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ViewMarkup,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ViewMarkup	2002/01/09 05:35:22	1.2
--- ViewMarkup	2002/01/09 06:36:56	1.3
***************
*** 3,7 ****
  Content-Type: application/x-phpwiki;
    pagename=ViewMarkup;
!   flags="";
    lastmodified=1009510399;
  Content-Transfer-Encoding: binary
--- 3,7 ----
  Content-Type: application/x-phpwiki;
    pagename=ViewMarkup;
!   flags=PAGE_LOCKED;
    lastmodified=1009510399;
  Content-Transfer-Encoding: binary

[phpwiki-checkins] CVS: phpwiki/pgsrc FullTextSearch,1.1,1.2 MagicPhpWikiURLs,1.5,1.6 PageHistory,1.1,1.2 TitleSearch,1.2,1.3

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

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

Modified Files:
	FullTextSearch MagicPhpWikiURLs PageHistory TitleSearch 
Log Message:
Added $Id$ tag.

Index: FullTextSearch
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FullTextSearch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** FullTextSearch	2001/09/18 19:16:23	1.1
--- FullTextSearch	2002/01/09 06:36:36	1.2
***************
*** 1,10 ****
! From hos...@da...  Sat Feb 10 21:28:19 2001
! Subject: FullTextSearch
! From: hos...@da... (PhpWiki)
! Date: Wed, 12 Sep 2001 13:49:06 -0700
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=FullTextSearch;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
--- 1,8 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=FullTextSearch;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096690;
  Content-Transfer-Encoding: binary
  

Index: MagicPhpWikiURLs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MagicPhpWikiURLs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** MagicPhpWikiURLs	2001/11/09 17:58:09	1.5
--- MagicPhpWikiURLs	2002/01/09 06:36:36	1.6
***************
*** 1,6 ****
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=MagicPhpWikiURLs;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
--- 1,8 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=MagicPhpWikiURLs;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096690;
  Content-Transfer-Encoding: binary
  
***************
*** 42,46 ****
    __[[__ ''text'' __|__ ''phpwiki-url'' __]__
  
! The "''text'' __|__" is optional but usually recommended. 
  If given it will provide the label for the link.
  
--- 44,48 ----
    __[[__ ''text'' __|__ ''phpwiki-url'' __]__
  
! The "''text'' __|__" is optional but usually recommended.
  If given it will provide the label for the link.
  
***************
*** 49,53 ****
  !Some examples
  
!   [[ Edit the !SandBox | phpwiki:!SandBox?action=edit ] 
  will generate a link which will take you directly to editing the SandBox, like so:
  [ Edit the SandBox | phpwiki:SandBox?action=edit ].
--- 51,55 ----
  !Some examples
  
!   [[ Edit the !SandBox | phpwiki:!SandBox?action=edit ]
  will generate a link which will take you directly to editing the SandBox, like so:
  [ Edit the SandBox | phpwiki:SandBox?action=edit ].
***************
*** 75,81 ****
  Examples:
  
!   [[ Full Search | phpwiki:FullTextSearch?s=() ] 
  gives
! [ Full Search | phpwiki:FullTextSearch?s=() ] 
  
  While
--- 77,83 ----
  Examples:
  
!   [[ Full Search | phpwiki:FullTextSearch?s=() ]
  gives
! [ Full Search | phpwiki:FullTextSearch?s=() ]
  
  While

Index: PageHistory
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PageHistory,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PageHistory	2001/12/14 20:28:02	1.1
--- PageHistory	2002/01/09 06:36:36	1.2
***************
*** 1,10 ****
! From hos...@da...  Fri Dec 14 11:38:20 PST 2001
! Subject: PageHistory
! From: hos...@da... (PhpWiki)
! Date: Fri, 31 Aug 2001 22:07:14 -0700
! Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
    pagename=PageHistory;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
--- 1,8 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=PageHistory;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096690;
  Content-Transfer-Encoding: binary
  

Index: TitleSearch
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TitleSearch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** TitleSearch	2001/10/29 19:34:27	1.2
--- TitleSearch	2002/01/09 06:36:36	1.3
***************
*** 1,10 ****
! From hos...@da...  Sat Feb 10 21:28:19 2001
! Subject: TitleSearch
! From: hos...@da... (PhpWiki)
! Date: Wed, 12 Sep 2001 13:47:25 -0700
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=TitleSearch;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
--- 1,8 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=TitleSearch;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096691;
  Content-Transfer-Encoding: binary
  

[phpwiki-checkins] CVS: phpwiki/pgsrc PhpWikiAdministration,1.10,1.11

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

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

Modified Files:
	PhpWikiAdministration 
Log Message:
Typo fix and added an $Id$ tag.

Index: PhpWikiAdministration
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/PhpWikiAdministration,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** PhpWikiAdministration	2002/01/07 04:55:47	1.10
--- PhpWikiAdministration	2002/01/09 06:35:17	1.11
***************
*** 1,10 ****
! From hos...@da...  Sun Jan 6 22:07:14 2002
! Subject: PhpWikiAdministration
! From: hos...@da... (PhpWiki)
! Date: Sun, 6 Jan 2002 22:07:14 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=PhpWikiAdministration;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
--- 1,8 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=PhpWikiAdministration;
!   flags=PAGE_LOCKED;
!   lastmodified=1010379143;
  Content-Transfer-Encoding: binary
  
***************
*** 19,23 ****
  This allows you to login.
  While you are logged in you will be able to ''lock'', ''unlock'' and ''delete'' pages.
! You will also be able edit ''locked'' pages.
  
  ----------
--- 17,21 ----
  This allows you to login.
  While you are logged in you will be able to ''lock'', ''unlock'' and ''delete'' pages.
! You will also be able to edit ''locked'' pages.
  
  ----------
***************
*** 28,32 ****
  
  ----------
- 
  !! Making Snapshots or Backups
  
--- 26,29 ----
***************
*** 56,60 ****
  
  -----------
- 
  !! Restoring
  
--- 53,56 ----
***************
*** 81,89 ****
  
  -----------
- 
  !! Format of the files
  
  Currently the pages are stored, one per
! file, as MIME ([ RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail 
  ([ RFC822 | http://www.faqs.org/rfcs/rfc822.html ]) messages.
  The content-type ''application/x-phpwiki'' is used, and page meta-data
--- 77,84 ----
  
  -----------
  !! Format of the files
  
  Currently the pages are stored, one per
! file, as MIME ([ RFC2045 | http://www.faqs.org/rfcs/rfc2045.html ]) e-mail
  ([ RFC822 | http://www.faqs.org/rfcs/rfc822.html ]) messages.
  The content-type ''application/x-phpwiki'' is used, and page meta-data
***************
*** 111,113 ****
  Note that when loading ''plain files'', the page name is deduced from the
  file name.
- 
--- 106,107 ----

[phpwiki-checkins] CVS: phpwiki/pgsrc MostPopular,1.2,1.3

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

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

Modified Files:
	MostPopular 
Log Message:
Added PAGE_LOCKED flag and an $Id$ tag.

Index: MostPopular
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/MostPopular,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** MostPopular	2001/09/18 19:16:23	1.2
--- MostPopular	2002/01/09 06:30:02	1.3
***************
*** 1,2 ****
! <?plugin MostPopular limit=20 ?>
  
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=MostPopular;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096690;
! Content-Transfer-Encoding: binary
  
+ <?plugin MostPopular limit=20 ?>

[phpwiki-checkins] CVS: phpwiki/pgsrc FindPage,1.7,1.8

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

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

Modified Files:
	FindPage 
Log Message:
Added PAGE_LOCKED flag and an $Id$ tag.

Index: FindPage
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/FindPage,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** FindPage	2001/09/18 19:16:23	1.7
--- FindPage	2002/01/09 06:27:54	1.8
***************
*** 1,20 ****
! Here are some good starting points for browsing.
! 
! * HowToUseWiki gives you the quick lowdown on Wiki markup.
! * RecentChanges recorded automatically.
! * MoreAboutMechanics of browsing and editing on this server.
! 
! Here's a title search.   Try something like ''wiki'' 
! or ''sandwich''.
! 
! <?plugin-form TitleSearch?>
! 
! Use the following for a full text search. This takes a few seconds. The results will show all lines on a given page that contain a match.
! 
! <?plugin-form FullTextSearch?>
! 
! ------
! Separate words with a space. All words have to match.
! %%%To exclude words prepend a '-'.
! %%%Example: 'wiki text -php' looks for all pages containing the words 'wiki'
! __and__ 'text', but __not__ containing the word 'php'.
--- 1,27 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=FindPage;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096690;
! Content-Transfer-Encoding: binary
! 
! Here are some good starting points for browsing.
! 
! * HowToUseWiki gives you the quick lowdown on Wiki markup.
! * RecentChanges recorded automatically.
! * MoreAboutMechanics of browsing and editing on this server.
! 
! Here's a title search. Try something like ''wiki'' or ''sandwich''.
! 
! <?plugin-form TitleSearch?>
! 
! Use the following for a full text search. This takes a few seconds. The results will show all lines on a given page that contain a match.
! 
! <?plugin-form FullTextSearch?>
! 
! ------
! Separate words with a space. All words have to match.
! %%%To exclude words prepend a '-'.
! %%%Example: 'wiki text -php' looks for all pages containing the words 'wiki'
! __and__ 'text', but __not__ containing the word 'php'.

[phpwiki-checkins] CVS: phpwiki/pgsrc LikePages,1.2,1.3

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

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

Modified Files:
	LikePages 
Log Message:
Added PAGE_LOCKED flag and an $Id$ tag.

Index: LikePages
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/LikePages,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** LikePages	2001/11/08 19:06:34	1.2
--- LikePages	2002/01/09 06:25:54	1.3
***************
*** 1,2 ****
--- 1,10 ----
+ Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
+ X-RCS_ID: $Id$
+ Content-Type: application/x-phpwiki;
+   pagename=LikePages;
+   flags=PAGE_LOCKED;
+   lastmodified=1009096690;
+ Content-Transfer-Encoding: binary
+ 
  LikePages are pages which share an initial or final word with that page.
  
***************
*** 4,6 ****
  ----
  <?plugin LikePages?>
- 
--- 12,13 ----

[phpwiki-checkins] CVS: phpwiki/pgsrc BackLinks,1.1,1.2

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

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

Modified Files:
	BackLinks 
Log Message:
Added a brief description of the BackLinks function and an $Id$ tag.

Index: BackLinks
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/BackLinks,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BackLinks	2001/09/18 19:16:23	1.1
--- BackLinks	2002/01/09 06:19:39	1.2
***************
*** 1,11 ****
! From hos...@da...  Sat Feb 10 21:28:19 2001
! Subject: BackLinks
! From: hos...@da... (PhpWiki)
! Date: Fri, 31 Aug 2001 22:07:14 -0700
! Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
    pagename=BackLinks;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
  <?plugin BackLinks include_self=1 page||='' ?>
--- 1,11 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=BackLinks;
!   flags=PAGE_LOCKED;
!   lastmodified=1010556918;
  Content-Transfer-Encoding: binary
  
+ The contents of all pages are searched to find links to the current page. The BackLinks function also answers the question: "Which pages contain the title of this page?".
+ ----
  <?plugin BackLinks include_self=1 page||='' ?>

[phpwiki-checkins] CVS: phpwiki/pgsrc RecentChanges,1.21,1.22 RecentEdits,1.4,1.5 TextFormattingRules,1.22,1.23

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

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

Modified Files:
	RecentChanges RecentEdits TextFormattingRules 
Log Message:
Converted to binary for easier editing during translation.

Index: RecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** RecentChanges	2002/01/08 23:17:21	1.21
--- RecentChanges	2002/01/09 05:50:18	1.22
***************
*** 1,16 ****
! From hos...@da...  Tue Jan 8 18:00:00 2002
! Subject: RecentChanges
! From: hos...@da... (PhpWiki)
! Date: Tue, 8 Jan 2002 18:00:00 -0500
! Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
    pagename=RecentChanges;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
- X-RCS_ID: $Id$
  
  Here's a list of recently changed pages on this wiki. (See RecentEdits for all recent minor edits and changes).
  
! <?plugin Toolbar name=RecentChanges days=1,3,7,30,90,-1 sep=| ?>
  --------
! <?plugin RecentChanges days||=30?>
--- 1,13 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=RecentChanges;
!   flags=PAGE_LOCKED;
!   lastmodified=1010523612;
  Content-Transfer-Encoding: binary
  
  Here's a list of recently changed pages on this wiki. (See RecentEdits for all recent minor edits and changes).
  
! <?plugin Toolbar name=RecentChanges days=1,3,7,30,90,-1 label="Show changes for: %s" sep=| ?>
  --------
! <?plugin RecentChanges days||=2 show_all||=0 ?>

Index: RecentEdits
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentEdits,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** RecentEdits	2002/01/08 23:17:21	1.4
--- RecentEdits	2002/01/09 05:50:18	1.5
***************
*** 1,12 ****
! From hos...@da...  Sun Tue 8 18:00:00 2002
! Subject: RecentEdits
! From: hos...@da... (PhpWiki)
! Date: Tue, 8 Jan 2002 18:00:00 -0500
! Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
    pagename=RecentEdits;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
- X-RCS_ID: $Id$
  
  Here's a list of recently edited pages on this wiki. All minor changes are shown, not just the most recent ones. (See RecentChanges for the most recent non-minor changes).
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=RecentEdits;
!   flags=PAGE_LOCKED;
!   lastmodified=1010531064;
  Content-Transfer-Encoding: binary
  
  Here's a list of recently edited pages on this wiki. All minor changes are shown, not just the most recent ones. (See RecentChanges for the most recent non-minor changes).

Index: TextFormattingRules
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/TextFormattingRules,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** TextFormattingRules	2002/01/01 22:05:18	1.22
--- TextFormattingRules	2002/01/09 05:50:18	1.23
***************
*** 1,26 ****
! From [no address given]  Tue Dec 18 22:49:56 2001
! Subject: TextFormattingRules
! From: [no address given] (PhpWiki)
! Date: Tue, 18 Dec 2001 19:32:52 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
    flags=PAGE_LOCKED;
!   lastmodified=1008721972;
! Content-Transfer-Encoding: quoted-printable
  
  ! Synopsis
  TextFormattingRules%%%
! __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.
  
  ----
--- 1,18 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=TextFormattingRules;
    flags=PAGE_LOCKED;
!   lastmodified=1008721970;
! Content-Transfer-Encoding: binary
  
  ! Synopsis
  TextFormattingRules%%%
! __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
  
  ----
***************
*** 68,73 ****
  * 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
--- 60,64 ----
  * 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
***************
*** 75,102 ****
  
  ! 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
--- 66,81 ----
  
  ! 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
***************
*** 108,114 ****
  |> 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.)
  
  
--- 87,91 ----
  |> 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.)
  
  
***************
*** 118,124 ****
  * < 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
--- 95,99 ----
  * < 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
***************
*** 131,139 ****
  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.)
--- 106,108 ----
  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.)

[phpwiki-checkins] CVS: phpwiki/pgsrc UserPreferences,1.2,1.3

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

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

Modified Files:
	UserPreferences 
Log Message:
added rcs $Id$

Index: UserPreferences
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/UserPreferences,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** UserPreferences	2001/12/19 04:20:15	1.2
--- UserPreferences	2002/01/09 05:48:18	1.3
***************
*** 1,9 ****
! Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
    pagename=UserPreferences;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
  
! You can now set some user preferences.  The values of these preferences are currently stored in a cookie (so you must have cookies enabled to use this feature.)
  
  ! !EditArea Dimensions.
--- 1,11 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=UserPreferences;
!   flags=PAGE_LOCKED;
!   lastmodified=1009096691;
  Content-Transfer-Encoding: binary
  
! You can now set some user preferences. The values of these preferences are currently stored in a cookie (so you must have cookies enabled to use this feature.)
  
  ! !EditArea Dimensions.

[phpwiki-checkins] CVS: phpwiki/pgsrc ViewMarkup,1.1,1.2

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

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

Modified Files:
	ViewMarkup 
Log Message:
Converted page to binary for easier editing during translation.

Index: ViewMarkup
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/ViewMarkup,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ViewMarkup	2001/12/28 03:42:35	1.1
--- ViewMarkup	2002/01/09 05:35:22	1.2
***************
*** 1,16 ****
! From [no address given]  Thu Dec 27 22:35:18 2001
! Subject: ViewMarkup
! From: [no address given] (PhpWiki)
! Date: Thu, 27 Dec 2001 22:33:19 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
! X-RCS: "$Id$"
  Content-Type: application/x-phpwiki;
    pagename=ViewMarkup;
!   flags=PAGE_LOCKED;
    lastmodified=1009510399;
! Content-Transfer-Encoding: quoted-printable
  
! View the WikiMarkup of a page without editing it. Most useful for =
! examining or copying the source code of locked pages.
  ----
! <?plugin ViewMarkup page||=3D'' ?>
--- 1,11 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=ViewMarkup;
!   flags="";
    lastmodified=1009510399;
! Content-Transfer-Encoding: binary
  
! View the WikiMarkup of a page without editing it. Most useful for examining or copying the source code of locked pages.
  ----
! <?plugin ViewMarkup page||='' ?>

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc DebugInfo,1.1,1.2

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

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

Modified Files:
	DebugInfo 
Log Message:
Converted page to binary for easier editing during translation. Added page description (still needs translation).

Index: DebugInfo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/DebugInfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DebugInfo	2001/12/18 07:59:03	1.1
--- DebugInfo	2002/01/09 05:31:58	1.2
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 02:37:25 2001
! Subject: DebugInfo
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 12:06:05 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=DebugInfo;
!   flags=PAGE_LOCKED;
!   lastmodified=1008522365;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin _BackendInfo page||=3D'' ?>
--- 1,10 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=DebugInfo;
!   flags=PAGE_LOCKED;
!   lastmodified=1010554068;
! Content-Transfer-Encoding: binary
! 
! Detailed view of a page, which is probably more useful for debugging than anything else.
! <?plugin _BackendInfo page||='' ?>

[phpwiki-checkins] CVS: phpwiki/pgsrc DebugInfo,1.1,1.2

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

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

Modified Files:
	DebugInfo 
Log Message:
Added page description.

Index: DebugInfo
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/DebugInfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DebugInfo	2001/09/18 19:16:23	1.1
--- DebugInfo	2002/01/09 05:30:59	1.2
***************
*** 1 ****
! <?plugin _BackendInfo page||='' ?>
--- 1,10 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=DebugInfo;
!   flags=PAGE_LOCKED;
!   lastmodified=1010554068;
! Content-Transfer-Encoding: binary
! 
! Detailed view of a page, which is probably more useful for debugging than anything else.
! <?plugin _BackendInfo page||='' ?>

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

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

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

Modified Files:
	KonvertiereLeerzeichenZuTabs 
Log Message:
Converted page to binary format for easier editing during translation.

Index: KonvertiereLeerzeichenZuTabs
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/KonvertiereLeerzeichenZuTabs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** KonvertiereLeerzeichenZuTabs	2001/12/16 07:43:23	1.4
--- KonvertiereLeerzeichenZuTabs	2002/01/09 05:25:34	1.5
***************
*** 1,38 ****
! From [no address given]  Sun Dec 16 02:19:06 2001
! Subject: KonvertiereLeerzeichenZuTabs
! From: [no address given] (PhpWiki)
! Date: Sat, 15 Dec 2001 23:28:41 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=KonvertiereLeerzeichenZuTabs;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
! Manche Webbrowser haben Probleme mit dem Tabulator, der in den =
! TextFormatierungsRegeln verwendet wird. Falls du keinen Tab eingeben =
! kannst oder eine Seite bearbeitest, die jemand geschrieben hat, der keine =
! Tabs verwendet hat, kann das Wiki-System Folgen von Leerzeichen f=FCr dich =
! in Tabs umwandeln.
! 
! Du aktivierst die Umwandlung, indem du das Kontrollfeld unten auf der =
! Seite EditiereText markierst. Das Kontrollfeld sieht etwa so aus:
! 
!  [[o] Ich kann keine Tabulatoren verwenden. Bitte f=FCr mich, wenn ich =
! speichere.
! 
! Eine Folge von Leerzeichen mu=DF mindestens __drei__ Leerzeichen lang =
! sein, um als Tab erkannt zu werden. Verwende Vielfache von __acht__ =
! Leerzeichen, um mehrere Tabs einzugeben. Jeweils acht Leerzeichen werden =
! in einen Tab umgewandelt. Die letzte Folge darf auch etwas k=FCrzer sein, =
! so lange mindestens drei Leerzeichen in der letzten (oder einzigen) Folge =
! sind.
  
! __Bitte =FCberpr=FCfe die so erstellten Seiten!__ Diese Art der =
! Tabulatorerkennung kann manchmal zu unerwarteten Ergebnissen f=FChren.
  
  -----
! ''Hinweis zu dieser Seite: diese Seite wird angezeigt, wenn der Benutzer =
! den Link =ABKonvertiereLeerzeichenZuTabs=BB auf irgendeiner =
! Bearbeiten-Seite anzeigt. Sie erkl=E4rt, was diese Funktion bewirkt, warum =
! man sie verwendet, und M=F6glichkeiten zum Vermeiden des Problems der =
! Leerzeichen statt Tabs.''
--- 1,20 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=KonvertiereLeerzeichenZuTabs;
    flags="";
!   lastmodified=1008922801;
! Content-Transfer-Encoding: binary
  
! Manche Webbrowser haben Probleme mit dem Tabulator, der in den TextFormatierungsRegeln verwendet wird. Falls du keinen Tab eingeben kannst oder eine Seite bearbeitest, die jemand geschrieben hat, der keine Tabs verwendet hat, kann das Wiki-System Folgen von Leerzeichen für dich in Tabs umwandeln.
  
! Du aktivierst die Umwandlung, indem du das Kontrollfeld unten auf der Seite EditiereText markierst. Das Kontrollfeld sieht etwa so aus:
  
+  [[o] Ich kann keine Tabulatoren verwenden. Bitte für mich, wenn ich speichere.
+ 
+ Eine Folge von Leerzeichen muß mindestens __drei__ Leerzeichen lang sein, um als Tab erkannt zu werden. Verwende Vielfache von __acht__ Leerzeichen, um mehrere Tabs einzugeben. Jeweils acht Leerzeichen werden in einen Tab umgewandelt. Die letzte Folge darf auch etwas kürzer sein, so lange mindestens drei Leerzeichen in der letzten (oder einzigen) Folge sind.
+ 
+ __Bitte überprüfe die so erstellten Seiten!__ Diese Art der Tabulatorerkennung kann manchmal zu unerwarteten Ergebnissen führen.
+ 
  -----
! ''Hinweis zu dieser Seite: diese Seite wird angezeigt, wenn der Benutzer den Link «KonvertiereLeerzeichenZuTabs» auf irgendeiner Bearbeiten-Seite anzeigt. Sie erklärt, was diese Funktion bewirkt, warum man sie verwendet, und Möglichkeiten zum Vermeiden des Problems der Leerzeichen statt Tabs.''

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc BackLinks,1.3,1.4 EditiereText,1.6,1.7 Einstellungen,1.2,1.3 FrischeSeiten,1.8,1.9 G%E4steBuch,1.2,1.3 Geringe%C4nderungen,1.4,1.5 GleicheSeiten,1.3,1.4 GuterStil,1.3,1.4 MeistBesucht,1.6,1.7 PhpWiki,1.3,1.4 SandKiste,1.5,1.6 SeiteFinden,1.6,1.7 SeitenErzeugen,1.4,1.5 SeiteProtokoll,1.1,1.2 StartSeite,1.6,1.7 TextFormatierungsRegeln,1.9,1.10 Titelsuche,1.3,1.4 Volltextsuche,1.3,1.4 WabiSabi,1.2,1.3 WieManWikiBenutzt,1.6,1.7 WikiTechnik,1.4,1.5 WikiWikiWeb,1.3,1.4

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

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

Modified Files:
	BackLinks EditiereText Einstellungen FrischeSeiten G%E4steBuch 
	Geringe%C4nderungen GleicheSeiten GuterStil MeistBesucht 
	PhpWiki SandKiste SeiteFinden SeitenErzeugen SeiteProtokoll 
	StartSeite TextFormatierungsRegeln Titelsuche Volltextsuche 
	WabiSabi WieManWikiBenutzt WikiTechnik WikiWikiWeb 
Log Message:
Converted page to binary format for easier editing during translation.

Index: BackLinks
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/BackLinks,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** BackLinks	2001/12/27 22:24:11	1.3
--- BackLinks	2002/01/09 05:21:48	1.4
***************
*** 1,18 ****
! From [no address given]  Thu Dec 27 15:28:06 2001
! Subject: BackLinks
! From: [no address given] (PhpWiki)
! Date: Thu, 27 Dec 2001 15:27:28 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
! X-RCS: "$Id$"
  Content-Type: application/x-phpwiki;
    pagename=BackLinks;
    flags=PAGE_LOCKED;
    lastmodified=1009484848;
! Content-Transfer-Encoding: quoted-printable
  
! Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten =
! verbunden, die einen Link auf die aktuelle Seite enthalten. Die BackLinks =
! Funktion beantwortet also die Frage: =BBWo wird der Name dieser Seite =
! verwendet?=AB.
  ----
! <?plugin BackLinks include_self=3D1 page||=3D'' ?>
--- 1,11 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=BackLinks;
    flags=PAGE_LOCKED;
    lastmodified=1009484848;
! Content-Transfer-Encoding: binary
  
! Der Titel der aktuellen Seite ist mit einem Suchbefehl nach allen Seiten verbunden, die einen Link auf die aktuelle Seite enthalten. Die BackLinks Funktion beantwortet also die Frage: ªWo wird der Name dieser Seite verwendet?´.
  ----
! <?plugin BackLinks include_self=1 page||='' ?>

Index: EditiereText
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/EditiereText,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** EditiereText	2001/12/19 04:09:57	1.6
--- EditiereText	2002/01/09 05:21:48	1.7
***************
*** 1,14 ****
! From [no address given]  Tue Dec 18 22:49:53 2001
! Subject: EditiereText
! From: [no address given] (PhpWiki)
! Date: Tue, 18 Dec 2001 21:25:11 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=EditiereText;
    flags="";
!   lastmodified=1008728711;
! Content-Transfer-Encoding: quoted-printable
  
! Alle Seiten (mit Ausnahme von Suchergebnissen) haben unten einen Link =
! __Editieren__. Man kann die aktuelle Seite editieren, indem man diesen =
! Link anklickt.
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=EditiereText;
    flags="";
!   lastmodified=1008736718;
! Content-Transfer-Encoding: binary
  
! Alle Seiten (mit Ausnahme von Suchergebnissen) haben unten einen Link __Editieren__. Man kann die aktuelle Seite editieren, indem man diesen Link anklickt.

Index: Einstellungen
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Einstellungen,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Einstellungen	2001/12/27 22:24:17	1.2
--- Einstellungen	2002/01/09 05:21:48	1.3
***************
*** 1,20 ****
! From [no address given]  Thu Dec 27 16:36:57 2001
! Subject: Einstellungen
! From: [no address given] (PhpWiki)
! Date: Thu, 27 Dec 2001 16:35:35 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks)
! X-RCS: "$Id$"
  Content-Type: application/x-phpwiki;
    pagename=Einstellungen;
    flags=PAGE_LOCKED;
    lastmodified=1009488935;
! Content-Transfer-Encoding: quoted-printable
  
! Du kannst einige Einstellungen jetzt bestimmen. Die Werte werden in einer =
! __Cookie__ deines Browsers gespeichert, daher mu=DFt du Cookies erlauben =
! um das Feature zu benutzen.
  
! ! Gr=F6=DFe des Texteingabefensters
  
! [Stelle Spalten | phpwiki:?action=3Dsetprefs&edit_area_width=3D3()]
! [Stelle Zeilen | phpwiki:?action=3Dsetprefs&edit_area_height=3D3()]
--- 1,14 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=Einstellungen;
    flags=PAGE_LOCKED;
    lastmodified=1009488935;
! Content-Transfer-Encoding: binary
  
! Du kannst einige Einstellungen jetzt bestimmen. Die Werte werden in einer __Cookie__ deines Browsers gespeichert, daher mußt du Cookies erlauben um das Feature zu benutzen.
  
! ! Größe des Texteingabefensters
  
! [Stelle Spalten | phpwiki:?action=setprefs&edit_area_width=3()]
! [Stelle Zeilen | phpwiki:?action=setprefs&edit_area_height=3()]

Index: FrischeSeiten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/FrischeSeiten,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** FrischeSeiten	2002/01/09 03:29:44	1.8
--- FrischeSeiten	2002/01/09 05:21:48	1.9
***************
*** 1,8 ****
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=FrischeSeiten;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
- X-RCS_ID: $Id$
  
  Eine Liste der kürzlich veränderter oder neuer Seiten wird hier erzeugt. GeringeÄnderungen zeigt alle Geringfügige- und Hauptänderungen.
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=FrischeSeiten;
!   flags=PAGE_LOCKED;
!   lastmodified=1010544734;
  Content-Transfer-Encoding: binary
  
  Eine Liste der kürzlich veränderter oder neuer Seiten wird hier erzeugt. GeringeÄnderungen zeigt alle Geringfügige- und Hauptänderungen.

Index: G%E4steBuch
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/G%E4steBuch,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** G%E4steBuch	2001/12/19 04:10:12	1.2
--- G%E4steBuch	2002/01/09 05:21:48	1.3
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 22:49:53 2001
! Subject: G%E4steBuch
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:02 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=G%E4steBuch;
    flags="";
!   lastmodified=1008498122;
! Content-Transfer-Encoding: quoted-printable
  
  Trage dich einfach mit Namen und Datum auf dieser Seite ein!
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=G%E4steBuch;
    flags="";
!   lastmodified=1008927013;
! Content-Transfer-Encoding: binary
  
  Trage dich einfach mit Namen und Datum auf dieser Seite ein!

Index: Geringe%C4nderungen
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Geringe%C4nderungen,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Geringe%C4nderungen	2002/01/09 03:29:44	1.4
--- Geringe%C4nderungen	2002/01/09 05:21:48	1.5
***************
*** 1,8 ****
! Mime-Version: 1.0 (Produced by PhpWiki 1.1.x)
  Content-Type: application/x-phpwiki;
    pagename=Geringe%C4nderungen;
!   flags=PAGE_LOCKED
  Content-Transfer-Encoding: binary
- X-RCS_ID: $Id$
  
  Eine Liste der Geringfügige Seiten wird hier erzeugt. FrischeSeiten zeigt alle Haupt- und Geringfügige Änderungen.
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=Geringe%C4nderungen;
!   flags=PAGE_LOCKED;
!   lastmodified=1010546869;
  Content-Transfer-Encoding: binary
  
  Eine Liste der Geringfügige Seiten wird hier erzeugt. FrischeSeiten zeigt alle Haupt- und Geringfügige Änderungen.

Index: GleicheSeiten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GleicheSeiten,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** GleicheSeiten	2001/12/19 04:10:21	1.3
--- GleicheSeiten	2002/01/09 05:21:48	1.4
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 22:49:53 2001
! Subject: GleicheSeiten
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:11:20 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=GleicheSeiten;
    flags="";
!   lastmodified=1008497480;
! Content-Transfer-Encoding: quoted-printable
  
  GleicheSeiten haben ein identiches Wort im Namen.
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=GleicheSeiten;
    flags="";
!   lastmodified=1008736718;
! Content-Transfer-Encoding: binary
  
  GleicheSeiten haben ein identiches Wort im Namen.

Index: GuterStil
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/GuterStil,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** GuterStil	2001/12/19 04:10:26	1.3
--- GuterStil	2002/01/09 05:21:48	1.4
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 22:49:53 2001
! Subject: GuterStil
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:02 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=GuterStil;
    flags="";
!   lastmodified=1008498122;
! Content-Transfer-Encoding: quoted-printable
  
  "Young writers often suppose that style is a garnish for the meat of
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=GuterStil;
    flags="";
!   lastmodified=1008736718;
! Content-Transfer-Encoding: binary
  
  "Young writers often suppose that style is a garnish for the meat of
***************
*** 21,25 ****
  --Strunk and White, "The Elements of Style"
  
! ''And thus an American textbook, typical required reading for 10th-grade =
! English students, unknowingly extols some virtues of WabiSabi''
  --scummings
--- 18,21 ----
  --Strunk and White, "The Elements of Style"
  
! ''And thus an American textbook, typical required reading for 10th-grade English students, unknowingly extols some virtues of WabiSabi''
  --scummings

Index: MeistBesucht
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/MeistBesucht,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** MeistBesucht	2001/12/19 04:10:31	1.6
--- MeistBesucht	2002/01/09 05:21:48	1.7
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 22:49:53 2001
! Subject: MeistBesucht
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:02 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=MeistBesucht;
    flags="";
!   lastmodified=1008498122;
! Content-Transfer-Encoding: quoted-printable
  
! <?plugin MostPopular limit=3D20 ?>
--- 1,10 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=MeistBesucht;
    flags="";
!   lastmodified=1009939563;
! Content-Transfer-Encoding: binary
  
! <?plugin MostPopular limit=20 ?>
! --

Index: PhpWiki
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/PhpWiki,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PhpWiki	2001/12/16 07:43:32	1.3
--- PhpWiki	2002/01/09 05:21:48	1.4
***************
*** 1,15 ****
! From [no address given]  Sun Dec 16 02:19:06 2001
! Subject: PhpWiki
! From: [no address given] (PhpWiki)
! Date: Sat, 15 Dec 2001 22:44:01 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=PhpWiki;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
  Du verwendest jetzt gerade PhpWiki. Faszinierend, oder?
  
! Besuche die Website von PhpWiki unter http://phpwiki.sourceforge.net/ und =
! schaue dir PhpWiki in Aktion an unter =
! http://phpwiki.sourceforge.net/phpwiki/ (und nat=FCrlich auch hier :-)).
--- 1,11 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=PhpWiki;
    flags="";
!   lastmodified=1010551574;
! Content-Transfer-Encoding: binary
  
  Du verwendest jetzt gerade PhpWiki. Faszinierend, oder?
  
! Besuche die Website von PhpWiki unter http://phpwiki.sourceforge.net/ und schaue dir PhpWiki in Aktion an unter http://phpwiki.sourceforge.net/phpwiki/ (und natürlich auch hier :-)).

Index: SandKiste
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SandKiste,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** SandKiste	2001/12/16 11:48:24	1.5
--- SandKiste	2002/01/09 05:21:48	1.6
***************
*** 1,14 ****
! From [no address given]  Sun Dec 16 02:19:06 2001
! Subject: SandKiste
! From: [no address given] (PhpWiki)
! Date: Sat, 15 Dec 2001 23:11:46 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=SandKiste;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
  Hier kannst du das Wiki ausprobieren.
  
! Viel Spa=DF :-)
  
--- 1,12 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=SandKiste;
    flags="";
!   lastmodified=1009844446;
! Content-Transfer-Encoding: binary
  
  Hier kannst du das Wiki ausprobieren.
  
! Viel Spaß :-)
  

Index: SeiteFinden
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SeiteFinden,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** SeiteFinden	2001/12/19 04:52:35	1.6
--- SeiteFinden	2002/01/09 05:21:48	1.7
***************
*** 1,31 ****
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: SeiteFinden
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:02 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=SeiteFinden;
    flags=PAGE_LOCKED;
!   lastmodified=1008498122;
! Content-Transfer-Encoding: quoted-printable
  
! Als Startpunkt zum Herumst=F6bern im Wiki eignen sich am besten die =
! folgenden Seiten:
  
  * WieManWikiBenutzt sagt wie die Sache hier in einem Wiki funzt.
! * FrischeSeiten ist eine automatisch erstellte Liste der ge=E4nderten =
! Seiten.
! * WikiTechnik erkl=E4rt die Technik, mit der PhpWiki arbeitet.
  
  
  
! Hier ist eine Suche nach Seitentiteln. Suche zum Beispiel nach ''wiki'' =
! oder ''sandwich''.
  
  <?plugin-form TitleSearch?>
  
! Und hier ist eine Volltextsuche. Die Suche dauert ein paar Sekunden. Im =
! Suchergebnis werden die Zeilen aus den gefundenen Seiten angezeigt, in =
! denen ein Suchbegriff gefunden wurde.
  
  <?plugin-form FullTextSearch?>
--- 1,23 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=SeiteFinden;
    flags=PAGE_LOCKED;
!   lastmodified=1008736719;
! Content-Transfer-Encoding: binary
  
! Als Startpunkt zum Herumstöbern im Wiki eignen sich am besten die folgenden Seiten:
  
  * WieManWikiBenutzt sagt wie die Sache hier in einem Wiki funzt.
! * FrischeSeiten ist eine automatisch erstellte Liste der geänderten Seiten.
! * WikiTechnik erklärt die Technik, mit der PhpWiki arbeitet.
  
  
  
! Hier ist eine Suche nach Seitentiteln. Suche zum Beispiel nach ''wiki'' oder ''sandwich''.
  
  <?plugin-form TitleSearch?>
  
! Und hier ist eine Volltextsuche. Die Suche dauert ein paar Sekunden. Im Suchergebnis werden die Zeilen aus den gefundenen Seiten angezeigt, in denen ein Suchbegriff gefunden wurde.
  
  <?plugin-form FullTextSearch?>

Index: SeitenErzeugen
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SeitenErzeugen,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** SeitenErzeugen	2001/12/19 04:10:35	1.4
--- SeitenErzeugen	2002/01/09 05:21:48	1.5
***************
*** 1,32 ****
! From [no address given]  Tue Dec 18 22:49:54 2001
! Subject: SeitenErzeugen
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:03 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=SeitenErzeugen;
    flags="";
!   lastmodified=1008498123;
! Content-Transfer-Encoding: quoted-printable
  
! Um dem Wiki eine neue Seite hinzuzuf=FCgen mu=DFt du dir nur einen =
! sinnvollen Titel einfallen lassen, alle W=F6rter im Titel gro=DFschreiben =
! und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen =
! Hyperlink. __Umlaute kannst du in Titeln auch verwenden: [[den Namen in =
! eckige Klammern so einschlie=DFen].__
! 
! Dann kannst du das Fragezeichen am Ende des neuen Hyperlinks anklicken, =
! und Wiki =F6ffnet einen Editor zum Erstellen der neuen Seite.
! 
! Wenn du ein Dokument mit aufwendigen Formatierungen zum Wiki hinzuf=FCgen =
! willst, ist es vielleicht einfacher, einen Link zu diesem Dokument ins =
! Wiki einzuf=FCgen statt das Dokument selbst. Zum Beispiel:
! 
!  Die Homepage des PhpWiki Projektes: http://phpwiki.sourceforge.net/
! 
! Wiki unterst=FCzt keine HTML-Tags (siehe TextFormatierungsRegeln). =
! <tags>werden einfach wie normaler Text angezeigt.</tags> Wiki soll so =
! einfach wie m=F6glich sein, damit es jeder benutzen kann.
  
! Es gibt eine Funktion, durch die der Systemverwalter HTML in Dokumenten =
! erlauben kann, das f=FChrt aber zu Sicherheitsrisiken.
--- 1,19 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=SeitenErzeugen;
    flags="";
!   lastmodified=1009324334;
! Content-Transfer-Encoding: binary
  
! Um dem Wiki eine neue Seite hinzuzufügen mußt du dir nur einen sinnvollen Titel einfallen lassen, alle Wörter im Titel großschreiben und sie AufDieseArtZusammenfuegen. Wiki erkennt dies automatisch als einen Hyperlink. __Umlaute kannst du in Titeln auch verwenden: [[den Namen in eckige Klammern so einschließen].__
  
! Dann kannst du das Fragezeichen am Ende des neuen Hyperlinks anklicken, und Wiki öffnet einen Editor zum Erstellen der neuen Seite.
! 
! Wenn du ein Dokument mit aufwendigen Formatierungen zum Wiki hinzufügen willst, ist es vielleicht einfacher, einen Link zu diesem Dokument ins Wiki einzufügen statt das Dokument selbst. Zum Beispiel:
! 
! Die Homepage des PhpWiki Projektes: http://phpwiki.sourceforge.net/
! 
! Wiki unterstüzt keine HTML-Tags (siehe TextFormatierungsRegeln). <tags>werden einfach wie normaler Text angezeigt.</tags> Wiki soll so einfach wie möglich sein, damit es jeder benutzen kann.
! 
! Es gibt eine Funktion, durch die der Systemverwalter HTML in Dokumenten erlauben kann, das führt aber zu Sicherheitsrisiken.

Index: SeiteProtokoll
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/SeiteProtokoll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SeiteProtokoll	2001/12/19 04:02:47	1.1
--- SeiteProtokoll	2002/01/09 05:21:48	1.2
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 22:49:54 2001
! Subject: SeiteProtokoll
! From: [no address given] (PhpWiki)
! Date: Tue, 18 Dec 2001 01:56:22 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
! Content-Type: application/x-phpwiki;
!   pagename=SeiteProtokoll;
!   flags="";
!   lastmodified=1008658582;
! Content-Transfer-Encoding: quoted-printable
! 
! <?plugin PageHistory?>
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=SeiteProtokoll;
!   flags="";
!   lastmodified=1008658582;
! Content-Transfer-Encoding: binary
! 
! <?plugin PageHistory?>

Index: StartSeite
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/StartSeite,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** StartSeite	2001/12/19 04:10:40	1.6
--- StartSeite	2002/01/09 05:21:48	1.7
***************
*** 1,18 ****
! From [no address given]  Tue Dec 18 22:49:54 2001
! Subject: StartSeite
! From: [no address given] (PhpWiki)
! Date: Tue, 18 Dec 2001 21:55:41 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=StartSeite;
    flags="";
!   lastmodified=1008730541;
! Content-Transfer-Encoding: quoted-printable
  
  * Was ist ein WikiWikiWeb? Eine kurze Beschreibung dieser Anwendung.
  * Lerne WieManWikiBenutzt und wie mann SeitenErzeugen kann.
  * Die SandKiste ist zum Spielen und zum Experimentieren.
! * Bitte trage dich im G=E4steBuch ein.
! * J=FCngste Ver=E4nderungen und neue Seiten findet man unter FrischeSeiten.
  * Eine Liste der [MeistBesucht]en Seiten.
  * ReleaseNotes (in Englisch)
--- 1,15 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=StartSeite;
    flags="";
!   lastmodified=1010445995;
! Content-Transfer-Encoding: binary
  
  * Was ist ein WikiWikiWeb? Eine kurze Beschreibung dieser Anwendung.
  * Lerne WieManWikiBenutzt und wie mann SeitenErzeugen kann.
  * Die SandKiste ist zum Spielen und zum Experimentieren.
! * Bitte trage dich im GästeBuch ein.
! * Jüngste Veränderungen und neue Seiten findet man unter FrischeSeiten.
  * Eine Liste der [MeistBesucht]en Seiten.
  * ReleaseNotes (in Englisch)

Index: TextFormatierungsRegeln
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/TextFormatierungsRegeln,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** TextFormatierungsRegeln	2002/01/01 22:05:15	1.9
--- TextFormatierungsRegeln	2002/01/09 05:21:48	1.10
***************
*** 1,89 ****
! From [no address given]  Tue Dec 18 22:49:54 2001
! Subject: TextFormatierungsRegeln
! From: [no address given] (PhpWiki)
! Date: Tue, 18 Dec 2001 21:09:31 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=TextFormatierungsRegeln;
    flags="";
!   lastmodified=1008727771;
! Content-Transfer-Encoding: quoted-printable
  
! ! =DCbersicht
  TextFormatierungsRegeln%%%
! __Hervorhebung:__ '____' f=FCr ''kursiv'', _''''_ f=FCr __starke =
! Betonung__, '____'_''''_ f=FCr ''__fett u. kursiv__''.%%%
! __Listen:__* f=FCr Rasterpunkte u. Ebenen, # f=FCr numerierte Listen, =BB; =
! Das Wort : Die Wortbestimmung=AB f=FCr glossar=E4hnliche Listen.%%%
! __Querverweise:__ in !Gro=DFbuchstabenZusammensto=DFen oder in =
! einschlie=DFende einklammern [[ein Link] oder URL =
! [[!http://cool.wiki.int/].%%%
! __Fu=DFnoten:__ Benutze [[1],[[2],[[3],...%%%
! __Das Erstellen eines Links verhindern:__ das Wort mit ein =BB!=AB =
! beginnen: !!NichtLinken, Links so angeben: [[[[Text | URL] (zweimal =
! =BB[=AB).%%%
! __Verschiedenes:__ =BB!=AB, =BB!!=AB, =BB!!!=AB f=FCr =FCberschriften, =
! =BB%%''''%=AB f=FCr Zeilenvorschubzeichen, u. =BB---''''-=AB zeichnet eine =
! Linie.
  
  ----
  ! Tip
! Schau dir am besten auch den =BBQuelltext=AB dieser Seite an, indem du =
! unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele =
! besser.
! 
! ! Abs=E4tze
! 
! * R=FCcke Abs=E4tze nicht ein
! * Zeilenumbr=FCche werden automatisch erstellt
! * Abs=E4tze werden durch Leerzeilen getrennt
! * Vier oder mehr Minuszeichen am Zeilenanfang erzeugen eine horizontale =
! Linie
! * %%''''% erstellt einen Zeilenumbruch (auch in =DCberschriften und Listen)
  
  
  ! Listen
  
! * Ein Sternchen f=FCr die erste Ebene
! ** Sternchen-Sternchen f=FCr die zweite Ebene, usw.
! * Verwende * f=FCr Aufz=E4hlungslisten, # f=FCr numerierte Listen (auch =
! durcheinander)
! * Eine Zeile f=FCr jeden Listenpunkt
! * Tab-Begriff:-Tab erstellt eine Definition f=FCr glossar=E4hnliche Listen
! * Andere Leerzeichen als Tab am Zeilenanfang erstellen vorformatierten =
! Text mit einer anderen Schriftart
  
! ! =DCberschriften
  
! * '!' am Zeilenanfang erstellt eine kleine =DCberschrift
  * '!!' eine mittlere
! * '!!!' eine gro=DFe
  
  ! Schriftart
! * Um eine Schriftart mit gleichen Zeichenabst=E4nden =
! (schreibmaschinen=E4hnlich, zum Beispiel f=FCr Quelltexte) zu erhalten, =
! f=FCge am Anfang der Zeile ein oder mehr Leerzeichen ein.
  
   Hier haben alle Zeichen den gleichen Abstand
  Und hier nicht.
  
! ! Einger=FCckte Abs=E4tze
  
! * Mit einem Semikolon und einem Doppelpunkt (;:) am Zeilenanfang erstellst =
! du einen einger=FCckten Absatz.
  
! ;: Dieser Absatz ist einger=FCckt. Verwende diese Funktion zum Beispiel =
! (zusammen mit ''Betonung'' zum zitieren von Texten).
  
  
  ! Hervorhebung
  
! * Verwende zwei einfache Anf=FChrungszeichen f=FCr ''Betonung'' (wird =
! normalerweise kursiv dargestellt)
! * Verwende doppelte Unterstriche f=FCr __starke Betonung__ (wird =
! normalerweise fett dargestellt)
  * Du kannst sie auch zusammen verwenden: ''__fett & kursiv__''
! * ''Betonungen'' k=F6nnen ''mehrfach'' in einer Zeile verwendet werden, =
! aber sie k=F6nnen ''nicht'' =FCber das Zeilenende hinausgehen:
  
  ''So etwas
--- 1,66 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=TextFormatierungsRegeln;
    flags="";
!   lastmodified=1008736719;
! Content-Transfer-Encoding: binary
  
! ! Übersicht
  TextFormatierungsRegeln%%%
! __Hervorhebung:__ '____' für ''kursiv'', _''''_ für __starke Betonung__, '____'_''''_ für ''__fett u. kursiv__''.%%%
! __Listen:__* für Rasterpunkte u. Ebenen, # für numerierte Listen, »; Das Wort : Die Wortbestimmung« für glossarähnliche Listen.%%%
! __Querverweise:__ in !GroßbuchstabenZusammenstoßen oder in einschließende einklammern [[ein Link] oder URL [[!http://cool.wiki.int/].%%%
! __Fußnoten:__ Benutze [[1],[[2],[[3],...%%%
! __Das Erstellen eines Links verhindern:__ das Wort mit ein »!« beginnen: !!NichtLinken, Links so angeben: [[Text | URL] (zweimal »[«).%%%
! __Verschiedenes:__ »!«, »!!«, »!!!« für überschriften, »%%''''%« für Zeilenvorschubzeichen, u. »---''''-« zeichnet eine Linie.
  
  ----
  ! Tip
! Schau dir am besten auch den »Quelltext« dieser Seite an, indem du unten auf den Link zum Editieren klickst. Dann verstehst du die Beispiele besser.
  
+ ! Absätze
  
+ * Rücke Absätze nicht ein
+ * Zeilenumbrüche werden automatisch erstellt
+ * Absätze werden durch Leerzeilen getrennt
+ * Vier oder mehr Minuszeichen am Zeilenanfang erzeugen eine horizontale Linie
+ * %%''''% erstellt einen Zeilenumbruch (auch in Überschriften und Listen)
+ 
+ 
  ! Listen
  
! * Ein Sternchen für die erste Ebene
! ** Sternchen-Sternchen für die zweite Ebene, usw.
! * Verwende * für Aufzählungslisten, # für numerierte Listen (auch durcheinander)
! * Eine Zeile für jeden Listenpunkt
! * Tab-Begriff:-Tab erstellt eine Definition für glossarähnliche Listen
! * Andere Leerzeichen als Tab am Zeilenanfang erstellen vorformatierten Text mit einer anderen Schriftart
  
! ! Überschriften
  
! * '!' am Zeilenanfang erstellt eine kleine Überschrift
  * '!!' eine mittlere
! * '!!!' eine große
  
  ! Schriftart
! * Um eine Schriftart mit gleichen Zeichenabständen (schreibmaschinenähnlich, zum Beispiel für Quelltexte) zu erhalten, füge am Anfang der Zeile ein oder mehr Leerzeichen ein.
  
   Hier haben alle Zeichen den gleichen Abstand
  Und hier nicht.
  
! ! Eingerückte Absätze
  
! * Mit einem Semikolon und einem Doppelpunkt (;:) am Zeilenanfang erstellst du einen eingerückten Absatz.
  
! ;: Dieser Absatz ist eingerückt. Verwende diese Funktion zum Beispiel (zusammen mit ''Betonung'' zum zitieren von Texten).
  
  
  ! Hervorhebung
  
! * Verwende zwei einfache Anführungszeichen für ''Betonung'' (wird normalerweise kursiv dargestellt)
! * Verwende doppelte Unterstriche für __starke Betonung__ (wird normalerweise fett dargestellt)
  * Du kannst sie auch zusammen verwenden: ''__fett & kursiv__''
! * ''Betonungen'' können ''mehrfach'' in einer Zeile verwendet werden, aber sie können ''nicht'' über das Zeilenende hinausgehen:
  
  ''So etwas
***************
*** 91,138 ****
  
  ! Querverweise
! * Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den =
! Namen in eckige Klammern einschlie=DFt [das ist ein Link] oder besser =
! WikiW=F6rterVerwendet.
  * Hyperlinks zu externen Seiten werden so erstellt: [http://www.wcsb.org/]
! * Du kannst Links zu externen Seiten einen Namen geben, indem du in der =
! eckigen Klammer erst den Namen und dann, getrennt durch einen senkrechten =
! Strich (|), die Adresse angibst: [Steve's Homepage | =
! http://wcsb.org/~swain/]
! * Du kannst das Erstellen eines Links verhindern, indem du vor das Wort =
! ein Ausrufungszeichen setzt, zum Beispiel !DasIstKeinLink.
! * 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].)
! * Wenn du im Text Adressen eingibst, die mit __http:__, __ftp:__ oder =
! __mailto:__ beginnen, werden diese auch automatisch in Links umgewandelt, =
! zum Beispiel http://c2.com/
! * Adressen, die mit __.png__ oder __.jpg__ enden (d.h. Bilder) werden in =
! die Seite eingef=FCgt, wenn sie in eckige Klammern gesetzt werden, z. B.: =
! [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:
!       ||  _''''_Namen_''''_              |v _''''_Kost_''''_   |v =
! _''''_Bemerkungen_''''_
        | _''''_Vor._''''_    | _''''_Nach._''''_
        |> Jeff       |< Dairiki   |^  billig    |< nicht preiswert
!       |> Marco      |< Polo      | billiger    |< nicht verf=FCgbar
  ;: will generate
  ||  __Namen__              |v __Kost__    |v __Bemerkungen__
  | __Vor.__    | __Nach.__
  |> Jeff       |< Dairiki   |^  billig     |< nicht preiswert
! |> Marco      |< Polo      | billiger     |< nicht verf=FCgbar
  
! ;: 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-Formatierungen
  
! * Du ben=F6tigst keine HTML-Formatierungen
  * < und > erscheinen einfach so im Text
  * Sonderzeichen mit & funktionieren nicht
! * Wenn du wirklich HTML verwenden ''mu=DFt'', kann dein Systemverwalter =
! diese Funktion aktivieren. Du mu=DFt dann jede Zeile mit einem senkrechten =
! Strich (|) beginnen. Normalerweise ist diese Funktion aber deaktiviert.
--- 68,97 ----
  
  ! Querverweise
! * Hyperlinks zu anderen Seiten im Wiki werden erstellt, indem man den Namen in eckige Klammern einschließt [das ist ein Link] oder besser WikiWörterVerwendet.
  * Hyperlinks zu externen Seiten werden so erstellt: [http://www.wcsb.org/]
! * Du kannst Links zu externen Seiten einen Namen geben, indem du in der eckigen Klammer erst den Namen und dann, getrennt durch einen senkrechten Strich (|), die Adresse angibst: [Steve's Homepage | http://wcsb.org/~swain/]
! * Du kannst das Erstellen eines Links verhindern, indem du vor das Wort ein Ausrufungszeichen setzt, zum Beispiel !DasIstKeinLink.
! * 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].)
! * Wenn du im Text Adressen eingibst, die mit __http:__, __ftp:__ oder __mailto:__ beginnen, werden diese auch automatisch in Links umgewandelt, zum Beispiel http://c2.com/
! * Adressen, die mit __.png__ oder __.jpg__ enden (d.h. Bilder) werden in die Seite eingefügt, wenn sie in eckige Klammern gesetzt werden, z. B.: [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:
!       ||  _''''_Namen_''''_              |v _''''_Kost_''''_   |v _''''_Bemerkungen_''''_
        | _''''_Vor._''''_    | _''''_Nach._''''_
        |> Jeff       |< Dairiki   |^  billig    |< nicht preiswert
!       |> Marco      |< Polo      | billiger    |< nicht verfügbar
  ;: will generate
  ||  __Namen__              |v __Kost__    |v __Bemerkungen__
  | __Vor.__    | __Nach.__
  |> Jeff       |< Dairiki   |^  billig     |< nicht preiswert
! |> Marco      |< Polo      | billiger     |< nicht verfügbar
  
! ;: 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-Formatierungen
  
! * Du benötigst keine HTML-Formatierungen
  * < und > erscheinen einfach so im Text
  * Sonderzeichen mit & funktionieren nicht
! * Wenn du wirklich HTML verwenden ''mußt'', kann dein Systemverwalter diese Funktion aktivieren. Du mußt dann jede Zeile mit einem senkrechten Strich (|) beginnen. Normalerweise ist diese Funktion aber deaktiviert.

Index: Titelsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Titelsuche,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Titelsuche	2001/12/19 05:21:19	1.3
--- Titelsuche	2002/01/09 05:21:48	1.4
***************
*** 1,16 ****
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: TitelSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 04:58:45 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=Titelsuche;
    flags="";
!   lastmodified=1008496725;
! Content-Transfer-Encoding: quoted-printable
  
  <?plugin TitleSearch?>
  ----
  Wieder Suchen:
! <?plugin-form TitleSearch auto_redirect=3D0?>
  <?plugin-form FullTextSearch?>
--- 1,13 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=Titelsuche;
    flags="";
!   lastmodified=1009931535;
! Content-Transfer-Encoding: binary
  
  <?plugin TitleSearch?>
  ----
  Wieder Suchen:
! <?plugin-form TitleSearch auto_redirect=0?>
  <?plugin-form FullTextSearch?>

Index: Volltextsuche
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/Volltextsuche,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Volltextsuche	2001/12/19 05:21:14	1.3
--- Volltextsuche	2002/01/09 05:21:48	1.4
***************
*** 1,12 ****
! From [no address given]  Tue Dec 18 02:37:26 2001
! Subject: VolltextSuche
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:00:03 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=Volltextsuche;
    flags="";
!   lastmodified=1008496803;
! Content-Transfer-Encoding: quoted-printable
  
  <?plugin FullTextSearch?>
--- 1,9 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=Volltextsuche;
    flags="";
!   lastmodified=1008736719;
! Content-Transfer-Encoding: binary
  
  <?plugin FullTextSearch?>

Index: WabiSabi
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WabiSabi,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** WabiSabi	2001/04/07 17:13:28	1.2
--- WabiSabi	2002/01/09 05:21:48	1.3
***************
*** 1,26 ****
! Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it ''"occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."''
! 
! Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
! 
! It is the beauty of things modest and humble.
! 
! It is the beauty of things unconventional.
! 
! The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes ''"direct, intuitive insight into transcendental truth beyond all intellectual conception."'' At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
! 
! * All things are impermanent
! * All things are imperfect
! * All things are incomplete 
! 
! Material characteristics of wabi-sabi:
! 
! * suggestion of natural process
! * irregular
! * intimate
! * unpretentious
! * earthy
! * simple
! 
! For more about wabi-sabi, see
! http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm
! 
--- 1,33 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
! Content-Type: application/x-phpwiki;
!   pagename=WabiSabi;
!   flags="";
!   lastmodified=1010551574;
! Content-Transfer-Encoding: binary
! 
! Since wabi-sabi represents a comprehensive Japanese world view or aesthetic system, it is difficult to explain precisely in western terms.  According to Leonard Koren, wabi-sabi is the most conspicuous and characteristic feature of what we think of as traditional Japanese beauty and it ''"occupies roughly the same position in the Japanese pantheon of aesthetic values as do the Greek ideals of beauty and perfection in the West."''
! 
! Wabi-sabi is a beauty of things imperfect, impermanent, and incomplete.
! 
! It is the beauty of things modest and humble.
! 
! It is the beauty of things unconventional.
! 
! The concepts of wabi-sabi correlate with the concepts of Zen Buddhism, as the first Japanese involved with wabi-sabi were tea masters, priests, and monks who practiced Zen. Zen Buddhism originated in India, traveled to China in the 6th century, and was first introduced in Japan around the 12th century. Zen emphasizes ''"direct, intuitive insight into transcendental truth beyond all intellectual conception."'' At the core of wabi- sabi is the importance of transcending ways of looking and thinking about things/existence.
! 
! * All things are impermanent
! * All things are imperfect
! * All things are incomplete
! 
! Material characteristics of wabi-sabi:
! 
! * suggestion of natural process
! * irregular
! * intimate
! * unpretentious
! * earthy
! * simple
! 
! For more about wabi-sabi, see
! http://www.art.unt.edu/ntieva/artcurr/japan/wabisabi.htm

Index: WieManWikiBenutzt
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WieManWikiBenutzt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** WieManWikiBenutzt	2001/12/19 04:52:40	1.6
--- WieManWikiBenutzt	2002/01/09 05:21:48	1.7
***************
*** 1,59 ****
! From [no address given]  Sun Dec 16 06:33:24 2001
! Subject: WieManWikiBenutzt
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 05:22:03 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=WieManWikiBenutzt;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
! ''=ABWiki wiki=BB'' hei=DFt =ABschnell=BB auf Hawai'anisch.
  
! __Alles was du wissen mu=DFt ist:__
  
! * Klicke auf =ABEditiereText=BB am unteren Ende der Seite, um sie zu =
! bearbeiten. Du solltest das gleich jetzt tun und den Quelltext dieser =
! Seite lesen - es ergibt dann mehr Sinn.
! * Kursiven Text bekommt man, indem man W=F6rter in jeweils zwei =
! Apostrophen ' einschlie=DFt, ''wie in diesem Beispiel''.
! * Fette Schrift bekommt man, indem man W=F6rter in jeweils zwei =
! untergesetzten Strichen einschlie=DFt, __wie in diesem Beispiel__
  * Und beides, indem man __''beides verwendet''__.
! * Eine Liste erh=E4lt man, indem man eine Zeile mit einem Sternchen =
! =AB*=BB startet.
! * Vorformatierten Text r=FCckt man mit mindestens einem Leerzeichen ein:
  
   Das ist ein Gedicht
!  =FCber vorformatierten Text
   Es gibt Reime mit Gedicht
   aber nicht mit Text
  
! * Abs=E4tze werden durch eine Leerzeile voneinander getrennt.
  
  Ich bin ein Absatz.
  
! Ich bin auch ein Absatz. Wir sind halt sehr kleine Abs=E4tze.
  
! * Eine horizontale Trennlinie bekommt man indem man vier oder mehr =
! Bindestriche an den Anfang einer Zeile stellt:
  ----
! * Links kann man erzeugen, indem man einzelne W=F6rter, deren =
! Anfangsbuchstabe gro=DF geschrieben wird, zusammenf=FCgt. Wenn du also =
! etwa eine Seite dar=FCber  schreiben willst, da=DF Arno Ratten mag, =
! schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert =
! erscheint dahinter ein Fragezeichen, das dir die M=F6glichkeit gibt die =
! Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das =
! Beispiel nicht, indem du diese Seite erzeugst).
! * Um externe Links zu setzen, kannst du einfach die Adresse eintippen und =
! PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
! * Um Bilder einzuf=FCgen, schlie=DFt man deren Adresse in eckigen Klammern =
! ein, wie hier: [[!http://www.deinhost.de/bilder/bild.png]. Falls die =
! Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die =
! Adresse (nicht aber das Bild) angezeigt.
  * Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
  
  ----
  WikiWikiWeb soll schnell und einfach zu editieren sein. Es hat eine sehr
! einfache Syntax, =FCber die du in TextFormatierungsRegeln mehr erfahren =
! kannst.
--- 1,40 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=WieManWikiBenutzt;
    flags="";
!   lastmodified=1008922802;
! Content-Transfer-Encoding: binary
  
! ''»Wiki wiki«'' heißt »schnell« auf Hawai'anisch.
  
! __Alles was du wissen mußt ist:__
  
! * Klicke auf »Editieren« am unteren Ende der Seite, um sie zu bearbeiten. Du solltest das gleich jetzt tun und den Quelltext dieser Seite lesen - es ergibt dann mehr Sinn.
! * Kursiven Text bekommt man, indem man Wörter in jeweils zwei Apostrophen ' einschließt, ''wie in diesem Beispiel''.
! * Fette Schrift bekommt man, indem man Wörter in jeweils zwei untergesetzten Strichen einschließt, __wie in diesem Beispiel__
  * Und beides, indem man __''beides verwendet''__.
! * Eine Liste erhält man, indem man eine Zeile mit einem Sternchen »*« startet.
! * Vorformatierten Text rückt man mit mindestens einem Leerzeichen ein:
  
   Das ist ein Gedicht
!  über vorformatierten Text
   Es gibt Reime mit Gedicht
   aber nicht mit Text
  
! * Absätze werden durch eine Leerzeile voneinander getrennt.
  
  Ich bin ein Absatz.
  
! Ich bin auch ein Absatz. Wir sind halt sehr kleine Absätze.
  
! * Eine horizontale Trennlinie bekommt man indem man vier oder mehr Bindestriche an den Anfang einer Zeile stellt:
  ----
! * Links kann man erzeugen, indem man einzelne Wörter, deren Anfangsbuchstabe groß geschrieben wird, zusammenfügt. Wenn du also etwa eine Seite darüber  schreiben willst, daß Arno Ratten mag, schreibst du: ArnoMagRatten. Falls die Seite noch nicht existiert erscheint dahinter ein Fragezeichen, das dir die Möglichkeit gibt die Seite zu erzeugen: DieseSeiteSollteNichtExistieren. (Und bitte verdirb das Beispiel nicht, indem du diese Seite erzeugst).
! * Um externe Links zu setzen, kannst du einfach die Adresse eintippen und PhpWiki erzeugt einen passenden Link, z.B. http://www.diezeit.de/
! * Um Bilder einzufügen, schließt man deren Adresse in eckigen Klammern ein, wie hier: [[!http://www.deinhost.de/bilder/bild.png]. Falls die Adresse des Bildes nicht in eckigen Klammern steht, wird einfach nur die Adresse (nicht aber das Bild) angezeigt.
  * Jetzt kann es eigentlich schon mit dem SeitenErzeugen losgehen!
  
  ----
  WikiWikiWeb soll schnell und einfach zu editieren sein. Es hat eine sehr
! einfache Syntax, über die du in TextFormatierungsRegeln mehr erfahren kannst.

Index: WikiTechnik
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WikiTechnik,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** WikiTechnik	2001/12/16 07:44:11	1.4
--- WikiTechnik	2002/01/09 05:21:48	1.5
***************
*** 1,41 ****
! From [no address given]  Sun Dec 16 02:19:07 2001
! Subject: WikiTechnik
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 01:41:19 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=WikiTechnik;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
! PhpWiki ist in der serverseitigen Skriptsprache PHP (http://www.php.net/) =
! geschrieben. PHP hat eine =E4hnliche Syntax wie Perl oder C und =
! funktioniert =E4hnlich wie ASP, !EmbPerl oder JSP.
! 
! PhpWiki besteht aus etwa einem Dutzend Dateien mit gemischtem PHP und =
! HTML. Die Webseiten, aus denen ein WikiWikiWeb besteht, werden von PHP =
! live in einer DBM-Datei gespeichert, au=DFerdem werden Sicherungskopien =
! der vorherigen Versionen aller Seiten in einer weiteren DBM-Datei =
! gespeichert. (PhpWiki unterst=FCtzt inzwischen neben DBM auch =
! Datenbankserver wie MySQL oder PostgreSQL und einfache Textdateien.)
! 
! Immer wenn ein Benutzer eine Seite anfordert wird sie aus der DBM geholt =
! und fliegender erstellt. Anwender fragen nur die Seite index.php ab, die =
! automatisch feststellt, welche weiteren Seiten eingebunden werden m=FCssen.
! 
! Links auf andere Seiten in einem Wiki werden automatisch erstellt: =
! PhpWiki. Die M=F6glichkeit, neue Seiten zu erstellen, indem man einfach =
! einen Link zu diesen erstellt, ist eine der wichtigsten Eigenschaften =
! eines Wiki. Au=DFerdem sind Links auf externe Seiten genauso einfach zu =
! erstellen:
  # http://www.wcsb.org/
  # ftp://ftp.redhat.com/
  # news://news.mozilla.org/
  
! In Verbindung mit einem einzigen Namensraum und einfachen =
! Textformatierungen besitzt ein Wiki viele Eigenschaften von WabiSabi.
  
! PhpWiki ist freie Software unter der GNU General Public License, die unter =
! dieser Adresse zu finden ist: =
! http://agnes.dida.physik.uni-essen.de/~gnu-pascal/gpl-ger.html (und auf =
! Englisch: http://www.gnu.org/copyleft/gpl.html).
--- 1,22 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=WikiTechnik;
    flags="";
!   lastmodified=1008922802;
! Content-Transfer-Encoding: binary
  
! PhpWiki ist in der serverseitigen Skriptsprache PHP (http://www.php.net/) geschrieben. PHP hat eine ähnliche Syntax wie Perl oder C und funktioniert ähnlich wie ASP, !EmbPerl oder JSP.
! 
! PhpWiki besteht aus etwa einem Dutzend Dateien mit gemischtem PHP und HTML. Die Webseiten, aus denen ein WikiWikiWeb besteht, werden von PHP live in einer DBM-Datei gespeichert, außerdem werden Sicherungskopien der vorherigen Versionen aller Seiten in einer weiteren DBM-Datei gespeichert. (PhpWiki unterstützt inzwischen neben DBM auch Datenbankserver wie MySQL oder PostgreSQL und einfache Textdateien.)
! 
! Immer wenn ein Benutzer eine Seite anfordert wird sie aus der DBM geholt und fliegender erstellt. Anwender fragen nur die Seite index.php ab, die automatisch feststellt, welche weiteren Seiten eingebunden werden müssen.
! 
! Links auf andere Seiten in einem Wiki werden automatisch erstellt: PhpWiki. Die Möglichkeit, neue Seiten zu erstellen, indem man einfach einen Link zu diesen erstellt, ist eine der wichtigsten Eigenschaften eines Wiki. Außerdem sind Links auf externe Seiten genauso einfach zu erstellen:
  # http://www.wcsb.org/
  # ftp://ftp.redhat.com/
  # news://news.mozilla.org/
  
! In Verbindung mit einem einzigen Namensraum und einfachen Textformatierungen besitzt ein Wiki viele Eigenschaften von WabiSabi.
  
! PhpWiki ist freie Software unter der GNU General Public License, die unter dieser Adresse zu finden ist: http://agnes.dida.physik.uni-essen.de/~gnu-pascal/gpl-ger.html (und auf Englisch: http://www.gnu.org/copyleft/gpl.html).

Index: WikiWikiWeb
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/WikiWikiWeb,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WikiWikiWeb	2001/12/16 07:44:16	1.3
--- WikiWikiWeb	2002/01/09 05:21:48	1.4
***************
*** 1,33 ****
! From [no address given]  Sun Dec 16 02:19:07 2001
! Subject: WikiWikiWeb
! From: [no address given] (PhpWiki)
! Date: Sun, 16 Dec 2001 02:16:21 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=WikiWikiWeb;
    flags="";
! Content-Transfer-Encoding: quoted-printable
  
! Ein WikiWikiWeb ist eine Website, bei der jeder am Inhalt mitarbeiten =
! kann. Jeder, der das Wiki liest, kann auch Seiten bearbeiten und neue =
! Seiten erstellen. Das bekannteste und meistverwendete Wiki ist das =
! Portland Pattern Repository unter http://c2.com/cgi-bin/wiki?WikiWikiWeb.
  
  Einige Zitate:
  
! ''Die Idee ist, die Funktion EditiereText einfach und die Suchfunktion =
! (SeiteFinden) schnell zu machen.''
  
! ''Abgesehen von der Geschwindigkeit orientiert sich diese Site auch an =
! Zen-Idealen die als WabiSabi bezeichnet werden. Nach Zen liegt Sch=F6nheit =
! im Unvollst=E4ndigen, Kurzlebigen. Letzendlich ben=F6tigt man nichts =
! weiter.''
! 
! ''Die Universum f=FChrt tendenziell nach dem Chaos. Die Universum f=FChrt =
! tendenziell nach Wiki.''
! 
! Du kannst dich im [G=E4steBuch] eintragen, oder lerne WieManWikiBenutzt =
! und wie man SeitenErzeugen kann. Hier gibts offene Diskussion. Viel =
! Vergn=FCgen!
  
  --SteveWainstead.
--- 1,21 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=WikiWikiWeb;
    flags="";
!   lastmodified=1010551574;
! Content-Transfer-Encoding: binary
  
! Ein WikiWikiWeb ist eine Website, bei der jeder am Inhalt mitarbeiten kann. Jeder, der das Wiki liest, kann auch Seiten bearbeiten und neue Seiten erstellen. Das bekannteste und meistverwendete Wiki ist das Portland Pattern Repository unter http://c2.com/cgi-bin/wiki?WikiWikiWeb.
  
  Einige Zitate:
  
! ''Die Idee ist, die Funktion EditiereText einfach und die Suchfunktion (SeiteFinden) schnell zu machen.''
  
! ''Abgesehen von der Geschwindigkeit orientiert sich diese Site auch an Zen-Idealen die als WabiSabi bezeichnet werden. Nach Zen liegt Schönheit im Unvollständigen, Kurzlebigen. Letzendlich benötigt man nichts weiter.''
! 
! ''Die Universum führt tendenziell nach dem Chaos. Die Universum führt tendenziell nach Wiki.''
! 
! Du kannst dich im [GästeBuch] eintragen, oder lerne WieManWikiBenutzt und wie man SeitenErzeugen kann. Hier gibts offene Diskussion. Viel Vergnügen!
  
  --SteveWainstead.

[phpwiki-checkins] CVS: phpwiki/locale/de/pgsrc PhpWikiSystemverwalten,1.3,1.4

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

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

Modified Files:
	PhpWikiSystemverwalten 
Log Message:
Added Rake Sandbox command (still needs translation). Converted page to binary format for easier editing during translation.

Index: PhpWikiSystemverwalten
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/de/pgsrc/PhpWikiSystemverwalten,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** PhpWikiSystemverwalten	2001/12/21 07:31:31	1.3
--- PhpWikiSystemverwalten	2002/01/09 05:14:50	1.4
***************
*** 1,30 ****
! From [no address given]  Fri Dec 21 02:02:03 2001
! Subject: PhpWikiSystemverwalten
! From: [no address given] (PhpWiki)
! Date: Fri, 21 Dec 2001 02:00:31 -0500
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.0-jeffs-hacks)
  Content-Type: application/x-phpwiki;
    pagename=PhpWikiSystemverwalten;
    flags=PAGE_LOCKED;
    lastmodified=1008918031;
! Content-Transfer-Encoding: quoted-printable
  
  
! __Beachtung__: Du mu=DFt der Systemverwalter-Account mit Passwort zuerst =
! sch=FCtzen, sonnst werden ziemlich viel von diesen Administrationsbefehlen =
! nicht funkionieren.
  
  -----------
  ! Anmelden
  
! __[ Melde mich an | phpwiki:?action=3Dlogin]__
  
  This allows you to login.
! While you are logged in you will be able to ''lock'', ''unlock'' and =
! ''delete'' pages.
  You will also be able edit ''locked'' pages.
  
  ----------
  
  !! Speicherauszug und Archiv-Datenversicherung
  
--- 1,29 ----
! Mime-Version: 1.0 (Produced by PhpWiki 1.3.2-jeffs-hacks+carsten's-binary-hack)
! X-RCS_ID: $Id$
  Content-Type: application/x-phpwiki;
    pagename=PhpWikiSystemverwalten;
    flags=PAGE_LOCKED;
    lastmodified=1008918031;
! Content-Transfer-Encoding: binary
  
  
! __Beachtung__: Du mußt der Systemverwalter-Account mit Passwort zuerst schützen, sonnst werden ziemlich viel von diesen Administrationsbefehlen nicht funkionieren.
  
  -----------
  ! Anmelden
  
! __[ Melde mich an | phpwiki:?action=login]__
  
  This allows you to login.
! While you are logged in you will be able to ''lock'', ''unlock'' and ''delete'' pages.
  You will also be able edit ''locked'' pages.
  
  ----------
+ !! Cleanup
+ A Wiki SandBox is very easy to clean. Here you can restore it to pristine condition by loading the default from pgsrc:
  
+ [ Rake the SandBox | phpwiki:?action=loadfile&source=pgsrc/SandBox ].
+ 
+ ----------
  !! Speicherauszug und Archiv-Datenversicherung
  
***************
*** 32,47 ****
  
  These links lead to zip files, generated on the fly, which contain all
! the  pages in your Wiki.  The zip file will be downloaded to your local =
! computer.
  
! Dieser __[ ZIP Speicherauszug | phpwiki:?action=3Dzip]__ enth=E4lt nur die =
! Aktuellste Versionen die Seiten, und dieser __[ ZIP Speicherauszug | =
! phpwiki:?action=3Dzip&include=3Dall]__ enth=E4lt alle
  archivierte Versionen.
  
  (If the PhpWiki is configured to allow it,) anyone can download a zip file.
  
! If your php has ''zlib'' support, the files in the archive will be =
! compressed,
  otherwise they will just be stored.
  
--- 31,42 ----
  
  These links lead to zip files, generated on the fly, which contain all
! the  pages in your Wiki.  The zip file will be downloaded to your local computer.
  
! Dieser __[ ZIP Speicherauszug | phpwiki:?action=zip]__ enthält nur die Aktuellste Versionen die Seiten, und dieser __[ ZIP Speicherauszug | phpwiki:?action=zip&include=all]__ enthält alle
  archivierte Versionen.
  
  (If the PhpWiki is configured to allow it,) anyone can download a zip file.
  
! If your php has ''zlib'' support, the files in the archive will be compressed,
  otherwise they will just be stored.
  
***************
*** 50,55 ****
  Here you can dump pages of your Wiki into a directory of your choice.
  
! [ Schreibe Seiten aus | =
! phpwiki:?action=3Ddumpserial&directory=3D(/tmp/wikidump) ]
  
  The most recent version of each page will written out to the
--- 45,49 ----
  Here you can dump pages of your Wiki into a directory of your choice.
  
! [ Schreibe Seiten aus | phpwiki:?action=dumpserial&directory=(/tmp/wikidump) ]
  
  The most recent version of each page will written out to the
***************
*** 72,76 ****
  your (client) machine.
  
! [ Hinauflade | phpwiki:?action=3Dupload&file=3D50()upload ]
  
  ! Dateien Einspeichern
--- 66,70 ----
  your (client) machine.
  
! [ Hinauflade | phpwiki:?action=upload&file=50()upload ]
  
  ! Dateien Einspeichern
***************
*** 80,85 ****
  You can also use this form to load from an http: or ftp: URL.
  
! [ Seiten einspeichern | =
! phpwiki:?action=3Dloadfile&source=3D50(/tmp/wikidump) ]
  
  -----------
--- 74,78 ----
  You can also use this form to load from an http: or ftp: URL.
  
! [ Seiten einspeichern | phpwiki:?action=loadfile&source=50(/tmp/wikidump) ]
  
  -----------

[phpwiki-checkins] CVS: phpwiki phpwiki.css,1.19,1.20 phpwiki-modern.css,1.2,1.3

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

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

Modified Files:
	phpwiki.css phpwiki-modern.css 
Log Message:
Fix for bug #501091

Index: phpwiki.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** phpwiki.css	2001/12/27 18:11:44	1.19
--- phpwiki.css	2002/01/09 04:11:14	1.20
***************
*** 237,241 ****
    background: #fff8dc; /* darker ivory */
    font-size: smaller;
!   padding: 0.05ex 1%;
  }
    
--- 237,241 ----
    background: #fff8dc; /* darker ivory */
    font-size: smaller;
!   padding: 0.05ex 2pt;
  }
    

Index: phpwiki-modern.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/phpwiki-modern.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** phpwiki-modern.css	2001/12/27 18:11:34	1.2
--- phpwiki-modern.css	2002/01/09 04:11:14	1.3
***************
*** 307,311 ****
    border-style: solid;
    font-size: smaller;
!   padding: 0.05ex 1%;
  }
    
--- 307,311 ----
    border-style: solid;
    font-size: smaller;
!   padding: 0.05ex 2pt;
  }