From 736d74d05f70be5b72e44eafe2cc8efae52b0af7 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 16 Mar 2009 04:33:45 +0000 Subject: Clean up the login, maintenance login and required-top-level-login code. We now have two clear and separate login approaches: login/ajax login/html Choose the one that's appropriate. Totally simplified the maintenance page to be separate from the theme and dead simple, and use login/html approach there. Totally simplified the top level login (login_page.html.php) to just be a login page, not the rest of the chrome on the page and use the login/ajax approach there. Don't use access::required in albums and then catch the exception, instead use access::can and check the return code. Improve the text for maintenance mode. --- core/controllers/albums.php | 11 +++--- core/controllers/maintenance.php | 10 ++---- core/libraries/Theme_View.php | 10 +++--- core/views/maintenance.html.php | 49 ++++++++++++++++++++++++++ modules/user/controllers/login.php | 58 +++++++++++++++---------------- modules/user/helpers/user.php | 10 ++++++ modules/user/views/login.html.php | 2 +- modules/user/views/login_prompt.html.php | 44 ----------------------- themes/default/views/login_page.html.php | 24 +------------ themes/default/views/maintenance.html.php | 56 ----------------------------- 10 files changed, 101 insertions(+), 173 deletions(-) create mode 100644 core/views/maintenance.html.php delete mode 100644 modules/user/views/login_prompt.html.php delete mode 100644 themes/default/views/maintenance.html.php diff --git a/core/controllers/albums.php b/core/controllers/albums.php index 9811ba13..bcfdd8c2 100644 --- a/core/controllers/albums.php +++ b/core/controllers/albums.php @@ -23,13 +23,12 @@ class Albums_Controller extends Items_Controller { * @see REST_Controller::_show($resource) */ public function _show($album) { - try { - access::required("view", $album); - } catch (Exception $e) { + if (!access::can("view", $album)) { if ($album->id != 1) { - throw $e; + access::forbidden(); } else { - url::redirect("login/page"); + print new Theme_View("login_page.html"); + return; } } @@ -163,7 +162,7 @@ class Albums_Controller extends Items_Controller { $album->description = $form->edit_album->description->value; $album->sort_column = $form->edit_album->sort_order->column->value; $album->sort_order = $form->edit_album->sort_order->direction->value; - + $album->save(); module::event("item_updated", $orig, $album); diff --git a/core/controllers/maintenance.php b/core/controllers/maintenance.php index 908e90b5..32295a45 100644 --- a/core/controllers/maintenance.php +++ b/core/controllers/maintenance.php @@ -19,12 +19,6 @@ */ class Maintenance_Controller extends Controller { function index() { - $album = ORM::factory("item", 1); - $v = new Theme_View("maintenance.html", "reset"); - $v->title = t("%title Unavailable", array("title" => $album->title)); - $v->content = t("%title is currently unavailable as it is undergoing maintenance", - array("title" => $album->title)); - - print $v; - } + print new View("maintenance.html"); + } } \ No newline at end of file diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php index ecae3946..797679fd 100644 --- a/core/libraries/Theme_View.php +++ b/core/libraries/Theme_View.php @@ -36,15 +36,13 @@ class Theme_View_Core extends View { if (user::active()->admin) { $this->theme_name = Input::instance()->get("theme", $this->theme_name); } - $this->set_global('theme', $this); - $this->set_global('user', user::active()); + $this->set_global("theme", $this); + $this->set_global("user", user::active()); $this->set_global("page_type", $page_type); $maintenance_mode = Kohana::config("core.maintenance_mode", false, false); - if (!empty($maintenance_mode)) { - $album = ORM::factory("item", 1); - message::warning(t("%title is currently unavailable as it is undergoing maintenance", - array("title" => $album->title))); + if ($maintenance_mode) { + message::warning(t("This site is currently in maintenance mode")); } } diff --git a/core/views/maintenance.html.php b/core/views/maintenance.html.php new file mode 100644 index 00000000..d970233d --- /dev/null +++ b/core/views/maintenance.html.php @@ -0,0 +1,49 @@ + + + + <?= t("Gallery - Maintenance Mode") ?> + + + + +

+ +

+

+ +

+ + + + + diff --git a/modules/user/controllers/login.php b/modules/user/controllers/login.php index 62420ab1..12301ce5 100644 --- a/modules/user/controllers/login.php +++ b/modules/user/controllers/login.php @@ -18,23 +18,41 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class Login_Controller extends Controller { - public function index() { - if (request::method() == "post") { - $this->_try_login(); + + public function ajax() { + $view = new View("login_ajax.html"); + $view->form = user::get_login_form("login/auth_ajax"); + print $view; + } + + public function auth_ajax() { + list ($valid, $form) = $this->_auth(); + if ($valid) { + print json_encode( + array("result" => "success", + "location" => url::site(""))); } else { - print $this->_login_form(); + print json_encode( + array("result" => "error", + "form" => $form->__toString())); } } - public function page() { - $view = new Theme_View("login_page.html"); - $view->page_type = "login"; - print $view; + public function html() { + print user::get_login_form("login/auth_html"); } - private function _try_login() { - $form = $this->_login_form()->form; + public function auth_html() { + list ($valid, $form) = $this->_auth(); + if ($valid) { + url::redirect("albums/1"); + } else { + print $form; + } + } + private function _auth() { + $form = user::get_login_form(); $valid = $form->validate(); if ($valid) { $user = ORM::factory("user")->where("name", $form->login->inputs["name"]->value)->find(); @@ -49,26 +67,8 @@ class Login_Controller extends Controller { if ($valid) { user::login($user); log::info("user", t("User %name logged in", array("name" => $user->name))); - print json_encode( - array("result" => "success", - "location" => url::site(""))); - } else { - print json_encode( - array("result" => "error", - "form" => $form->__toString())); } - } - - private function _login_form() { - $view = new View("login_prompt.html"); - - $view->form = new Forge(url::current(true), "", "post", array("id" => "gLoginForm")); - $group = $view->form->group("login")->label(t("Login")); - $group->input("name")->label(t("Name"))->id("gName")->class(null); - $group->password("password")->label(t("Password"))->id("gPassword")->class(null); - $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password")); - $group->submit("")->value(t("Login")); - return $view; + return array($valid, $form); } } \ No newline at end of file diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index a15fa463..dbb9b613 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -99,6 +99,16 @@ class user_Core { return $form; } + static function get_login_form($url) { + $form = new Forge($url, "", "post", array("id" => "gLoginForm")); + $group = $form->group("login")->label(t("Login")); + $group->input("name")->label(t("Name"))->id("gName")->class(null); + $group->password("password")->label(t("Password"))->id("gPassword")->class(null); + $group->inputs["name"]->error_messages("invalid_login", t("Invalid name or password")); + $group->submit("")->value(t("Login")); + return $form; + } + /** * Make sure that we have a session and group_ids cached in the session. */ diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index d06f2a45..27373f02 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -1,7 +1,7 @@