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

ftimme

2012-11-12 8e38755040c6c2073f92f0ffb087da530d0e7a0a

 server/plugins-available/apache2_plugin.inc.php

@@ -115,8 +115,8 @@
      $csr_file = $ssl_dir.'/'.$domain.'.csr';
      $crt_file = $ssl_dir.'/'.$domain.'.crt';

      //* Create a SSL Certificate
      if($data['new']['ssl_action'] == 'create') {
      //* Create a SSL Certificate, but only if this is not a mirror server.
      if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
         
         $this->ssl_certificate_changed = true;
         
@@ -849,15 +849,15 @@
      //$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']['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;
@@ -929,6 +929,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 +952,15 @@
                  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'] .= '/';
@@ -1017,10 +1027,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 +1112,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 +1357,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',0755);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0750);
            unset($htp_file);
         }
      }
@@ -1581,7 +1596,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);
@@ -1715,8 +1730,8 @@
      
      //* Create empty .htpasswd file, if it does not exist
      if(!is_file($folder_path.'.htpasswd')) {
         touch($folder_path.'.htpasswd');
         $app->system->chmod($folder_path.'.htpasswd',0755);
         $app->system->touch($folder_path.'.htpasswd');
         $app->system->chmod($folder_path.'.htpasswd',0750);
         $app->system->chown($folder_path.'.htpasswd',$website['system_user']);
         $app->system->chgrp($folder_path.'.htpasswd',$website['system_group']);
         $app->log('Created file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
@@ -1770,7 +1785,7 @@
            unset($old_content);
            
            $app->system->file_put_contents($folder_path.'.htaccess',$ht_file);
         $app->system->chmod($folder_path.'.htaccess',0755);
         $app->system->chmod($folder_path.'.htaccess',0750);
         $app->system->chown($folder_path.'.htaccess',$website['system_user']);
         $app->system->chgrp($folder_path.'.htaccess',$website['system_group']);
         $app->log('Created/modified file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
@@ -1932,7 +1947,7 @@
            }
            
            $app->system->file_put_contents($new_folder_path.'.htaccess',$ht_file);
         $app->system->chmod($new_folder_path.'.htaccess',0755);
         $app->system->chmod($new_folder_path.'.htaccess',0750);
         $app->system->chown($new_folder_path.'.htaccess',$website['system_user']);
         $app->system->chgrp($new_folder_path.'.htaccess',$website['system_group']);
         $app->log('Created/modified file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
@@ -2118,6 +2133,8 @@
    * @param string $pwd      The password-hash of the user
    */
   private function _writeHtDigestFile($filename, $username, $authname, $pwdhash ) {
      global $app;
		
      $changed = false;
      if(is_file($filename) && !is_link($filename)) {
         $in = fopen($filename, 'r');
@@ -2196,7 +2213,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
                  */
@@ -2554,6 +2571,8 @@
   }

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

@@ -2586,6 +2605,49 @@
    private function _is_url($string) {
        return preg_match('/^(f|ht)tp(s)?:\/\//i', $string);
    }
	
   private function get_seo_redirects($web, $prefix = ''){
      $seo_redirects = array();
		
      if(substr($web['domain'], 0, 2) === '*.') $web['subdomain'] = '*';
		
      if($web['subdomain'] == 'www' || $web['subdomain'] == '*'){
         if($web['seo_redirect'] == 'non_www_to_www'){
            $seo_redirects[$prefix.'seo_redirect_origin_domain'] = str_replace('.', '\.', $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\.'.str_replace('.', '\.', $web['domain']);
            $seo_redirects[$prefix.'seo_redirect_target_domain'] = 'www.'.$web['domain'];
            $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
         }
      }
      if($web['seo_redirect'] == 'www_to_non_www'){
         $seo_redirects[$prefix.'seo_redirect_origin_domain'] = 'www\.'.str_replace('.', '\.', $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'] = str_replace('.', '\.', $web['domain']);
         $seo_redirects[$prefix.'seo_redirect_target_domain'] = $web['domain'];
         $seo_redirects[$prefix.'seo_redirect_operator'] = '!';
      }
      return $seo_redirects;
   }
    
} // end class