* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
//* DEBUG: */ debugOutput('<strong>Response:</strong><pre>'.print_r($response, TRUE).'</pre>');
// Proxy agent found or something went wrong?
- if (count($response) == 0) {
+ if (!isFilledArray($response)) {
// No response, maybe timeout
$response = array('', '', '');
logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
$GLOBALS['http_headers'][] = getConfig('HTTP_EOL');
// Make sure at least one header is there (which is still not valid but okay here)
- assert((is_array($GLOBALS['http_headers'])) && (count($GLOBALS['http_headers']) > 0));
+ assert(isFilledArray($GLOBALS['http_headers']));
// Merge both together
return merge_array($GLOBALS['http_headers'], array(count($GLOBALS['http_headers']) => $body));
} // END - if
// Extract host name
- $host = str_replace('http://', '', $url);
+ $host = str_replace(array('http://', 'https://'), array('', ''), $url);
+
+ // Is there a slash at the end?
if (isInString('/', $host)) {
$host = substr($host, 0, strpos($host, '/'));
} // END - if
+ // Is there a double-dot in? (Means port number)
+ if (strpos($host, ':') !== FALSE) {
+ // Detected a double-dot
+ $hostArray = explode(':', $host);
+ $host = $hostArray[0];
+ } // END - if
+
// Generate relative URL
//* DEBUG: */ debugOutput('SCRIPT=' . $script);
if (substr(strtolower($script), 0, 7) == 'http://') {
// Is ext-sql_patches at least version 0.9.2?
if (isExtensionInstalledAndNewer('sql_patches', '0.9.2')) {
// Is there an entry?
- if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", SQL_ESCAPE(detectRemoteAddr(TRUE)), SQL_ESCAPE(detectUserAgent(TRUE)), SQL_ESCAPE(detectReferer(TRUE))))) == 1) {
+ if (countSumTotalData(detectServerName(), 'server_name_log', 'server_name_id', 'server_name', TRUE, str_replace('%', '{PER}', sprintf(" AND `server_name_remote_addr`='%s' AND `server_name_ua`='%s' AND `server_name_referrer`='%s'", sqlEscapeString(detectRemoteAddr(TRUE)), sqlEscapeString(detectUserAgent(TRUE)), sqlEscapeString(detectReferer(TRUE))))) == 1) {
// Update counter, as all are the same
- SQL_QUERY_ESC("UPDATE
+ sqlQueryEscaped("UPDATE
`{?_MYSQL_PREFIX?}_server_name_log`
SET
`server_name_counter`=`server_name_counter`+1
), __FUNCTION__, __LINE__);
} else {
// Then log it away
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
+ sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_server_name_log` (`server_name`, `server_name_remote_addr`, `server_name_ua`, `server_name_referrer`) VALUES('%s','%s', '%s', '%s')",
array(
detectServerName(),
detectRemoteAddr(TRUE),