From 0a2b2a139080b41c10bbc7fc0f3b24129f2c3c38 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Thu, 30 Jan 2014 10:39:09 +0100 Subject: attempt with fix URL for testing works --- include/network.php | 12 +++++++++--- include/zot.php | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/network.php b/include/network.php index 3fe7f5400..ca6fa1bfc 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); - // don't let curl abort the entire application + // dont 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 @@ -129,7 +129,11 @@ 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); @@ -181,10 +185,12 @@ 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 7c2cfe019..de2fb4202 100644 --- a/include/zot.php +++ b/include/zot.php @@ -134,6 +134,7 @@ 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)); } -- cgit v1.2.3 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 - 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'include') 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)); } -- cgit v1.2.3