diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 064a5dd4e3..8583cbcc39 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -50,6 +50,8 @@ // Load language files for log messages include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_log_messages.php'); //... for core functions +$mes = e107::getMessage(); + if(is_array($pref['lan_log_list'])) //... and for any plugins which support it { foreach($pref['lan_log_list'] as $path => $file) @@ -96,15 +98,17 @@ if($admin_log->logArrayDiffs($temp, $pref, 'ADLOG_01') || $admin_log->logArrayDiffs($temp, $pref, 'ADLOG_04')) { save_prefs(); // Only save if changes - $emessage->add(RL_LAN_006, E_MESSAGE_SUCCESS); + //$emessage->add(RL_LAN_006, E_MESSAGE_SUCCESS); } else { - $emessage->add(LAN_NO_CHANGE); + $mes->addInfo(LAN_NO_CHANGE); } } +$ns->tablerender($caption, $mes->render() . $text); + if(e_QUERY) { // Must explode after calling auth.php $qs = explode(".", e_QUERY); diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index c60747faea..f4356dc817 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -28,7 +28,9 @@ require_once("auth.php"); require_once(e_HANDLER."message_handler.php"); -$emessage = &eMessage::getInstance(); + +//$emessage = &eMessage::getInstance(); +$mes = e107::getMessage(); if(!$sql->db_Count("core", "(*)", "WHERE e107_name = 'emote_default' AND e107_value !='' ")) { // Set up the default emotes @@ -47,19 +49,23 @@ $admin_log->log_event($pref['smiley_activate'] ? 'EMOTE_02' : 'EMOTE_03', $pref['emotepack'], E_LOG_INFORMATIVE, ''); save_prefs(); $update = true; - $emessage->add(LAN_UPDATED, E_MESSAGE_SUCCESS); + //$emessage->add(LAN_UPDATED, E_MESSAGE_SUCCESS); + //$mes->addSucces(LAN_UPDATED); } else { - $emessage->add(LAN_NO_CHANGE); + //$emessage->add(LAN_NO_CHANGE); + $mes->addInfo(LAN_NO_CHANGE); } } +$ns->tablerender($caption, $mes->render() . $text); /* get packs */ require_once(e_HANDLER."file_class.php"); -$fl = new e_file; +//$fl = new e_file; +$fl = e107::getFile(); $emote = new emotec; $one_pack = FALSE; @@ -86,11 +92,13 @@ $pref['emotepack'] = str_replace("defPack_", "", $key); if(save_prefs()) { - $emessage->add(LAN_UPDATED, E_MESSAGE_SUCCESS); + //$emessage->add(LAN_UPDATED, E_MESSAGE_SUCCESS); + $mes->addSucces(LAN_UPDATED); } else { - $emessage->add(LAN_NO_CHANGE, E_MESSAGE_INFO); + //$emessage->add(LAN_NO_CHANGE, E_MESSAGE_INFO); + $mes->addInfo(LAN_NO_CHANGE); } $admin_log->log_event('EMOTE_01', $pref['emotepack'], E_LOG_INFORMATIVE, ''); break; @@ -103,6 +111,7 @@ } } +$ns->tablerender($caption, $mes->render() . $text); $check = TRUE; @@ -135,13 +144,13 @@ function emotec() // List available emote packs function listPacks() { - global $pref; + //global $pref; + $pref = e107::getPref(); $frm = e107::getForm(); $fl = e107::getFile(); $ns = e107::getRender(); $mes = e107::getMessage(); - - + $text = "