From 6de36357d5ad2ef5ff14094f180894492420c9bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 7 May 2008 14:57:06 +0000 Subject: [PATCH] More renamed --- .gitattributes | 6 +++--- .../main/resolver/{local => web}/.htaccess | 0 .../class_WebCommandResolver.php} | 14 +++++++------- .../class_WebControllerResolver.php} | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) rename inc/classes/main/resolver/{local => web}/.htaccess (100%) rename inc/classes/main/resolver/{local/class_LocalCommandResolver.php => web/class_WebCommandResolver.php} (93%) rename inc/classes/main/resolver/{local/class_LocalControllerResolver.php => web/class_WebControllerResolver.php} (90%) diff --git a/.gitattributes b/.gitattributes index f0c126e..6b382e1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -285,9 +285,9 @@ inc/classes/main/request/.htaccess -text inc/classes/main/request/class_HttpRequest.php -text inc/classes/main/resolver/.htaccess -text inc/classes/main/resolver/class_BaseResolver.php -text -inc/classes/main/resolver/local/.htaccess -text -inc/classes/main/resolver/local/class_LocalCommandResolver.php -text -inc/classes/main/resolver/local/class_LocalControllerResolver.php -text +inc/classes/main/resolver/web/.htaccess -text +inc/classes/main/resolver/web/class_WebCommandResolver.php -text +inc/classes/main/resolver/web/class_WebControllerResolver.php -text inc/classes/main/response/.htaccess -text inc/classes/main/response/class_HttpResponse.php -text inc/classes/main/template/.htaccess -text diff --git a/inc/classes/main/resolver/local/.htaccess b/inc/classes/main/resolver/web/.htaccess similarity index 100% rename from inc/classes/main/resolver/local/.htaccess rename to inc/classes/main/resolver/web/.htaccess diff --git a/inc/classes/main/resolver/local/class_LocalCommandResolver.php b/inc/classes/main/resolver/web/class_WebCommandResolver.php similarity index 93% rename from inc/classes/main/resolver/local/class_LocalCommandResolver.php rename to inc/classes/main/resolver/web/class_WebCommandResolver.php index 87e0d69..30b31b5 100644 --- a/inc/classes/main/resolver/local/class_LocalCommandResolver.php +++ b/inc/classes/main/resolver/web/class_WebCommandResolver.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class LocalCommandResolver extends BaseResolver implements CommandResolver { +class WebCommandResolver extends BaseResolver implements CommandResolver { /** * Last successfull resolved command */ @@ -46,12 +46,12 @@ class LocalCommandResolver extends BaseResolver implements CommandResolver { $this->removeNumberFormaters(); $this->removeSystemArray(); - // Set prefix to "Local" - $this->setCommandPrefix("Local"); + // Set prefix to "Web" + $this->setCommandPrefix("Web"); } /** - * Creates an instance of a local command resolver with a given default command + * Creates an instance of a Web command resolver with a given default command * * @param $defaultCommand The default command we shall execute * @param $appInstance An instance of a manageable application helper class @@ -59,9 +59,9 @@ class LocalCommandResolver extends BaseResolver implements CommandResolver { * @throws EmptyVariableException Thrown if the default command is not set * @throws InvalidCommandException Thrown if the default command is invalid */ - public final static function createLocalCommandResolver ($defaultCommand, ManageableApplication $appInstance) { + public final static function createWebCommandResolver ($defaultCommand, ManageableApplication $appInstance) { // Create the new instance - $resolverInstance = new LocalCommandResolver(); + $resolverInstance = new WebCommandResolver(); // Is the variable $defaultCommand set and the command is valid? if (empty($defaultCommand)) { @@ -144,7 +144,7 @@ class LocalCommandResolver extends BaseResolver implements CommandResolver { $commandInstance = null; // Create command class name - $class = sprintf("Local%sCommand", + $class = sprintf("Web%sCommand", ucfirst(strtolower($commandName)) ); diff --git a/inc/classes/main/resolver/local/class_LocalControllerResolver.php b/inc/classes/main/resolver/web/class_WebControllerResolver.php similarity index 90% rename from inc/classes/main/resolver/local/class_LocalControllerResolver.php rename to inc/classes/main/resolver/web/class_WebControllerResolver.php index 9c94209..c3bebd5 100644 --- a/inc/classes/main/resolver/local/class_LocalControllerResolver.php +++ b/inc/classes/main/resolver/web/class_WebControllerResolver.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class LocalControllerResolver extends BaseResolver implements ControllerResolver { +class WebControllerResolver extends BaseResolver implements ControllerResolver { /** * Last successfull resolved controller */ @@ -46,8 +46,8 @@ class LocalControllerResolver extends BaseResolver implements ControllerResolver $this->removeNumberFormaters(); $this->removeSystemArray(); - // Set prefix to "Local" - $this->setCommandPrefix("Local"); + // Set prefix to "Web" + $this->setCommandPrefix("Web"); } /** @@ -59,9 +59,9 @@ class LocalControllerResolver extends BaseResolver implements ControllerResolver * @throws EmptyVariableException Thrown if the default command is not set * @throws InvalidCommandException Thrown if the default command is invalid */ - public final static function createLocalControllerResolver ($commandName, ManageableApplication $appInstance) { + public final static function createWebControllerResolver ($commandName, ManageableApplication $appInstance) { // Create the new instance - $resolverInstance = new LocalControllerResolver(); + $resolverInstance = new WebControllerResolver(); // Is the variable $commandName set and the command is valid? if (empty($commandName)) { @@ -140,17 +140,17 @@ class LocalControllerResolver extends BaseResolver implements ControllerResolver $controllerInstance = null; // Default controller - $class = "LocalDefaultController"; + $class = "WebDefaultController"; // Generate the class name if ($commandName != $defaultCommand) { // Create controller class name - $class = sprintf("Local%sController", + $class = sprintf("Web%sController", ucfirst(strtolower($commandName)) ); } elseif ($this->getConfigInstance()->readConfig("home_with_news") == "Y") { // Yes, display news in home then set default controller with news - $class = "LocalDefaultNewsController"; + $class = "WebDefaultNewsController"; } // Is this class loaded? @@ -166,7 +166,7 @@ class LocalControllerResolver extends BaseResolver implements ControllerResolver } // Initiate the controller - $eval = sprintf("\$controllerInstance = %s::create%s(LocalCommandResolver::createLocalCommandResolver(\$commandName, \$this->getApplicationInstance()));", + $eval = sprintf("\$controllerInstance = %s::create%s(WebCommandResolver::createWebCommandResolver(\$commandName, \$this->getApplicationInstance()));", $class, $class ); -- 2.39.5