webapp/postfixadmin
1
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-07-31 10:04:20 +03:00
Code Activity

psalm fixes/workarounds; require PHP 5.6+

Browse Source
This commit is contained in:
David Goodwin
2019-10-19 20:51:05 +01:00
parent 1df7f15d40
commit 87824ef970
12 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
functions.inc.php
View File

@ -8,7 +8,6 @@
*
* Further details on the project are available at http://postfixadmin.sf.net
*
* @version $Id$
* @license GNU GPL v2 or later.
*
* File: functions.inc.php
@ -665,11 +664,6 @@ function list_domains_for_admin($username) {
return array_column($result, 'domain');
}
if (!function_exists('array_column')) {
require_once(dirname(__FILE__) . '/lib/array_column.php');
}
/**
* List all available domains.
*
@ -1916,15 +1910,10 @@ function db_in_clause($field, array $values) {
* Note: the $searchmode operator will only be used if a $condition for that field is set.
* This also means you'll need to set a (dummy) condition for NULL and NOTNULL.
*/
function db_where_clause($condition, $struct, $additional_raw_where = '', $searchmode = array()) {
if (!is_array($condition)) {
throw new Exception('db_where_cond: parameter $cond is not an array!');
} elseif (!is_array($searchmode)) {
throw new Exception('db_where_cond: parameter $searchmode is not an array!');
} elseif (count($condition) == 0 && trim($additional_raw_where) == '') {
function db_where_clause(array $condition, array $struct, $additional_raw_where = '', array $searchmode = array()) {
if (count($condition) == 0 && trim($additional_raw_where) == '') {
throw new Exception("db_where_cond: parameter is an empty array!");
} elseif (!is_array($struct)) {
throw new Exception('db_where_cond: parameter $struct is not an array!');
}
$allowed_operators = array('<', '>', '>=', '<=', '=', '!=', '<>', 'CONT', 'LIKE', 'NULL', 'NOTNULL');