Core Improvements: Next Round #79 #80

2025-08-03 11:47:51 +02:00 · 2013-01-08 22:54:02 +02:00
parent 7e71457a2e
commit b4438b5440
23 changed files with 67 additions and 64 deletions
--- 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__)), '\\/'));
--- a/admin/themes/default/index.template.php
+++ b/admin/themes/default/index.template.php
@@ -100,7 +100,7 @@
                <span style="border-top:1px solid #E0E0E0; padding-top:10px;">
                <a href="http://forum.monstra.org" target="_blank"><?php echo __('Official Support Forum', 'system'); ?></a> /
                <a href="http://monstra.org/documentation" target="_blank"><?php echo __('Documentation', 'system'); ?></a> /
-                © 2012 <a href="http://monstra.org" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
+                © 2012 - 2013 <a href="http://monstra.org" target="_blank">Monstra</a> – <?php echo __('Version', 'system'); ?> <?php echo Monstra::VERSION; ?>
                </span>
            </p>
        </footer>
--- 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;
        }
--- 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
--- a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php
+++ b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php
@@ -1,3 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>Error</title>
 <style type="text/css">
 * { margin: 0; padding: 0; }
 #gelato-error
@@ -223,3 +228,5 @@ function toggle(id, link)
    return false;
 }
 </script>
+</body>
+</html>
--- a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php
+++ b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php
@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<meta charset="">
+<meta charset="utf-8">
 <title>Error</title>
-
 <style type="text/css">
-
 body
 {
 height:100%;
@@ -56,10 +54,8 @@ hr
 padding:10px;
 }
 </style>
-
 </head>
 <body>
-
 <div id="message">
 <h1>Error</h1>
 <hr>
--- 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
 {
    /**
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
     *
     */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */
--- 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
 *
 */