diff options
author | rub <rub@piwigo.org> | 2007-04-10 05:26:48 +0000 |
---|---|---|
committer | rub <rub@piwigo.org> | 2007-04-10 05:26:48 +0000 |
commit | a991ac35ebbc6e3ec0419cba78de82c41df19014 (patch) | |
tree | 42d692df04469a947a07e00c3a55c457f6e806ff | |
parent | 01cc3d8d98f7f67529e45142fa9c9dbb4ce8a69b (diff) |
Issue 674:
Allow administrator and webmaster ADVISER to ask a new password
git-svn-id: http://piwigo.org/svn/trunk@1951 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r-- | password.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/password.php b/password.php index 42715e864..1ff5dfab6 100644 --- a/password.php +++ b/password.php @@ -4,8 +4,7 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -71,7 +70,10 @@ 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\', \'admin\', \'webmaster\') + ( + ui.status = \'normal\' OR + (ui.status in (\'admin\', \'webmaster\') AND ui.adviser = \'true\') + ) ;'; $result = pwg_query($query); |