From 54afe0e3036f339e623e98f5d3fbb397376c7ca2 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 15 Feb 2015 04:05:48 -0500
Subject: [PATCH] allow ipv6 for openvz-container
---
interface/web/sites/ajax_get_json.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 deletions(-)
diff --git a/interface/web/sites/ajax_get_json.php b/interface/web/sites/ajax_get_json.php
index 6800897..243c158 100644
--- a/interface/web/sites/ajax_get_json.php
+++ b/interface/web/sites/ajax_get_json.php
@@ -74,7 +74,7 @@
//* Client: If the logged in user is not admin and has no sub clients (no reseller)
if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $sql_where = " AND (client_id = 0 OR client_id = ".$_SESSION["s"]["user"]["client_id"] . ")";
+ $sql_where = " AND (client_id = 0 OR client_id = ".$app->functions->intval($_SESSION["s"]["user"]["client_id"]) . ")";
//* Reseller: If the logged in user is not admin and has sub clients (is a reseller)
} elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = $client_group_id");
@@ -158,7 +158,7 @@
$sql = "SELECT sys_groupid FROM web_domain WHERE domain_id = $web_id AND ".$app->tform->getAuthSQL('r');
$group = $app->db->queryOneRecord($sql);
if($group) {
- $sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $group['sys_groupid'] . "'";
+ $sql = "SELECT database_user_id, database_user FROM web_database_user WHERE sys_groupid = '" . $app->functions->intval($group['sys_groupid']) . "'";
$records = $app->db->queryAllRecords($sql);
$tmp_array = array();
@@ -190,6 +190,55 @@
$json .= '"}';
}
+if ($type == 'getdirectivesnippet') {
+ $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'];
+
+ $snippets = $app->db->queryAllRecords("SELECT directive_snippets_id, name FROM directive_snippets WHERE customer_viewable = 'y' AND type = ? ORDER BY name ASC", $server_type);
+
+ $json = json_encode($snippets);
+}
+
+if($type == 'getclientssldata'){
+ $web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", intval($web_id));
+ $sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", intval($web['sys_groupid']));
+ $client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", intval($sys_group['client_id']));
+ if(is_array($client) && !empty($client)){
+ if($client['telephone'] == '' && $client['mobile'] != '') $client['telephone'] = $client['mobile'];
+
+ $fname = '';
+ $lname = '';
+ $parts = preg_split("/\s+/", $client['contact_name']);
+ if(sizeof($parts) == 2){
+ $fname = $parts[0];
+ $lname = $parts[1];
+ }
+ if(sizeof($parts) > 2){
+ $fname = $parts[0].' ';
+ for($i=1;$i<sizeof($parts);$i++){
+ if($i == (sizeof($parts) - 1)){
+ $lname .= $parts[$i];
+ } else {
+ if(preg_match('@^(von|van|ten|ter|zur|zu|auf|sieber)$@i', $parts[$i])){
+ $lname .= implode(' ', array_slice($parts, $i));
+ break;
+ } else {
+ $fname .= $parts[$i].' ';
+ }
+ }
+ }
+ }
+ $fname = trim($fname);
+ $lname = trim($lname);
+ $client['fname'] = $fname;
+ $client['lname'] = $lname;
+ if(trim($client['company_name']) == '') $client['company_name'] = $fname.' '.$lname;
+ }
+ $json = $app->functions->json_encode($client);
+}
+
//}
header('Content-type: application/json');
--
Gitblit v1.9.1