From 4eac3a7c70ad9da658766b41da1be58db67964c6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Mar 2015 08:13:41 +0000 Subject: [PATCH] * LDAP,ActiveDirectory: setting default sorting of accounts to ascending, as in SQL backend r52289: docu fix, default is here ASC to, as it is SQL default --- phpgwapi/inc/class.accounts.inc.php | 2 +- phpgwapi/inc/class.accounts_ads.inc.php | 6 +++--- phpgwapi/inc/class.accounts_ldap.inc.php | 8 ++++---- phpgwapi/inc/class.accounts_sql.inc.php | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/phpgwapi/inc/class.accounts.inc.php b/phpgwapi/inc/class.accounts.inc.php index 60c1b121d7..6be7823170 100644 --- a/phpgwapi/inc/class.accounts.inc.php +++ b/phpgwapi/inc/class.accounts.inc.php @@ -242,7 +242,7 @@ class accounts * or integer group-id for a list of members of that group * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set * @param $param['order'] string column to sort after, default account_lid if unset - * @param $param['sort'] string 'ASC' or 'DESC', default 'DESC' if not set + * @param $param['sort'] string 'ASC' or 'DESC', default 'ASC' if not set * @param $param['query'] string to search for, no search if unset or empty * @param $param['query_type'] string: * 'all' - query all fields for containing $param[query] diff --git a/phpgwapi/inc/class.accounts_ads.inc.php b/phpgwapi/inc/class.accounts_ads.inc.php index 736b43eec7..f8364d9e78 100644 --- a/phpgwapi/inc/class.accounts_ads.inc.php +++ b/phpgwapi/inc/class.accounts_ads.inc.php @@ -819,7 +819,7 @@ class accounts_ads * or integer group-id for a list of members of that group * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set * @param $param['order'] string column to sort after, default account_lid if unset - * @param $param['sort'] string 'ASC' or 'DESC', default 'DESC' if not set + * @param $param['sort'] string 'ASC' or 'DESC', default 'ASC' if not set * @param $param['query'] string to search for, no search if unset or empty * @param $param['query_type'] string: * 'all' - query all fields for containing $param[query] @@ -955,7 +955,7 @@ class accounts_ads * * @var string */ - private $_callback_sort = 'DESC'; + private $_callback_sort = 'ASC'; /** * column_names to sort by * @@ -974,7 +974,7 @@ class accounts_ads { foreach($this->_callback_order as $col ) { - if($this->_callback_sort == 'ASC') + if($this->_callback_sort != 'DESC') { $cmp = strcasecmp( $a[$col], $b[$col] ); } diff --git a/phpgwapi/inc/class.accounts_ldap.inc.php b/phpgwapi/inc/class.accounts_ldap.inc.php index ee9d23e105..0f16b4c64a 100644 --- a/phpgwapi/inc/class.accounts_ldap.inc.php +++ b/phpgwapi/inc/class.accounts_ldap.inc.php @@ -643,7 +643,7 @@ class accounts_ldap * or integer group-id for a list of members of that group * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set * @param $param['order'] string column to sort after, default account_lid if unset - * @param $param['sort'] string 'ASC' or 'DESC', default 'DESC' if not set + * @param $param['sort'] string 'ASC' or 'DESC', default 'ASC' if not set * @param $param['query'] string to search for, no search if unset or empty * @param $param['query_type'] string: * 'all' - query all fields for containing $param[query] @@ -657,7 +657,7 @@ class accounts_ldap */ function search($param) { - //echo "

accounts_ldap::search(".print_r($param,true)."): ".microtime()."

\n"; + //error_log(__METHOD__."(".array2string($param).")"); $account_search =& accounts::$cache['account_search']; // check if the query is cached @@ -875,7 +875,7 @@ class accounts_ldap * * @var string */ - private $_callback_sort = 'DESC'; + private $_callback_sort = 'ASC'; /** * column_names to sort by * @@ -894,7 +894,7 @@ class accounts_ldap { foreach($this->_callback_order as $col ) { - if($this->_callback_sort == 'ASC') + if($this->_callback_sort != 'DESC') { $cmp = strcasecmp( $a[$col], $b[$col] ); } diff --git a/phpgwapi/inc/class.accounts_sql.inc.php b/phpgwapi/inc/class.accounts_sql.inc.php index 5e98a802fb..847890ce1a 100644 --- a/phpgwapi/inc/class.accounts_sql.inc.php +++ b/phpgwapi/inc/class.accounts_sql.inc.php @@ -382,7 +382,7 @@ class accounts_sql * or integer group-id for a list of members of that group * @param $param['start'] int first account to return (returns offset or max_matches entries) or all if not set * @param $param['order'] string column to sort after, default account_lid if unset - * @param $param['sort'] string 'ASC' or 'DESC', default 'DESC' if not set + * @param $param['sort'] string 'ASC' or 'DESC', default 'ASC' if not set * @param $param['query'] string to search for, no search if unset or empty * @param $param['query_type'] string: * 'all' - query all fields for containing $param[query]