From 8e38755040c6c2073f92f0ffb087da530d0e7a0a Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:49:26 -0500
Subject: [PATCH] - Changed a German translation. - Extended SEO redirect check for subdomains/alias domains.
---
interface/web/sites/ajax_get_ip.php | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/interface/web/sites/ajax_get_ip.php b/interface/web/sites/ajax_get_ip.php
index fbe9203..34fbab8 100644
--- a/interface/web/sites/ajax_get_ip.php
+++ b/interface/web/sites/ajax_get_ip.php
@@ -33,24 +33,34 @@
//* Check permissions for module
$app->auth->check_module_permissions('sites');
+$app->uses('getconf');
-$server_id = intval($_GET["server_id"]);
+$server_id = $app->functions->intval($_GET["server_id"]);
+$client_group_id = $app->functions->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";
+ //* Get global web config
+ $web_config = $app->getconf->get_server_config($server_id, 'web');
+
+ $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 = ($web_config['enable_ip_wildcard'] == 'y')?"*#":"";
+ } 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);
unset($ips);
}
-echo $ip_select;
+echo substr($ip_select,0,-1);
?>
\ No newline at end of file
--
Gitblit v1.9.1