Keep reject-sender-mismatch-setting also when updating Fixed missing parts ...

Dominik

2015-04-05 20f478fd5e36bb03dd6850d3f5e8a2a459a6dc2b

 interface/web/login/index.php

@@ -160,7 +160,7 @@
               } else {
                  if(stristr($username, '@')) {
                     //* mailuser login
                     $sql = "SELECT * FROM mail_user WHERE login = '$username'";
                     $sql = "SELECT * FROM mail_user WHERE login = '$username' or email = '$username'";
                     $mailuser = $app->db->queryOneRecord($sql);
                     $user = false;
                     if($mailuser) {
@@ -325,6 +325,15 @@
         $error = '<div class="box box_error"><h1>Error</h1>'.$error.'</div>';
      }
      
      $app->load('getconf');

      $security_config = $app->getconf->get_security_config('permissions');
      if($security_config['password_reset_allowed'] == 'yes') {
         $app->tpl->setVar('pw_lost_show', 1);
      } else {
         $app->tpl->setVar('pw_lost_show', 0);
      }
		
      $app->tpl->setVar('error', $error);
      $app->tpl->setVar('pw_lost_txt', $app->lng('pw_lost_txt'));
      $app->tpl->setVar('username_txt', $app->lng('username_txt'));