tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

DbTool: Be less error-prone while calling array_search

Browse Source
This commit is contained in:
Johannes Meyer 2015-07-31 11:04:17 +02:00
parent b8293b1fdd
commit 7305edc74c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/setup/library/Setup/Utils/DbTool.php
View File

@ -816,7 +816,7 @@ EOD;
// as the chances are very high that the database is created later causing the current user being // as the chances are very high that the database is created later causing the current user being
// the owner with ALL privileges. (Which in turn can be granted to others.) // the owner with ALL privileges. (Which in turn can be granted to others.)
if (array_search('CREATE', $privileges) !== false) { if (array_search('CREATE', $privileges, true) !== false) {
$query = $this->query( $query = $this->query(
'select rolcreatedb from pg_roles where rolname = :user', 'select rolcreatedb from pg_roles where rolname = :user',
array(':user' => $username !== null ? $username : $this->config['username']) array(':user' => $username !== null ? $username : $this->config['username'])
@ -825,7 +825,7 @@ EOD;
} }
} }
if (array_search('CREATEROLE', $privileges) !== false) { if (array_search('CREATEROLE', $privileges, true) !== false) {
$query = $this->query( $query = $this->query(
'select rolcreaterole from pg_roles where rolname = :user', 'select rolcreaterole from pg_roles where rolname = :user',
array(':user' => $username !== null ? $username : $this->config['username']) array(':user' => $username !== null ? $username : $this->config['username'])
@ -833,7 +833,7 @@ EOD;
$privilegesGranted &= $query->fetchColumn() !== false; $privilegesGranted &= $query->fetchColumn() !== false;
} }
if (array_search('SUPER', $privileges) !== false) { if (array_search('SUPER', $privileges, true) !== false) {
$query = $this->query( $query = $this->query(
'select rolsuper from pg_roles where rolname = :user', 'select rolsuper from pg_roles where rolname = :user',
array(':user' => $username !== null ? $username : $this->config['username']) array(':user' => $username !== null ? $username : $this->config['username'])