From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/dns/dns_import.php | 177 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 143 insertions(+), 34 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 3aaaf3f..255d290 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -44,13 +44,13 @@
$app->load_language_file('/web/dns/lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng');
// import variables
-$template_id = (isset($_POST['template_id']))?intval($_POST['template_id']):0;
-$sys_groupid = (isset($_POST['client_group_id']))?intval($_POST['client_group_id']):0;
+$template_id = (isset($_POST['template_id']))?$app->functions->intval($_POST['template_id']):0;
+$sys_groupid = (isset($_POST['client_group_id']))?$app->functions->intval($_POST['client_group_id']):0;
$domain = (isset($_POST['domain'])&&!empty($_POST['domain']))?$_POST['domain']:NULL;
// get the correct server_id
if($_SESSION['s']['user']['typ'] == 'admin') {
- $server_id = (isset($_POST['server_id']))?intval($_POST['server_id']):1;
+ $server_id = (isset($_POST['server_id']))?$app->functions->intval($_POST['server_id']):1;
} else {
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$client = $app->db->queryOneRecord("SELECT default_dnsserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
@@ -84,14 +84,14 @@
$app->tpl->setVar("server_id",$server_id_option);
// load the list of clients
- $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name";
+ $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND sys_group.client_id > 0 ORDER BY sys_group.name";
$clients = $app->db->queryAllRecords($sql);
$client_select = '';
if($_SESSION["s"]["user"]["typ"] == 'admin') $client_select .= "<option value='0'></option>";
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
- $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
+ $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
}
}
@@ -102,30 +102,34 @@
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
- $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
+ $client = $app->db->queryOneRecord("SELECT client.client_id, client.contact_name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname, sys_group.name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id");
// load the list of clients
- $sql = "SELECT groupid, name FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
+ $sql = "SELECT sys_group.groupid, sys_group.name, CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as contactname FROM sys_group, client WHERE sys_group.client_id = client.client_id AND client.parent_client_id = ".$client['client_id'];
$clients = $app->db->queryAllRecords($sql);
$tmp = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ".$client['client_id']);
- $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contact_name'].'</option>';
+ $client_select = '<option value="'.$tmp['groupid'].'">'.$client['contactname'].'</option>';
if(is_array($clients)) {
foreach( $clients as $client) {
$selected = ($client["groupid"] == $sys_groupid)?'SELECTED':'';
- $client_select .= "<option value='$client[groupid]' $selected>$client[name]</option>\r\n";
+ $client_select .= "<option value='$client[groupid]' $selected>$client[contactname]</option>\r\n";
}
}
$app->tpl->setVar("client_group_id",$client_select);
}
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_import.lng';
+include($lng_file);
+$app->tpl->setVar($wb);
+
// Import the zone-file
//if(1=="1")
if(isset($_FILES['file']['name']) && is_uploaded_file($_FILES['file']['tmp_name'])){
$valid_zone_file = FALSE;
- $sql = "SELECT server_name FROM `server` WHERE server_id=".intval($server_id)." OR mirror_server_id=".intval($server_id)." ORDER BY server_name ASC";
+ $sql = "SELECT server_name FROM `server` WHERE server_id=".$app->functions->intval($server_id)." OR mirror_server_id=".$app->functions->intval($server_id)." ORDER BY server_name ASC";
$servers = $app->db->queryAllRecords($sql);
for ($i=0;$i<count($servers);$i++)
{
@@ -195,7 +199,27 @@
}
// TTL
if($parts[0] == '$ttl'){
- $soa['ttl'] = intval($parts[1]);
+ $time_format = strtolower(substr($parts[1],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['ttl'] = $app->functions->intval(substr($parts[1],0,-1));
+ break;
+ case 'm':
+ $soa['ttl'] = $app->functions->intval(substr($parts[1],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['ttl'] = $app->functions->intval(substr($parts[1],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['ttl'] = $app->functions->intval(substr($parts[1],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['ttl'] = $app->functions->intval(substr($parts[1],0,-1)) * 604800;
+ break;
+ default:
+ $soa['ttl'] = $app->functions->intval($parts[1]);
+ }
+ unset($time_format);
}
// SOA
if(in_array("soa", $parts)){
@@ -210,15 +234,103 @@
$valid_zone_file = TRUE;
}
// SERIAL
- if($i == ($soa_array_key + 1)) $soa['serial'] = intval($parts[0]);
+ if($i == ($soa_array_key + 1)) $soa['serial'] = $app->functions->intval($parts[0]);
// REFRESH
- if($i == ($soa_array_key + 2)) $soa['refresh'] = intval($parts[0]);
+ if($i == ($soa_array_key + 2)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['refresh'] = $app->functions->intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['refresh'] = $app->functions->intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['refresh'] = $app->functions->intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['refresh'] = $app->functions->intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['refresh'] = $app->functions->intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['refresh'] = $app->functions->intval($parts[0]);
+ }
+ unset($time_format);
+ }
// RETRY
- if($i == ($soa_array_key + 3)) $soa['retry'] = intval($parts[0]);
+ if($i == ($soa_array_key + 3)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['retry'] = $app->functions->intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['retry'] = $app->functions->intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['retry'] = $app->functions->intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['retry'] = $app->functions->intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['retry'] = $app->functions->intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['retry'] = $app->functions->intval($parts[0]);
+ }
+ unset($time_format);
+ }
// EXPIRE
- if($i == ($soa_array_key + 4)) $soa['expire'] = intval($parts[0]);
+ if($i == ($soa_array_key + 4)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['expire'] = $app->functions->intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['expire'] = $app->functions->intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['expire'] = $app->functions->intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['expire'] = $app->functions->intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['expire'] = $app->functions->intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['expire'] = $app->functions->intval($parts[0]);
+ }
+ unset($time_format);
+ }
// MINIMUM
- if($i == ($soa_array_key + 5)) $soa['minimum'] = intval($parts[0]);
+ if($i == ($soa_array_key + 5)){
+ $time_format = strtolower(substr($parts[0],-1));
+ switch ($time_format) {
+ case 's':
+ $soa['minimum'] = $app->functions->intval(substr($parts[0],0,-1));
+ break;
+ case 'm':
+ $soa['minimum'] = $app->functions->intval(substr($parts[0],0,-1)) * 60;
+ break;
+ case 'h':
+ $soa['minimum'] = $app->functions->intval(substr($parts[0],0,-1)) * 3600;
+ break;
+ case 'd':
+ $soa['minimum'] = $app->functions->intval(substr($parts[0],0,-1)) * 86400;
+ break;
+ case 'w':
+ $soa['minimum'] = $app->functions->intval(substr($parts[0],0,-1)) * 604800;
+ break;
+ default:
+ $soa['minimum'] = $app->functions->intval($parts[0]);
+ }
+ unset($time_format);
+ }
// RESOURCE RECORDS
if($i > ($soa_array_key + 5)){
if(substr($parts[0],-1) == '.' || $parts[0] == '@' || ($parts[0] != 'a' && $parts[0] != 'aaaa' && $parts[0] != 'ns' && $parts[0] != 'cname' && $parts[0] != 'hinfo' && $parts[0] != 'mx' && $parts[0] != 'naptr' && $parts[0] != 'ptr' && $parts[0] != 'rp' && $parts[0] != 'srv' && $parts[0] != 'txt')){
@@ -246,14 +358,14 @@
$dns_rr[$r]['name'] = $parts[0];
}
if(is_numeric($parts[1])){
- $dns_rr[$r]['ttl'] = intval($parts[1]);
+ $dns_rr[$r]['ttl'] = $app->functions->intval($parts[1]);
} else {
$dns_rr[$r]['ttl'] = $soa['ttl'];
}
switch ($resource_type) {
case 'mx':
case 'srv':
- $dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
case 'txt':
@@ -273,11 +385,11 @@
$pkey = 3;
$dns_rr[$r]['type'] = $resource_type;
$dns_rr[$r]['name'] = $parts[0];
- $dns_rr[$r]['ttl'] = intval($parts[1]);
+ $dns_rr[$r]['ttl'] = $app->functions->intval($parts[1]);
switch ($resource_type) {
case 'mx':
case 'srv':
- $dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
case 'txt':
@@ -301,7 +413,7 @@
switch ($resource_type) {
case 'mx':
case 'srv':
- $dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
case 'txt':
@@ -321,11 +433,11 @@
$pkey = 2;
$dns_rr[$r]['type'] = $resource_type;
$dns_rr[$r]['name'] = $parts[0];
- $dns_rr[$r]['ttl'] = intval($parts[1]);
+ $dns_rr[$r]['ttl'] = $app->functions->intval($parts[1]);
switch ($resource_type) {
case 'mx':
case 'srv':
- $dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
case 'txt':
@@ -351,7 +463,7 @@
switch ($resource_type) {
case 'mx':
case 'srv':
- $dns_rr[$r]['aux'] = intval($parts[$pkey+1]);
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
$dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
break;
case 'txt':
@@ -522,7 +634,7 @@
$minimum = $app->db->quote($soa['minimum']);
$ttl = $app->db->quote($soa['ttl']);
$xfer = $app->db->quote('');
- $serial = $app->db->quote(intval($soa['serial'])+1);
+ $serial = $app->db->quote($app->functions->intval($soa['serial'])+1);
//print_r($soa);
//die();
if($valid_zone_file){
@@ -540,23 +652,20 @@
$dns_rr_id = $app->db->datalogInsert('dns_rr', $insert_data, 'id');
}
}
- $msg .= $app->lng('zone_file_successfully_imported_txt');
+ $msg .= $wb['zone_file_successfully_imported_txt'];
} else {
- $error .= $app->lng('error_no_valid_zone_file_txt');
+ $error .= $wb['error_no_valid_zone_file_txt'];
}
//header('Location: /dns/dns_soa_edit.php?id='.$dns_soa_id);
+} else {
+ if(isset($_FILES['file']['name'])) {
+ $error = $wb['no_file_uploaded_error'];
+ }
}
$app->tpl->setVar('msg',$msg);
$app->tpl->setVar('error',$error);
-
-$app->tpl->setVar("title",'Import Zone Files');
-$app->tpl->setVar("zonefile_to_import_txt",$app->lng('zonefile_to_import_txt'));
-
-$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng';
-include($lng_file);
-$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
--
Gitblit v1.9.1