stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-15 11:12:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up the login, maintenance login and required-top-level-login code.

Browse Source 
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.
This commit is contained in:
Bharat Mediratta
2009-03-16 04:33:45 +00:00
parent cbc7c870fa
commit 736d74d05f
10 changed files with 103 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/libraries/Theme_View.php
View File

@@ -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"));
}
}