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

fix validation of offset-value in domain import + minor fixes

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-19 09:29:25 +01:00
parent 495a48bc87
commit c1ca72dd3c
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actions/admin/settings/136.phpfpm.php
View File

@@ -198,5 +198,3 @@ return array(
), ),
), ),
); );
?>

2
admin_domains.php
View File

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

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

@@ -103,7 +103,9 @@ class DomainBulkAction {
*/ */
public function __construct($import_file = null, $customer_id = 0) { public function __construct($import_file = null, $customer_id = 0) {
if (!empty($import_file)) {
$this->_impFile = makeCorrectFile($import_file); $this->_impFile = makeCorrectFile($import_file);
}
$this->_custId = $customer_id; $this->_custId = $customer_id;
} }
@@ -135,10 +137,14 @@ class DomainBulkAction {
throw new Exception("Invalid separator specified: '" . $separator . "'"); throw new Exception("Invalid separator specified: '" . $separator . "'");
} }
if (! is_numeric($offset) || $offset < 0) { if (! is_int($offset) || $offset < 0) {
throw new Exception("Invalid offset specified"); throw new Exception("Invalid offset specified");
} }
if ($this->_custId <= 0) {
throw new Exception("Invalid customer selected");
}
$this->_readCustomerData(); $this->_readCustomerData();
if (is_null($this->_custData)) { if (is_null($this->_custData)) {