Changeset 10245

Timestamp:

Feb 26, 2007 3:39:56 PM (13 years ago)

Author:

saraj

Message:

inactive user able to login through thunderbird plugin - fixed. Fixes #3084

Location:

vtigercrm/branches/5.0.3/soap

Files:

• thunderbirdplugin.php (modified) (1 diff)
• wordplugin.php (modified) (1 diff)

vtigercrm/branches/5.0.3/soap/thunderbirdplugin.php

@@ -491 +491 @@
   require_once('modules/Users/Users.php');
         $objuser = new Users();
-  if($password != "" && $user_name != '')
-        {
-                $objuser->column_fields['user_name'] = $user_name;
-                $encrypted_password = $objuser->encrypt_password($password);
-                $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
-                $result = $adb->query($query);
-                if($adb->num_rows($result) > 0)
+        if($password != "" && $user_name != '')
+        {
+                if($objuser->is_authenticated())
                 {
-                        $return_access = 'success';
-                        $log->debug("Logged in sucessfully from thunderbirdplugin");
-                }else
+                        $objuser->column_fields['user_name'] = $user_name;
+                        $encrypted_password = $objuser->encrypt_password($password);
+                        $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+                        $result = $adb->query($query);
+                        if($adb->num_rows($result) > 0)
+                        {
+                                $return_access = 'success';
+                                $log->debug("Logged in sucessfully from thunderbirdplugin");
+                        }else
+                        {
+                                $return_access = 'failure';
+                                $log->debug("Logged in failure from thunderbirdplugin");
+                        }
+                }
+                else
                 {
                         $return_access = 'failure';
-                        $log->debug("Logged in failure from thunderbirdplugin");
                 }
         }else

vtigercrm/branches/5.0.3/soap/wordplugin.php

@@ -328 +328 @@
         if($password != "" && $user_name != '')
         {
-                $objuser->column_fields['user_name'] = $user_name;
-                $encrypted_password = $objuser->encrypt_password($password);
-                $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
-                $result = $adb->query($query);
-                if($adb->num_rows($result) > 0)
+                if($objuser->is_authenticated())
                 {
-                        $return_access = "TempSessionID";
-                        $log->debug("Logged in sucessfully from wordplugin");
-                }else
+                        $objuser->column_fields['user_name'] = $user_name;
+                        $encrypted_password = $objuser->encrypt_password($password);
+                        $query = "select id from vtiger_users where user_name='$user_name' and user_password='$encrypted_password'";
+                        $result = $adb->query($query);
+                        if($adb->num_rows($result) > 0)
+                        {
+                                $return_access = "TempSessionID";
+                                $log->debug("Logged in sucessfully from wordplugin");
+                        }else
+                        {
+                                $return_access = "false";
+                                $log->debug("Logged in failure from wordplugin");
+                        }
+                }
+                else
                 {
                         $return_access = "false";
-                        $log->debug("Logged in failure from wordplugin");
+                        $log->debug("Logged in failure from wordplugin when the user is not authenticated");
                 }
         }else