Changeset 106

Timestamp:

04/19/07 04:45:59

Author:

danfreak

Message:

"FAL: backend validation=> moved functions from controllers to FAL_validation library, edited views FreakAuth/admin/users/edit and FreakAuth/admin/users/add for complaince with FAL_validation lib, corrected 1 bug in password_backend_check function"

Files:

• FreakAuth/trunk/www/system/application/controllers/admin/admins.php (modified) (10 diffs)
• FreakAuth/trunk/www/system/application/controllers/admin/users.php (modified) (10 diffs)
• FreakAuth/trunk/www/system/application/libraries/FAL_validation.php (modified) (6 diffs)
• FreakAuth/trunk/www/system/application/views/FreakAuth_light/template_admin/users/add.php (modified) (7 diffs)
• FreakAuth/trunk/www/system/application/views/FreakAuth_light/template_admin/users/edit.php (modified) (8 diffs)

FreakAuth/trunk/www/system/application/controllers/admin/admins.php

@@ -6 +6 @@
- * requests.  It also can verify the logged in status of a user and his permissions.
- *
-
+, FAL_validation
- *
- * @package     FreakAuth
@@ -48 +48 @@
-        $this->lang->load('freakauth');
-        $this->load->model('FreakAuth_light/usermodel', 'usermodel');
-
-
+
+
+
+
+
+
+
+
-
-                //sets the necessary form fields
@@ -67 +73 @@
-        //additionalFields($fields);
-        
-
+fal_
-        
-    }
@@ -217 +223 @@
-    {      
-        //set validation rules
-callback__username_check|callback__username
-callback__passwor
+username_check|username_backend
+password_backen
-        $rules['password_confirm'] = "trim|required|xss_clean|matches[password]";
-callback__email
+email_backend
-        $rules['role'] = 'required';
-        $rules['banned'] = 'is_numeric';
-        
-
+fal_
-        //do we want to set the country?
-        //(looks what we set in the freakauth_light.php config)
@@ -239 +245 @@
-                    $fields = $data['fields']; 
-                    
-
+fal_
-                        
-
+fal_
-                }
-                        
-
+fal_
-       
-        
-        
-        //if validation unsuccesfull & data not ok
-
+fal_
-                {
-                        //$countries = null;            
@@ -311 +317 @@
-        
-        //set validation rules
-callback__username_check|callback__username
-callback__passwor
+username_check|username_backend
+password_backen
-        $rules['password_confirm'] = "trim|xss_clean|matches[password]";
-callback__email
+email_backend
-        $rules['role'] = 'required';
-        $rules['banned'] = 'is_numeric';
-        
-        
-
+fal_
-        //do we want to set the country?
-        //(looks what we set in the freakauth_light.php config)
@@ -334 +340 @@
-                    $fields = $data['fields']; 
-                    
-
-
-
-
-
-
-
+fal_
+
+
+
+fal_
+
+fal_
-        
-        //id field needed for validation
@@ -346 +352 @@
-        $fields['role'] = 'role';
-        
-
+fal_
-        
-                $data['role_options'] = array_keys($this->config->item('FAL_roles'));
@@ -388 +394 @@
-            }
-                        
-
+fal_
-        {
-                $data['heading'] = 'Admin management';
@@ -554 +560 @@
-        return false;
-    }
-    
-    // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     *
-     * @param form value $value
-     * @return boolean
-     */
-        function _password_check($value)
-        {       
-                if ($value='' AND isset($_POST['id']))
-                {
-                        $callback = '_password_check';
-                        return $this->_is_valid_text($callback, $value, $this->config->item('FAL_user_password_min'), $this->config->item('FAL_user_password_max'));
-                }
-           
-        }
-        
-        // --------------------------------------------------------------------
-
-    /**
-     * RULES HELPER FUNCTION
-     * User name validation callback for validation against min-max length settings
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _username_check($value)
-        {       
-                $callback = '_username_check';
-            return $this->_is_valid_text($callback, $value, $this->config->item('FAL_user_name_min'), $this->config->item('FAL_user_name_max'));
-        }
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * User name duplicate validation callback for validation against duplicate username in DB
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _username_duplicate_check($value)
-        {
-                //checks if the request comes from add or edit actions
-        $fields='id';
-                isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'user_name'=>$value) : $where=null;
-        $query = $this->usermodel->getUsers($fields, $limit=null, $where);
-        
-        //checks if the request comes from add or edit actions
-        //query in temporary user table (users waiting for activation)
-        $this->load->model('FreakAuth_light/UserTemp');
-        $fields='id';
-        isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'user_name'=>$value) : $where=null;
-        $query_temp = $this->UserTemp->getUserTemp($fields, $limit=null, $where);
-        
-
-        if (($query != null) && ($query->num_rows() > 0) OR ($query_temp != null) && ($query_temp->num_rows() > 0))
-            {
-                $this->validation->set_message('_username_duplicate_check', $this->lang->line('FAL_in_use_validation_message'));
-                    return false;
-                }
-                
-                return true;
-        }
-                
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * User name duplicate validation callback for validation against duplicate username in DB
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _email_duplicate_check($value)
-        {       
-                //Use the input e-mail and check against 'users' table
-            //checks if the request comes from add or edit actions
-                //query in main user table (users already activated)
-            $fields='id';
-                isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'email'=>$value) : $where=null;
-        $query = $this->usermodel->getUsers($fields, $limit=null, $where);
-
-        
-        //query in temporary user table (users waiting for activation)
-        //checks if the request comes from add or edit actions
-        //query in main user table (users already activated)
-             $this->load->model('FreakAuth_light/UserTemp');
-             $fields='id';
-                 isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'email'=>$value) : $where=null;
-         $query_temp = $this->UserTemp->getUserTemp($fields, $limit=null, $where);
-
-                
-        if (($query != null) && ($query->num_rows() > 0))
-            {
-                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_user_email_duplicate'));
-                    
-                $query->free_result();
-                return false;
-                }
-                
-                 if (($query_temp != null) && ($query_temp->num_rows() > 0))
-            {
-                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_usertemp_email_duplicate'));
-                    
-                $query_temp->free_result();
-                return false;
-                }
-                
-                
-                //return true;
-        }
-        
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * Checks if a country has been chosen in the select country form element
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _country_check($country_id)
-        {
-            if ($this->config->item('FAL_use_country'))
-            {
-            if ($country_id == 0)
-            {
-                $this->validation->country_id= $country_id;
-                $this->validation->set_message('_country_check', 'Please specify a country');
-                    return FALSE;
-                }
-        }
-                
-                return true;
-        }
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * Determines if a input text has valid characters and meets min/max length requirements
-     *
-     * @access private
-     * @param unknown_type $callback
-     * @param varchar $value
-     * @param integer $min
-     * @param integer $max
-     * @param varchar $invalid_message
-     * @param unknown_type $expression
-     * @return boolean
-     */
-    function _is_valid_text($callback, $value, $min, $max, $invalid_message = null, $expression = '/^([a-z0-9])([a-z0-9_\-])*$/ix')
-        {
-            $message = '';
-            if ((strlen($value) < $min) ||
-                (strlen($value) > $max))
-                $message .= sprintf($this->lang->line('FAL_lenght_validation_message'), $min, $max);
-                
-            if (!preg_match($expression, $value))
-                $message .= $this->lang->line('FAL_allowed_characters_validation_message');
-                
-                if ($message != '')
-                {
-                    if (!isset($invalid_message))
-                        $invalid_message = $this->lang->line('FAL_invalid_validation_message');
-                    $this->validation->set_message($callback, $invalid_message.$message);
-                return false;
-                }
-                
-                return true;
-        }
-}
-?>

FreakAuth/trunk/www/system/application/controllers/admin/users.php

@@ -6 +6 @@
- * requests.  It also can verify the logged in status of a user and his permissions.
- *
-
+, FAL_validation
- *
- * @package     FreakAuth
@@ -47 +47 @@
-        $this->lang->load('freakauth');
-        $this->load->model('FreakAuth_light/usermodel', 'usermodel');
-
-
+
+
+
+
+
+
+
+
-
-                //sets the necessary form fields
@@ -66 +72 @@
-        //additionalFields($fields);
-        
-
+fal_
-        
-    }
@@ -218 +224 @@
-    {      
-        //set validation rules
-callback__username_check|callback__username
-callback__passwor
+username_check|username_backend
+password_backen
-        $rules['password_confirm'] = "trim|required|xss_clean|matches[password]";
-callback__email
+email_backend
-        $rules['role'] = 'trim|required';
-        $rules['banned'] = 'is_numeric';
-        
-
+fal_
-        //do we want to set the country?
-        //(looks what we set in the freakauth_light.php config)
@@ -240 +246 @@
-                    $fields = $data['fields']; 
-                    
-
+fal_
-                        
-
+fal_
-                }
-                        
-
+fal_
-       
-        
-        
-        //if validation unsuccesfull & data not ok
-
+fal_
-                {
-                        //$countries = null;            
@@ -324 +330 @@
-        
-        //set validation rules
-callback__username_check|callback__username
-callback__passwor
+username_check|username_backend
+password_backen
-        $rules['password_confirm'] = "trim|xss_clean|matches[password]";
-callback__email
+email_backend
-        $rules['role'] = 'required';
-        $rules['banned'] = 'is_numeric';
-        
-        
-
+fal_
-        //do we want to set the country?
-        //(looks what we set in the freakauth_light.php config)
@@ -347 +353 @@
-                    $fields = $data['fields']; 
-                    
-
-
-
-
-
-
-
+fal_
+
+
+
+fal_
+
+fal_
-        
-        //id field needed for validation
@@ -359 +365 @@
-        $fields['role'] = 'role';
-        
-
+fal_
-        
-                $data['role_options'] = array_keys($this->config->item('FAL_roles'));
@@ -401 +407 @@
-            }
-                        
-
+fal_
-        {
-                $data['heading'] = 'Users management';
@@ -547 +553 @@
-        return false;
-    }
-    
-    // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     *
-     * @param form value $value
-     * @return boolean
-     */
-        function _password_check($value)
-        {       
-                if ($value='' AND isset($_POST['id']))
-                {
-                        $callback = '_password_check';
-                        return $this->_is_valid_text($callback, $value, $this->config->item('FAL_user_password_min'), $this->config->item('FAL_user_password_max'));
-                }
-           
-        }
-        
-        // --------------------------------------------------------------------
-
-    /**
-     * RULES HELPER FUNCTION
-     * User name validation callback for validation against min-max length settings
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _username_check($value)
-        {       
-                $callback = '_username_check';
-            return $this->_is_valid_text($callback, $value, $this->config->item('FAL_user_name_min'), $this->config->item('FAL_user_name_max'));
-        }
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * User name duplicate validation callback for validation against duplicate username in DB
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _username_duplicate_check($value)
-        {
-                //checks if the request comes from add or edit actions
-        $fields='id';
-                isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'user_name'=>$value) : $where=null;
-        $query = $this->usermodel->getUsers($fields, $limit=null, $where);
-        
-        //checks if the request comes from add or edit actions
-        //query in temporary user table (users waiting for activation)
-        $this->load->model('FreakAuth_light/UserTemp');
-        $fields='id';
-        isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'user_name'=>$value) : $where=null;
-        $query_temp = $this->UserTemp->getUserTemp($fields, $limit=null, $where);
-        
-
-        if (($query != null) && ($query->num_rows() > 0) OR ($query_temp != null) && ($query_temp->num_rows() > 0))
-            {
-                $this->validation->set_message('_username_duplicate_check', $this->lang->line('FAL_in_use_validation_message'));
-                    return false;
-                }
-                
-                return true;
-        }
-                
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * User name duplicate validation callback for validation against duplicate username in DB
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _email_duplicate_check($value)
-        {       
-                //Use the input e-mail and check against 'users' table
-            //checks if the request comes from add or edit actions
-                //query in main user table (users already activated)
-            $fields='id';
-                isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'email'=>$value) : $where=null;
-        $query = $this->usermodel->getUsers($fields, $limit=null, $where);
-
-        
-        //query in temporary user table (users waiting for activation)
-        //checks if the request comes from add or edit actions
-        //query in main user table (users already activated)
-             $this->load->model('FreakAuth_light/UserTemp');
-             $fields='id';
-                 isset($_POST['id']) ? $where = array('id !='=> $_POST['id'], 'email'=>$value) : $where=null;
-         $query_temp = $this->UserTemp->getUserTemp($fields, $limit=null, $where);
-
-                
-        if (($query != null) && ($query->num_rows() > 0))
-            {
-                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_user_email_duplicate'));
-                    
-                $query->free_result();
-                return false;
-                }
-                
-                 if (($query_temp != null) && ($query_temp->num_rows() > 0))
-            {
-                $this->validation->set_message('_email_duplicate_check', $this->lang->line('FAL_usertemp_email_duplicate'));
-                    
-                $query_temp->free_result();
-                return false;
-                }
-                
-                
-                //return true;
-        }
-        
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * Checks if a country has been chosen in the select country form element
-     *
-     * @access private
-     * @param varchar $value
-     * @return boolean
-     */
-    function _country_check($country_id)
-        {
-            if ($this->config->item('FAL_use_country'))
-            {
-            if ($country_id == 0)
-            {
-                $this->validation->country_id= $country_id;
-                $this->validation->set_message('_country_check', 'Please specify a country');
-                    return FALSE;
-                }
-        }
-                
-                return true;
-        }
-        
-        // --------------------------------------------------------------------
-        
-    /**
-     * RULES HELPER FUNCTION
-     * Determines if a input text has valid characters and meets min/max length requirements
-     *
-     * @access private
-     * @param unknown_type $callback
-     * @param varchar $value
-     * @param integer $min
-     * @param integer $max
-     * @param varchar $invalid_message
-     * @param unknown_type $expression
-     * @return boolean
-     */
-    function _is_valid_text($callback, $value, $min, $max, $invalid_message = null, $expression = '/^([a-z0-9])([a-z0-9_\-])*$/ix')
-        {
-            $message = '';
-            if ((strlen($value) < $min) ||
-                (strlen($value) > $max))
-                $message .= sprintf($this->lang->line('FAL_lenght_validation_message'), $min, $max);
-                
-            if (!preg_match($expression, $value))
-                $message .= $this->lang->line('FAL_allowed_characters_validation_message');
-                
-                if ($message != '')
-                {
-                    if (!isset($invalid_message))
-                        $invalid_message = $this->lang->line('FAL_invalid_validation_message');
-                    $this->validation->set_message($callback, $invalid_message.$message);
-                return false;
-                }
-                
-                return true;
-        }
-}
-?>

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

@@ -38 +38 @@
- * @license                     http://www.gnu.org/licenses/lgpl.html
- * @link                        http://www.ciforge.com/freakauth/
-Optimization
+eliminate some hardcoded languages, check validation against user_temp table
- * @version             1.0.3
- * @tutorial        http://www.ciforge.com/trac/freakauth/wiki/FreakAuthDoc
@@ -71 +71 @@
-                $callback = 'password_check';
-            return $this->is_valid_text($callback, $value, $this->CI->config->item('FAL_user_password_min'), $this->CI->config->item('FAL_user_password_max'));
+        }
+        
+        // --------------------------------------------------------------------
+        
+    /**
+     * Rule used in admin backend: it get applyed only if the password field
+     * has a value, namely if the password get changed
+     *
+     * @param form value $value
+     * @return boolean
+     */
+        function password_backend_check($value)
+        {       
+                if ($value!='' AND isset($_POST['id']))
+                {
+                        $callback = 'password_backend_check';
+                        return $this->is_valid_text($callback, $value, $this->CI->config->item('FAL_user_password_min'), $this->CI->config->item('FAL_user_password_max'));
+                }
+           
-        }
-        
@@ -228 +247 @@
-        $query = $this->CI->UserModel->getUserByUsername($value);
-        //query in temporary user table (users waiting for activation)
-        $this->load->model('Usertemp', 'UserTemp');
-        $fields='id';
-        $where=array('user_name'=>$value);
-
+CI->
-
-        if (($query != null) && ($query->num_rows() > 0) OR ($query_temp != null) && ($query_temp->num_rows() > 0))
-            {
-                $this->set_message('username_duplicate_check', $this->CI->lang->line('FAL_in_use_validation_message'));
+                    return false;
+                }
+                
+                return true;
+        }
+        
+        // --------------------------------------------------------------------
+        
+    /**
+     * User name duplicate validation callback for validation against duplicate username in DB.
+     * Used in backend.
+     *
+     * @access private
+     * @param varchar $value
+     * @return boolean
+     */
+    function username_backend_duplicate_check($value)
+        {
+                //checks if the request comes from add or edit actions
+        $fields='id';
+                $where= isset($_POST['id']) ? array('id !='=> $_POST['id'], 'user_name'=>$value) : null;
+        $query = $this->CI->UserModel->getUsers($fields, $limit=null, $where);
+        
+        //checks if the request comes from add or edit actions
+        //query in temporary user table (users waiting for activation)
+        $fields='id';
+        $where = isset($_POST['id']) ?  array('id !='=> $_POST['id'], 'user_name'=>$value) : null;
+        $query_temp = $this->CI->UserTemp->getUserTemp($fields, $limit=null, $where);
+        
+
+        if (($query != null) && ($query->num_rows() > 0) OR ($query_temp != null) && ($query_temp->num_rows() > 0))
+            {
+                $this->set_message('username_backend_duplicate_check', $this->CI->lang->line('FAL_in_use_validation_message'));
-                    return false;
-                }
@@ -260 +311 @@
-                $fields='id';
-        $where=array('email'=>$value);
-
+CI->
-        
-        if (($query != null) && ($query->num_rows() > 0))
@@ -276 +327 @@
-                
-                return true;
+        }
+        
+        // --------------------------------------------------------------------
+        
+    /**
+     * User name duplicate validation callback for validation against duplicate username in DB.
+     * This function is used in the backend administration
+     *
+     * @access private
+     * @param varchar $value
+     * @return boolean
+     */
+    function email_backend_duplicate_check($value)
+        {       
+                //Use the input e-mail and check against 'users' table
+            //checks if the request comes from add or edit actions
+                //query in main user table (users already activated)
+            $fields='id';
+                $where = isset($_POST['id']) ?  array('id !='=> $_POST['id'], 'email'=>$value) : null;
+        $query = $this->CI->UserModel->getUsers($fields, $limit=null, $where);
+
+        
+        //query in temporary user table (users waiting for activation)
+        //checks if the request comes from add or edit actions
+        //query in main user table (users already activated)
+             $fields='id';
+                 $where = isset($_POST['id']) ?  array('id !='=> $_POST['id'], 'email'=>$value) : null;
+         $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;
+                }
+                
+                 if (($query_temp != null) && ($query_temp->num_rows() > 0))
+            {
+                $this->set_message('email_backend_duplicate_check', $this->CI->lang->line('FAL_usertemp_email_duplicate'));
+                    
+                $query_temp->free_result();
+                return false;
+                }
+                
+                
+                //return true;
-        }
-        
@@ -319 +418 @@
-            if ($country_id == 0)
-            {
-
+//
-                $this->set_message('country_check', $this->CI->lang->line('FAL_country_validation_message'));
-                    return FALSE;

FreakAuth/trunk/www/system/application/views/FreakAuth_light/template_admin/users/add.php

@@ -16 +16 @@
-                            'maxlength'=>'45', 
-                            'size'=>'25',
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-
-<?php }
@@ -37 +37 @@
-                               'maxlength'=>'45', 
-                               'size'=>'35',
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-          </p>
-    
@@ -46 +46 @@
-                               'maxlength'=>'120', 
-                               'size'=>'35',
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-      </p>
-
@@ -55 +55 @@
-                               'maxlength'=>'16', 
-                               'size'=>'16',
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-      </p>
-
@@ -64 +64 @@
-                               'maxlength'=>'16', 
-                               'size'=>'16',
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-     </p>
-
@@ -74 +74 @@
-      <?=form_dropdown('country_id',
-                         $countries,
-validation) ? $this->
-validation) ? $this->
+fal_validation) ? $this->fal_
+fal_validation) ? $this->fal_
-    </p>
-    
@@ -85 +85 @@
-         <?php foreach ($role_options as $value)
-         {?>
-
+fal_
-         <?php 
-         }
-         ?>
-         </select>
-validation) ? $this->
+fal_validation) ? $this->fal_
-        </p>
-