From b9a3ef486ebcde18a5ade37865ff8f397185d24f Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Sun, 24 Jul 2016 05:30:59 -0400 Subject: [PATCH] Fixed #3979 Mailbox users unable to save autoresponders --- interface/web/dns/dns_import.php | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/interface/web/dns/dns_import.php b/interface/web/dns/dns_import.php index 2e4d58e..6bb738e 100644 --- a/interface/web/dns/dns_import.php +++ b/interface/web/dns/dns_import.php @@ -38,10 +38,22 @@ $error = ''; // Loading the template -$app->uses('tpl,validate_dns'); +$app->uses('tform,tpl,validate_dns'); $app->tpl->newTemplate("form.tpl.htm"); $app->tpl->setInclude('content_tpl', 'templates/dns_import.htm'); $app->load_language_file('/web/dns/lib/lang/'.$_SESSION['s']['language'].'_dns_wizard.lng'); + +// Check if dns record limit has been reached. We will check only users, not admins +if($_SESSION["s"]["user"]["typ"] == 'user') { + $app->tform->formDef['db_table_idx'] = 'id'; + $app->tform->formDef['db_table'] = 'dns_soa'; + if(!$app->tform->checkClientLimit('limit_dns_zone')) { + $app->error($app->lng('limit_dns_zone_txt')); + } + if(!$app->tform->checkResellerLimit('limit_dns_zone')) { + $app->error('Reseller: '.$app->lng('limit_dns_zone_txt')); + } +} // import variables $template_id = (isset($_POST['template_id']))?$app->functions->intval($_POST['template_id']):0; @@ -216,7 +228,7 @@ $line = trim($line); if ($line != '' && substr($line, 0, 1) != ';'){ if(strpos($line, ";") !== FALSE) { - if (!preg_match("/v=DKIM|v=DMARC/",$line)) { + if(!preg_match("/\"[^\"]+;[^\"]*\"/", $line)) { $line = substr($line, 0, strpos($line, ";")); } } @@ -267,12 +279,13 @@ $parts = explode(' ', $line); // make elements lowercase - $dkim=@($parts[3]=='"v=DKIM1;')?true:false; - $dmarc=@($parts[3]=='"v=DMARC1;')?true:false; - $new_parts = array(); foreach($parts as $part){ - if(!$dkim && !$dmarc) { + if( + (strpos($part, ';') === false) && + (!preg_match("/^\"/", $part)) && + (!preg_match("/\"$/", $part)) + ) { $new_parts[] = strtolower($part); } else { $new_parts[] = $part; -- Gitblit v1.9.1