From 6028e4692d172b63f8af79c4460f9dbff5a9a01c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Thu, 26 May 2016 02:21:05 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'
---
interface/web/tools/user_settings.php | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/interface/web/tools/user_settings.php b/interface/web/tools/user_settings.php
index 02fc4f7..ccf86ad 100644
--- a/interface/web/tools/user_settings.php
+++ b/interface/web/tools/user_settings.php
@@ -44,10 +44,6 @@
//* 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');
@@ -102,7 +98,7 @@
global $app;
if($_POST['passwort'] != '') {
- $tmp_user = $app->db->queryOneRecord("SELECT passwort FROM sys_user WHERE userid = '".$app->functions->intval($_SESSION['s']['user']['userid'])."'");
+ $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);
}
--
Gitblit v1.9.1