From e7ee70541fe60800480d7b3a830a80f715e60ce2 Mon Sep 17 00:00:00 2001
From: simonp <simon.plasger@web.de>
Date: Tue, 27 May 2014 21:09:24 +0200
Subject: Add option to force new users to change their password (#1486884)

---
 plugins/password/localization/en_US.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/password/localization/en_US.inc')

diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
index a4c077fe5..94475ce36 100644
--- a/plugins/password/localization/en_US.inc
+++ b/plugins/password/localization/en_US.inc
@@ -33,5 +33,6 @@ $messages['internalerror'] = 'Could not save new password.';
 $messages['passwordshort'] = 'Password must be at least $length characters long.';
 $messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
 $messages['passwordforbidden'] = 'Password contains forbidden characters.';
+$messages['firstloginchange'] = 'This is your first login. Please change your password.';
 
 ?>
-- 
cgit v1.2.3


From 7e309b872f9a60ecb5ac975fdd2f4f89b508aba8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 16 Jun 2014 11:24:45 +0200
Subject: Add title attribute to settings menu

---
 plugins/password/localization/en_US.inc | 2 +-
 plugins/password/password.php           | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'plugins/password/localization/en_US.inc')

diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
index 94475ce36..278a20374 100644
--- a/plugins/password/localization/en_US.inc
+++ b/plugins/password/localization/en_US.inc
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['changepasswd']  = 'Change Password';
+$labels['changepasswd']  = 'Change password';
 $labels['curpasswd']  = 'Current Password:';
 $labels['newpasswd']  = 'New Password:';
 $labels['confpasswd']  = 'Confirm New Password:';
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 9bf020176..6c599bb4b 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -75,7 +75,14 @@ class password extends rcube_plugin
     function settings_actions($args)
     {
         // register as settings action
-        $args['actions'][] = array('action' => 'plugin.password', 'class' => 'password', 'label' => 'password', 'domain' => 'password');
+        $args['actions'][] = array(
+            'action' => 'plugin.password',
+            'class'  => 'password',
+            'label'  => 'password',
+            'title'  => 'changepasswd',
+            'domain' => 'password',
+        );
+
         return $args;
     }
 
-- 
cgit v1.2.3