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

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

 interface/web/sites/web_vhost_subdomain_edit.php

@@ -197,6 +197,51 @@
         unset($php_records);

            foreach($read_limits as $limit) $app->tpl->setVar($limit, ($limit == 'force_suexec' ? 'n' : 'y'));
			
         // Directive Snippets
         $php_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'php' AND active = 'y'");
         $php_directive_snippets_txt = '';
         if(is_array($php_directive_snippets) && !empty($php_directive_snippets)){
               foreach($php_directive_snippets as $php_directive_snippet){
                  $php_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$php_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$php_directive_snippet['snippet'].'</pre></a> ';
               }
         }
         if($php_directive_snippets_txt == '') $php_directive_snippets_txt = '------';
         $app->tpl->setVar("php_directive_snippets_txt",$php_directive_snippets_txt);
			
         if($server_type == 'apache'){
            $apache_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'apache' AND active = 'y'");
            $apache_directive_snippets_txt = '';
            if(is_array($apache_directive_snippets) && !empty($apache_directive_snippets)){
                  foreach($apache_directive_snippets as $apache_directive_snippet){
                     $apache_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$apache_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$apache_directive_snippet['snippet'].'</pre></a> ';
                  }
            }
            if($apache_directive_snippets_txt == '') $apache_directive_snippets_txt = '------';
            $app->tpl->setVar("apache_directive_snippets_txt",$apache_directive_snippets_txt);
         }
			
         if($server_type == 'nginx'){
            $nginx_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'nginx' AND active = 'y'");
            $nginx_directive_snippets_txt = '';
            if(is_array($nginx_directive_snippets) && !empty($nginx_directive_snippets)){
                  foreach($nginx_directive_snippets as $nginx_directive_snippet){
                     $nginx_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$nginx_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$nginx_directive_snippet['snippet'].'</pre></a> ';
                  }
            }
            if($nginx_directive_snippets_txt == '') $nginx_directive_snippets_txt = '------';
            $app->tpl->setVar("nginx_directive_snippets_txt",$nginx_directive_snippets_txt);
         }
			
         $proxy_directive_snippets = $app->db->queryAllRecords("SELECT * FROM directive_snippets WHERE type = 'proxy' AND active = 'y'");
         $proxy_directive_snippets_txt = '';
         if(is_array($proxy_directive_snippets) && !empty($proxy_directive_snippets)){
               foreach($proxy_directive_snippets as $proxy_directive_snippet){
                  $proxy_directive_snippets_txt .= '<a href="javascript:void(0);" class="addPlaceholderContent">['.$proxy_directive_snippet['name'].']<pre class="addPlaceholderContent" style="display:none;">'.$proxy_directive_snippet['snippet'].'</pre></a> ';
               }
         }
         if($proxy_directive_snippets_txt == '') $proxy_directive_snippets_txt = '------';
         $app->tpl->setVar("proxy_directive_snippets_txt",$proxy_directive_snippets_txt);
      }

      $ssl_domain_select = '';
@@ -279,6 +324,12 @@
      global $app, $conf;

      // Get the record of the parent domain
        if(!@$this->dataRecord["parent_domain_id"] && $this->id) {
            $tmp = $app->db->queryOneRecord("SELECT parent_domain_id FROM web_domain WHERE domain_id = ".$app->functions->intval($this->id));
            if($tmp) $this->dataRecord["parent_domain_id"] = $tmp['parent_domain_id'];
            unset($tmp);
        }
        
      $parent_domain = $app->db->queryOneRecord("select * FROM web_domain WHERE domain_id = ".$app->functions->intval(@$this->dataRecord["parent_domain_id"]));

      // Set a few fixed values
@@ -477,7 +528,7 @@
      $app->uses("getconf");
      $web_rec = $app->tform->getDataRecord($this->id);
      $web_config = $app->getconf->get_server_config($app->functions->intval($web_rec["server_id"]),'web');
        var_dump($this->parent_domain_record, $web_rec);
        //var_dump($this->parent_domain_record, $web_rec);
      // Set the values for document_root, system_user and system_group
      $system_user = $app->db->quote($this->parent_domain_record['system_user']);
      $system_group = $app->db->quote($this->parent_domain_record['system_group']);