From 2c4a9e0776ed3f2ce40cb5e4335df5ffaacde9a2 Mon Sep 17 00:00:00 2001 From: kondou Date: Tue, 2 Jul 2013 03:16:42 +0200 Subject: [PATCH 1/2] Add a "Wrong password." message, if the password for the public share was wrong. Fix #2725 --- apps/files_sharing/public.php | 2 +- apps/files_sharing/templates/authenticate.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index ef86013b3e7..fb18bc26248 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -79,7 +79,7 @@ if (isset($path)) { $linkItem['share_with']))) { $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); $tmpl->assign('URL', $url); - $tmpl->assign('error', true); + $tmpl->assign('wrongpw', true); $tmpl->printPage(); exit(); } else { diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index 7a67b6e5503..9334861b1ce 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -1,5 +1,8 @@
+ +
t('Wrong password.')); ?>
+

From 65bcedfbbee891a4a5253ff328f7a2b5e9d07e78 Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 3 Jul 2013 20:13:10 +0200 Subject: [PATCH 2/2] Use better wording. --- apps/files_sharing/templates/authenticate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index 9334861b1ce..fa03f419130 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -1,7 +1,7 @@

-
t('Wrong password.')); ?>
+
t('The password is wrong. Try again.')); ?>