Bounce the user to the login page if they try to get to part of the

admin site as a guest.  Also, theme the login/html page.
This commit is contained in:
Bharat Mediratta
2010-06-12 15:28:03 -07:00
parent dceecabbf1
commit 87f8b6ff0a
2 changed files with 12 additions and 4 deletions

View File

@@ -22,7 +22,12 @@ class Admin_Controller extends Controller {
public function __construct($theme=null) {
if (!identity::active_user()->admin) {
access::forbidden();
if (identity::active_user()->guest) {
Session::instance()->set("continue_url", url::abs_current(true));
url::redirect("login");
} else {
access::forbidden();
}
}
parent::__construct();

View File

@@ -38,7 +38,10 @@ class Login_Controller extends Controller {
}
public function html() {
print auth::get_login_form("login/auth_html");
$view = new Theme_View("page.html", "other", "login");
$view->page_title = t("Login");
$view->content = auth::get_login_form("login/auth_html");
print $view;
}
public function auth_html() {
@@ -46,8 +49,8 @@ class Login_Controller extends Controller {
list ($valid, $form) = $this->_auth("login/auth_html");
if ($valid) {
url::redirect($form->continue_url->value ? $form->continue_url_value :
item::root()->abs_url());
$continue_url = $form->continue_url->value;
url::redirect($continue_url ? $continue_url : item::root()->abs_url());
} else {
$view = new Theme_View("page.html", "other", "login");
$view->page_title = t("Log in to Gallery");