Changeset 266

Timestamp:

05/28/07 08:26:19

Author:

danfreak

Message:

added config option for direct activation, and modified needed libraries accordingly

Files:

• FreakAuth/trunk/www/system/application/config/freakauth_light.php (modified) (1 diff)
• FreakAuth/trunk/www/system/application/libraries/FAL_front.php (modified) (1 diff)
• FreakAuth/trunk/www/system/application/libraries/FAL_validation.php (modified) (5 diffs)
• FreakAuth/trunk/www/system/application/libraries/Freakauth_light.php (modified) (9 diffs)
• FreakAuth/trunk/www/system/application/models/FreakAuth_light/usertemp.php (modified) (1 diff)

FreakAuth/trunk/www/system/application/config/freakauth_light.php

@@ -115 +115 @@
- $config['FAL_allow_user_registration'] = TRUE;
- 
+ /*
+ |------------------------------------------------------------------------------
+ | Whether the registration/activation process requires e-mail verification
+ | 
+ | If set to FALSE, the registration process is as follows:
+ | 1) the user registers to the website (data stored in user_temp table)
+ | 2) the user gets a registration e-mail with an activation link
+ | 3) if the user clicks the activation link (data moved to user table)
+ |    he get finally registered and can login with his credentials
+ |
+ | If set to TRUE:
+ | 1) the user registers to the website (data stored in user table)
+ | 2) the user can immediately login
+ | 3) no e-mail is sent to the user to remember him his credentials
+ |    i.e. username and password
+ |
+ |------------------------------------------------------------------------------
+ */
+ $config['FAL_register_direct'] = FALSE;
+ 
+ 
+ /*
+ |------------------------------------------------------------------------------
+ | Usernames and passwords config
+ |------------------------------------------------------------------------------
+ */
- $config['FAL_user_name_min'] = 4;       //min username length
- $config['FAL_user_name_max'] = 16;      //max username length

FreakAuth/trunk/www/system/application/libraries/FAL_front.php

@@ -267 +267 @@
-        {
-                        $data['heading'] = $this->CI->lang->line('FAL_register_label');
-
+
+
+
+
+
+
+
+
+
+
-                        //$this->CI->output->enable_profiler(TRUE);
-        }

FreakAuth/trunk/www/system/application/libraries/FAL_validation.php

@@ -197 +197 @@
-        //query in main user table (users already activated)
-        $query = $this->CI->UserModel->getUserByUsername($value);
+        
-        //query in temporary user table (users waiting for activation)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                $this->set_message('username_duplicate_check', $this->CI->lang->line('FAL_in_use_validation_message'));
-                    return false;
-                }
-
-
+
+
+
+
-        }
-        
@@ -229 +247 @@
-        
-        //query in temporary user table (users waiting for activation)
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            {
-                $this->set_message('username_backend_duplicate_check', $this->CI->lang->line('FAL_in_use_validation_message'));
-                    return false;
-
-
-
+
+
+
+
+
-        }
-        
@@ -258 +292 @@
-        //query in main user table (users already activated)
-        $query = $this->CI->UserModel->getUserForForgottenPassword($value);
-        //query in temporary user table (users waiting for activation)
-                $fields='id';
-        $where=array('email'=>$value);
-        $query_temp = $this->CI->UserTemp->getUserTempWhere($fields, $where);
-        
-        if (($query != null) && ($query->num_rows() > 0))
@@ -269 +299 @@
-                }
-                
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return true;
-        }
@@ -298 +336 @@
-        $query = $this->CI->UserModel->getUsers($fields, $limit=null, $where);
-
-        
-        //query in temporary user table (users waiting for activation)
-        //query in main user table (users already activated)
-             $fields='id';
-                 $where = array('email'=>$value);
-         $query_temp = $this->CI->UserTemp->getUserTemp($fields, $limit=null, $where);
-
-                
-        if (($query != null) && ($query->num_rows() > 0))
-            {
-                $this->set_message('email_backend_duplicate_check', $this->CI->lang->line('FAL_user_email_duplicate'));
-                    
-                $query->free_result();
-                return false;
-                }
-                
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

FreakAuth/trunk/www/system/application/libraries/Freakauth_light.php

@@ -69 +69 @@
-        * Function FreakAuth inizialises the class loading the right libraries, helpers and models
-        * 
-U
+u
-        * */
-    function Freakauth_light()
@@ -82 +82 @@
-        $this->CI->load->helper('freakauth_light');
-        $this->CI->load->model('FreakAuth_light/usertemp', 'UserTemp');
-U
+u
-        if($this->CI->config->item('FAL_create_user_profile'))
-            $this->CI->load->model('Userprofile', 'userprofile');
@@ -192 +192 @@
-     *
-     * else displays the FAL_denied_page (see config file)
-
-
+
+
+
+
+
+
-     */
-    function denyAccess($role)
@@ -312 +316 @@
-     * Returns true if a valid user is logged, false otherwise
-     * 
-unknow
+boolea
-     */
-    function isValidUser()
@@ -509 +513 @@
-    {
-        //let's clean the user_temp table
-
+
+
+
+
+
-        
-        //let's check if the system is turned on and if we allow users to register
@@ -527 +535 @@
-                $password_email=$password;
-                $password = $this->_encode($password);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-                {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-    
@@ -569 +611 @@
-    {   
-        //let's clean the user_temp table
-
+
+
+
+
+
-                
-        if (($id > 0) && ($activation_code != ''))
@@ -670 +716 @@
-                /**
-                 * recalls the function getUserForForgottenPasswordReset($id, $activation_code)
-U
+u
-                 * it queries the database looking for the user's $id and $activation_code
-                 */
@@ -1348 +1394 @@
-                
-}
-
-?>

FreakAuth/trunk/www/system/application/models/FreakAuth_light/usertemp.php

@@ -147 +147 @@
-        function getUserTempCreated()
-        {       
-
+ 
-                 
-        }