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

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

 server/plugins-available/nginx_plugin.inc.php

@@ -920,15 +920,15 @@
      }

      // Set SEO Redirect
      if($data['new']['seo_redirect'] != '' && ($data['new']['subdomain'] == 'www' || $data['new']['subdomain'] == '*')){
      if($data['new']['seo_redirect'] != ''){
         $vhost_data['seo_redirect_enabled'] = 1;
         if($data['new']['seo_redirect'] == 'non_www_to_www'){
            $vhost_data['seo_redirect_origin_domain'] = $data['new']['domain'];
            $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
         }
         if($data['new']['seo_redirect'] == 'www_to_non_www'){
            $vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
            $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
         $tmp_seo_redirects = $this->get_seo_redirects($data['new']);
         if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
            foreach($tmp_seo_redirects as $key => $val){
               $vhost_data[$key] = $val;
            }
         } else {
            $vhost_data['seo_redirect_enabled'] = 0;
         }
      } else {
         $vhost_data['seo_redirect_enabled'] = 0;
@@ -1138,6 +1138,7 @@

      // get alias domains (co-domains and subdomains)
      $aliases = $app->db->queryAllRecords('SELECT * FROM web_domain WHERE parent_domain_id = '.$data['new']['domain_id']." AND active = 'y' AND type != 'vhostsubdomain'");
      $alias_seo_redirects = array();
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
         
@@ -1171,7 +1172,16 @@
                     break;
               }
               $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' && ($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;
                  }
               }
            }
				
            // Rewriting
            if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
               if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
@@ -1203,13 +1213,23 @@
                     if($alias['redirect_type'] != 'proxy'){
                        if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
                     }
                     // Add SEO redirects for alias domains
                     $alias_seo_redirects2 = array();
                     if($alias['seo_redirect'] != ''){
                        $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
                        if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                           $alias_seo_redirects2[] = $tmp_seo_redirects;
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => $alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'proxy_directives'   => $final_proxy_directives,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false),
                        'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
								
                        
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
                        if($alias['redirect_type'] == 'proxy'){
@@ -1229,13 +1249,22 @@
                     if($alias['redirect_type'] != 'proxy'){
                        if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
                     }
                     // Add SEO redirects for alias domains
                     $alias_seo_redirects2 = array();
                     if($alias['seo_redirect'] != ''){
                        $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'www');
                        if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                           $alias_seo_redirects2[] = $tmp_seo_redirects;
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'proxy_directives'   => $final_proxy_directives,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false),
                        'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
                     break;
                  case '*':
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
@@ -1256,13 +1285,22 @@
                     if($alias['redirect_type'] != 'proxy'){
                        if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => '*.' . $alias['domain'],
                     // Add SEO redirects for alias domains
                     $alias_seo_redirects2 = array();
                     if($alias['seo_redirect'] != ''){
                        $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
                        if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                           $alias_seo_redirects2[] = $tmp_seo_redirects;
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => $alias['domain'].' *.'.$alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'proxy_directives'   => $final_proxy_directives,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false),
                        'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
                     break;
                  default:
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
@@ -1285,13 +1323,26 @@
                     }
                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '*.'.substr($alias['domain'], 2);
                            else $domain_rule = $alias['domain'];
                     // Add SEO redirects for alias domains
                     $alias_seo_redirects2 = array();
                     if($alias['seo_redirect'] != ''){
                        if(substr($alias['domain'], 0, 2) === '*.'){
                           $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_');
                        } else {
                           $tmp_seo_redirects = $this->get_seo_redirects($alias, 'alias_', 'none');
                        }
                        if(is_array($tmp_seo_redirects) && !empty($tmp_seo_redirects)){
                           $alias_seo_redirects2[] = $tmp_seo_redirects;
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => $domain_rule,
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'proxy_directives'   => $final_proxy_directives,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false),
                        'alias_seo_redirects2' => (count($alias_seo_redirects2) > 0 ? $alias_seo_redirects2 : false));
               }
            }
         }
@@ -1317,6 +1368,9 @@
      }
      if(count($own_rewrite_rules) > 0) {
         $tpl->setLoop('own_redirects',$own_rewrite_rules);
      }
      if(count($alias_seo_redirects) > 0) {
         $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
      }
      
      //* Create basic http auth for website statistics
@@ -2360,6 +2414,52 @@
      
      return false;
   }
	
   private function get_seo_redirects($web, $prefix = '', $force_subdomain = false){
      // $force_subdomain = 'none|www'
      $seo_redirects = array();
		
      if(substr($web['domain'], 0, 2) === '*.') $web['subdomain'] = '*';
		
      if(($web['subdomain'] == 'www' || $web['subdomain'] == '*') && $force_subdomain != 'www'){
         if($web['seo_redirect'] == 'non_www_to_www'){
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '=';
         }
         if($web['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
            // ^(example\.com|(?!\bwww\b)\.example\.com)$
            // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^('.str_replace('.', '\.', $web['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $web['domain']).'))$';
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
         }
         if($web['seo_redirect'] == '*_to_www_domain_tld'){
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
         }
      }
      if($force_subdomain != 'none'){
         if($web['seo_redirect'] == 'www_to_non_www'){
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '=';
         }
         if($web['seo_redirect'] == '*_domain_tld_to_domain_tld'){
            // ^(.+)\.example\.com$
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = '^(.+)\.'.str_replace('.', '\.', $web['domain']).'$';
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '~*';
         }
         if($web['seo_redirect'] == '*_to_domain_tld'){
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '!=';
         }
      }
      return $seo_redirects;
   }

} // end class