Changeset 1947


Ignore:
Timestamp:
04/08/07 00:31:37 (13 years ago)
Author:
rub
Message:

Issue 674:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/language/en_UK.iso-8859-1/common.lang.php

    r1932 r1947  
    356356$lang['New password sent by email'] = 'New password sent by email'; 
    357357$lang['No email address'] = 'No email address'; 
    358 $lang['No user matches this email address'] = 'No user matches this email address'; 
     358$lang['No user matches this email address'] = 'No classic user matches this email address'; 
    359359$lang['Notification'] = 'Notification'; 
    360360$lang['Number of items'] = 'Number of items'; 
     
    633633$lang['Waiting page: %s'] = 'Waiting page: %s'; 
    634634$lang['Picture uploaded by %s'] = 'Picture uploaded by %s'; 
     635$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrator, webmaster and special user cannot use this method'; 
    635636?> 
  • trunk/language/fr_FR.iso-8859-1/common.lang.php

    r1932 r1947  
    356356$lang['New password sent by email'] = 'Nouveau mot de passe envoyé par e-mail'; 
    357357$lang['No email address'] = 'Pas d\'adresse e-mail'; 
    358 $lang['No user matches this email address'] = 'Cette adresse e-mail ne correspond à aucun utilisateur'; 
     358$lang['No user matches this email address'] = 'Cette adresse e-mail ne correspond à aucun utilisateur classique'; 
    359359$lang['Notification'] = 'Notification'; 
    360360$lang['Number of items'] = 'Nombre d\'élément'; 
     
    633633$lang['Waiting page: %s'] = 'Page en attente: %s'; 
    634634$lang['Picture uploaded by %s'] = 'Image téléchargée par %s'; 
     635$lang['Administrator, webmaster and special user cannot use this method'] = 'Administrateur, webmestre et utilisateur spécial ne peuvent pas utiliser cette méthode'; 
    635636?> 
  • trunk/password.php

    r1903 r1947  
    7272WHERE ' 
    7373  .$conf['user_fields']['email'].' = \''.$mail_address.'\' AND 
    74   ui.status not in (\'guest\', \'generic\', \'webmaster\') 
     74  ui.status not in (\'guest\', \'generic\', \'admin\', \'webmaster\') 
    7575;'; 
    7676    $result = pwg_query($query); 
     
    133133    { 
    134134      array_push($page['errors'], l10n('No user matches this email address')); 
     135      array_push($page['errors'], l10n('Administrator, webmaster and special user cannot use this method')); 
    135136      array_push($page['errors'], $mailto); 
    136137    } 
Note: See TracChangeset for help on using the changeset viewer.