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

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

- Changed a German translation.
- Extended SEO redirect check for subdomains/alias domains.

 interface/web/sites/lib/lang/de_web_subdomain.lng

@@ -12,8 +12,8 @@
$wb['domain_txt'] = 'Domain';
$wb['type_txt'] = 'Typ';
$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
$wb['redirect_type_txt'] = 'Redirect Typ';
$wb['redirect_path_txt'] = 'Redirect Pfad';
$wb['redirect_type_txt'] = 'Weiterleitungstyp';
$wb['redirect_path_txt'] = 'Weiterleitungspfad';
$wb['active_txt'] = 'Aktiv';
$wb['document_root_txt'] = 'Documentroot';
$wb['system_user_txt'] = 'Linux Benutzer';

 server/plugins-available/apache2_plugin.inc.php

@@ -954,7 +954,7 @@
                $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
                
                // Add SEO redirects for alias domains
                if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld'){
                if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld' && ($alias['type'] == 'alias' || ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '*_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_domain_tld_to_domain_tld'))){
                    $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
                    if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                        $alias_seo_redirects[] = $tmp_seo_redirects;

 server/plugins-available/nginx_plugin.inc.php

@@ -1174,7 +1174,7 @@
                    $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
                    
                    // Add SEO redirects for alias domains
                    if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld'){
                    if($alias['seo_redirect'] != '' && $data['new']['seo_redirect'] != '*_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_to_domain_tld' && ($alias['type'] == 'alias' || ($alias['type'] == 'subdomain' && $data['new']['seo_redirect'] != '*_domain_tld_to_www_domain_tld' && $data['new']['seo_redirect'] != '*_domain_tld_to_domain_tld'))){
                        $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
                        if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                            $alias_seo_redirects[] = $tmp_seo_redirects;