From ff8281821f233703d7b741d990b8162fb8d1e82e Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Mar 2015 16:02:41 +0100 Subject: [PATCH] 'Web' is to generic, better use 'Html' as it is for HTML. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- inc/classes/main/controller/{web => html}/.htaccess | 0 .../main/controller/{web/class_ => html/class_Html} | 6 +++--- .../class_HtmlConfirmController.php} | 6 +++--- .../class_HtmlDefaultController.php} | 6 +++--- .../class_HtmlDefaultNewsController.php} | 6 +++--- .../class_HtmlLoginController.php} | 6 +++--- .../class_HtmlLoginFailedController.php} | 6 +++--- .../class_HtmlLogoutController.php} | 6 +++--- .../class_HtmlLogoutDoneController.php} | 7 +++---- .../class_HtmlProblemController.php} | 6 +++--- .../class_HtmlRegisterController.php} | 7 +++---- .../class_HtmlStatusController.php} | 6 +++--- 12 files changed, 33 insertions(+), 35 deletions(-) rename inc/classes/main/controller/{web => html}/.htaccess (100%) rename inc/classes/main/controller/{web/class_ => html/class_Html} (92%) rename inc/classes/main/controller/{web/class_WebConfirmController.php => html/class_HtmlConfirmController.php} (92%) rename inc/classes/main/controller/{web/class_WebDefaultController.php => html/class_HtmlDefaultController.php} (92%) rename inc/classes/main/controller/{web/class_WebDefaultNewsController.php => html/class_HtmlDefaultNewsController.php} (92%) rename inc/classes/main/controller/{web/class_WebLoginController.php => html/class_HtmlLoginController.php} (92%) rename inc/classes/main/controller/{web/class_WebLoginFailedController.php => html/class_HtmlLoginFailedController.php} (90%) rename inc/classes/main/controller/{web/class_WebLogoutController.php => html/class_HtmlLogoutController.php} (92%) rename inc/classes/main/controller/{web/class_WebLogoutDoneController.php => html/class_HtmlLogoutDoneController.php} (91%) rename inc/classes/main/controller/{web/class_WebProblemController.php => html/class_HtmlProblemController.php} (91%) rename inc/classes/main/controller/{web/class_WebRegisterController.php => html/class_HtmlRegisterController.php} (91%) rename inc/classes/main/controller/{web/class_WebStatusController.php => html/class_HtmlStatusController.php} (90%) diff --git a/inc/classes/main/controller/web/.htaccess b/inc/classes/main/controller/html/.htaccess similarity index 100% rename from inc/classes/main/controller/web/.htaccess rename to inc/classes/main/controller/html/.htaccess diff --git a/inc/classes/main/controller/web/class_ b/inc/classes/main/controller/html/class_Html similarity index 92% rename from inc/classes/main/controller/web/class_ rename to inc/classes/main/controller/html/class_Html index fb7ca372..6c1da014 100644 --- a/inc/classes/main/controller/web/class_ +++ b/inc/classes/main/controller/html/class_Html @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class Web???Controller extends BaseController implements Controller { +class Html???Controller extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class Web???Controller extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public final static function createWeb???Controller (CommandResolver $resolverInstance) { + public final static function createHtml???Controller (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new Web???Controller(); + $controllerInstance = new Html???Controller(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebConfirmController.php b/inc/classes/main/controller/html/class_HtmlConfirmController.php similarity index 92% rename from inc/classes/main/controller/web/class_WebConfirmController.php rename to inc/classes/main/controller/html/class_HtmlConfirmController.php index 9857bd84..b988de5a 100644 --- a/inc/classes/main/controller/web/class_WebConfirmController.php +++ b/inc/classes/main/controller/html/class_HtmlConfirmController.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 WebConfirmController extends BaseController implements Controller { +class HtmlConfirmController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebConfirmController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public static final function createWebConfirmController (CommandResolver $resolverInstance) { + public static final function createHtmlConfirmController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebConfirmController(); + $controllerInstance = new HtmlConfirmController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebDefaultController.php b/inc/classes/main/controller/html/class_HtmlDefaultController.php similarity index 92% rename from inc/classes/main/controller/web/class_WebDefaultController.php rename to inc/classes/main/controller/html/class_HtmlDefaultController.php index 2117aac7..f94a8c2d 100644 --- a/inc/classes/main/controller/web/class_WebDefaultController.php +++ b/inc/classes/main/controller/html/class_HtmlDefaultController.php @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebDefaultController extends BaseController implements Controller { +class HtmlDefaultController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebDefaultController extends BaseController implements Controller { * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebDefaultController (CommandResolver $resolverInstance) { + public static final function createHtmlDefaultController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebDefaultController(); + $controllerInstance = new HtmlDefaultController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebDefaultNewsController.php b/inc/classes/main/controller/html/class_HtmlDefaultNewsController.php similarity index 92% rename from inc/classes/main/controller/web/class_WebDefaultNewsController.php rename to inc/classes/main/controller/html/class_HtmlDefaultNewsController.php index e2f37ad3..8cf33168 100644 --- a/inc/classes/main/controller/web/class_WebDefaultNewsController.php +++ b/inc/classes/main/controller/html/class_HtmlDefaultNewsController.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 WebDefaultNewsController extends BaseController implements Controller { +class HtmlDefaultNewsController extends BaseController implements Controller { /** * Protected constructor * @@ -38,9 +38,9 @@ class WebDefaultNewsController extends BaseController implements Controller { * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebDefaultNewsController (CommandResolver $resolverInstance) { + public static final function createHtmlDefaultNewsController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebDefaultNewsController(); + $controllerInstance = new HtmlDefaultNewsController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebLoginController.php b/inc/classes/main/controller/html/class_HtmlLoginController.php similarity index 92% rename from inc/classes/main/controller/web/class_WebLoginController.php rename to inc/classes/main/controller/html/class_HtmlLoginController.php index 85739ff2..a9016878 100644 --- a/inc/classes/main/controller/web/class_WebLoginController.php +++ b/inc/classes/main/controller/html/class_HtmlLoginController.php @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebLoginController extends BaseController implements Controller { +class HtmlLoginController extends BaseController implements Controller { /** * Protected constructor * @@ -40,9 +40,9 @@ class WebLoginController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public static final function createWebLoginController (CommandResolver $resolverInstance) { + public static final function createHtmlLoginController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebLoginController(); + $controllerInstance = new HtmlLoginController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebLoginFailedController.php b/inc/classes/main/controller/html/class_HtmlLoginFailedController.php similarity index 90% rename from inc/classes/main/controller/web/class_WebLoginFailedController.php rename to inc/classes/main/controller/html/class_HtmlLoginFailedController.php index 7ac8b4c0..2061064f 100644 --- a/inc/classes/main/controller/web/class_WebLoginFailedController.php +++ b/inc/classes/main/controller/html/class_HtmlLoginFailedController.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 WebLoginFailedController extends BaseController implements Controller { +class HtmlLoginFailedController extends BaseController implements Controller { /** * Protected constructor * @@ -38,9 +38,9 @@ class WebLoginFailedController extends BaseController implements Controller { * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebLoginFailedController (CommandResolver $resolverInstance) { + public static final function createHtmlLoginFailedController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebLoginFailedController(); + $controllerInstance = new HtmlLoginFailedController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebLogoutController.php b/inc/classes/main/controller/html/class_HtmlLogoutController.php similarity index 92% rename from inc/classes/main/controller/web/class_WebLogoutController.php rename to inc/classes/main/controller/html/class_HtmlLogoutController.php index 52404a54..43edba06 100644 --- a/inc/classes/main/controller/web/class_WebLogoutController.php +++ b/inc/classes/main/controller/html/class_HtmlLogoutController.php @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebLogoutController extends BaseController implements Controller { +class HtmlLogoutController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebLogoutController extends BaseController implements Controller { * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebLogoutController (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebLogoutController(); + $controllerInstance = new HtmlLogoutController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebLogoutDoneController.php b/inc/classes/main/controller/html/class_HtmlLogoutDoneController.php similarity index 91% rename from inc/classes/main/controller/web/class_WebLogoutDoneController.php rename to inc/classes/main/controller/html/class_HtmlLogoutDoneController.php index e9fa748b..4762d925 100644 --- a/inc/classes/main/controller/web/class_WebLogoutDoneController.php +++ b/inc/classes/main/controller/html/class_HtmlLogoutDoneController.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 WebLogoutDoneController extends BaseController implements Controller { +class HtmlLogoutDoneController extends BaseController implements Controller { /** * Protected constructor * @@ -39,14 +39,13 @@ class WebLogoutDoneController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public static final function createWebLogoutDoneController (CommandResolver $resolverInstance) { + public static final function createHtmlLogoutDoneController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebLogoutDoneController(); + $controllerInstance = new HtmlLogoutDoneController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); - // Return the prepared instance return $controllerInstance; } diff --git a/inc/classes/main/controller/web/class_WebProblemController.php b/inc/classes/main/controller/html/class_HtmlProblemController.php similarity index 91% rename from inc/classes/main/controller/web/class_WebProblemController.php rename to inc/classes/main/controller/html/class_HtmlProblemController.php index b358215a..e3dc2ce2 100644 --- a/inc/classes/main/controller/web/class_WebProblemController.php +++ b/inc/classes/main/controller/html/class_HtmlProblemController.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 WebProblemController extends BaseController implements Controller { +class HtmlProblemController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebProblemController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public static final function createWebProblemController (CommandResolver $resolverInstance) { + public static final function createHtmlProblemController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebProblemController(); + $controllerInstance = new HtmlProblemController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); diff --git a/inc/classes/main/controller/web/class_WebRegisterController.php b/inc/classes/main/controller/html/class_HtmlRegisterController.php similarity index 91% rename from inc/classes/main/controller/web/class_WebRegisterController.php rename to inc/classes/main/controller/html/class_HtmlRegisterController.php index ffb66884..b4348f8f 100644 --- a/inc/classes/main/controller/web/class_WebRegisterController.php +++ b/inc/classes/main/controller/html/class_HtmlRegisterController.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 WebRegisterController extends BaseController implements Controller { +class HtmlRegisterController extends BaseController implements Controller { /** * Protected constructor * @@ -39,14 +39,13 @@ class WebRegisterController extends BaseController implements Controller { * @return $controllerInstance A prepared instance of this class * @todo Add some filters to this controller */ - public static final function createWebRegisterController (CommandResolver $resolverInstance) { + public static final function createHtmlRegisterController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebRegisterController(); + $controllerInstance = new HtmlRegisterController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); - // Return the prepared instance return $controllerInstance; } diff --git a/inc/classes/main/controller/web/class_WebStatusController.php b/inc/classes/main/controller/html/class_HtmlStatusController.php similarity index 90% rename from inc/classes/main/controller/web/class_WebStatusController.php rename to inc/classes/main/controller/html/class_HtmlStatusController.php index 2fb6b74e..f51e8355 100644 --- a/inc/classes/main/controller/web/class_WebStatusController.php +++ b/inc/classes/main/controller/html/class_HtmlStatusController.php @@ -22,7 +22,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class WebStatusController extends BaseController implements Controller { +class HtmlStatusController extends BaseController implements Controller { /** * Protected constructor * @@ -39,9 +39,9 @@ class WebStatusController extends BaseController implements Controller { * @param $resolverInstance An instance of a command resolver class * @return $controllerInstance A prepared instance of this class */ - public static final function createWebStatusController (CommandResolver $resolverInstance) { + public static final function createHtmlStatusController (CommandResolver $resolverInstance) { // Create the instance - $controllerInstance = new WebStatusController(); + $controllerInstance = new HtmlStatusController(); // Set the command resolver $controllerInstance->setResolverInstance($resolverInstance); -- 2.39.2