Added isGuest() isConfirmed() to BaseUser for wrapping this type of check into

[core.git] / inc / classes / main / user / guest / class_Guest.php

diff --git a/inc/classes/main/user/guest/class_Guest.php b/inc/classes/main/user/guest/class_Guest.php
index ec9ef165d5d13e7a8055eba2666acfb1e3a9c9d5..e2911cf3b81709c56e7c094eb4219085c1aeeae9 100644 (file)
--- a/inc/classes/main/user/guest/class_Guest.php
+++ b/inc/classes/main/user/guest/class_Guest.php
@@ -26,6 +26,7 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
        const EXCEPTION_USERNAME_NOT_FOUND   = 0x170;
        const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x171;
        const EXCEPTION_USER_PASS_MISMATCH   = 0x172;
        const EXCEPTION_USERNAME_NOT_FOUND   = 0x170;
        const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x171;
        const EXCEPTION_USER_PASS_MISMATCH   = 0x172;

+       const EXCEPTION_USER_NOT_GUEST       = 0x173;

 
        /**
         * Protected constructor
 
        /**
         * Protected constructor


@@ -45,6 +46,7 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
         * @param       $userName               Username we need a class instance for
         * @return      $userInstance   An instance of this user class
         * @throws      UsernameMissingException        If the username does not exist
         * @param       $userName               Username we need a class instance for
         * @return      $userInstance   An instance of this user class
         * @throws      UsernameMissingException        If the username does not exist

+        * @throws      UserNoGuestException            If the user is no guest account

         */
        public static final function createGuestByUsername ($userName) {
                // Get a new instance
         */
        public static final function createGuestByUsername ($userName) {
                // Get a new instance


@@ -57,7 +59,10 @@ class Guest extends BaseUser implements ManageableGuest, Registerable {
                if ($userInstance->ifUsernameExists() === FALSE) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);
                if ($userInstance->ifUsernameExists() === FALSE) {
                        // Throw an exception here
                        throw new UsernameMissingException(array($userInstance, $userName), self::EXCEPTION_USERNAME_NOT_FOUND);

-               } // END - if
+               } elseif ($userInstance->isGuest() === FALSE) {
+                       // Sanity check on 'guest' status failed
+                       throw new UserNoGuestException(array($userInstance, $userName), self::EXCEPTION_USER_NOT_GUEST_STATUS);
+               }

 
                // Return the instance
                return $userInstance;
 
                // Return the instance
                return $userInstance;