Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0

 interface/web/tools/user_settings.php

@@ -63,7 +63,7 @@
      $app->tform->loadFormDef($tform_def_file);

      // Importing ID
      $this->id = $_SESSION['s']['user']['userid'];
      $this->id = $app->functions->intval($_SESSION['s']['user']['userid']);
      $_POST['id'] = $_SESSION['s']['user']['userid'];

      if(count($_POST) > 1) {
@@ -86,8 +86,22 @@
      if($_POST['passwort'] != $_POST['repeat_password']) {
         $app->tform->errorMessage = $app->tform->lng('password_mismatch');
      }
      $_SESSION['s']['user']['language'] = $_POST['language'];
      $_SESSION['s']['language'] = $_POST['language'];
      if(preg_match('/[a-z]{2}/',$_POST['language'])) {
         $_SESSION['s']['user']['language'] = $_POST['language'];
         $_SESSION['s']['language'] = $_POST['language'];
      } else {
         $app->error('Invalid language.');
      }
   }
	
   function onAfterUpdate() {
      global $app;
		
      if($_POST['passwort'] != '') {
         $tmp_user = $app->db->queryOneRecord("SELECT passwort FROM sys_user WHERE userid = ?", $_SESSION['s']['user']['userid']);
         $_SESSION['s']['user']['passwort'] = $tmp_user['passwort'];
         unset($tmp_user);
      }
   }