Login and auth classes added. WARNING: All class config entries must end with _class!

[shipsimu.git] / inc / classes / main / user / class_User.php

diff --git a/inc/classes/main/user/class_User.php b/inc/classes/main/user/class_User.php
index 302c117d73d475c0fdb4d6129b2fbd7bdc60a5d2..cc9c44348058bd2e9645030a5d2950a22554955e 100644 (file)
--- a/inc/classes/main/user/class_User.php
+++ b/inc/classes/main/user/class_User.php
@@ -33,9 +33,9 @@ class User extends BaseFrameworkSystem implements ManageableUser, Registerable {
        private $email = "";
 
        // Exceptions
        private $email = "";
 
        // Exceptions

-       const EXCEPTION_USERNAME_NOT_FOUND   = 0xd00;
-       const EXCEPTION_USER_EMAIL_NOT_FOUND = 0xd01;
-       const EXCEPTION_USER_PASS_MISMATCH   = 0xd02;
+       const EXCEPTION_USERNAME_NOT_FOUND   = 0x060;
+       const EXCEPTION_USER_EMAIL_NOT_FOUND = 0x061;
+       const EXCEPTION_USER_PASS_MISMATCH   = 0x062;

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


@@ -152,10 +152,10 @@ class User extends BaseFrameworkSystem implements ManageableUser, Registerable {
                $exists = false;
 
                // Get a UserDatabaseWrapper instance
                $exists = false;
 
                // Get a UserDatabaseWrapper instance

-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper');
+               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');

 
                // Create a search criteria
 
                // Create a search criteria

-               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria');
+               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');

 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUsername());
 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUsername());


@@ -184,10 +184,10 @@ class User extends BaseFrameworkSystem implements ManageableUser, Registerable {
                $exists = false;
 
                // Get a UserDatabaseWrapper instance
                $exists = false;
 
                // Get a UserDatabaseWrapper instance

-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper');
+               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');

 
                // Create a search criteria
 
                // Create a search criteria

-               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria');
+               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');

 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_EMAIL, $this->getEmail());
 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_EMAIL, $this->getEmail());


@@ -218,10 +218,10 @@ class User extends BaseFrameworkSystem implements ManageableUser, Registerable {
                $matches = false;
 
                // Get a UserDatabaseWrapper instance
                $matches = false;
 
                // Get a UserDatabaseWrapper instance

-               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper');
+               $wrapperInstance = ObjectFactory::createObjectByConfiguredName('user_db_wrapper_class');

 
                // Create a search criteria
 
                // Create a search criteria

-               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria');
+               $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');

 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());
 
                // Add the username as a criteria and set limit to one entry
                $criteriaInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName());