From 8f9ec70e8d1395fd787a39c0181ab751d2ef730a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 18 Jun 2013 14:51:27 +0000 Subject: [PATCH] removed PHP 5.3 closure in favor for a regular class method, thought LDAP plugins still require 5.3 --- emailadmin/inc/class.emailadmin_bo.inc.php | 41 ++++++++++++---------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/emailadmin/inc/class.emailadmin_bo.inc.php b/emailadmin/inc/class.emailadmin_bo.inc.php index 076230b4dd..fbd3652fb7 100644 --- a/emailadmin/inc/class.emailadmin_bo.inc.php +++ b/emailadmin/inc/class.emailadmin_bo.inc.php @@ -420,17 +420,19 @@ class emailadmin_bo extends so_sql { if ($data) $retData += $data; } - uksort($retData, function($a, $b) { - static $prio = array( // not explicitly mentioned get 0 - 'emailadmin_smtp' => 9, - 'emailadmin_smtp_sql' => 8, - 'smtpplesk' => -1, - ); - return (int)$prio[$b] - (int)$prio[$a]; - }); + uksort($retData, array(__CLASS__, 'smtp_sort')); return $retData; } + static function smtp_sort($a, $b) + { + static $prio = array( // not explicitly mentioned get 0 + 'emailadmin_smtp' => 9, + 'emailadmin_smtp_sql' => 8, + 'smtpplesk' => -1, + ); + return (int)$prio[$b] - (int)$prio[$a]; + } /** * Get a list of supported IMAP servers * @@ -449,19 +451,22 @@ class emailadmin_bo extends so_sql { if ($data) $retData += $data; } - uksort($retData, function($a, $b) { - static $prio = array( // not explicitly mentioned get 0 - 'defaultimap' => 9, - 'managementserver_imap' => 8, - 'emailadmin_dovecot' => 7, - 'cyrusimap' => 6, - 'pleskimap' => -1, - ); - return (int)$prio[$b] - (int)$prio[$a]; - }); + uksort($retData, array(__CLASS__, 'imap_sort')); return $retData; } + static function imap_sort($a, $b) + { + static $prio = array( // not explicitly mentioned get 0 + 'defaultimap' => 9, + 'managementserver_imap' => 8, + 'emailadmin_dovecot' => 7, + 'cyrusimap' => 6, + 'pleskimap' => -1, + ); + return (int)$prio[$b] - (int)$prio[$a]; + } + /** * unset certain CachedObjects for the given profile id, unsets the profile for default ID=0 as well *