diff --git a/e107_admin/ad_links.php b/e107_admin/ad_links.php index c2b9b7d60..c20f8979e 100644 --- a/e107_admin/ad_links.php +++ b/e107_admin/ad_links.php @@ -563,7 +563,7 @@ $array_functions = array( 8 => array(e_ADMIN.'emoticon.php', ADLAN_58, ADLAN_59, 'F', 1, E_16_EMOTE, E_32_EMOTE), // 9 => array(e_ADMIN.'filemanager.php', ADLAN_30, ADLAN_31, '6', 5, E_16_FILE, E_32_FILE), // replaced by media-manager 10 => array(e_ADMIN.'frontpage.php', ADLAN_60, ADLAN_61, 'G', 1, E_16_FRONT, E_32_FRONT), - 11 => array(e_ADMIN.'image.php', LAN_MEDIAMANAGER, ADLAN_106, 'A', 5, E_16_IMAGES, E_32_IMAGES), + 11 => array(e_ADMIN.'image.php', LAN_MEDIAMANAGER, LAN_MEDIAMANAGER, 'A', 5, E_16_IMAGES, E_32_IMAGES), 12 => array(e_ADMIN.'links.php', ADLAN_138, ADLAN_139, 'I', 1, E_16_LINKS, E_32_LINKS), 13 => array(e_ADMIN.'wmessage.php', ADLAN_28, ADLAN_29, 'M', 3, E_16_WELCOME, E_32_WELCOME), 14 => array(e_ADMIN.'ugflag.php', ADLAN_40, ADLAN_41, '9', 4, E_16_MAINTAIN, E_32_MAINTAIN), diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index dcf0d80a1..4e9e16c3c 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -310,12 +310,18 @@ class admin_shortcodes { function admin_latest($parm='') { - global $sql, $ns, $pref; + + $sql = e107::getDb(); + $ns = e107::getRender(); + $pref = e107::getPref(); $active_uploads = $sql -> db_Count('upload', '(*)', 'WHERE upload_active = 0'); $submitted_news = $sql -> db_Count('submitnews', '(*)', 'WHERE submitnews_auth = 0'); + $comments_pending = $sql -> db_Count("comments", "(*)", "WHERE comment_blocked = 2 "); $text = "
".E_16_NEWS.($submitted_news ? " ".ADLAN_LAT_2.": $submitted_news" : ' '.ADLAN_LAT_2.': 0').'
'; + $text .= "
".E_16_COMMENT.($comments_pending ? " ".ADLAN_LAT_9.": $comments_pending" : " ".ADLAN_LAT_9.": ".$comments_pending)."
"; + $text .= "
".E_16_UPLOADS.($active_uploads ? " ".ADLAN_LAT_7.": $active_uploads" : ' '.ADLAN_LAT_7.': '.$active_uploads).'
'; if(vartrue($pref['e_latest_list'])) diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 6a20db310..c5e00f638 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -204,6 +204,7 @@ define("ADLAN_LAT_5", "Submitted links"); define("ADLAN_LAT_6", "Reported forum posts"); define("ADLAN_LAT_7", "File uploads"); define("ADLAN_LAT_8", "There are unmoderated administrator messages"); +define("ADLAN_LAT_9", "Comments pending"); //LAN_WARNING define("ADLAN_ERR_1", "Warning!"); //define("ADLAN_ERR_2", "There are files on your server that are known to be exploitable. These must be removed immediately. The files are related to the older 0.6xx branch of e107. Please delete the following directories and all their contents:");