From bef47735b2cc8d484a9533a726f1c7a6c42b3f6c Mon Sep 17 00:00:00 2001 From: moglia <moglia@ispconfig3> Date: Sun, 16 May 2010 22:49:43 -0400 Subject: [PATCH] Update brazilian portuguese error and indexes pages to work on any charset encoding. --- server/plugins-available/bind_plugin.inc.php | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php index 4ab9b48..7262cc1 100644 --- a/server/plugins-available/bind_plugin.inc.php +++ b/server/plugins-available/bind_plugin.inc.php @@ -90,26 +90,28 @@ $dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns'); //* Write the domain file - $tpl = new tpl(); - $tpl->newTemplate("bind_pri.domain.master"); + if(!empty($data['new']['id'])) { + $tpl = new tpl(); + $tpl->newTemplate("bind_pri.domain.master"); - $zone = $data['new']; - $tpl->setVar($zone); + $zone = $data['new']; + $tpl->setVar($zone); - $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'"); - $tpl->setLoop('zones',$records); + $records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'"); + $tpl->setLoop('zones',$records); - $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1)); - $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG); - file_put_contents($filename,$tpl->grab()); - exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename); - unset($tpl); - unset($records); - unset($zone); + $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1)); + $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG); + file_put_contents($filename,$tpl->grab()); + exec('chown '.escapeshellcmd($dns_config['bind_user']).':'.escapeshellcmd($dns_config['bind_group']).' '.$filename); + unset($tpl); + unset($records); + unset($zone); + } //* rebuild the named.conf file if the origin has changed or when the origin is inserted. //if($this->action == 'insert' || $data['old']['origin'] != $data['new']['origin']) { - $this->write_named_conf($data,$dns_config); + $this->write_named_conf($data,$dns_config); //} //* Delete old domain file, if domain name has been changed @@ -127,7 +129,7 @@ global $app, $conf; //* load the server configuration options - $app->uses("getconf"); + $app->uses("getconf,tpl"); $dns_config = $app->getconf->get_server_config($conf["server_id"], 'dns'); //* rebuild the named.conf file -- Gitblit v1.9.1