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

Merge branch 'master' into talmdal_dev

Browse Source
This commit is contained in:
Tim Almdal
2010-06-13 09:59:27 -07:00
parent 0ebc36b4e5 87f8b6ff0a
commit 938eea7fc4
13 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/gallery.dialog.js
View File

@@ -114,7 +114,8 @@
},
success: function(data) {
if (data.form) {
$("#g-dialog form").replaceWith(data.form);
var formData = unescape(data.form);
$("#g-dialog form").replaceWith(formData);
$("#g-dialog form :submit").removeClass("ui-state-disabled")
.attr("disabled", null);
self._ajaxify_dialog();

9
modules/gallery/controllers/admin.php
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();
@@ -78,7 +83,7 @@ class Admin_Controller extends Controller {
private static function _prompt_for_reauth($controller_name, $args) {
if (request::method() == "get" && !request::is_ajax()) {
// Avoid anti-phishing protection by passing the url as session variable.
Session::instance()->set("continue_url", url::current(true));
Session::instance()->set("continue_url", url::abs_current(true));
}
url::redirect("reauthenticate");
}

7
modules/gallery/controllers/login.php
View File

@@ -38,15 +38,18 @@ 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() {
access::verify_csrf();
$continue_url = Session::instance()->get("continue_url", null);
list ($valid, $form) = $this->_auth("login/auth_html");
if ($valid) {
$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");

11
modules/gallery/controllers/logout.php
View File

@@ -21,14 +21,9 @@ class Logout_Controller extends Controller {
public function index() {
access::verify_csrf();
auth::logout();
if ($continue_url = Input::instance()->get("continue")) {
$item = url::get_item_from_uri($continue_url);
if (access::can("view", $item)) {
// Don't use url::redirect() because it'll call url::site() and munge the continue url.
header("Location: $continue_url");
} else {
url::redirect(item::root()->abs_url());
}
if ($continue_url = Input::instance()->get("continue_url")) {
url::redirect($continue_url);
}
url::redirect(item::root()->abs_url());
}
}

4
modules/gallery/controllers/reauthenticate.php
View File

@@ -37,8 +37,7 @@ class Reauthenticate_Controller extends Controller {
if ($valid) {
message::success(t("Successfully re-authenticated!"));
module::event("user_auth", $user);
$continue_url = Session::instance()->get_once("continue_url", "admin");
url::redirect($continue_url);
url::redirect($form->continue_url->value);
} else {
$name = $user->name;
log::warning("user", t("Failed re-authentication for %name", array("name" => $name)));
@@ -59,6 +58,7 @@ class Reauthenticate_Controller extends Controller {
private static function _form() {
$form = new Forge("reauthenticate/auth", "", "post", array("id" => "g-reauthenticate-form"));
$form->set_attr('class', "g-narrow");
$form->hidden("continue_url")->value(Session::instance()->get("continue_url", "admin"));
$group = $form->group("reauthenticate")->label(t("Re-authenticate"));
$group->password("password")->label(t("Password"))->id("g-password")->class(null)
->callback("auth::validate_too_many_failed_auth_attempts")

1
modules/gallery/helpers/auth.php
View File

@@ -21,6 +21,7 @@ class auth_Core {
static function get_login_form($url) {
$form = new Forge($url, "", "post", array("id" => "g-login-form"));
$form->set_attr("class", "g-narrow");
$form->hidden("continue_url")->value(Session::instance()->get("continue_url"));
$group = $form->group("login")->label(t("Login"));
$group->input("name")->label(t("Username"))->id("g-username")->class(null)
->callback("auth::validate_too_many_failed_logins")

15
modules/gallery/helpers/gallery_event.php
View File

@@ -157,11 +157,22 @@ class gallery_event_Core {
->view("login_current_user.html")
->url(user_profile::url($user->id))
->label($user->display_name()));
if (isset($theme->item)) {
if (access::user_can(identity::guest(), "view", $theme->item)) {
$continue_url = $theme->item->abs_url();
} else {
$continue_url = item::root()->abs_url();
}
} else {
$continue_url = url::abs_current();
}
$menu->append(Menu::factory("link")
->id("user_menu_logout")
->css_id("g-logout-link")
->url(url::site("logout?csrf=$csrf&continue=" .
urlencode(url::abs_current())))
->url(url::site("logout?csrf=$csrf&continue_url=" .
urlencode($continue_url)))
->label(t("Logout")));
}
}

2
modules/gallery/helpers/item.php
View File

@@ -136,7 +136,7 @@ class item_Core {
*/
static function convert_filename_to_title($filename) {
$title = strtr($filename, "_", " ");
$title = preg_replace("/\..*?$/", "", $title);
$title = preg_replace("/\..{3,4}$/", "", $title);
$title = preg_replace("/ +/", " ", $title);
return $title;
}

4
modules/gallery/libraries/MY_Kohana_Exception.php
View File

@@ -59,7 +59,7 @@ class Kohana_Exception extends Kohana_Exception_Core {
private static function _show_themed_error_page(Exception $e) {
// Create a text version of the exception
$error = Kohana_Exception::text($e);
// Add this exception to the log
Kohana_Log::add('error', $error);
@@ -83,8 +83,6 @@ class Kohana_Exception extends Kohana_Exception_Core {
if ($view->content->is_guest) {
$view->content->login_form = new View("login_ajax.html");
$view->content->login_form->form = auth::get_login_form("login/auth_html");
// Avoid anti-phishing protection by passing the url as session variable.
Session::instance()->set("continue_url", url::current(true));
}
} else {
$view->page_title = t("Dang... Something went wrong!");

5
modules/gallery/tests/Item_Helper_Test.php
View File

@@ -41,6 +41,11 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
}
public function convert_filename_to_title_test() {
$this->assert_equal("foo", item::convert_filename_to_title("foo.jpg"));
$this->assert_equal("foo.bar", item::convert_filename_to_title("foo.bar.jpg"));
}
public function convert_filename_to_slug_test() {
$this->assert_equal("foo", item::convert_filename_to_slug("{[foo]}"));
$this->assert_equal("foo-bar", item::convert_filename_to_slug("{[foo!@#!$@#^$@($!(@bar]}"));

3
modules/rest/helpers/rest.php
View File

@@ -18,9 +18,12 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
class rest_Core {
const API_VERSION = "3.0";
static function reply($data=array()) {
Session::instance()->abort_save();
header("X-Gallery-API-Version: " . rest::API_VERSION);
if (Input::instance()->get("output") == "html") {
header("Content-type: text/html");
if ($data) {

2
modules/search/helpers/search.php
View File

@@ -42,7 +42,7 @@ class search_Core {
$data = $db->query($query);
$count = $db->query("SELECT FOUND_ROWS() as c")->current()->c;
return array($count, new ORM_Iterator(ORM::factory("item"), $db->query($query)));
return array($count, new ORM_Iterator(ORM::factory("item"), $data));
}
/**

2
modules/watermark/controllers/admin_watermarks.php
View File

@@ -124,7 +124,7 @@ class Admin_Watermarks_Controller extends Admin_Controller {
array("result" => "success",
"location" => url::site("admin/watermarks")));
} else {
print json_encode(array("result" => "error", "form" => (string) $form));
print json_encode(array("result" => "error", "form" => rawurlencode((string) $form)));
}
}