From be6c8281144706e46dea4438a7d8cf795afda435 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Mon, 1 Nov 2010 01:32:41 -0400 Subject: [PATCH] Bugfixes for older web browsers. --- .../controllers/albumpassword.php | 24 ------------------- 3.0/modules/albumpassword/helpers/MY_item.php | 5 ---- .../views/assignpassword.html.php | 20 ---------------- .../views/loginpassword.html.php | 20 ---------------- .../controllers/albumpassword.php | 24 ------------------- 3.1/modules/albumpassword/helpers/MY_item.php | 5 ---- .../views/assignpassword.html.php | 20 ---------------- .../views/loginpassword.html.php | 20 ---------------- 8 files changed, 138 deletions(-) diff --git a/3.0/modules/albumpassword/controllers/albumpassword.php b/3.0/modules/albumpassword/controllers/albumpassword.php index 9c672e34..01080fc2 100644 --- a/3.0/modules/albumpassword/controllers/albumpassword.php +++ b/3.0/modules/albumpassword/controllers/albumpassword.php @@ -84,11 +84,7 @@ class albumpassword_Controller extends Controller { // Display a success message and close the dialog. message::success(t("Password saved.")); -<<<<<<< HEAD print "\n\n\n\n\n"; -======= - json::reply(array("result" => "success")); ->>>>>>> gallery3-contrib/master } public function logout() { @@ -116,17 +112,10 @@ class albumpassword_Controller extends Controller { // If not, close the dialog and display a rejected message. cookie::set("g3_albumpassword", $album_password); message::success(t("Password Accepted.")); -<<<<<<< HEAD print "\n\n\n\n\n"; } else { message::error(t("Password Rejected.")); print "\n\n\n\n\n"; -======= - json::reply(array("result" => "success")); - } else { - message::error(t("Password Rejected.")); - json::reply(array("result" => "success")); ->>>>>>> gallery3-contrib/master } } @@ -140,11 +129,7 @@ class albumpassword_Controller extends Controller { $assignpassword_group->input("assignpassword_password") ->id('assignpassword_password') ->label(t("Password:")); -<<<<<<< HEAD $assignpassword_group->submit("save_password")->value(t("Save")); -======= - $form->submit("save_password")->value(t("Save")); ->>>>>>> gallery3-contrib/master // Return the newly generated form. return $form; @@ -154,7 +139,6 @@ class albumpassword_Controller extends Controller { // Generate a form for allowing visitors to enter in their passwords. $form = new Forge("albumpassword/checkpassword", "", "post", array("id" => "g-login-password-form")); -<<<<<<< HEAD $assignpassword_group = $form->group("Enter Password") ->label(t("Enter Password:")); @@ -163,14 +147,6 @@ class albumpassword_Controller extends Controller { ->label(t("Password:")); $assignpassword_group->submit("")->value(t("Login")); -======= - $assignpassword_group = $form->group("Enter Password") - ->label(t("Enter Password:")); - $assignpassword_group->input("albumpassword_password") - ->id('albumpassword_password') - ->label(t("Password:")); - $form->submit("login_password")->value(t("Login")); ->>>>>>> gallery3-contrib/master // Return the newly generated form. return $form; diff --git a/3.0/modules/albumpassword/helpers/MY_item.php b/3.0/modules/albumpassword/helpers/MY_item.php index eb555ef5..e79717c4 100644 --- a/3.0/modules/albumpassword/helpers/MY_item.php +++ b/3.0/modules/albumpassword/helpers/MY_item.php @@ -36,13 +36,8 @@ class item extends item_Core { } // set access::DENY if necessary. -<<<<<<< HEAD $view_restrictions = array(); if ($deny_access == true) { -======= - if ($deny_access == true) { - $view_restrictions = array(); ->>>>>>> gallery3-contrib/master if (!identity::active_user()->admin) { foreach (identity::group_ids_for_active_user() as $id) { $view_restrictions[] = array("items.view_$id", "=", access::DENY); diff --git a/3.0/modules/albumpassword/views/assignpassword.html.php b/3.0/modules/albumpassword/views/assignpassword.html.php index 43066c68..c1a60b8d 100644 --- a/3.0/modules/albumpassword/views/assignpassword.html.php +++ b/3.0/modules/albumpassword/views/assignpassword.html.php @@ -1,23 +1,3 @@ -<<<<<<< HEAD -======= - ->>>>>>> gallery3-contrib/master