summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapps/files_encryption/lib/crypt.php4
-rw-r--r--settings/js/personal.js13
-rw-r--r--settings/personal.php2
3 files changed, 18 insertions, 1 deletions
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 6543a0de5f3..d8d19029096 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -662,5 +662,9 @@ class Crypt {
return rtrim($result, "\0");
}
}
+
+ public static function decryptAll() {
+ error_log("decrypt all");
+ }
} \ No newline at end of file
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 099c1426dc0..97342e7653e 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -110,6 +110,19 @@ $(document).ready(function(){
});
return false;
});
+
+ $('button:button[name="submitDecryptAll"]').click(function() {
+ console.log("click!");
+ $.post('ajax/decryptall.php', {}, function(data) {
+ /*
+ if (data.status === "error") {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ } else {
+ OC.msg.finishedSaving('#encryption .msg', data);
+ }*/
+ }
+ );
+ });
} );
OC.msg={
diff --git a/settings/personal.php b/settings/personal.php
index 4961661e250..79ce8e4576b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -89,7 +89,7 @@ $tmpl->assign('activelanguage', $userLang);
$tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User::getUser()));
$tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
$tmpl->assign('displayName', OC_User::getDisplayName());
-$tmpl->assign('enableDecryptAll' , true);
+$tmpl->assign('enableDecryptAll' , $enableDecryptAll);
$forms=OC_App::getForms('personal');
$tmpl->assign('forms', array());