paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing username in username_invalid message (#3135) 

* Fix missing username in username_invalid message

Fix missing username in username_invalid message

* Fix missing username in username_invalid message 2

Fix missing username in username_invalid message
master
Max 2019-11-11 08:19:22 +01:00 committed by André Peters
parent 36bd55ee5e
commit 852392fd15
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/web/inc/functions.admin.inc.php
View File

@ -23,7 +23,7 @@ function admin($_action, $_data = null) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'username_invalid'
'msg' => array('username_invalid', $username)
);
return false;
}
@ -261,7 +261,7 @@ function admin($_action, $_data = null) {
':admin' => $_data
));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
if (empty($row)) {
if (empty($row)) {
return false;
}
$admindata['username'] = $row['username'];

10
data/web/inc/functions.domain_admin.inc.php
View File

@ -35,7 +35,7 @@ function domain_admin($_action, $_data = null) {
$_SESSION['return'][] = array(
'type' => 'danger',
'log' => array(__FUNCTION__, $_action, $_data_log),
'msg' => 'username_invalid'
'msg' => array('username_invalid', $username)
);
return false;
}
@ -44,12 +44,12 @@ function domain_admin($_action, $_data = null) {
WHERE `username` = :username");
$stmt->execute(array(':username' => $username));
$num_results[] = count($stmt->fetchAll(PDO::FETCH_ASSOC));
$stmt = $pdo->prepare("SELECT `username` FROM `admin`
WHERE `username` = :username");
$stmt->execute(array(':username' => $username));
$num_results[] = count($stmt->fetchAll(PDO::FETCH_ASSOC));
$stmt = $pdo->prepare("SELECT `username` FROM `domain_admins`
WHERE `username` = :username");
$stmt->execute(array(':username' => $username));
@ -379,7 +379,7 @@ function domain_admin($_action, $_data = null) {
}
$stmt = $pdo->query("SELECT DISTINCT
`username`
FROM `domain_admins`
FROM `domain_admins`
WHERE `username` IN (
SELECT `username` FROM `admin`
WHERE `superadmin`!='1'
@ -415,7 +415,7 @@ function domain_admin($_action, $_data = null) {
':domain_admin' => $_data
));
$row = $stmt->fetch(PDO::FETCH_ASSOC);
if (empty($row)) {
if (empty($row)) {
return false;
}
$domainadmindata['username'] = $row['username'];