From b4438b5440664b182c7b70b1cae1449c4fbcd780 Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 8 Jan 2013 22:54:02 +0200 Subject: [PATCH] Core Improvements: Next Round #79 #80 --- admin/index.php | 1 - admin/themes/default/index.template.php | 2 +- libraries/Gelato/ClassLoader/ClassLoader.php | 26 ++++----- .../Gelato/ErrorHandler/ErrorHandler.php | 4 +- .../Resources/Views/Errors/exception.php | 7 +++ .../Resources/Views/Errors/production.php | 58 +++++++++---------- libraries/Gelato/Validation/Valid.php | 1 + plugins/box/backup/backup.plugin.php | 2 +- plugins/box/blocks/blocks.plugin.php | 2 +- plugins/box/editor/editor.plugin.php | 2 +- .../box/filesmanager/filesmanager.plugin.php | 2 +- .../box/information/information.plugin.php | 2 +- plugins/box/menu/menu.plugin.php | 2 +- plugins/box/pages/pages.plugin.php | 2 +- plugins/box/plugins/plugins.plugin.php | 2 +- plugins/box/sitemap/sitemap.plugin.php | 2 +- plugins/box/snippets/snippets.plugin.php | 2 +- plugins/box/system/system.plugin.php | 2 +- plugins/box/themes/themes.plugin.php | 2 +- plugins/box/users/users.plugin.php | 2 +- plugins/captcha/captcha.plugin.php | 2 +- plugins/markitup/markitup.plugin.php | 2 +- plugins/sandbox/sandbox.plugin.php | 2 +- 23 files changed, 67 insertions(+), 64 deletions(-) diff --git a/admin/index.php b/admin/index.php index 6083842..95f8376 100644 --- a/admin/index.php +++ b/admin/index.php @@ -15,7 +15,6 @@ * file that was distributed with this source code. */ - // Main engine defines define('DS', DIRECTORY_SEPARATOR); define('ROOT', rtrim(str_replace(array('admin'), array(''), dirname(__FILE__)), '\\/')); diff --git a/admin/themes/default/index.template.php b/admin/themes/default/index.template.php index 0dd0530..ae027c9 100644 --- a/admin/themes/default/index.template.php +++ b/admin/themes/default/index.template.php @@ -100,7 +100,7 @@ / / - © 2012 Monstra – + © 2012 - 2013 Monstra –

diff --git a/libraries/Gelato/ClassLoader/ClassLoader.php b/libraries/Gelato/ClassLoader/ClassLoader.php index 1ddd9e6..e70b315 100644 --- a/libraries/Gelato/ClassLoader/ClassLoader.php +++ b/libraries/Gelato/ClassLoader/ClassLoader.php @@ -90,7 +90,6 @@ class ClassLoader public static function directory($path) { static::$directories[] = rtrim($path, '/'); - echo rtrim($path, '/'); } /** @@ -160,28 +159,27 @@ class ClassLoader public static function load($className) { -/* - var_dump(static::$classes); - die(); -*/ $className = ltrim($className, '\\'); - // Try to autoload an aliased class - + /** + * Try to autoload an aliased class + */ if (isset(static::$aliases[$className])) { return class_alias(static::$aliases[$className], $className); } - // Try to load a mapped class - + /** + * Try to load a mapped class + */ if (isset(static::$classes[$className]) && file_exists(static::$classes[$className])) { include static::$classes[$className]; return true; } - // Try to load class from a registered namespace - + /** + * Try to load class from a registered namespace + */ foreach (static::$namespaces as $namespace => $path) { if (strpos($className, $namespace) === 0) { if (static::loadPSR0(substr($className, strlen($namespace)), $path)) { @@ -190,8 +188,10 @@ class ClassLoader } } - // Try to load a PSR-0 compatible class - // The second call to the loadPSR0 method is used to autoload legacy code + /** + * Try to load a PSR-0 compatible class + * The second call to the loadPSR0 method is used to autoload legacy code + */ if (static::loadPSR0($className) || static::loadPSR0(strtolower($className))) { return true; } diff --git a/libraries/Gelato/ErrorHandler/ErrorHandler.php b/libraries/Gelato/ErrorHandler/ErrorHandler.php index 86055ad..5420229 100644 --- a/libraries/Gelato/ErrorHandler/ErrorHandler.php +++ b/libraries/Gelato/ErrorHandler/ErrorHandler.php @@ -242,7 +242,7 @@ class ErrorHandler $error['type'] = get_class($exception); } - // Write to error log + // @todo Write to error log /*if () { Write here @@ -251,7 +251,7 @@ class ErrorHandler // Send headers and output @header('Content-Type: text/html; charset=UTF-8'); - if (GELATO_DISPLAY_ERRORS) { + if (GELATO_DISPLAY_ERRORS) { $error['backtrace'] = $exception->getTrace(); if ($exception instanceof ErrorException) { diff --git a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php index 319e8a5..d07ffce 100644 --- a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php +++ b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php @@ -1,3 +1,8 @@ + + + + +Error - -

Error

Aw, snap! An error has occurred while processing your request.

- + \ No newline at end of file diff --git a/libraries/Gelato/Validation/Valid.php b/libraries/Gelato/Validation/Valid.php index d599321..144812b 100644 --- a/libraries/Gelato/Validation/Valid.php +++ b/libraries/Gelato/Validation/Valid.php @@ -14,6 +14,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ + class Valid { /** diff --git a/plugins/box/backup/backup.plugin.php b/plugins/box/backup/backup.plugin.php index 5970b06..8fc11c9 100644 --- a/plugins/box/backup/backup.plugin.php +++ b/plugins/box/backup/backup.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/blocks/blocks.plugin.php b/plugins/box/blocks/blocks.plugin.php index 2ce30d3..fde0944 100644 --- a/plugins/box/blocks/blocks.plugin.php +++ b/plugins/box/blocks/blocks.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/editor/editor.plugin.php b/plugins/box/editor/editor.plugin.php index 0edbe0b..5bc7906 100644 --- a/plugins/box/editor/editor.plugin.php +++ b/plugins/box/editor/editor.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/filesmanager/filesmanager.plugin.php b/plugins/box/filesmanager/filesmanager.plugin.php index 4a5db57..aded97c 100644 --- a/plugins/box/filesmanager/filesmanager.plugin.php +++ b/plugins/box/filesmanager/filesmanager.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/information/information.plugin.php b/plugins/box/information/information.plugin.php index 02ddb02..8b1e84f 100644 --- a/plugins/box/information/information.plugin.php +++ b/plugins/box/information/information.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/menu/menu.plugin.php b/plugins/box/menu/menu.plugin.php index df60101..6c30d0a 100644 --- a/plugins/box/menu/menu.plugin.php +++ b/plugins/box/menu/menu.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/pages/pages.plugin.php b/plugins/box/pages/pages.plugin.php index c21f4b7..b70edf8 100644 --- a/plugins/box/pages/pages.plugin.php +++ b/plugins/box/pages/pages.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/plugins/plugins.plugin.php b/plugins/box/plugins/plugins.plugin.php index ef9c649..27ae5e3 100644 --- a/plugins/box/plugins/plugins.plugin.php +++ b/plugins/box/plugins/plugins.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/sitemap/sitemap.plugin.php b/plugins/box/sitemap/sitemap.plugin.php index 1572305..ef7653e 100644 --- a/plugins/box/sitemap/sitemap.plugin.php +++ b/plugins/box/sitemap/sitemap.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/snippets/snippets.plugin.php b/plugins/box/snippets/snippets.plugin.php index f3a9987..5f73f4c 100644 --- a/plugins/box/snippets/snippets.plugin.php +++ b/plugins/box/snippets/snippets.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/system/system.plugin.php b/plugins/box/system/system.plugin.php index 869cc85..c6a899e 100644 --- a/plugins/box/system/system.plugin.php +++ b/plugins/box/system/system.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/themes/themes.plugin.php b/plugins/box/themes/themes.plugin.php index 5005449..1b647cb 100644 --- a/plugins/box/themes/themes.plugin.php +++ b/plugins/box/themes/themes.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/box/users/users.plugin.php b/plugins/box/users/users.plugin.php index ccf0cad..21b882f 100644 --- a/plugins/box/users/users.plugin.php +++ b/plugins/box/users/users.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/captcha/captcha.plugin.php b/plugins/captcha/captcha.plugin.php index 672c263..2831fd8 100644 --- a/plugins/captcha/captcha.plugin.php +++ b/plugins/captcha/captcha.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/markitup/markitup.plugin.php b/plugins/markitup/markitup.plugin.php index 9a55fe8..9b97a16 100644 --- a/plugins/markitup/markitup.plugin.php +++ b/plugins/markitup/markitup.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */ diff --git a/plugins/sandbox/sandbox.plugin.php b/plugins/sandbox/sandbox.plugin.php index 9f4a159..69b7768 100644 --- a/plugins/sandbox/sandbox.plugin.php +++ b/plugins/sandbox/sandbox.plugin.php @@ -6,7 +6,7 @@ * @package Monstra * @subpackage Plugins * @author Romanenko Sergey / Awilum - * @copyright 2012 Romanenko Sergey / Awilum + * @copyright 2012-2013 Romanenko Sergey / Awilum * @version 1.0.0 * */