Some minor improvements:

[core.git] / inc / classes / main / console / class_ConsoleTools.php

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index ab7df3daa4a41fc3d65893f60254140601ce916f..825f5fa9cfd440331236268808ae1447b6df5c90 100644 (file)
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -153,12 +153,12 @@ class ConsoleTools extends BaseFrameworkSystem {
 
                // First get a socket
                // @TODO Add some DNS caching here
-               $socket = fsockopen('188.138.90.169', 80, $errorNo, $errorStr, 5);
+               $socketResource = fsockopen('188.138.90.169', 80, $errorNo, $errorStr, 5);
 
                // Check if there was an error else
                if ($errorNo > 0) {
                        // Then throw again
-                       throw new InvalidSocketException(array($helperInstance, gettype($socket), $errorNo, $errorStr), BaseListener::EXCEPTION_INVALID_SOCKET);
+                       throw new InvalidSocketException(array($helperInstance, gettype($socketResource), $errorNo, $errorStr), BaseListener::EXCEPTION_INVALID_SOCKET);
                } // END - if
 
                // Prepare the GET request
@@ -169,18 +169,18 @@ class ConsoleTools extends BaseFrameworkSystem {
                $request .= self::HTTP_EOL;
 
                // Send it to the socket
-               fwrite($socket, $request);
+               fwrite($socketResource, $request);
 
                // Init IP (this will always be the last line)
                $externalAddress = 'invalid';
 
                // And read the reply
-               while (!feof($socket)) {
-                       $externalAddress = fgets($socket, 128);
+               while (!feof($socketResource)) {
+                       $externalAddress = fgets($socketResource, 128);
                } // END - while
 
                // Close socket
-               fclose($socket);
+               fclose($socketResource);
 
                // Return determined external IP
                return $externalAddress;