Changeset 56

Timestamp:

04/12/07 04:57:54

Author:

grahack

Message:

FAL: adding convenient helper functions to get user infos (the one connected or others) + adding some more user info in db_session + renaming the 'username' key in this db_session to 'user_name'

Files:

• FreakAuth/trunk/www/system/application/controllers/example.php (modified) (1 diff)
• FreakAuth/trunk/www/system/application/helpers/freakauth_light_helper.php (modified) (1 diff)
• FreakAuth/trunk/www/system/application/libraries/Freakauth_light.php (modified) (9 diffs)
• FreakAuth/trunk/www/system/language/english/freakauth_lang.php (modified) (1 diff)

FreakAuth/trunk/www/system/application/controllers/example.php

@@ -16 +16 @@
-                 
-                        echo '<h1>You can view this message because you logged in and are at least an user!</h1>';
-
-
+
+
+
+
-}
-?>

FreakAuth/trunk/www/system/application/helpers/freakauth_light_helper.php

@@ -35 +35 @@
-    $obj =& get_instance();
-    return $obj->freakauth_light->getUserName();
+}
+
+// ------------------------------------------------------------------------
+//
+// Returns the currently logged on user's prop.
+// Returns an empty string if no user is logged in.
+//
+function getUserProperty($prop)
+{
+    $obj =& get_instance();
+    return $obj->freakauth_light->getUserProperty($prop);
+}
+
+// ------------------------------------------------------------------------
+//
+// Returns the prop of the user identified by $id
+// Returns a message if the user does not exist
+// Returns an empty string if $prop is unknown.
+//
+function getUserPropertyFromId($id, $prop)
+{
+        $obj =& get_instance();
+    return $obj->freakauth_light->getUserPropertyFromId($id, $prop);
-}
-

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

@@ -194 +194 @@
-        if ($this->CI->db_session AND $this->CI->config->item('FAL'))
-        {
-
+_
-            $_role = $this->CI->db_session->userdata('role');
-            
@@ -222 +222 @@
-        if ($this->CI->db_session AND $this->CI->config->item('FAL'))
-        {
-
+_
-            $_role = $this->CI->db_session->userdata('role');
-            
@@ -246 +246 @@
-        if ($this->CI->db_session AND $this->CI->config->item('FAL'))
-        {
-
+_
-            $_role = $this->CI->db_session->userdata('role');
-            
@@ -281 +281 @@
-        if ($this->CI->db_session AND $this->CI->config->item('FAL'))
-        {
-
+_
-            $_who_is = $this->CI->db_session->userdata('role');
-            
@@ -369 +369 @@
-                {
-                    $row = $query->row();
-userdata['id'] = $row->{'id'};
-$userdata['username'] = $row->{'user_name'};                    
-$userdata['role'] = $row->{'role'
-
+fields = array('id', 'user_name', 'country_id', 'email',
+              'role', 'last_visit', 'created', 'modified');
+foreach($fields as $field) $userdata[$field] = $row->{$field
+
-                    //verifies if an user has not been banned from the site (i.e. user table, banned=1)
-banned
+row->{'banned'}
-                    {
-                        $this->_set_logindata($userdata);
@@ -408 +408 @@
-        if ($this->CI->db_session)
-        {
-
+_
-
-            if ($_username != false)
@@ -705 +705 @@
-    function _unset_user($_username)
-    {
-
+_
-        
-        if (isset($users))
@@ -712 +712 @@
-            //is better to do a 1 call to unset_userdata passing an array?
-            $this->CI->db_session->unset_userdata('id');
-
+_
-            $this->CI->db_session->unset_userdata('role');
-        }
@@ -764 +764 @@
-            
-                // returns username string of currently logged in user
-
+_
-        
-        // returns empty string if user not logged in
-        return '';
+    }
+    
+        // --------------------------------------------------------------------
+    
+    /**
+     * Returns the currently logged in user's prop
+     * Returns an empty string if no user is logged in
+     * uses function isValidUser()
+     * and Class db_session method "userdata".
+     * 
+     * @return prop string of currently logged in user
+     * @return empty string if user not logged in
+     */
+    function getUserProperty($prop)
+    {
+        if ($this->CI->config->item('FAL') && $this->CI->db_session && ($this->isValidUser() OR $this->isAdmin()))
+            
+                // returns property string of currently logged in user
+                return $this->CI->db_session->userdata($prop);
+        
+        // returns empty string if user not logged in
+        return '';
+    }
+    
+
+    /**
+     * Returns the prop of the user identified by $id
+     * Returns an empty string if no user is logged in
+     * uses function isValidUser()
+     * and Class db_session method "userdata".
+     * 
+     * @return prop string of currently logged in user
+     * @return empty string if user not logged in
+     */
+    function getUserPropertyFromId($id, $prop)
+    {
+                $query = $this->CI->usermodel->getUserById($id);
+                if ($query->num_rows() == 1)
+                {
+                        $row = $query->row();
+                        if (isset($row->{$prop})) return $row->{$prop};
+                        else return '';
+                }
+                else
+                {
+                        $this->CI->lang->load('freakauth');
+                        return $this->CI->lang->line('FAL_unknown_user');
+                }
-    }
-    

FreakAuth/trunk/www/system/language/english/freakauth_lang.php

@@ -38 +38 @@
-$lang['FAL_citation_message'] = 'Thank You!';
-$lang['FAL_already_logged_in_msg'] = 'you have already logged in!';
+
+$lang['FAL_unknown_user'] = 'utilisateur inconnu';
-
-//------------------------------------------------------------------