From fea974d01416c9ecb57f801b1796d1332918063a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 23 Jan 2012 09:53:52 -0500
Subject: [PATCH] Fixed: FS#1997 - Check encoding of the subject in ispconfig mail sending function.
---
interface/web/sites/ajax_get_ip.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index fbe9203..faf7753 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -35,17 +35,23 @@
$app->auth->check_module_permissions('sites');
$server_id = intval($_GET["server_id"]);
+$client_group_id = intval($_GET["client_group_id"]);
+$ip_type = $app->db->quote($_GET['ip_type']);
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+if($_SESSION["s"]["user"]["typ"] == 'admin' or $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
- $sql = "SELECT ip_address FROM server_ip WHERE server_id = $server_id";
+ $sql = "SELECT ip_address FROM server_ip WHERE ip_type = '$ip_type' AND server_id = $server_id";
$ips = $app->db->queryAllRecords($sql);
// $ip_select = "<option value=''></option>";
- $ip_select = "<option value='*'>*</option>\r\n";
+ if($ip_type == 'IPv4'){
+ $ip_select = "*";
+ } else {
+ $ip_select = "";
+ }
if(is_array($ips)) {
foreach( $ips as $ip) {
//$selected = ($ip["ip_address"] == $this->dataRecord["ip_address"])?'SELECTED':'';
- $ip_select .= "<option value='$ip[ip_address]'>$ip[ip_address]</option>\r\n";
+ $ip_select .= "#$ip[ip_address]";
}
}
unset($tmp);
--
Gitblit v1.9.1