Skip to content
Snippets Groups Projects
Commit 38b49844 authored by Falko Timme's avatar Falko Timme
Browse files

- Reverted revision 4176.

parent 3a96095d
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ if($_SESSION["s"]["user"]["typ"] == 'admin' or $app->auth->has_clients($_SESSION ...@@ -44,7 +44,7 @@ if($_SESSION["s"]["user"]["typ"] == 'admin' or $app->auth->has_clients($_SESSION
//* Get global web config //* Get global web config
$web_config = $app->getconf->get_server_config($server_id, 'web'); $web_config = $app->getconf->get_server_config($server_id, 'web');
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = '$ip_type' AND virtualhost = 'y' AND 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); $ips = $app->db->queryAllRecords($sql);
// $ip_select = "<option value=''></option>"; // $ip_select = "<option value=''></option>";
if($ip_type == 'IPv4'){ if($ip_type == 'IPv4'){
......
...@@ -108,7 +108,7 @@ class page_action extends tform_actions { ...@@ -108,7 +108,7 @@ class page_action extends tform_actions {
unset($tmp); unset($tmp);
//* Fill the IPv4 select field with the IP addresses that are allowed for this client //* Fill the IPv4 select field with the IP addresses that are allowed for this client
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND virtualhost = 'y' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":""; $ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = ""; //$ip_select = "";
...@@ -123,7 +123,7 @@ class page_action extends tform_actions { ...@@ -123,7 +123,7 @@ class page_action extends tform_actions {
unset($ips); unset($ips);
//* Fill the IPv6 select field with the IP addresses that are allowed for this client //* Fill the IPv6 select field with the IP addresses that are allowed for this client
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND virtualhost = 'y' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>"; $ip_select = "<option value=''></option>";
//$ip_select = ""; //$ip_select = "";
...@@ -199,7 +199,7 @@ class page_action extends tform_actions { ...@@ -199,7 +199,7 @@ class page_action extends tform_actions {
$app->tpl->setVar("client_group_id",$client_select); $app->tpl->setVar("client_group_id",$client_select);
//* Fill the IPv4 select field with the IP addresses that are allowed for this client //* Fill the IPv4 select field with the IP addresses that are allowed for this client
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv4' AND virtualhost = 'y' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv4' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":""; $ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = ""; //$ip_select = "";
...@@ -214,7 +214,7 @@ class page_action extends tform_actions { ...@@ -214,7 +214,7 @@ class page_action extends tform_actions {
unset($ips); unset($ips);
//* Fill the IPv6 select field with the IP addresses that are allowed for this client //* Fill the IPv6 select field with the IP addresses that are allowed for this client
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND virtualhost = 'y' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".intval($client['default_webserver'])." AND ip_type = 'IPv6' AND (client_id = 0 OR client_id=".$_SESSION['s']['user']['client_id'].")";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>"; $ip_select = "<option value=''></option>";
//$ip_select = ""; //$ip_select = "";
...@@ -281,7 +281,7 @@ class page_action extends tform_actions { ...@@ -281,7 +281,7 @@ class page_action extends tform_actions {
$web_config = $app->getconf->get_server_config($server_id, 'web'); $web_config = $app->getconf->get_server_config($server_id, 'web');
//* Fill the IPv4 select field //* Fill the IPv4 select field
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = 'IPv4' AND virtualhost = 'y' AND server_id = $server_id"; $sql = "SELECT ip_address FROM server_ip WHERE ip_type = 'IPv4' AND server_id = $server_id";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":""; $ip_select = ($web_config['enable_ip_wildcard'] == 'y')?"<option value='*'>*</option>":"";
//$ip_select = ""; //$ip_select = "";
...@@ -296,7 +296,7 @@ class page_action extends tform_actions { ...@@ -296,7 +296,7 @@ class page_action extends tform_actions {
unset($ips); unset($ips);
//* Fill the IPv6 select field //* Fill the IPv6 select field
$sql = "SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' AND server_id = $server_id"; $sql = "SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND server_id = $server_id";
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value=''></option>"; $ip_select = "<option value=''></option>";
//$ip_select = ""; //$ip_select = "";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment