Changeset 1442

Timestamp:

04/16/06 21:10:16 (3 years ago)

Author:

mbonetti

Message:

Proper mobile login

Location:

trunk/rss

Files:

• cls/user.php (modified) (8 diffs)
• themes/default/mobile/plugins.php (modified) (1 diff)

trunk/rss/cls/user.php

@@ -42 +42 @@
     /** List of valid IP subnets this user is allowed to log in via a cookie */
     var $_validIPs;
+    /** Mobile session */
+    var $_mobileSession;
 
     /**
@@ -51 +53 @@
      */
     function RSSUser() {
+    
+            // We need sessions for the mobile version
+            ini_set('session.use_trans_sid',true);
+            session_start();
+    
         $this -> _uid = 0;
         $this -> _validIPs = array();
@@ -57 +64 @@
         $this -> _realName = '';
         $this -> _hash = null;
-
+                $this -> _mobileSession = (isset($_POST['media']) && 'mobile' == $_POST['media']);
+                
         if (array_key_exists('logout',$_GET)) {
             $this -> logout();
             rss_redirect('');
         }
-
+                
         $cuname = $chash = null;
         if (isset($_POST['username']) && isset($_POST['password'])) {
             $_cuname = trim($_POST['username']);
-            $_chash = md5($_POST['password']);
+            if ($this -> _mobileSession) {
+                $_chash = md5(md5($_POST['password'] . $_POST['username']));
+            } else {
+                $_chash = md5($_POST['password']);
+            }
             if ($this -> login($_cuname,$_chash)) {
                 $cuname = $_cuname;
@@ -77 +89 @@
         elseif(isset($_SESSION['mobile'])) {
             list($cuname,$chash) = explode('|',$_SESSION['mobile']);
+            $this -> _mobileSession = true;
         }
         if ($cuname && $chash) {
@@ -124 +137 @@
                    ." where uname = '$uname' ";
             rss_query($sql);
-            $this -> setUserCookie($uname,$pass);
+            if ($this -> _mobileSession) {
+                $this -> setUserSession($uname,$pass);
+            } else {
+                $this -> setUserCookie($uname,$pass);
+            }
             rss_invalidate_cache();
             return true;
@@ -136 +153 @@
      */
     function setUserCookie($user,$hash) {
-        // if (getConfig('rss.config.autologout')) {
-        //     $t = 0;
-        // } else {
-        $t =time()+COOKIE_LIFESPAN;
-        // }
+            $rs = rss_query(
+                'select value_ from ' .getTable('config') . "where key_ = 'rss.config.autologout'", false,true);
+                if (rss_is_sql_error(RSS_SQL_ERROR_NO_ERROR) && rss_num_rows($rs) > 0) {
+                    list($als) = rss_fetch_row($rs);
+                    $al = ($als == 'true');
+                } else {
+                    $al = false;
+                }
+        $t = $al ? 0: time()+COOKIE_LIFESPAN;
         setcookie(RSS_USER_COOKIE, $user .'|' . $hash , $t, getPath());
     }
 
+        function setUserSession($user,$hash) {
+            $_SESSION['mobile'] = $user . "|" . $hash;
+        }
+        
     /**
      * Logs the user out.
@@ -151 +176 @@
      */
     function logout() {
-        if (array_key_exists(RSS_USER_COOKIE, $_COOKIE)) {
+        if (array_key_exists(RSS_USER_COOKIE, $_COOKIE) || isset($_SESSION['mobile'])) {
             $subnet = preg_replace('#^([0-9]+\.[0-9]+\.[0-9]+)\.[0-9]+$#','\1',$_SERVER['REMOTE_ADDR']);
 
@@ -169 +194 @@
             unset($_COOKIE[RSS_USER_COOKIE]);
             setcookie(RSS_USER_COOKIE, "", -1, getPath());
+            if (isset($_SESSION['mobile'])) {
+                unset($_SESSION['mobile']);
+            }
+
             rss_invalidate_cache();
         }

trunk/rss/themes/default/mobile/plugins.php

@@ -3 +3 @@
 // stores constants for overrides' defaults
 require_once('mobileconstants.php');
-
-// Mobile theme relys on PHP sessions
-ini_set('session.use_trans_sid',true);
-session_start();
-
-//var_dump($_SESSION['mobile']);
 
 function __mobile_strip_images($i) {