Email address confirmation now working (not in registration):

[shipsimu.git] / application / ship-simu / main / registration / class_ShipSimuRegistration.php

diff --git a/application/ship-simu/main/registration/class_ShipSimuRegistration.php b/application/ship-simu/main/registration/class_ShipSimuRegistration.php
index a4a0b355425e6ed9b1a792b709139031e4f261d0..60dc559df5002e4c0f723736ca871ed09f49ce0d 100644 (file)
--- a/application/ship-simu/main/registration/class_ShipSimuRegistration.php
+++ b/application/ship-simu/main/registration/class_ShipSimuRegistration.php
@@ -159,9 +159,15 @@ class ShipSimuRegistration extends BaseRegistration {
         * @return      void
         */
        public function addElementsToDataSet (StoreableCriteria $criteriaInstance) {
-               // Default is user account!
+               // Default is unconfirmed!
                $configEntry = 'user_status_unconfirmed';
 
+               // Is the confirmation process entirely disabled?
+               if ($this->getConfigInstance()->readConfig('confirm_email_enabled') === "N") {
+                       // No confirmation of email needed
+                       $configEntry = 'user_status_confirmed';
+               } // END - if
+
                // Add a lot elements to the dataset criteria
                foreach ($this->criteriaElements as $alias=>$element) {
                        // Do we have an alias?
@@ -184,7 +190,7 @@ class ShipSimuRegistration extends BaseRegistration {
                $criteriaInstance->setUniqueKey('username');
 
                // Add account status as configured
-               $criteriaInstance->addConfiguredCriteria('user_status', $configEntry);
+               $criteriaInstance->addConfiguredCriteria(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $configEntry);
 
                // Include registration timestamp
                $criteriaInstance->addCriteria('registered', date("Y-m-d H:i:s", time()));