Commit e79866fe authored by marknl's avatar marknl
Browse files

FS#1113 - Force client to use only allowed IPs - see flyspray page for more info

parent 55fee880
...@@ -82,7 +82,7 @@ class page_action extends tform_actions { ...@@ -82,7 +82,7 @@ class page_action extends tform_actions {
function onShowEnd() { function onShowEnd() {
global $app, $conf; global $app, $conf;
//* Client: If the logged in user is not admin and has no sub clients (no rseller) //* 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'])) { if($_SESSION["s"]["user"]["typ"] != 'admin' && !$app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client // Get the limits of the client
...@@ -95,9 +95,7 @@ class page_action extends tform_actions { ...@@ -95,9 +95,7 @@ class page_action extends tform_actions {
unset($tmp); unset($tmp);
// Fill the IP select field with the IP addresses that are allowed for this client // Fill the IP select field with the IP addresses that are allowed for this client
// $ip_select = "<option value='*'>*</option>"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND client_id=0 OR client_id=".$_SESSION['s']['user']['client_id'];
// $app->tpl->setVar("ip_address",$ip_select);
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver'];
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value='*'>*</option>"; $ip_select = "<option value='*'>*</option>";
//$ip_select = ""; //$ip_select = "";
...@@ -111,7 +109,7 @@ class page_action extends tform_actions { ...@@ -111,7 +109,7 @@ class page_action extends tform_actions {
unset($tmp); unset($tmp);
unset($ips); unset($ips);
//* Reseller: If the logged in user is not admin and has sub clients (is a rseller) //* 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'])) { } elseif ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
// Get the limits of the client // Get the limits of the client
...@@ -138,9 +136,7 @@ class page_action extends tform_actions { ...@@ -138,9 +136,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 IP select field with the IP addresses that are allowed for this client // Fill the IP select field with the IP addresses that are allowed for this client
//$ip_select = "<option value='*'>*</option>"; $sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver']." AND client_id=0 OR client_id=".$_SESSION['s']['user']['client_id'];
//$app->tpl->setVar("ip_address",$ip_select);
$sql = "SELECT ip_address FROM server_ip WHERE server_id = ".$client['default_webserver'];
$ips = $app->db->queryAllRecords($sql); $ips = $app->db->queryAllRecords($sql);
$ip_select = "<option value='*'>*</option>"; $ip_select = "<option value='*'>*</option>";
//$ip_select = ""; //$ip_select = "";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment