- Added more options to the SEO Redirect field.

ftimme

2012-11-08 e34fec13567f76f1a052362c071bd7e1a85dd7cf

 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;
@@ -1343,19 +1370,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);
         }
      }
@@ -1582,7 +1609,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);
@@ -2557,6 +2584,8 @@
   }

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