BugTrack/2256 edit: Handle template loading button

[pukiwiki/pukiwiki.git] / plugin / loginform.inc.php

diff --git a/plugin/loginform.inc.php b/plugin/loginform.inc.php
index f6fb213..ea7d932 100644 (file)
--- a/plugin/loginform.inc.php
+++ b/plugin/loginform.inc.php
@@ -19,22 +19,24 @@ function plugin_loginform_convert()
 
 function plugin_loginform_action()
 {
-       global $auth_user, $auth_type;
-       $page_r = $_GET['page'];
-       $page = rawurldecode($page_r);
-       $pcmd = $_GET['pcmd'];
-       $url_after_login_r = $_GET['url_after_login'];
-       $url_after_login = rawurldecode($url_after_login_r);
-       $page_after_login_r = '';
-       if (!$url_after_login_r) $page_after_login_r = $page_r;
+       global $auth_user, $auth_type, $_loginform_messages;
+       $page = isset($_GET['page']) ? $_GET['page'] : '';
+       $pcmd = isset($_GET['pcmd']) ? $_GET['pcmd'] : '';
+       $url_after_login = isset($_GET['url_after_login']) ? $_GET['url_after_login'] : '';
+       $page_after_login = $page;
+       if (!$url_after_login) {
+               $page_after_login = $page;
+       }
        $action_url = get_script_uri() . '?plugin=loginform'
-               . '&page=' . $page_r
-               . ($url_after_login_r ? '&url_after_login=' . $url_after_login_r : '')
-               . ($page_after_login_r ? '&page_after_login=' . $page_after_login_r : '');
-       $username = $_POST['username'];
-       $password = $_POST['password'];
-       if (form_auth($username, $password)) {
-               form_auth_redirect($url_after_login, $page_after_login_r);
+               . '&page=' . rawurlencode($page)
+               . ($url_after_login ? '&url_after_login=' . rawurlencode($url_after_login) : '')
+               . ($page_after_login ? '&page_after_login=' . rawurlencode($page_after_login) : '');
+       $username = isset($_POST['username']) ? $_POST['username'] : '';
+       $password = isset($_POST['password']) ? $_POST['password'] : '';
+       $isset_user_credential = $username || $password ;
+       if ($username && $password && form_auth($username, $password)) {
+               // Sign in successfully completed
+               form_auth_redirect($url_after_login, $page_after_login);
                return;
        }
        if ($pcmd === 'logout') {
@@ -46,7 +48,10 @@ function plugin_loginform_action()
                                break;
                        case AUTH_TYPE_FORM:
                        case AUTH_TYPE_EXTERNAL:
+                       case AUTH_TYPE_SAML:
                        default:
+                               $_SESSION = array();
+                               session_regenerate_id(true); // require: PHP5.1+
                                session_destroy();
                                break;
                }
@@ -54,20 +59,90 @@ function plugin_loginform_action()
                return array(
                        'msg' => 'Log out',
                        'body' => 'Logged out completely<br>'
-                               . '<a href="'. get_script_uri() . '?' . $page_r . '">'
+                               . '<a href="'. get_script_uri() . '?' . pagename_urlencode($page) . '">'
                                . $page . '</a>'
                );
        } else {
                // login
+               ob_start();
+?>
+<style>
+  .loginformcontainer {
+    text-align: center;
+  }
+  .loginform table {
+    margin-top: 1em;
+       margin-left: auto;
+       margin-right: auto;
+  }
+  .loginform tbody td {
+    padding: .5em;
+  }
+  .loginform .label {
+    text-align: right;
+  }
+  .loginform .login-button-container {
+    text-align: right;
+  }
+  .loginform .loginbutton {
+    margin-top: 1em;
+  }
+  .loginform .errormessage {
+    color: red;
+  }
+</style>
+<div class="loginformcontainer">
+<form name="loginform" class="loginform" action="<?php echo htmlsc($action_url) ?>" method="post">
+<div>
+<table style="border:0">
+  <tbody>
+  <tr>
+    <td class="label"><label for="_plugin_loginform_username"><?php echo htmlsc($_loginform_messages['username']) ?></label></td>
+    <td><input type="text" name="username" value="<?php echo htmlsc($username) ?>" id="_plugin_loginform_username"></td>
+  </tr>
+  <tr>
+  <td class="label"><label for="_plugin_loginform_password"><?php echo htmlsc($_loginform_messages['password']) ?></label></td>
+  <td><input type="password" name="password" id="_plugin_loginform_password"></td>
+  </tr>
+<?php if ($isset_user_credential): ?>
+  <tr>
+    <td></td>
+    <td class="errormessage"><?php echo $_loginform_messages['invalid_username_or_password'] ?></td>
+  </tr>
+<?php endif ?>
+  <tr>
+    <td></td>
+    <td class="login-button-container"><input type="submit" value="<?php echo htmlsc($_loginform_messages['login']) ?>" class="loginbutton"></td>
+  </tr>
+  </tbody>
+</table>
+</div>
+<div>
+</div>
+</form>
+</div>
+<script><!--
+window.addEventListener && window.addEventListener("DOMContentLoaded", function() {
+  var f = window.document.forms.loginform;
+                               console.log(f);
+                               console.log(f.username);
+                               console.log(f.password);
+  if (f && f.username && f.password) {
+    if (f.username.value) {
+     f.password.focus && f.password.focus();
+       } else {
+     f.username.focus && f.username.focus();
+       }
+  }
+});
+//-->
+</script>
+<?php
+               $body = ob_get_contents();
+               ob_end_clean();
                return array(
-                       'msg' => 'Login',
-                       'body' => 'Please input username and password:'
-                       . '<form action="' . htmlsc($action_url) . '" method="post">'
-                       . 'Username: <input type="text" name="username"><br>'
-                       . 'Password: <input type="password" name="password"><br>'
-                       . '<input type="submit" value="Login">'
-                       . '</form>'
-                       . "<br>\n"
+                       'msg' => $_loginform_messages['login'],
+                       'body' => $body,
                        );
        }
 }