Typo

diff --git a/lib/user.php b/lib/user.php
index 399a3240c8c74c9e5e0f94318f43ea6fe37c0d70..3a35069fd621b54db579e19185874eb1178e6bcb 100644 (file)
--- a/lib/user.php
+++ b/lib/user.php
@@ -265,45 +265,45 @@ class OC_User {
        public static function setUserId($uid) {
                $_SESSION['user_id'] = $uid;
        }
-       
-       /**\r
-        * @brief Sets user display name for session\r
-        */\r
+
+       /**
+        * @brief Sets user display name for session
+        */
        public static function setDisplayName($uid, $displayName = null) {
                $result = false;
-               if ($displayName ) {\r
-                       foreach(self::$_usedBackends as $backend) {\r
-                               if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {\r
-                                       if($backend->userExists($uid)) {\r
-                                               $success |= $backend->setDisplayName($uid, $displayName);\r
-                                       }\r
-                               }\r
+               if ($displayName ) {
+                       foreach(self::$_usedBackends as $backend) {
+                               if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
+                                       if($backend->userExists($uid)) {
+                                               $success |= $backend->setDisplayName($uid, $displayName);
+                                       }
+                               }
                        }
                } else {
                        $displayName = self::determineDisplayName($uid);
                        $result = true;
                }
                $_SESSION['display_name'] = $displayName;
-               return result;\r
+               return $result;
        }
-       
-       
-       /**\r
-        * @brief get display name\r
-        * @param $uid The username\r
-        * @returns string display name or uid if no display name is defined\r
-        *\r
-        */\r
-       private static function determineDisplayName( $uid ) {\r
-               foreach(self::$_usedBackends as $backend) {\r
-                       if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {\r
-                               $result=$backend->getDisplayName( $uid );\r
-                               if($result) {\r
-                                       return $result;\r
-                               }\r
-                       }\r
+
+
+       /**
+        * @brief get display name
+        * @param $uid The username
+        * @returns string display name or uid if no display name is defined
+        *
+        */
+       private static function determineDisplayName( $uid ) {
+               foreach(self::$_usedBackends as $backend) {
+                       if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+                               $result=$backend->getDisplayName( $uid );
+                               if($result) {
+                                       return $result;
+                               }
+                       }
                }
-               return $uid;\r
+               return $uid;
        }
 
        /**
@@ -360,22 +360,22 @@ class OC_User {
                        return false;
                }
        }
-       
-       /**\r
-        * @brief get the display name of the user currently logged in.\r
-        * @return string uid or false\r
-        */\r
+
+       /**
+        * @brief get the display name of the user currently logged in.
+        * @return string uid or false
+        */
        public static function getDisplayName($user=null) {
                if ( $user ) {
                        return self::determineDisplayName($user);
-               } else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {\r
-                       return $_SESSION['display_name'];\r
-               }\r
-               else{\r
-                       return false;\r
-               }\r
+               } else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
+                       return $_SESSION['display_name'];
+               }
+               else{
+                       return false;
+               }
        }
-       
+
        /**
         * @brief Autogenerate a password
         * @returns string
@@ -474,23 +474,23 @@ class OC_User {
                asort($users);
                return $users;
        }
-       
-       /**\r
-        * @brief Get a list of all users display name\r
-        * @returns associative array with all display names (value) and corresponding uids (key)\r
-        *\r
-        * Get a list of all display names and user ids.\r
-        */\r
-       public static function getDisplayNames($search = '', $limit = null, $offset = null) {\r
-               $displayNames = array();\r
-               foreach (self::$_usedBackends as $backend) {\r
-                       $backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);\r
-                       if (is_array($backendDisplayNames)) {\r
-                               $displayNames = array_merge($displayNames, $backendDisplayNames);\r
-                       }\r
-               }\r
-               ksort($displayNames);\r
-               return $displayNames;\r
+
+       /**
+        * @brief Get a list of all users display name
+        * @returns associative array with all display names (value) and corresponding uids (key)
+        *
+        * Get a list of all display names and user ids.
+        */
+       public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+               $displayNames = array();
+               foreach (self::$_usedBackends as $backend) {
+                       $backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
+                       if (is_array($backendDisplayNames)) {
+                               $displayNames = array_merge($displayNames, $backendDisplayNames);
+                       }
+               }
+               ksort($displayNames);
+               return $displayNames;
        }
 
        /**