From b889edb33e4a09cc1f65d2fb9ad9f9ea16b1eae9 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 04 Sep 2012 11:42:42 -0400
Subject: [PATCH] - Ported changes from Apache plugin to nginx plugin. - Fixed errors in system.inc.php-
---
interface/web/sites/ajax_get_json.php | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 2672965..14eb440 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'];
@@ -97,8 +99,29 @@
unset($php);
$json .= '"}';
}
+
+ if($type == 'get_ipv4'){
+ $result = array();
+
+ // ipv4
+ //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".intval($_SESSION['s']['user']['client_id']).")");
+ $result[] = $app->functions->suggest_ips('IPv4');
+
+ $json = $app->functions->json_encode($result);
+ }
+
+ if($type == 'get_ipv6'){
+ $result = array();
+
+ // ipv6
+ //$result[] = _search('admin', 'server_ip', "AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".intval($_SESSION['s']['user']['client_id']).")");
+ $result[] = $app->functions->suggest_ips('IPv6');
+
+ $json = $app->functions->json_encode($result);
+ }
//}
+header('Content-type: application/json');
echo $json;
?>
\ No newline at end of file
--
Gitblit v1.9.1