From c5ac5544cb02aa3194c5cab2b3ab736a2e19e6eb Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Thu, 30 Jan 2014 11:04:20 +0100 Subject: clean up logger commands. Placed apostrophs at the end from some comments to keep the syntax highlighting in vi working --- include/network.php | 10 ++-------- include/zot.php | 1 - index.php | 4 +--- mod/admin.php | 3 --- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/network.php b/include/network.php index ca6fa1bfc..1fb4beaa7 100644 --- a/include/network.php +++ b/include/network.php @@ -78,7 +78,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { @curl_setopt($ch, CURLOPT_BINARYTRANSFER,1); - // dont let curl abort the entire application + // don't let curl abort the entire application' // if it throws any errors. $s = @curl_exec($ch); @@ -86,7 +86,7 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { $base = $s; $curl_info = @curl_getinfo($ch); $http_code = $curl_info['http_code']; - logger('fetch_url:' . $http_code . ' data: ' . $s); + //logger('fetch_url:' . $http_code . ' data: ' . $s); $header = ''; // Pull out multiple headers, e.g. proxy and continuation headers @@ -130,10 +130,6 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { function z_post_url($url,$params, $redirects = 0, $opts = array()) { - logger('z_post_url',LOGGER_DEBUG); - logger('z_post_url url ' . $url ,LOGGER_DEBUG); - logger('z_post_url params' . $params ,LOGGER_DEBUG); - logger('z_post_url redirects ' . $redirects ,LOGGER_DEBUG); $ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => ""); $ch = curl_init($url); @@ -185,12 +181,10 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { // if it throws any errors. $s = @curl_exec($ch); - logger('z_post_url s ' . $s ,LOGGER_DEBUG); $base = $s; $curl_info = curl_getinfo($ch); $http_code = $curl_info['http_code']; - logger('z_post_url http_code ' . $http_code ,LOGGER_DEBUG); $header = ''; diff --git a/include/zot.php b/include/zot.php index de2fb4202..7c2cfe019 100644 --- a/include/zot.php +++ b/include/zot.php @@ -134,7 +134,6 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_ function zot_zot($url,$data) { - logger('zot_zot ',LOGGER_DEBUG); return z_post_url($url,array('data' => $data)); } diff --git a/index.php b/index.php index 15fa264bd..c2421bc0e 100755 --- a/index.php +++ b/index.php @@ -19,7 +19,7 @@ $a = new App; /** * * Load the configuration file which contains our DB credentials. - * Ignore errors. If the file doesnt exist or is empty, we are running in installation mode. + * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.' * */ @@ -181,8 +181,6 @@ if(strlen($a->module)) { * If the site has a custom module to over-ride the standard module, use it. * Otherwise, look for the standard program module in the 'mod' directory */ - logger('Index.php', LOGGER_DEBUG); - //logger('Index.php array ' . print_r($a,true), LOGGER_DEBUG); if(! $a->module_loaded) { if(file_exists("custom/{$a->module}.php")) { diff --git a/mod/admin.php b/mod/admin.php index 360eddd2a..12b847b03 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -479,12 +479,9 @@ function admin_page_hubloc_post(&$a){ intval($hublocid) ); $hublocurl = $arrhublocurl[0]['hubloc_url'] . '/post'; - $hublocurl = "http://fred-dev.michameer.dyndns.org/post"; //perform ping $m = zot_build_packet($a->get_channel(),'ping'); - logger('ping message : ' . print_r($m,true), LOGGER_DEBUG); - logger('ping _REQUEST ' . print_r($_REQUEST,true), LOGGER_DEBUG); $r = zot_zot($hublocurl,$m); logger('ping answer: ' . print_r($r,true), LOGGER_DEBUG); -- cgit v1.2.3