Bugfixes for older web browsers.
This commit is contained in:
rWatcher
parent
d5728284c8
commit
be6c828114
@ -84,11 +84,7 @@ class albumpassword_Controller extends Controller {
|
||||
|
||||
// Display a success message and close the dialog.
|
||||
message::success(t("Password saved."));
|
||||
<<<<<<< HEAD
|
||||
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\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 "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\n";
|
||||
} else {
|
||||
message::error(t("Password Rejected."));
|
||||
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -1,23 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<script type="text/javascript">
|
||||
function ajaxify_login_reset_form() {
|
||||
$("#g-login form").ajaxForm({
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
if (data.form) {
|
||||
$("#g-login form").replaceWith(data.form);
|
||||
ajaxify_login_reset_form();
|
||||
}
|
||||
if (data.result == "success") {
|
||||
$("#g-dialog").dialog("close");
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
>>>>>>> gallery3-contrib/master
|
||||
<div id="g-assign-password">
|
||||
<ul>
|
||||
<li id="g-assign-password-form">
|
||||
|
||||
@ -1,23 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<script type="text/javascript">
|
||||
function ajaxify_login_reset_form() {
|
||||
$("#g-login form").ajaxForm({
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
if (data.form) {
|
||||
$("#g-login form").replaceWith(data.form);
|
||||
ajaxify_login_reset_form();
|
||||
}
|
||||
if (data.result == "success") {
|
||||
$("#g-dialog").dialog("close");
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
>>>>>>> gallery3-contrib/master
|
||||
<div id="g-login-password">
|
||||
<ul>
|
||||
<li id="g-login-password-form">
|
||||
|
||||
@ -84,11 +84,7 @@ class albumpassword_Controller extends Controller {
|
||||
|
||||
// Display a success message and close the dialog.
|
||||
message::success(t("Password saved."));
|
||||
<<<<<<< HEAD
|
||||
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\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 "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\n";
|
||||
} else {
|
||||
message::error(t("Password Rejected."));
|
||||
print "<html>\n<body>\n<script type=\"text/javascript\">\n$(\"#g-dialog\").dialog(\"close\");\nwindow.location.reload();\n</script>\n</body>\n</html>\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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -1,23 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<script type="text/javascript">
|
||||
function ajaxify_login_reset_form() {
|
||||
$("#g-login form").ajaxForm({
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
if (data.form) {
|
||||
$("#g-login form").replaceWith(data.form);
|
||||
ajaxify_login_reset_form();
|
||||
}
|
||||
if (data.result == "success") {
|
||||
$("#g-dialog").dialog("close");
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
>>>>>>> gallery3-contrib/master
|
||||
<div id="g-assign-password">
|
||||
<ul>
|
||||
<li id="g-assign-password-form">
|
||||
|
||||
@ -1,23 +1,3 @@
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
<script type="text/javascript">
|
||||
function ajaxify_login_reset_form() {
|
||||
$("#g-login form").ajaxForm({
|
||||
dataType: "json",
|
||||
success: function(data) {
|
||||
if (data.form) {
|
||||
$("#g-login form").replaceWith(data.form);
|
||||
ajaxify_login_reset_form();
|
||||
}
|
||||
if (data.result == "success") {
|
||||
$("#g-dialog").dialog("close");
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
</script>
|
||||
>>>>>>> gallery3-contrib/master
|
||||
<div id="g-login-password">
|
||||
<ul>
|
||||
<li id="g-login-password-form">
|
||||
|
||||
Reference in New Issue
Block a user