Menu
▾
▴
[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
|
From: Mutwin K. <mu...@us...> - 2004-11-07 12:01:18
|
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); } |
