Menu
▾
▴
[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
|
From: Mutwin K. <mu...@us...> - 2004-10-16 15:55:57
|
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&layout=".$file."&style=".get_xml_argument("css", $style_args)."\">"._FWL_PREVIEW."</a> <a href=\"index.php?FWikiLayout&set_layout=".$file."&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&layout=".$file."&style=".get_xml_argument("css", $style_args)."\">"._FWL_PREVIEW."</a> | <a href=\"index.php?FWikiLayout&set_layout=".$file."&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&layout=".$file."\">"._FWL_PREVIEW."</a> <a href=\"index.php?FWikiLayout&set_layout=".$file."\">"._FWL_SETLAYOUT."</a></b></td></tr>\n"; } } --- 93,97 ---- } } ! $out .= "<tr><td colspan=\"2\"><b><a href=\"index.php?Home&layout=".$file."\">"._FWL_PREVIEW."</a> | <a href=\"index.php?FWikiLayout&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ü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)) |
