From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:05:33 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
interface/web/dns/dns_import.php | 406 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 203 insertions(+), 203 deletions(-)
diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php
index 255d290..b015453 100644
--- a/interface/web/dns/dns_import.php
+++ b/interface/web/dns/dns_import.php
@@ -28,8 +28,8 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('dns');
@@ -40,7 +40,7 @@
// Loading the template
$app->uses('tpl,validate_dns');
$app->tpl->newTemplate("form.tpl.htm");
-$app->tpl->setInclude('content_tpl','templates/dns_import.htm');
+$app->tpl->setInclude('content_tpl', 'templates/dns_import.htm');
$app->load_language_file('/web/dns/lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng');
// import variables
@@ -69,11 +69,11 @@
$n++;
}
unset($n);
-$app->tpl->setVar("template_id_option",$template_id_option);
+$app->tpl->setVar("template_id_option", $template_id_option);
// If the user is administrator
if($_SESSION['s']['user']['typ'] == 'admin') {
-
+
// Load the list of servers
$records = $app->db->queryAllRecords("SELECT server_id, server_name FROM server WHERE mirror_server_id = 0 AND dns_server = 1 ORDER BY server_name");
$server_id_option = '';
@@ -81,8 +81,8 @@
$checked = ($rec['server_id'] == $server_id)?' SELECTED':'';
$server_id_option .= '<option value="'.$rec['server_id'].'"'.$checked.'>'.$rec['server_name'].'</option>';
}
- $app->tpl->setVar("server_id",$server_id_option);
-
+ $app->tpl->setVar("server_id", $server_id_option);
+
// load the list of clients
$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);
@@ -95,16 +95,16 @@
}
}
- $app->tpl->setVar("client_group_id",$client_select);
+ $app->tpl->setVar("client_group_id", $client_select);
}
if ($_SESSION["s"]["user"]["typ"] != 'admin' && $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
-
+
// Get the limits of the client
$client_group_id = $_SESSION["s"]["user"]["default_group"];
$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 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);
@@ -117,37 +117,37 @@
}
}
- $app->tpl->setVar("client_group_id",$client_select);
+ $app->tpl->setVar("client_group_id", $client_select);
}
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dns_import.lng';
-include($lng_file);
+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=".$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++)
{
- if (substr($servers[$i]['server_name'],strlen($servers[$i]['server_name'])-1) != ".")
+ if (substr($servers[$i]['server_name'], strlen($servers[$i]['server_name'])-1) != ".")
{
$servers[$i]['server_name'] .= ".";
}
}
$lines = file($_FILES['file']['tmp_name']);
-
+
// Remove empty lines, comments, whitespace, tabs, etc.
$new_lines = array();
foreach($lines as $line){
$line = trim($line);
- if ($line != '' && substr($line,0,1) != ';'){
- if(strpos($line,";") !== FALSE) $line = substr($line,0,strpos($line,";"));
- if(strpos($line,"(") !== FALSE) $line = substr($line,0,strpos($line,"("));
- if(strpos($line,")") !== FALSE) $line = substr($line,0,strpos($line,")"));
+ if ($line != '' && substr($line, 0, 1) != ';'){
+ if(strpos($line, ";") !== FALSE) $line = substr($line, 0, strpos($line, ";"));
+ if(strpos($line, "(") !== FALSE) $line = substr($line, 0, strpos($line, "("));
+ if(strpos($line, ")") !== FALSE) $line = substr($line, 0, strpos($line, ")"));
$line = trim($line);
if ($line != ''){
$sPattern = '/\s+/m';
@@ -159,19 +159,19 @@
unset($lines);
$lines = $new_lines;
unset($new_lines);
-
+
//$lines = file("apriqot.se.txt");
- $name = str_replace("txt","",$_FILES['file']['name']);
- $name = str_replace("zone","",$name);
+ $name = str_replace("txt", "", $_FILES['file']['name']);
+ $name = str_replace("zone", "", $name);
if ($domain !== NULL){
$name = $domain;
}
-
- if (substr($name,-1) != "."){
+
+ if (substr($name, -1) != "."){
$name .= ".";
}
-
+
$i = 0;
$origin_exists = FALSE;
$soa_array_key = -1;
@@ -180,9 +180,9 @@
$r = 0;
$dns_rr = array();
foreach($lines as $line){
-
+
$parts = explode(' ', $line);
-
+
// make all elements lowercase
$new_parts = array();
foreach($parts as $part){
@@ -191,7 +191,7 @@
unset($parts);
$parts = $new_parts;
unset($new_parts);
-
+
// if ORIGIN exists, overwrite $soa['name']
if($parts[0] == '$origin'){
$soa['name'] = $parts[1];
@@ -199,25 +199,25 @@
}
// TTL
if($parts[0] == '$ttl'){
- $time_format = strtolower(substr($parts[1],-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]);
+ 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);
}
@@ -237,103 +237,103 @@
if($i == ($soa_array_key + 1)) $soa['serial'] = $app->functions->intval($parts[0]);
// REFRESH
if($i == ($soa_array_key + 2)){
- $time_format = strtolower(substr($parts[0],-1));
+ $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]);
+ 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)){
- $time_format = strtolower(substr($parts[0],-1));
+ $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]);
+ 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)){
- $time_format = strtolower(substr($parts[0],-1));
+ $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]);
+ 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)){
- $time_format = strtolower(substr($parts[0],-1));
+ $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]);
+ 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')){
+ 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')){
if(is_numeric($parts[1])){
if($parts[2] == 'in'){
$resource_type = $parts[3];
@@ -363,20 +363,20 @@
$dns_rr[$r]['ttl'] = $soa['ttl'];
}
switch ($resource_type) {
- case 'mx':
- case 'srv':
- $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
- break;
- case 'txt':
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
- if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
- if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
- break;
- default:
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ case 'mx':
+ case 'srv':
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'], 0, 1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 1);
+ if(substr($dns_rr[$r]['data'], -1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 0, -1);
+ break;
+ default:
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
}
} else {
// a 3600 IN A 1.2.3.4
@@ -387,22 +387,22 @@
$dns_rr[$r]['name'] = $parts[0];
$dns_rr[$r]['ttl'] = $app->functions->intval($parts[1]);
switch ($resource_type) {
- case 'mx':
- case 'srv':
- $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
- break;
- case 'txt':
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
- if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
- if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
- break;
- default:
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ case 'mx':
+ case 'srv':
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'], 0, 1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 1);
+ if(substr($dns_rr[$r]['data'], -1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 0, -1);
+ break;
+ default:
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
}
- }
+ }
// a IN A 1.2.3.4
elseif($parts[1] == 'in' && ($parts[2] == 'a' || $parts[2] == 'aaaa' || $parts[2] == 'ns'|| $parts[2] == 'cname' || $parts[2] == 'hinfo' || $parts[2] == 'mx' || $parts[2] == 'naptr' || $parts[2] == 'ptr' || $parts[2] == 'rp' || $parts[2] == 'srv' || $parts[2] == 'txt')){
$resource_type = $parts[2];
@@ -411,22 +411,22 @@
$dns_rr[$r]['name'] = $parts[0];
$dns_rr[$r]['ttl'] = $soa['ttl'];
switch ($resource_type) {
- case 'mx':
- case 'srv':
- $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
- break;
- case 'txt':
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
- if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
- if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
- break;
- default:
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ case 'mx':
+ case 'srv':
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'], 0, 1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 1);
+ if(substr($dns_rr[$r]['data'], -1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 0, -1);
+ break;
+ default:
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
}
- }
+ }
// a 3600 A 1.2.3.4
elseif(is_numeric($parts[1]) && ($parts[2] == 'a' || $parts[2] == 'aaaa' || $parts[2] == 'ns'|| $parts[2] == 'cname' || $parts[2] == 'hinfo' || $parts[2] == 'mx' || $parts[2] == 'naptr' || $parts[2] == 'ptr' || $parts[2] == 'rp' || $parts[2] == 'srv' || $parts[2] == 'txt')){
$resource_type = $parts[2];
@@ -435,22 +435,22 @@
$dns_rr[$r]['name'] = $parts[0];
$dns_rr[$r]['ttl'] = $app->functions->intval($parts[1]);
switch ($resource_type) {
- case 'mx':
- case 'srv':
- $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
- break;
- case 'txt':
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
- if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
- if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
- break;
- default:
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ case 'mx':
+ case 'srv':
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'], 0, 1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 1);
+ if(substr($dns_rr[$r]['data'], -1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 0, -1);
+ break;
+ default:
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
}
- }
+ }
// A 1.2.3.4
// MX 10 mail
// TXT "v=spf1 a mx ptr -all"
@@ -461,20 +461,20 @@
$dns_rr[$r]['name'] = $soa['name'];
$dns_rr[$r]['ttl'] = $soa['ttl'];
switch ($resource_type) {
- case 'mx':
- case 'srv':
- $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+2));
- break;
- case 'txt':
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
- if(substr($dns_rr[$r]['data'],0,1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],1);
- if(substr($dns_rr[$r]['data'],-1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'],0,-1);
- break;
- default:
- $dns_rr[$r]['aux'] = 0;
- $dns_rr[$r]['data'] = implode(' ',array_slice($parts, $pkey+1));
+ case 'mx':
+ case 'srv':
+ $dns_rr[$r]['aux'] = $app->functions->intval($parts[$pkey+1]);
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+2));
+ break;
+ case 'txt':
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
+ if(substr($dns_rr[$r]['data'], 0, 1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 1);
+ if(substr($dns_rr[$r]['data'], -1) == '"') $dns_rr[$r]['data'] = substr($dns_rr[$r]['data'], 0, -1);
+ break;
+ default:
+ $dns_rr[$r]['aux'] = 0;
+ $dns_rr[$r]['data'] = implode(' ', array_slice($parts, $pkey+1));
}
}
}
@@ -486,7 +486,7 @@
}
$i++;
}
-
+
/*
$i = 0;
$r = 0;
@@ -586,7 +586,7 @@
if (!empty($mx[$r][$m]))
$dns_rr[$r]['data'] = $mx[$r][$m];
}
-
+
$dns_rr[$r]['aux'] = $mx[$r][0];
}
else if (strtolower($dns_rr[$r]['type'])=='txt')
@@ -618,11 +618,11 @@
$dns_rr[$r]['aux'] = 0;
$r++;
}
- //print('<pre>');
- //print_r($dns_rr);
- //print('</pre>');
-
-
+ //print('<pre>');
+ //print_r($dns_rr);
+ //print('</pre>');
+
+
// Insert the soa record
$sys_userid = $_SESSION['s']['user']['userid'];
$origin = $app->db->quote($soa['name']);
@@ -641,7 +641,7 @@
$insert_data = "(`sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `server_id`, `origin`, `ns`, `mbox`, `serial`, `refresh`, `retry`, `expire`, `minimum`, `ttl`, `active`, `xfer`) VALUES
('$sys_userid', '$sys_groupid', 'riud', 'riud', '', '$server_id', '$origin', '$ns', '$mbox', '$serial', '$refresh', '$retry', '$expire', '$minimum', '$ttl', 'Y', '$xfer')";
$dns_soa_id = $app->db->datalogInsert('dns_soa', $insert_data, 'id');
-
+
// Insert the dns_rr records
if(is_array($dns_rr) && $dns_soa_id > 0)
{
@@ -664,11 +664,11 @@
}
-$app->tpl->setVar('msg',$msg);
-$app->tpl->setVar('error',$error);
+$app->tpl->setVar('msg', $msg);
+$app->tpl->setVar('error', $error);
$app->tpl_defaults();
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1