[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;
  		}