From a0ad44d3b74f2cf8e404f7bc24fa07d150cbd93a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Oct 2011 14:35:12 +0000 Subject: [PATCH] Added missing port in regex --- .../states/peer/class_PeerStateFactory.php | 2 +- application/hub/main/tools/class_HubTools.php | 2 +- docs/TODOs.txt | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/application/hub/main/factories/states/peer/class_PeerStateFactory.php b/application/hub/main/factories/states/peer/class_PeerStateFactory.php index 2837ae665..72989dc6c 100644 --- a/application/hub/main/factories/states/peer/class_PeerStateFactory.php +++ b/application/hub/main/factories/states/peer/class_PeerStateFactory.php @@ -95,7 +95,7 @@ class PeerStateFactory extends ObjectFactory { $tableInstance->registerPeerState($stateInstance, $packageData); } else { // It is a known peer, so we need to check if the state has changed - $tableInstance->debugBackTrace(__METHOD__ . ': Lookup!' . "\n"); + $tableInstance->debugBackTrace(__METHOD__ . ': Lookup!'); } // Debug message diff --git a/application/hub/main/tools/class_HubTools.php b/application/hub/main/tools/class_HubTools.php index 231078411..4c439ffe0 100644 --- a/application/hub/main/tools/class_HubTools.php +++ b/application/hub/main/tools/class_HubTools.php @@ -133,7 +133,7 @@ class HubTools extends BaseFrameworkSystem { // Found in cache! $recipient = $selfInstance->sessionIdCache[$sessionId]; - } elseif (preg_match('/([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}/', $sessionId)) { + } elseif (preg_match('/([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}:([0-9]{3,5})/', $sessionId)) { // Hostname:port found $hostnameArray = explode(':', $sessionId); diff --git a/docs/TODOs.txt b/docs/TODOs.txt index 34b9ca903..16c006c42 100644 --- a/docs/TODOs.txt +++ b/docs/TODOs.txt @@ -19,7 +19,8 @@ ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:108: * @todo Implement this method ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:138: * @todo 0% done ./application/hub/main/cruncher/mcrypt/class_HubMcryptCruncher.php:98: // @TODO Implement this method -./application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php:165: * @todo Unfinished area +./application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php:170: * @todo Unfinished area +./application/hub/main/database/wrapper/states/class_PeerStateLookupDatabaseWrapper.php:212: * @todo Unfinished area ./application/hub/main/discovery/socket/class_PackageSocketDiscovery.php:102: // @TODO We may need some logging here ./application/hub/main/factories/socket/class_SocketFactory.php:10: * @todo Find an interface for hub helper ./application/hub/main/filter/bootstrap/chat/class_ChatBootstrapGenericActivationFilter.php:54: * @todo Maybe we want to do somthing more here? @@ -122,7 +123,7 @@ ./application/hub/main/template/objects/class_XmlObjectRegistryTemplateEngine.php:324: * @todo Handle $objectCount ./application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php:10: * @todo This template engine does not make use of setTemplateType() ./application/hub/main/template/producer/test_units/class_XmlCruncherTestUnitTemplateEngine.php:433: * @todo Handle $keyCount -./application/hub/main/tools/class_HubTools.php:129: // @TODO We may want to encapsulate this PHP call into an own class +./application/hub/main/tools/class_HubTools.php:141: // @TODO We may want to encapsulate this PHP call into an own class ./application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php:105: * @todo Does a query needs to perform some actions as an active task? ./application/hub/main/visitor/tasks/class_ActiveTaskVisitor.php:116: * @todo Does a queue needs to perform some actions as an active task? ./application/hub/main/visitor/tasks/class_ShutdownTaskVisitor.php:100: * @todo Does a query needs to perform some actions as an active task? @@ -138,7 +139,8 @@ ./inc/classes/main/commands/web/class_WebProblemCommand.php:58: * @todo 0% done ./inc/classes/main/commands/web/class_WebStatusCommand.php:58: * @todo 0% done ./inc/classes/main/console/class_ConsoleTools.php:147: * @todo This should be moved out to an external class, e.g. HttpClient -./inc/classes/main/console/class_ConsoleTools.php:154: // @TODO Add some DNS caching here +./inc/classes/main/console/class_ConsoleTools.php:148: * @todo Make IP, host name, port and script name configurable +./inc/classes/main/console/class_ConsoleTools.php:155: // @TODO Add some DNS caching here ./inc/classes/main/console/class_ConsoleTools.php:45: * @todo We should connect this to a caching class to cache DNS requests ./inc/classes/main/console/class_ConsoleTools.php:58: // @TODO Here should the cacher be implemented ./inc/classes/main/controller/console/class_ConsoleDefaultController.php:10: * @todo This controller shall still provide some headlines for sidebars @@ -151,8 +153,8 @@ ./inc/classes/main/controller/web/class_WebProblemController.php:40: * @todo Add some filters to this controller ./inc/classes/main/controller/web/class_WebRegisterController.php:40: * @todo Add some filters to this controller ./inc/classes/main/controller/web/class_WebStatusController.php:10: * @todo This controller shall still provide some headlines for sidebars -./inc/classes/main/criteria/search/class_SearchCriteria.php:126: * @todo Find a nice casting here. (int) allows until and including 32766. -./inc/classes/main/criteria/search/class_SearchCriteria.php:94: * @todo Find a nice casting here. (int) allows until and including 32766. +./inc/classes/main/criteria/search/class_SearchCriteria.php:102: * @todo Find a nice casting here. (int) allows until and including 32766. +./inc/classes/main/criteria/search/class_SearchCriteria.php:70: * @todo Find a nice casting here. (int) allows until and including 32766. ./inc/classes/main/database/databases/class_LocalFileDatabase.php:331: * @todo Do some checks on the database directory and files here ./inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php:426: * @todo Find something useful with this! ./inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php:82: * @todo 0% done @@ -196,8 +198,8 @@ ./inc/classes/main/response/image/class_ImageResponse.php:89: * @todo Why are these parameters conflicting? ./inc/classes/main/response/image/class_ImageResponse.php:90: * @todo If the return statement is removed and setcookie() commented out, ./inc/classes/main/response/image/class_ImageResponse.php:91: * @todo this will send only one cookie out, the first one. -./inc/classes/main/result/class_DatabaseResult.php:226: * @todo 0% done -./inc/classes/main/result/class_DatabaseResult.php:379:4 * @todo Find a caching way without modifying the result array +./inc/classes/main/result/class_DatabaseResult.php:229: * @todo 0% done +./inc/classes/main/result/class_DatabaseResult.php:382:4 * @todo Find a caching way without modifying the result array ./inc/classes/main/rng/class_RandomNumberGenerator.php:161: * @todo I had a better random number generator here but now it is somewhere lost :( ./inc/classes/main/rng/class_RandomNumberGenerator.php:83: * @todo Add site key for stronger salt! ./inc/classes/main/template/class_BaseTemplateEngine.php:1055: // @TODO This silent abort should be logged, maybe. @@ -231,7 +233,7 @@ ./inc/loader/class_ClassLoader.php:264: /* @todo: Do not die here. */ ./inc/output.php:11: * @todo We should minimize these includes ./inc/selector.php:11: * @todo We should minimize these includes -./index.php:59: * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper +./index.php:57: * @todo This method is old code and needs heavy rewrite and should be moved to ApplicationHelper ### ### DEPRECATION FOLLOWS: ### ### ./application/hub/interfaces/messages/class_MessageHelper.php:2:// @DEPRECATED ./application/hub/main/database/wrapper/class_NodeInformationDatabaseWrapper.php:2:// @DEPRECATED -- 2.39.5