maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- prepare inserttask()-function for multiserver-support

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-10-17 01:44:58 +00:00
parent 2a4d618bcc
commit 382bd88344
10 changed files with 243 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
admin_ipsandports.php
View File

@@ -148,6 +148,13 @@ if($page == 'ipsandports'
$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
$docroot = validate($_POST['docroot'], 'docroot');
/*
* get server-id for ip/port combo (multiserver-support, default = 0)
* @TODO needs to be implemented in the interface, using 0 for now
* 16.10.2010 d00p
*/
//$server_id = intval_ressource($_POST['serverid']);
$server_id = 0;
if($listen_statement != '1')
{
@@ -226,7 +233,8 @@ if($page == 'ipsandports'
`ssl_ca_file` = '" . $db->escape($ssl_ca_file) . "',
`ssl_cert_chainfile` = '" . $db->escape($ssl_cert_chainfile) . "',
`default_vhostconf_domain` = '" . $db->escape($default_vhostconf_domain) . "',
`docroot` = '" . $db->escape($docroot) . "';
`docroot` = '" . $db->escape($docroot) . "',
`sid` = '" . (int)$server_id ."';
");
if(filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
@@ -235,8 +243,8 @@ if($page == 'ipsandports'
}
$log->logAction(ADM_ACTION, LOG_WARNING, "added IP/port '" . $ip . ":" . $port . "'");
inserttask('1');
inserttask('4');
inserttask('1', $server_id);
inserttask('4', $server_id);
redirectTo($filename, Array('page' => $page, 's' => $s));
}
}
@@ -257,6 +265,16 @@ if($page == 'ipsandports'
if($result['ip'] != '')
{
/*
* get server-id from ip/port combo (multiserver-support)
*/
$server_id = $result['sid'];
/*
* @TODO enter server-id as select-condition where necessary
* 16.10.2010 d00p
*/
if(isset($_POST['send'])
&& $_POST['send'] == 'send')
{
@@ -276,7 +294,13 @@ if($page == 'ipsandports'
$ssl_cert_chainfile = validate($_POST['ssl_cert_chainfile'], 'ssl_cert_chainfile');
$default_vhostconf_domain = validate(str_replace("\r\n", "\n", $_POST['default_vhostconf_domain']), 'default_vhostconf_domain', '/^[^\0]*$/');
$docroot = validate($_POST['docroot'], 'docroot');
/*
* get server-id for customer (multiserver-support, default = 0)
* @TODO needs to be implemented in the interface, using 0 for now
* 16.10.2010 d00p
*/
//$server_id = intval_ressource($_POST['serverid']);
if($listen_statement != '1')
{
$listen_statement = '0';
@@ -365,8 +389,8 @@ if($page == 'ipsandports'
");
$log->logAction(ADM_ACTION, LOG_WARNING, "changed IP/port from '" . $result['ip'] . ":" . $result['port'] . "' to '" . $ip . ":" . $port . "'");
inserttask('1');
inserttask('4');
inserttask('1', $server_id);
inserttask('4', $server_id);
redirectTo($filename, Array('page' => $page, 's' => $s));
}
}