diff --git a/interface/web/admin/form/users.tform.php b/interface/web/admin/form/users.tform.php
index 9ee2970df51bac402529b9c794579918bf678bf9..6a23559f1273b5113bb0165a3862905b5ab3b582 100644
--- a/interface/web/admin/form/users.tform.php
+++ b/interface/web/admin/form/users.tform.php
@@ -260,6 +260,19 @@ $form['tabs']['users'] = array (
'maxlength' => '2',
'rows' => '',
'cols' => ''
+ ),
+ 'lost_password_function' => array (
+ 'datatype' => 'INTEGER',
+ 'formtype' => 'CHECKBOX',
+ 'regex' => '',
+ 'errmsg' => '',
+ 'default' => 1,
+ 'value' => array(0 => 0, 1 => 1),
+ 'separator' => '',
+ 'width' => '30',
+ 'maxlength' => '255',
+ 'rows' => '',
+ 'cols' => ''
)
//#################################
// ENDE Datenbankfelder
diff --git a/interface/web/admin/lib/lang/de_users.lng b/interface/web/admin/lib/lang/de_users.lng
index da26db30fc035192cf15524453260aeb0bea22b0..db37a605bc984ed6a708e6bc8802d979a397d3c8 100644
--- a/interface/web/admin/lib/lang/de_users.lng
+++ b/interface/web/admin/lib/lang/de_users.lng
@@ -31,4 +31,5 @@ $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
$wb['username_error_collision'] = 'Der Benutzername darf nicht <b>web<b> oder <b>web<b> gefolgt von einer Zahl sein.';
$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Passwort vergessen Funktion steht zur Verfügung';
?>
diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng
index 09b8ac3057382b237c0d5a9b17ad0225989f49ef..9c57f1db8bbbb4bf5acf4f5216a452252e880c47 100644
--- a/interface/web/admin/lib/lang/en_users.lng
+++ b/interface/web/admin/lib/lang/en_users.lng
@@ -31,4 +31,5 @@ $wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['username_error_collision'] = 'The username may not be web or web plus a number."';
$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
?>
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index b973a34b7922635afa0f781972c6b0d2bdeada9d..91c35bbf9899e27a42b3c0c5b670622d838d0c14 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -60,6 +60,12 @@
{tmpl_var name='language'}
</select>
</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='lost_password_function_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='lost_password_function'}
+ </div>
+ </div>
</fieldset>
<input type="hidden" name="id" value="{tmpl_var name='id'}">
@@ -70,4 +76,4 @@
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/interface/web/login/lib/lang/de.lng b/interface/web/login/lib/lang/de.lng
index 4ece1b0ed63f895817d7335e241631ff7351ba5f..44f677b7b36d0015d948038be62d2b02e4141c68 100644
--- a/interface/web/login/lib/lang/de.lng
+++ b/interface/web/login/lib/lang/de.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'Das gewählte Design ist mit dieser ISPConfig Ver
$wb['back_txt'] = 'Zurück';
$wb['stay_logged_in_txt'] = 'Dauerhaft eingeloggt bleiben';
$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
+$wb['lost_password_function_disabled_txt'] = 'Die Passwort vergessen Funktion steht für diesen Benutzer nicht zur Verfügung.';
?>
diff --git a/interface/web/login/lib/lang/en.lng b/interface/web/login/lib/lang/en.lng
index e540ef2dba6aad41203b40c23c83677d38ec3baa..e7487da677b5fef3ee70407db9c70cc1f7d99cc9 100644
--- a/interface/web/login/lib/lang/en.lng
+++ b/interface/web/login/lib/lang/en.lng
@@ -24,4 +24,5 @@ $wb['back_txt'] = 'Back';
$wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
$wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
$wb['stay_logged_in_txt'] = 'Keep me logged in';
-?>
\ No newline at end of file
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
+?>
diff --git a/interface/web/login/password_reset.php b/interface/web/login/password_reset.php
index c466ac8e4b466d12f5c7d394d1acdac68dc1e9fe..f2e4e95075104875cf75011d88f6fe286e1fc46f 100644
--- a/interface/web/login/password_reset.php
+++ b/interface/web/login/password_reset.php
@@ -7,14 +7,14 @@ All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of ISPConfig nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -26,7 +26,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ */
require_once '../../lib/config.inc.php';
require_once '../../lib/app.inc.php';
@@ -54,36 +54,39 @@ if(isset($_POST['username']) && $_POST['username'] != '' && $_POST['email'] != '
$username = $app->db->quote($_POST['username']);
$email = $app->db->quote($_POST['email']);
- $client = $app->db->queryOneRecord("SELECT * FROM client WHERE username = '$username' AND email = '$email'");
+ $client = $app->db->queryOneRecord("SELECT client.*, sys_user.lost_password_function FROM client,sys_user WHERE client.username = '$username' AND client.email = '$email' AND client.client_id = sys_user.client_id");
- if($client['client_id'] > 0) {
- $new_password = $app->auth->get_random_password();
- $new_password_encrypted = $app->auth->crypt_password($new_password);
- $new_password_encrypted = $app->db->quote($new_password_encrypted);
-
- $username = $app->db->quote($client['username']);
- $app->db->query("UPDATE sys_user SET passwort = '$new_password_encrypted' WHERE username = '$username'");
- $app->db->query("UPDATE client SET password = '$new_password_encrypted' WHERE username = '$username'");
- $app->tpl->setVar("message", $wb['pw_reset']);
-
- $app->uses('getconf,ispcmail');
- $mail_config = $app->getconf->get_global_config('mail');
- if($mail_config['smtp_enabled'] == 'y') {
- $mail_config['use_smtp'] = true;
- $app->ispcmail->setOptions($mail_config);
- }
- $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']);
- $app->ispcmail->setSubject($wb['pw_reset_mail_title']);
- $app->ispcmail->setMailText($wb['pw_reset_mail_msg'].$new_password);
- $app->ispcmail->send(array($client['contact_name'] => $client['email']));
- $app->ispcmail->finish();
-
- $app->plugin->raiseEvent('password_reset', true);
- $app->tpl->setVar("msg", $wb['pw_reset']);
+ if($client['lost_password_function'] == 0) {
+ $app->tpl->setVar("error", $wb['lost_password_function_disabled_txt']);
} else {
- $app->tpl->setVar("error", $wb['pw_error']);
+ if($client['client_id'] > 0) {
+ $new_password = $app->auth->get_random_password();
+ $new_password_encrypted = $app->auth->crypt_password($new_password);
+ $new_password_encrypted = $app->db->quote($new_password_encrypted);
+
+ $username = $app->db->quote($client['username']);
+ $app->db->query("UPDATE sys_user SET passwort = '$new_password_encrypted' WHERE username = '$username'");
+ $app->db->query("UPDATE client SET password = '$new_password_encrypted' WHERE username = '$username'");
+ $app->tpl->setVar("message", $wb['pw_reset']);
+
+ $app->uses('getconf,ispcmail');
+ $mail_config = $app->getconf->get_global_config('mail');
+ if($mail_config['smtp_enabled'] == 'y') {
+ $mail_config['use_smtp'] = true;
+ $app->ispcmail->setOptions($mail_config);
+ }
+ $app->ispcmail->setSender($mail_config['admin_mail'], $mail_config['admin_name']);
+ $app->ispcmail->setSubject($wb['pw_reset_mail_title']);
+ $app->ispcmail->setMailText($wb['pw_reset_mail_msg'].$new_password);
+ $app->ispcmail->send(array($client['contact_name'] => $client['email']));
+ $app->ispcmail->finish();
+
+ $app->plugin->raiseEvent('password_reset', true);
+ $app->tpl->setVar("msg", $wb['pw_reset']);
+ } else {
+ $app->tpl->setVar("error", $wb['pw_error']);
+ }
}
-
} else {
$app->tpl->setVar("msg", $wb['pw_error_noinput']);
}