From 58b0eacb5c852637508a3fd6ecd2ae4ef587b112 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 13 Mar 2013 18:04:58 -0400
Subject: [PATCH] - Fixed FS#2795 - Empty database user dropdown/autocomplete.

---
 interface/web/sites/ajax_get_json.php |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index f7bbc71..ba9a32e 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -130,23 +130,21 @@
 	}
     
     if($type == 'getdatabaseusers') {
-		$json = '{';
-        
+        $json = '{}';
+		
 		$sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id";
         $group = $app->db->queryOneRecord($sql);
         if($group) {
             $sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
             $records = $app->db->queryAllRecords($sql);
             
+			$tmp_array = array();
             foreach($records as $record) {
-                $json .= '"'.$record['database_user_id'].'": "'.$record['database_user'].'",';
+				$tmp_array[$record['database_user_id']] = $record['database_user'];
             }
-            unset($records);
-            unset($group);
+			$json = $app->functions->json_encode($tmp_array);
+            unset($records, $group, $tmp_array);
         }
-        
-        if(substr($json,-1) == ',') $json = substr($json,0,-1);
-		$json .= '}';
     }
 	
 	if($type == 'get_use_combobox'){

--
Gitblit v1.9.1