Merge pull request #694 from cmacmackin/autocomplete_numeric_usernames

Fix issue with autocompletion of numeric usernames

Author: annda

_test/types/UserTest.php

@@ -84,5 +84,31 @@ public function test_ajax()
 
         $INPUT->set('search', 'test');
         $this->assertEquals([], $user->handleAjax());
+
+        // Check that numeric usernames are handled properly; PHP's
+        // strange handling of array keys that look like integers has
+        // caused bugs with this in the past.
+        global $auth;
+        $auth->createUser('12345', 'secret_password', 'Some Person', '[email protected]');
+        $auth->createUser('54321', 'another_password', 'Someone Else', '[email protected]');
+        
+        $user = new User(
+            [
+                'autocomplete' => [
+                    'fullname' => true,
+                    'mininput' => 2,
+                    'maxresult' => 5,
+                ],
+            ]
+        );
+        
+        $INPUT->set('search', 'Some');
+        $this->assertEquals(
+            [
+                ['label' => 'Some Person [12345]', 'value' => '12345'],
+                ['label' => 'Someone Else [54321]', 'value' => '54321']
+            ],
+            $user->handleAjax()
+        );
     }
 }

types/User.php

@@ -81,17 +81,31 @@ public function handleAjax()
         if ($max <= 0) return [];
 
         // find users by login, fill up with names if wanted
-        $logins = (array)$auth->retrieveUsers(0, $max, ['user' => $lookup]);
+        // Because a value might be interpreted as integer in the
+        // array key, we temporarily pad each key with a space at the
+        // end to enforce string keys.
+        $pad_keys = function ($logins) {
+            $result = [];
+            foreach ($logins as $login => $info) {
+                $result["$login "] = $info;
+            }
+            return $result;
+        };
+        $logins = $pad_keys($auth->retrieveUsers(0, $max, ['user' => $lookup]));
         if ((count($logins) < $max) && $this->config['autocomplete']['fullname']) {
-            $logins = array_merge($logins, (array)$auth->retrieveUsers(0, $max, ['name' => $lookup]));
+            $logins = array_merge(
+                $logins,
+                $pad_keys($auth->retrieveUsers(0, $max, ['name' => $lookup]))
+            );
         }
 
         // reformat result for jQuery UI Autocomplete
         $users = [];
         foreach ($logins as $login => $info) {
+            $true_login = substr($login, 0, -1);
             $users[] = [
-                'label' => $info['name'] . ' [' . $login . ']',
-                'value' => $login
+                'label' => $info['name'] . ' [' . $true_login . ']',
+                'value' => $true_login
             ];
         }