part of #34: store last openid and pre-fill URL field

diff --git a/data/templates/login.htm b/data/templates/login.htm
index a825023623b4030016134663d54f321b8b6f5d03..08953c8045c6cec2d6135c7b926b2cd4280fd58c 100644 (file)
--- a/data/templates/login.htm
+++ b/data/templates/login.htm
@@ -21,7 +21,7 @@
     </div>
     <div id="openid_input_area">
       <p>or enter your OpenID URL.</p>
-      <input id="openid_url" type="text" name="openid_url" value="http://" />
+      <input id="openid_url" type="text" name="openid_url" value="{{openid}}" />
       <input class="btn" id="openid_submit" type="submit" value="Sign in" />
     </div>
   </div>

diff --git a/www/login.php b/www/login.php
index fbd337dbd7edba95a63a3f8167c0a00771b57965..fb396b9a8b1a2f496a75de6cb0818d481a68f42f 100644 (file)
--- a/www/login.php
+++ b/www/login.php
@@ -11,7 +11,13 @@ if (isset($_REQUEST['logout'])) {
 }
 
 if (!count($_GET) && !count($_POST)) {
-    render('login');
+    render(
+        'login',
+        array(
+            'openid' => isset($_COOKIE['lastopenid'])
+                ? $_COOKIE['lastopenid'] : 'http://'
+        )
+    );
     exit();
 }
 
@@ -150,6 +156,8 @@ $name = isset($openid['openid.ax.value.fullname'])
 $_SESSION['name'] = isset($name) ? $name : $_SERVER['REMOTE_ADDR'];
 $_SESSION['identity'] = $openid['openid.identity'];
 
+setcookie('lastopenid', $_SESSION['identity'], time() + 84600 * 60, '/login');
+
 if (isset($_SESSION['REQUEST_URI'])) {
     $redirect = Tools::fullUrl($_SESSION['REQUEST_URI']);
 } else {