From 0ae667e6cfdd1bcc85bacf85cd93a84f99fa88f8 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 22 May 2012 04:08:05 -0400
Subject: [PATCH] added missing language string already present in default theme
---
interface/web/sites/ajax_get_json.php | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 26e8211..887f5da 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -38,6 +38,7 @@
$server_id = intval($_GET["server_id"]);
$web_id = intval($_GET["web_id"]);
+$php_type = $_GET["php_type"];
$type = $_GET["type"];
//if($_SESSION["s"]["user"]["typ"] == 'admin') {
@@ -67,16 +68,17 @@
$server_type = 'apache';
$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'){
- $sql = "SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = $server_id";
- } else {
- $sql = "SELECT * FROM server_php WHERE php_fastcgi_binary != '' AND php_fastcgi_ini_dir != '' AND server_id = $server_id";
+ if($server_type == 'nginx' && $php_type == 'fast-cgi') $php_type = 'php-fpm';
+ 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($sql);
+ 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_select = "";
if(is_array($php_records) && !empty($php_records)) {
foreach( $php_records as $php_record) {
- if($server_type == 'nginx'){
+ if($php_type == 'php-fpm'){
$php_version = $php_record['name'].':'.$php_record['php_fpm_init_script'].':'.$php_record['php_fpm_ini_dir'].':'.$php_record['php_fpm_pool_dir'];
} else {
$php_version = $php_record['name'].':'.$php_record['php_fastcgi_binary'].':'.$php_record['php_fastcgi_ini_dir'];
@@ -88,8 +90,17 @@
if(substr($json,-1) == ',') $json = substr($json,0,-1);
$json .= '}';
}
+
+ if($type == 'getphptype'){
+ $json = '{"phptype":"';
+ $sql = "SELECT php FROM web_domain WHERE domain_id = $web_id";
+ $php = $app->db->queryOneRecord($sql);
+ $json .= $php['php'];
+ unset($php);
+ $json .= '"}';
+ }
//}
-
+header('Content-type: application/json');
echo $json;
?>
\ No newline at end of file
--
Gitblit v1.9.1