From 8cc2353ea200d5e91ea7922db9b5dfead64b9638 Mon Sep 17 00:00:00 2001 From: Christopher Lewis Date: Tue, 17 Jun 2014 14:21:16 -0400 Subject: [PATCH] added app name prefixes to controllers --- README.md | 2 +- apps/admin/AdminController.php | 2 -- ...ontroller.php => AdminGroupController.php} | 5 ++-- ...Controller.php => AdminHomeController.php} | 6 ++-- ...ontroller.php => AdminLoginController.php} | 6 ++-- ...Controller.php => AdminUserController.php} | 6 ++-- apps/api/ApiController.php | 23 +++++++++++++++ .../ApiRouterController.php} | 9 ++++-- apps/error/ErrorController.php | 0 .../ErrorHttpController.php} | 6 ++-- .../modules/{error => http}/views/404.php | 0 apps/frontend/FrontendController.php | 12 ++++---- .../landing/FrontendLandingController.php | 28 +++++++++++++++++++ .../modules/landing/LandingController.php | 23 --------------- classes/core/base/BaseDinkly.php | 2 +- classes/core/base/BaseDinklyBuilder.php | 6 ++-- 16 files changed, 79 insertions(+), 57 deletions(-) rename apps/admin/modules/group/{GroupController.php => AdminGroupController.php} (98%) rename apps/admin/modules/home/{HomeController.php => AdminHomeController.php} (85%) rename apps/admin/modules/login/{LoginController.php => AdminLoginController.php} (92%) rename apps/admin/modules/user/{UserController.php => AdminUserController.php} (98%) create mode 100644 apps/api/ApiController.php rename apps/api/modules/{api/ApiController.php => router/ApiRouterController.php} (92%) create mode 100644 apps/error/ErrorController.php rename apps/error/modules/{error/ErrorController.php => http/ErrorHttpController.php} (92%) rename apps/error/modules/{error => http}/views/404.php (100%) create mode 100644 apps/frontend/modules/landing/FrontendLandingController.php delete mode 100644 apps/frontend/modules/landing/LandingController.php diff --git a/README.md b/README.md index e02c0193..be14952c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Dinkly v2.04 +Dinkly v2.05 ============ The biggest little PHP framework diff --git a/apps/admin/AdminController.php b/apps/admin/AdminController.php index 89081ca8..f4cc6501 100644 --- a/apps/admin/AdminController.php +++ b/apps/admin/AdminController.php @@ -2,8 +2,6 @@ /** * AdminController * - * - * * @package Dinkly * @subpackage AppsAdminController * @author Christopher Lewis diff --git a/apps/admin/modules/group/GroupController.php b/apps/admin/modules/group/AdminGroupController.php similarity index 98% rename from apps/admin/modules/group/GroupController.php rename to apps/admin/modules/group/AdminGroupController.php index f695b116..6e6d92e3 100644 --- a/apps/admin/modules/group/GroupController.php +++ b/apps/admin/modules/group/AdminGroupController.php @@ -1,14 +1,13 @@ */ -class GroupController extends AdminController +class AdminGroupController extends AdminController { protected $group; diff --git a/apps/admin/modules/home/HomeController.php b/apps/admin/modules/home/AdminHomeController.php similarity index 85% rename from apps/admin/modules/home/HomeController.php rename to apps/admin/modules/home/AdminHomeController.php index e2839ad4..1f075ec9 100644 --- a/apps/admin/modules/home/HomeController.php +++ b/apps/admin/modules/home/AdminHomeController.php @@ -1,14 +1,12 @@ */ -class HomeController extends AdminController +class AdminHomeController extends AdminController { public function __construct() { diff --git a/apps/admin/modules/login/LoginController.php b/apps/admin/modules/login/AdminLoginController.php similarity index 92% rename from apps/admin/modules/login/LoginController.php rename to apps/admin/modules/login/AdminLoginController.php index 46437727..e1a70899 100644 --- a/apps/admin/modules/login/LoginController.php +++ b/apps/admin/modules/login/AdminLoginController.php @@ -1,14 +1,12 @@ */ -class LoginController extends AdminController +class AdminLoginController extends AdminController { public function __construct() { diff --git a/apps/admin/modules/user/UserController.php b/apps/admin/modules/user/AdminUserController.php similarity index 98% rename from apps/admin/modules/user/UserController.php rename to apps/admin/modules/user/AdminUserController.php index 660e0a2e..1d31c782 100644 --- a/apps/admin/modules/user/UserController.php +++ b/apps/admin/modules/user/AdminUserController.php @@ -1,14 +1,12 @@ */ -class UserController extends AdminController +class AdminUserController extends AdminController { protected $user; diff --git a/apps/api/ApiController.php b/apps/api/ApiController.php new file mode 100644 index 00000000..bfa5307d --- /dev/null +++ b/apps/api/ApiController.php @@ -0,0 +1,23 @@ + + */ + +class ApiController extends Dinkly +{ + /** + * Default Constructor + * + * @return bool: always returns true on successful construction of view + * + */ + public function __construct() + { + return true; + } +} diff --git a/apps/api/modules/api/ApiController.php b/apps/api/modules/router/ApiRouterController.php similarity index 92% rename from apps/api/modules/api/ApiController.php rename to apps/api/modules/router/ApiRouterController.php index ad0d304e..d1604274 100644 --- a/apps/api/modules/api/ApiController.php +++ b/apps/api/modules/router/ApiRouterController.php @@ -1,6 +1,6 @@ */ -class ApiController extends Dinkly +class ApiRouterController extends Dinkly { + public function __construct() + { + parent::__construct(); + } + /** * Handle any errors that occur internally with Server Side Data * diff --git a/apps/error/ErrorController.php b/apps/error/ErrorController.php new file mode 100644 index 00000000..e69de29b diff --git a/apps/error/modules/error/ErrorController.php b/apps/error/modules/http/ErrorHttpController.php similarity index 92% rename from apps/error/modules/error/ErrorController.php rename to apps/error/modules/http/ErrorHttpController.php index 98a46142..b4005469 100644 --- a/apps/error/modules/error/ErrorController.php +++ b/apps/error/modules/http/ErrorHttpController.php @@ -1,14 +1,12 @@ */ -class ErrorController extends Dinkly +class ErrorHttpController extends Dinkly { /** * Handle any URL errors when page is not found diff --git a/apps/error/modules/error/views/404.php b/apps/error/modules/http/views/404.php similarity index 100% rename from apps/error/modules/error/views/404.php rename to apps/error/modules/http/views/404.php diff --git a/apps/frontend/FrontendController.php b/apps/frontend/FrontendController.php index 45ef3721..beab9724 100644 --- a/apps/frontend/FrontendController.php +++ b/apps/frontend/FrontendController.php @@ -10,12 +10,12 @@ class FrontendController extends Dinkly { -/** - * Default Constructor - * - * @return bool: always returns true on successful construction of view - * - */ + /** + * Default Constructor + * + * @return bool: always returns true on successful construction of view + * + */ public function __construct() { return true; diff --git a/apps/frontend/modules/landing/FrontendLandingController.php b/apps/frontend/modules/landing/FrontendLandingController.php new file mode 100644 index 00000000..c6538e3e --- /dev/null +++ b/apps/frontend/modules/landing/FrontendLandingController.php @@ -0,0 +1,28 @@ + + */ + +class FrontendLandingController extends FrontendController +{ + public function __construct() + { + parent::__construct(); + } + + /** + * Load default view + * + * @return bool: always returns true on successful construction of view + * + */ + public function loadDefault() + { + return true; + } +} diff --git a/apps/frontend/modules/landing/LandingController.php b/apps/frontend/modules/landing/LandingController.php deleted file mode 100644 index f65a89b6..00000000 --- a/apps/frontend/modules/landing/LandingController.php +++ /dev/null @@ -1,23 +0,0 @@ - - */ - -class LandingController extends FrontendController -{ -/** - * Load default view - * - * @return bool: always returns true on successful construction of view - * - */ - public function loadDefault() - { - return true; - } -} diff --git a/classes/core/base/BaseDinkly.php b/classes/core/base/BaseDinkly.php index 971cbd26..950869a6 100644 --- a/classes/core/base/BaseDinkly.php +++ b/classes/core/base/BaseDinkly.php @@ -269,7 +269,7 @@ public function loadModule($app_name, $module_name = null, $view_name = 'default } //Get module controller - $camel_module_name = self::convertToCamelCase($module_name, true) . "Controller"; + $camel_module_name = self::convertToCamelCase($app_name, true) . self::convertToCamelCase($module_name, true) . "Controller"; $controller_file = $_SERVER['APPLICATION_ROOT'] . '/apps/' . $app_name . '/modules/' . $module_name . '/' . $camel_module_name . '.php'; //Save these on the object so they can be retrieved as needed in controllers or views diff --git a/classes/core/base/BaseDinklyBuilder.php b/classes/core/base/BaseDinklyBuilder.php index 5366a86d..a2ba211e 100644 --- a/classes/core/base/BaseDinklyBuilder.php +++ b/classes/core/base/BaseDinklyBuilder.php @@ -287,17 +287,17 @@ public static function buildModule($app_name, $module_name) $fp = fopen($module_folder . "/views/default.php", 'w+'); fclose($fp); - $fp = fopen($module_folder . "/" . Dinkly::convertToCamelCase($module_name, true) . "Controller.php", 'w+'); + $fp = fopen($module_folder . "/" . Dinkly::convertToCamelCase($app_name, true) . Dinkly::convertToCamelCase($module_name, true) . "Controller.php", 'w+'); fwrite($fp, ''.PHP_EOL . ' */' . PHP_EOL . PHP_EOL); - fwrite($fp, 'class ' . Dinkly::convertToCamelCase($module_name, true) . 'Controller extends ' . Dinkly::convertToCamelCase($app_name, true) . "Controller" . PHP_EOL . '{' . PHP_EOL); + fwrite($fp, 'class ' . Dinkly::convertToCamelCase($app_name, true) . Dinkly::convertToCamelCase($module_name, true) . 'Controller extends ' . Dinkly::convertToCamelCase($app_name, true) . "Controller" . PHP_EOL . '{' . PHP_EOL); fwrite($fp,"\t/**".PHP_EOL . "\t * Constructor".PHP_EOL . "\t *".PHP_EOL .