From 0b6d94047d7db758b12ef5e5525013f23ed41c69 Mon Sep 17 00:00:00 2001 From: e107steved Date: Sat, 23 Dec 2006 18:38:33 +0000 Subject: [PATCH] notice removal --- e107_plugins/login_menu/login_menu.php | 12 ++++++------ .../online_extended_menu/languages/English.php | 14 +++++++------- .../online_extended_menu/online_extended_menu.php | 13 +++++++------ news.php | 8 ++++---- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/e107_plugins/login_menu/login_menu.php b/e107_plugins/login_menu/login_menu.php index fcc3c0593..8f023ac81 100644 --- a/e107_plugins/login_menu/login_menu.php +++ b/e107_plugins/login_menu/login_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/login_menu/login_menu.php,v $ -| $Revision: 1.2 $ -| $Date: 2006-12-06 20:19:03 $ -| $Author: lisa_ $ +| $Revision: 1.3 $ +| $Date: 2006-12-23 18:38:27 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -109,7 +109,7 @@ if (USER == TRUE || ADMIN == TRUE) // ------------ Chatbox Stats ----------- - if (isset($menu_pref['login_menu']) && $menu_pref['login_menu']['new_chatbox'] == true) { + if (isset($menu_pref['login_menu']['new_chatbox']) && $menu_pref['login_menu']['new_chatbox'] == true) { $display_chats = TRUE; if(in_array('chatbox_menu',$eMenuActive)){ @@ -129,7 +129,7 @@ if (USER == TRUE || ADMIN == TRUE) // ------------ Forum Stats ----------- - if (isset($menu_pref['login_menu']) && $menu_pref['login_menu']['new_forum'] == true) { + if (isset($menu_pref['login_menu']['new_forum']) && $menu_pref['login_menu']['new_forum'] == true) { $qry = " SELECT count(*) as count FROM #forum_t as t LEFT JOIN #forum as f @@ -150,7 +150,7 @@ if (USER == TRUE || ADMIN == TRUE) // ------------ Member Stats ----------- - if (isset($menu_pref['login_menu']) && $menu_pref['login_menu']['new_members'] == true) { + if (isset($menu_pref['login_menu']['new_members']) && $menu_pref['login_menu']['new_members'] == true) { $new_users = $sql->db_Count('user', '(user_join)', 'WHERE user_join > '.$time); $new_total += $new_users; if (!$new_users) { diff --git a/e107_plugins/online_extended_menu/languages/English.php b/e107_plugins/online_extended_menu/languages/English.php index 37a471dc9..afd1ba9dc 100644 --- a/e107_plugins/online_extended_menu/languages/English.php +++ b/e107_plugins/online_extended_menu/languages/English.php @@ -11,12 +11,12 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/online_extended_menu/languages/English.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:32 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2006-12-23 18:38:33 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ - + define("ONLINE_EL1", "Guests: "); define("ONLINE_EL2", "Members: "); define("ONLINE_EL3", "On this page: "); @@ -24,10 +24,10 @@ define("ONLINE_EL4", "Online"); define("ONLINE_EL5", "Members"); define("ONLINE_EL6", "Newest member"); define("ONLINE_EL7", "viewing"); - + define("ONLINE_EL8", "most ever online: "); define("ONLINE_EL9", "on"); -define("TRACKING_MESSAGE", "Online user tracking is currently disabled, please enable it here
"); +define("ONLINE_TRACKING_MESSAGE", "Online user tracking is currently disabled, please enable it [link=".e_ADMIN."users.php?options]here[/link][br]"); -?> \ No newline at end of file +?> diff --git a/e107_plugins/online_extended_menu/online_extended_menu.php b/e107_plugins/online_extended_menu/online_extended_menu.php index b2101aad4..31e106d2b 100644 --- a/e107_plugins/online_extended_menu/online_extended_menu.php +++ b/e107_plugins/online_extended_menu/online_extended_menu.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/online_extended_menu/online_extended_menu.php,v $ -| $Revision: 1.2 $ -| $Date: 2006-12-07 15:41:50 $ -| $Author: sweetas $ +| $Revision: 1.3 $ +| $Date: 2006-12-23 18:38:27 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -48,7 +48,7 @@ if(!defined("e_TRACKING_DISABLED") && (isset($pref['track_online']) && $pref['tr $pinfo = "comment.php"; $online_location_page = "comment.php"; } - $text .= " $oname ".ONLINE_EL7; + $text .= " $oname ".ONLINE_EL7; (!strstr($pinfo, $ADMIN_DIRECTORY) ? $text .= " $online_location_page
" : $text .= " $online_location_page
"); } } @@ -78,8 +78,9 @@ if(!defined("e_TRACKING_DISABLED") && (isset($pref['track_online']) && $pref['tr extract($row); $text .= "
".ONLINE_EL5.": ".$total_members."
".ONLINE_EL6.": ".$user_name.""; } -} else { - $text = TRACKING_MESSAGE; +} elseif(ADMIN) { + global $tp; + $text = $tp->toHtml(ONLINE_TRACKING_MESSAGE,TRUE); } diff --git a/news.php b/news.php index 295ff8ad7..136c46abd 100644 --- a/news.php +++ b/news.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/news.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:33:07 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2006-12-23 18:38:27 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ require_once("class2.php"); @@ -557,7 +557,7 @@ function renderCache($cache, $nfp = FALSE){ global $pref,$tp,$sql,$CUSTOMFOOTER, $FOOTER,$cust_footer,$ph; global $db_debug,$ns,$eTraffic,$eTimingStart, $error_handler, $db_time, $sql2, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb,$e107; echo $cache; - if ($nfp && $pref['nfp_display'] == 2) { + if (isset($nfp) && isset($pref['nfp_display']) && $pref['nfp_display'] == 2) { require_once(e_PLUGIN."newforumposts_main/newforumposts_main.php"); } render_newscats();