useProxy is duplicate, because isProxyUsed() is cached, fixed bug in IP resolver...

diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php
index a09fab364e02392224745f1c14ccdc74966a072c..47805bde3cfc2af67c18298d344fa75ccf4c9835 100644 (file)
--- a/inc/classes/resolver.class.php
+++ b/inc/classes/resolver.class.php
@@ -83,6 +83,7 @@ class HostnameResolver {
                } else {
                        // Get IP address
                        $ip = gethostbyname($hostname);
+                       //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, 'ip=' . $ip . ',hostname=' . $hostname . ' - RESOLVED!');
 
                        // Count lookup hit
                        incrementStatsEntry('dns_lookup_hits');
@@ -97,6 +98,7 @@ class HostnameResolver {
 
                                        // Set return value to $ip
                                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("IP detected, cache entry written: %s->%s", $hostname, $ip));
+                                       $ret = $ip;
                                } else {
                                        // Network address or broadcast address found
                                        //* DEBUG: */ logDebugMessage(__METHOD__, __LINE__, sprintf("IP %s is possibly a network or broadcast address.", $ip));
@@ -118,7 +120,7 @@ class HostnameResolver {
                // Free result
                SQL_FREERESULT($result);
 
-               // Return IP number (let's hope it!
+               // Return IP number (let's hope it)
                return $ret;
        }
 

diff --git a/inc/http-functions.php b/inc/http-functions.php
index b65729810526fee9dc0651d8e9b84b0eec65940c..85ae678a45f4badc55c9e6d443a7e7e626c7796b 100644 (file)
--- a/inc/http-functions.php
+++ b/inc/http-functions.php
@@ -308,18 +308,9 @@ function sendRawRequest ($host, $request) {
        // Initialize array
        $response = array('', '', '');
 
-       // Default is not to use proxy
-       $useProxy = false;
-
        // Default is non-broken HTTP server implementation
        $GLOBALS['is_http_server_broken'] = false;
 
-       // Are proxy settins set?
-       if (isProxyUsed()) {
-               // Then use it
-               $useProxy = true;
-       } // END - if
-
        // Load include
        loadIncludeOnce('inc/classes/resolver.class.php');
 
@@ -338,7 +329,7 @@ function sendRawRequest ($host, $request) {
        $resolver = new HostnameResolver();
 
        // Open connection
-       if ($useProxy === true) {
+       if (isProxyUsed() === true) {
                // Resolve hostname into IP address
                $ip = $resolver->resolveHostname(compileRawCode(getProxyHost()));
 
@@ -351,6 +342,7 @@ function sendRawRequest ($host, $request) {
                // Connect to host directly
                $fp = fsockopen($ip, $port, $errno, $errdesc, 30);
        }
+       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ip=' . $ip . ',host=' . $host . ',isProxyUsed()=' . intval(isProxyUsed()));
 
        // Is there a link?
        if (!is_resource($fp)) {
@@ -364,7 +356,7 @@ function sendRawRequest ($host, $request) {
        }
 
        // Do we use proxy?
-       if ($useProxy === true) {
+       if (isProxyUsed() === true) {
                // Setup proxy tunnel
                $response = setupProxyTunnel($host, $port, $fp);
 
@@ -452,7 +444,7 @@ function sendRawRequest ($host, $request) {
                // No response, maybe timeout
                $response = array('', '', '');
                logDebugMessage(__FUNCTION__, __LINE__, 'Invalid empty response array, maybe timed out?');
-       } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && ($useProxy === true)) {
+       } elseif ((substr(strtolower($response[0]), 0, 11) == 'proxy-agent') && (isProxyUsed() === true)) {
                // Proxy header detected, so remove two lines
                array_shift($response);
                array_shift($response);

diff --git a/inc/libs/yoomedia_functions.php b/inc/libs/yoomedia_functions.php
index f515b525ccfa43ed8d137be0ea36c6e2f17475d9..8b317b64069750e718bede1c96c8026d3de7c1b4 100644 (file)
--- a/inc/libs/yoomedia_functions.php
+++ b/inc/libs/yoomedia_functions.php
@@ -394,6 +394,7 @@ function YOOMEDIA_GET_ERRORCODE_FROM_RESULT ($response) {
                $code = bigintval($codeArray[0]);
        } elseif (!empty($response[0])) {
                // Merge response together
+               die('response=<pre>'.print_r($response,true).'</pre>');
                $parts = explode('|', implode('', $response));
 
                // If we have only one part, we got an error

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ebb1aeb4362d4d86cdc568df5b88d6e792d0edc7..2b879de773f2d4efce72164d78e206ed41886951 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -1494,8 +1494,8 @@ function generateCategoryOptionsList ($mode) {
 
        // Initialize array...
        $CATS = array(
-               'id'   => array(),
-               'name' => array(),
+               'id'      => array(),
+               'name'    => array(),
                'userids' => array()
        );
 

diff --git a/templates/de/html/admin/admin_add_config_network_type_form.tpl b/templates/de/html/admin/admin_add_config_network_type_form.tpl
index 0cb2bb926c06c56a76320badd20731c37937c6a2..44d54dd60926733fe034f20d7099fa299526f84d 100644 (file)
--- a/templates/de/html/admin/admin_add_config_network_type_form.tpl
+++ b/templates/de/html/admin/admin_add_config_network_type_form.tpl
@@ -14,8 +14,8 @@
                {%template,YesNoSelectionBox=set_all%}
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
-               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({--TIME_UNIT--})<br />
-               $content[network_max_reload_time] ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})
+               {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MAX_RELOAD_TIME--} ({%pipe,translateTimeUnit=$content[network_type_reload_time_unit]%})<br />
+               $content[network_max_reload_time]
        </div>
        <div class="bottom" style="padding-top:3px;padding-bottom:3px">
                {--ADMIN_CONFIG_NETWORK_HANDLER_TYPE_MIN_WAITING_TIME--}<br />