From 6837bf8aa83a9102a3cf7a7eb6a7ba90fc27d19b Mon Sep 17 00:00:00 2001 From: Tijn Kuyper Date: Sat, 1 Dec 2012 23:33:24 +0100 Subject: [PATCH] Forum admin clean-up: GUI and LAN --- e107_plugins/forum/forum_admin_class.php | 146 +++++++++--------- .../languages/English/lan_forum_admin.php | 4 +- 2 files changed, 71 insertions(+), 79 deletions(-) diff --git a/e107_plugins/forum/forum_admin_class.php b/e107_plugins/forum/forum_admin_class.php index 505b7c442..80765ed1b 100755 --- a/e107_plugins/forum/forum_admin_class.php +++ b/e107_plugins/forum/forum_admin_class.php @@ -211,7 +211,7 @@ class forumAdmin $ns = e107::getRender(); $txt = "
- +
@@ -432,7 +432,7 @@ class forumAdmin $row['forum_threadclass'] = e_UC_MEMBER; } - $text = "
+ $text = "
".FORLAN_151." ".FORLAN_31."
@@ -444,18 +444,18 @@ class forumAdmin - - + + - - + + - - + + @@ -473,8 +473,7 @@ class forumAdmin $text .= "
".FORLAN_23.":
(".FORLAN_24.")		".$e107->user_class->uc_dropdown('forum_class', $row['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_23.":".$e107->user_class->uc_dropdown('forum_class', $row['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_24."
".FORLAN_142.":
(".FORLAN_143.")		".$e107->user_class->uc_dropdown("forum_postclass", $row['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_142.":".$e107->user_class->uc_dropdown("forum_postclass", $row['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_143."
".FORLAN_184.":
(".FORLAN_185.")		".$e107->user_class->uc_dropdown('forum_threadclass', $row['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_184.":".$e107->user_class->uc_dropdown('forum_threadclass', $row['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_185."
-
- "; + "; $ns->tablerender(FORLAN_75, $text); } @@ -506,7 +505,7 @@ class forumAdmin ); } - $text = "
+ $text = "
\n @@ -525,41 +524,39 @@ class forumAdmin - + - + - + - - + + - - + + - - + + @@ -575,8 +572,7 @@ class forumAdmin $text .= "
".FORLAN_31.": -
".FORLAN_179."
- 		".FORLAN_31.": - + ".FORLAN_179."
".FORLAN_32.": ".FORLAN_32.":
".FORLAN_33.":
(".FORLAN_34.")		".FORLAN_33.": "; - $text .= $e107->user_class->uc_dropdown('forum_moderators', $fInfo['forum_moderators'], 'admin,classes'); + $text .= $e107->user_class->uc_dropdown('forum_moderators', $fInfo['forum_moderators'], 'admin,classes')."".FORLAN_34.""; $text .= "
".FORLAN_23.":
(".FORLAN_24.")		".$e107->user_class->uc_dropdown('forum_class', $fInfo['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_23.":".$e107->user_class->uc_dropdown('forum_class', $fInfo['forum_class'], 'nobody,public,member,admin,classes')."".FORLAN_24."
".FORLAN_142.":
(".FORLAN_143.")		".$e107->user_class->uc_dropdown('forum_postclass', $fInfo['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_142.":".$e107->user_class->uc_dropdown('forum_postclass', $fInfo['forum_postclass'], 'nobody,public,member,admin,classes')."".FORLAN_143."
".FORLAN_184.":
(".FORLAN_185.")		".$e107->user_class->uc_dropdown('forum_threadclass', $fInfo['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_184.":".$e107->user_class->uc_dropdown('forum_threadclass', $fInfo['forum_threadclass'], 'nobody,public,member,admin,classes')."".FORLAN_185."
-
-
"; + "; $ns->tablerender(FORLAN_28, $text); } @@ -672,120 +668,120 @@ class forumAdmin } } - $text = "
+ $text = "
\n - - + + - - + + - - + + - - + + - "; + "; if($poll_installed) { // - $text .= "'; + $text .= "'; } else { - $text .= ""; + $text .= ""; } $text .= " - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -794,14 +790,13 @@ class forumAdmin
".FORLAN_44."
".FORLAN_45."		".($fPref->get('enclose') ? "" : "")."".FORLAN_44.":".($fPref->get('enclose') ? "" : "")."".FORLAN_45."
".FORLAN_65."
".FORLAN_46."		".FORLAN_65.":
".FORLAN_47."
".FORLAN_48."		".($fPref->get('notify') ? "" : "")."".FORLAN_47.":".($fPref->get('notify') ? "" : "")."".FORLAN_48."
".FORLAN_177."
".FORLAN_178."		".($fPref->get('notify_on') ? "" : "")."".FORLAN_177.":".($fPref->get('notify_on') ? "" : "")."".FORLAN_178."
".FORLAN_49."
".FORLAN_50."		".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').'".$e107->user_class->uc_dropdown('forum_poll', $fPref->get('poll'), 'admin,classes').''.FORLAN_50.'".FORLAN_66."".FORLAN_66."
".FORLAN_70."
".FORLAN_71." ".FORLAN_130." ". FORLAN_131.""; + 		".FORLAN_70.":"; if(!$pref['image_post']) { - $text .= "
".FORLAN_139.""; + $text .= "
".FORLAN_139.""; // TODO LAN } if(!is_writable(e_PLUGIN.'forum/attachments')) { - $text .= "
Attachment dir (".e_PLUGIN_ABS.'forum/attachments'.") is not writable!"; + $text .= "
Attachment dir (".e_PLUGIN_ABS.'forum/attachments'.") is not writable!"; // TODO LAN } $text .= "		".($fPref->get('attach') ? "" : "")."".($fPref->get('attach') ? "" : "")."".FORLAN_71." ".FORLAN_130." ". FORLAN_131."
".FORLAN_134."
".FORLAN_135."		".FORLAN_134.":".FORLAN_135."
".FORLAN_136."
".FORLAN_137."		".($fPref->get('linkimg') ? "" : "")."".FORLAN_136.":".($fPref->get('linkimg') ? "" : "")."".FORLAN_137."
".FORLAN_51."
".FORLAN_52."		".($fPref->get('track') ? "" : "")."".FORLAN_51.":".($fPref->get('track') ? "" : "")."".FORLAN_52."
".FORLAN_112."
".FORLAN_113."		".($fPref->get('redirect') ? "" : "")."".FORLAN_112.":".($fPref->get('redirect') ? "" : "")."".FORLAN_113."
".FORLAN_116."
".FORLAN_122."		".($fPref->get('reported_post_email') ? "" : "")."".FORLAN_116.":".($fPref->get('reported_post_email') ? "" : "")."".FORLAN_122."
".FORLAN_126."
".FORLAN_127."		".($fPref->get('forum_tooltip') ? "" : "")."".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."
".FORLAN_133."		".($fPref->get('hilightsticky') ? "" : "")."".FORLAN_132.":".($fPref->get('hilightsticky') ? "" : "")."".FORLAN_133."
-
-
"; + "; $ns->tablerender(FORLAN_62, $emessage->render().$text); } function show_reported ($sub_action, $id) { - global $rs; //FIX: needed? + global $rs; // FIX replace by $frm? $sql = e107::getDb(); $ns = e107::getRender(); $tp = e107::getParser(); @@ -812,8 +807,9 @@ class forumAdmin $sql -> db_Select("user", "*", "user_id='". $row['gen_user_id']."'"); $user = $sql -> db_Fetch(); $con = new convert; - $text = "
- + $text = " +
+ @@ -864,13 +860,12 @@ class forumAdmin $text .= ""; $ns -> tablerender(FORLAN_116, $text); } else { - $text = "
"; if ($reported_total = $sql->db_Select("generic", "*", "gen_type='reported_post' OR gen_type='Reported Forum Post'")) { $text .= "
".FORLAN_171.":
- + "; while ($row = $sql->db_Fetch()) { @@ -889,7 +884,6 @@ class forumAdmin { $text .= "
".FORLAN_121."
"; } - $text .= ""; $ns->tablerender(FORLAN_116, $text); } } @@ -1041,7 +1035,6 @@ class forumAdmin $admintext = $tp->toFORM($admin_rules['gen_chardata']); $text = " -
".FORLAN_170."".FORLAN_80."".FORLAN_80."
"; @@ -1119,8 +1112,7 @@ class forumAdmin
- -
"; + "; $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 b500621d5..fdcd57a11 100644 --- a/e107_plugins/forum/languages/English/lan_forum_admin.php +++ b/e107_plugins/forum/languages/English/lan_forum_admin.php @@ -147,7 +147,7 @@ define("WMGLAN_6", "Activate?"); define("FORLAN_126", "Show Tooltips"); define("FORLAN_127", "Tick here to show a tooltip containing the first post of the thread when mouse hovers over thread name. "); define("FORLAN_128", "Length of tooltip"); -define("FORLAN_129", "This will determine the number of characters to display in the tooltip. "); +define("FORLAN_129", "This will determine the number of characters to display in the tooltip."); define("FORLAN_130", "click here"); define("FORLAN_131", "to set max file size, allowed types etc"); define("FORLAN_132", "Emphasize Sticky Threads"); @@ -200,7 +200,7 @@ define("FORLAN_176", "Report"); define("FORLAN_177", "email notification ON by default"); define("FORLAN_178", "Tick this to allow make the email notification checkbox be on by default"); -define("FORLAN_179", "(Adding a * to the beginning of the forum name will make this forum a container for sub-forums only. The forum theme must support this option also.)"); +define("FORLAN_179", "Adding a * to the beginning of the forum name will make this forum a container for sub-forums only. The forum theme must support this option also."); define("FORLAN_180", "Confirm delete operation"); //define("FORLAN_181", "Confirm Delete"); define("FORLAN_182", "also recalculate replies for all threads in selected forum");