From 74216a3c636673fd49e82a7c31c0c9ed1de60e7f Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Wed, 12 Nov 2008 21:42:40 +0000 Subject: The login processing is starting to take shape. Login_Form is gone. The html for the login form is retrieve via an ajax call when the user clicks on login. Can't login with a valid id yet, but you certainly get error messages when things are wrong :-) --- modules/user/controllers/login.php | 29 ++++++++++++++++++----- modules/user/libraries/Login_Form.php | 44 ----------------------------------- modules/user/views/login.html.php | 41 ++++++++++++++++---------------- themes/default/css/screen.css | 6 ++--- themes/default/js/login.js | 37 ++++++++++++++++++++++++++++- themes/default/views/header.html.php | 3 +-- 6 files changed, 83 insertions(+), 77 deletions(-) delete mode 100644 modules/user/libraries/Login_Form.php diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php index e6f10ec8..991fa73b 100644 --- a/modules/user/controllers/login.php +++ b/modules/user/controllers/login.php @@ -19,24 +19,41 @@ */ class Login_Controller extends Controller { public function index() { - $this->template->title = "User Login"; + Kohana::log("debug", "Login_Controller/index"); + $form = new Forge(); + $form->input("username")->rules("required|length[4,32]"); + $form->password("password")->rules("required|length[5,40]"); + $form->submit("Login"); + print $form->render("login.html", true); + } + + public function process() { + Kohana::log("debug", "Login_Controller/process"); - $form = new Login_Form(); + Kohana::log("debug", print_r($_POST, true)); + $form = new Forge("login.html", true); + $form->input("username")->rules("required|length[4,32]"); + $form->password("password")->rules("required|length[5,40]"); + $form->submit("Login"); + $response = array(); if ($form->validate()) { // Load the user $user = ORM::factory("user")->where("name", $form->username->value)->find(); if (!$user->loaded) { - $form->error_message = "Invalid username or password"; + $response["error_message"] = "Invalid username or password"; } else { if (user::is_correct_password($user,$form->password->value)) { user::login($user); - url::redirect("user/success.html"); + $response["error_message"] = ""; } else { - $form->error_message = "Invalid username or password"; + $response["error_message"] = "Invalid username or password"; } } + } else { + $response["error_message"] = "Invalid username or password"; } - $form->render(); + + print json_encode($response); } } \ No newline at end of file diff --git a/modules/user/libraries/Login_Form.php b/modules/user/libraries/Login_Form.php deleted file mode 100644 index 6874cbd4..00000000 --- a/modules/user/libraries/Login_Form.php +++ /dev/null @@ -1,44 +0,0 @@ -legend="Login"; - $this->input("username")->rules("required|length[4,32]"); - $this->password("password")->rules("required|length[5,40]"); - $this->submit("Login"); - } - - public function render($template = 'login.html', $custom = true) { - $form = parent::render($template, $custom); - $form->error_message = $this->error_message; - return $form; - } - - public function __set($key, $value) { - $this->$key = $value; - } -} \ No newline at end of file diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index 58df6024..fb770f3f 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -1,24 +1,23 @@ -
- Login - +
+
+
+
+
+ diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css index 5e37e8e9..a00ed05a 100644 --- a/themes/default/css/screen.css +++ b/themes/default/css/screen.css @@ -272,7 +272,7 @@ table.gMetadata td.toggle { } .gError { - + color: red; } .gWarning { @@ -392,8 +392,8 @@ table.gMetadata td.toggle { list-style-type: none; } -#gLoginMenu li input.text, -#gLoginMenu li input.password { +#gLoginMenu li input#gUsername, +#gLoginMenu li input#gPassword { padding: 0 0 .1em 0; width: 80px; } diff --git a/themes/default/js/login.js b/themes/default/js/login.js index a598f39a..6c017a47 100644 --- a/themes/default/js/login.js +++ b/themes/default/js/login.js @@ -1,11 +1,46 @@ +$(document).ready(function() { + $("#gLoginForm").submit(function() { + process_login(); + return false; + }); +}); + function show_login() { $("#gLoginLink").css({display: "none"}); - $("#gLoginForm").css({display: "block"}); $("#gLoginClose").css({display: "inline"}); + var url = $("#gLoginForm").attr("formSrc"); + $.get(url, null, function(data, textStatus) { + $("#gLoginForm").html(data); + $("#gLoginForm").css({display: "block"}); + }); } function close_login() { $("#gLoginLink").css({display: "inline"}); $("#gLoginForm").css({display: "none"}); + $("#gLoginForm").html(""); $("#gLoginClose").css({display: "none"}); + $("input#gUsername").val(""); + $("input#gPassword").val(""); +} + +function process_login() { + var username = $("input#gUsername").val(); + var password = $("input#gPassword").val(); + var data = 'username=' + username + '&password=' + password; + $.ajax({ + url: $("#gLogin").attr("action"), + type: "POST", + data: data, + dataType: "json", + error: function(XMLHttpRequest, textStatus, errorThrown) { + alert("textStatus: " + textStatus + "\nerrorThrown: " + errorThrown); + }, + success: function(data, textStatus) { + if (data.error_message != "") { + $("#gLoginMessage").html(data.error_message); + $("#gLoginMessage").css({display: "block"}); + } + } + }); } \ No newline at end of file diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php index ba16a5fb..52c3992b 100644 --- a/themes/default/views/header.html.php +++ b/themes/default/views/header.html.php @@ -16,8 +16,7 @@ | X - - + " >