Class/method doc-tags fixed

diff --git a/application/ship-simu/main/actions/class_ShipSimuLoginAction.php b/application/ship-simu/main/actions/class_ShipSimuLoginAction.php
index 2e06eccd3f8b61efa55f61751230a1d8858e1218..d019a3b0c94f17365f360c7e409af4662d7dfa0a 100644 (file)
--- a/application/ship-simu/main/actions/class_ShipSimuLoginAction.php
+++ b/application/ship-simu/main/actions/class_ShipSimuLoginAction.php
@@ -57,9 +57,9 @@ class ShipSimuLoginAction extends BaseAction implements PerformableAction {
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void

+        * @todo        Maybe we need to do something later here

         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {

-               /* @todo Maybe we need to do something later here */

        }
 }
 
        }
 }
 

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
index e244d1ea6ec017f34ba016165751e2b68700188c..9d747de6b100eb484f7a4bdc2b0add9617c1ff44 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuGuestLoginCommand.php
@@ -100,6 +100,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable {
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void

+        * @todo        Add more filters

         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?


@@ -117,7 +118,7 @@ class WebShipsimuGuestLoginCommand extends BaseCommand implements Commandable {
                                break;
                }
 
                                break;
                }
 

-               /* @todo Add more filters */
+               // Add password verifier filter

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
        }
 }
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
        }
 }

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
index 72ad467fdae051b4ef555db9f4424e2a0a03ad7d..107d093d683312d24871380a4f1e0bdecaa4d5f2 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuProfileCommand.php
@@ -122,16 +122,25 @@ class WebShipsimuProfileCommand extends BaseCommand implements Commandable {
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void

+        * @todo        Add some more pre/post filters to the controller

         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
 
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Add user auth filter (we don't need an update of the user here because it will be redirected)
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_auth_class'));
 

-               /* @todo Add some more pre/post filters to the controller */
+               // User status filter

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('user_status_class'));

+
+               // Updated rules accepted

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('rules_accepted_class'));

+
+               // Account password validation

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('account_password_class'));

+
+               // Email changed

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_change_class'));

+
+               // Password changed

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_class'));
        }
 }
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_change_class'));
        }
 }

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
index d671f8b145355d73d151a3ac96e3997749aae1d5..b7c240f9719673f8991478d86633800b941223c2 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuRegisterCommand.php
@@ -97,9 +97,9 @@ class WebShipsimuRegisterCommand extends BaseCommand implements Commandable {
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void

+        * @todo        Add some more pre/post filters to the controller

         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {

-               /* @todo Add some more pre/post filters to the controller */

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('email_validator_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_validator_class'));
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('username_is_guest_class'));

diff --git a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
index 855f62cc7da47123e615748b2d8c9e3658dc29a2..a1f4c10162caac8f10fc133d019449ee834522fa 100644 (file)
--- a/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
+++ b/application/ship-simu/main/commands/web/class_WebShipsimuUserLoginCommand.php
@@ -100,6 +100,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void
         * @param       $controllerInstance             A controller instance
         * @param       $requestInstance                An instance of a class with an Requestable interface
         * @return      void

+        * @todo        Add more filters

         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
                // Which login type do we have?


@@ -117,7 +118,7 @@ class WebShipsimuUserLoginCommand extends BaseCommand implements Commandable {
                                break;
                }
 
                                break;
                }
 

-               /* @todo Add more filters */
+               // Password verifier filter

                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
        }
 }
                $controllerInstance->addPreFilter(ObjectFactory::createObjectByConfiguredName('password_verifier_class'));
        }
 }

diff --git a/application/ship-simu/main/login/class_ShipSimuUserLogin.php b/application/ship-simu/main/login/class_ShipSimuUserLogin.php
index 64aeaff816313d00497fb1e7987980b33a1ce245..1e094cb86c45a44ebf7c33f724f99fdd4edf01e2 100644 (file)
--- a/application/ship-simu/main/login/class_ShipSimuUserLogin.php
+++ b/application/ship-simu/main/login/class_ShipSimuUserLogin.php
@@ -74,6 +74,9 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
         *                                                                              User class
         * @throws      UserPasswordMismatchException   If the supplied password did not
         *                                                                              match with the stored password
         *                                                                              User class
         * @throws      UserPasswordMismatchException   If the supplied password did not
         *                                                                              match with the stored password

+        * @todo        We need to add something here which will make more than one
+        * @todo        guest logins, users who are online but based on the same
+        * @todo        user account.

         */
        public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
                // By default no method is selected
         */
        public function doLogin (Requestable $requestInstance, Responseable $responseInstance) {
                // By default no method is selected


@@ -118,9 +121,7 @@ class ShipSimuUserLogin extends BaseFrameworkSystem implements LoginableUser {
                        throw new UserPasswordMismatchException(array($this, $userInstance), User::EXCEPTION_USER_PASS_MISMATCH);
                } // END - if
 
                        throw new UserPasswordMismatchException(array($this, $userInstance), User::EXCEPTION_USER_PASS_MISMATCH);
                } // END - if
 

-               /* @todo We need to add something here which will make more than one */
-               /* @todo guest logins, users who are online but based on the same */
-               /* @todo user account. */
+               // ToDo place

 
                // Now do the real login. This can be cookie- or session-based login
                // which depends on the admins setting then on the user's taste.
 
                // Now do the real login. This can be cookie- or session-based login
                // which depends on the admins setting then on the user's taste.

diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
index c6bb77250afd7e5c77430ebe8767a5e8614e8bd7..148b72a4c56470b2aa64b150556da748456835ba 100644 (file)
--- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
+++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php
@@ -70,9 +70,9 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable {
         * Prepares some general data which shall be displayed on every page
         *
         * @return      void
         * Prepares some general data which shall be displayed on every page
         *
         * @return      void

+        * @todo        Add some stuff here: Some personal data, app/game related data

         */
        protected function prepareCommand () {
         */
        protected function prepareCommand () {

-               /* @todo Add some stuff here: Some personal data, app/game related data */

        }
 
        /**
        }
 
        /**

diff --git a/inc/classes/main/controller/default/class_WebLoginController.php b/inc/classes/main/controller/default/class_WebLoginController.php
index 09a0115469d390c4e64a449d7354dcd7f99c407f..95a984a0a1f43fea1134d6b93808230d7355c026 100644 (file)
--- a/inc/classes/main/controller/default/class_WebLoginController.php
+++ b/inc/classes/main/controller/default/class_WebLoginController.php
@@ -44,6 +44,7 @@ class WebLoginController extends BaseController implements Controller {
         *
         * @param       $resolverInstance               An instance of a command resolver class
         * @return      $controllerInstance             A prepared instance of this class
         *
         * @param       $resolverInstance               An instance of a command resolver class
         * @return      $controllerInstance             A prepared instance of this class

+        * @todo        Add some filters to this controller

         */
        public final static function createWebLoginController (CommandResolver $resolverInstance) {
                // Create the instance
         */
        public final static function createWebLoginController (CommandResolver $resolverInstance) {
                // Create the instance


@@ -52,7 +53,6 @@ class WebLoginController extends BaseController implements Controller {
                // Set the command resolver
                $controllerInstance->setResolverInstance($resolverInstance);
 
                // Set the command resolver
                $controllerInstance->setResolverInstance($resolverInstance);
 

-               /* @todo Add some filters to this controller */

 
                // Return the prepared instance
                return $controllerInstance;
 
                // Return the prepared instance
                return $controllerInstance;

diff --git a/inc/classes/main/database/databases/class_LocalFileDatabase.php b/inc/classes/main/database/databases/class_LocalFileDatabase.php
index d7a579a9106255a958f16070a6d33cb5b2c5893c..b3ee46ecb7b2b22851e2337439289394b4797417 100644 (file)
--- a/inc/classes/main/database/databases/class_LocalFileDatabase.php
+++ b/inc/classes/main/database/databases/class_LocalFileDatabase.php
@@ -353,9 +353,9 @@ class LocalFileDatabase extends BaseDatabaseFrontend implements DatabaseFrontend
         * Makes sure that the database connection is alive
         *
         * @return      void
         * Makes sure that the database connection is alive
         *
         * @return      void

+        * @todo        Do some checks on the database directory and files here

         */
        public function connectToDatabase () {
         */
        public function connectToDatabase () {

-               /* @todo Do some checks on the database directory and files here */

        }
 
        /**
        }
 
        /**

diff --git a/inc/classes/main/filter/news/class_NewsProcessFilter.php b/inc/classes/main/filter/news/class_NewsProcessFilter.php
index 1f468fe8c277e371ae4fbe67ac8a3b552bcb2eea..8fc54099ddd1f29bc139e2f2e1dc7a28c5ce668b 100644 (file)
--- a/inc/classes/main/filter/news/class_NewsProcessFilter.php
+++ b/inc/classes/main/filter/news/class_NewsProcessFilter.php
@@ -58,9 +58,9 @@ class NewsProcessFilter extends BaseFilter implements Filterable {
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void

+        * @todo        Unfinished stub, add functionality here

         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {

-               /* @todo Unfinished stub, add functionality here */

        }
 }
 
        }
 }
 

diff --git a/inc/classes/main/filter/update/class_UserUpdateFilter.php b/inc/classes/main/filter/update/class_UserUpdateFilter.php
index 47eee38a4b87d1bc1fd38b94572bc588bb0551ba..ac0d8a12ec34455752352dba7980be826f9728b0 100644 (file)
--- a/inc/classes/main/filter/update/class_UserUpdateFilter.php
+++ b/inc/classes/main/filter/update/class_UserUpdateFilter.php
@@ -62,6 +62,7 @@ class UserUpdateFilter extends BaseFrameworkSystem implements Filterable {
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void

+        * @todo        Add more user updates here

         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get user instance from registry
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get user instance from registry


@@ -74,8 +75,6 @@ class UserUpdateFilter extends BaseFrameworkSystem implements Filterable {
                $authInstance = Registry::getRegistry()->getInstance('auth');
                $authInstance->updateAuthData();
 
                $authInstance = Registry::getRegistry()->getInstance('auth');
                $authInstance->updateAuthData();
 

-               /* @todo Add more user updates here */
-

                // Write all updates to the database
                $userInstance->flushUpdates();
        }
                // Write all updates to the database
                $userInstance->flushUpdates();
        }

diff --git a/inc/classes/main/helper/web/class_WebFormHelper.php b/inc/classes/main/helper/web/class_WebFormHelper.php
index 79de8131d6a120ef53d4b2eeeb86ce1b22daa3d8..c8c744835df2c35a49343321f7a7abbfacdce975 100644 (file)
--- a/inc/classes/main/helper/web/class_WebFormHelper.php
+++ b/inc/classes/main/helper/web/class_WebFormHelper.php
@@ -128,6 +128,7 @@ class WebFormHelper extends BaseHelper {
         * @param       $formId         Id of the form (attribute "id"; default: false)
         * @return      void
         * @throws      InvalidFormNameException        If the form name is invalid (=false)
         * @param       $formId         Id of the form (attribute "id"; default: false)
         * @return      void
         * @throws      InvalidFormNameException        If the form name is invalid (=false)

+        * @todo        Add some unique PIN here to bypass problems with some browser and/or extensions

         */
        public function addFormTag ($formName = false, $formId = false) {
                // When the form is not yet opened at least form name must be valid
         */
        public function addFormTag ($formName = false, $formId = false) {
                // When the form is not yet opened at least form name must be valid


@@ -174,7 +175,6 @@ class WebFormHelper extends BaseHelper {
                                $this->addFormGroup("", "");
                        } // END - if
 
                                $this->addFormGroup("", "");
                        } // END - if
 

-                       /* @todo Add some unique PIN here to bypass problems with some browser and/or extensions */

                        // Simply close it
                        $this->formOpened = false;
                }
                        // Simply close it
                        $this->formOpened = false;
                }


@@ -659,9 +659,9 @@ class WebFormHelper extends BaseHelper {
         * Checks wether the rules has been updated
         *
         * @return      $rulesUpdated   Wether rules has been updated
         * Checks wether the rules has been updated
         *
         * @return      $rulesUpdated   Wether rules has been updated

+        * @todo        Implement check if rules have been changed

         */
        public function ifRulesHaveChanged () {
         */
        public function ifRulesHaveChanged () {

-               /* @todo Implement check if rules have been changed */

                return false;
        }
 
                return false;
        }
 

diff --git a/inc/classes/main/response/class_HttpResponse.php b/inc/classes/main/response/class_HttpResponse.php
index deff1a80269d682542218947759ef73b35c23cdb..46979c7fa17227f1435ca1314ba3c572214b569f 100644 (file)
--- a/inc/classes/main/response/class_HttpResponse.php
+++ b/inc/classes/main/response/class_HttpResponse.php
@@ -246,6 +246,10 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
         * @param       $expires                Timestamp of expiration (default: configured)
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
         * @param       $expires                Timestamp of expiration (default: configured)
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent

+        * @todo        Encryption of cookie data not yet supported.
+        * @todo        Why are these parameters conflicting?
+        * @todo        If the return statement is removed and setcookie() commented out,
+        * @todo        this will send only one cookie out, the first one.

         */
        public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
                // Are headers already sent?
         */
        public function addCookie ($cookieName, $cookieValue, $encrypted = false, $expires = null) {
                // Are headers already sent?


@@ -256,7 +260,6 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {
 
                // Shall we encrypt the cookie?
                if ($encrypted === true) {

-                       /* @todo Encryption of cookie data not yet supported */

                } // END - if
 
                // For slow browsers set the cookie array element first
                } // END - if
 
                // For slow browsers set the cookie array element first


@@ -271,15 +274,12 @@ class HttpResponse extends BaseFrameworkSystem implements Responseable {
                $domain = $this->getConfigInstance()->readConfig('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);
                $domain = $this->getConfigInstance()->readConfig('cookie_domain');
 
                setcookie($cookieName, $cookieValue, $expires);

-               /* @todo Why are these parameters conflicting? */

                //, $path, $domain, (isset($_SERVER['HTTPS']))
                return;
                //, $path, $domain, (isset($_SERVER['HTTPS']))
                return;

-               /* @todo This will send only one cookie out, the first one. */

 
                // Now construct the full header
                $cookieString = $cookieName . "=" . $cookieValue . "; ";
                $cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";
 
                // Now construct the full header
                $cookieString = $cookieName . "=" . $cookieValue . "; ";
                $cookieString .= "expires=" . date("D, d-F-Y H:i:s", $expires) . " GMT";

-               /* @todo Why are these parameters conflicting? */

                // $cookieString .= "; path=".$path."; domain=".$domain;
 
                // Set the cookie as a header
                // $cookieString .= "; path=".$path."; domain=".$domain;
 
                // Set the cookie as a header

diff --git a/inc/classes/main/rng/class_RandomNumberGenerator.php b/inc/classes/main/rng/class_RandomNumberGenerator.php
index 5decb85f5e804547acf2a1d7f18a628939e5e966..917739301c6fac84dc258e6aa99d2f5478a3f4b0 100644 (file)
--- a/inc/classes/main/rng/class_RandomNumberGenerator.php
+++ b/inc/classes/main/rng/class_RandomNumberGenerator.php
@@ -88,6 +88,7 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         * Initializes the random number generator
         *
         * @return      void
         * Initializes the random number generator
         *
         * @return      void

+        * @todo        Add site key for stronger salt!

         */
        protected function initRng () {
                // Seed mt_rand()
         */
        protected function initRng () {
                // Seed mt_rand()


@@ -113,7 +114,6 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
                $this->fixedSalt = sha1($serverIp . ":" . serialize($this->getDatabaseInstance()->getConnectionData()));
 
                // One-way data we need for "extra-salting" the random number
                $this->fixedSalt = sha1($serverIp . ":" . serialize($this->getDatabaseInstance()->getConnectionData()));
 
                // One-way data we need for "extra-salting" the random number

-               /* @todo Add site key for stronger salt! */

                $this->extraSalt = sha1($this->fixedSalt . ":" . getenv('SERVER_SOFTWARE') . ":" . $this->getConfigInstance()->readConfig('date_key'));
 
                // Get config entry for max salt length
                $this->extraSalt = sha1($this->fixedSalt . ":" . getenv('SERVER_SOFTWARE') . ":" . $this->getConfigInstance()->readConfig('date_key'));
 
                // Get config entry for max salt length


@@ -149,9 +149,9 @@ class RandomNumberGenerator extends BaseFrameworkSystem {
         * @param       $min    Min value to generate
         * @param       $max    Max value to generate
         * @return      $num    Pseudo-random number
         * @param       $min    Min value to generate
         * @param       $max    Max value to generate
         * @return      $num    Pseudo-random number

+        * @todo        I had a better random number generator here but now it is somewhere lost :(

         */
        public function randomNumnber ($min, $max) {
         */
        public function randomNumnber ($min, $max) {

-               /* @todo I had a better random number generator here but now it is somewhere lost :( */

                return mt_rand($min, $max);
        }
 
                return mt_rand($min, $max);
        }
 

diff --git a/inc/classes/main/template/class_TemplateEngine.php b/inc/classes/main/template/class_TemplateEngine.php
index f2e78dbde38f25e190fbf90fb7ed13e0eec9c2bd..23ac8b4a0fa35e4749feb8b00e9acbf8edf789c4 100644 (file)
--- a/inc/classes/main/template/class_TemplateEngine.php
+++ b/inc/classes/main/template/class_TemplateEngine.php
@@ -771,6 +771,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         *
         * @param               $varMatches     An array full of variable/value pairs.
         * @return      void
         *
         * @param               $varMatches     An array full of variable/value pairs.
         * @return      void

+        * @todo        Unfinished work or don't die here.

         */
        private function assignAllVariables (array $varMatches) {
                // Search for all variables
         */
        private function assignAllVariables (array $varMatches) {
                // Search for all variables


@@ -788,7 +789,6 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                                $this->assignVariable($var, $varMatches[3][$key]);
                        } elseif (!empty($varMatches[2][$key])) {
                                // Non-string found so we need some deeper analysis...
                                $this->assignVariable($var, $varMatches[3][$key]);
                        } elseif (!empty($varMatches[2][$key])) {
                                // Non-string found so we need some deeper analysis...

-                               /* @todo Unfinished work or don't die here. */

                                die("Deeper analysis not yet implemented!");
                        }
 
                                die("Deeper analysis not yet implemented!");
                        }
 


@@ -952,6 +952,7 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
         * Compile all variables by inserting their respective values
         *
         * @return      void
         * Compile all variables by inserting their respective values
         *
         * @return      void

+        * @todo        Make this code some nicer...

         */
        public final function compileVariables () {
                // Initialize the $content array
         */
        public final function compileVariables () {
                // Initialize the $content array


@@ -992,7 +993,6 @@ class TemplateEngine extends BaseFrameworkSystem implements CompileableTemplate
                        );
 
                        // This loop does remove the backslashes (\) in PHP parameters
                        );
 
                        // This loop does remove the backslashes (\) in PHP parameters

-                       /* @todo Make this some nicer... */

                        while (strpos($eval, "<?") !== false) {
                                // Get left part before "<?"
                                $evalLeft = substr($eval, 0, strpos($eval, "<?"));
                        while (strpos($eval, "<?") !== false) {
                                // Get left part before "<?"
                                $evalLeft = substr($eval, 0, strpos($eval, "<?"));