Issue 674:

  Administrator can ask a new password
  Add message about users witch can change their password


git-svn-id: http://piwigo.org/svn/trunk@1947 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 6 insertions, 3 deletions

diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php
index 4f1d2b3e7..4f3c0f93d 100644
--- a/language/en_UK.iso-8859-1/common.lang.php
+++ b/language/en_UK.iso-8859-1/common.lang.php
@@ -355,7 +355,7 @@ $lang['New on %s'] = 'New on %s';
 $lang['New password confirmation does not correspond'] = 'New password confirmation does not correspond';
 $lang['New password sent by email'] = 'New password sent by email';
 $lang['No email address'] = 'No email address';
-$lang['No user matches this email address'] = 'No user matches this email address';
+$lang['No user matches this email address'] = 'No classic user matches this email address';
 $lang['Notification'] = 'Notification';
 $lang['Number of items'] = 'Number of items';
 $lang['Original dimensions'] = 'Original dimensions';
@@ -632,4 +632,5 @@ $lang['Picture name: %s'] = 'Picture name: %s';
 $lang['Creation date: %s'] = 'Creation date: %s';
 $lang['Waiting page: %s'] = 'Waiting page: %s';
 $lang['Picture uploaded by %s'] = 'Picture uploaded by %s';
+$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method';
 ?>
diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php
index 0ce3f7800..a4f516bb9 100644
--- a/language/fr_FR.iso-8859-1/common.lang.php
+++ b/language/fr_FR.iso-8859-1/common.lang.php
@@ -355,7 +355,7 @@ $lang['New on %s'] = 'Nouveau le %s';
 $lang['New password confirmation does not correspond'] = 'Erreur de confirmation de mot de passe';
 $lang['New password sent by email'] = 'Nouveau mot de passe envoyé par e-mail';
 $lang['No email address'] = 'Pas d\'adresse e-mail';
-$lang['No user matches this email address'] = 'Cette adresse e-mail ne correspond à aucun utilisateur';
+$lang['No user matches this email address'] = 'Cette adresse e-mail ne correspond à aucun utilisateur classique';
 $lang['Notification'] = 'Notification';
 $lang['Number of items'] = 'Nombre d\'élément';
 $lang['Original dimensions'] = 'Dimensions d\'origine';
@@ -632,4 +632,5 @@ $lang['Picture name: %s'] = 'Nom de l\'image: %s';
 $lang['Creation date: %s'] = 'Date de création: %d';
 $lang['Waiting page: %s'] = 'Page en attente: %s';
 $lang['Picture uploaded by %s'] = 'Image téléchargée par %s';
+$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode';
 ?>
diff --git a/password.php b/password.php
index c0fe3b2e9..42715e864 100644
--- a/password.php
+++ b/password.php
@@ -71,7 +71,7 @@ FROM '.USERS_TABLE.' as u
       ON u.'.$conf['user_fields']['id'].' = ui.user_id
 WHERE '
   .$conf['user_fields']['email'].' = \''.$mail_address.'\' AND
-  ui.status not in (\'guest\', \'generic\', \'webmaster\')
+  ui.status not in (\'guest\', \'generic\', \'admin\', \'webmaster\')
 ;';
     $result = pwg_query($query);
 
@@ -132,6 +132,7 @@ WHERE '
     else
     {
       array_push($page['errors'], l10n('No user matches this email address'));
+      array_push($page['errors'], l10n('Administrator, webmaster and special user cannot use this method'));
       array_push($page['errors'], $mailto);
     }
   }