diff options
| -rw-r--r-- | apps/user_ldap/user_proxy.php | 27 | ||||
| -rw-r--r-- | index.html | 6 | ||||
| -rw-r--r-- | lib/l10n.php | 2 | ||||
| -rw-r--r-- | settings/apps.php | 4 | ||||
| -rw-r--r-- | settings/css/settings.css | 4 |
5 files changed, 40 insertions, 3 deletions
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php index 47f901ddb51..a94be3354fc 100644 --- a/apps/user_ldap/user_proxy.php +++ b/apps/user_ldap/user_proxy.php @@ -147,6 +147,33 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface { } /** + * @brief get display name of the user + * @param $uid user ID of the user + * @return display name + */ + public function getDisplayName($uid) { + return $this->handleRequest($uid, 'getDisplayName', array($uid)); + } + + /** + * @brief Get a list of all display names + * @returns array with all displayNames (value) and the corresponding uids (key) + * + * Get a list of all display names and user ids. + */ + public function getDisplayNames($search = '', $limit = null, $offset = null) { + //we do it just as the /OC_User implementation: do not play around with limit and offset but ask all backends + $users = array(); + foreach($this->backends as $backend) { + $backendUsers = $backend->getDisplayNames($search, $limit, $offset); + if (is_array($backendUsers)) { + $users = array_merge($users, $backendUsers); + } + } + return $users; + } + + /** * @brief delete a user * @param $uid The username of the user to delete * @returns true/false diff --git a/index.html b/index.html new file mode 100644 index 00000000000..69d42e3a0b3 --- /dev/null +++ b/index.html @@ -0,0 +1,6 @@ +<!DOCTYPE html> +<html> +<head> + <meta http-equiv="refresh" content="0; URL=index.php"> +</head> +</html> diff --git a/lib/l10n.php b/lib/l10n.php index ca53b3cf65c..ee879009265 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -287,7 +287,7 @@ class OC_L10N{ } if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { - $accepted_languages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']); + $accepted_languages = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE'])); if(is_array($app)) { $available = $app; } diff --git a/settings/apps.php b/settings/apps.php index 4f8eba159c2..b9ed2cac93a 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -36,6 +36,10 @@ function app_sort( $a, $b ) { } + if ($a['internal'] != $b['internal']) { + return $b['internal'] - $a['internal']; + } + return strcmp($a['name'], $b['name']); } diff --git a/settings/css/settings.css b/settings/css/settings.css index 35c7176d45e..667539cd685 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -55,8 +55,8 @@ small.recommendedapp.list { float: right; } span.version { margin-left:1em; margin-right:1em; color:#555; } .app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ } -.app.externalapp { max-width: 12.5em; z-index: 100; } -.app.recommendedapp { max-width: 12.5em; z-index: 100; } +.app.externalapp { max-width: 12.5em; } +.app.recommendedapp { max-width: 12.5em; } /* Transition to complete width! */ .app:hover, .app:active { max-width: inherit; } |