diff --git a/3.0/modules/albumpassword/controllers/albumpassword.php b/3.0/modules/albumpassword/controllers/albumpassword.php
index b014b749..01080fc2 100644
--- a/3.0/modules/albumpassword/controllers/albumpassword.php
+++ b/3.0/modules/albumpassword/controllers/albumpassword.php
@@ -84,7 +84,7 @@ class albumpassword_Controller extends Controller {
// Display a success message and close the dialog.
message::success(t("Password saved."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
}
public function logout() {
@@ -112,10 +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."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
} else {
message::error(t("Password Rejected."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
}
}
@@ -129,7 +129,7 @@ class albumpassword_Controller extends Controller {
$assignpassword_group->input("assignpassword_password")
->id('assignpassword_password')
->label(t("Password:"));
- $form->submit("save_password")->value(t("Save"));
+ $assignpassword_group->submit("save_password")->value(t("Save"));
// Return the newly generated form.
return $form;
@@ -139,12 +139,14 @@ 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"));
+
$assignpassword_group = $form->group("Enter Password")
->label(t("Enter Password:"));
- $assignpassword_group->input("albumpassword_password")
+ $assignpassword_group->password("albumpassword_password")
->id('albumpassword_password')
->label(t("Password:"));
- $form->submit("login_password")->value(t("Login"));
+
+ $assignpassword_group->submit("")->value(t("Login"));
// 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 3e09a64d..e79717c4 100644
--- a/3.0/modules/albumpassword/helpers/MY_item.php
+++ b/3.0/modules/albumpassword/helpers/MY_item.php
@@ -36,8 +36,8 @@ class item extends item_Core {
}
// set access::DENY if necessary.
+ $view_restrictions = array();
if ($deny_access == true) {
- $view_restrictions = array();
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 14cd2767..c1a60b8d 100644
--- a/3.0/modules/albumpassword/views/assignpassword.html.php
+++ b/3.0/modules/albumpassword/views/assignpassword.html.php
@@ -1,20 +1,3 @@
-
-
diff --git a/3.0/modules/albumpassword/views/loginpassword.html.php b/3.0/modules/albumpassword/views/loginpassword.html.php
index 9ebb47fd..750ffbed 100644
--- a/3.0/modules/albumpassword/views/loginpassword.html.php
+++ b/3.0/modules/albumpassword/views/loginpassword.html.php
@@ -1,20 +1,3 @@
-
-
diff --git a/3.1/modules/albumpassword/controllers/albumpassword.php b/3.1/modules/albumpassword/controllers/albumpassword.php
index b014b749..01080fc2 100644
--- a/3.1/modules/albumpassword/controllers/albumpassword.php
+++ b/3.1/modules/albumpassword/controllers/albumpassword.php
@@ -84,7 +84,7 @@ class albumpassword_Controller extends Controller {
// Display a success message and close the dialog.
message::success(t("Password saved."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
}
public function logout() {
@@ -112,10 +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."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
} else {
message::error(t("Password Rejected."));
- json::reply(array("result" => "success"));
+ print "\n\n\n\n\n";
}
}
@@ -129,7 +129,7 @@ class albumpassword_Controller extends Controller {
$assignpassword_group->input("assignpassword_password")
->id('assignpassword_password')
->label(t("Password:"));
- $form->submit("save_password")->value(t("Save"));
+ $assignpassword_group->submit("save_password")->value(t("Save"));
// Return the newly generated form.
return $form;
@@ -139,12 +139,14 @@ 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"));
+
$assignpassword_group = $form->group("Enter Password")
->label(t("Enter Password:"));
- $assignpassword_group->input("albumpassword_password")
+ $assignpassword_group->password("albumpassword_password")
->id('albumpassword_password')
->label(t("Password:"));
- $form->submit("login_password")->value(t("Login"));
+
+ $assignpassword_group->submit("")->value(t("Login"));
// Return the newly generated form.
return $form;
diff --git a/3.1/modules/albumpassword/helpers/MY_item.php b/3.1/modules/albumpassword/helpers/MY_item.php
index 3e09a64d..e79717c4 100644
--- a/3.1/modules/albumpassword/helpers/MY_item.php
+++ b/3.1/modules/albumpassword/helpers/MY_item.php
@@ -36,8 +36,8 @@ class item extends item_Core {
}
// set access::DENY if necessary.
+ $view_restrictions = array();
if ($deny_access == true) {
- $view_restrictions = array();
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.1/modules/albumpassword/views/assignpassword.html.php b/3.1/modules/albumpassword/views/assignpassword.html.php
index 14cd2767..c1a60b8d 100644
--- a/3.1/modules/albumpassword/views/assignpassword.html.php
+++ b/3.1/modules/albumpassword/views/assignpassword.html.php
@@ -1,20 +1,3 @@
-
-
diff --git a/3.1/modules/albumpassword/views/loginpassword.html.php b/3.1/modules/albumpassword/views/loginpassword.html.php
index 9ebb47fd..750ffbed 100644
--- a/3.1/modules/albumpassword/views/loginpassword.html.php
+++ b/3.1/modules/albumpassword/views/loginpassword.html.php
@@ -1,20 +1,3 @@
-