diff --git a/e107_plugins/forum/forum_admin.php b/e107_plugins/forum/forum_admin.php index 8976271af..7133f7782 100644 --- a/e107_plugins/forum/forum_admin.php +++ b/e107_plugins/forum/forum_admin.php @@ -2,7 +2,7 @@ /* * e107 website system * - * Copyright (C) 2008-2009 e107 Inc (e107.org) + * Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -26,7 +26,7 @@ $e_sub_cat = 'forum'; require_once(e_ADMIN.'auth.php'); require_once(e_HANDLER.'userclass_class.php'); require_once(e_HANDLER.'form_handler.php'); -require_once(e_HANDLER.'ren_help.php'); +require_once(e_HANDLER.'ren_help.php'); // FIXME require_once(e_PLUGIN.'forum/forum_class.php'); require_once(e_PLUGIN.'forum/forum_admin_class.php'); //$emessage = eMessage::getInstance(); @@ -191,14 +191,18 @@ if(isset($_POST['submit_parent'])) $tmp['forum_threadclass'] = (int)$_POST['forum_threadclass']; if($sql->db_Insert('forum',$tmp)) { - $forum->show_message(FORLAN_22.' - '.LAN_CREATED); + //$forum->show_message(FORLAN_22.' - '.LAN_CREATED); + $mes->addSuccess(LAN_CREATED); } else { - $forum->show_message(FORLAN_22.' - '.LAN_CREATED_FAILED); + //$forum->show_message(FORLAN_22.' - '.LAN_CREATED_FAILED); + $mes->addError(LAN_CREATED_FAILED); } } +$ns->tablerender($caption, $mes->render() . $text); + if(isset($_POST['update_parent'])) { $tmp = $_POST; @@ -214,10 +218,13 @@ if(isset($_POST['update_parent'])) $tmp['data']['forum_postclass'] = $_POST['forum_postclass']; $tmp['data']['forum_threadclass'] = $_POST['forum_threadclass']; $sql->db_Update('forum', $tmp); - $forum->show_message(FORLAN_14); + //$forum->show_message(FORLAN_14); + $mes->addSucces(LAN_UPDATED); $action = 'main'; } +$ns->tablerender($caption, $mes->render() . $text); + if(isset($_POST['submit_forum'])) { $tmp = array(); @@ -229,16 +236,20 @@ if(isset($_POST['submit_forum'])) $tmp['forum_postclass'] = (int)$_POST['forum_postclass']; $tmp['forum_threadclass'] = (int)$_POST['forum_threadclass']; $tmp['forum_parent'] = (int)$_POST['forum_parent']; - if($sql->db_Insert('forum',$tmp)) + if($sql->db_Insert('forum', $tmp)) { - $forum->show_message(FORLAN_36.' - '.LAN_CREATED); + //$forum->show_message(FORLAN_36.' - '.LAN_CREATED); + $mes->addSuccess(LAN_CREATED); } else { - $forum->show_message(FORLAN_36.' - '.LAN_CREATED_FAILED); + //$forum->show_message(FORLAN_36.' - '.LAN_CREATED_FAILED); + $mes->addError(LAN_CREATED_FAILED); } } +$ns->tablerender($caption, $mes->render() . $text); + if(isset($_POST['update_forum'])) { unset($_POST['update_forum']); @@ -254,10 +265,13 @@ if(isset($_POST['update_forum'])) $sql->db_Update('forum', $tmp); $sql->db_Update('forum', $tmp2); - $forum->show_message(FORLAN_12); + //$forum->show_message(FORLAN_12); + $mes->addSucces(LAN_UPDATED); $action = 'main'; } +$ns->tablerender($caption, $mes->render() . $text); + if (isset($_POST['update_order'])) { while (list($key, $id) = each($_POST['forum_order'])) @@ -299,13 +313,18 @@ if (isset($_POST['updateoptions'])) // $forum->show_message(FORLAN_10); } +$ns->tablerender($caption, $mes->render() . $text); + if (isset($_POST['do_prune'])) { $msg = $for->forumPrune($_POST['prune_type'], $_POST['prune_days'], $_POST['pruneForum']); - $forum->show_message($msg); + //$forum->show_message($msg); + $mes->addSucces($msg); $action = 'main'; } +$ns->tablerender($caption, $mes->render() . $text); + if (isset($_POST['frsubmit'])) { $guestrules = $e107->tp->toDB($_POST['guestrules']); @@ -325,13 +344,21 @@ if (isset($_POST['frsubmit'])) } } +$ns->tablerender($caption, $mes->render() . $text); if (vartrue($delete) == 'main') { if ($sql->db_Delete('forum', "forum_id='$del_id' ")) { - $forum->show_message(FORLAN_96); + //$forum->show_message(FORLAN_96); + $mes->addSucces(LAN_DELETED); + } + else + { + $mes->addError(LAN_DELETED_FAILED); } } +$ns->tablerender($caption, $mes->render() . $text); + if (vartrue($action) == 'create') { if ($sql->db_Select('forum', '*', "forum_parent='0' ")) @@ -350,11 +377,17 @@ if ($delete == 'cat') if ($sql->db_Delete('forum', "forum_id='$del_id' ")) { $sql->db_Delete('forum', "forum_parent='$del_id' "); - $forum->show_message(FORLAN_97); + $mes->addSucces(LAN_DELETED); $action = 'main'; } + else + { + $mes->addError(LAN_DELETED_FAILED); + } } +$ns->tablerender($caption, $mes->render() . $text); + switch($action) { case 'delete': @@ -402,7 +435,8 @@ switch($action) if ($delete == 'reported') { $sql->db_Delete("generic", "gen_id='$del_id' "); - $forum->show_message(FORLAN_118); + //$forum->show_message(FORLAN_118); + $mes->addSucces(LAN_DELETED); } diff --git a/e107_plugins/forum/forum_admin_class.php b/e107_plugins/forum/forum_admin_class.php index 69eaf7e3d..f3e64bbfd 100755 --- a/e107_plugins/forum/forum_admin_class.php +++ b/e107_plugins/forum/forum_admin_class.php @@ -2,7 +2,7 @@ /* * e107 website system * -* Copyright (C) 2008-2009 e107 Inc (e107.org) +* Copyright (C) 2008-2013 e107 Inc (e107.org) * Released under the terms and conditions of the * GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * @@ -90,7 +90,10 @@ class forumAdmin function delete_parent($id, $confirm = false) { $sql = e107::getDb(); - $ret = ''; + $mes = e107::getMessage(); + $ns = e107::getRender(); + + //$ret = ''; if($sql->db_Select('forum', 'forum_id', "forum_parent = {$id} AND forum_sub = 0")) { $fList = $sql->db_getList(); @@ -103,18 +106,21 @@ class forumAdmin { if($sql->db_Delete('forum', "forum_id = {$id}")) { - $ret .= 'Forum parent successfully deleted'; // TODO LAN + //$ret .= 'Forum parent successfully deleted'; + $mes->addSuccess("Forum parent successfully deleted"); // TODO LAN } else { - $ret .= 'Forum parent could not be deleted'; // TODO LAN + //$ret .= 'Forum parent could not be deleted'; // TODO LAN + $mes->addError("Forum parent could not be deleted"); // TODO LAN } return $ret; } - return 'The forum parent has the following info:
'.$ret; // TODO LAN + //return 'The forum parent has the following info:
'.$ret; // TODO LAN } + function deleteForum($forumId) { $sql = e107::getDb(); @@ -133,7 +139,7 @@ class forumAdmin $f = new e107Forum; if($sql->db_Select('forum_thread', 'thread_id','thread_forum_id='.$forumId)) { - $list = $e107->sql->db_getList(); + $list = $sql->db_getList(); foreach($list as $t) { $f->threadDelete($t['thread_id'], false); @@ -146,7 +152,10 @@ class forumAdmin { $sql = e107::getDb(); $tp = e107::getParser(); - $ret = ''; + $ns = e107::getRender(); + $mes = e107::getMessage(); + + //$ret = ''; if($sql->db_Select('forum', 'forum_id', 'forum_sub = '.$id)) { $fList = $sql->db_getList(); @@ -159,18 +168,22 @@ class forumAdmin { if($this->deleteForum($id)) { - $ret .= "Forum {$id} successfully deleted"; // TODO LAN + //$ret .= "Forum {$id} successfully deleted"; // TODO LAN + $mes->addSuccess(LAN_DELETED); } else { - $ret .= "Forum {$id} could not be deleted"; // TODO LAN - } - return $ret; + //$ret .= "Forum {$id} could not be deleted"; // TODO LAN + $mes->addError(LAN_DELETED_FAILED); + } } $sql->db_Select('forum', 'forum_name, forum_threads, forum_replies', 'forum_id = '.$id); $row = $sql->db_Fetch(); - return "Forum {$id} [".$tp->toHTML($row['forum_name'])."] has {$row['forum_threads']} threads, {$row['forum_replies']} replies.
".$ret; + //return "Forum {$id} [".$tp->toHTML($row['forum_name'])."] has {$row['forum_threads']} threads, {$row['forum_replies']} replies.
".$ret; + $mes->addInfo("Forum {$id} [".$tp->toHTML($row['forum_name'])."] has {$row['forum_threads']} threads and {$row['forum_replies']} replies."); //FIXME combine multiple info's into one message + + $ns->tablerender($caption, $mes->render() . $text); } function delete_sub($id, $confirm = FALSE) @@ -290,6 +303,8 @@ class forumAdmin $frm = e107::getForm(); $sql = e107::getDb(); $tp = e107::getParser(); + $mes = e107::getMessage(); + $ns = e107::getRender(); $subList = $for->forumGetSubs(); @@ -301,19 +316,20 @@ class forumAdmin { $text = "
"; } - $text .= " - - - - - "; if (!$parent_amount = $sql->db_Select('forum', '*', "forum_parent='0' ORDER BY forum_order ASC")) { - $text .= ""; + //$text .= ""; + $mes->addInfo(FORLAN_29); } else { + $text .= " +
".FORLAN_28."".FORLAN_80."
".FORLAN_29."
".FORLAN_29."
+ + + + "; while ($row = $sql->db_Fetch(MYSQL_ASSOC)) { $parentList[] = $row; @@ -405,16 +421,17 @@ class forumAdmin if (!$mode) { $text .= "
".FORLAN_28."".LAN_OPTIONS."
"; - $e107->ns->tablerender(FORLAN_30, $text); + $ns->tablerender(FORLAN_30, $mes->render() . $text); } else { - $text .= "\n\n".$frm->admin_button('update_order', LAN_UPDATE, 'update')."\n\n\n\n
"; - $e107->ns->tablerender(FORLAN_37, $text); + $text .= "\n".$frm->admin_button('update_order', LAN_UPDATE, 'update')."\n\n\n\n"; + $ns->tablerender(FORLAN_37, $mes->render() . $text); } } + function create_parents($sub_action, $id) { global $e107; @@ -443,32 +460,28 @@ class forumAdmin $text = "
- + + + + - - + + - - - + + - - - + + - - - + + - - -
".LAN_NAME.": - - ".LAN_NAME.":
".FORLAN_23.":".$e107->user_class->uc_dropdown('forum_class', $row['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_24."".FORLAN_23.":".$e107->user_class->uc_dropdown('forum_class', $row['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_24."
".FORLAN_142.":".$e107->user_class->uc_dropdown("forum_postclass", $row['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_143."".FORLAN_142.":".$e107->user_class->uc_dropdown("forum_postclass", $row['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_143."
".FORLAN_184.":".$e107->user_class->uc_dropdown('forum_threadclass', $row['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_185."".FORLAN_184.":".$e107->user_class->uc_dropdown('forum_threadclass', $row['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_185."
"; - +
+
"; if ($sub_action == 'edit') { $text .= $frm->admin_button('update_parent', LAN_UPDATE, 'update'); @@ -477,10 +490,8 @@ class forumAdmin { $text .= $frm->admin_button('submit_parent', LAN_CREATE, 'submit'); } - - $text .= " - - + $text .= " +
"; $ns->tablerender(FORLAN_75, $text); @@ -499,7 +510,7 @@ class forumAdmin { if ($sql->db_Select('forum', '*', "forum_id=$id")) { - $fInfo = $e107->sql->db_Fetch(MYSQL_ASSOC); + $fInfo = $sql->db_Fetch(MYSQL_ASSOC); } } else @@ -580,11 +591,13 @@ class forumAdmin $ns->tablerender(FORLAN_28, $text); } - function show_message($message) + + function show_message($message) // FIX { $ns = e107::getRender(); $ns->tablerender('', "
".$message."
"); //FIX: v2 style = render? } + function show_tools() { @@ -596,56 +609,56 @@ class forumAdmin $txt = "
- - + + + + + + - + $txt .= " + - + + + + + + + + ".FORLAN_162."
+      ".FORLAN_182."
".FORLAN_183."
+ - + - - - - - - - - - - +
".FORLAN_156."
".FORLAN_156."
- "; - if($sql->db_Select("forum", "*", "1 ORDER BY forum_order")) - { - $fList = $sql->db_getList(); - foreach($fList as $f) + + "; + if($sql->db_Select("forum", "*", "1 ORDER BY forum_order")) { - $txt .= " ".$tp->toHTML($f['forum_name'])."
"; + $fList = $sql->db_getList(); + foreach($fList as $f) + { + $txt .= " ".$tp->toHTML($f['forum_name'])."
"; + } + $txt .= " ".FORLAN_157.""; } - $txt .= " ".FORLAN_157.""; - } - $txt .= " -
".FORLAN_158."".FORLAN_158."
+ ".FORLAN_159."
     + ".FORLAN_160." +
".FORLAN_161."
- ".FORLAN_159."
     - ".FORLAN_160." -
".FORLAN_161."".FORLAN_163."
- ".FORLAN_162."
-      ".FORLAN_182."
".FORLAN_183."
-
".FORLAN_163."
- ".FORLAN_164."
-
- ".$frm->admin_button('tools', LAN_EXECUTE, 'submit')." - ".FORLAN_164."
+
+ ".$frm->admin_button('tools', LAN_EXECUTE, 'submit')." +
"; $ns->tablerender(FORLAN_166, $txt); @@ -657,8 +670,9 @@ class forumAdmin $ns = e107::getRender(); $sql = e107::getDb(); $e107 = e107::getInstance(); - $emessage = eMessage::getInstance(); + //$emessage = eMessage::getInstance(); $frm = e107::getForm(); + $mes = e107::getMessage(); $poll_installed = plugInstalled('poll'); @@ -675,135 +689,138 @@ class forumAdmin $text = "
\n - + + + + - - + + - - + + - - + + - - + + - "; - if($poll_installed) - { -// - $text .= "'; - } - else - { - $text .= ""; - } - $text .= " + "; + if($poll_installed) + { + // + $text .= "'; + } + else + { + $text .= ""; + } + $text .= " - - + $text .= " + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
".FORLAN_44.":".($fPref->get('enclose') ? "" : "")."".FORLAN_45."".FORLAN_44.":".($fPref->get('enclose') ? "" : "")."".FORLAN_45."
".FORLAN_65.":".FORLAN_65.":
".FORLAN_47.":".($fPref->get('notify') ? "" : "")."".FORLAN_48."".FORLAN_47.":".($fPref->get('notify') ? "" : "")."".FORLAN_48."
".FORLAN_177.":".($fPref->get('notify_on') ? "" : "")."".FORLAN_178."".FORLAN_177.":".($fPref->get('notify_on') ? "" : "")."".FORLAN_178."
".FORLAN_49.":".$e107->user_class->uc_dropdown("mods[{$f['forum_id']}]", $f['forum_moderators'], 'admin,classes')."".$e107->user_class->uc_dropdown('forum_poll', $fPref->get('poll'), 'admin,classes').''.FORLAN_50.'".FORLAN_66."".FORLAN_49.":".$e107->user_class->uc_dropdown("mods[{$f['forum_id']}]", $f['forum_moderators'], 'admin,classes')."".$e107->user_class->uc_dropdown('forum_poll', $fPref->get('poll'), 'admin,classes').''.FORLAN_50.'".FORLAN_66."
".FORLAN_70.":"; + ".FORLAN_70.":"; - if(!$pref['image_post']) - { - $text .= "
".FORLAN_139.""; // TODO LAN - } - if(!is_writable(e_PLUGIN.'forum/attachments')) - { - $text .= "
Attachment dir (".e_PLUGIN_ABS.'forum/attachments'.") is not writable!"; // TODO LAN - } + if(!$pref['image_post']) + { + $text .= "
".FORLAN_139.""; // TODO LAN + } + if(!is_writable(e_PLUGIN.'forum/attachments')) + { + $text .= "
Attachment dir (".e_PLUGIN_ABS.'forum/attachments'.") is not writable!"; // TODO LAN + } - $text .= "		".($fPref->get('attach') ? "" : "")."".FORLAN_71." ".FORLAN_130." ". FORLAN_131."".($fPref->get('attach') ? "" : "")."".FORLAN_71." ".FORLAN_130." ". FORLAN_131."
".FORLAN_134.":".FORLAN_135."".FORLAN_134.":".FORLAN_135."
".FORLAN_136.":".($fPref->get('linkimg') ? "" : "")."".FORLAN_137."".FORLAN_136.":".($fPref->get('linkimg') ? "" : "")."".FORLAN_137."
".FORLAN_51.":".($fPref->get('track') ? "" : "")."".FORLAN_52."".FORLAN_51.":".($fPref->get('track') ? "" : "")."".FORLAN_52."
".FORLAN_112.":".($fPref->get('redirect') ? "" : "")."".FORLAN_113."".FORLAN_112.":".($fPref->get('redirect') ? "" : "")."".FORLAN_113."
".FORLAN_116.":".($fPref->get('reported_post_email') ? "" : "")."".FORLAN_122."".FORLAN_116.":".($fPref->get('reported_post_email') ? "" : "")."".FORLAN_122."
".FORLAN_126.":".($fPref->get('forum_tooltip') ? "" : "")."".FORLAN_127."".FORLAN_126.":".($fPref->get('forum_tooltip') ? "" : "")."".FORLAN_127."
".FORLAN_128.":".FORLAN_129."".FORLAN_128.":".FORLAN_129."
".FORLAN_53.":".FORLAN_54."".FORLAN_53.":".FORLAN_54."
".FORLAN_55.":".FORLAN_56."".FORLAN_55.":".FORLAN_56."
".FORLAN_57.":".FORLAN_58."".FORLAN_57.":".FORLAN_58."
".FORLAN_186.":".FORLAN_187."".FORLAN_186.":".FORLAN_187."
".FORLAN_132.":".($fPref->get('hilightsticky') ? "" : "")."".FORLAN_133."".FORLAN_132.":".($fPref->get('hilightsticky') ? "" : "")."".FORLAN_133."
-
".$frm->admin_button('updateoptions', LAN_UPDATE, 'update')."
"; - $ns->tablerender(FORLAN_62, $emessage->render().$text); + $ns->tablerender(FORLAN_62, $mes->render() . $text); } function show_reported ($sub_action, $id) { - global $rs; // FIX replace by $frm? + global $rs; // FIX replace by $frm $sql = e107::getDb(); $ns = e107::getRender(); $tp = e107::getParser(); + $mes = e107::getMessage(); if ($sub_action) { $sql -> db_Select("generic", "*", "gen_id='".$sub_action."'"); @@ -813,83 +830,73 @@ class forumAdmin $con = new convert; $text = " + + + + - - + + + + + + + + + - - + + - - + + - - - - - - - - - \n"; - $text .= "
- ".FORLAN_171.": - - #".$row['gen_intdata']." + ".FORLAN_171.":#".$row['gen_intdata']."
".FORLAN_173.":".$row['gen_ip']."
".FORLAN_174.":".$user['user_name']."
- ".FORLAN_173.": - - ".$row['gen_ip']." - ".FORLAN_175.":".$con -> convert_date($row['gen_datestamp'], "long")."
- ".FORLAN_174.": - - ".$user['user_name']." - ".FORLAN_176.":".$row['gen_chardata']."
- ".FORLAN_175.": - - ".$con -> convert_date($row['gen_datestamp'], "long")." + + ".$rs->form_open("post", e_SELF."?sr", "", "", "", " onsubmit=\"return confirm_('sr',".$row['gen_datestamp'].")\"")." + ".$rs->form_button("submit", "delete[reported_{$row['gen_id']}]", FORLAN_172)." + ".$rs->form_close()."
- ".FORLAN_176.": - - ".$row['gen_chardata']." -
- ".$rs->form_open("post", e_SELF."?sr", "", "", "", " onsubmit=\"return confirm_('sr',".$row['gen_datestamp'].")\"")." - ".$rs->form_button("submit", "delete[reported_{$row['gen_id']}]", FORLAN_172)." - ".$rs->form_close()." -
"; - $text .= ""; + "; + $ns -> tablerender(FORLAN_116, $text); - } else { - if ($reported_total = $sql->db_Select("generic", "*", "gen_type='reported_post' OR gen_type='Reported Forum Post'")) - { - $text .= " - - - - "; - while ($row = $sql->db_Fetch()) - { - $text .= " - - - \n"; - } - $text .= "
".FORLAN_170."".FORLAN_80."
".FORLAN_171." #".$row['gen_intdata']." - ".$rs->form_open("post", e_SELF."?sr", "", "", "", " onsubmit=\"return confirm_('sr',".$row['gen_datestamp'].")\"")." - ".$rs->form_button("submit", "delete[reported_{$row['gen_id']}]", FORLAN_172)." - ".$rs->form_close()." -
"; - } + + } else { - $text = "
".FORLAN_121."
"; + if ($reported_total = $sql->db_Select("generic", "*", "gen_type='reported_post' OR gen_type='Reported Forum Post'")) + { + $text .= " + + + + + "; + while ($row = $sql->db_Fetch()) + { + $text .= " + ".FORLAN_171." #".$row['gen_intdata']." + + \n"; + } + $text .= "
".FORLAN_170."".LAN_OPTIONS."
+ ".$rs->form_open("post", e_SELF."?sr", "", "", "", " onsubmit=\"return confirm_('sr',".$row['gen_datestamp'].")\"")." + ".$rs->form_button("submit", "delete[reported_{$row['gen_id']}]", FORLAN_172)." + ".$rs->form_close()." +
"; + } + else + { + //$text = "
".FORLAN_121."
"; + $mes->addInfo(FORLAN_121); + } + $ns->tablerender(FORLAN_116, $mes->render() . $text); } - $ns->tablerender(FORLAN_116, $text); - } } function show_prune() @@ -914,19 +921,17 @@ class forumAdmin
\n - - - - - + - + + + + @@ -942,12 +947,11 @@ class forumAdmin } - $text .= " - - + $text .= "
".FORLAN_60."
".FORLAN_87." - - ".FORLAN_60."
".FORLAN_2."
- ".FORLAN_89."     - ".FORLAN_90." + 		".FORLAN_87."
".FORLAN_2."
+ ".FORLAN_89."     + ".FORLAN_90."
- ".$frm->admin_button('do_prune', LAN_PRUNE, 'submit')." -
+
+ ".$frm->admin_button('do_prune', LAN_PRUNE, 'submit')." +
"; $ns->tablerender(LAN_PRUNE, $text); } @@ -958,20 +962,25 @@ class forumAdmin global $for; $ns = e107::getRender(); $sql = e107::getDB(); - $e107 = e107::getInstance(); // FIX: needed? + $e107 = e107::getInstance(); // FIX needed? $forumList = $for->forum_getforums('all'); $parentList = $for->forum_getparents('list'); $subList = $for->forumGetSubs('bysub'); $frm = e107::getForm(); $tp = e107::getParser(); - $txt = "
"; + $txt = " +
+ + + + "; foreach($parentList as $p) { $txt .= " - + "; @@ -979,29 +988,27 @@ class forumAdmin { $txt .= " - - + + "; foreach($subList[$f['forum_id']] as $s) { $txt .= " - - + + "; } } } $txt .= " - - - - -
".$tp->toHTML($p['forum_name'])."".$tp->toHTML($p['forum_name'])."
{$f['forum_name']}".$e107->user_class->uc_dropdown("mods[{$f['forum_id']}]", $f['forum_moderators'], 'admin,classes')."{$f['forum_name']}".$e107->user_class->uc_dropdown("mods[{$f['forum_id']}]", $f['forum_moderators'], 'admin,classes')."
    {$s['forum_name']}".$e107->user_class->uc_dropdown("mods[{$s['forum_id']}]", $s['forum_moderators'], 'admin,classes')."    {$s['forum_name']}".$e107->user_class->uc_dropdown("mods[{$s['forum_id']}]", $s['forum_moderators'], 'admin,classes')."
- ".$frm->admin_button('setMods', LAN_UPDATE, 'update')." -
"; + +
+ ".$frm->admin_button('setMods', LAN_UPDATE, 'update')." +
+ "; $ns->tablerender(FORLAN_33, $txt); // FIX: LAN button update was WMGLAN_4." ".FORLAN_33) } @@ -1041,81 +1048,80 @@ class forumAdmin $text = "
- "; - - $text .= " - - - + + + + + + + + - - + + + - - - - - - - + $text .= " +
".WMGLAN_1.":
- ".WMGLAN_6.":"; - if (vartrue($guest_rules['gen_intdata'])) - { - $text .= ""; - } - else - { - $text .= ""; - } - $text .= "		 - -
- -
- ".display_help('helpb', 1, 'addtext1', 'help1')." -
".WMGLAN_1.":
+ ".WMGLAN_6.":"; + if (vartrue($guest_rules['gen_intdata'])) + { + $text .= ""; + } + else + { + $text .= ""; + } + $text .= "		 + +
+ +
+ ".display_help('helpb', 1, 'addtext1', 'help1')." +
".WMGLAN_2.":
- ".WMGLAN_6.":"; - if (vartrue($member_rules['gen_intdata'])) - { - $text .= ""; - } - else - { - $text .= ""; - } - $text .= "		 - -
- -
- ".display_help('helpb', 1, 'addtext2', 'help2')." - 		".WMGLAN_2.":
+ ".WMGLAN_6.":"; + if (vartrue($member_rules['gen_intdata'])) + { + $text .= ""; + } + else + { + $text .= ""; + } + $text .= "		 + +
+ +
+ ".display_help('helpb', 1, 'addtext2', 'help2')." +
".WMGLAN_3.":
- ".WMGLAN_6.": "; + 		".WMGLAN_3.":
+ ".WMGLAN_6.": "; - if (vartrue($admin_rules['gen_intdata'])) - { - $text .= ""; - } - else - { - $text .= ""; - } + if (vartrue($admin_rules['gen_intdata'])) + { + $text .= ""; + } + else + { + $text .= ""; + } - $text .= "		 - -
- -
- ".display_help('helpb', 1, 'addtext3', 'help3')." -
  - ".$frm->admin_button('frsubmit', WMGLAN_4, 'submit')." - + +
+ +
+ ".display_help('helpb', 1, 'addtext3', 'help3')." +
+
+ ".$frm->admin_button('frsubmit', LAN_UPDATE, 'submit')." +
"; $ns->tablerender(WMGLAN_5, $text); diff --git a/e107_plugins/forum/languages/English/lan_forum_admin.php b/e107_plugins/forum/languages/English/lan_forum_admin.php index 469c20bc9..d51749230 100644 --- a/e107_plugins/forum/languages/English/lan_forum_admin.php +++ b/e107_plugins/forum/languages/English/lan_forum_admin.php @@ -19,13 +19,13 @@ define("FORLAN_7", "Forum Options"); define("FORLAN_8", "Forums pruned."); define("FORLAN_9", "Prune not required."); //define("FORLAN_10", "Options Saved"); -define("FORLAN_11", "Forum created"); -define("FORLAN_12", "Forum updated"); -define("FORLAN_13", "Parent created"); -define("FORLAN_14", "Forum parent updated"); +//define("FORLAN_11", "Forum created"); +//define("FORLAN_12", "Forum updated"); +//define("FORLAN_13", "Parent created"); +//define("FORLAN_14", "Forum parent updated"); define("FORLAN_15", "Please tick the confirm box to delete the forum"); define("FORLAN_16", "Forums"); -define("FORLAN_17", "No parents yet"); +define("FORLAN_17", "No parents yet."); define("FORLAN_18", "Existing Parents"); define("FORLAN_19", "Edit"); define("FORLAN_20", "Delete"); @@ -86,7 +86,7 @@ define("FORLAN_76", "Forums Front Page"); define("FORLAN_77", "Create Forums"); define("FORLAN_78", "Forum Order"); define("FORLAN_79", "Preferences"); -define("FORLAN_80", "Options"); +//define("FORLAN_80", "Options"); define("FORLAN_81", "Are you sure you want to delete this parent? - forums of this parent will also be deleted"); define("FORLAN_82", "Are you sure you want to delete this forum?"); define("FORLAN_83", "Create Parents"); @@ -106,8 +106,8 @@ define("FORLAN_93", "reply (replies) deleted"); define("FORLAN_94", "Set Ranks"); define("FORLAN_95", "Ranks saved"); -define("FORLAN_96", "Forum deleted"); -define("FORLAN_97", "Parent deleted"); +//define("FORLAN_96", "Forum deleted"); +//define("FORLAN_97", "Parent deleted"); define("FORLAN_98", "Rank Name"); define("FORLAN_99", "number of points before level change"); @@ -132,7 +132,7 @@ define("FORLAN_113", "Tick this to make browser redirect to forum page after rep //define("FORLAN_115", "Tick this to allow users to change their Custom Title"); define("FORLAN_116", "Reported Posts"); define("FORLAN_117", "This will delete the record of the reported post. Not the post itself."); -define("FORLAN_118", "Reported post deleted"); +// define("FORLAN_118", "Reported post deleted"); // define("FORLAN_119", "Clicking links will open forum in a new window."); define("FORLAN_120", "Tick this to allow users to change their Custom Title"); define("FORLAN_121", "No reported posts");