Some code cosmetics applied

[mailer.git] / index.php

diff --git a/index.php b/index.php
index 3b7f082544b72dcaebefe3db00e4752fdb4aa922..3950334e917c67e0b9c65eaa558bae402cfd9677 100644 (file)
--- a/index.php
+++ b/index.php
@@ -9,7 +9,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0

- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team

  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *


@@ -56,9 +56,9 @@ final class ApplicationEntryPoint {
         * @param       $extraData              Extra information from exceptions
         * @param       $silentMode             Wether not silent mode is turned on
         * @return      void
         * @param       $extraData              Extra information from exceptions
         * @param       $silentMode             Wether not silent mode is turned on
         * @return      void

-        * @todo        This method is old code and needs heavy rewrite
+        * @todo        This method is old code and needs heavy rewrite and should be moved to ApplicationHelper

         */
         */

-       public static function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {
+       public static final function app_die ($message = '', $code = false, $extraData = '', $silentMode = false) {

                // Is this method already called?
                if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly
                // Is this method already called?
                if (isset($GLOBALS['app_die_called'])) {
                        // Then output the text directly


@@ -98,7 +98,7 @@ final class ApplicationEntryPoint {
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory
                        // Use the template engine for putting out (nicer look) the message
                        try {
                                // Get the template instance from our object factory

-                               $templateInstance = ObjectFactory::createObjectByName($tpl, array(ApplicationHelper::getInstance()));
+                               $templateInstance = ObjectFactory::createObjectByName($tpl);

                        } catch (FrameworkException $e) {
                                die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
                                        $e->getMessage()
                        } catch (FrameworkException $e) {
                                die(sprintf("[Main:] Could not initialize template engine for reason: <span class=\"exception_reason\">%s</span>",
                                        $e->getMessage()


@@ -109,9 +109,18 @@ final class ApplicationEntryPoint {
                        $backtraceArray = debug_backtrace();
                        $backtrace = '';
                        foreach ($backtraceArray as $key => $trace) {
                        $backtraceArray = debug_backtrace();
                        $backtrace = '';
                        foreach ($backtraceArray as $key => $trace) {

-                               if (!isset($trace['file'])) $trace['file'] = __FILE__;
-                               if (!isset($trace['line'])) $trace['line'] = __LINE__;
-                               if (!isset($trace['args'])) $trace['args'] = array();
+                               // Set missing array elements
+                               if (!isset($trace['file'])) {
+                                       $trace['file'] = __FILE__;
+                               } // END - if
+                               if (!isset($trace['line'])) {
+                                       $trace['line'] = __LINE__;
+                               } // END - if
+                               if (!isset($trace['args'])) {
+                                       $trace['args'] = array();
+                               } // END - if
+
+                               // Add the traceback path to the final output

                                $backtrace .= sprintf("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
                                        basename($trace['file']),
                                        $trace['line'],
                                $backtrace .= sprintf("<span class=\"backtrace_file\">%s</span>:%d, <span class=\"backtrace_function\">%s(%d)</span><br />\n",
                                        basename($trace['file']),
                                        $trace['line'],


@@ -121,15 +130,15 @@ final class ApplicationEntryPoint {
                        } // END - foreach
 
                        // Init application instance
                        } // END - foreach
 
                        // Init application instance

-                       $appInstance = null;
+                       $applicationInstance = null;

 
                        // Is the class there?
                        if (class_exists('ApplicationHelper')) {
                                // Get application instance
 
                        // Is the class there?
                        if (class_exists('ApplicationHelper')) {
                                // Get application instance

-                               $appInstance = ApplicationHelper::getInstance();
+                               $applicationInstance = ApplicationHelper::getInstance();

 
                                // Assign application data
 
                                // Assign application data

-                               $templateInstance->assignApplicationData($appInstance);
+                               $templateInstance->assignApplicationData($applicationInstance);

                        } // END - if
 
                        // We only try this
                        } // END - if
 
                        // We only try this


@@ -176,9 +185,9 @@ final class ApplicationEntryPoint {
         * Determines the correct absolute path for all includes only once per run.
         * Other calls of this method are being "cached".
         *
         * Determines the correct absolute path for all includes only once per run.
         * Other calls of this method are being "cached".
         *

-        * @return      $basePath       Base path (core) for all includes
+        * @return      $corePath       Base path (core) for all includes

         */
         */

-       protected static function detectCorePath () {
+       protected static final function detectCorePath () {

                // Is it not set?
                if (empty(self::$corePath)) {
                        // Auto-detect our core path
                // Is it not set?
                if (empty(self::$corePath)) {
                        // Auto-detect our core path


@@ -197,7 +206,7 @@ final class ApplicationEntryPoint {
         *
         * @return      void
         */
         *
         * @return      void
         */

-       public static function main () {
+       public static final function main () {

                // Load config file
                require(self::detectCorePath() . '/inc/config.php');
 
                // Load config file
                require(self::detectCorePath() . '/inc/config.php');