efwiki-cvs — CVS-Logs for FUWiki

[fuwiki-cvs] fuwiki_1_0/install tables.sql,1.2,1.3

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv561/install

Modified Files:
	tables.sql 
Log Message:
up-to-date with fuckupwiki codebase

Index: tables.sql
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/install/tables.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tables.sql	7 Nov 2004 12:00:35 -0000	1.2
--- tables.sql	13 Feb 2005 21:28:31 -0000	1.3
***************
*** 1,92 ****
! CREATE TABLE `messages` (
!   `id` int(11) NOT NULL auto_increment,
!   `senderid` int(11) default '0',
!   `receiverid` int(11) NOT NULL default '0',
!   `message` text NOT NULL,
!   `date` varchar(14) NOT NULL default '',
!   `has_read` set('true','false') NOT NULL default 'false',
!   PRIMARY KEY  (`id`),
!   KEY `senderid` (`senderid`,`receiverid`,`date`),
!   KEY `read` (`has_read`)
  );
  
! CREATE TABLE `restrictions` (
!   `id` int(11) NOT NULL default '0',
!   `name` varchar(255) NOT NULL default '',
!   `priv` char(2) NOT NULL default 'rw',
!   PRIMARY KEY  (`id`),
!   UNIQUE KEY `name` (`name`)
  );
  
! CREATE TABLE `stats` (
!   `id` bigint(20) NOT NULL auto_increment,
!   `name` varchar(255) NOT NULL default '',
!   `value` varchar(255) NOT NULL default '',
!   `date` varchar(14) default NULL,
!   PRIMARY KEY  (`id`),
!   KEY `name` (`name`)
  );
  
! CREATE TABLE `user_priv` (
!   `id` int(11) NOT NULL auto_increment,
!   `user_id` int(11) NOT NULL default '0',
!   `is_admin` set('true','false') NOT NULL default 'false',
!   `can_move` set('true','false') NOT NULL default 'false',
!   `can_delete` set('true','false') NOT NULL default 'false',
!   `can_makeadmin` set('true','false') NOT NULL default 'false',
!   `can_changeprivs` set('true','false') NOT NULL default 'false',
!   `can_postnews` set('true','false') NOT NULL default 'false',
!   `can_lock` set('true','false') NOT NULL default 'false',
!   PRIMARY KEY  (`id`)
  );
  
! CREATE TABLE `user_settings` (
!   `uid` int(11) NOT NULL default '0',
!   `show_footer` set('true','false') NOT NULL default 'true',
!   `show_commentbox` set('true','false') NOT NULL default 'true',
!   `show_commentbox_signature` set('true','false') NOT NULL default 'true',
!   `show_loginbox` set('true','false') NOT NULL default 'true',
!   `show_userpages` set('true','false') NOT NULL default 'false',
!   `show_searchbox` set('true','false') NOT NULL default 'true',
!   `show_comments` set('true','false') NOT NULL default 'true',
!   `show_commentbox_upload` set('true','false') NOT NULL default 'false',
!   UNIQUE KEY `uid` (`uid`)
  );
  
! CREATE TABLE `users` (
!   `id` int(11) NOT NULL auto_increment,
!   `name` varchar(255) NOT NULL default '',
!   `date_joined` timestamp(14) NOT NULL,
!   `password` varchar(255) default NULL,
!   `email` tinytext,
!   `layout` varchar(255) default NULL,
!   `style` varchar(255) default 'default',
!   `language` varchar(255) default 'en',
!   `signature` tinytext,
!   PRIMARY KEY  (`id`),
!   UNIQUE KEY `name` (`name`)
  );
  
! CREATE TABLE `votes` (
!   `id` int(11) NOT NULL auto_increment,
!   `creatorid` int(11) NOT NULL default '0',
!   `headline` text NOT NULL,
!   `options` text NOT NULL,
!   `results` text,
!   `signerids` text,
!   `date` varchar(14) NOT NULL default '',
!   PRIMARY KEY  (`id`),
!   KEY `creatorid` (`creatorid`),
!   KEY `date` (`date`)
  );
  
! CREATE TABLE `wikis` (
!   `id` bigint(20) NOT NULL auto_increment,
!   `date` varchar(14) default NULL,
!   `creator_id` int(11) NOT NULL default '0',
!   `revision` int(11) default '0',
!   `name` tinytext,
!   `text` longtext,
!   PRIMARY KEY  (`id`)
  );
  
--- 1,109 ----
! CREATE TABLE html_cache (
!   id bigint(20) NOT NULL auto_increment,
!   revision int(11) default '0',
!   name tinytext,
!   text longtext,
!   lang char(2) NOT NULL default '',
!   PRIMARY KEY  (id)
  );
  
! CREATE TABLE images (
!   id bigint(20) NOT NULL auto_increment,
!   uploader_id int(11) NOT NULL default '0',
!   pagename tinytext NOT NULL,
!   name tinytext NOT NULL,
!   upload_time varchar(14) NOT NULL default '',
!   filetype varchar(10) default NULL,
!   KEY id (id)
  );
  
! CREATE TABLE messages (
!   id int(11) NOT NULL auto_increment,
!   senderid int(11) default '0',
!   receiverid int(11) NOT NULL default '0',
!   message text NOT NULL,
!   date varchar(14) NOT NULL default '',
!   has_read set('true','false') NOT NULL default 'false',
!   PRIMARY KEY  (id)
  );
  
! CREATE TABLE restrictions (
!   id int(11) NOT NULL auto_increment,
!   name varchar(255) NOT NULL default '',
!   priv char(2) NOT NULL default 'rw',
!   PRIMARY KEY  (id),
!   UNIQUE KEY name (name)
  );
  
! CREATE TABLE stats (
!   id bigint(20) NOT NULL auto_increment,
!   name varchar(255) NOT NULL default '',
!   value varchar(255) NOT NULL default '',
!   date varchar(14) default NULL,
!   PRIMARY KEY  (id),
!   KEY name (name)
  );
  
! CREATE TABLE user_priv (
!   id int(11) NOT NULL auto_increment,
!   user_id int(11) NOT NULL default '0',
!   is_admin set('true','false') NOT NULL default 'false',
!   can_move set('true','false') NOT NULL default 'false',
!   can_delete set('true','false') NOT NULL default 'false',
!   can_makeadmin set('true','false') NOT NULL default 'false',
!   can_changeprivs set('true','false') NOT NULL default 'false',
!   can_postnews set('true','false') NOT NULL default 'false',
!   can_lock set('true','false') NOT NULL default 'false',
!   PRIMARY KEY  (id)
  );
  
! CREATE TABLE user_settings (
!   uid int(11) NOT NULL default '0',
!   show_footer set('true','false') NOT NULL default 'true',
!   show_commentbox set('true','false') NOT NULL default 'true',
!   show_commentbox_signature set('true','false') NOT NULL default 'true',
!   show_loginbox set('true','false') NOT NULL default 'true',
!   show_userpages set('true','false') NOT NULL default 'false',
!   show_searchbox set('true','false') NOT NULL default 'false',
!   show_comments set('true','false') NOT NULL default 'true',
!   show_commentbox_upload set('true','false') NOT NULL default 'false',
!   UNIQUE KEY uid (uid)
  );
  
! CREATE TABLE users (
!   id int(11) NOT NULL auto_increment,
!   name varchar(255) NOT NULL default '',
!   date_joined timestamp(14) NOT NULL,
!   password varchar(255) default NULL,
!   email tinytext,
!   layout varchar(255) default NULL,
!   style varchar(255) NOT NULL default 'default',
!   language varchar(255) default 'en',
!   signature tinytext,
!   PRIMARY KEY  (id),
!   UNIQUE KEY name (name)
! );
! 
! CREATE TABLE votes (
!   id int(11) NOT NULL auto_increment,
!   creatorid int(11) NOT NULL default '0',
!   headline text NOT NULL,
!   options text NOT NULL,
!   results text,
!   signerids text,
!   date varchar(14) NOT NULL default '',
!   PRIMARY KEY  (id),
!   KEY creatorid (creatorid),
!   KEY date (date)
! );
! 
! CREATE TABLE wikis (
!   id bigint(20) NOT NULL auto_increment,
!   date varchar(14) default NULL,
!   creator_id int(11) NOT NULL default '0',
!   revision int(11) default '0',
!   name tinytext,
!   text longtext,
!   PRIMARY KEY  (id)
  );
  

[fuwiki-cvs] fuwiki_1_0 functions.inc,1.5,1.6 index.php,1.4,1.5 index_rss.php,1.1.1.1,1.2 io.mysql.inc,1.3,1.4 parser.inc,1.6,1.7 user.inc,1.2,1.3

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30058

Modified Files:
	functions.inc index.php index_rss.php io.mysql.inc parser.inc 
	user.inc 
Log Message:
up-to-date with fuckupwiki codebase

Index: parser.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/parser.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** parser.inc	15 Nov 2004 20:39:18 -0000	1.6
--- parser.inc	13 Feb 2005 21:21:48 -0000	1.7
***************
*** 102,107 ****
      $action = _COMMENT_DEFAULT; $timestamp = "";
      $comment_num++;
!     $arguments = stripslashes(stripslashes($arguments));
!     if(preg_match("/action=\"([^\"]*)\"/", $arguments, $o)) {
          $action = $WikiParser->parse_comment_action($o[1]);
      }
--- 102,107 ----
      $action = _COMMENT_DEFAULT; $timestamp = "";
      $comment_num++;
!     $arguments = stripslashes(stripslashes(stripslashes($arguments)));
!     if(preg_match("/action=\"([^\"]*)\"/Us", $arguments, $o)) {
          $action = $WikiParser->parse_comment_action($o[1]);
      }
***************
*** 236,244 ****
  }
  
! function parse_votes_callback($str)
  {
      global $wiki_vote;
      $wiki_vote = $str;
!     return get_wikielement('vote');
  }
  
--- 236,247 ----
  }
  
! function parse_votes_callback($str, $cache)
  {
      global $wiki_vote;
      $wiki_vote = $str;
!     $str = get_wikielement('vote');
!     if($cache)
!         return preg_replace("/\r/", "\n", preg_replace("/\n/", "<br />", $str, -1), -1);
!     return $str;
  }
  
***************
*** 327,335 ****
          $string = $this->extract_nowiki($string);
          $string = preg_replace("/</", "&lt;", $string, -1);
!         $string = preg_replace("/(?!^|\n)>/", "&gt;", $string, -1);
          foreach($nowiki_cache as $key => $v)
              $nowiki_cache[$key] = htmlentities($v, ENT_NOQUOTES, "UTF-8");
          $string = $this->pre_parse($string);
!         if(!$this->show_comments || (!$html_caching && !$WikiUser->get_setting("show_comments")) || (!preg_match("/\[\/comment\]/", $string) && !preg_match("/--/", $string))) {
              $string = $this->parse_in_nocomments($string);
          } else {
--- 330,338 ----
          $string = $this->extract_nowiki($string);
          $string = preg_replace("/</", "&lt;", $string, -1);
!         $string = preg_replace("/>/", "&gt;", $string, -1);
          foreach($nowiki_cache as $key => $v)
              $nowiki_cache[$key] = htmlentities($v, ENT_NOQUOTES, "UTF-8");
          $string = $this->pre_parse($string);
!         if(!$this->show_comments || (!$WikiUser->get_setting("show_comments")) || (!preg_match("/\[\/comment\]/", $string) && !preg_match("/--/", $string))) {
              $string = $this->parse_in_nocomments($string);
          } else {
***************
*** 361,365 ****
--- 364,370 ----
      function parse_html_cache($string)
      {
+         $this->html_caching = false;
          $string = $this->parse_votes($string);
+         $string = $this->parse_divs($string);
          return $string;
      }
***************
*** 373,376 ****
--- 378,382 ----
      function parse_private_message($string)
      {
+         $this->html_caching = false;
          $string = preg_replace("/\r\n/", "\n", $string, -1);
          $string = preg_replace("/\n\r/", "\n", $string, -1);
***************
*** 416,422 ****
          $string = $this->parse_lists($string);
          $string = $this->parse_hr($string);
-         $string = $this->parse_showpage($string);
          $string = $this->parse_votes($string);
          $string = $this->parse_divs($string);
          return $string;
      }
--- 422,428 ----
          $string = $this->parse_lists($string);
          $string = $this->parse_hr($string);
          $string = $this->parse_votes($string);
          $string = $this->parse_divs($string);
+         $string = $this->parse_showpage($string);
          return $string;
      }
***************
*** 569,573 ****
          if($this->html_caching)
              return $string;
!         return preg_replace("/\[showvote ([0123456789]+)\]/Ue", "parse_votes_callback('\\1')", $string, -1);
      }
      
--- 575,579 ----
          if($this->html_caching)
              return $string;
!         return preg_replace("/\[showvote:? ([0123456789]+)\]/Ue", "parse_votes_callback('\\1', \$this->html_caching)", $string, -1);
      }
      
***************
*** 661,667 ****
--- 667,688 ----
      
      function parse_divs($string) {
+         global $creatinghtmlcache;
+         if($creatinghtmlcache == true || $this->html_caching == true)
+             return $string;
+         if(preg_match("/(&lt;|<)style(&gt;|>)(.*)(<|&lt;)\/style(>|&gt;)/Us", $string, $out))
+         {
+             global $additional_html_header;
+             $additional_html_header .= "<style type=\"text/css\">".preg_replace("/(<br \/>|\r)/", "", $out[3], -1)."</style>";
+             if(!$this->html_caching)
+                 $string = preg_replace("/(&lt;|<)style(&gt;|>)(.*)(<|&lt;)\/style(>|&gt;)/s", "", $string, 1);
+         }
          $string = preg_replace("/&lt;div style=\"(.*)\"&gt;/iUs", "<div style=\"\\1\">", $string, -1);
+         $string = preg_replace("/&lt;div class=\"(.*)\"&gt;/iUs", "<div class=\"\\1\">", $string, -1);
          $string = preg_replace("/&lt;\/div&gt;/", "</div>", $string, -1);
          $string = preg_replace("/&lt;div&gt;/iUs", "<div>", $string, -1);
+         $string = preg_replace("/&lt;span style=\"(.*)\"&gt;/iUs", "<span style=\"\\1\">", $string, -1);
+         $string = preg_replace("/&lt;span class=\"(.*)\"&gt;/iUs", "<span class=\"\\1\">", $string, -1);
+         $string = preg_replace("/&lt;\/span&gt;/", "</span>", $string, -1);
+         $string = preg_replace("/&lt;span&gt;/iUs", "<span>", $string, -1);
          return $string;
      }

Index: index.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/index.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.php	7 Nov 2004 12:00:33 -0000	1.4
--- index.php	13 Feb 2005 21:21:48 -0000	1.5
***************
*** 73,76 ****
--- 73,78 ----
  if(!empty($_POST["edited"]))
  {
+   if(!empty($_POST["is_private"]))
+     $WikiIO->set_private(_PAGENAME);
    // Save uploaded file
    save_image(_PAGENAME, $_FILES['userfile']['name'], $_FILES['userfile']['tmp_name']);
***************
*** 89,92 ****
--- 91,96 ----
  if(!empty($_POST["commented"]))
  {
+     if(!empty($_POST["is_private"]))
+         $WikiIO->set_private(_PAGENAME);
    $WikiStats->edit_page(true);
    // Save uploaded file
***************
*** 101,105 ****
    }
    else
!   	$WikiIO->write(_PAGENAME, $WikiUser->get_name(), $temp_rev->text."\n\n". "[comment".($action != _COMMENT_DEFAULT ? " action=\"".stripslashes($action)."\"":"")." timestamp=".get_timestamp()."]\n".$comment ." ".stripslashes($_POST["signature"])."[/comment]");
  }
  
--- 105,109 ----
    }
    else
!   	$WikiIO->write(_PAGENAME, $WikiUser->get_name(), $temp_rev->text."\n\n". "[comment".($action != _COMMENT_DEFAULT ? " action=\"".stripslashes($action)."\"":"")." timestamp=".get_timestamp()."]\n".$comment."\n".stripslashes($_POST["signature"])."[/comment]");
  }
  

Index: functions.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/functions.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** functions.inc	15 Nov 2004 20:39:18 -0000	1.5
--- functions.inc	13 Feb 2005 21:21:47 -0000	1.6
***************
*** 58,64 ****
  function show_edit($pagename, $v="", $nosubmit=false, $text="")
  {
!   global $WikiIO;
    $revision = $WikiIO->get_revision($pagename, $v);
    
    if($nosubmit == false)
      $out  = "<form enctype=\"multipart/form-data\" id=\"edit_form\" method=\"post\" action=\"index.php?".rawurldecode(utf8_decode($pagename))."\">";
--- 58,66 ----
  function show_edit($pagename, $v="", $nosubmit=false, $text="")
  {
!   global $WikiIO, $WikiUser;
    $revision = $WikiIO->get_revision($pagename, $v);
    
+   if(!$WikiIO->is_readable($pagename))
+     return "uh, no!";
    if($nosubmit == false)
      $out  = "<form enctype=\"multipart/form-data\" id=\"edit_form\" method=\"post\" action=\"index.php?".rawurldecode(utf8_decode($pagename))."\">";
***************
*** 76,79 ****
--- 78,83 ----
    	$out .= "<input type=\"submit\" class=\"btn_submit\" name=\"edited\" value=\"". _EDIT_SUBMIT. "\" accesskey=\"s\">";
    	$out .= "<input type=\"submit\" class=\"btn_preview\" name=\"preview\" value=\"". _EDIT_SUBMIT_PREVIEW ."\" accesskey=\"f\">";
+   	if(!$WikiIO->page_exists($pagename) && $WikiUser->is_authorized() && $WikiUser->get_is_cool())
+         $out .= "<br /><input type=\"checkbox\" name=\"is_private\" value=\"active\"> Private\n";
    	$out .= "</form>";
    }
***************
*** 193,199 ****
  function get_html_cache($pagename)
  {
!     global $WikiIO, $WikiUser, $WikiParser;
      $res = $WikiIO->query("SELECT id,revision,name,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
!     if(!$res || mysql_num_rows($res) < 1)
          update_html_cache($pagename);
      else {
--- 197,204 ----
  function get_html_cache($pagename)
  {
!     global $WikiIO, $WikiUser, $WikiParser, $creatinghtmlcache;
!     $creatinghtmlcache = false;
      $res = $WikiIO->query("SELECT id,revision,name,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
!     if(!$res || mysql_num_rows($res) < 1 || $_GET["gennewcache"] == 1)
          update_html_cache($pagename);
      else {
***************
*** 204,211 ****
      }
      
!     $res = $WikiIO->query("SELECT id,name,text,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
      if(!$res || mysql_num_rows($res) < 1)
          return mysql_error();
      $h = mysql_fetch_array($res);
      return $WikiParser->parse_html_cache($h["text"]);
  }
--- 209,217 ----
      }
      
!     $res = $WikiIO->query("SELECT name,text,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
      if(!$res || mysql_num_rows($res) < 1)
          return mysql_error();
      $h = mysql_fetch_array($res);
+     $creatinghtmlcache = false;
      return $WikiParser->parse_html_cache($h["text"]);
  }
***************
*** 213,220 ****
  function update_html_cache($pagename)
  {
!     global $WikiIO, $WikiParser, $WikiUser;
      $rev = $WikiIO->get_revision_fast($pagename);
      if(!$rev)
          return;
      $res = $WikiIO->query("SELECT id,name FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
      if(!$res || mysql_num_rows($res) < 1)
--- 219,227 ----
  function update_html_cache($pagename)
  {
!     global $WikiIO, $WikiParser, $WikiUser, $creatinghtmlcache;
      $rev = $WikiIO->get_revision_fast($pagename);
      if(!$rev)
          return;
+     $creatinghtmlcache = true;
      $res = $WikiIO->query("SELECT id,name FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
      if(!$res || mysql_num_rows($res) < 1)
***************
*** 223,227 ****
          $query = "UPDATE html_cache SET revision=".$rev->revision.", text='".addslashes($WikiParser->parse($rev->text, true, true))."',  lang='".$WikiUser->get_language()."' WHERE id=".$a["id"]." LIMIT 1;";
      }
!     $WikiIO->query($query);echo mysql_error();
  }
  
--- 230,235 ----
          $query = "UPDATE html_cache SET revision=".$rev->revision.", text='".addslashes($WikiParser->parse($rev->text, true, true))."',  lang='".$WikiUser->get_language()."' WHERE id=".$a["id"]." LIMIT 1;";
      }
!     $WikiIO->query($query); echo mysql_error();
!     //$creatinghtmlcache = false;
  }
  
***************
*** 474,478 ****
  function begin_html($nolayout=false)
  {
!   global $WikiLayout, $WikiParser;
    
    $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
--- 482,486 ----
  function begin_html($nolayout=false)
  {
!   global $WikiLayout, $WikiParser, $additional_html_header;
    
    $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
***************
*** 484,487 ****
--- 492,497 ----
    if(!$nolayout)
    	$out .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"layout/".$WikiParser->work_html($WikiLayout->get_layout())."/".$WikiParser->work_html($WikiLayout->get_style()).".css\" />\n";
+   if($additional_html_header != "")
+     $out .= $additional_html_header."\n";
    $out .= "</head>\n";
    $out .= "<body>\n";

Index: index_rss.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/index_rss.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index_rss.php	13 Oct 2004 20:28:26 -0000	1.1.1.1
--- index_rss.php	13 Feb 2005 21:21:48 -0000	1.2
***************
*** 34,38 ****
  require("user.inc");
  
! define("_URL", "https://fuckup.homeunix.net/fuwiki/index.php");
  define("_DESC", "FUCKUP-Wiki RSS-Feed");
  define("_COPYR", "Copyright 2003-2004 FUCKUP-Community, all contents released under the GNU-FDL");
--- 34,38 ----
  require("user.inc");
  
! define("_URL", "http://fuckup.homeunix.net/index.php");
  define("_DESC", "FUCKUP-Wiki RSS-Feed");
  define("_COPYR", "Copyright 2003-2004 FUCKUP-Community, all contents released under the GNU-FDL");
***************
*** 59,66 ****
  			continue;
  		$out .= "  <item>\n   <title>". $ar["name"] ."</title>\n";
! 		$out .= "   <url>". _URL ."?". $ar["name"] ."</url>\n";
! 		$out .= "   <LastChanged>". timestamp_pattern($ar["date"]) ."</LastChanged>\n";
  		$out .= "   <author>". $WikiUser->get_user_name($ar["creator_id"]) ."</author>\n";
- 		$out .= "   <revision>". $ar["revision"] ."</revision>\n";
  		$out .= "  </item>\n";
  		$x[$ar["name"]] = true;
--- 59,65 ----
  			continue;
  		$out .= "  <item>\n   <title>". $ar["name"] ."</title>\n";
! 		$out .= "   <link>". _URL ."?". $ar["name"] ."</link>\n";
! 		$out .= "   <pubDate>". timestamp_pattern($ar["date"]) ."</pubDate>\n";
  		$out .= "   <author>". $WikiUser->get_user_name($ar["creator_id"]) ."</author>\n";
  		$out .= "  </item>\n";
  		$x[$ar["name"]] = true;

Index: user.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/user.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** user.inc	13 Oct 2004 22:35:14 -0000	1.2
--- user.inc	13 Feb 2005 21:21:48 -0000	1.3
***************
*** 3,7 ****
  class FWikiUser
  {
!   var $id=0, $name, $pass, $email, $authorized=false, $layout, $style, $name_err=false, $pass_err=false, $settings, $settings_loaded, $language, $signature;
    
    function FWikiUser($name="", $pass="")
--- 3,7 ----
  class FWikiUser
  {
!   var $id=0, $name, $pass, $email, $authorized=false, $layout, $style, $name_err=false, $pass_err=false, $settings, $settings_loaded, $language, $signature, $is_cool=false;
    
    function FWikiUser($name="", $pass="")
***************
*** 86,90 ****
  		}
  	}
! 	$this->settings_loaded = true;
    }
    
--- 86,96 ----
  		}
  	}
! 	$this->settings_loaded = true;
! 	$f = fopen("cool_users.txt", "r");
! 	while(!feof($f))
! 	   if(strcmp($this->id."\n", fgets($f, 10)) == 0) {
! 	       $this->is_cool = true;
!             return;
!         }
    }
    
***************
*** 239,242 ****
--- 245,253 ----
    		$ar[$key] = $entry;
    	return $ar;
+   }
+   
+   function get_is_cool()
+   {
+     return $this->is_cool;
    }
  }

Index: io.mysql.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/io.mysql.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** io.mysql.inc	7 Nov 2004 12:00:33 -0000	1.3
--- io.mysql.inc	13 Feb 2005 21:21:48 -0000	1.4
***************
*** 56,60 ****
    {
      global $WikiUser;
!     
      if($v != 0)
          $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." LIMIT 1;";
--- 56,62 ----
    {
      global $WikiUser;
!     
!     if(!$this->is_readable($pagename))
!         return null;
      if($v != 0)
          $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." LIMIT 1;";
***************
*** 75,79 ****
    {
      global $WikiUser;
!     
      if($v != 0)
          $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
--- 77,83 ----
    {
      global $WikiUser;
!     
!     if(!$this->is_readable($pagename))
!         return null;
      if($v != 0)
          $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
***************
*** 125,129 ****
    function get_latest_revision_number($pagename)
    {
!     $res = mysql_query("SELECT revision, name FROM "._CACHE_TBL." WHERE name='".addslashes(rawurldecode(utf8_decode($pagename)))."' ORDER BY revision DESC LIMIT 1", $this->link);
      if(mysql_error()) return 0;
      $row = mysql_fetch_row($res);
--- 129,133 ----
    function get_latest_revision_number($pagename)
    {
!     $res = mysql_query("SELECT revision, name FROM "._CACHE_TBL." WHERE name='".encode_utf8($pagename)."' ORDER BY revision DESC LIMIT 1", $this->link);
      if(mysql_error()) return 0;
      $row = mysql_fetch_row($res);
***************
*** 136,142 ****
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision FROM wikis WHERE name ='". addslashes(rawurldecode(utf8_decode($pagename))) ."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision FROM "._CACHE_TBL." WHERE name ='".addslashes(rawurldecode(utf8_decode($pagename)))."' ORDER BY revision DESC LIMIT 1;";
    
      $res = mysql_query($query, $this->link);
--- 140,146 ----
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision FROM wikis WHERE name ='". encode_utf8($pagename) ."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision FROM "._CACHE_TBL." WHERE name ='".encode_utf8($pagename)."' ORDER BY revision DESC LIMIT 1;";
    
      $res = mysql_query($query, $this->link);
***************
*** 165,169 ****
    function page_exists($pagename)
    {
!     $res = mysql_query("SELECT * FROM "._CACHE_TBL." WHERE name='".addslashes(rawurldecode(utf8_decode($pagename)))."' LIMIT 1;", $this->link);
      if(!$res)
      	return false;
--- 169,173 ----
    function page_exists($pagename)
    {
!     $res = mysql_query("SELECT * FROM "._CACHE_TBL." WHERE name='".encode_utf8($pagename)."' LIMIT 1;", $this->link);
      if(!$res)
      	return false;
***************
*** 176,187 ****
      function is_writable($pagename)
      {
!         $res = mysql_query("SELECT * FROM restrictions WHERE name='".addslashes(rawurldecode(utf8_decode($pagename)))."' LIMIT 1;");
          if(!$res || mysql_num_rows($res) == 0)
              return true;
          $a = mysql_fetch_array($res);
!         if($a["priv"] == "r-")
              return false;
          return true;
      }
  }
  
--- 180,223 ----
      function is_writable($pagename)
      {
!         $res = $this->query("SELECT * FROM restrictions WHERE name='".encode_utf8($pagename)."' LIMIT 1;");
          if(!$res || mysql_num_rows($res) == 0)
              return true;
          $a = mysql_fetch_array($res);
!         if($a["priv"][1] == "-")
!             return false;
!         return true;
!     }
!     
!     function is_readable($pagename)
!     {
!         global $WikiUser;
!         if($WikiUser->is_authorized() && $WikiUser->get_is_cool())
!             return true;
!         $res = $this->query("SELECT * FROM restrictions WHERE name='".encode_utf8($pagename)."' LIMIT 1;");
!         if(!$res || mysql_num_rows($res) == 0)
!             return true;
!         $a = mysql_fetch_array($res);
!         if($a["priv"][0] == "-")
              return false;
          return true;
      }
+     
+     function is_private($pagename)
+     {
+         $res = $this->query("SELECT * FROM restrictions WHERE name='".encode_utf8($pagename)."' LIMIT 1;");
+         if(!$res || mysql_num_rows($res) == 0)
+             return false;
+         $a = mysql_fetch_array($res);
+         if($a["priv"][0] == "-") return true;
+         return false;
+     }
+     
+     function set_private($pagename)
+     {
+         $res = $this->query("SELECT * FROM restrictions WHERE name='".encode_utf8($pagename)."' LIMIT 1;");
+         if(!$res || mysql_num_rows($res) == 0) {
+             $res = $this->query("INSERT restrictions(name, priv) VALUES('".encode_utf8($pagename)."', '-w');");
+         }
+     }
  }
  

[fuwiki-cvs] fuwiki_1_0/elements comment_box.inc,1.4,1.5 revision_warning.inc,1.2,1.3 search_box.inc,1.2,1.3

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/elements
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30058/elements

Modified Files:
	comment_box.inc revision_warning.inc search_box.inc 
Log Message:
up-to-date with fuckupwiki codebase

Index: comment_box.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/comment_box.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** comment_box.inc	7 Nov 2004 12:00:34 -0000	1.4
--- comment_box.inc	13 Feb 2005 21:21:48 -0000	1.5
***************
*** 22,26 ****
   */
  
! global $WikiUser;
  
  if(!$WikiUser->get_setting("show_commentbox"))
--- 22,26 ----
   */
  
! global $WikiUser, $WikiIO;
  
  if(!$WikiUser->get_setting("show_commentbox"))
***************
*** 34,41 ****
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";
!   if($WikiUser->get_setting("show_commentbox_signature"))
!   {
!   	$out .= "<input size=\"30\" name=\"signature\" value=\"". $WikiUser->get_signature() ."\" />\n";
!   }
    $out .= " Action: <input name=\"action\" value=\""._COMMENT_DEFAULT."\" />";
    if($WikiUser->get_setting("show_commentbox_upload"))
--- 34,42 ----
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";
!   if(!$WikiUser->get_setting("show_commentbox_signature"))
!     $type = "hidden";
!   else
!     $type = "";
!   $out .= "<input ". ($type == "" ? "" : "type=\"".$type."\" ")."size=\"30\" name=\"signature\" value=\"". $WikiUser->get_signature() ."\" />\n";
    $out .= " Action: <input name=\"action\" value=\""._COMMENT_DEFAULT."\" />";
    if($WikiUser->get_setting("show_commentbox_upload"))
***************
*** 44,47 ****
--- 45,50 ----
    	$out .= "<br />". _EDIT_UPLOAD ." <input name=\"userfile\" class=\"userfile\" type=\"file\"> ";
    }
+   if(!$WikiIO->page_exists(_PAGENAME) && $WikiUser->is_authorized() && $WikiUser->get_is_cool())
+     $out .= "<br /><input type=\"checkbox\" name=\"is_private\" value=\"active\"> Private\n";
    $out .= "</p></form></div>\n";
    return $out;

Index: search_box.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/search_box.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** search_box.inc	7 Nov 2004 12:00:34 -0000	1.2
--- search_box.inc	13 Feb 2005 21:21:48 -0000	1.3
***************
*** 26,29 ****
--- 26,31 ----
  if(!$WikiUser->get_setting("show_searchbox"))
  	return "";
+ 
+   global $WikiIO, $_GET;
    
    $str = "\n<div><form action=\"index.php?FWikiSearch\" method=\"post\">\n";

Index: revision_warning.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/revision_warning.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** revision_warning.inc	7 Nov 2004 12:00:34 -0000	1.2
--- revision_warning.inc	13 Feb 2005 21:21:48 -0000	1.3
***************
*** 31,35 ****
    	$out = "\nERROR: Someone has already changed this Revision!<br />\nPlease insert your changes in the upper Textarea.\n";
    	$out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), 0, false);
!     $out .= "<hr width=\"100%\" /><br />\n";
      $out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), $myV, true, stripslashes(rawurldecode(utf8_decode(($_POST["WikiCode"])))));
      
--- 31,35 ----
    	$out = "\nERROR: Someone has already changed this Revision!<br />\nPlease insert your changes in the upper Textarea.\n";
    	$out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), 0, false);
!     $out .= "<hr width=\"100%\"><br />\n";
      $out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), $myV, true, stripslashes(rawurldecode(utf8_decode(($_POST["WikiCode"])))));
      

[fuwiki-cvs] fuwiki_1_0/FWiki Changes.php,1.2,1.3 List.php,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/FWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30058/FWiki

Modified Files:
	Changes.php List.php 
Log Message:
up-to-date with fuckupwiki codebase

Index: Changes.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Changes.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Changes.php	7 Nov 2004 12:00:33 -0000	1.2
--- Changes.php	13 Feb 2005 21:21:48 -0000	1.3
***************
*** 37,49 ****
  	{
  		if($x[$ar["name"]] || preg_match("/^FWiki/", $ar["name"]))
! 			continue;
  		if(!empty($_COOKIE["fuwiki_lastlogin"]) && $_COOKIE["fuwiki_lastlogin"] < $ar["date"])
  			$out .= "<tr class=\"new_change\">";
  		else
  			$out .= "<tr>";
!         if(strlen(($ar["name"])) > 100)
!             $out .= "<td><a href=\"index.php?". ($ar["name"]) ."\">". preg_replace("/\n/", "<br />", preg_replace("/([^\n]{100,})/Us", "\\1\n", ($ar["name"]), -1), -1) ."</a></td>";
          else
!             $out .= "<td><a href=\"index.php?". ($ar["name"]) ."\">". ($ar["name"]) ."</a></td>";
  		$out .= "<td>". timestamp_pattern($ar["date"]) ."</td>";
  		$name = $WikiUser->get_user_name($ar["creator_id"]);
--- 37,55 ----
  	{
  		if($x[$ar["name"]] || preg_match("/^FWiki/", $ar["name"]))
! 			continue;
!         if(!$WikiIO->is_readable($ar["name"])) {
!             $x[$ar["name"]] = true; continue;
!         }
  		if(!empty($_COOKIE["fuwiki_lastlogin"]) && $_COOKIE["fuwiki_lastlogin"] < $ar["date"])
  			$out .= "<tr class=\"new_change\">";
  		else
  			$out .= "<tr>";
!         $name = $ar["name"]; $labelname = $name;
!         if($WikiIO->is_private($name))
!             $labelname = "[Private]".$name;
!         if(strlen(($labelname)) > 100)
!             $out .= "<td><a href=\"index.php?". ($name) ."\">". preg_replace("/\n/", "<br />", preg_replace("/([^\n]{100,})/Us", "\\1\n", ($labelname), -1), -1) ."</a></td>";
          else
!             $out .= "<td><a href=\"index.php?". ($name) ."\">". ($labelname) ."</a></td>";
  		$out .= "<td>". timestamp_pattern($ar["date"]) ."</td>";
  		$name = $WikiUser->get_user_name($ar["creator_id"]);
***************
*** 54,58 ****
  	$out .= "</table>\n";
  	$out .= "<br /><br />\n";
! 	$out .= "<i><a href=\"index.php?FWikiChanges&start=".($offset + 50)."\">"._FWC_MORE_CHANGES."</a></i>\n";
  	setcookie("fuwiki_lastlogin", get_timestamp(), time()+30758400);
  	return $out;
--- 60,64 ----
  	$out .= "</table>\n";
  	$out .= "<br /><br />\n";
! 	$out .= "<i><a href=\"index.php?FWikiChanges&amp;start=".($offset + 50)."\">"._FWC_MORE_CHANGES."</a></i>\n";
  	setcookie("fuwiki_lastlogin", get_timestamp(), time()+30758400);
  	return $out;

Index: List.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/List.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** List.php	13 Oct 2004 20:28:27 -0000	1.1.1.1
--- List.php	13 Feb 2005 21:21:48 -0000	1.2
***************
*** 31,39 ****
  	$a = array();
  	while ($ar = mysql_fetch_array($res)) 
! 		if(!$a[$ar["name"]] && !preg_match("/^FWiki/", $ar["name"])){
! 		  if(strlen(($ar["name"])) > 100)
!                 $out .= "<li><a href=\"index.php?". ($ar["name"]) ."\">". preg_replace("/\n/", "<br />", preg_replace("/([^\n]{100,})/Us", "\\1\n", ($ar["name"]), -1), -1) ."</a></li>\n";
              else
! 			 $out .= "<li><a href=\"index.php?". $ar["name"] ."\">\n". rawurldecode($ar["name"]) ."</a></li>\n";
  			$num++; $a[$ar["name"]] = true;
  		}
--- 31,42 ----
  	$a = array();
  	while ($ar = mysql_fetch_array($res)) 
! 		if(!$a[$ar["name"]] && !preg_match("/^FWiki/", $ar["name"]) && $WikiIO->is_readable($ar["name"])){
! 		  $labelname = $ar["name"];
! 		  if($WikiIO->is_private($labelname))
! 		      $labelname = "[Private]".$labelname;
! 		  if(strlen(($labelname)) > 100)
!                 $out .= "<li><a href=\"index.php?". ($ar["name"]) ."\">". preg_replace("/\n/", "<br />", preg_replace("/([^\n]{100,})/Us", "\\1\n", ($labelname), -1), -1) ."</a></li>\n";
              else
! 			 $out .= "<li><a href=\"index.php?". $ar["name"] ."\">\n". rawurldecode($labelname) ."</a></li>\n";
  			$num++; $a[$ar["name"]] = true;
  		}

[fuwiki-cvs] fuwiki_1_0 functions.inc,1.4,1.5 parser.inc,1.5,1.6 syntax_overview.txt,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22330

Modified Files:
	functions.inc parser.inc syntax_overview.txt 
Log Message:
nearing rc2

Index: parser.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/parser.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** parser.inc	7 Nov 2004 12:00:33 -0000	1.5
--- parser.inc	15 Nov 2004 20:39:18 -0000	1.6
***************
*** 103,108 ****
      $comment_num++;
      $arguments = stripslashes(stripslashes($arguments));
!     if(preg_match("/action=\"(.*)\"/", $arguments, $o))
          $action = $WikiParser->parse_comment_action($o[1]);
      if(preg_match("/timestamp=(.*)$/", $arguments, $o))
          $timestamp = $o[1];
--- 103,109 ----
      $comment_num++;
      $arguments = stripslashes(stripslashes($arguments));
!     if(preg_match("/action=\"([^\"]*)\"/", $arguments, $o)) {
          $action = $WikiParser->parse_comment_action($o[1]);
+     }
      if(preg_match("/timestamp=(.*)$/", $arguments, $o))
          $timestamp = $o[1];
***************
*** 417,420 ****
--- 418,422 ----
          $string = $this->parse_showpage($string);
          $string = $this->parse_votes($string);
+         $string = $this->parse_divs($string);
          return $string;
      }
***************
*** 437,440 ****
--- 439,443 ----
          $string = $this->parse_newsletterquotes($string);
          $string = $this->parse_votes($string);
+         $string = $this->parse_divs($string);
          return $string;
      }
***************
*** 532,536 ****
--- 535,541 ----
          $string = preg_replace("/\'\'(.*)\'\'/U", "<i>\\1</i>", $string, -1);      
          $string = preg_replace("/\[center\](.*)\[\/center\]/Us", "<center>\\1</center>", $string, -1);
+         $string = preg_replace("/&lt;u&gt;(.*)&lt;\/u&gt;/Us", "<span style=\"text-decoration:underline;\">\\1</span>", $string, -1);
          $string = preg_replace("/<u>(.*)<\/u>/Us", "<span style=\"text-decoration:underline;\">\\1</span>", $string, -1);
+         $string = preg_replace("/\[size=([0-9]{1,3})\](.*)\[\/size\]/Us", "<span style=\"font-size:\\1px;\">\\2</span>", $string, -1);
          return $string;
      }
***************
*** 626,630 ****
      function parse_lists($string)
      {
!         $string = preg_replace("/(\n|\r|^)\*([^\n\r]*)(?=[\n\r])/e", "parse_lists_callback('\\2')", $string, -1);
          return $string;
      }
--- 631,635 ----
      function parse_lists($string)
      {
!         $string = preg_replace("/(\n|\r|^)\*([^\n\r]*)(?=[$\n\r])/e", "parse_lists_callback('\\2')", $string, -1);
          return $string;
      }
***************
*** 633,637 ****
      {
          $string = preg_replace("/(\n|\r|^)&gt;/", "\\1>", $string, -1);
!         $string = preg_replace("/(\n|\r|^)(>+)([^\n\r]*)(?=[\n\r])/e", "parse_newsletterquotes_callback('\\3', '\\2')", $string, -1);
          return stripslashes($string);
      }
--- 638,642 ----
      {
          $string = preg_replace("/(\n|\r|^)&gt;/", "\\1>", $string, -1);
!         $string = preg_replace("/(\n|\r|^)(>+)([^\n\r]*)(?=[$\n\r])/e", "parse_newsletterquotes_callback('\\3', '\\2')", $string, -1);
          return stripslashes($string);
      }
***************
*** 655,658 ****
--- 660,671 ----
      }
      
+     function parse_divs($string) {
+         $string = preg_replace("/&lt;div style=\"(.*)\"&gt;/iUs", "<div style=\"\\1\">", $string, -1);
+         $string = preg_replace("/&lt;\/div&gt;/", "</div>", $string, -1);
+         $string = preg_replace("/&lt;div&gt;/iUs", "<div>", $string, -1);
+         return $string;
+     }
+ 
+     
      function work_html($string) {
      $search = array("/&nbsp;/", "/&iexcl;/", "/&cent;/", "/&pound;/", "/&curren;/", "/&yen;/",

Index: functions.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/functions.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functions.inc	7 Nov 2004 12:00:32 -0000	1.4
--- functions.inc	15 Nov 2004 20:39:18 -0000	1.5
***************
*** 101,109 ****
    
    $out .= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
!   $out .= $WikiParser->parse(encode_utf8($_POST["WikiCode"]), true);
    $out .= "</td></tr><tr><td><br /><hr /></td></tr><tr><td>";
    $out .= "<form".$form_enctype." name=\"previewform\" action=\"index.php?"._PAGENAME."\" method=\"post\">";
    $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$_POST["revision"]."\">";
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" cols=\"90\">".encode_utf8($_POST["WikiCode"])."</textarea>";
    $out .= "<br />".$form_upload;
    $out .= "<input type=\"submit\" name=\"edited\" value=\"Abschicken\" accesskey=\"s\"> ";
--- 101,109 ----
    
    $out .= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
!   $out .= $WikiParser->parse(encode_utf8(stripslashes($_POST["WikiCode"])), true);
    $out .= "</td></tr><tr><td><br /><hr /></td></tr><tr><td>";
    $out .= "<form".$form_enctype." name=\"previewform\" action=\"index.php?"._PAGENAME."\" method=\"post\">";
    $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$_POST["revision"]."\">";
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" cols=\"90\">".encode_utf8(stripslashes($_POST["WikiCode"]))."</textarea>";
    $out .= "<br />".$form_upload;
    $out .= "<input type=\"submit\" name=\"edited\" value=\"Abschicken\" accesskey=\"s\"> ";
***************
*** 332,338 ****
  }
  
! function get_timestamp()
  {
! 	$d = getdate();
      return $d["year"].($d["mon"] < 10 ? "0".$d["mon"] : $d["mon"]).($d["mday"] < 10 ? "0".$d["mday"] : $d["mday"]).($d["hours"] < 10 ? "0".$d["hours"] : $d["hours"]).($d["minutes"] < 10 ? "0".$d["minutes"] : $d["minutes"]).($d["seconds"] < 10 ? "0".$d["seconds"] : $d["seconds"]);
  }
--- 332,341 ----
  }
  
! function get_timestamp($date=0)
  {
!     if($date == 0)
! 	   $d = getdate();
!     else
!         $d = $date;
      return $d["year"].($d["mon"] < 10 ? "0".$d["mon"] : $d["mon"]).($d["mday"] < 10 ? "0".$d["mday"] : $d["mday"]).($d["hours"] < 10 ? "0".$d["hours"] : $d["hours"]).($d["minutes"] < 10 ? "0".$d["minutes"] : $d["minutes"]).($d["seconds"] < 10 ? "0".$d["seconds"] : $d["seconds"]);
  }

Index: syntax_overview.txt
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/syntax_overview.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** syntax_overview.txt	13 Oct 2004 20:28:26 -0000	1.1.1.1
--- syntax_overview.txt	15 Nov 2004 20:39:18 -0000	1.2
***************
*** 10,15 ****
  [quote]text[/quote]			[quote]text[/quote]						yes
  (no expression)				[comment verb="" time=""]text --user_name[/comment]		yes
! URL					[url]URL[/url]							yes
! [[@URL|desc]]				[url desc]URL[/url]						yes
  [[WikiPage]]				[[WikiPage]]							yes
  [[WikiPage|desc]]			[[WikiPage|desc]]						yes
--- 10,15 ----
  [quote]text[/quote]			[quote]text[/quote]						yes
  (no expression)				[comment verb="" time=""]text --user_name[/comment]		yes
! URL					[url]URL[/url]	[URL]						yes
! [[@URL|desc]]				[url desc]URL[/url]	[URL Desc]				yes
  [[WikiPage]]				[[WikiPage]]							yes
  [[WikiPage|desc]]			[[WikiPage|desc]]						yes
***************
*** 19,22 ****
  [color=blue]text[/color]		[color=blue]text[/color]					yes
  [code]text[/code]			[code]text[/code]						yes
! [a #anchor]				[#anchor]							no
  [size=XX]bla[/size]			[size=XX]bla[/size]						yes
\ No newline at end of file
--- 19,22 ----
  [color=blue]text[/color]		[color=blue]text[/color]					yes
  [code]text[/code]			[code]text[/code]						yes
! [a #anchor]				[#anchor]							yes
  [size=XX]bla[/size]			[size=XX]bla[/size]						yes
\ No newline at end of file

[fuwiki-cvs] fuwiki_1_0/lang de.inc,1.5,1.6 en.inc,1.4,1.5

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22330/lang

Modified Files:
	de.inc en.inc 
Log Message:
nearing rc2

Index: en.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/lang/en.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** en.inc	7 Nov 2004 12:00:35 -0000	1.4
--- en.inc	15 Nov 2004 20:39:18 -0000	1.5
***************
*** 62,66 ****
  define("_FWS_TOTALRES", "Total Results: ");
  define("_FWS_NOSEARCHSTR", "Please enter a search string");
! define("_FWS_NORESULTS", "Your search didn't return any results");
  
  // FWikiAdmin - Interface
--- 62,67 ----
  define("_FWS_TOTALRES", "Total Results: ");
  define("_FWS_NOSEARCHSTR", "Please enter a search string");
! define("_FWS_NORESULTS", "Your search didn't return any results. <i>(Keywords must be at least 4 characters long)</i>");
! define("_FWS_MORERESULTS", "Show more results");
  
  // FWikiAdmin - Interface
***************
*** 139,142 ****
--- 140,144 ----
  define("_FWST_CHANGES", "Page Changes");
  define("_FWST_DOTW", "Day of the week");
+ define("_FWST_TODAY", "Todays Page Changes");
  
  // FWikiMessages - Interface

Index: de.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/lang/de.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** de.inc	7 Nov 2004 12:00:35 -0000	1.5
--- de.inc	15 Nov 2004 20:39:18 -0000	1.6
***************
*** 62,66 ****
  define("_FWS_TOTALRES", "Ergebnisse insgesamt: ");
  define("_FWS_NOSEARCHSTR", "Bitte einen Suchbegriff eingeben");
! define("_FWS_NORESULTS", "Keine Suchergebnisse gefunden.");
  
  // FWikiAdmin - Interface
--- 62,67 ----
  define("_FWS_TOTALRES", "Ergebnisse insgesamt: ");
  define("_FWS_NOSEARCHSTR", "Bitte einen Suchbegriff eingeben");
! define("_FWS_NORESULTS", "Keine Suchergebnisse gefunden. <i>(Suchbegriffe m&uuml;ssen mindestens 4 Zeichen lang sein)</i>");
! define("_FWS_MORERESULTS", "Mehr Suchergebnisse anzeigen");
  
  // FWikiAdmin - Interface
***************
*** 100,104 ****
  define("_FWC_USER", "Benutzer");
  define("_FWC_TIMEFORMAT", "%d.%m.%y - %h:%s:%i Uhr");
! define("_FWC_MORE_CHANGES", "Mehr &auml;nderungen anzeigen");
  
  // FWikiLayout - Interface
--- 101,105 ----
  define("_FWC_USER", "Benutzer");
  define("_FWC_TIMEFORMAT", "%d.%m.%y - %h:%s:%i Uhr");
! define("_FWC_MORE_CHANGES", "Mehr &Auml;nderungen anzeigen");
  
  // FWikiLayout - Interface
***************
*** 139,142 ****
--- 140,144 ----
  define("_FWST_CHANGES", "Seiten&auml;nderungen");
  define("_FWST_DOTW", "Wochentag");
+ define("_FWST_TODAY", "Heutige &auml;nderungen");
  define("_FWMSG_TO", "An");
  

[fuwiki-cvs] fuwiki_1_0/FWiki Images.php,1.1,1.2 Search.php,1.2,1.3 Stats.php,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/FWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22330/FWiki

Modified Files:
	Images.php Search.php Stats.php 
Log Message:
nearing rc2

Index: Search.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Search.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Search.php	7 Nov 2004 12:00:34 -0000	1.2
--- Search.php	15 Nov 2004 20:39:18 -0000	1.3
***************
*** 37,46 ****
  function show_search_results($str, $begin=0)
  {
!     global $WikiStats, $WikiIO;
      //$WikiStats->inc_count("total_searches");
      $str = encode_utf8($str);
      $str = stripslashes(preg_replace("/\"([^\"]*)\"/Ue", "preg_replace('/ /', '-', stripslashes('\\1'), -1)", $str, -1));
-     $strs = split(" ", $str);
      $results = ""; $total = 0;
      for($i = 0; $i < 2; $i++) {
          $query[$i] = "SELECT name,id".($i == 1 ? ",text" : "")." FROM "._CACHE_TBL." WHERE";
--- 37,50 ----
  function show_search_results($str, $begin=0)
  {
!     global $WikiStats, $WikiIO, $_GET;
      //$WikiStats->inc_count("total_searches");
+     if(!empty($_GET["start"]))
+         $start = $_GET["start"];
+     else
+         $start = 0;
      $str = encode_utf8($str);
      $str = stripslashes(preg_replace("/\"([^\"]*)\"/Ue", "preg_replace('/ /', '-', stripslashes('\\1'), -1)", $str, -1));
      $results = ""; $total = 0;
+     $str = preg_replace("/(^| )(?![+-])/", " +", $str, -1);
      for($i = 0; $i < 2; $i++) {
          $query[$i] = "SELECT name,id".($i == 1 ? ",text" : "")." FROM "._CACHE_TBL." WHERE";
***************
*** 48,67 ****
          if($i == 0) $where = "name";
          else $where = "text";
!         foreach($strs as $s) {
!             if($n == 0) $n = 1;
!             else $query[$i] .= " AND";
!             if(preg_match("/^\*|\*$/", $s)) {
!                 $s = preg_replace("/^\*/", "%", $s, 1);
!                 $s = preg_replace("/\*$/", "%", $s, 1);
!                 $s = preg_replace("/^([^%])/", "% \\1", $s, 1);
!                 $s = preg_replace("/([^%])$/", "\\1 %", $s, 1);
!                 $query[$i] .= " ".$where." LIKE '".preg_replace("/-/", " ", $s, -1)."'";
!             }
!             else
!                 $query[$i] .= " ".$where." LIKE '% ".preg_replace("/-/", " ", $s, -1)." %'";
!         }
! 	   $query[$i] .= " LIMIT 25;";
  	   $res = $WikiIO->query($query[$i]);
  	   if(!$res || mysql_num_rows($res) < 1) {
  	       if($i == 0)
  	           continue;
--- 52,60 ----
          if($i == 0) $where = "name";
          else $where = "text";
!         $query[$i] .= " MATCH(".$where.") AGAINST ('".$str."' IN BOOLEAN MODE)";
! 	   $query[$i] .= " LIMIT ".$start.",25;";
  	   $res = $WikiIO->query($query[$i]);
  	   if(!$res || mysql_num_rows($res) < 1) {
+ 	       echo mysql_error();
  	       if($i == 0)
  	           continue;
***************
*** 72,84 ****
  	   $results .= "<table>\n"; 
  	   while($a = mysql_fetch_array($res)) {
! 	       if($i == 0)
  	           $results .= "<tr><td><b><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></b></td></tr>\n";
! 	       else {
  	           $results .= "<tr><td><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></td><td>\n";
! 	           foreach($strs as $s) {
! 	               preg_match("/(.{0,50})(".preg_replace("/-/", " ", $s, -1).")(.{0,50})/i", ($a["text"]), $o);
! 	                   $results .= "(...)".$o[1]."<b>".$o[2]."</b>".$o[3]."(...)<br />";
  	           }
! 	           $results."</td></tr>\n";
  	       }
  	       $total++;
--- 65,82 ----
  	   $results .= "<table>\n"; 
  	   while($a = mysql_fetch_array($res)) {
! 	       if($i == 0) {
! 	           $total_title++;
  	           $results .= "<tr><td><b><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></b></td></tr>\n";
! 	       } else {
  	           $results .= "<tr><td><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></td><td>\n";
! 	           $ar = split(" ", $str);
! 	           foreach($ar as $s) {
! 	               if(strlen($s) < 3 || preg_match("/^-/", $s))
! 	                   continue;
! 	               $s = preg_replace("/^\+/", "", $s, 1);
! 	               preg_match("/(.{0,50})(".preg_replace("/-/", " ", $s, -1).")(.{0,50})/i", stripslashes($a["text"]), $o);
! 	               $results .= "(...)".$o[1]."<b>".$o[2]."</b>".$o[3]."(...)<br />";
  	           }
! 	           $results .= "</td></tr>\n";
  	       }
  	       $total++;
***************
*** 86,90 ****
  	   $results .= "</table>\n";
  	}
! 	$out = "\n"._FWS_RESULTS . " (". _FWS_TOTALRES . $total .")<br /><br />\n" . $results;
  	
  	return $out;
--- 84,94 ----
  	   $results .= "</table>\n";
  	}
! 	$out = "\n"._FWS_RESULTS . " (". _FWS_TOTALRES . $total .")<br />";
!     if($total_title >= 25 || $total >= 25) {
! 	   $out .= "<form action=\"index.php?FWikiSearch&start=".($start+25)."\" method=\"post\">\n";
!         $out .= "<input type=\"hidden\" name=\"searchstr\" value=\"".$_POST["searchstr"]."\"><input type=\"hidden\" name=\"Searching\" value=\"true\">\n";
!         $out .= "<input type=\"submit\" value=\"". _FWS_MORERESULTS ."\"><br />\n";
!     }
! 	$out .= "<br />\n" . $results;
  	
  	return $out;
***************
*** 94,98 ****
  {
  	$out = "\n"._FWS_TITLE . "<br /><br />\n";
! 	$out .= "<form action=\"index.php?FWikiSearch\" method=\"POST\">\n";
  	$out .= "<input name=\"searchstr\">\n";
  	$out .= "<input type=\"hidden\" name=\"Searching\" value=\"true\">\n";
--- 98,102 ----
  {
  	$out = "\n"._FWS_TITLE . "<br /><br />\n";
! 	$out .= "<form action=\"index.php?FWikiSearch\" method=\"post\">\n";
  	$out .= "<input name=\"searchstr\">\n";
  	$out .= "<input type=\"hidden\" name=\"Searching\" value=\"true\">\n";

Index: Stats.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Stats.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Stats.php	13 Oct 2004 20:28:27 -0000	1.1.1.1
--- Stats.php	15 Nov 2004 20:39:18 -0000	1.2
***************
*** 40,44 ****
  function FWikiMain()
  {
!     global $WikiStats;
      
      $out  = "<h1>"._SITENAME ." "._FWST_HEADER."</h1><br />\n\n";
--- 40,44 ----
  function FWikiMain()
  {
!     global $WikiStats, $WikiIO;
      
      $out  = "<h1>"._SITENAME ." "._FWST_HEADER."</h1><br />\n\n";
***************
*** 79,82 ****
--- 79,111 ----
      $out .= "</tr>\n</table>\n\n";
      
+     $out .= "<br /><br /><h2>"._FWST_TODAY."</h2>\n";
+     $a1 = array(); $nums = array(); $nchanges = 0;
+     $time = getdate();
+     $time["hours"] = 0; $time["minutes"] = 0; $time["seconds"] = 0;
+     $res = $WikiIO->query("SELECT date FROM wikis WHERE date > '".get_timestamp($time)."'");
+     if(!$res || mysql_num_rows($res) < 1) {
+         $out .= _FWST_NO_CHTODAY; echo mysql_error();
+     } else {
+         $out .= "<table border=\"1\">\n";
+         $o1 = "<td><b>"._FWST_HOUR."</b></td>"; $o2 = "<td><b>"._FWST_CHANGES."</b></td>";
+         while($a = mysql_fetch_array($res)) {
+             $nums[substr($a["date"], 8, 2)]++;
+             $nchanges++;
+         }
+         if(_CACHE_TBL != "wikis") {
+             $res = $WikiIO->query("SELECT date FROM wikis_cache WHERE date > '".get_timestamp($time)."'");
+             if($res)
+                 while($a = mysql_fetch_array($res)) {
+                     $nums[substr($a["date"], 8, 2)]++;
+                     $nchanges++;
+                 }
+         }
+         for($i = 0; $i < 24; $i++) {
+             $o1 .= "<td>".$i."</td>"; $o2 .= "<td>".($nchanges == 0 ? "0" : round(($nums[$i]/$nchanges)*100, 0)."% (".$nums[$i].")"). "</td>";
+         }
+         $out .= "\n<tr>".$o1."</tr>\n<tr>".$o2."</tr>";
+         $out .= "\n</table>\n\n";        
+     }
+     
      $out .= "<br /><br /><h2>"._FWST_HOURLY." "._FWST_HEADER."</h2>\n<table border=\"1\">\n";
      $o1 = "<td><b>"._FWST_HOUR."</b></td>"; $o2 = "<td><b>"._FWST_PGVIEWS."</b></td>"; $o3 = "<td><b>"._FWST_CHANGES."</b></td>";

Index: Images.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Images.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Images.php	7 Nov 2004 12:02:47 -0000	1.1
--- Images.php	15 Nov 2004 20:39:18 -0000	1.2
***************
*** 26,29 ****
--- 26,43 ----
      return "<a href=\"index.php?FWikiImages&order=".$n."\">".$header."</a>";
  }
+ 
+ function get_neighbours($id, $next=true)
+ {
+     global $WikiIO;
+     if($next)
+         $query = "SELECT id FROM images WHERE id > ".$id." ORDER BY id LIMIT 1;";
+     else
+         $query = "SELECT id FROM images WHERE id < ".$id." ORDER BY id DESC LIMIT 1;";
+     $res = $WikiIO->query($query);
+     if(!$res || mysql_num_rows($res) < 1)
+         return 0;
+     $a = mysql_fetch_array($res);
+     return $a["id"];
+ }
  
  function FWikiMain()
***************
*** 55,59 ****
  	   $a = mysql_fetch_array($res);
  	   $gallery = $_GET["gallery"];
! 	   $out = "<a href=\"index.php?FWikiImages&gallery=".($gallery-1)."\">&lt;&lt;</a> <a href=\"index.php?FWikiImages&gallery=".($gallery+1)."\">&gt;&gt;</a><br />\n";
  	   $out .= "<a href=\"index.php?".$a["pagename"]."\">".$a["pagename"]."</a>" . " : ".$a["name"]."<br />";
  	   $out .= "<img src=\"upload/".$a["id"].".".get_file_extension($a["name"])."\"><br />\n";
--- 69,73 ----
  	   $a = mysql_fetch_array($res);
  	   $gallery = $_GET["gallery"];
! 	   $out = "<a href=\"index.php?FWikiImages&gallery=".get_neighbours($gallery, false)."\">&lt;&lt;</a> <a href=\"index.php?FWikiImages&gallery=".get_neighbours($gallery, true)."\">&gt;&gt;</a><br />\n";
  	   $out .= "<a href=\"index.php?".$a["pagename"]."\">".$a["pagename"]."</a>" . " : ".$a["name"]."<br />";
  	   $out .= "<img src=\"upload/".$a["id"].".".get_file_extension($a["name"])."\"><br />\n";
***************
*** 63,67 ****
  	   $out = "<table>\n<tr><td>".gen_header(_FWI_FILENAME, 1)."</td><td>".gen_header(_FWI_PAGENAME, 2)."</td><td>".gen_header(_FWI_UPLOADER, 3)."</td><td>".gen_header(_FWI_UPLOADTIME, 4)."</td><td>&nbsp;</td></tr>\n";
  	   while ($a = mysql_fetch_array($res)) {
!             $out .= "<tr><td>".$a["name"]."</td><td>".$a["pagename"]."</td><td>".$WikiUser->get_user_name($a["uploader_id"])."</td><td>".timestamp_pattern($a["upload_time"])."</td>";
              $out .= "<td><a href=\"index.php?FWikiImages&gallery=".$a["id"]."\">"._FWI_VIEW."</a></td></tr>\n";
          
--- 77,81 ----
  	   $out = "<table>\n<tr><td>".gen_header(_FWI_FILENAME, 1)."</td><td>".gen_header(_FWI_PAGENAME, 2)."</td><td>".gen_header(_FWI_UPLOADER, 3)."</td><td>".gen_header(_FWI_UPLOADTIME, 4)."</td><td>&nbsp;</td></tr>\n";
  	   while ($a = mysql_fetch_array($res)) {
!             $out .= "<tr><td>".$a["name"]."</td><td><a href=\"index.php?".$a["pagename"]."\">".$a["pagename"]."</a></td><td>".$WikiUser->get_user_name($a["uploader_id"])."</td><td>".timestamp_pattern($a["upload_time"])."</td>";
              $out .= "<td><a href=\"index.php?FWikiImages&gallery=".$a["id"]."\">"._FWI_VIEW."</a></td></tr>\n";
          

[fuwiki-cvs] fuwiki_1_0/FWiki Images.php,NONE,1.1

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/FWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31202/FWiki

Added Files:
	Images.php 
Log Message:
nearing rc2

--- NEW FILE: Images.php ---
<?PHP

/* fuwiki - A free Wiki Software
* 
* Copyright (C) 2002-2004 The fuwiki Project
* Copyright (C) 2002-2004 Mutwin Kraus and Lukas Bombach
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.

* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
* GNU General Public License for more details.

* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
*
*/

function gen_header($header, $n)
{
    return "<a href=\"index.php?FWikiImages&order=".$n."\">".$header."</a>";
}

function FWikiMain()
{
	global $WikiIO, $WikiUser, $_POST, $_GET;
	
	if(!empty($_GET["gallery"])) {
	   $cond = " WHERE id=".$_GET["gallery"];
	} else if(!empty($_POST["search_pagename"])) {
	   $cond = " WHERE pagename LIKE '%".$_POST["search"]."%'";
	} else if(!empty($_POST["search_name"])) {
	   $cond = " WHERE name LIKE '%".$_POST["search"]."%'";
	}
	if(!empty($_GET["order"])) {
        if($_GET["order"] == 1) $order = " ORDER BY name";
        if($_GET["order"] == 2) $order = " ORDER BY pagename";
        if($_GET["order"] == 3) $order = " ORDER BY uploader_id DESC";
        if($_GET["order"] == 4) $order = " ORDER BY upload_time DESC";
	}
	else $order = " ORDER BY upload_time DESC";
	$head = "<h2>"._FWI_TITLE."</h2><br />\n";
	$head .= "<form action=\"index.php?FWikiImages\" method=\"post\">\n";
	$head .= " <input name=\"search\"><br />\n";
	$head .= "<input type=\"submit\" name=\"search_pagename\" value=\""._FWI_SEARCH_PAGENAME."\"><input type=\"submit\" name=\"search_name\" value=\""._FWI_SEARCH_NAME."\"></form><br />\n";
	$num = 0;
	$query = "SELECT * FROM images".$cond.$order.";";
	$res = $WikiIO->query($query);
	if(!empty($_GET["gallery"])) {
	   $a = mysql_fetch_array($res);
	   $gallery = $_GET["gallery"];
	   $out = "<a href=\"index.php?FWikiImages&gallery=".($gallery-1)."\">&lt;&lt;</a> <a href=\"index.php?FWikiImages&gallery=".($gallery+1)."\">&gt;&gt;</a><br />\n";
	   $out .= "<a href=\"index.php?".$a["pagename"]."\">".$a["pagename"]."</a>" . " : ".$a["name"]."<br />";
	   $out .= "<img src=\"upload/".$a["id"].".".get_file_extension($a["name"])."\"><br />\n";
	   $out .= $WikiUser->get_user_name($a["uploader_id"]). " (".timestamp_pattern($a["upload_time"]).")<br />\n";
	}
	else {
	   $out = "<table>\n<tr><td>".gen_header(_FWI_FILENAME, 1)."</td><td>".gen_header(_FWI_PAGENAME, 2)."</td><td>".gen_header(_FWI_UPLOADER, 3)."</td><td>".gen_header(_FWI_UPLOADTIME, 4)."</td><td>&nbsp;</td></tr>\n";
	   while ($a = mysql_fetch_array($res)) {
            $out .= "<tr><td>".$a["name"]."</td><td>".$a["pagename"]."</td><td>".$WikiUser->get_user_name($a["uploader_id"])."</td><td>".timestamp_pattern($a["upload_time"])."</td>";
            $out .= "<td><a href=\"index.php?FWikiImages&gallery=".$a["id"]."\">"._FWI_VIEW."</a></td></tr>\n";
        
            $num++;
	       }
    }
	$out .= "</table>\n";
	return $head. ($num > 0 ? _FWI_NUMSHOWN." ". $num : "")."<br />\n".$out;
}

?>

[fuwiki-cvs] fuwiki_1_0/FWiki Changes.php,1.1.1.1,1.2 Messages.php,1.2,1.3 Search.php,1.1.1.1,1.2 User.php,1.2,1.3

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/FWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690/FWiki

Modified Files:
	Changes.php Messages.php Search.php User.php 
Log Message:
nearing rc2

Index: Messages.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Messages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Messages.php	16 Oct 2004 15:55:32 -0000	1.2
--- Messages.php	7 Nov 2004 12:00:34 -0000	1.3
***************
*** 34,37 ****
--- 34,46 ----
      return $out;
  }
+ 
+ function show_send_message($receiver="", $quotemsg="")
+ {
+     $out = "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
+     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
+     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
+     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";
+     return $out;
+ }
  
  function FWikiMain()
***************
*** 68,75 ****
  	   
  	   $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
!     $out .= "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
!     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";
  	}
      else
--- 77,81 ----
  	   
  	   $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
! 	   $out .= show_send_message($receiver, $quotemsg);
  	}
      else
***************
*** 79,108 ****
  	   if(!$res || mysql_num_rows($res) == 0) {
              $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";   
          } else {
!             $out .= "<h2>"._FWMSG_MSGS."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_FROM."</td><td colspan=\"2\">"._FWMSG_DATE."</td></tr>";
              while($a = mysql_fetch_array($res)) {
                  $name = $WikiUser->get_user_name($a["senderid"]);
!                 if($a["has_read"] == "false")
                      $out .= "\n<tr><td><b>".$name."</b></td><td><b>".timestamp_pattern($a["date"])."</b></td><td><b><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></b></td></tr>";
!                 else
!                     $out .= "\n<tr><td>".$name."</td><td>".timestamp_pattern($a["date"])."</td><td><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></td></tr>";
              }
          $out .= "\n</table>\n";
!         $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
!     $out .= "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
!     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";    
         $query = "SELECT * FROM messages WHERE senderid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
  	   if(!$res || mysql_num_rows($res) == 0) {
              $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";   
          } else {
              $out .= "<h2>"._FWMSG_SENT_MSGS."</h2><br />\n";
--- 85,113 ----
  	   if(!$res || mysql_num_rows($res) == 0) {
              $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= show_send_message(); 
          } else {
!             $out .= "<h2>"._FWMSG_MSGS_NEW."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_FROM."</td><td colspan=\"2\">"._FWMSG_DATE."</td></tr>";
+             $out2 = ""; $n = 0;
              while($a = mysql_fetch_array($res)) {
                  $name = $WikiUser->get_user_name($a["senderid"]);
!                 if($a["has_read"] == "false") { $n++;
                      $out .= "\n<tr><td><b>".$name."</b></td><td><b>".timestamp_pattern($a["date"])."</b></td><td><b><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></b></td></tr>";
!                 } else
!                     $out2 .= "\n<tr><td>".$name."</td><td>".timestamp_pattern($a["date"])."</td><td><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></td></tr>";
              }
          $out .= "\n</table>\n";
!         if($n == 0)
!             $out .= "<br />\n"._FWMSG_NO_MSGS;
!          $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
!        $out .= show_send_message();
!         $out .= "<br /><br />\n<h2>"._FWMSG_MSGS."</h2><br />\n";
!         $out.= "<table>\n<tr><td>"._FWMSG_FROM."</td><td colspan=\"2\">"._FWMSG_DATE."</td></tr>";
!         $out .= $out2 . "\n</table>\n";
         $query = "SELECT * FROM messages WHERE senderid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
  	   if(!$res || mysql_num_rows($res) == 0) {
              $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= show_send_message();  
          } else {
              $out .= "<h2>"._FWMSG_SENT_MSGS."</h2><br />\n";

Index: Search.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Search.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Search.php	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- Search.php	7 Nov 2004 12:00:34 -0000	1.2
***************
*** 32,36 ****
  		return show_search_form(_FWS_NOSEARCHSTR);
  	
! 	return show_search_results(rawurldecode(utf8_decode($_POST["searchstr"])));
  }
  
--- 32,36 ----
  		return show_search_form(_FWS_NOSEARCHSTR);
  	
! 	return show_search_results(rawurldecode($_POST["searchstr"]));
  }
  
***************
*** 38,94 ****
  {
      global $WikiStats, $WikiIO;
!     $WikiStats->inc_count("total_searches");
      $strs = split(" ", $str);
!     $search[0] = "SELECT name, revision, text FROM "._CACHE_TBL." WHERE name LIKE '%". $strs[0] ."%' GROUP BY name ORDER BY revision DESC LIMIT 100;";
! 	$search[1] = "SELECT name, revision, text FROM "._CACHE_TBL." WHERE text LIKE '%". $strs[0] ."%' GROUP BY name ORDER BY revision DESC LIMIT 100;";
! 	$total = 0;
! 	for($j = 0; $j < 2; $j++) {
! 	   $res = $WikiIO->query($search[$j]);
!     	if(mysql_num_rows($res) == 0 && $j == 1)
!     		return _FWS_NORESULTS;
! 	    
!     	$ar = array(); $text = array();
!     	while($obj = mysql_fetch_array($res))
!     	{
! 	      	if(!empty($ar[$obj["name"]]))
!       			if($ar[$obj["name"]] < $obj["revision"])
! 	       			continue;
!     		$ar[$obj["name"]] = $obj["revision"];
!             $text[$obj["name"]] = $obj["text"];
!         }
!         
!         $i = 0; $n = 0;
!         $out = "";
!         foreach($ar as $key => $value)
!         {
!             if($i < $begin) {
! 		          $i++;
! 			     continue;
!             }
!             
!             if($i > $begin + _NUM_SEARCH_RESULTS)
!                 break;
! 		    if($j == 0) {
! 		      $out .= "<br /><a href=\"index.php?". $key . "\"><b>". $key . "</b></a>\n";
! 		      $n++;
!             } else {
!                 $result = "";
!                 foreach($strs as $val) {
!                     if(preg_match("/(.{0,50})". $val ."(.{0,50})/i", $text[$key], $o))
!                         $result .= "<i>". $o[1] . "</i><b>" . $val . "</b><i>".preg_replace("/\n/", "", $o[2])."(...)</i>\n";
!                     else continue;
!                 }
!                 $out .= "<br /><a href=\"index.php?". $key ."\">". $key ."</a> (Revision ". $value ."): " . $result. "\n"; 
!                 $n++;
              }
! 		    $i++;
  	   }
! 	   $total += $n;
! 	   if($n == 0 && $j == 1)
!             return _FWS_NORESULTS;
!         
!         $results .= $out;
  	}
- 	
  	$out = "\n"._FWS_RESULTS . " (". _FWS_TOTALRES . $total .")<br /><br />\n" . $results;
  	
--- 38,89 ----
  {
      global $WikiStats, $WikiIO;
!     //$WikiStats->inc_count("total_searches");
!     $str = encode_utf8($str);
!     $str = stripslashes(preg_replace("/\"([^\"]*)\"/Ue", "preg_replace('/ /', '-', stripslashes('\\1'), -1)", $str, -1));
      $strs = split(" ", $str);
!     $results = ""; $total = 0;
!     for($i = 0; $i < 2; $i++) {
!         $query[$i] = "SELECT name,id".($i == 1 ? ",text" : "")." FROM "._CACHE_TBL." WHERE";
!         $n = 0;
!         if($i == 0) $where = "name";
!         else $where = "text";
!         foreach($strs as $s) {
!             if($n == 0) $n = 1;
!             else $query[$i] .= " AND";
!             if(preg_match("/^\*|\*$/", $s)) {
!                 $s = preg_replace("/^\*/", "%", $s, 1);
!                 $s = preg_replace("/\*$/", "%", $s, 1);
!                 $s = preg_replace("/^([^%])/", "% \\1", $s, 1);
!                 $s = preg_replace("/([^%])$/", "\\1 %", $s, 1);
!                 $query[$i] .= " ".$where." LIKE '".preg_replace("/-/", " ", $s, -1)."'";
              }
!             else
!                 $query[$i] .= " ".$where." LIKE '% ".preg_replace("/-/", " ", $s, -1)." %'";
!         }
! 	   $query[$i] .= " LIMIT 25;";
! 	   $res = $WikiIO->query($query[$i]);
! 	   if(!$res || mysql_num_rows($res) < 1) {
! 	       if($i == 0)
! 	           continue;
! 	       if($total == 0)
! 	           return _FWS_NORESULTS;
! 	       continue;
  	   }
! 	   $results .= "<table>\n"; 
! 	   while($a = mysql_fetch_array($res)) {
! 	       if($i == 0)
! 	           $results .= "<tr><td><b><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></b></td></tr>\n";
! 	       else {
! 	           $results .= "<tr><td><a href=\"index.php?".$a["name"]."\">".$a["name"]."</a></td><td>\n";
! 	           foreach($strs as $s) {
! 	               preg_match("/(.{0,50})(".preg_replace("/-/", " ", $s, -1).")(.{0,50})/i", ($a["text"]), $o);
! 	                   $results .= "(...)".$o[1]."<b>".$o[2]."</b>".$o[3]."(...)<br />";
! 	           }
! 	           $results."</td></tr>\n";
! 	       }
! 	       $total++;
! 	   }
! 	   $results .= "</table>\n";
  	}
  	$out = "\n"._FWS_RESULTS . " (". _FWS_TOTALRES . $total .")<br /><br />\n" . $results;
  	

Index: Changes.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Changes.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Changes.php	13 Oct 2004 20:28:27 -0000	1.1.1.1
--- Changes.php	7 Nov 2004 12:00:33 -0000	1.2
***************
*** 25,30 ****
  {
  	global $WikiIO, $WikiUser, $_COOKIE;
! 		
! 	$query = "SELECT name, revision, date, creator_id FROM "._CACHE_TBL." ORDER BY date DESC LIMIT 50;";
  	$res = $WikiIO->query($query);
  	if(!$res)
--- 25,31 ----
  {
  	global $WikiIO, $WikiUser, $_COOKIE;
!     
!     $offset = !empty($_GET["start"]) ? $_GET["start"] : 0;
! 	$query = "SELECT name, revision, date, creator_id FROM "._CACHE_TBL." ORDER BY date DESC LIMIT ".$offset.",50;";
  	$res = $WikiIO->query($query);
  	if(!$res)
***************
*** 51,55 ****
  		$x[$ar["name"]] = true;
  	}
! 	$out .= "</table>\n";
  	setcookie("fuwiki_lastlogin", get_timestamp(), time()+30758400);
  	return $out;
--- 52,58 ----
  		$x[$ar["name"]] = true;
  	}
! 	$out .= "</table>\n";
! 	$out .= "<br /><br />\n";
! 	$out .= "<i><a href=\"index.php?FWikiChanges&start=".($offset + 50)."\">"._FWC_MORE_CHANGES."</a></i>\n";
  	setcookie("fuwiki_lastlogin", get_timestamp(), time()+30758400);
  	return $out;

Index: User.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/User.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** User.php	16 Oct 2004 15:55:32 -0000	1.2
--- User.php	7 Nov 2004 12:00:34 -0000	1.3
***************
*** 86,90 ****
          return show_new_user_form(rawurldecode(utf8_decode($_POST["username"])), rawurldecode(utf8_decode($_POST["password"])), rawurldecode(utf8_decode($_POST["rpt_password"])), rawurldecode(utf8_decode($_POST["email"])), rawurldecode(utf8_decode($_POST["layout"])), _PW_RPT_INCORRECT);
        
!       $WikiUser->create_new_user(rawurldecode(utf8_decode($_POST["username"])), rawurldecode(utf8_decode($_POST["password"])), rawurldecode(utf8_decode($_POST["layout"])), rawurldecode(utf8_decode($_POST["email"])));
        if(!$WikiIO->page_exists(rawurldecode(utf8_decode($_POST["username"]))) && $WikiUser->get_user_id($_POST["username"]) != -1)
  	    $WikiIO->write(rawurldecode(utf8_decode($_POST["username"])), "Wiki", "[nocomment]=".rawurldecode(utf8_decode($_POST["username"]))."=\n\n[/nocomment]");
--- 86,90 ----
          return show_new_user_form(rawurldecode(utf8_decode($_POST["username"])), rawurldecode(utf8_decode($_POST["password"])), rawurldecode(utf8_decode($_POST["rpt_password"])), rawurldecode(utf8_decode($_POST["email"])), rawurldecode(utf8_decode($_POST["layout"])), _PW_RPT_INCORRECT);
        
!       $WikiUser->create_new_user(rawurldecode(utf8_decode($_POST["username"])), rawurldecode(utf8_decode($_POST["password"])), rawurldecode(utf8_decode($_POST["layout"])), rawurldecode(utf8_decode($_POST["email"])), rawurldecode(utf8_decode($_POST["language"])));
        if(!$WikiIO->page_exists(rawurldecode(utf8_decode($_POST["username"]))) && $WikiUser->get_user_id($_POST["username"]) != -1)
  	    $WikiIO->write(rawurldecode(utf8_decode($_POST["username"])), "Wiki", "[nocomment]=".rawurldecode(utf8_decode($_POST["username"]))."=\n\n[/nocomment]");
***************
*** 259,267 ****
  
  
! function new_user($name, $pass, $layout, $email)
  {
    global $WikiUser;
    
!   $WikiUser->create_new_user($name, $pass, $layout, $email);
  }
  
--- 259,267 ----
  
  
! function new_user($name, $pass, $layout, $email, $lang="en")
  {
    global $WikiUser;
    
!   $WikiUser->create_new_user($name, $pass, $layout, $email, $lang);
  }
  

[fuwiki-cvs] fuwiki_1_0 functions.inc,1.3,1.4 index.php,1.3,1.4 io.mysql.inc,1.2,1.3 parser.inc,1.4,1.5 stats.inc,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690

Modified Files:
	functions.inc index.php io.mysql.inc parser.inc stats.inc 
Log Message:
nearing rc2

Index: parser.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/parser.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** parser.inc	16 Oct 2004 15:55:32 -0000	1.4
--- parser.inc	7 Nov 2004 12:00:33 -0000	1.5
***************
*** 53,57 ****
  {
      if(preg_match("/^#/", $str))
!         $str = utf8_decode(_PAGENAME).$str;
      if(preg_match("/([^\|]*)\|(.*)/", $str, $out)) {
          $url = $out[1];
--- 53,57 ----
  {
      if(preg_match("/^#/", $str))
!         $str = _PAGENAME.$str;
      if(preg_match("/([^\|]*)\|(.*)/", $str, $out)) {
          $url = $out[1];
***************
*** 64,73 ****
  }
  
- function parse_lists_callback($str)
- {
-     $str = preg_replace("/\*([^\n]*)(\n?)/", "<li>\\1</li>\\2\r", $str, -1);
-     return "<ul class=\"WikiUL\">\r".$str."</ul>\r";
- }
- 
  function parse_tables_callback($str)
  {
--- 64,67 ----
***************
*** 91,95 ****
      if(preg_match("/^https?:\/\//", $str))
          return "<img src=\"". $str ."\" alt=\"[image]\" />";
!     return "<img src=\"upload/". _PAGENAME ."_". $str ."\" alt=\"[image]\" />";
  }
  
--- 85,89 ----
      if(preg_match("/^https?:\/\//", $str))
          return "<img src=\"". $str ."\" alt=\"[image]\" />";
!     return "<img src=\"".get_image_url($str)."\" alt=\"[image]\" />";
  }
  
***************
*** 104,114 ****
  function parse_comments_callback($str, $arguments="")
  {
!     global $comment_num;
      
      $action = _COMMENT_DEFAULT; $timestamp = "";
      $comment_num++;
      $arguments = stripslashes(stripslashes($arguments));
!     if(preg_match("/action=\\?&quot;(.*)\\?&quot;/U", $arguments, $o) || preg_match("/action=\"(.*)\"/U", $arguments, $o))
!         $action = $o[1];
      if(preg_match("/timestamp=(.*)$/", $arguments, $o))
          $timestamp = $o[1];
--- 98,108 ----
  function parse_comments_callback($str, $arguments="")
  {
!     global $comment_num, $WikiParser;
      
      $action = _COMMENT_DEFAULT; $timestamp = "";
      $comment_num++;
      $arguments = stripslashes(stripslashes($arguments));
!     if(preg_match("/action=\"(.*)\"/", $arguments, $o))
!         $action = $WikiParser->parse_comment_action($o[1]);
      if(preg_match("/timestamp=(.*)$/", $arguments, $o))
          $timestamp = $o[1];
***************
*** 169,172 ****
--- 163,173 ----
              $str = $pre_str."[cmtend]";
      }
+     if($n == 4) {
+         $pre_str = "";
+         while(preg_match("/^(.*)(\[\/comment\])(.*)$/s", $str, $o)) {
+             $str = $o[3]; $pre_str .= $o[1].$o[2];
+         }
+         $str = $pre_str."[nocomment]".$str."[/nocomment]";
+     }
      return $str;
  }
***************
*** 192,210 ****
  function parse_showpage_callback($str)
  {
!     return show($str, false, true);
  }
  
! function parse_paragraphs_callback($str, $str2)
  {
!     if(preg_match("/\[\/comment\][ \n]*$/", $str)) {
!         $str = preg_replace("/\[\/comment\]([ \n]*)$/", "\\1", $str, 1);
!         $str2 = "[/comment]".$str2;
!     }
!     $out  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\r<tr>";
!     $out .= "<td><img src=\"files/empty.gif\" width=\"40\" height=\"1\" alt=\" \"></td>";
!     $out .= "<td>".preg_replace("/(\n|^):/", "\\1", $str)."</td>";
      $out .= "</tr>\r</table>\r";
      
!     return $out.$str2;
  }
  
--- 193,207 ----
  function parse_showpage_callback($str)
  {
!     return preg_replace("/\n/", "", show($str, true, true), -1);
  }
  
! function parse_paragraphs_callback($str, $option)
  {
!     $out  = "\r<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\r<tr>";
!     $out .= "<td><img src=\"files/empty.gif\" width=\"".(strlen($option)*20)."\" height=\"1\" alt=\" \" /></td>";
!     $out .= "<td>".$str."</td>";
      $out .= "</tr>\r</table>\r";
      
!     return $out;
  }
  
***************
*** 216,220 ****
      }
      $str = preg_replace("/(^|\n)\+/", "\\1", $str, -1);
!     $out ="<table cellpadding=\"4\" cellspacing=\"0\" width=\"98%\" class=\"WikiQuote\">\r";
      $out .= "<tr><td class=\"WikiQuoteHeader\">". _PARSERQUOTE ."</td></tr><tr><td valign=\"top\" class=\"WikiQuoteBody\">".$str."</td></tr>\r</table>\r";
      
--- 213,217 ----
      }
      $str = preg_replace("/(^|\n)\+/", "\\1", $str, -1);
!     $out ="\r<table cellpadding=\"4\" cellspacing=\"0\" width=\"98%\" class=\"WikiQuote\">\r";
      $out .= "<tr><td class=\"WikiQuoteHeader\">". _PARSERQUOTE ."</td></tr><tr><td valign=\"top\" class=\"WikiQuoteBody\">".$str."</td></tr>\r</table>\r";
      
***************
*** 222,238 ****
  }
  
! function parse_newsletterquotes_callback($str, $str2)
  {
!     if(preg_match("/\[\/comment\][ \n]*$/", $str)) {
!         $str = preg_replace("/\[\/comment\]([ \n]*)$/", "\\1", $str, 1);
!         $str2 = "[/comment]".$str2;
!     }
!     $str = preg_replace("/(^|\n)>/", "\\1", $str, -1);
!     $out  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\r";
!     $out .= "<tr><td style=\"width:25px; background-image:url('files/newsletter_quote.gif'); background-repeat:repeat-y;\">";
!     $out .= "<img src=\"files/newsletter_quote.gif\" width=\"25\" height=\"1\" alt=\">\" /></td>";
      $out .= "<td valign=\"top\">".ltrim($str)."</td></tr>\r</table>\r";
      
!     return $out.$str2;
  }
  
--- 219,236 ----
  }
  
! 
! function parse_lists_callback($str)
  {
!     return "<ul class=\"WikiUL\" style=\"margin:0px; margin-left:15px; padding:0px;\">\r<li>".$str."</li></ul>\r";
! }
! 
! function parse_newsletterquotes_callback($str, $option)
! {
!     $out  = "\r<table style=\"margin:0px; padding:0px;\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\r";
!     $out .= "<tr><td style=\"width:".(strlen($option)*25)."px; background-image:url('files/newsletter_quote.gif'); background-repeat:repeat;\">";
!     $out .= "</td>";
      $out .= "<td valign=\"top\">".ltrim($str)."</td></tr>\r</table>\r";
      
!     return $out;
  }
  
***************
*** 283,287 ****
  class FWikiParser
  {
!     var $show_comments;
      
      function compare($str1, $str2)
--- 281,285 ----
  class FWikiParser
  {
!     var $show_comments, $html_caching;
      
      function compare($str1, $str2)
***************
*** 305,309 ****
          $str = preg_replace("/(\n)([0123456789][^\n]*)/", "\\1[/change][change]\\2", $str, -1);
          $str = preg_replace("/$/", "[/change]", $str, 1);
! 	$str = preg_replace("/\[change\](.*)\[\/change\]/Use", "compare_callback('\\1')", $str, -1);
          
          $str = preg_replace("/\n/", "<br />", $str, -1);
--- 303,307 ----
          $str = preg_replace("/(\n)([0123456789][^\n]*)/", "\\1[/change][change]\\2", $str, -1);
          $str = preg_replace("/$/", "[/change]", $str, 1);
!         $str = preg_replace("/\[change\](.*)\[\/change\]/Use", "compare_callback('\\1')", $str, -1);
          
          $str = preg_replace("/\n/", "<br />", $str, -1);
***************
*** 314,322 ****
      }
      
!     function parse($string, $isMain=false)
      {
          global $nowiki_cache, $nocomment_cache, $comment_num, $WikiUser;
!         $this->show_comments = $isMain;
          $nowiki_cache = array(); $nocomment_cache = array();
          $string = preg_replace("/\r\n/", "\n", $string, -1);
          $string = preg_replace("/\n\r/", "\n", $string, -1);
--- 312,321 ----
      }
      
!     function parse($string, $isMain=false, $html_caching=false)
      {
          global $nowiki_cache, $nocomment_cache, $comment_num, $WikiUser;
!         $this->show_comments = $isMain; $this->html_caching = $html_caching;
          $nowiki_cache = array(); $nocomment_cache = array();
+         //$string = decode_utf8($string);
          $string = preg_replace("/\r\n/", "\n", $string, -1);
          $string = preg_replace("/\n\r/", "\n", $string, -1);
***************
*** 324,331 ****
          $string = stripslashes($string);
          $string = preg_replace("/\\\"/", "\"", $string, -1);
          $string = $this->extract_nowiki($string);
!         $string = htmlentities($string, ENT_NOQUOTES);
          $string = $this->pre_parse($string);
!         if(!$this->show_comments || !$WikiUser->get_setting("show_comments") || (!preg_match("/\[\/comment\]/", $string) && !preg_match("/--/", $string))) {
              $string = $this->parse_in_nocomments($string);
          } else {
--- 323,334 ----
          $string = stripslashes($string);
          $string = preg_replace("/\\\"/", "\"", $string, -1);
+         $string = preg_replace("/&(?!#|euro;)/", "&amp;", $string, -1);
          $string = $this->extract_nowiki($string);
!         $string = preg_replace("/</", "&lt;", $string, -1);
!         $string = preg_replace("/(?!^|\n)>/", "&gt;", $string, -1);
!         foreach($nowiki_cache as $key => $v)
!             $nowiki_cache[$key] = htmlentities($v, ENT_NOQUOTES, "UTF-8");
          $string = $this->pre_parse($string);
!         if(!$this->show_comments || (!$html_caching && !$WikiUser->get_setting("show_comments")) || (!preg_match("/\[\/comment\]/", $string) && !preg_match("/--/", $string))) {
              $string = $this->parse_in_nocomments($string);
          } else {
***************
*** 355,358 ****
--- 358,373 ----
      }
      
+     function parse_html_cache($string)
+     {
+         $string = $this->parse_votes($string);
+         return $string;
+     }
+         
+     function parse_comment_action($string)
+     {
+         $string = $this->parse_formatting($string);
+         return $string;
+     }
+     
      function parse_private_message($string)
      {
***************
*** 392,396 ****
          $string = $this->parse_code($string);        
          $string = $this->parse_links($string);
-         $string = $this->parse_lists($string);
          $string = $this->parse_tables($string);
          $string = $this->parse_images($string);
--- 407,410 ----
***************
*** 399,402 ****
--- 413,417 ----
          $string = $this->parse_paragraphs($string);
          $string = $this->parse_newsletterquotes($string);
+         $string = $this->parse_lists($string);
          $string = $this->parse_hr($string);
          $string = $this->parse_showpage($string);
***************
*** 455,459 ****
          $string = preg_replace("/\[img-placeholder\]/e", "insert_callback(\$a3)", $string, -1);
          $string = preg_replace("/([^@\n ]+@[^\. @\n]+\.[^ @\n]+)(?= |\n)/", "[url \\1]mailto:\\1[/url]", $string, -1);
!         
          //$string = preg_replace("/\[comment([^\]]*)\](.*)\n/", "[comment\\1]\n\\2", $string, -1);
          return $string;
--- 470,474 ----
          $string = preg_replace("/\[img-placeholder\]/e", "insert_callback(\$a3)", $string, -1);
          $string = preg_replace("/([^@\n ]+@[^\. @\n]+\.[^ @\n]+)(?= |\n)/", "[url \\1]mailto:\\1[/url]", $string, -1);
!         $string = preg_replace("/(\n[^:>\*\n]*)(?=\n[:>\*])/", "\\1\n", $string, -1);
          //$string = preg_replace("/\[comment([^\]]*)\](.*)\n/", "[comment\\1]\n\\2", $string, -1);
          return $string;
***************
*** 463,467 ****
      {
          global $nowiki_cache;
!         $string = preg_replace("/<nowiki>(.*)<\/nowiki>/Use", "extract_callback(\$nowiki_cache, '\\1', '[nowiki-placeholder]')", $string, -1);
          return $string;
      }
--- 478,482 ----
      {
          global $nowiki_cache;
!         $string = preg_replace("/<nowiki>(.*)<\/nowiki>/Use", "extract_callback(\$nowiki_cache, '\\1', '{nowiki-placeholder}')", $string, -1);
          return $string;
      }
***************
*** 470,474 ****
      {
          global $nowiki_cache;
!         $string = preg_replace("/\[nowiki-placeholder\]/e", "insert_callback(\$nowiki_cache)", $string, -1);
          return $string;
      }
--- 485,489 ----
      {
          global $nowiki_cache;
!         $string = preg_replace("/\{nowiki-placeholder\}/e", "insert_callback(\$nowiki_cache)", $string, -1);
          return $string;
      }
***************
*** 499,504 ****
              $string = preg_replace("/\[\[FWikiUser\]\]/i", "<a href=\"index.php?FWikiUser\">". _PARSERREGISTER ."</a>", $string);
          }
!         $string = preg_replace("/\[\[FWikiEdit\]\]/", "<a href=\"index.php?".utf8_decode(_PAGENAME)."&amp;edit=1&amp;v=".(_REVNUM != 0 ? _REVNUM : 0)."\">"._PARSEREDIT."</a>", $string, -1);
!         $string = preg_replace("/\[\[FWikiEdit\|([^\]]*)\]\]/", "<a href=\"index.php?".utf8_decode(_PAGENAME)."&amp;edit=1&amp;v=".(_REVNUM != 0 ? _REVNUM : 0)."\">\\1</a>", $string, -1);
          $string = preg_replace("/\[\[([^\]]*)\]\]/e", "parse_links_callback('\\1')", $string, -1);
          $string = preg_replace("/\[a #([^\]]*)\]/", "<a name=\"\\1\"></a>", $string, -1);
--- 514,519 ----
              $string = preg_replace("/\[\[FWikiUser\]\]/i", "<a href=\"index.php?FWikiUser\">". _PARSERREGISTER ."</a>", $string);
          }
!         $string = preg_replace("/\[\[FWikiEdit\]\]/", "<a href=\"index.php?"._PAGENAME."&amp;edit=1&amp;v=".(_REVNUM != 0 ? _REVNUM : 0)."\">"._PARSEREDIT."</a>", $string, -1);
!         $string = preg_replace("/\[\[FWikiEdit\|([^\]]*)\]\]/", "<a href=\"index.php?"._PAGENAME."&amp;edit=1&amp;v=".(_REVNUM != 0 ? _REVNUM : 0)."\">\\1</a>", $string, -1);
          $string = preg_replace("/\[\[([^\]]*)\]\]/e", "parse_links_callback('\\1')", $string, -1);
          $string = preg_replace("/\[a #([^\]]*)\]/", "<a name=\"\\1\"></a>", $string, -1);
***************
*** 506,517 ****
      }
      
-     function parse_lists($string)
-     {
-         $string = preg_replace("/(^|\n)(\*.*)(?=(\n[^\*])|$)/Use", "parse_lists_callback('\\2')", $string, -1);
-         $string = preg_replace("/\<\/li\>\n*/", "</li>", $string, -1);
-         $string = preg_replace("/\<\/ul\>\n*/", "</ul>", $string, -1);
-         return $string;
-     }
-     
      function parse_tables($string)
      {
--- 521,524 ----
***************
*** 555,558 ****
--- 562,567 ----
      function parse_votes($string)
      {
+         if($this->html_caching)
+             return $string;
          return preg_replace("/\[showvote ([0123456789]+)\]/Ue", "parse_votes_callback('\\1')", $string, -1);
      }
***************
*** 580,583 ****
--- 589,593 ----
          $string = preg_replace("/(\[\/comment\])(.*)(\[comment[^\]]*\])/Use", "'\\1'.fix_comments_callback2('\\2').'\\3'", $string, -1);
          $string = preg_replace("/(\[\/comment\])(?=\n*)(.*)(?!\[comment[^\]]*\])$/Use", "'\\1'.fix_comments_callback2('\\2')", $string, 1);
+         $string = preg_replace("/(\[\/comment\])(.*)$/se", "fix_comments_callback('\\1\\2', 4)", $string, 1);
          $string = preg_replace("/(\[\/comment\])([\n\r]*)(\[comment[^\]]*\])/", "\\1\\3", $string, -1);
          return $string;
***************
*** 595,599 ****
      function parse_urls($string)
      {
-         //$string = preg_replace("/\[url\]\[url\]/", "[url]", $string, -1); $string = preg_replace("/\[\/url\]\[\/url\]/", "[/url]", $string, -1);
          $string = preg_replace("/\[\[url\](.*)\[\/url\] ([^\]]*)\]/Ue", "parse_urls_callback('\\1', '\\2')", $string, -1);
          $string = preg_replace("/\[\[url\](.*)\[\/url\]\]/Ue", "parse_urls_callback('\\1')", $string, -1);
--- 605,608 ----
***************
*** 611,615 ****
      function parse_paragraphs($string)
      {
!         $string = preg_replace("/(\n|^)(:.*)(\n[^:]|$)/Use", "'\\1'.parse_paragraphs_callback('\\2', '\\3')", $string, -1);
          return $string;
      }
--- 620,630 ----
      function parse_paragraphs($string)
      {
!         $string = preg_replace("/(\n|\r|^)(:+)([^\n\r]*)(?=[\n\r])/e", "parse_paragraphs_callback('\\3', '\\2')", $string, -1);
!         return $string;
!     }
!     
!     function parse_lists($string)
!     {
!         $string = preg_replace("/(\n|\r|^)\*([^\n\r]*)(?=[\n\r])/e", "parse_lists_callback('\\2')", $string, -1);
          return $string;
      }
***************
*** 617,622 ****
      function parse_newsletterquotes($string)
      {
!         $string = preg_replace("/(\n|^)&gt;/", "\\1>", $string, -1);
!         $string = preg_replace("/(\n|^)>(.*)(?=\n[^>]|$)/Use", "parse_newsletterquotes_callback('\\2', '\\3')", $string, -1);
          return stripslashes($string);
      }
--- 632,637 ----
      function parse_newsletterquotes($string)
      {
!         $string = preg_replace("/(\n|\r|^)&gt;/", "\\1>", $string, -1);
!         $string = preg_replace("/(\n|\r|^)(>+)([^\n\r]*)(?=[\n\r])/e", "parse_newsletterquotes_callback('\\3', '\\2')", $string, -1);
          return stripslashes($string);
      }
***************
*** 624,628 ****
      function parse_code($string)
      {
!         $string = preg_replace("/\[code\](.*)\[\/code\]/Us", "<pre class=\"WikiCode\">\r\\1\r</pre>\r", $string, -1);
          return $string;
      }
--- 639,643 ----
      function parse_code($string)
      {
!         $string = preg_replace("/\[code\](.*)\[\/code\]/Use", "'<pre class=\"WikiCode\">\r'.htmlentities('\\1', ENT_NOQUOTES).'\r</pre>\r'", $string, -1);
          return $string;
      }
***************
*** 656,665 ****
      "/&uuml;/", "/&yacute;/", "/&thorn;/", "/&amp;/", "/&quot;/", "/&lt;/", "/&gt;/"); 
      
!     $replace = array(" ", "¡", "¢", "£", "¤", "¥", "¦", "§", "¨", "©", "ª", "«", "¬", "­", "®", "¯",
!     "°", "±", "²", "³", "´", "µ", "¶", "·", "¸", "¹", "º", "»", "¼", "½", "¾", "¿", "À", "Á", "Â",
!     "Ã", "Ä", "Å", "Æ", "Ç", "È", "É", "Ê", "Ë", "Ì", "Í", "Î", "Ï", "Ð", "Ñ", "Ò", "Ó", "Ô", "Õ",
!     "Ö", "×", "Ø", "Ù", "Ú", "Û", "Ü", "Ý", "Þ", "ß", "à", "á", "â", "ã", "ä", "å", "æ", "ç", "è",
!     "é", "ê", "ë", "ì", "í", "î", "ï", "ð", "ñ", "ò", "ó", "ô", "õ", "ö", "÷", "ø", "ù", "ú", "û",
!     "ü", "ý", "þ", "&", "\"", "<", ">");        
  
      return preg_replace($search, $replace, $string);   
--- 671,680 ----
      "/&uuml;/", "/&yacute;/", "/&thorn;/", "/&amp;/", "/&quot;/", "/&lt;/", "/&gt;/"); 
      
!     $replace = array(" ", "°", "¢", "£", "§", "•", "¶", "ß", "®", "©", "™", "´", "¨", "≠", "Æ", "Ø",
!     "∞", "±", "≤", "≥", "¥", "µ", "∂", "∑", "∏", "π", "∫", "ª", "º", "Ω", "æ", "ø", "¿", "¡", "¬",
!     "√", "ƒ", "≈", "∆", "«", "»", "…", " ", "À", "Ã", "Õ", "Œ", "œ", "–", "—", "“", "”", "‘", "’",
!     "÷", "◊", "ÿ", "Ÿ", "⁄", "€", "‹", "›", "fi", "fl", "‡", "·", "‚", "„", "‰", "Â", "Ê", "Á", "Ë",
!     "È", "Í", "Î", "Ï", "Ì", "Ó", "Ô", "", "Ò", "Ú", "Û", "Ù", "ı", "ˆ", "˜", "¯", "˘", "˙", "˚",
!     "¸", "˝", "˛", "&", "\"", "<", ">");        
  
      return preg_replace($search, $replace, $string);   

Index: stats.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/stats.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** stats.inc	13 Oct 2004 20:28:26 -0000	1.1.1.1
--- stats.inc	7 Nov 2004 12:00:33 -0000	1.2
***************
*** 104,111 ****
          else if(preg_match("/firefox/i", $agent))
              $browser = "Mozilla FireFox";
-         else if(preg_match("/mozilla/i", $agent) || preg_match("/gecko/i", $agent))
-             $browser = "Mozilla/Gecko";
          else if(preg_match("/msie/i", $agent) || preg_match("/internet explorer/i", $agent))
              $browser = "Internet Explorer";
          
          $this->inc_count("browser_".$browser);
--- 104,111 ----
          else if(preg_match("/firefox/i", $agent))
              $browser = "Mozilla FireFox";
          else if(preg_match("/msie/i", $agent) || preg_match("/internet explorer/i", $agent))
              $browser = "Internet Explorer";
+         else if(preg_match("/mozilla/i", $agent) || preg_match("/gecko/i", $agent))
+             $browser = "Mozilla/Gecko";
          
          $this->inc_count("browser_".$browser);

Index: index.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.php	15 Oct 2004 11:49:04 -0000	1.3
--- index.php	7 Nov 2004 12:00:33 -0000	1.4
***************
*** 38,41 ****
--- 38,43 ----
  require("priv.inc");
  require("stats.inc");
+ 
+ 
  
  // Create objects
***************
*** 72,86 ****
  {
    // Save uploaded file
!   if(is_uploaded_file($_FILES['userfile']['tmp_name'])) {
!     move_uploaded_file($_FILES['userfile']['tmp_name'], "upload/".rawurldecode(utf8_decode(_PAGENAME))."_".$_FILES['userfile']['name']);
!     $WikiStats->inc_count("total_image_uploads");
!   }
!   // Move uploaded (previewed file)  
!   if(!empty($_POST["uploaded_file"]))
!   {
!     copy("upload/temp/".rawurldecode(utf8_decode(_PAGENAME))."_".rawurldecode(utf8_decode($_POST["uploaded_file"])), "upload/".rawurldecode(utf8_decode(_PAGENAME))."_".rawurldecode(utf8_decode($_POST["uploaded_file"])));
! 	unlink("upload/temp/".rawurldecode(utf8_decode(_PAGENAME))."_".rawurldecode(utf8_decode($_POST["uploaded_file"])));
! 	$WikiStats->inc_count("total_image_uploads");
!   }
  	
    if(!empty($_POST["revision"]) && $_POST["revision"] < $WikiIO->get_latest_revision_number(_PAGENAME)) {
--- 74,78 ----
  {
    // Save uploaded file
!   save_image(_PAGENAME, $_FILES['userfile']['name'], $_FILES['userfile']['tmp_name']);
  	
    if(!empty($_POST["revision"]) && $_POST["revision"] < $WikiIO->get_latest_revision_number(_PAGENAME)) {
***************
*** 97,110 ****
  if(!empty($_POST["commented"]))
  {
!   $WikiStats->edit_page();
    // Save uploaded file
!   if(is_uploaded_file($_FILES['userfile']['tmp_name'])) {
!     move_uploaded_file($_FILES['userfile']['tmp_name'], "upload/".rawurldecode(utf8_decode(_PAGENAME))."_".$_FILES['userfile']['name']);
! 	$WikiStats->inc_count("total_image_uploads");
!   }
    
    $temp_rev = $WikiIO->get_revision(_PAGENAME);
    $d = getdate();
!   $comment = $_POST["comment"];
    if(_PAGENAME == "FWikiNews") {
    	$comment = "'''Date''': ". $d["mon"] ."/". $d["mday"] ." ". $d["year"] ." '''Author''': ". $WikiUser->get_name() ."\n" . $comment;
--- 89,99 ----
  if(!empty($_POST["commented"]))
  {
!   $WikiStats->edit_page(true);
    // Save uploaded file
!   save_image(_PAGENAME, $_FILES['userfile']['name'], $_FILES['userfile']['tmp_name']);
    
    $temp_rev = $WikiIO->get_revision(_PAGENAME);
    $d = getdate();
!   $comment = fuwiki_entities_commentbox($_POST["comment"]);
    if(_PAGENAME == "FWikiNews") {
    	$comment = "'''Date''': ". $d["mon"] ."/". $d["mday"] ." ". $d["year"] ." '''Author''': ". $WikiUser->get_name() ."\n" . $comment;
***************
*** 112,116 ****
    }
    else
!   	$WikiIO->write(_PAGENAME, $WikiUser->get_name(), utf8_encode($temp_rev->text)."\n\n". "[comment".($action != _COMMENT_DEFAULT ? " action=\"".stripslashes($action)."\"":"")." timestamp=".get_timestamp()."]\n".$comment ." ".stripslashes($_POST["signature"])."[/comment]");
  }
  
--- 101,105 ----
    }
    else
!   	$WikiIO->write(_PAGENAME, $WikiUser->get_name(), $temp_rev->text."\n\n". "[comment".($action != _COMMENT_DEFAULT ? " action=\"".stripslashes($action)."\"":"")." timestamp=".get_timestamp()."]\n".$comment ." ".stripslashes($_POST["signature"])."[/comment]");
  }
  
***************
*** 180,187 ****
  header("Content-type: text/html; charset=UTF-8"); 
  
! begin_html();
  
  // Everything between <body> and </body>
! echo utf8_encode($out);
  
  // Finish page
--- 169,176 ----
  header("Content-type: text/html; charset=UTF-8"); 
  
! begin_html();
  
  // Everything between <body> and </body>
! echo (utf8_encode($out));
  
  // Finish page

Index: functions.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/functions.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions.inc	16 Oct 2004 15:55:32 -0000	1.3
--- functions.inc	7 Nov 2004 12:00:32 -0000	1.4
***************
*** 1,4 ****
! <?PHP
! 
  /* fuwiki - A free Wiki Software
   * 
--- 1,4 ----
! <?PHP
! 
  /* fuwiki - A free Wiki Software
   * 
***************
*** 20,85 ****
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   *
!  */
! 
! ############ MAIN FUNCTIONS #############
! 
! function show($pagename, $isMain=false, $show_news=false)
! {
!   global $WikiIO, $WikiParser, $WikiUser, $_GET;
    if(!$WikiIO->page_exists($pagename))
!     return _WIKIPAGE_NOT_FOUND;
!   if($pagename == "FWikiNews" && _PAGENAME != "FWikiNews" && !$show_news) {
!   	include("FWiki/News.php");
!   	return (FWikiMain());
    }
    else if($isMain && $_GET["show_revchanges"] == true) {
      $revision = $WikiIO->get_revision($pagename, _REVNUM);
      $old_revision = $WikiIO->get_revision($pagename, $revision->revision-1);
!   }
!   else if($isMain) {
!     $revision = $WikiIO->get_revision($pagename, _REVNUM);
!   }
!   else {
!     $revision = $WikiIO->get_revision($pagename);
!   }
!     
!   if($revision == null)
!     return _WIKIPAGE_NOT_FOUND;
    else if($old_revision != null)
!     return $WikiParser->compare($revision->text, $old_revision->text, $isMain);
!     return $WikiParser->parse($revision->text, $isMain) .($isMain ? "\n<a name=\"wiki_pageend\"></a>\n" : "");
! }
! 
! function show_edit($pagename, $v="", $nosubmit=false, $text="")
! {
!   global $WikiIO;
! 
! 	if($text != "")
! 	{
! 		$out = "<textarea name=\"WikiCode\" rows=\"25\" class=\"WikiCodeArea\">".$text."</textarea>";
! 		return $out;
! 	}
! 
!   $revision = $WikiIO->get_revision($pagename, $v);
!   
!   $out  = "<form enctype=\"multipart/form-data\" id=\"edit_form\" name=\"wiki_edit\" method=\"POST\" action=\"index.php?".rawurldecode(utf8_decode($pagename))."\">";
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" style=\"width: 100%\" class=\"WikiCodeArea\">".stripslashes($revision->text)."</textarea>";
!   
!   if($revision == null)
!     $out .= "<input type=\"hidden\" name=\"revision\" value=\"1\">";
!   else
!     $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$revision->revision."\">";
!   
!   if($nosubmit == false) {  
!   	$out .= "<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\""._MAX_UPLOAD_SIZE."\">";  
!   	$out .= "<br />". _EDIT_UPLOAD ." <input name=\"userfile\" class=\"userfile\" type=\"file\"> ";
!   	$out .= "<input type=\"submit\" class=\"btn_submit\" name=\"edited\" value=\"". _EDIT_SUBMIT. "\" accesskey=\"s\">";
!   	$out .= "<input type=\"submit\" class=\"btn_preview\" name=\"preview\" value=\"". _EDIT_SUBMIT_PREVIEW ."\" accesskey=\"f\">";
!   }
!   $out .= "</form>";
!   
!   return $out;
! }
! 
  function show_preview($pagename)
  {
--- 20,85 ----
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   *
!  */
! 
! ############ MAIN FUNCTIONS #############
! 
! function show($pagename, $isMain=false, $show_news=false)
! {
!   global $WikiIO, $WikiParser, $WikiUser, $_GET;
!   $additional = ($isMain ? "\n<a name=\"wiki_pageend\"></a>\n" : "");
    if(!$WikiIO->page_exists($pagename))
!     return _WIKIPAGE_NOT_FOUND;
!   if($pagename == "FWikiNews" && _PAGENAME != "FWikiNews" && !$show_news) {
!   	include("FWiki/News.php");
!   	return (FWikiMain());
    }
+   else if($pagename != _PAGENAME && !preg_match("/(^|:)menu/", $pagename))
+     return get_html_cache($pagename);
    else if($isMain && $_GET["show_revchanges"] == true) {
      $revision = $WikiIO->get_revision($pagename, _REVNUM);
      $old_revision = $WikiIO->get_revision($pagename, $revision->revision-1);
!   }
!   else if($isMain && $WikiUser->is_authorized() && $WikiUser->get_setting("show_comments")) {
!     if(_REVNUM == 0 && empty($_GET["nocache"]))
!         return get_html_cache($pagename).$additional;
!     $revision = $WikiIO->get_revision($pagename, _REVNUM);
!   }
!   else {
!     $revision = $WikiIO->get_revision($pagename);
!   }
!     
!   if($revision == null)
!     return _WIKIPAGE_NOT_FOUND;
    else if($old_revision != null)
!     return $WikiParser->compare($revision->text, $old_revision->text, $isMain);
!     return $WikiParser->parse($revision->text, $isMain) .$additional;
! }
! 
! function show_edit($pagename, $v="", $nosubmit=false, $text="")
! {
!   global $WikiIO;
!   $revision = $WikiIO->get_revision($pagename, $v);
!   
!   if($nosubmit == false)
!     $out  = "<form enctype=\"multipart/form-data\" id=\"edit_form\" method=\"post\" action=\"index.php?".rawurldecode(utf8_decode($pagename))."\">";
!   
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" style=\"width: 100%\" class=\"WikiCodeArea\">".stripslashes(($text != "" ? $text : $revision->text))."</textarea>";
!   
!   if($nosubmit == false) {
!     if($revision == null)
!         $out .= "<input type=\"hidden\" name=\"revision\" value=\"1\">";
!     else
!         $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$revision->revision."\">";
!     
!   	$out .= "<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\""._MAX_UPLOAD_SIZE."\">";  
!   	$out .= "<br />". _EDIT_UPLOAD ." <input name=\"userfile\" class=\"userfile\" type=\"file\"> ";
!   	$out .= "<input type=\"submit\" class=\"btn_submit\" name=\"edited\" value=\"". _EDIT_SUBMIT. "\" accesskey=\"s\">";
!   	$out .= "<input type=\"submit\" class=\"btn_preview\" name=\"preview\" value=\"". _EDIT_SUBMIT_PREVIEW ."\" accesskey=\"f\">";
!   	$out .= "</form>";
!   }
!   
!   return $out;
! }
! 
  function show_preview($pagename)
  {
***************
*** 89,102 ****
    if(is_uploaded_file($_FILES['userfile']['tmp_name']))
    {
!     move_uploaded_file($_FILES['userfile']['tmp_name'], "upload/temp/".$pagename."_".$_FILES['userfile']['name']);
!     $form_upload  = "Upload: <i>".$_FILES['userfile']['name']."</i> ";
!     $form_upload .= "<input type=\"hidden\" name=\"uploaded_file\" value=\"".$_FILES['userfile']['name']."\">";
!     $_POST["uploaded_file"] = $_FILES['userfile']['name'];
!   }elseif(!empty($_POST["uploaded_file"])){
!     $form_upload  = "Upload: <i>".$_POST["uploaded_file"]."</i> ";
!     $form_upload .= "<input type=\"hidden\" name=\"uploaded_file\" value=\"".$_POST["uploaded_file"]."\">";  
!   }else{
      $form_enctype = " enctype=\"multipart/form-data\"";
!     $form_upload  = "<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\""._MAX_UPLOAD_SIZE."\">";
      $form_upload .= "Upload: <input name=\"userfile\" type=\"file\"> ";  
    }
--- 89,96 ----
    if(is_uploaded_file($_FILES['userfile']['tmp_name']))
    {
!     save_image(_PAGENAME, $_FILES['userfile']['name'], $_FILES['userfile']['tmp_name']);
!     $form_upload  = "Upload: <i>".$_FILES['userfile']['name']."</i><br />";
      $form_enctype = " enctype=\"multipart/form-data\"";
!     $form_upload  .= "<input type=\"hidden\" name=\"MAX_FILE_SIZE\" value=\""._MAX_UPLOAD_SIZE."\">";
      $form_upload .= "Upload: <input name=\"userfile\" type=\"file\"> ";  
    }
***************
*** 107,115 ****
    
    $out .= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
!   $out .= $WikiParser->parse(stripslashes(utf8_decode($_POST["WikiCode"])), true);
    $out .= "</td></tr><tr><td><br /><hr /></td></tr><tr><td>";
!   $out .= "<form".$form_enctype." name=\"previewform\" action=\"index.php?".rawurldecode(utf8_decode(_PAGENAME))."\" method=\"post\">";
    $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$_POST["revision"]."\">";
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" cols=\"90\">".stripslashes(rawurldecode(utf8_decode($_POST["WikiCode"])))."</textarea>";
    $out .= "<br />".$form_upload;
    $out .= "<input type=\"submit\" name=\"edited\" value=\"Abschicken\" accesskey=\"s\"> ";
--- 101,109 ----
    
    $out .= "<table border=\"0\" width=\"100%\" cellpadding=\"0\" cellspacing=\"0\"><tr><td>";
!   $out .= $WikiParser->parse(encode_utf8($_POST["WikiCode"]), true);
    $out .= "</td></tr><tr><td><br /><hr /></td></tr><tr><td>";
!   $out .= "<form".$form_enctype." name=\"previewform\" action=\"index.php?"._PAGENAME."\" method=\"post\">";
    $out .= "<input type=\"hidden\" name=\"revision\" value=\"".$_POST["revision"]."\">";
!   $out .= "<textarea name=\"WikiCode\" rows=\"25\" cols=\"90\">".encode_utf8($_POST["WikiCode"])."</textarea>";
    $out .= "<br />".$form_upload;
    $out .= "<input type=\"submit\" name=\"edited\" value=\"Abschicken\" accesskey=\"s\"> ";
***************
*** 119,142 ****
    
    return $out;
! }
! 
! function show_revfix($pagename, $v="")
! {
!   global $WikiParser, $WikiIO, $_POST;
!   
!   $out = "";
!   if($_POST["revision"] < $WikiIO->get_latest_revision_number($pagename))
!     $out .= get_wikielement("revision_warning");
!     
!   return $out;
! }
! 
! function show_user_page($pagename)
! {
!   global $WikiUser, $WikiIO;
!   
!     if($WikiUser->is_authorized()) {
!         if($WikiUser->get_setting("show_userpages") == true && $WikiIO->page_exists($WikiUser->get_name().":".$pagename))
!             return show($WikiUser->get_name().":".$pagename);
          else if($WikiIO->page_exists($pagename.".". $WikiUser->get_language()))
              return show($pagename.".". $WikiUser->get_language());
--- 113,136 ----
    
    return $out;
! }
! 
! function show_revfix($pagename, $v="")
! {
!   global $WikiParser, $WikiIO, $_POST;
!   
!   $out = "";
!   if($_POST["revision"] < $WikiIO->get_latest_revision_number($pagename))
!     $out .= get_wikielement("revision_warning");
!     
!   return $out;
! }
! 
! function show_user_page($pagename)
! {
!   global $WikiUser, $WikiIO;
!   
!     if($WikiUser->is_authorized()) {
!         if($WikiUser->get_setting("show_userpages") == true && $WikiIO->page_exists($WikiUser->get_name().":".$pagename))
!             return show($WikiUser->get_name().":".$pagename);
          else if($WikiIO->page_exists($pagename.".". $WikiUser->get_language()))
              return show($pagename.".". $WikiUser->get_language());
***************
*** 144,247 ****
      if($WikiIO->page_exists($pagename.".". _LANGUAGE))
          return show($pagename.".". _LANGUAGE);
!     
!     return show($pagename);
! }
! 
! 
! function get_wikielement($name)
! {
!   if(file_exists("elements/".$name.".inc"))
!   {
!     return include("elements/".$name.".inc");
!   }else{
!     return "[Wikielement: \"".$name."\"]";
!   }
! }
! 
! function get_wikivar($name)
! {
! 	global $WikiLayout;
! 	return $WikiLayout->get_var($name);
! }
! 
! 
! ######## MISCELLANEOUS FUNCTIONS ########
! 
! function init()
! {
!   global $_GET, $_POST, $_ALIASES;
!   
!   // Set up pagename
!   $queries = explode("&", getenv("QUERY_STRING"));
!   $pagename = preg_replace("/=/", "", $queries[0]);
!   if(!empty($_GET["s"])) $pagename = $_GET["s"]; 
!   
!   foreach($_ALIASES as $key=>$value)
!   {
!     if($pagename == $key) $pagename = $value;
!   }
!   
    if(!empty($_GET["v"])) define("_REVNUM", $_GET["v"]);
    else if(!empty($_POST["v"])) define("_REVNUM", $_POST["v"]);
    else define("_REVNUM", 0);
!   if(empty($pagename)) $pagename=$_ALIASES[""];
!   
!   define("_PAGENAME", rawurldecode(utf8_decode($pagename)));
!   
!   // Set up if user is in edit-mode
!   if(!empty($_GET["edit"])) define("_EDIT_MODE", true); else define("_EDIT_MODE", false);
    if(!empty($_GET["v"])) define("_EDIT_REV", $_GET["v"]); else define("_EDIT_REV", 0);
!   
!   // Set up if user is in preview-mode
!   if(!empty($_POST["preview"])) define("_PREVIEW_MODE", true); else define("_PREVIEW_MODE", false);
! }
! 
! function FWikiPage_exists($name)
! {
!   return file_exists("FWiki/".$name.".php");
! }
! 
! function timestamp_pattern($date)
! {
! 	preg_match("/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/", $date, $o);
! 	$s = preg_replace("/\%y/", $o[1], _FWC_TIMEFORMAT); $s = preg_replace("/\%m/", $o[2], $s);
! 	$s = preg_replace("/\%d/", $o[3], $s); $s = preg_replace("/\%h/", $o[4], $s);
! 	$s = preg_replace("/\%s/", $o[5], $s);
! 	
! 	return $s;
! }
! 
! function get_timestamp()
! {
! 	$d = getdate();
!     return $d["year"].($d["mon"] < 10 ? "0".$d["mon"] : $d["mon"]).($d["mday"] < 10 ? "0".$d["mday"] : $d["mday"]).($d["hours"] < 10 ? "0".$d["hours"] : $d["hours"]).($d["minutes"] < 10 ? "0".$d["minutes"] : $d["minutes"]).($d["seconds"] < 10 ? "0".$d["seconds"] : $d["seconds"]);
! }
! 
! ############## HTML OUTPUT ##############
! function begin_html($nolayout=false)
! {
!   global $WikiLayout, $WikiParser;
!   
    $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
    $out .= "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n";
!   $out .= "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
!   $out .= "<head>\n";
!   $out .= "<meta http-equiv=\"content-type\" content=\"text/html;". _CHARSET ."\" />\n";
!   $out .= "<title>".utf8_decode(_PAGENAME)." - ". _SITENAME."</title>\n";
!   if(!$nolayout)
!   	$out .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"layout/".$WikiParser->work_html($WikiLayout->get_layout())."/".$WikiParser->work_html($WikiLayout->get_style()).".css\" />\n";
!   $out .= "</head>\n";
!   $out .= "<body>\n";
!   
!   echo utf8_encode($out);
! }
! 
! function end_html()
! {
!   $out = "\n</body>";
!   $out .= "\n</html>";
!   
!   echo utf8_encode($out);
! }
! 
! ?>
--- 138,497 ----
      if($WikiIO->page_exists($pagename.".". _LANGUAGE))
          return show($pagename.".". _LANGUAGE);
!     
!     return show($pagename);
! }
! 
! 
! function get_wikielement($name)
! {
!   if(file_exists("elements/".$name.".inc"))
!   {
!     return include("elements/".$name.".inc");
!   }else{
!     return "[Wikielement: \"".$name."\"]";
!   }
! }
! 
! function get_wikivar($name)
! {
! 	global $WikiLayout;
! 	return $WikiLayout->get_var($name);
! }
! 
! function get_image_url($name)
! {
!     global $WikiIO;
!     $query = "SELECT id, pagename, name FROM images WHERE name='".$name."' AND pagename='"._PAGENAME."' LIMIT 1;";
!     $res = $WikiIO->query($query);
!     if(!$res || mysql_num_rows($res) == 0)
!         return 0;
!     $a = mysql_fetch_array($res);
!     $ext = get_file_extension($a["name"]);
!     return "upload/".$a["id"].".".$ext;
! }
! 
! function save_image($pagename, $name, $tempname)
! {
!     global $WikiIO, $WikiUser, $WikiStats;
!     if(is_uploaded_file($tempname)) {
!         $query = "INSERT images (uploader_id, pagename, name, upload_time) VALUES (".$WikiUser->get_id().", '".$pagename."', '".$name."', '".get_timestamp()."');";
!         $WikiIO->query($query);
!         $query = "SELECT id, name, pagename FROM images WHERE name='".$name."' AND pagename='".$pagename."' LIMIT 1;";
!         $res = $WikiIO->query($query);
!          if(!$res || mysql_num_rows($res) == 0)
!             return;
!         $a = mysql_fetch_array($res);
!         $ext = get_file_extension($a["name"]);
!         move_uploaded_file($tempname, "upload/".$a["id"].".".$ext);
!         $WikiStats->inc_count("total_image_uploads");
!     }
! }
! 
! 
! ############ HTML-CACHE ################
! 
! function get_html_cache($pagename)
! {
!     global $WikiIO, $WikiUser, $WikiParser;
!     $res = $WikiIO->query("SELECT id,revision,name,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
!     if(!$res || mysql_num_rows($res) < 1)
!         update_html_cache($pagename);
!     else {
!         $a = mysql_fetch_array($res);
!         if($WikiIO->get_latest_revision_number($pagename) != $a["revision"]) {
!             update_html_cache($pagename);
!         }
!     }
!     
!     $res = $WikiIO->query("SELECT id,name,text,lang FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
!     if(!$res || mysql_num_rows($res) < 1)
!         return mysql_error();
!     $h = mysql_fetch_array($res);
!     return $WikiParser->parse_html_cache($h["text"]);
! }
! 
! function update_html_cache($pagename)
! {
!     global $WikiIO, $WikiParser, $WikiUser;
!     $rev = $WikiIO->get_revision_fast($pagename);
!     if(!$rev)
!         return;
!     $res = $WikiIO->query("SELECT id,name FROM html_cache WHERE name='".$pagename."' AND lang='".$WikiUser->get_language()."' LIMIT 1;");
!     if(!$res || mysql_num_rows($res) < 1)
!         $query = "INSERT html_cache (revision, name, text, lang) VALUES(".$rev->revision.", '".$pagename."', '".addslashes($WikiParser->parse($rev->text, true, true))."', '".$WikiUser->get_language()."');";
!     else { $a = mysql_fetch_array($res);
!         $query = "UPDATE html_cache SET revision=".$rev->revision.", text='".addslashes($WikiParser->parse($rev->text, true, true))."',  lang='".$WikiUser->get_language()."' WHERE id=".$a["id"]." LIMIT 1;";
!     }
!     $WikiIO->query($query);echo mysql_error();
! }
! 
! 
! ######## MISCELLANEOUS FUNCTIONS ########
! 
! function get_file_extension($name)
! {
!     if(preg_match("/\.(\w+)$/", $name, $o))
!         return $o[1];
!     return "";
! }
! 
! function fuwiki_entities_commentbox($str)
! {
!     $str = preg_replace("/--/", "<nowiki>--</nowiki>", $str);
!     return $str;
! }
! 
! function fuwiki_entities($str)
! {
!     $str = preg_replace("/€/", "&euro;", $str);
!     return $str;
! }
! 
! function seems_utf8($str) {
!     for ($i=0; $i < strlen($str); $i++) {
!         if (ord($str[$i]) < 0x80) continue; # 0bbbbbbb
!         else if ((ord($str[$i]) & 0xE0) == 0xC0) $n=1; # 110bbbbb
!         else if ((ord($str[$i]) & 0xF0) == 0xE0) $n=2; # 1110bbbb
!         else if ((ord($str[$i]) & 0xF8) == 0xF0) $n=3; # 11110bbb
!         else if ((ord($str[$i]) & 0xFC) == 0xF8) $n=4; # 111110bb
!         else if ((ord($str[$i]) & 0xFE) == 0xFC) $n=5; # 1111110b
!         else return false; # Does not match any model
!         for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
!         if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
!             return false;
!         }
!     } 
!     return true;
! }
! 
! 
! function checkTitleEncoding( $s ) {
! 		# Check for non-UTF-8 URLs
! 		$ishigh = preg_match( '/[\x80-\xff]/', $s);
! 		if(!$ishigh) return $s;
! 		
! 		$isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
!                 '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
! 		if( $isutf8 ) return $s;
! }
! 
! function init()
! {
!   global $_GET, $_POST, $_ALIASES;
!   
!   $pagename = getenv("QUERY_STRING");
!   // Set up pagename
!   if(preg_match("/&#/", getenv("QUERY_STRING")))
!     $pagename = decode_utf8(getenv("QUERY_STRING"));
!   
!   $queries = explode("&", $pagename);
! 
!   //echo seems_utf8($queries[0])."<br>";
!   $pagename = preg_replace("/=/", "", $queries[0]);
!   $pagename = preg_replace("/\'/", "", $pagename);
!   $pagename = preg_replace("/\"/", "", $pagename);
!   if(!empty($_GET["s"])) $pagename = $_GET["s"]; 
!   
!   foreach($_ALIASES as $key=>$value)
!   {
!     if($pagename == $key) $pagename = $value;
!   }
!   
    if(!empty($_GET["v"])) define("_REVNUM", $_GET["v"]);
    else if(!empty($_POST["v"])) define("_REVNUM", $_POST["v"]);
    else define("_REVNUM", 0);
!   if(empty($pagename)) $pagename=$_ALIASES[""];
!   
!   if(seems_utf8($pagename))
!     define("_PAGENAME", encode_utf8(rawurldecode($pagename)));
!   else
!     define("_PAGENAME", encode_utf8(utf8_encode(rawurldecode($pagename))));
!   
!   // Set up if user is in edit-mode
!   if(!empty($_GET["edit"])) define("_EDIT_MODE", true); else define("_EDIT_MODE", false);
    if(!empty($_GET["v"])) define("_EDIT_REV", $_GET["v"]); else define("_EDIT_REV", 0);
!   
!   // Set up if user is in preview-mode
!   if(!empty($_POST["preview"])) define("_PREVIEW_MODE", true); else define("_PREVIEW_MODE", false);
! }
! 
! function FWikiPage_exists($name)
! {
!   return file_exists("FWiki/".$name.".php");
! }
! 
! function timestamp_pattern($date)
! {
! 	preg_match("/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/", $date, $o);
! 	$s = preg_replace("/\%y/", $o[1], _FWC_TIMEFORMAT); $s = preg_replace("/\%m/", $o[2], $s);
! 	$s = preg_replace("/\%d/", $o[3], $s); $s = preg_replace("/\%h/", $o[4], $s);
! 	$s = preg_replace("/\%s/", $o[5], $s);
! 	$s = preg_replace("/\%i/", $o[6], $s);
! 	
! 	return $s;
! }
! 
! function get_timestamp()
! {
! 	$d = getdate();
!     return $d["year"].($d["mon"] < 10 ? "0".$d["mon"] : $d["mon"]).($d["mday"] < 10 ? "0".$d["mday"] : $d["mday"]).($d["hours"] < 10 ? "0".$d["hours"] : $d["hours"]).($d["minutes"] < 10 ? "0".$d["minutes"] : $d["minutes"]).($d["seconds"] < 10 ? "0".$d["seconds"] : $d["seconds"]);
! }
! 
! function decode_utf8($source) {
!     $utf8Str = "";
!     $entityArray = explode ("&#", $source);
!     $size = count ($entityArray);
!     for ($i = 0; $i < $size; $i++) {
!         $subStr = $entityArray[$i];
!         $nonEntity = strstr ($subStr, ';');
!         if ($nonEntity !== false) {
!             $unicode = intval (substr ($subStr, 0, (strpos ($subStr, ';') + 1)));
!             // determine how many chars are needed to reprsent this unicode char
!             if ($unicode < 128) {
!                 $utf8Substring = chr ($unicode);
!             }
!             else if ($unicode >= 128 && $unicode < 2048) {
!                 $binVal = str_pad (decbin ($unicode), 11, "0", STR_PAD_LEFT);
!                 $binPart1 = substr ($binVal, 0, 5);
!                 $binPart2 = substr ($binVal, 5);
!                 $char1 = chr (192 + bindec ($binPart1));
!                 $char2 = chr (128 + bindec ($binPart2));
!                 $utf8Substring = $char1 . $char2;
!             }
!             else if ($unicode >= 2048 && $unicode < 65536) {
!                 $binVal = str_pad (decbin ($unicode), 16, "0", STR_PAD_LEFT);
!                 $binPart1 = substr ($binVal, 0, 4);
!                 $binPart2 = substr ($binVal, 4, 6);
!                 $binPart3 = substr ($binVal, 10);
!                 
!                 $char1 = chr (224 + bindec ($binPart1));
!                 $char2 = chr (128 + bindec ($binPart2));
!                 $char3 = chr (128 + bindec ($binPart3));
!                 $utf8Substring = $char1 . $char2 . $char3;
!             }
!             else {
!                 $binVal = str_pad (decbin ($unicode), 21, "0", STR_PAD_LEFT);
!                 $binPart1 = substr ($binVal, 0, 3);
!                 $binPart2 = substr ($binVal, 3, 6);
!                 $binPart3 = substr ($binVal, 9, 6);
!                 $binPart4 = substr ($binVal, 15);
!                 $char1 = chr (240 + bindec ($binPart1));
!                 $char2 = chr (128 + bindec ($binPart2));
!                 $char3 = chr (128 + bindec ($binPart3));
!                 $char4 = chr (128 + bindec ($binPart4));
!                 $utf8Substring = $char1 . $char2 . $char3 . $char4;
!             }
!             if (strlen ($nonEntity) > 1)
!                 $nonEntity = substr ($nonEntity, 1); // chop the first char (';')
!             else
!                 $nonEntity = '';
!             
!             $utf8Str .= $utf8Substring . $nonEntity;
!         }
!         else {
!             $utf8Str .= $subStr;
!         }
!     }
!     return $utf8Str;
! }
! 
! function encode_utf8($source) {
!     // array used to figure what number to decrement from character order value
!     // according to number of characters used to map unicode to ascii by utf-8
!     $decrement[4] = 240;
!     $decrement[3] = 224;
!     $decrement[2] = 192;
!     $decrement[1] = 0;
!     
!     // the number of bits to shift each charNum by
!     $shift[1][0] = 0;
!     $shift[2][0] = 6;
!     $shift[2][1] = 0;
!     $shift[3][0] = 12;
!     $shift[3][1] = 6;
!     $shift[3][2] = 0;
!     $shift[4][0] = 18;
!     $shift[4][1] = 12;
!     $shift[4][2] = 6;
!     $shift[4][3] = 0;
!     $pos = 0;
!     $len = strlen ($source);
!     $encodedString = '';
!     while ($pos < $len) {
!         $asciiPos = ord (substr ($source, $pos, 1));
!         if (($asciiPos >= 240) && ($asciiPos <= 255)) {
!             // 4 chars representing one unicode character
!             $thisLetter = substr ($source, $pos, 4);
!             $pos += 4;
!         }
!         else if (($asciiPos >= 224) && ($asciiPos <= 239)) {
!             // 3 chars representing one unicode character
!             $thisLetter = substr ($source, $pos, 3);
!             $pos += 3;
!         }
!         else if (($asciiPos >= 192) && ($asciiPos <= 223)) {
!             // 2 chars representing one unicode character
!             $thisLetter = substr ($source, $pos, 2);
!             $pos += 2;
!         }
!         else {
!             // 1 char (lower ascii)
!             $thisLetter = substr ($source, $pos, 1);
!             $pos += 1;
!         }
!         
!         // process the string representing the letter to a unicode entity
!         $thisLen = strlen ($thisLetter);
!         $thisPos = 0;
!         $decimalCode = 0;
!         while ($thisPos < $thisLen) {
!             $thisCharOrd = ord (substr ($thisLetter, $thisPos, 1));
!             if ($thisPos == 0) {
!                 $charNum = intval ($thisCharOrd - $decrement[$thisLen]);
!                 $decimalCode += ($charNum << $shift[$thisLen][$thisPos]);
!             }
!             else {
!                 $charNum = intval ($thisCharOrd - 128);
!                 $decimalCode += ($charNum << $shift[$thisLen][$thisPos]);
!             }
!             $thisPos++;
!         }
!         
!         if ($thisLen == 1)
!             $encodedLetter = chr($decimalCode);
!         else
!             $encodedLetter = "&#". str_pad($decimalCode, 5, "0", STR_PAD_LEFT) . ';';
!         
!         $encodedString .= $encodedLetter;
!     }
!     return $encodedString;
! }
! 
! ############## HTML OUTPUT ##############
! function begin_html($nolayout=false)
! {
!   global $WikiLayout, $WikiParser;
!   
    $out = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
    $out .= "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"DTD/xhtml1-strict.dtd\">\n";
!   $out .= "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
!   $out .= "<head>\n";
!   $out .= "<meta http-equiv=\"content-type\" content=\"text/html;". _CHARSET ."\" />\n";
!   $out .= "<title>"._PAGENAME." - ". _SITENAME."</title>\n";
!   if(!$nolayout)
!   	$out .= "<link rel=\"stylesheet\" type=\"text/css\" href=\"layout/".$WikiParser->work_html($WikiLayout->get_layout())."/".$WikiParser->work_html($WikiLayout->get_style()).".css\" />\n";
!   $out .= "</head>\n";
!   $out .= "<body>\n";
!   
!   echo utf8_encode($out);
! }
! 
! function end_html()
! {
!   $out = "\n</body>";
!   $out .= "\n</html>";
!   
!   echo utf8_encode($out);
! }
! 
! ?>

Index: io.mysql.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/io.mysql.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** io.mysql.inc	15 Oct 2004 11:49:04 -0000	1.2
--- io.mysql.inc	7 Nov 2004 12:00:33 -0000	1.3
***************
*** 58,64 ****
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".addslashes(rawurldecode(utf8_decode($pagename)))."' AND revision=". $v ." LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision, text FROM "._CACHE_TBL." WHERE name ='".addslashes(rawurldecode(utf8_decode($pagename)))."' ORDER BY revision DESC LIMIT 1;";
      
      $res = mysql_query($query, $this->link);
--- 58,64 ----
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision, text FROM "._CACHE_TBL." WHERE name ='".$pagename."' ORDER BY revision DESC LIMIT 1;";
      
      $res = mysql_query($query, $this->link);
***************
*** 77,83 ****
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".addslashes(rawurldecode(utf8_decode($pagename)))."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision, text FROM "._CACHE_TBL." WHERE name ='".addslashes(rawurldecode(utf8_decode($pagename)))."' ORDER BY revision DESC LIMIT 1;";
      
      $res = mysql_query($query, $this->link);
--- 77,83 ----
      
      if($v != 0)
!         $query = "SELECT name, date, creator_id, revision, text FROM wikis WHERE name ='".$pagename."' AND revision=". $v ." ORDER BY revision DESC LIMIT 1;";
      else
!         $query = "SELECT name, date, creator_id, revision, text FROM "._CACHE_TBL." WHERE name ='".$pagename."' ORDER BY revision DESC LIMIT 1;";
      
      $res = mysql_query($query, $this->link);
***************
*** 103,114 ****
              $rev = $old->revision;
              $insert_tbl_old = "INSERT INTO wikis (date, creator_id, revision, name, text) VALUES (". $old->timestamp.", ";
!             $insert_tbl_old .= $old->user.", ".$rev.", '".addslashes(rawurldecode(utf8_decode($pagename)))."', '".addslashes($old->text)."');";
              $insert_tbl = "UPDATE wikis_cache SET date=". get_timestamp() .", creator_id=".$uid.", revision=". ($rev+1) .", ";
!             $insert_tbl .= "text='". addslashes(rawurldecode(utf8_decode($text))) ."' WHERE name='".addslashes(utf8_decode(rawurldecode($pagename)))."' LIMIT 1;";
              mysql_query($insert_tbl_old, $this->link) or $this->error(_MYSQL_INSERT_ERROR);
          } else {
              $rev = 0;
!             $insert_tbl = "INSERT INTO "._CACHE_TBL." (name, date, creator_id, revision, text) VALUES('".addslashes(rawurldecode(utf8_decode($pagename)))."', ". get_timestamp() .", ". $uid .", 1, ";
!             $insert_tbl .= "'".addslashes(rawurldecode(utf8_decode($text)))."');";
          }
      } else {
--- 103,114 ----
              $rev = $old->revision;
              $insert_tbl_old = "INSERT INTO wikis (date, creator_id, revision, name, text) VALUES (". $old->timestamp.", ";
!             $insert_tbl_old .= $old->user.", ".$rev.", '".$pagename."', '".addslashes($old->text)."');";
              $insert_tbl = "UPDATE wikis_cache SET date=". get_timestamp() .", creator_id=".$uid.", revision=". ($rev+1) .", ";
!             $insert_tbl .= "text='". addslashes(encode_utf8($text)) ."' WHERE name='".$pagename."' LIMIT 1;";
              mysql_query($insert_tbl_old, $this->link) or $this->error(_MYSQL_INSERT_ERROR);
          } else {
              $rev = 0;
!             $insert_tbl = "INSERT INTO "._CACHE_TBL." (name, date, creator_id, revision, text) VALUES('".encode_utf8($pagename)."', ". get_timestamp() .", ". $uid .", 1, ";
!             $insert_tbl .= "'".addslashes(encode_utf8($text))."');";
          }
      } else {
***************
*** 118,122 ****
              $rev = 0;
          $insert_tbl = "INSERT INTO wikis(date, creator_id, revision, text, name) VALUES (".get_timestamp().", ".$uid.", ".($rev+1).", ";
!         $insert_tbl .= "'".addslashes(rawurldecode(utf8_decode($text)))."', '".addslashes(rawurldecode(utf8_decode($pagename)))."');";
      }
      mysql_query($insert_tbl, $this->link) or $this->error(_MYSQL_INSERT_ERROR);
--- 118,122 ----
              $rev = 0;
          $insert_tbl = "INSERT INTO wikis(date, creator_id, revision, text, name) VALUES (".get_timestamp().", ".$uid.", ".($rev+1).", ";
!         $insert_tbl .= "'".addslashes(encode_utf8($text))."', '".encode_utf8($pagename)."');";
      }
      mysql_query($insert_tbl, $this->link) or $this->error(_MYSQL_INSERT_ERROR);

[fuwiki-cvs] fuwiki_1_0/elements comment_box.inc,1.3,1.4 revision_warning.inc,1.1.1.1,1.2 search_box.inc,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/elements
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690/elements

Modified Files:
	comment_box.inc revision_warning.inc search_box.inc 
Log Message:
nearing rc2

Index: comment_box.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/comment_box.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** comment_box.inc	16 Oct 2004 15:55:32 -0000	1.3
--- comment_box.inc	7 Nov 2004 12:00:34 -0000	1.4
***************
*** 31,35 ****
    $out  = "<br />\n";
    $out .= "\n<div><form action=\"index.php?".rawurldecode(utf8_decode(_PAGENAME))."\" method=\"post\" enctype=\"multipart/form-data\">\n";
!   $out .= "<p><h2>". _COMBOXCOMMENT ."</h2>"."<br />\n";
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";
--- 31,35 ----
    $out  = "<br />\n";
    $out .= "\n<div><form action=\"index.php?".rawurldecode(utf8_decode(_PAGENAME))."\" method=\"post\" enctype=\"multipart/form-data\">\n";
!   $out .= "<h2>". _COMBOXCOMMENT ."</h2>"."<p><br />\n";
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";

Index: search_box.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/search_box.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** search_box.inc	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- search_box.inc	7 Nov 2004 12:00:34 -0000	1.2
***************
*** 26,31 ****
  if(!$WikiUser->get_setting("show_searchbox"))
  	return "";
- 
-   global $WikiIO, $_GET;
    
    $str = "\n<div><form action=\"index.php?FWikiSearch\" method=\"post\">\n";
--- 26,29 ----

Index: revision_warning.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/revision_warning.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** revision_warning.inc	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- revision_warning.inc	7 Nov 2004 12:00:34 -0000	1.2
***************
*** 31,35 ****
    	$out = "\nERROR: Someone has already changed this Revision!<br />\nPlease insert your changes in the upper Textarea.\n";
    	$out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), 0, false);
!     $out .= "<hr width=\"100%\"><br />\n";
      $out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), $myV, true, stripslashes(rawurldecode(utf8_decode(($_POST["WikiCode"])))));
      
--- 31,35 ----
    	$out = "\nERROR: Someone has already changed this Revision!<br />\nPlease insert your changes in the upper Textarea.\n";
    	$out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), 0, false);
!     $out .= "<hr width=\"100%\" /><br />\n";
      $out .= show_edit(rawurldecode(utf8_decode(_PAGENAME)), $myV, true, stripslashes(rawurldecode(utf8_decode(($_POST["WikiCode"])))));
      

[fuwiki-cvs] fuwiki_1_0/install tables.sql,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690/install

Modified Files:
	tables.sql 
Log Message:
nearing rc2

Index: tables.sql
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/install/tables.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tables.sql	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- tables.sql	7 Nov 2004 12:00:35 -0000	1.2
***************
*** 90,91 ****
--- 90,92 ----
    PRIMARY KEY  (`id`)
  );
+ 

[fuwiki-cvs] fuwiki_1_0/layout/FUCKUP default.css,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690/layout/FUCKUP

Modified Files:
	default.css 
Log Message:
nearing rc2

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css	13 Oct 2004 20:28:29 -0000	1.1.1.1
--- default.css	7 Nov 2004 12:00:36 -0000	1.2
***************
*** 326,330 ****
  .WikiQuoteHeader{
   color: #000000;
-  /*background-color: #6480AF;*/  
   background-image: url('pics/default/inv_bevel.gif');
   background-repeat: repeat-x;
--- 326,329 ----
***************
*** 332,336 ****
   font-family: tahoma,helvetica,sans-serif;
   font-size: 11px;
!  font-weight: bold;
   border-bottom: 1px solid #000000;
  }
--- 331,350 ----
   font-family: tahoma,helvetica,sans-serif;
   font-size: 11px;
!  font-weight: bold;
!  border: 0px none;
!  border-bottom: 1px solid #000000;
!  border-right: 1px solid #000000;
! }
! 
! .WikiQuoteHeader_r{
!  color: #000000;
!  background-image: url('pics/default/inv_bevel.gif');
!  background-repeat: repeat-x;
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  text-align: right;
!  font-weight: bold;
!  border: 0px none;
   border-bottom: 1px solid #000000;
  }

[fuwiki-cvs] fuwiki_1_0/lang de.inc,1.4,1.5 en.inc,1.3,1.4

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30690/lang

Modified Files:
	de.inc en.inc 
Log Message:
nearing rc2

Index: en.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/lang/en.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** en.inc	13 Oct 2004 22:55:30 -0000	1.3
--- en.inc	7 Nov 2004 12:00:35 -0000	1.4
***************
*** 99,103 ****
  define("_FWC_DATE", "Date Changed");
  define("_FWC_USER", "User");
! define("_FWC_TIMEFORMAT", "%m/%d %y - %h:%s");
  
  // FWikiLayout - Interface
--- 99,104 ----
  define("_FWC_DATE", "Date Changed");
  define("_FWC_USER", "User");
! define("_FWC_TIMEFORMAT", "%m/%d %y - %h:%s:%i");
! define("_FWC_MORE_CHANGES", "Show more changes");
  
  // FWikiLayout - Interface
***************
*** 143,146 ****
--- 144,148 ----
  define("_FWMSG_ERROR", "Invalid Message.");
  define("_FWMSG_MSGS", "Inbox");
+ define("_FWMSG_MSGS_NEW", "Inbox - New Messages");
  define("_FWMSG_FROM", "From");
  define("_FWMSG_DATE", "Date");
***************
*** 157,160 ****
--- 159,163 ----
  define("_FWMSG_NO", "No");
  define("_FWMSG_YES", "Yes");
+ define("_FWMSG_TO", "To");
  
  // FWikiVote - Interface
***************
*** 180,183 ****
--- 183,198 ----
  define("_FWVOTE_HEADLINE", "Description");
  define("_FWVOTE_VIEW", "View Poll");
+ define("_FWVOTE_SHOW_RESULTS", "Show Results");
+ 
+ // FWikiImages - Interface
+ define("_FWI_TITLE", "Images in "._SITENAME);
+ define("_FWI_SEARCH_PAGENAME", "Search in Pagename");
+ define("_FWI_SEARCH_NAME", "Search in Filename");
+ define("_FWI_FILENAME", "Filename");
+ define("_FWI_PAGENAME", "Pagename");
+ define("_FWI_UPLOADER", "Uploader");
+ define("_FWI_UPLOADTIME", "Uploaddate");
+ define("_FWI_VIEW", "View Image");
+ define("_FWI_NUMSHOWN", "Number of Images:");
  
  // Categorize_Box - Interface

Index: de.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/lang/de.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** de.inc	16 Oct 2004 15:55:32 -0000	1.4
--- de.inc	7 Nov 2004 12:00:35 -0000	1.5
***************
*** 51,55 ****
  define("_NO_USERNAME", "Bitte Benutzername eingeben.");
  define("_NO_PASSWORD", "Bitte ein Passwort eingeben.");
! define("_WRONG_USERNAME", "Benutzernamen kšnnen nur aus Buchstaben, Zahlen, [Leertaste], \"-\" und \"_\" bestehen.");
  define("_USER_EXISTS", "Es ist bereits ein Benutzer mit diesen Namen registriert.");
  define("_PW_RPT_INCORRECT", _FWU_ERR_PASSNOMATCH);
--- 51,55 ----
  define("_NO_USERNAME", "Bitte Benutzername eingeben.");
  define("_NO_PASSWORD", "Bitte ein Passwort eingeben.");
! define("_WRONG_USERNAME", "Benutzernamen können nur aus Buchstaben, Zahlen, [Leertaste], \"-\" und \"_\" bestehen.");
  define("_USER_EXISTS", "Es ist bereits ein Benutzer mit diesen Namen registriert.");
  define("_PW_RPT_INCORRECT", _FWU_ERR_PASSNOMATCH);
***************
*** 99,103 ****
  define("_FWC_DATE", "Änderungsdatum");
  define("_FWC_USER", "Benutzer");
! define("_FWC_TIMEFORMAT", "%d.%m.%y - %h:%s Uhr");
  
  // FWikiLayout - Interface
--- 99,104 ----
  define("_FWC_DATE", "Änderungsdatum");
  define("_FWC_USER", "Benutzer");
! define("_FWC_TIMEFORMAT", "%d.%m.%y - %h:%s:%i Uhr");
! define("_FWC_MORE_CHANGES", "Mehr änderungen anzeigen");
  
  // FWikiLayout - Interface
***************
*** 138,141 ****
--- 139,143 ----
  define("_FWST_CHANGES", "Seitenänderungen");
  define("_FWST_DOTW", "Wochentag");
+ define("_FWMSG_TO", "An");
  
  // FWikiMessages - Interface
***************
*** 143,146 ****
--- 145,149 ----
  define("_FWMSG_ERROR", "Ungültige Nachricht.");
  define("_FWMSG_MSGS", "Inbox");
+ define("_FWMSG_MSGS_NEW", "Inbox - Neue Nachrichten");
  define("_FWMSG_FROM", "Von");
  define("_FWMSG_DATE", "Datum");
***************
*** 180,183 ****
--- 183,198 ----
  define("_FWVOTE_HEADLINE", "Beschreibung");
  define("_FWVOTE_VIEW", "Wahl ansehen");
+ define("_FWVOTE_SHOW_RESULTS", "Ergebnis ansehen");
+ 
+ // FWikiImages - Interface
+ define("_FWI_TITLE", "Bilder in "._SITENAME);
+ define("_FWI_SEARCH_PAGENAME", "Suchen im Seitename");
+ define("_FWI_SEARCH_NAME", "Search im Dateiname");
+ define("_FWI_FILENAME", "Dateiname");
+ define("_FWI_PAGENAME", "Seitenname");
+ define("_FWI_UPLOADER", "Uploader");
+ define("_FWI_UPLOADTIME", "Upload Datum");
+ define("_FWI_VIEW", "Anschauen");
+ define("_FWI_NUMSHOWN", "Anzahl Bilder:");
  
  // Categorize_Box - Interface

[fuwiki-cvs] fuwiki_1_0/layout/bw default.css,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/bw
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/layout/bw

Modified Files:
	default.css 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/bw/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css	13 Oct 2004 20:28:30 -0000	1.1.1.1
--- default.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 3,12 ****
  	padding: 10px;
  	width: 95%;
! 	font-size: 11px;
  	font-family: Verdana,sans-serif;
  }
  
! a:link {color: #1A1A1A; text-decoration: none;}
! a:visited {color: #555555; text-decoration: none;}
  
  #header{
--- 3,15 ----
  	padding: 10px;
  	width: 95%;
! 	font-size: 11px;
! 	background-color: #DDDDDD;
  	font-family: Verdana,sans-serif;
  }
  
! a:link {color: #404040; text-decoration: underline;}
! a:visited {color: #505050; text-decoration: underline;}
! 
! textarea {background-color:#CCCCCC;}
  
  #header{
***************
*** 63,67 ****
  #content .content_hack {
      height:600px;
!     background-color: green;
      width: 1px;
      float: right;
--- 66,70 ----
  #content .content_hack {
      height:600px;
!     background-color: none;
      width: 1px;
      float: right;
***************
*** 87,92 ****
  
  .WikiQuote{
!   background-color: #BBBBBB;
!   border: 1px solid #CECECE;
    border-collapse:collapse;
    width: 95%;
--- 90,95 ----
  
  .WikiQuote{
!   background-color: #CFCFCF;
!   border: 2px solid #222222;
    border-collapse:collapse;
    width: 95%;
***************
*** 102,106 ****
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECECE;
  }
  
--- 105,110 ----
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECECE;
!  border-right: 0px none #000000;
  }
  
***************
*** 113,117 ****
   border: 1px solid #CECECE;
   text-align:right;
!  width: 100px;
  }
      
--- 117,121 ----
   border: 1px solid #CECECE;
   text-align:right;
!  border-left: 0px none #000000;
  }
      

[fuwiki-cvs] fuwiki_1_0/layout/simple RAW.css,1.1.1.1,1.2 default.css,1.1.1.1,1.2 silver.css,1.1.1.1,1.2 style.css,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/layout/simple

Modified Files:
	RAW.css default.css silver.css style.css 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: silver.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/simple/silver.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** silver.css	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- silver.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 95,98 ****
--- 95,100 ----
  a.WikiLinkExternal:active{color: #000000; text-decoration: none; background: transparent;}
  
+ .new_change{ background-color: #DDDDDD; }
+ 
  .WikiH1 {
  }
***************
*** 121,127 ****
  .WikiCode{}
  
! .WikiQuote{}
! .WikiQuote .header {}
! .WikiQuote .body {}
  
  .WikiTable {}
--- 123,155 ----
  .WikiCode{}
  
! .WikiQuote{
!   background-color: #BBBBBB;
!   border: 1px solid #CECECE;
!   border-collapse:collapse;
!   width: 95%;
!   margin-left: 20px;
!   margin-right: 40px;
!   text-align:justify;
! }
! 
! .WikiQuoteHeader{
!  background-color: #F1F1F1;  
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  font-weight: bold;
!  border: 1px solid #CECECE;
!  border-right: 0px none #000000;
! }
! 
! .WikiQuoteHeader_r{
!  background-color: #F1F1F1;  
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  border: 1px solid #CECECE;
!  text-align:right;
!  border-left: 0px none #000000;
! }
  
  .WikiTable {}

Index: style.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/simple/style.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** style.css	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- style.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 87,90 ****
--- 87,92 ----
  a.WikiLinkExternal:active{color: #000000; text-decoration: none; background: #556890;}
  
+ .new_change{ background-color: #DDDDDD; }
+ 
  .WikiH1 {
  	color: #212947;/*#324058;*/
***************
*** 154,160 ****
  .WikiCode{}
  
! .WikiQuote{}
! .WikiQuote .header {}
! .WikiQuote .body {}
  
  .WikiTable
--- 156,188 ----
  .WikiCode{}
  
! .WikiQuote{
!   background-color: #BBBBBB;
!   border: 1px solid #CECECE;
!   border-collapse:collapse;
!   width: 95%;
!   margin-left: 20px;
!   margin-right: 40px;
!   text-align:justify;
! }
! 
! .WikiQuoteHeader{
!  background-color: #F1F1F1;  
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  font-weight: bold;
!  border: 1px solid #CECECE;
!  border-right: 0px none #000000;
! }
! 
! .WikiQuoteHeader_r{
!  background-color: #F1F1F1;  
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  border: 1px solid #CECECE;
!  text-align:right;
!  border-left: 0px none #000000;
! }
  
  .WikiTable

Index: RAW.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/simple/RAW.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RAW.css	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- RAW.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 40,45 ****
  .window .footer {}
  
- 
- 
  #content {
  	position: absolute;
--- 40,43 ----
***************
*** 47,48 ****
--- 45,47 ----
  /*	height: 100%; /* To please IE6 */
  }
+ 

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/simple/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- default.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 84,87 ****
--- 84,89 ----
  a.WikiLinkExternal:active{color: #000000; text-decoration: none; background: #556890;}
  
+ .new_change{ background-color: #DDDDDD; }
+ 
  .WikiH1 {
  	color: #212947;/*#324058;*/

[fuwiki-cvs] fuwiki_1_0/FWiki Admin.php,1.1.1.1,1.2 Layout.php,1.4,1.5 Messages.php,1.1.1.1,1.2 User.php,1.1.1.1,1.2 Vote.php,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/FWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/FWiki

Modified Files:
	Admin.php Layout.php Messages.php User.php Vote.php 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: Messages.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Messages.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Messages.php	13 Oct 2004 20:28:27 -0000	1.1.1.1
--- Messages.php	16 Oct 2004 15:55:32 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
  	}
  	
+ 	
  	if(!$WikiUser->is_authorized())
  	   return _FWMSG_NOT_LOGGEDIN;
***************
*** 65,68 ****
--- 66,75 ----
  	       $receiver = $a["receiverid"];
  	   $quotemsg = $a["message"];
+ 	   
+ 	   $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
+     $out .= "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
+     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
+     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
+     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";
  	}
      else
***************
*** 70,76 ****
  	   $query = "SELECT * FROM messages WHERE receiverid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
! 	   if(!$res || mysql_num_rows($res) == 0)
!             $out .= _FWMSG_NO_MSGS;
!         else {
              $out .= "<h2>"._FWMSG_MSGS."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_FROM."</td><td colspan=\"2\">"._FWMSG_DATE."</td></tr>";
--- 77,86 ----
  	   $query = "SELECT * FROM messages WHERE receiverid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
! 	   if(!$res || mysql_num_rows($res) == 0) {
!             $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";   
!         } else {
              $out .= "<h2>"._FWMSG_MSGS."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_FROM."</td><td colspan=\"2\">"._FWMSG_DATE."</td></tr>";
***************
*** 82,91 ****
                      $out .= "\n<tr><td>".$name."</td><td>".timestamp_pattern($a["date"])."</td><td><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></td></tr>";
              }
!             $out .= "\n</table>\n";
         $query = "SELECT * FROM messages WHERE senderid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
! 	   if(!$res || mysql_num_rows($res) == 0)
!             $out .= _FWMSG_NO_MSGS;
!         else {
              $out .= "<h2>"._FWMSG_SENT_MSGS."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_RECEIVER."</td><td colspan=\"2\">"._FWMSG_DATE."</td><td>"._FWMSG_RECEIVER_READ."</td></tr>";
--- 92,109 ----
                      $out .= "\n<tr><td>".$name."</td><td>".timestamp_pattern($a["date"])."</td><td><a href=\"index.php?FWikiMessages&mid=".$a["id"]."\">"._FWMSG_READ."</a></td></tr>";
              }
!         $out .= "\n</table>\n";
!         $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
!     $out .= "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
!     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";    
         $query = "SELECT * FROM messages WHERE senderid=".$WikiUser->get_id()." ORDER BY date DESC;";
  	   $res = $WikiIO->query($query);
! 	   if(!$res || mysql_num_rows($res) == 0) {
!             $out .= _FWMSG_NO_MSGS."<br /><br />\n";
!             $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\" accesskey=\"s\">\n</form>\n\n";   
!         } else {
              $out .= "<h2>"._FWMSG_SENT_MSGS."</h2><br />\n";
              $out.= "<table>\n<tr><td>"._FWMSG_RECEIVER."</td><td colspan=\"2\">"._FWMSG_DATE."</td><td>"._FWMSG_RECEIVER_READ."</td></tr>";
***************
*** 98,106 ****
          }
      }
!     $out .= "<br /><br />\n<h2>"._FWMSG_WRITE."</h2><br />\n";
!     $out .= "<form action=\"index.php?FWikiMessages\" method=\"post\" encoding=\"multipart/form-data\">\n";
!     $out .= _FWMSG_RECEIVER." ".show_user_popup($receiver)."<br />\n";
!     $out .= _FWMSG_TEXT. "<br />\n<textarea name=\"message\" rows=\"10\" style=\"width: 80%\">".($quotemsg != "" ? preg_replace("/(^|\n)/", "\\1> ", $quotemsg, -1) : "")."</textarea><br />\n";
!     $out .= "<input type=\"hidden\" name=\"WritingMessage\" value=\"1\">\n<input type=\"submit\" value=\""._FWMSG_SUBMIT."\">\n</form>\n\n";
  	return $out;
  }
--- 116,120 ----
          }
      }
!     
  	return $out;
  }

Index: Admin.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Admin.php	13 Oct 2004 20:28:27 -0000	1.1.1.1
--- Admin.php	16 Oct 2004 15:55:32 -0000	1.2
***************
*** 45,48 ****
--- 45,52 ----
  			$query = "UPDATE wikis SET name='". rawurldecode(utf8_decode($_POST["dest"])) ."' WHERE name='". rawurldecode(utf8_decode($_POST["source"])) ."';";
  			$WikiIO->query($query);
+ 			if(_CACHE_TBL == "wikis_cache") {
+ 			     $query = "UPDATE wikis_cache SET name='". rawurldecode(utf8_decode($_POST["dest"])) ."' WHERE name='". rawurldecode(utf8_decode($_POST["source"])) ."' LIMIT 1;";
+                 $WikiIO->query($query);
+             }
  			$moved = true;
  		}
***************
*** 50,53 ****
--- 54,61 ----
  		$query = "UPDATE wikis SET name='Trash:". rawurldecode(utf8_decode($_POST["delete"])) ."' WHERE name='". rawurldecode(utf8_decode($_POST["delete"])) ."';";
  		$WikiIO->query($query);
+ 		if(_CACHE_TBL == "wikis_cache") {
+ 			 $query = "UPDATE wikis_cache SET name='Trash:". rawurldecode(utf8_decode($_POST["delete"])) ."' WHERE name='". rawurldecode(utf8_decode($_POST["delete"])) ."' LIMIT 1;";
+             $WikiIO->query($query);
+         }
  		$deleted = true;
  	} else if($_POST["MakingAdmin"] && $priv->get("can_makeadmin")) {
***************
*** 55,58 ****
--- 63,73 ----
  		$WikiIO->query($query);
  		$made_admin = true;
+     } else if($_POST["EmptyingTrash"] && $priv->get("can_delete")) {
+         $query = "DELETE FROM wikis WHERE name LIKE 'Trash:%';";
+         $WikiIO->query($query);
+         if(_CACHE_TBL == "wikis_cache") {
+             $query = "DELETE FROM wikis_cache WHERE name LIKE 'Trash:%';";
+             $WikiIO->query($query);
+         }
  	} else if($_POST["ChangingPrivs"] && $priv->get("can_changeprivs") && !empty($_POST["change_uid"])) {
  		$query = "UPDATE user_priv SET ";
***************
*** 174,177 ****
--- 189,200 ----
  		$out .= "</form>\n";
      }
+ 	if($priv->get("can_delete"))
+ 	{
+ 	   $out .= "<br /><br />\n". _FWA_EMPTY_TRASH_TITLE ." \n";
+ 		$out .= "<form action=\"index.php?FWikiAdmin\" method=\"POST\">\n";
+ 		$out .= "<input type=\"hidden\" name=\"EmptyingTrash\" value=\"true\">\n";
+ 		$out .= "<input type=\"submit\" value=\"". _FWA_EMPTY_TRASH_SUBMIT ."\">\n";
+ 		$out .= "</form>\n";
+ 	}
  	
  	return $out;

Index: Layout.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Layout.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Layout.php	15 Oct 2004 11:49:04 -0000	1.4
--- Layout.php	16 Oct 2004 15:55:32 -0000	1.5
***************
*** 83,87 ****
                  while(get_optional_xml_tag("style", $style_args, $style, $buf)){
                      $out .= "<tr><td><b>".get_xml_argument("name", $style_args)."</b>";
!                     $out .= "</td>\n<td>(<a href=\"index.php?Home&amp;layout=".$file."&amp;style=".get_xml_argument("css", $style_args)."\">"._FWL_PREVIEW."</a> <a href=\"index.php?FWikiLayout&amp;set_layout=".$file."&amp;style=".get_xml_argument("css", $style_args)."\">"._FWL_SETLAYOUT."</a>)</td></tr><tr><td colspan=\"2\">".$WikiParser->parse_in_fwiki_layout(trim($style))."</td></tr>";
                  }
                  $out .= "\n</table>\n</td></tr>\n";
--- 83,87 ----
                  while(get_optional_xml_tag("style", $style_args, $style, $buf)){
                      $out .= "<tr><td><b>".get_xml_argument("name", $style_args)."</b>";
!                     $out .= "</td>\n<td>( <a href=\"index.php?Home&amp;layout=".$file."&amp;style=".get_xml_argument("css", $style_args)."\">"._FWL_PREVIEW."</a> | <a href=\"index.php?FWikiLayout&amp;set_layout=".$file."&amp;style=".get_xml_argument("css", $style_args)."\">"._FWL_SETLAYOUT."</a> )</td></tr><tr><td colspan=\"2\">".$WikiParser->parse_in_fwiki_layout(trim($style))."</td></tr>";
                  }
                  $out .= "\n</table>\n</td></tr>\n";
***************
*** 93,97 ****
                      }
                  }
!                 $out .= "<tr><td colspan=\"2\"><b><a href=\"index.php?Home&amp;layout=".$file."\">"._FWL_PREVIEW."</a> <a href=\"index.php?FWikiLayout&amp;set_layout=".$file."\">"._FWL_SETLAYOUT."</a></b></td></tr>\n";
              }
          }
--- 93,97 ----
                      }
                  }
!                 $out .= "<tr><td colspan=\"2\"><b><a href=\"index.php?Home&amp;layout=".$file."\">"._FWL_PREVIEW."</a> | <a href=\"index.php?FWikiLayout&amp;set_layout=".$file."\">"._FWL_SETLAYOUT."</a></b></td></tr>\n";
              }
          }

Index: Vote.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/Vote.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Vote.php	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- Vote.php	16 Oct 2004 15:55:32 -0000	1.2
***************
*** 130,136 ****
      else {
          $out = "<h2>"._FWVOTE_VOTES."</h2><br />\n";
!         $out.= "<table>\n<tr><td><b>"._FWVOTE_CREATOR."</b></td><td><b>"._FWVOTE_DATE."</b></td><td colspan=\"2\"><b>"._FWVOTE_HEADLINE."</b></td></tr>";
          while($a = mysql_fetch_array($res)) {
!             $out .= "\n<tr><td>".$WikiUser->get_user_name($a["creatorid"])."</td><td>".timestamp_pattern($a["date"])."</td><td>".substr($a["headline"], 0, 100).(strlen($a["headline"]) > 100 ? "[...]" : "" )."</td><td><a href=\"index.php?FWikiVote&pid=".$a["id"]."\">"._FWVOTE_VIEW."</a></td></tr>";
          }
          $out .= "\n</table><br /><br />\n";
--- 130,136 ----
      else {
          $out = "<h2>"._FWVOTE_VOTES."</h2><br />\n";
!         $out.= "<table>\n<tr><td><b>"._FWVOTE_CREATOR."</b></td><td><b>"._FWVOTE_DATE."</b></td><td colspan=\"2\"><b>"._FWVOTE_HEADLINE."</b></td><td>ID</td></tr>";
          while($a = mysql_fetch_array($res)) {
!             $out .= "\n<tr><td>".$WikiUser->get_user_name($a["creatorid"])."</td><td>".timestamp_pattern($a["date"])."</td><td>".substr($a["headline"], 0, 100).(strlen($a["headline"]) > 100 ? "[...]" : "" )."</td><td><a href=\"index.php?FWikiVote&pid=".$a["id"]."\">"._FWVOTE_VIEW."</a></td><td>".$a["id"]."</td></tr>";
          }
          $out .= "\n</table><br /><br />\n";

Index: User.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/FWiki/User.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** User.php	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- User.php	16 Oct 2004 15:55:32 -0000	1.2
***************
*** 24,27 ****
--- 24,31 ----
  $settings = Array("show_footer", "show_commentbox", "show_commentbox_signature",  "show_loginbox", "show_userpages", "show_searchbox", "show_comments", "show_commentbox_upload");
  
+ $settings_en = Array("Show Wiki-Footer", "Show the Commentbox", "Show the signature with the Commentbox", "Show the Login-Box", "Show Userpages (i.e. [username]:menu instead of the normal menu)", "Show the Wiki-Search", "Enable Comment-View", "Enable uploading for the Commentbox");
+ 
+ $settings_de = Array("Wiki-Fusszeile anzeigen", "Kommentarbox anzeigen", "Signatur bei der Kommentarbox anzeigen", "Loginbox anzeigen", "Benutzer-Seiten anzeigen (z.b. [benutzername]:menu anstatt den normalen Menu)", "Suchbox anzeigen", "Kommentar-Ansicht einschalten", "Uploadfunktion f&uuml;r die Kommentarbox einschalten");
+ 
  function FWikiMain()
  {
***************
*** 218,225 ****
  	$out .= "  <tr>\n<td colspan=\"2\">". _FWU_SETTINGS ."</td>\n</tr>\n";
  	
! 	global $settings;
  	
! 	foreach($settings as $entry)
! 		$out .= "  <tr>\n<td align=\"right\">". $entry ."</td>\n<td><input type=\"checkbox\" name=\"set_". $entry ."\"". ($WikiUser->get_setting($entry) == true ? " checked" : "") ." value=\"active\"></td>\n</tr>\n";
  	
  	if(!empty($err))
--- 222,229 ----
  	$out .= "  <tr>\n<td colspan=\"2\">". _FWU_SETTINGS ."</td>\n</tr>\n";
  	
! 	global $settings, $settings_de, $settings_en;
  	
! 	foreach($settings as $key => $entry)
! 		$out .= "  <tr>\n<td align=\"right\">". ($WikiUser->get_language() == "de" ? $settings_de[$key] : $settings_en[$key]) ."</td>\n<td><input type=\"checkbox\" name=\"set_". $entry ."\"". ($WikiUser->get_setting($entry) == true ? " checked" : "") ." value=\"active\"></td>\n</tr>\n";
  	
  	if(!empty($err))

[fuwiki-cvs] fuwiki_1_0/lang de.inc,1.3,1.4

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/lang

Modified Files:
	de.inc 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: de.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/lang/de.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** de.inc	13 Oct 2004 22:55:30 -0000	1.3
--- de.inc	16 Oct 2004 15:55:32 -0000	1.4
***************
*** 57,61 ****
  
  // FWikiSearch - Interface
! define("_FWS_TITLE", "<b>Im Wiki Suchen</b>");
  define("_FWS_SUBMIT", "Suchen");
  define("_FWS_RESULTS", "<b>Suchergebnisse</b>");
--- 57,61 ----
  
  // FWikiSearch - Interface
! define("_FWS_TITLE", "<b>Im Wiki suchen</b>");
  define("_FWS_SUBMIT", "Suchen");
  define("_FWS_RESULTS", "<b>Suchergebnisse</b>");
***************
*** 106,110 ****
  define("_FWL_NOTAUTHORIZED", "Du musst eingeloggt sein");
  define("_FWL_STYLES", "Styles");
! define("_FWL_INCOMP", "InkompatibilitŠten");
  define("_FWL_PREVIEW", "Vorschau");
  define("_FWL_SETLAYOUT", "Layout Aktivieren");
--- 106,110 ----
  define("_FWL_NOTAUTHORIZED", "Du musst eingeloggt sein");
  define("_FWL_STYLES", "Styles");
! define("_FWL_INCOMP", "Inkompatibilit&auml;ten");
  define("_FWL_PREVIEW", "Vorschau");
  define("_FWL_SETLAYOUT", "Layout Aktivieren");
***************
*** 195,199 ****
  
  // Priv_Msg - Interface
! define("_PRIVMSGCAPTION", "Neue Private Nachrichten: %n");
  
  // Subsites - Interface
--- 195,199 ----
  
  // Priv_Msg - Interface
! define("_PRIVMSGCAPTION", "Neue private Nachrichten: %n");
  
  // Subsites - Interface

[fuwiki-cvs] fuwiki_1_0/layout/FUCKUP lite default.css,1.2,1.3

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP lite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/layout/FUCKUP lite

Modified Files:
	default.css 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP lite/default.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** default.css	15 Oct 2004 11:49:05 -0000	1.2
--- default.css	16 Oct 2004 15:55:33 -0000	1.3
***************
*** 7,11 ****
  	height: 100%;
  	width: 100%;
! 	font-size: 11px;
  	font-family: Verdana,sans-serif;
  }
--- 7,11 ----
  	height: 100%;
  	width: 100%;
! 	font-size: x-small;
  	font-family: Verdana,sans-serif;
  }
***************
*** 193,197 ****
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECED0;
  }
      
--- 193,208 ----
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECED0;
!  border-right: 0px none #000000;
! }
! 
! .WikiQuoteHeader_r{
!  background-color: #F1F1EF;  
!  padding: 3px;
!  font-family: tahoma,helvetica,sans-serif;
!  font-size: 11px;
!  border: 1px solid #CECED0;
!  border-left: 0px none #000000;
!  text-align:right;
  }
      

[fuwiki-cvs] fuwiki_1_0/layout/wikipedia default.css,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/wikipedia
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/layout/wikipedia

Modified Files:
	default.css 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/wikipedia/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- default.css	16 Oct 2004 15:55:33 -0000	1.2
***************
*** 112,116 ****
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECECE;
  }
  
--- 112,117 ----
   font-size: 11px;
   font-weight: bold;
!  border: 1px solid #CECECE;
!  border-right: 0px none #000000;
  }
  
***************
*** 120,127 ****
   font-family: tahoma,helvetica,sans-serif;
   font-size: 11px;
-  font-weight: bold;
   border: 1px solid #CECECE;
   text-align:right;
!  width: 100px;
  }
      
--- 121,127 ----
   font-family: tahoma,helvetica,sans-serif;
   font-size: 11px;
   border: 1px solid #CECECE;
   text-align:right;
!  border-left: 0px none #000000;
  }
      

[fuwiki-cvs] fuwiki_1_0/elements comment_box.inc,1.2,1.3 discuss_link.inc,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/elements
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020/elements

Modified Files:
	comment_box.inc discuss_link.inc 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: comment_box.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/comment_box.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** comment_box.inc	15 Oct 2004 11:49:05 -0000	1.2
--- comment_box.inc	16 Oct 2004 15:55:32 -0000	1.3
***************
*** 31,35 ****
    $out  = "<br />\n";
    $out .= "\n<div><form action=\"index.php?".rawurldecode(utf8_decode(_PAGENAME))."\" method=\"post\" enctype=\"multipart/form-data\">\n";
!   $out .= "<p><b>". _COMBOXCOMMENT ."</b>"."<br />\n";
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";
--- 31,35 ----
    $out  = "<br />\n";
    $out .= "\n<div><form action=\"index.php?".rawurldecode(utf8_decode(_PAGENAME))."\" method=\"post\" enctype=\"multipart/form-data\">\n";
!   $out .= "<p><h2>". _COMBOXCOMMENT ."</h2>"."<br />\n";
    $out .= "<textarea name=\"comment\" rows=\"10\" cols=\"50\" style=\"width: 100%;\" accesskey=\"c\"></textarea><br />\n";
    $out .= "<input type=\"submit\" name=\"commented\" value=\"". _COMBOXSUBMIT ."\" accesskey=\"s\" />\n";

Index: discuss_link.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/elements/discuss_link.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** discuss_link.inc	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- discuss_link.inc	16 Oct 2004 15:55:32 -0000	1.2
***************
*** 29,33 ****
      return "\n<a href=\"index.php?".utf8_decode(_PAGENAME).":Discuss\">"._DISCUSS."</a>\n";
    else
!     return "\n<a href=\"index.php?".utf8_decode(_PAGENAME).":Discuss&amp;edit=1\">"._START_DISCUSSION."</a>\n";
  }else{
    return "";
--- 29,33 ----
      return "\n<a href=\"index.php?".utf8_decode(_PAGENAME).":Discuss\">"._DISCUSS."</a>\n";
    else
!     return "\n<a href=\"index.php?".utf8_decode(_PAGENAME).":Discuss\">"._START_DISCUSSION."</a>\n";
  }else{
    return "";

[fuwiki-cvs] fuwiki_1_0 functions.inc,1.2,1.3 parser.inc,1.3,1.4

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5020

Modified Files:
	functions.inc parser.inc 
Log Message:
many bugfixes on the long road to fuwiki 1.0

Index: functions.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/functions.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions.inc	15 Oct 2004 11:49:04 -0000	1.2
--- functions.inc	16 Oct 2004 15:55:32 -0000	1.3
***************
*** 48,52 ****
    else if($old_revision != null)
      return $WikiParser->compare($revision->text, $old_revision->text, $isMain);
!     return $WikiParser->parse($revision->text, $isMain);
  }
  
--- 48,52 ----
    else if($old_revision != null)
      return $WikiParser->compare($revision->text, $old_revision->text, $isMain);
!     return $WikiParser->parse($revision->text, $isMain) .($isMain ? "\n<a name=\"wiki_pageend\"></a>\n" : "");
  }
  

Index: parser.inc
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/parser.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** parser.inc	15 Oct 2004 11:49:04 -0000	1.3
--- parser.inc	16 Oct 2004 15:55:32 -0000	1.4
***************
*** 52,55 ****
--- 52,57 ----
  function parse_links_callback($str)
  {
+     if(preg_match("/^#/", $str))
+         $str = utf8_decode(_PAGENAME).$str;
      if(preg_match("/([^\|]*)\|(.*)/", $str, $out)) {
          $url = $out[1];
***************
*** 172,176 ****
  function fix_comments_callback2($str)
  {
!     if(preg_match("/^\n*$/", $str) || preg_match("/\[comment[^\]]*\]/", $str))
          return $str;
      return "[nocomment]".$str."[/nocomment]";
--- 174,178 ----
  function fix_comments_callback2($str)
  {
!     if(preg_match("/^[\n\r]*$/", $str) || preg_match("/\[comment[^\]]*\]/", $str))
          return $str;
      return "[nocomment]".$str."[/nocomment]";
***************
*** 381,385 ****
          $string = stripslashes($string);
          $string = preg_replace("/\[comment[^\]]*\]/U", "", $string, -1);
!         $string = preg_replace("/\[\/comment\]/", "", $string, -1);
          $string = preg_replace("/\[\/nocomment\]/", "", $string, -1);
          $string = preg_replace("/\[nocomment\]/", "", $string, -1);
--- 383,387 ----
          $string = stripslashes($string);
          $string = preg_replace("/\[comment[^\]]*\]/U", "", $string, -1);
!         $string = preg_replace("/\[\/comment\]\n*(?!\n)/", "\n\n", $string, -1);
          $string = preg_replace("/\[\/nocomment\]/", "", $string, -1);
          $string = preg_replace("/\[nocomment\]/", "", $string, -1);
***************
*** 445,449 ****
          
          $a = array(); $a2 = array(); $a3 = array();
!         $string = preg_replace("/\[url ([^\]]*)\](.*)\[\/url\]/e", "extract_callback(\$a, '[url \\1]\\2[/url]', '[url-placeholder]')", $string, -1);
          $string = preg_replace("/\[\[@([^\|]*)\|([^\]]*)\]\]/e", "extract_callback(\$a2, '[url \\2]\\1[/url]', '[url2-placeholder]')", $string, -1);
          $string = preg_replace("/\[img (.*)\]/e", "extract_callback(\$a3, '[img \\1]', '[img-placeholder]')", $string, -1);
--- 447,451 ----
          
          $a = array(); $a2 = array(); $a3 = array();
!         $string = preg_replace("/\[url([^\]]*)\](.*)\[\/url\]/e", "extract_callback(\$a, '[url\\1]\\2[/url]', '[url-placeholder]')", $string, -1);
          $string = preg_replace("/\[\[@([^\|]*)\|([^\]]*)\]\]/e", "extract_callback(\$a2, '[url \\2]\\1[/url]', '[url2-placeholder]')", $string, -1);
          $string = preg_replace("/\[img (.*)\]/e", "extract_callback(\$a3, '[img \\1]', '[img-placeholder]')", $string, -1);
***************
*** 452,455 ****
--- 454,458 ----
          $string = preg_replace("/\[url2-placeholder\]/e", "insert_callback(\$a2)", $string, -1);
          $string = preg_replace("/\[img-placeholder\]/e", "insert_callback(\$a3)", $string, -1);
+         $string = preg_replace("/([^@\n ]+@[^\. @\n]+\.[^ @\n]+)(?= |\n)/", "[url \\1]mailto:\\1[/url]", $string, -1);
          
          //$string = preg_replace("/\[comment([^\]]*)\](.*)\n/", "[comment\\1]\n\\2", $string, -1);
***************
*** 499,502 ****
--- 502,506 ----
          $string = preg_replace("/\[\[FWikiEdit\|([^\]]*)\]\]/", "<a href=\"index.php?".utf8_decode(_PAGENAME)."&amp;edit=1&amp;v=".(_REVNUM != 0 ? _REVNUM : 0)."\">\\1</a>", $string, -1);
          $string = preg_replace("/\[\[([^\]]*)\]\]/e", "parse_links_callback('\\1')", $string, -1);
+         $string = preg_replace("/\[a #([^\]]*)\]/", "<a name=\"\\1\"></a>", $string, -1);
          return $string;
      }
***************
*** 575,582 ****
          $string = preg_replace("/^(.*)(\[comment[^\]]*\])/Use", "fix_comments_callback2('\\1').'\\2'", $string, 1);
          $string = preg_replace("/(\[\/comment\])(.*)(\[comment[^\]]*\])/Use", "'\\1'.fix_comments_callback2('\\2').'\\3'", $string, -1);
!         
!         $string = preg_replace("/(\[\/comment\])(?=\n*)(.*)(\[comment[^\]]*\])/Us", "\\1[nocomment]\\2[/nocomment]\\3", $string, -1);
!         $string = preg_replace("/(\[\/comment\])(?=\n*)(.*)(?!\[comment[^\]]*\])$/Us", "\\1[nocomment]\\2[/nocomment]", $string, 1);
!         $string = preg_replace("/(\[\/comment\])(\n*)(\[comment[^\]]*\])/", "\\1\n\r\\3", $string, -1);
          return $string;
      }
--- 579,584 ----
          $string = preg_replace("/^(.*)(\[comment[^\]]*\])/Use", "fix_comments_callback2('\\1').'\\2'", $string, 1);
          $string = preg_replace("/(\[\/comment\])(.*)(\[comment[^\]]*\])/Use", "'\\1'.fix_comments_callback2('\\2').'\\3'", $string, -1);
!         $string = preg_replace("/(\[\/comment\])(?=\n*)(.*)(?!\[comment[^\]]*\])$/Use", "'\\1'.fix_comments_callback2('\\2')", $string, 1);
!         $string = preg_replace("/(\[\/comment\])([\n\r]*)(\[comment[^\]]*\])/", "\\1\\3", $string, -1);
          return $string;
      }
***************
*** 595,598 ****
--- 597,601 ----
          //$string = preg_replace("/\[url\]\[url\]/", "[url]", $string, -1); $string = preg_replace("/\[\/url\]\[\/url\]/", "[/url]", $string, -1);
          $string = preg_replace("/\[\[url\](.*)\[\/url\] ([^\]]*)\]/Ue", "parse_urls_callback('\\1', '\\2')", $string, -1);
+         $string = preg_replace("/\[\[url\](.*)\[\/url\]\]/Ue", "parse_urls_callback('\\1')", $string, -1);
  	$string = preg_replace("/\[url ([^\]]*)\](.*)\[\/url\]/Ue", "parse_urls_callback('\\2', '\\1')", $string, -1);
          $string = preg_replace("/\[url\](.*)\[\/url\]/Ue", "parse_urls_callback('\\1')", $string, -1);
***************
*** 621,625 ****
      function parse_code($string)
      {
!         $string = preg_replace("/\[code\](.*)\[\/code\]/Us", "<pre class=\"WikiCode\">\\r\1\r</pre>\r", $string, -1);
          return $string;
      }
--- 624,628 ----
      function parse_code($string)
      {
!         $string = preg_replace("/\[code\](.*)\[\/code\]/Us", "<pre class=\"WikiCode\">\r\\1\r</pre>\r", $string, -1);
          return $string;
      }

[fuwiki-cvs] fuwiki_1_0/layout/FUCKUP lite default.css,1.1.1.1,1.2 index.htm,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP lite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29539/layout/FUCKUP lite

Modified Files:
	default.css index.htm 
Log Message:
1.0RC1 fixes

Index: index.htm
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP lite/index.htm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.htm	13 Oct 2004 20:28:30 -0000	1.1.1.1
--- index.htm	15 Oct 2004 11:49:05 -0000	1.2
***************
*** 10,14 ****
      	<div class="caption">[WikiVar: "WIKI_LINKS"]</div>
      	<div class="body">
! 			[Wikiuserpage: "menu"]<hr>
  			[WikiElement: "login_menu"]
  			[WikiElement: "revision_chooser_js"]
--- 10,14 ----
      	<div class="caption">[WikiVar: "WIKI_LINKS"]</div>
      	<div class="body">
! 			[Wikiuserpage: "menu"]<hr />
  			[WikiElement: "login_menu"]
  			[WikiElement: "revision_chooser_js"]

Index: default.css
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/FUCKUP lite/default.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** default.css	13 Oct 2004 20:28:30 -0000	1.1.1.1
--- default.css	15 Oct 2004 11:49:05 -0000	1.2
***************
*** 121,126 ****
  	padding-right: 10px;
  	padding-left: 10px;
  	text-align: right;
- 	vertical-align: center;
  	color: #777777;
  	font: 11px/25px tahoma,arial,helvetica;
--- 121,126 ----
  	padding-right: 10px;
  	padding-left: 10px;
+ 	padding-top: 1px;
  	text-align: right;
  	color: #777777;
  	font: 11px/25px tahoma,arial,helvetica;
***************
*** 140,144 ****
  .Logos {text-align: center;}
  
! .new_change { background-color: #00FF00; }
  
  /*===========================   LAYOUT END   ===================================*/
--- 140,144 ----
  .Logos {text-align: center;}
  
! .new_change { background-color: #00DD00; }
  
  /*===========================   LAYOUT END   ===================================*/

[fuwiki-cvs] fuwiki_1_0/layout/wikipedia index.htm,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/layout/wikipedia
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29539/layout/wikipedia

Modified Files:
	index.htm 
Log Message:
1.0RC1 fixes

Index: index.htm
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/layout/wikipedia/index.htm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.htm	13 Oct 2004 20:28:31 -0000	1.1.1.1
--- index.htm	15 Oct 2004 11:49:05 -0000	1.2
***************
*** 1,4 ****
  <div id ="menu">
!     <div class="menu_logo">FUWIKI<br /><br />LOGO WILL COME</div>
      <div class="menu_header">Navigation</div>
      <div class="menu">[Wikiuserpage: "menu"]<hr />[Wikielement: "revision_chooser_js"]</div>
--- 1,4 ----
  <div id ="menu">
!     <div class="menu_logo">FUCKUP-Wiki<br /><br />LOGO WILL COME</div>
      <div class="menu_header">Navigation</div>
      <div class="menu">[Wikiuserpage: "menu"]<hr />[Wikielement: "revision_chooser_js"]</div>
***************
*** 13,15 ****
          <div class="mainpage">[Wikimainpage]</div>
          <div class="mainpage">[Wikielement: "footer_collection"]</div>
! </div>
\ No newline at end of file
--- 13,15 ----
          <div class="mainpage">[Wikimainpage]</div>
          <div class="mainpage">[Wikielement: "footer_collection"]</div>
! </div>

[fuwiki-cvs] fuwiki_1_0/install fix_0.5.php,1.1.1.1,1.2 tables_cache.sql,1.1.1.1,1.2

[Mutwin K. <mu...@us...>]

Update of /cvsroot/fuwiki/fuwiki_1_0/install
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29539/install

Modified Files:
	fix_0.5.php tables_cache.sql 
Log Message:
1.0RC1 fixes

Index: fix_0.5.php
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/install/fix_0.5.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fix_0.5.php	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- fix_0.5.php	15 Oct 2004 11:49:05 -0000	1.2
***************
*** 2,15 ****
  
  require("../settings.inc");
  
  $link = mysql_connect(_MYSQL_HOST, _MYSQL_USER, _MYSQL_PASS);
! mysql_select_db(_MYSQL_DATABASE, $link);
  $query = "SELECT id, name FROM wikis_cache;";
  $res = mysql_query($query, $link);
  while($a = mysql_fetch_array($res))
  {
!     $query = "UPDATE wikis_cache SET name='".rawurldecode($a["name"])."' where id=".$a["id"]." LIMIT 1;";
      $r = mysql_query($query, $link);
  }
  
  ?>
\ No newline at end of file
--- 2,35 ----
  
  require("../settings.inc");
+  
+  function decode($str) {
+     $str = rawurldecode($str);
+     if(substr_count($str, utf8_decode("ü")) == 0 && substr_count($str, utf8_decode("ä")) == 0 && substr_count($str, utf8_decode("ö")) == 0 && substr_count($str, utf8_decode("ß")) == 0)
+         return utf8_decode($str);
+     
+         return $str;
+  }
  
  $link = mysql_connect(_MYSQL_HOST, _MYSQL_USER, _MYSQL_PASS);
! mysql_select_db("fuwiki", $link);
  $query = "SELECT id, name FROM wikis_cache;";
  $res = mysql_query($query, $link);
  while($a = mysql_fetch_array($res))
  {
!     $query = "UPDATE wikis_cache SET name='".decode($a["name"])."' WHERE id=".$a["id"]." LIMIT 1;";
      $r = mysql_query($query, $link);
  }
  
+ echo "updated wikis_cache\n";
+ 
+ $query = "SELECT id, name, revision FROM wikis;";
+ $res = mysql_query($query, $link);
+ while($a = mysql_fetch_array($res))
+ {
+     $query = "UPDATE wikis SET name='".decode($a["name"])."' WHERE id=".$a["id"]." LIMIT 1;";
+     $r = mysql_query($query, $link);
+ }
+ 
+ echo "updated wikis\n";
+ 
  ?>
\ No newline at end of file

Index: tables_cache.sql
===================================================================
RCS file: /cvsroot/fuwiki/fuwiki_1_0/install/tables_cache.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tables_cache.sql	13 Oct 2004 20:28:28 -0000	1.1.1.1
--- tables_cache.sql	15 Oct 2004 11:49:05 -0000	1.2
***************
*** 6,12 ****
    `name` tinytext,
    `text` longtext,
-   `category1` int(11) default '0',
-   `category2` int(11) default NULL,
-   `category3` int(11) default NULL,
    PRIMARY KEY  (`id`)
  );
--- 6,9 ----