webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-07 17:42:53 +03:00
Code Activity

Set $reset_by_sms even if password reset is disabled

Browse Source 
... to avoid an "undefined variable" warning
This commit is contained in:
Christian Boltz
2018-04-27 23:23:57 +02:00
parent 7c38bdd871
commit 24ad5cc3d8
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
model/AdminHandler.php
View File

@@ -36,12 +36,10 @@ class AdminHandler extends PFAHandler {
$passwordReset = Config::read('forgotten_admin_password_reset'); $passwordReset = Config::read('forgotten_admin_password_reset');
if ($passwordReset) {
$reset_by_sms = 0; $reset_by_sms = 0;
if (Config::read('sms_send_function')) { if ($passwordReset && Config::read('sms_send_function')) {
$reset_by_sms = 1; $reset_by_sms = 1;
} }
}
$this->struct=array( $this->struct=array(
# field name allow display in... type $PALANG label $PALANG description default / options / ... # field name allow display in... type $PALANG label $PALANG description default / options / ...

4
model/MailboxHandler.php
View File

@@ -13,12 +13,10 @@ class MailboxHandler extends PFAHandler {
# init $this->struct, $this->db_table and $this->id_field # init $this->struct, $this->db_table and $this->id_field
protected function initStruct() { protected function initStruct() {
$passwordReset = Config::read('forgotten_user_password_reset'); $passwordReset = Config::read('forgotten_user_password_reset');
if ($passwordReset) {
$reset_by_sms = 0; $reset_by_sms = 0;
if (Config::read('sms_send_function')) { if ($passwordReset && Config::read('sms_send_function')) {
$reset_by_sms = 1; $reset_by_sms = 1;
} }
}
$this->struct=array( $this->struct=array(
# field name allow display in... type $PALANG label $PALANG description default / options / ... # field name allow display in... type $PALANG label $PALANG description default / options / ...