From d87f76019fc231ec20d95126a7fee0487e7be5f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 14 Aug 2012 10:56:20 -0400
Subject: [PATCH] - Added new web folder named private to web folder layout. The folder is intended to store data that shall not be visible in the web directory, it is owned by the user of the web. - Changed ownership of web root directory to root user in all security modes to prevent symlink attacks. - Apache log files are now owned by user root. - Improved functions in system library.
---
interface/web/sites/ajax_get_json.php | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index a910dce..14eb440 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -34,16 +34,18 @@
//* Check permissions for module
$app->auth->check_module_permissions('sites');
+$app->uses('getconf');
+
$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') {
+//if($_SESSION["s"]["user"]["typ"] == 'admin') {
if($type == 'getservertype'){
$json = '{"servertype":"';
$server_type = 'apache';
- $app->uses('getconf');
$web_config = $app->getconf->get_server_config($server_id, 'web');
if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
$json .= $server_type;
@@ -59,8 +61,67 @@
unset($server);
$json .= '"}';
}
+
+ if($type == 'getphpfastcgi'){
+ $json = '{';
+
+ $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' && $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");
+ }
+ 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($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'];
+ }
+ $json .= '"'.$php_version.'": "'.$php_record['name'].'",';
+ }
+ }
+ unset($php_records);
+ 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 .= '"}';
+ }
+
+ 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