- Changed a German translation. - Extended SEO redirect check for subdomain...

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

 server/plugins-available/bind_plugin.inc.php

@@ -39,7 +39,7 @@
   function onInstall() {
      global $conf;
      
      if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) {
      if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true && @is_link('/usr/local/ispconfig/server/mods-enabled/dns_module.inc.php')) {
         return true;
      } else {
         return false;
@@ -107,16 +107,25 @@
         
         //TODO : change this when distribution information has been integrated into server record
           if (file_exists('/etc/gentoo-release')) {
              $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri/'.substr($zone['origin'],0,-1));
            $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)));
           }
           else {
              $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.substr($zone['origin'],0,-1));
              $filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)));
           }
           
         $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
         file_put_contents($filename,$tpl->grab());
         chown($filename, escapeshellcmd($dns_config['bind_user']));
         chgrp($filename, escapeshellcmd($dns_config['bind_group']));
			
         //* Check the zonefile
         if(is_file($filename.'.err')) unlink($filename.'.err');
         exec('named-checkzone '.escapeshellarg($zone['origin']).' '.escapeshellarg($filename),$out,$return_status);
         if($return_status === 0) {
            $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
         } else {
            $app->log("Writing BIND domain file failed: ".$filename." ".implode(' ',$out),LOGLEVEL_WARN);
            rename($filename,$filename.'.err');
         }
         unset($tpl);
         unset($records);
         unset($records_out);
@@ -132,13 +141,14 @@
      if($data['old']['origin'] != $data['new']['origin']) {
         //TODO : change this when distribution information has been integrated into server record
           if (file_exists('/etc/gentoo-release')) {
              $filename = $dns_config['bind_zonefiles_dir'].'/pri/'.substr($data['old']['origin'],0,-1);
              $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
           }
           else {
              $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
              $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
           }
         
         if(is_file($filename)) unset($filename);
         if(is_file($filename)) unlink($filename);
         if(is_file($filename.'.err')) unlink($filename.'.err');
      }
      
      //* Reload bind nameserver
@@ -159,13 +169,14 @@
      //* Delete the domain file
      //TODO : change this when distribution information has been integrated into server record
        if (file_exists('/etc/gentoo-release')) {
           $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri/'.substr($data['old']['origin'],0,-1);
           $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
        }
        else {
           $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri.'.substr($data['old']['origin'],0,-1);
           $zone_file_name = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
        }
      
      if(is_file($zone_file_name)) unlink($zone_file_name);
      if(is_file($zone_file_name.'.err')) unlink($zone_file_name.'.err');
      $app->log("Deleting BIND domain file: ".$zone_file_name,LOGLEVEL_DEBUG);
      
      //* Reload bind nameserver
@@ -199,14 +210,24 @@
      if($data['old']['origin'] != $data['new']['origin']) {
         //TODO : change this when distribution information has been integrated into server record
           if (file_exists('/etc/gentoo-release')) {
              $filename = $dns_config['bind_zonefiles_dir'].'/sec/'.substr($data['old']['origin'],0,-1);
              $filename = $dns_config['bind_zonefiles_dir'].'/sec/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
           }
           else {
              $filename = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.substr($data['old']['origin'],0,-1);
              $filename = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
           }
         
         if(is_file($filename)) unset($filename);
      }
		
      //* Ensure that the named slave directory is writable by the named user
      if (file_exists('/etc/gentoo-release')) {
         $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/sec';
      } else {
         $slave_record_dir = $dns_config['bind_zonefiles_dir'].'/slave';
      }
      if(!@is_dir($slave_record_dir)) mkdir($slave_record_dir,0770);
      chown($slave_record_dir,$dns_config['bind_user']);
      chgrp($slave_record_dir,$dns_config['bind_group']);
      
      //* Reload bind nameserver
      $app->services->restartServiceDelayed('bind','reload');
@@ -227,10 +248,10 @@
      //* Delete the domain file
      //TODO : change this when distribution information has been integrated into server record
       if (file_exists('/etc/gentoo-release')) {
          $zone_file_name = $dns_config['bind_zonefiles_dir'].'/sec/'.substr($data['old']['origin'],0,-1);
          $zone_file_name = $dns_config['bind_zonefiles_dir'].'/sec/'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
       }
       else {
          $zone_file_name = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.substr($data['old']['origin'],0,-1);
          $zone_file_name = $dns_config['bind_zonefiles_dir'].'/slave/sec.'.str_replace("/", "_",substr($data['old']['origin'],0,-1));
       }
      
      if(is_file($zone_file_name)) unlink($zone_file_name);
@@ -284,16 +305,18 @@
      global $app, $conf;
   
      //* Only write the master file for the current server   
      $tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify FROM dns_soa WHERE active = 'Y' AND server_id=".$conf["server_id"]);
      $tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify, update_acl FROM dns_soa WHERE active = 'Y' AND server_id=".$conf["server_id"]);
      $zones = array();
      
      //* Check if the current zone that triggered this function has at least one NS record
      /* Has been replaced by a better zone check
      $rec_num = $app->db->queryOneRecord("SELECT count(id) as ns FROM dns_rr WHERE type = 'NS' AND zone = ".intval($data['new']['id'])." AND active = 'Y'");
      if($rec_num['ns'] == 0) {
         $exclude_zone = $data['new']['origin'];
      } else {
         $exclude_zone = '';
      }
      */
      
      //TODO : change this when distribution information has been integrated into server record
       if (file_exists('/etc/gentoo-release')) {
@@ -309,6 +332,8 @@
      //* Loop trough zones
      foreach($tmps as $tmp) {
         
         $zone_file = $pri_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1));
			
         $options = '';
         if(trim($tmp['xfer']) != '') {
            $options .= "        allow-transfer {".str_replace(',',';',$tmp['xfer']).";};\n";
@@ -316,10 +341,11 @@
            $options .= "        allow-transfer {none;};\n";
         }
         if(trim($tmp['also_notify']) != '') $options .= '        also-notify {'.str_replace(',',';',$tmp['also_notify']).";};\n";
         if(trim($tmp['update_acl']) != '') $options .= "        allow-update {".str_replace(',',';',$tmp['update_acl']).";};\n";
         
         if($tmp['origin'] != $exclude_zone) {
         if(file_exists($zone_file)) {
            $zones[] = array(   'zone' => substr($tmp['origin'],0,-1),
                           'zonefile_path' => $pri_zonefiles_path.substr($tmp['origin'],0,-1),
                           'zonefile_path' => $zone_file,
                           'options' => $options
                        );
         }
@@ -344,7 +370,7 @@

         
         $zones_sec[] = array(   'zone' => substr($tmp['origin'],0,-1),
                           'zonefile_path' => $sec_zonefiles_path.substr($tmp['origin'],0,-1),
                           'zonefile_path' => $sec_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1)),
                           'options' => $options
                        );