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

force integer conversion for domainimport-offset-field, as POST sends it as string; filter IP-addresses that are unknown to froxlor when importing domains.

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-01-30 17:55:27 +01:00
parent d7f8586413
commit 7680cd441c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_domains.php
View File

@@ -1911,7 +1911,7 @@ if ($page == 'domains'
$customerid = intval($_POST['customerid']); $customerid = intval($_POST['customerid']);
$separator = validate($_POST['separator'], 'separator'); $separator = validate($_POST['separator'], 'separator');
$offset = validate($_POST['offset'], 'offset', "/[0-9]/i"); $offset = (int)validate($_POST['offset'], 'offset', "/[0-9]/i");
$file_name = $_FILES['file']['tmp_name']; $file_name = $_FILES['file']['tmp_name'];

15
lib/classes/bulk/class.DomainBulkAction.php
View File

@@ -60,6 +60,13 @@ class DomainBulkAction {
* @var array * @var array
*/ */
private $_knownIpPort = null; private $_knownIpPort = null;
/**
* array of known IP's to check against
*
* @var array
*/
private $_knownIpPortChk = null;
/** /**
* array of fields to import to panel_domains * array of fields to import to panel_domains
@@ -319,6 +326,13 @@ class DomainBulkAction {
// save iplist // save iplist
$iplist = $domain_data['ips']; $iplist = $domain_data['ips'];
$iplist_arr = array_unique(explode(",", $iplist));
$knownIPsCheck = array_unique($this->_knownIpPortChk);
// check whether we actually have at least one of the used IP's in our system
$result_iplist = array_intersect($iplist_arr, $knownIPsCheck);
// write back iplist
$iplist = implode(",", $result_iplist);
// dont need that for the domain-insert-statement // dont need that for the domain-insert-statement
unset($domain_data['ips']); unset($domain_data['ips']);
@@ -445,6 +459,7 @@ class DomainBulkAction {
$this->_knownIpPort = array (); $this->_knownIpPort = array ();
while ($ipp = $knownip_stmt->fetch()) { while ($ipp = $knownip_stmt->fetch()) {
$this->_knownIpPort[$ipp['ip']][] = $ipp; $this->_knownIpPort[$ipp['ip']][] = $ipp;
$this->_knownIpPortChk[] = $ipp['ip'];
} }
} }