From fe6e09d08d741580f3418c417ef9a5c71774f653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=B3na=20Lore?= Date: Thu, 7 May 2015 10:44:11 +0200 Subject: [PATCH] removed debug messages from LAN files --- e107_admin/cron.php | 4 ++-- e107_admin/frontpage.php | 4 ++-- e107_admin/language.php | 8 +++---- e107_admin/newspost.php | 24 +++++++++---------- e107_languages/English/admin/lan_cron.php | 3 --- .../English/admin/lan_frontpage.php | 2 -- e107_languages/English/admin/lan_language.php | 2 -- e107_languages/English/admin/lan_newspost.php | 11 --------- 8 files changed, 20 insertions(+), 38 deletions(-) diff --git a/e107_admin/cron.php b/e107_admin/cron.php index 9b9a37f7a..890866d41 100644 --- a/e107_admin/cron.php +++ b/e107_admin/cron.php @@ -442,7 +442,7 @@ class cron_admin_ui extends e_admin_ui $obj = new $class_name; if (method_exists($obj, $method_name)) { - $message = str_replace('[function]', $class_name." : ".$method_name, LAN_CRON_55); + $message = str_replace('[function]', $class_name." : ".$method_name, "Executing config function [b][function][/b]"); $mes->add($message, E_MESSAGE_DEBUG); if ($return == 'boolean') { @@ -456,7 +456,7 @@ class cron_admin_ui extends e_admin_ui } else { - $message = str_replace('[method]', $method_name."()", LAN_CRON_56); + $message = str_replace('[method]', $method_name."()", "Config function [b][method][/b] NOT found."); $mes->add($message, E_MESSAGE_DEBUG); } } diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 9b7753819..bb8792246 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -318,8 +318,8 @@ if($fp_update_prefs) $corePrefs->set('frontpage', $fp_list); $corePrefs->set('frontpage_force', $fp_force); $result = $corePrefs->save(FALSE, TRUE); - $mes->addDebug("

".FRTLAN_58."

".print_a($fp_list, true)); - $mes->addDebug("

".FRTLAN_59."

".print_a($fp_force, true)); + $mes->addDebug("

Home

".print_a($fp_list, true)); + $mes->addDebug("

Post-Login

".print_a($fp_force, true)); } diff --git a/e107_admin/language.php b/e107_admin/language.php index f1ac985ba..4b54470c3 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -1630,7 +1630,7 @@ function unused($lanfile,$script,$reverse=false) } - $mes->addDebug(LANG_LAN_122." ".$script); + $mes->addDebug("Script: ".$script); $tmp = explode(",", $lanfile); foreach($tmp as $scr) @@ -1642,7 +1642,7 @@ function unused($lanfile,$script,$reverse=false) } $compare[$scr] = file_get_contents($scr); - $mes->addDebug(LANG_LAN_123." ".$scr); + $mes->addDebug("LanFile: ".$scr); } @@ -1651,7 +1651,7 @@ function unused($lanfile,$script,$reverse=false) else { $lanDefines = file_get_contents($lanfile); - $mes->addDebug(LANG_LAN_123." ".$lanfile); + $mes->addDebug("LanFile: ".$lanfile); $tmp = explode(",",$script); foreach($tmp as $scr) @@ -1662,7 +1662,7 @@ function unused($lanfile,$script,$reverse=false) continue; } $compare[$scr] = file_get_contents($scr); - $mes->addDebug(LANG_LAN_122." ".$scr); + $mes->addDebug("Script: ".$scr); } } diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 257588a3b..d621ca765 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -683,11 +683,11 @@ class news_admin_ui extends e_admin_ui $mes = e107::getMessage(); - $mes->addDebug(LAN_NEWS_76,'default',true); + $mes->addDebug('Checking for Ping Status','default',true); if(!empty($_POST['news_ping']) && (count($pingServices)>0) && (in_array(e_UC_PUBLIC, $_POST['news_class']))) { - $mes->addDebug(LAN_NEWS_77,'default',true); + $mes->addDebug("Initiating ping",'default',true); include (e_HANDLER.'xmlrpc/xmlrpc.inc.php'); include (e_HANDLER.'xmlrpc/xmlrpcs.inc.php'); @@ -712,11 +712,11 @@ class news_admin_ui extends e_admin_ui if($this->ping($server, $port, $path, $weblog_name, $weblog_url, $changes_url, $cat_or_rss, $extended)) { - e107::getMessage()->addInfo(LAN_NEWS_78." ".$server .' '.LAN_NEWS_79.'
url: '.$changes_url .'
rss: '.$cat_or_rss , 'default', true); + e107::getMessage()->addInfo("Successfully Pinged: ".$server .' with:
url: '.$changes_url .'
rss: '.$cat_or_rss , 'default', true); } else { - e107::getMessage()->addDebug(LAN_NEWS_80." ".$server .' '.LAN_NEWS_79.' '.$changes_url , 'default', true); + e107::getMessage()->addDebug("Ping failed!: ".$server .' with: '.$changes_url , 'default', true); } } @@ -724,9 +724,9 @@ class news_admin_ui extends e_admin_ui } else { - // $mes->addDebug(LAN_NEWS_81,'default',true); - // $mes->addDebug(LAN_NEWS_82." ".print_a($pingServices, true),'default', true); - // $mes->addDebug(LAN_NEWS_83." ".print_a($_POST['news_class'],true),'default', true); + // $mes->addDebug('Ping not triggerred','default',true); + // $mes->addDebug("Services: ".print_a($pingServices, true),'default', true); + // $mes->addDebug("Userclass: ".print_a($_POST['news_class'],true),'default', true); } @@ -739,7 +739,7 @@ class news_admin_ui extends e_admin_ui $mes = e107::getMessage(); $log = e107::getAdminLog(); - $mes->addDebug(LAN_NEWS_84." ".$xml_rpc_server, 'default', true); + $mes->addDebug("Attempting to ping: ".$xml_rpc_server, 'default', true); $name_param = new xmlrpcval($weblog_name, 'string'); @@ -772,12 +772,12 @@ class news_admin_ui extends e_admin_ui $client = new xmlrpc_client($xml_rpc_path, $xml_rpc_server, $xml_rpc_port); $response = $client->send($message); - $this->log_ping(LAN_NEWS_85." " . $call_text); + $this->log_ping("Request: " . $call_text); $this->log_ping($message->serialize(), true); if ($response == 0) { - $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $client->errno . " " . $client->errstring; + $error_text = "Error: " . $xml_rpc_server . ": " . $client->errno . " " . $client->errstring; $this->report_error($error_text); $this->log_ping($error_text); $log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$client->errstring))->save('PING_01'); @@ -787,7 +787,7 @@ class news_admin_ui extends e_admin_ui if ($response->faultCode() != 0) { - $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $response->faultCode() . " " . $response->faultString(); + $error_text = "Error: " . $xml_rpc_server . ": " . $response->faultCode() . " " . $response->faultString(); $this->report_error($error_text); $log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$response->faultString()))->save('PING_01'); @@ -808,7 +808,7 @@ class news_admin_ui extends e_admin_ui // read the response if ($fl_error->scalarval() != false) { - $error_text = LAN_NEWS_86." " . $xml_rpc_server . ": " . $message->scalarval(); + $error_text = "Error: " . $xml_rpc_server . ": " . $message->scalarval(); $this->report_error($error_text); $log->addArray(array('status'=>LAN_ERROR, 'service'=>$xml_rpc_server, 'url'=> $changes_url, 'response'=>$message->scalarval()))->save('PING_01'); diff --git a/e107_languages/English/admin/lan_cron.php b/e107_languages/English/admin/lan_cron.php index 95c84fd57..c6da67b0f 100644 --- a/e107_languages/English/admin/lan_cron.php +++ b/e107_languages/English/admin/lan_cron.php @@ -88,9 +88,6 @@ define("LAN_CRON_52", "Day(s):"); define("LAN_CRON_53", "Month(s):"); define("LAN_CRON_54", "Weekday(s):"); -define("LAN_CRON_55", "Executing config function [b][function][/b]"); -define("LAN_CRON_56", "Config function [b][method][/b] NOT found."); - define("LAN_CRON_BACKUP", "Backup"); define("LAN_CRON_LOGGING", "Logging"); define("LAN_CRON_RUNNING", "Running") diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php index 816f425fb..f8d6af6a9 100644 --- a/e107_languages/English/admin/lan_frontpage.php +++ b/e107_languages/English/admin/lan_frontpage.php @@ -43,8 +43,6 @@ define("FRTLAN_PAGE_TITLE", "Front Page"); //define("FRTLAN_55", "Confirm delete rule?"); define("FRTLAN_56", "duplicate definition for class:"); define("FRTLAN_57", "Software error"); -define("FRTLAN_58", "Home"); -define("FRTLAN_59", "Post-Login"); define("FRTLAN_60", "Front"); ?> \ No newline at end of file diff --git a/e107_languages/English/admin/lan_language.php b/e107_languages/English/admin/lan_language.php index 271be3e8f..9a1c7236d 100644 --- a/e107_languages/English/admin/lan_language.php +++ b/e107_languages/English/admin/lan_language.php @@ -81,8 +81,6 @@ define("LANG_LAN_118", "Please verify your language files ('Verify') then try ag define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [lcpath] and try again."); define("LANG_LAN_120", "Please make sure you are using default folder names in e107_config.php (eg. e107_languages/, e107_plugins/ etc.) and try again."); define("LANG_LAN_121", "Couldn't Load:"); -define("LANG_LAN_122", "Script:"); -define("LANG_LAN_123", "LanFile:"); define("LANG_LAN_124", "Definition"); define("LANG_LAN_125", "(disabled)"); define("LANG_LAN_126", "Disable All Unused"); diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index 8870bf5c2..899e60844 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -210,17 +210,6 @@ define("LAN_NEWS_73", "Sidebar - Othernews 2"); define("LAN_NEWS_74", "Carousel"); define("LAN_NEWS_75", "Featurebox"); -define("LAN_NEWS_76", "Checking for Ping Status"); -define("LAN_NEWS_77", "Initiating ping"); -define("LAN_NEWS_78", "Successfully Pinged:"); -define("LAN_NEWS_79", "with:"); -define("LAN_NEWS_80", "Ping failed!:"); -define("LAN_NEWS_81", "Ping not triggerred"); -define("LAN_NEWS_82", "Services:"); -define("LAN_NEWS_83", "Userclass:"); -define("LAN_NEWS_84", "Attempting to ping:"); -define("LAN_NEWS_85", "Request:"); -define("LAN_NEWS_86", "Error:"); define("LAN_NEWS_87", "eg. blogsearch.google.com/ping/RPC2"); define("LAN_NEWS_88", "Determines how the default news page should appear."); define("LAN_NEWS_89", "Notify these services when you create/update news items.");