extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 12:41:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

* LDAP,ActiveDirectory: setting default sorting of accounts to ascending, as in SQL backend

Browse Source 
r52289: docu fix, default is here ASC to, as it is SQL default
This commit is contained in:
Ralf Becker 2015-03-27 08:13:41 +00:00
parent 4079010bfa
commit 4eac3a7c70
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.accounts.inc.php
View File

@ -242,7 +242,7 @@ class accounts
* or integer group-id for a list of members of that group * 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['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['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'] string to search for, no search if unset or empty
* @param $param['query_type'] string: * @param $param['query_type'] string:
* 'all' - query all fields for containing $param[query] * 'all' - query all fields for containing $param[query]

6
phpgwapi/inc/class.accounts_ads.inc.php
View File

@ -819,7 +819,7 @@ class accounts_ads
* or integer group-id for a list of members of that group * 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['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['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'] string to search for, no search if unset or empty
* @param $param['query_type'] string: * @param $param['query_type'] string:
* 'all' - query all fields for containing $param[query] * 'all' - query all fields for containing $param[query]
@ -955,7 +955,7 @@ class accounts_ads
* *
* @var string * @var string
*/ */
private $_callback_sort = 'DESC'; private $_callback_sort = 'ASC';
/** /**
* column_names to sort by * column_names to sort by
* *
@ -974,7 +974,7 @@ class accounts_ads
{ {
foreach($this->_callback_order as $col ) foreach($this->_callback_order as $col )
{ {
if($this->_callback_sort == 'ASC') if($this->_callback_sort != 'DESC')
{ {
$cmp = strcasecmp( $a[$col], $b[$col] ); $cmp = strcasecmp( $a[$col], $b[$col] );
} }

8
phpgwapi/inc/class.accounts_ldap.inc.php
View File

@ -643,7 +643,7 @@ class accounts_ldap
* or integer group-id for a list of members of that group * 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['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['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'] string to search for, no search if unset or empty
* @param $param['query_type'] string: * @param $param['query_type'] string:
* 'all' - query all fields for containing $param[query] * 'all' - query all fields for containing $param[query]
@ -657,7 +657,7 @@ class accounts_ldap
*/ */
function search($param) function search($param)
{ {
//echo "<p>accounts_ldap::search(".print_r($param,true)."): ".microtime()."</p>\n"; //error_log(__METHOD__."(".array2string($param).")");
$account_search =& accounts::$cache['account_search']; $account_search =& accounts::$cache['account_search'];
// check if the query is cached // check if the query is cached
@ -875,7 +875,7 @@ class accounts_ldap
* *
* @var string * @var string
*/ */
private $_callback_sort = 'DESC'; private $_callback_sort = 'ASC';
/** /**
* column_names to sort by * column_names to sort by
* *
@ -894,7 +894,7 @@ class accounts_ldap
{ {
foreach($this->_callback_order as $col ) foreach($this->_callback_order as $col )
{ {
if($this->_callback_sort == 'ASC') if($this->_callback_sort != 'DESC')
{ {
$cmp = strcasecmp( $a[$col], $b[$col] ); $cmp = strcasecmp( $a[$col], $b[$col] );
} }

2
phpgwapi/inc/class.accounts_sql.inc.php
View File

@ -382,7 +382,7 @@ class accounts_sql
* or integer group-id for a list of members of that group * 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['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['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'] string to search for, no search if unset or empty
* @param $param['query_type'] string: * @param $param['query_type'] string:
* 'all' - query all fields for containing $param[query] * 'all' - query all fields for containing $param[query]