- Added SEO Redirects to alias domains.

ftimme

2012-11-08 f26825f736be267c68709efc5d359a7ba7858ade

 server/plugins-available/apache2_plugin.inc.php

@@ -849,15 +849,42 @@
      //$vhost_data['document_root'] = $data['new']['document_root'].'/' . $web_folder;
      
      // 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']['subdomain'] == 'www' || $data['new']['subdomain'] == '*'){
            if($data['new']['seo_redirect'] == 'non_www_to_www'){
               $vhost_data['seo_redirect_origin_domain'] = str_replace('.', '\.', $data['new']['domain']);
               $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
               $vhost_data['seo_redirect_operator'] = '';
            }
            if($data['new']['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
               // ^(example\.com|(?!\bwww\b)\.example\.com)$
               // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
               $vhost_data['seo_redirect_origin_domain'] = '('.str_replace('.', '\.', $data['new']['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $data['new']['domain']).'))';
               $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
               $vhost_data['seo_redirect_operator'] = '';
            }
            if($data['new']['seo_redirect'] == '*_to_www_domain_tld'){
               $vhost_data['seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $data['new']['domain']);
               $vhost_data['seo_redirect_target_domain'] = 'www.'.$data['new']['domain'];
               $vhost_data['seo_redirect_operator'] = '!';
            }
         }
         if($data['new']['seo_redirect'] == 'www_to_non_www'){
            $vhost_data['seo_redirect_origin_domain'] = 'www.'.$data['new']['domain'];
            $vhost_data['seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $data['new']['domain']);
            $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
            $vhost_data['seo_redirect_operator'] = '';
         }
         if($data['new']['seo_redirect'] == '*_domain_tld_to_domain_tld'){
            // ^(.+)\.example\.com$
            $vhost_data['seo_redirect_origin_domain'] = '(.+)\.'.str_replace('.', '\.', $data['new']['domain']);
            $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
            $vhost_data['seo_redirect_operator'] = '';
         }
         if($data['new']['seo_redirect'] == '*_to_domain_tld'){
            $vhost_data['seo_redirect_origin_domain'] = str_replace('.', '\.', $data['new']['domain']);
            $vhost_data['seo_redirect_target_domain'] = $data['new']['domain'];
            $vhost_data['seo_redirect_operator'] = '!';
         }
      } else {
         $vhost_data['seo_redirect_enabled'] = 0;
@@ -929,6 +956,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();
      switch($data['new']['subdomain']) {
         case 'www':
            $server_alias[] .= 'www.'.$data['new']['domain'].' ';
@@ -951,6 +979,49 @@
                  break;
            }
            $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
				
            // Add SEO redirects for alias domains
            if($alias['seo_redirect'] != ''){
               if($alias['subdomain'] == 'www' || $alias['subdomain'] == '*'){
                  if($alias['seo_redirect'] == 'non_www_to_www'){
                     $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => str_replace('.', '\.', $alias['domain']),
                                             'alias_seo_redirect_target_domain'    => 'www.'.$alias['domain'],
                                             'alias_seo_redirect_operator'    => '');
                  }
                  if($alias['seo_redirect'] == '*_domain_tld_to_www_domain_tld'){
                     // ^(example\.com|(?!\bwww\b)\.example\.com)$
                     // ^(example\.com|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.example\.com))$
                     $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => '('.str_replace('.', '\.', $alias['domain']).'|((?:\w+(?:-\w+)*\.)*)((?!www\.)\w+(?:-\w+)*)(\.'.str_replace('.', '\.', $alias['domain']).'))',
                                             'alias_seo_redirect_target_domain'    => 'www.'.$alias['domain'],
                                             'alias_seo_redirect_operator'    => '');
                  }
                  if($alias['seo_redirect'] == '*_to_www_domain_tld'){
                     $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => 'www\.'.str_replace('.', '\.', $alias['domain']),
                                             'alias_seo_redirect_target_domain'    => 'www.'.$alias['domain'],
                                             'alias_seo_redirect_operator'    => '!');
                  }
               }
               if($alias['seo_redirect'] == 'www_to_non_www'){
                  $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => 'www\.'.str_replace('.', '\.', $alias['domain']),
                                          'alias_seo_redirect_target_domain'    => $alias['domain'],
                                          'alias_seo_redirect_operator'    => '');
               }
               if($alias['seo_redirect'] == '*_domain_tld_to_domain_tld'){
                  // ^(.+)\.example\.com$
                  $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => '(.+)\.'.str_replace('.', '\.', $alias['domain']),
                                          'alias_seo_redirect_target_domain'    => $alias['domain'],
                                          'alias_seo_redirect_operator'    => '');
               }
               if($alias['seo_redirect'] == '*_to_domain_tld'){
                  $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => str_replace('.', '\.', $alias['domain']),
                                          'alias_seo_redirect_target_domain'    => $alias['domain'],
                                          'alias_seo_redirect_operator'    => '!');
               }
               $alias_seo_redirects[] = array(   'alias_seo_redirect_origin_domain'    => $alias_seo_redirect['alias_seo_redirect_origin_domain'],
                                       'alias_seo_redirect_target_domain'    => $alias_seo_redirect['alias_seo_redirect_target_domain'],
                                       'alias_seo_redirect_operator'    => $alias_seo_redirect['alias_seo_redirect_operator']);
            }
					
            // Rewriting
            if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
               if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
@@ -1017,10 +1088,14 @@
         $tpl->setVar('alias','');
      }

      if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0) {
      if(count($rewrite_rules) > 0 || $vhost_data['seo_redirect_enabled'] > 0 || count($alias_seo_redirects) > 0) {
         $tpl->setVar('rewrite_enabled',1);
      } else {
         $tpl->setVar('rewrite_enabled',0);
      }
		
      if(count($alias_seo_redirects) > 0) {
         $tpl->setLoop('alias_seo_redirects',$alias_seo_redirects);
      }

      //$tpl->setLoop('redirects',$rewrite_rules);
@@ -1098,6 +1173,7 @@
         $tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
         $tpl->setVar('fastcgi_starter_script',$fastcgi_config['fastcgi_starter_script'].($data['new']['type'] == 'vhostsubdomain' ? '_web' . $data['new']['domain_id'] : ''));
         $tpl->setVar('fastcgi_config_syntax',$fastcgi_config['fastcgi_config_syntax']);
         $tpl->setVar('fastcgi_max_requests',$fastcgi_config['fastcgi_max_requests']);

      } else {
         //remove the php fastgi starter script if available
@@ -1342,19 +1418,19 @@
      //* Create .htaccess and .htpasswd file for website statistics
      if(!is_file($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess') or $data['old']['document_root'] != $data['new']['document_root']) {
         if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/.htpasswd_stats\nrequire valid-user";
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user";
         $app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',$ht_file);
         $app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess',0755);
         unset($ht_file);
      }

      if(!is_file($data['new']['document_root'].'/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
      if(!is_file($data['new']['document_root'].'/web/stats/.htpasswd_stats') || $data['new']['stats_password'] != $data['old']['stats_password']) {
         if(trim($data['new']['stats_password']) != '') {
            $htp_file = 'admin:'.trim($data['new']['stats_password']);
            $app->system->web_folder_protection($data['new']['document_root'],false);
            $app->system->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
            $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
            $app->system->web_folder_protection($data['new']['document_root'],true);
            $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0750);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
            unset($htp_file);
         }
      }
@@ -1581,7 +1657,7 @@
                        $tmp_symlink = str_replace('[website_domain]',$data['old']['domain'],$tmp_symlink);
                        // Remove trailing slash
                        if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
                        // create the symlinks, if not exist
                        // delete the symlink
                        if(is_link($tmp_symlink)) {
                            $app->system->unlink($tmp_symlink);
                            $app->log('Removing symlink: '.$tmp_symlink,LOGLEVEL_DEBUG);
@@ -2198,7 +2274,7 @@
            $files = @scandir($webdavRoot);
            if(is_array($files)) {
            foreach($files as $file) {
               if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("[a-zA-Z0-9\-_\.]",$file)) {
               if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest' && preg_match("/^[a-zA-Z0-9\-_\.]*$/",$file)) {
                  /*
                   * found a htdigest - file, so add it to webdav
                  */
@@ -2556,6 +2632,8 @@
   }

   public function create_relative_link($f, $t) {
      global $app;
		
      // $from already exists
      $from = realpath($f);