*
* @author Roland Haeder <webmaster@shipsimu.org>
* @version 0.0.0
- * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2014 Core Developer Team
* @license GNU GPL 3.0 or any newer version
* @link http://www.shipsimu.org
*
// Add last new-line
$proxyTunnel .= self::HTTP_EOL;
- //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __LINE__ . ']: proxyTunnel=' . $proxyTunnel);
+ //* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __METHOD__ . ':' . __LINE__ . ']: proxyTunnel=' . $proxyTunnel);
// Write request
fwrite($socketResource, $proxyTunnel);
try {
// Get a file pointer
- $io = FrameworkFileInputPointer::createFrameworkFileInputPointer($helperInstance->getConfigInstance()->getConfigEntry('hostname_file'));
+ $fileInstance = ObjectFactory::createObjectByConfiguredName('file_raw_input_class', array($helperInstance->getConfigInstance()->getConfigEntry('hostname_file')));
// Read the file
- $rawData = trim($io->readFromFile());
+ $rawData = trim($fileInstance->readFromFile());
// Close the file
- $io->closeFile();
+ $fileInstance->closeFile();
// Extract hostname from it
$hostname = $helperInstance->extractHostnameFromRawData($rawData);
/**
* Determines own remote IP address (e.g. can be used to probe if we are
- * reachable from outside by determining external IP and then connect to it.
+ * reachable from outside by determining external address and then connect to it.
* This is accomblished by connecting to the IP of www.shipsimu.org which
* should default to 188.138.90.169 and requesting /ip.php which does only
* return the content of $_SERVER['REMOTE_ADDR']. Of course, this method
* Compare to following link:
* http://de.php.net/manual/en/function.socket-create.php#49368
*
- * @return $externalAddress The determined external IP address
+ * @return $externalAddress The determined external address address
* @throws InvalidSocketException If socket initialization wents wrong or if an errors occurs
* @todo This should be moved out to an external class, e.g. HttpClient
* @todo Make IP, host name, port and script name configurable
*/
- public static function determineExternalIp () {
+ public static function determineExternalAddress () {
// Get helper instance
$helperInstance = new ConsoleTools();
// Debug message
- /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __LINE__ . ']: Resolved external address: ' . $externalAddress);
+ /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CONSOLE-TOOLS[' . __METHOD__ . ':' . __LINE__ . ']: Resolved external address: ' . $externalAddress);
- // Return determined external IP
+ // Return determined external address
return $externalAddress;
}