pluf2 Commit Details

Date:

2008-12-19 03:33:02 (16 years 10 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

4cdca4b8334676376c10f325b9927a63827b555c

Parents:

b519e074b6d00dbf4b247bf22a95868a946c110d

Message:

Fixed to correctly remove the test cookie after a good login.

Changes:

File differences

-156
157 157
158 158
159 
160 
159
160
161
161 162
162 163
163 164
+            }␊
            foreach ($this->cookies as $cookie => $data) {␊
                // name, data, expiration, path, domain, secure, http only␊
                setcookie($cookie, $data, ␊
                          time()+31536000, ␊
                $expire = (null == $data) ? time()-31536000 : time()+31536000;␊
                $data = (null == $data) ? '' : $data;␊
                setcookie($cookie, $data, $expire,␊
                          Pluf::f('cookie_path', '/'), ␊
                          Pluf::f('cookie_domain', null), ␊
                          Pluf::f('cookie_secure', false), ␊
             }␊
             foreach ($this->cookies as $cookie => $data) {␊
                 // name, data, expiration, path, domain, secure, http only␊
-                setcookie($cookie, $data, ␊
-                          time()+31536000, ␊
+                $expire = (null == $data) ? time()-31536000 : time()+31536000;␊
+                $data = (null == $data) ? '' : $data;␊
+                setcookie($cookie, $data, $expire,␊
                           Pluf::f('cookie_path', '/'), ␊
                           Pluf::f('cookie_domain', null), ␊
                           Pluf::f('cookie_secure', false), ␊

-128
129 129
130 130
131 
131
132 132
133 133
134 134
+            $data['Pluf_Session_key'] = $request->session->session_key;␊
            $response->cookies[$request->session->cookie_name] = self::_encodeData($data);␊
        }␊
        if ($request->session->set_test_cookie != null) {␊
        if ($request->session->set_test_cookie != false) {␊
            $response->cookies[$request->session->test_cookie_name] = $request->session->test_cookie_value;␊
        }␊
        return $response;␊
             $data['Pluf_Session_key'] = $request->session->session_key;␊
             $response->cookies[$request->session->cookie_name] = self::_encodeData($data);␊
         }␊
-        if ($request->session->set_test_cookie != null) {␊
+        if ($request->session->set_test_cookie != false) {␊
             $response->cookies[$request->session->test_cookie_name] = $request->session->test_cookie_value;␊
         }␊
         return $response;␊

-160
161 161
162 162
163 
163
164
164 165
165 166
+␊
    public function deleteTestCookie()␊
    {␊
        $this->set_test_cookie = false;␊
        $this->set_test_cookie = true;␊
        $this->test_cookie_value = null;␊
    }␊
}␊
 ␊
     public function deleteTestCookie()␊
     {␊
-        $this->set_test_cookie = false;␊
+        $this->set_test_cookie = true;␊
+        $this->test_cookie_value = null;␊
     }␊
 }␊