From 906bec446fb3a7368c15710912e38b8a9ed09473 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Thu, 4 Jun 2015 15:46:30 -0400 Subject: [PATCH] More simplification --- app/classes/controller.php | 37 -------- app/classes/index.html | 0 .../meta => }/controllers/category.php | 2 +- app/{modules/meta => }/controllers/genre.php | 26 +++--- .../meta => }/controllers/section.php | 2 +- app/{modules/meta => }/models/data_model.php | 0 .../meta => }/views/category_detail.php | 0 app/{modules/meta => }/views/edit_form.php | 0 app/{modules/meta => }/views/genre_detail.php | 0 app/{modules/meta => }/views/genres.php | 0 app/views/header.php | 1 + app/{modules/meta => }/views/outline.php | 0 .../meta => }/views/section_detail.php | 1 - composer.json | 4 +- index.php | 9 +- sys/common.php | 84 +------------------ sys/core/Controller.php | 12 ++- sys/core/Page.php | 15 +--- sys/db | 1 - 19 files changed, 39 insertions(+), 155 deletions(-) delete mode 100755 app/classes/controller.php delete mode 100644 app/classes/index.html rename app/{modules/meta => }/controllers/category.php (97%) rename app/{modules/meta => }/controllers/genre.php (97%) rename app/{modules/meta => }/controllers/section.php (97%) rename app/{modules/meta => }/models/data_model.php (100%) rename app/{modules/meta => }/views/category_detail.php (100%) rename app/{modules/meta => }/views/edit_form.php (100%) rename app/{modules/meta => }/views/genre_detail.php (100%) rename app/{modules/meta => }/views/genres.php (100%) rename app/{modules/meta => }/views/outline.php (100%) rename app/{modules/meta => }/views/section_detail.php (96%) delete mode 120000 sys/db diff --git a/app/classes/controller.php b/app/classes/controller.php deleted file mode 100755 index 7a699c4..0000000 --- a/app/classes/controller.php +++ /dev/null @@ -1,37 +0,0 @@ -load_model('meta\data_model'); - $db = \miniMVC\db::get_instance(); - - $this->page->queries =& $db->queries; - } - -} diff --git a/app/classes/index.html b/app/classes/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/app/modules/meta/controllers/category.php b/app/controllers/category.php similarity index 97% rename from app/modules/meta/controllers/category.php rename to app/controllers/category.php index 27b2052..7d53944 100755 --- a/app/modules/meta/controllers/category.php +++ b/app/controllers/category.php @@ -18,7 +18,7 @@ * * @package meta */ -class category extends meta\controller { +class category extends \miniMVC\Controller { /** * Initialize the Controller diff --git a/app/modules/meta/controllers/genre.php b/app/controllers/genre.php similarity index 97% rename from app/modules/meta/controllers/genre.php rename to app/controllers/genre.php index 1837d54..7d0bc1a 100755 --- a/app/modules/meta/controllers/genre.php +++ b/app/controllers/genre.php @@ -18,7 +18,7 @@ * * @package meta */ -class genre extends meta\controller { +class genre extends \miniMVC\Controller { /** * Default controller method @@ -32,7 +32,7 @@ class genre extends meta\controller { return; } - + // -------------------------------------------------------------------------- /** @@ -58,7 +58,7 @@ class genre extends meta\controller { // Render the basic page $this->index(); } - + // -------------------------------------------------------------------------- /** @@ -74,7 +74,7 @@ class genre extends meta\controller { // is a valid integer $id = (int) miniMVC\get_last_segment(); } - + $genre = $this->data_model->get_genre_by_id($id); $categories = $this->data_model->get_categories($id); @@ -86,7 +86,7 @@ class genre extends meta\controller { $this->render('genre_detail', $data); } - + // -------------------------------------------------------------------------- /** @@ -112,7 +112,7 @@ class genre extends meta\controller { $this->detail($id); } - + // -------------------------------------------------------------------------- /** @@ -144,10 +144,10 @@ class genre extends meta\controller { public function delete() { $type = strip_tags($_POST['type']); - + $valid_types = ['genre', 'category', 'section', 'data']; - - $res = (in_array($type, $valid_types)) + + $res = (in_array($type, $valid_types)) ? $this->data_model->delete($type, (int) $_POST['id']) : 0; @@ -184,7 +184,7 @@ class genre extends meta\controller { $type = strip_tags($_POST['type']); $name = strip_tags($_POST['name']); $val = (isset($_POST['val'])) ? $_POST['val'] : NULL; - + if ($this->data_model->is_valid_type($type)) { if ($type != 'data') @@ -195,12 +195,12 @@ class genre extends meta\controller { { $res = $this->data_model->update_data($id, $name, $val); } - + $res = (int) $res; - + exit(mb_trim($res)); } - + exit(0); } } diff --git a/app/modules/meta/controllers/section.php b/app/controllers/section.php similarity index 97% rename from app/modules/meta/controllers/section.php rename to app/controllers/section.php index 1c33efb..e6537ee 100755 --- a/app/modules/meta/controllers/section.php +++ b/app/controllers/section.php @@ -18,7 +18,7 @@ * * @package meta */ -class section extends meta\controller { +class section extends \miniMVC\Controller { /** * Constructor diff --git a/app/modules/meta/models/data_model.php b/app/models/data_model.php similarity index 100% rename from app/modules/meta/models/data_model.php rename to app/models/data_model.php diff --git a/app/modules/meta/views/category_detail.php b/app/views/category_detail.php similarity index 100% rename from app/modules/meta/views/category_detail.php rename to app/views/category_detail.php diff --git a/app/modules/meta/views/edit_form.php b/app/views/edit_form.php similarity index 100% rename from app/modules/meta/views/edit_form.php rename to app/views/edit_form.php diff --git a/app/modules/meta/views/genre_detail.php b/app/views/genre_detail.php similarity index 100% rename from app/modules/meta/views/genre_detail.php rename to app/views/genre_detail.php diff --git a/app/modules/meta/views/genres.php b/app/views/genres.php similarity index 100% rename from app/modules/meta/views/genres.php rename to app/views/genres.php diff --git a/app/views/header.php b/app/views/header.php index 8e685b1..85b8ad7 100755 --- a/app/views/header.php +++ b/app/views/header.php @@ -7,6 +7,7 @@ + > diff --git a/app/modules/meta/views/outline.php b/app/views/outline.php similarity index 100% rename from app/modules/meta/views/outline.php rename to app/views/outline.php diff --git a/app/modules/meta/views/section_detail.php b/app/views/section_detail.php similarity index 96% rename from app/modules/meta/views/section_detail.php rename to app/views/section_detail.php index edb1885..197a6d8 100755 --- a/app/modules/meta/views/section_detail.php +++ b/app/views/section_detail.php @@ -4,7 +4,6 @@ >

-
" method="post" onsubmit="window.edit_wysiwyg.toggle()">
Add Data diff --git a/composer.json b/composer.json index 0e0233d..b17cee6 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,7 @@ { "require": { - "aura/router": "2.0.*@dev" + "filp/whoops": "1.1.*", + "aura/router": "2.2.*", + "aviat4ion/query": "2.0.*" } } \ No newline at end of file diff --git a/index.php b/index.php index 42cb180..fc1f9ba 100755 --- a/index.php +++ b/index.php @@ -24,13 +24,15 @@ namespace miniMVC; +use \Whoops\Handler\PrettyPageHandler; +use \Whoops\Handler\JsonResponseHandler; + error_reporting(-1); // Set the default paths define('MM_BASE_PATH', __DIR__); define('MM_SYS_PATH', __DIR__.'/sys/'); define('MM_APP_PATH', __DIR__.'/app/'); -define('MM_MOD_PATH', MM_APP_PATH.'modules/'); // Autoload vendors require(MM_BASE_PATH . '/vendor/autoload.php'); @@ -44,6 +46,11 @@ require(MM_SYS_PATH . 'common.php'); // Start the autoloader spl_autoload_register('miniMVC\autoload'); +// Setup error handling +$whoops = new \Whoops\Run(); +$defaultHandler = new PrettyPageHandler(); +$whoops->pushHandler($defaultHandler); + // And away we go! init(); diff --git a/sys/common.php b/sys/common.php index 97b6598..2c58caa 100755 --- a/sys/common.php +++ b/sys/common.php @@ -61,77 +61,7 @@ function autoload($name) } // -------------------------------------------------------------------------- -// ! Error handling / messages -// -------------------------------------------------------------------------- - -/** - * Function to run on script shutdown - * -used to catch most fatal errors, and - * display them cleanly - * - * @return void - */ -function shutdown() -{ - // Catch the last error - $error = error_get_last(); - - // types of errors that are fatal - $fatal = array(E_ERROR, E_PARSE, E_RECOVERABLE_ERROR); - - // Display pretty error page - if (in_array($error['type'], $fatal)) - { - $file = str_replace(MM_BASE_PATH, "", $error['file']); - - $err_msg = "

Fatal Error:

- {$error['message']}

- File: {$file}

- Line: {$error['line']}"; - - show_error($err_msg); - } -} - -// -------------------------------------------------------------------------- - -/** - * Custom error handler - * - * @param int $severity - * @param string $message - * @param string $filepath - * @param int $line - * @return ErrorException - */ -function on_error($severity, $message, $filepath, $line) -{ - throw new \ErrorException($message, 0, $severity, $filepath, $line); -} - -// -------------------------------------------------------------------------- - -/** - * Custom exception handlererror_get_last - * - * @param Exception $exception - * @return void - */ -function on_exception($exception) -{ - // This is passed to the error template - $message = $exception->getMessage(); - - // Contain the content for buffering - ob_start(); - - include(MM_APP_PATH . '/views/errors/error_php_exception.php'); - - $buffer = ob_get_contents(); - ob_end_clean(); - echo $buffer; -} - +// ! Messages // -------------------------------------------------------------------------- /** @@ -295,16 +225,6 @@ if ( ! function_exists('do_include')) */ function init() { - // Catch fatal errors, don't show them - if (function_exists('error_get_last')) - { - register_shutdown_function('miniMVC\shutdown'); - } - - //Set error handlers - set_error_handler('miniMVC\on_error'); - set_exception_handler('miniMVC\on_exception'); - // Load Database classes require_once(MM_SYS_PATH . 'db/autoload.php'); @@ -418,7 +338,7 @@ function route() */ function run($controller, $func, $args = array()) { - $path = MM_MOD_PATH . "meta/controllers/{$controller}.php"; + $path = MM_APP_PATH . "controllers/{$controller}.php"; if (is_file($path)) { diff --git a/sys/core/Controller.php b/sys/core/Controller.php index 1d77fcb..16e5874 100755 --- a/sys/core/Controller.php +++ b/sys/core/Controller.php @@ -42,6 +42,11 @@ class Controller { { $this->page = new Page(); } + + $this->load_model('meta\data_model'); + $db = \miniMVC\db::get_instance(); + + $this->page->queries =& $db->queries; } // -------------------------------------------------------------------------- @@ -59,8 +64,7 @@ class Controller { $file_name = end($segments); // The module is set via the router - $module = strtolower(MM_MOD); - $path = MM_MOD_PATH . "{$module}/models/{$file_name}.php"; + $path = MM_APP_PATH . "models/{$file_name}.php"; if (is_file($path)) { @@ -92,9 +96,9 @@ class Controller { { return $this->page->load_view($file, $data, $return); } - + // -------------------------------------------------------------------------- - + /** * Automate loading of header and footer * diff --git a/sys/core/Page.php b/sys/core/Page.php index a3eec42..8bea26d 100755 --- a/sys/core/Page.php +++ b/sys/core/Page.php @@ -137,7 +137,7 @@ class Page { { die(); } - + if ( ! empty($this->headers)) { // Set headers @@ -614,18 +614,7 @@ class Page { */ public function load_view($file, array $data=array(), $return=FALSE) { - $path = ""; - - // The module is set via the router - $module = strtolower(MM_MOD); - $path = MM_MOD_PATH . "{$module}/views/{$file}.php"; - - // If it's not a module, or doesn't exist in the module view folder - // look in the app view folder - if ( ! is_file($path)) - { - $path = MM_APP_PATH . "views/{$file}.php"; - } + $path = MM_APP_PATH . "views/{$file}.php"; // Contain the content for buffering ob_start(); diff --git a/sys/db b/sys/db deleted file mode 120000 index 945333d..0000000 --- a/sys/db +++ /dev/null @@ -1 +0,0 @@ -/var/www/htdocs/dev.timshomepage.net/github/Query/ \ No newline at end of file