NPE catched, command class added, beter coding practice applied:

- New command class WebProblemCommand added to handle page=problem&problem=???
- Command class WebConfirmCommand redirect to a configurable URL if the user
  instance is not found in registry. This might happen e.g. if the database is
  corrupted or the underlaying file (in LocalFileDatabase class) has been
  removed.
- All user classes inherited from BaseUser class do now set their result
  instance a more clean state (might fix later troubles)

diff --git a/.gitattributes b/.gitattributes
index fe697c1241ee2661d4d059c3f3cf516e3e4e9723..b9372516499cc0d2857040b2af839227414cc056 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -247,6 +247,7 @@ inc/classes/main/commands/web/class_WebLoginCommand.php -text
 inc/classes/main/commands/web/class_WebLoginFailedCommand.php -text
 inc/classes/main/commands/web/class_WebLogoutCommand.php -text
 inc/classes/main/commands/web/class_WebLogoutDoneCommand.php -text
+inc/classes/main/commands/web/class_WebProblemCommand.php -text
 inc/classes/main/commands/web/class_WebRegisterCommand.php -text
 inc/classes/main/commands/web/class_WebResendLinkCommand.php -text
 inc/classes/main/commands/web/class_WebStatusCommand.php -text

diff --git a/inc/classes/main/commands/web/class_WebConfirmCommand.php b/inc/classes/main/commands/web/class_WebConfirmCommand.php
index 090dbad97c609f2a5535f618b1443e6cff997891..220ae5ce60d3aaae0965fb85b137d678f0f5ca23 100644 (file)
--- a/inc/classes/main/commands/web/class_WebConfirmCommand.php
+++ b/inc/classes/main/commands/web/class_WebConfirmCommand.php
@@ -99,7 +99,12 @@ class WebConfirmCommand extends BaseCommand implements Commandable {
                $templateInstance->assignVariable('title', $this->getLanguageInstance()->getMessage('page_confirm_link_title'));
 
                // Get user instance
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               try {
+                       $userInstance = Registry::getRegistry()->getInstance('user');
+               } catch (NullPointerException $e) {
+                       // Not found user, e.g. when the user is somehow invalid
+                       $responseInstance->redirectToConfiguredUrl('web_cmd_user_is_null');
+               }
 
                // Set username
                $templateInstance->assignVariable('username', $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USERNAME));

diff --git a/inc/classes/main/commands/web/class_WebProblemCommand.php b/inc/classes/main/commands/web/class_WebProblemCommand.php
new file mode 100644 (file)
index 0000000..28adc9d
--- /dev/null
+++ b/inc/classes/main/commands/web/class_WebProblemCommand.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * A command for Problem page
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+class WebProblemCommand extends BaseCommand implements Commandable {
+       /**
+        * Protected constructor
+        *
+        * @return      void
+        */
+       protected function __construct () {
+               // Call parent constructor
+               parent::__construct(__CLASS__);
+       }
+
+       /**
+        * Creates an instance of this class
+        *
+        * @param       $resolverInstance       An instance of a command resolver class
+        * @return      $commandInstance        An instance a prepared command class
+        */
+       public final static function createWebProblemCommand (CommandResolver $resolverInstance) {
+               // Get new instance
+               $commandInstance = new WebProblemCommand();
+
+               // Set the application instance
+               $commandInstance->setResolverInstance($resolverInstance);
+
+               // Return the prepared instance
+               return $commandInstance;
+       }
+
+       /**
+        * Executes the given command with given request and response objects
+        *
+        * @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        0% done
+        */
+       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+               $this->partialStub('Unfinished method.');
+       }
+
+       /**
+        * Adds extra filters to the given controller instance
+        *
+        * @param       $controllerInstance             A controller instance
+        * @param       $requestInstance                An instance of a class with an Requestable interface
+        * @return      void
+        */
+       public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
+               // Empty for now
+       }
+}
+
+// [EOF]
+?>

diff --git a/inc/classes/main/user/class_BaseUser.php b/inc/classes/main/user/class_BaseUser.php
index 5de1249a2781c0aa2ce2af4d7ece77ffa3e8f9fd..0aa89c354c6587ed574ab73fc8f815077ae6bf0f 100644 (file)
--- a/inc/classes/main/user/class_BaseUser.php
+++ b/inc/classes/main/user/class_BaseUser.php
@@ -241,13 +241,16 @@ class BaseUser extends BaseFrameworkSystem implements Updateable {
                        $this->setResultInstance($resultInstance);
                } // END - if
 
-               // Rewind it
+               // Rewind it and advance to first entry
                $this->getResultInstance()->rewind();
 
+               // This call set the result instance to a clean state
+               $this->getResultInstance()->next();
+
                // Search for it
                if ($this->getResultInstance()->find('pass_hash')) {
                        // So does the hashes match?
-                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '/' . $this->getResultInstance()->getFoundValue() . '<br />';
+                       //* DEBUG: */ echo $requestInstance->getRequestElement('pass_hash') . '<br />' . $this->getResultInstance()->getFoundValue() . '<br />';
                        $matches = ($requestInstance->getRequestElement('pass_hash') === $this->getResultInstance()->getFoundValue());
                } // END - if