Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/tools/user_settings.php

@@ -44,6 +44,10 @@
//* Check permissions for module
$app->auth->check_module_permissions('tools');

if($_SESSION['s']['user']['typ'] == 'admin') {
   $app->auth->check_security_permissions('admin_allow_new_admin');
}

// Loading classes
$app->uses('tpl,tform,tform_actions');
$app->load('tform_actions');
@@ -93,6 +97,16 @@
         $app->error('Invalid language.');
      }
   }
	
   function onAfterUpdate() {
      global $app;
		
      if($_POST['passwort'] != '') {
         $tmp_user = $app->db->queryOneRecord("SELECT passwort FROM sys_user WHERE userid = '".$app->functions->intval($_SESSION['s']['user']['userid'])."'");
         $_SESSION['s']['user']['passwort'] = $tmp_user['passwort'];
         unset($tmp_user);
      }
   }


}