Changeset 1450

Timestamp:

04/24/06 17:33:25 (3 years ago)

Author:

mbonetti

Message:

experimental: only check for a valid IP when we actual log in. Should fix
the can't log in from distinct IPs bug

Files:

• trunk/rss/cls/user.php (modified) (5 diffs)

trunk/rss/cls/user.php

@@ -27 +27 @@
 ###############################################################################
 rss_require('cls/wrappers/user.php');
+
+define ('RSS_USER_ACTION_LOGIN',0x01);
+define ('RSS_USER_ACTION_COOKIE',0x02);
+define ('RSS_USER_ACTION_SESSION',0x04);
+define ('RSS_USER_ACTION_LOGOUT',0x08);
 
 /**
@@ -44 +49 @@
     /** Mobile session */
     var $_mobileSession;
+    /** Action */
+    var $_action;
 
     /**
@@ -60 +67 @@
         $this -> _realName = '';
         $this -> _hash = null;
-                $this -> _mobileSession = 
-                    isset($_POST['media']) && 'mobile' == $_POST['media'];
-                
-                if ('mobile' ==  getThemeMedia()) {
-                    ini_set('session.use_trans_sid',true);
-                session_start();
-                }
+        
+        
+        $this -> _mobileSession = 
+            isset($_POST['media']) && 'mobile' == $_POST['media'];
+        
+        if ('mobile' ==  getThemeMedia()) {
+            ini_set('session.use_trans_sid',true);
+            session_start();
+        }
                 
         if (array_key_exists('logout',$_GET)) {
@@ -84 +93 @@
                 $cuname = $_cuname;
                 $chash = $_chash;
+                $this -> _action = RSS_USER_ACTION_LOGIN;
             }
         }
         elseif (isset($_COOKIE[RSS_USER_COOKIE])) {
             list($cuname,$chash) = explode('|',$_COOKIE[RSS_USER_COOKIE]);
+            $this -> _action = RSS_USER_ACTION_COOKIE;
         }
         elseif(isset($_SESSION['mobile'])) {
             list($cuname,$chash) = explode('|',$_SESSION['mobile']);
             $this -> _mobileSession = true;
+            $this -> _action = RSS_USER_ACTION_SESSION;
         }
         if ($cuname && $chash) {
@@ -102 +114 @@
                 $userIPs = explode(' ',$tmpUserIps);
                 $subnet = preg_replace('#^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$#','\1',$_SERVER['REMOTE_ADDR']);
-                if (array_search($subnet, $userIPs) !== FALSE) {
+                if ((array_search($subnet, $userIPs) !== FALSE) || ($this -> _action != RSS_USER_ACTION_COOKIE)) {
                     $this -> _uid = $uid;
                     $this -> _uname = $uname;