From 2a189307eb0a6693a8d64b62e3845ca87c58d1eb Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Fri, 18 May 2012 08:34:18 -0400 Subject: [PATCH] - Added "Repeat Password" field to all forms where a password has to be set. --- interface/web/sites/ajax_get_json.php | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php index a910dce..887f5da 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,46 @@ 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 .= '"}'; + } -} - +//} +header('Content-type: application/json'); echo $json; ?> \ No newline at end of file -- Gitblit v1.9.1