From 615a0a96618fa99e7e452523145d6c0f238d4473 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 31 Jul 2013 09:33:43 -0400
Subject: [PATCH] Merged revisions 3960-4065 from stable branch.
---
interface/web/sites/ajax_get_json.php | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index f7bbc71..334738a 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -69,11 +69,17 @@
$web_config = $app->getconf->get_server_config($server_id, 'web');
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
if($server_type == 'nginx' && $php_type == 'fast-cgi') $php_type = 'php-fpm';
+ // get client id
+ $sql_where = '';
+ if($_SESSION["s"]["user"]["typ"] != 'admin'){
+ $sql_where = " AND client_id = ".$_SESSION["s"]["user"]["client_id"];
+ }
+
if($php_type == 'php-fpm'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id".$sql_where);
}
if($php_type == 'fast-cgi'){
- $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = $server_id");
+ $php_records = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = $server_id".$sql_where);
}
$php_select = "";
if(is_array($php_records) && !empty($php_records)) {
@@ -130,23 +136,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