- Finished (hopefully) nginx rewrite section.

ftimme

2012-11-06 5ecd4a795c1fb944f021099c5e7c17ae51a97be8

 server/plugins-available/nginx_plugin.inc.php

@@ -115,7 +115,7 @@
      $crt_file = $ssl_dir.'/'.$domain.'.crt';

      //* Create a SSL Certificate
      if($data['new']['ssl_action'] == 'create') {
      if($data['new']['ssl_action'] == 'create' && $conf['mirror_server_id'] == 0) {
      
         $this->ssl_certificate_changed = true;
         
@@ -934,109 +934,162 @@
         $vhost_data['seo_redirect_enabled'] = 0;
      }
      
      $tpl->setVar($vhost_data);
		

      // Rewrite rules
      $own_rewrite_rules = array();
      $rewrite_rules = array();
      if($data['new']['redirect_type'] != '' && $data['new']['redirect_path'] != '') {
         if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
         if(substr($data['new']['redirect_path'],0,8) == '[scheme]') $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
			
         /* Disabled path extension
         if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
            $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
         if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
            if($data['new']['redirect_type'] != 'proxy'){
               $data['new']['redirect_path'] = '$scheme'.substr($data['new']['redirect_path'],8);
            } else {
               $data['new']['redirect_path'] = 'http'.substr($data['new']['redirect_path'],8);
            }
         }
         */

         switch($data['new']['subdomain']) {
            case 'www':
               if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
                  $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
                  if($data['new']['redirect_type'] == 'proxy'){
                     $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                     $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
                     break;
                  }
                  $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
               } else { // URL - check if URL is local
                  $tmp_redirect_path = $data['new']['redirect_path'];
                  if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                  $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                  if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                  if(($tmp_redirect_path_parts['host'] == $data['new']['domain'] || $tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain']) && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                     // URL is local
                     if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                     if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                     $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                     //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                        $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
                        break;
                     } else {
                        $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
                     }
                  } else {
                     $rewrite_exclude = '(.?)';
                     // external URL
                     $rewrite_exclude = '(.?)/';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['use_proxy'] = 'y';
                        $rewrite_subdir = $tmp_redirect_path_parts['path'];
                        if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                        if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                     }
                  }
                  unset($tmp_redirect_path);
                  unset($tmp_redirect_path_parts);
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$this->_rewrite_quote($data['new']['domain']),
               'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
               'rewrite_target'    => $data['new']['redirect_path'],
               'rewrite_exclude'   => $rewrite_exclude);
					
               if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
                  $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
               } else { // URL - check if URL is local
                  $tmp_redirect_path = $data['new']['redirect_path'];
                  if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                  $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                  if($tmp_redirect_path_parts['host'] == 'www.'.$data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                     if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                     if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                     $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                  } else {
                     $rewrite_exclude = '(.?)';
                  }
                  unset($tmp_redirect_path);
                  unset($tmp_redirect_path_parts);
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => '^' . $this->_rewrite_quote('www.'.$data['new']['domain']),
                     'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                     'rewrite_target'    => $data['new']['redirect_path'],
                     'rewrite_exclude'   => $rewrite_exclude);
               $own_rewrite_rules[] = array(   'rewrite_domain'    => '^'.$this->_rewrite_quote($data['new']['domain']),
                  'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                  'rewrite_target'    => $data['new']['redirect_path'],
                  'rewrite_exclude'   => $rewrite_exclude,
                  'rewrite_subdir'   => $rewrite_subdir,
                  'use_rewrite'   => ($data['new']['redirect_type'] == 'proxy' ? false:true),
                  'use_proxy'   => ($data['new']['redirect_type'] == 'proxy' ? true:false));
               break;
            case '*':
               if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
                  $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
                  if($data['new']['redirect_type'] == 'proxy'){
                     $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                     $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
                     break;
                  }
                  $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
               } else { // URL - check if URL is local
                  $tmp_redirect_path = $data['new']['redirect_path'];
                  if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                  $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                  if(substr($tmp_redirect_path_parts['host'],-strlen($data['new']['domain'])) == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
												
                  //if($is_serveralias && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                  if($this->url_is_local($tmp_redirect_path_parts['host'], $data['new']['domain_id']) && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                     // URL is local
                     if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                     if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                     $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                     //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                        $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
                        break;
                     } else {
                        $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
                     }
                  } else {
                     $rewrite_exclude = '(.?)';
                     // external URL
                     $rewrite_exclude = '(.?)/';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['use_proxy'] = 'y';
                        $rewrite_subdir = $tmp_redirect_path_parts['path'];
                        if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                        if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                     }
                  }
                  unset($tmp_redirect_path);
                  unset($tmp_redirect_path_parts);
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
               $own_rewrite_rules[] = array(   'rewrite_domain'    => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
                  'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                  'rewrite_target'    => $data['new']['redirect_path'],
                  'rewrite_exclude'   => $rewrite_exclude);
                  'rewrite_exclude'   => $rewrite_exclude,
                  'rewrite_subdir'   => $rewrite_subdir,
                  'use_rewrite'   => ($data['new']['redirect_type'] == 'proxy' ? false:true),
                  'use_proxy'   => ($data['new']['redirect_type'] == 'proxy' ? true:false));
               break;
            default:
               if(substr($data['new']['redirect_path'],0,1) == '/'){ // relative path
                  $rewrite_exclude = '(?!'.substr($data['new']['redirect_path'],0,-1).')';
                  if($data['new']['redirect_type'] == 'proxy'){
                     $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                     $vhost_data['web_document_root_www'] .= substr($data['new']['redirect_path'],0,-1);
                     break;
                  }
                  $rewrite_exclude = '(?!/\b('.substr($data['new']['redirect_path'],1,-1).(substr($data['new']['redirect_path'],1,-1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
               } else { // URL - check if URL is local
                  $tmp_redirect_path = $data['new']['redirect_path'];
                  if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                  $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                  if($tmp_redirect_path_parts['host'] == $data['new']['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                     // URL is local
                     if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                     if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                     $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                     //$rewrite_exclude = '((?!'.$tmp_redirect_path_parts['path'].'))';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['web_document_root_www_proxy'] = 'root '.$vhost_data['web_document_root_www'].';';
                        $vhost_data['web_document_root_www'] .= $tmp_redirect_path_parts['path'];
                        break;
                     } else {
                        $rewrite_exclude = '(?!/\b('.substr($tmp_redirect_path_parts['path'],1).(substr($tmp_redirect_path_parts['path'],1) != ''? '|': '').'stats'.($vhost_data['errordocs'] == 1 ? '|error' : '').')\b)/';
                     }
                  } else {
                     $rewrite_exclude = '(.?)';
                     // external URL
                     $rewrite_exclude = '(.?)/';
                     if($data['new']['redirect_type'] == 'proxy'){
                        $vhost_data['use_proxy'] = 'y';
                        $rewrite_subdir = $tmp_redirect_path_parts['path'];
                        if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                        if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                     }
                  }
                  unset($tmp_redirect_path);
                  unset($tmp_redirect_path_parts);
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$this->_rewrite_quote($data['new']['domain']),
               'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
               'rewrite_target'    => $data['new']['redirect_path'],
               'rewrite_exclude'   => $rewrite_exclude);
               $own_rewrite_rules[] = array(   'rewrite_domain'    => '^'.$this->_rewrite_quote($data['new']['domain']),
                  'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                  'rewrite_target'    => $data['new']['redirect_path'],
                  'rewrite_exclude'   => $rewrite_exclude,
                  'rewrite_subdir'   => $rewrite_subdir,
                  'use_rewrite'   => ($data['new']['redirect_type'] == 'proxy' ? false:true),
                  'use_proxy'   => ($data['new']['redirect_type'] == 'proxy' ? true:false));
         }
      }

      $tpl->setVar($vhost_data);
      
      $server_alias = array();
      
@@ -1054,8 +1107,6 @@
         $server_alias[] .= $auto_alias.' ';
      }
      
      // 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'");
      switch($data['new']['subdomain']) {
         case 'www':
            $server_alias[] = 'www.'.$data['new']['domain'].' ';
@@ -1064,120 +1115,141 @@
            $server_alias[] = '*.'.$data['new']['domain'].' ';
            break;
      }

      // 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'");
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
            switch($alias['subdomain']) {
               case 'www':
                  $server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
                  break;
               case '*':
                  $server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
                  break;
               default:
                  $server_alias[] = $alias['domain'].' ';
                  break;
            if($alias['redirect_type'] == '' || $alias['redirect_path'] == '') {
               switch($alias['subdomain']) {
                  case 'www':
                     $server_alias[] = 'www.'.$alias['domain'].' '.$alias['domain'].' ';
                     break;
                  case '*':
                     $server_alias[] = '*.'.$alias['domain'].' '.$alias['domain'].' ';
                     break;
                  default:
                     $server_alias[] = $alias['domain'].' ';
                     break;
               }
               $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
            }
            $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
            // Rewriting
            if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
               if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
               if(substr($alias['redirect_path'],0,8) == '[scheme]') $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);	
					
               /* Disabled the path extension
               if($data['new']['redirect_type'] == 'no' && substr($data['new']['redirect_path'],0,4) != 'http') {
                  $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
               if(substr($alias['redirect_path'],0,8) == '[scheme]'){
                  if($alias['redirect_type'] != 'proxy'){
                     $alias['redirect_path'] = '$scheme'.substr($alias['redirect_path'],8);
                  } else {
                     $alias['redirect_path'] = 'http'.substr($alias['redirect_path'],8);
                  }
               }
               */
               
               switch($alias['subdomain']) {
                  case 'www':
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
                        $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
                     } else { // URL - check if URL is local
                        $tmp_redirect_path = $alias['redirect_path'];
                        if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                        $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                        if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                           if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                           if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                           $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                        } else {
                           $rewrite_exclude = '(.?)';
                        if($alias['redirect_type'] == 'proxy'){
                           $rewrite_subdir = substr($alias['redirect_path'],1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                        unset($tmp_redirect_path);
                        unset($tmp_redirect_path_parts);
                        $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
                     } else {
                        if($alias['redirect_type'] == 'proxy'){
                           $tmp_redirect_path = $alias['redirect_path'];
                           $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                           $rewrite_subdir = $tmp_redirect_path_parts['path'];
                           if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$this->_rewrite_quote($alias['domain']),
                     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'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_exclude'   => $rewrite_exclude);
                        'rewrite_subdir'   => $rewrite_subdir,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                        
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
                        $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
                     } else { // URL - check if URL is local
                        $tmp_redirect_path = $alias['redirect_path'];
                        if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                        $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                        if($tmp_redirect_path_parts['host'] == 'www.'.$alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                           if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                           if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                           $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                        } else {
                           $rewrite_exclude = '(.?)';
                        if($alias['redirect_type'] == 'proxy'){
                           $rewrite_subdir = substr($alias['redirect_path'],1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                        unset($tmp_redirect_path);
                        unset($tmp_redirect_path_parts);
                        $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
                     } else {
                        if($alias['redirect_type'] == 'proxy'){
                           $tmp_redirect_path = $alias['redirect_path'];
                           $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                           $rewrite_subdir = $tmp_redirect_path_parts['path'];
                           if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => '^' . $this->_rewrite_quote('www.'.$alias['domain']),
                           'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                           'rewrite_target'    => $alias['redirect_path'],
                           'rewrite_exclude'   => $rewrite_exclude);
                     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'    => 'www.'.$alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                     break;
                  case '*':
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
                        $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
                     } else { // URL - check if URL is local
                        $tmp_redirect_path = $alias['redirect_path'];
                        if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                        $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                        if(substr($tmp_redirect_path_parts['host'],-strlen($alias['domain'])) == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                           if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                           if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                           $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                        } else {
                           $rewrite_exclude = '(.?)';
                        if($alias['redirect_type'] == 'proxy'){
                           $rewrite_subdir = substr($alias['redirect_path'],1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                        unset($tmp_redirect_path);
                        unset($tmp_redirect_path_parts);
                        $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
                     } else {
                        if($alias['redirect_type'] == 'proxy'){
                           $tmp_redirect_path = $alias['redirect_path'];
                           $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                           $rewrite_subdir = $tmp_redirect_path_parts['path'];
                           if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                     }
                     $rewrite_rules[] = array(   'rewrite_domain'    => '(^|\.)' . $this->_rewrite_quote($alias['domain']),
                     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'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_exclude'   => $rewrite_exclude);
                        'rewrite_subdir'   => $rewrite_subdir,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
                     break;
                  default:
                     if(substr($alias['redirect_path'],0,1) == '/'){ // relative path
                        $rewrite_exclude = '(?!'.substr($alias['redirect_path'],0,-1).')';
                     } else { // URL - check if URL is local
                        $tmp_redirect_path = $alias['redirect_path'];
                        if(substr($tmp_redirect_path,0,7) == '$scheme') $tmp_redirect_path = 'http'.substr($tmp_redirect_path,7);
                        $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                        if($tmp_redirect_path_parts['host'] == $alias['domain'] && ($tmp_redirect_path_parts['port'] == '80' || $tmp_redirect_path_parts['port'] == '443' || !isset($tmp_redirect_path_parts['port']))){
                           if(substr($tmp_redirect_path_parts['path'],-1) == '/') $tmp_redirect_path_parts['path'] = substr($tmp_redirect_path_parts['path'],0,-1);
                           if(substr($tmp_redirect_path_parts['path'],0,1) != '/') $tmp_redirect_path_parts['path'] = '/'.$tmp_redirect_path_parts['path'];
                           $rewrite_exclude = '(?!'.$tmp_redirect_path_parts['path'].')';
                        } else {
                           $rewrite_exclude = '(.?)';
                        if($alias['redirect_type'] == 'proxy'){
                           $rewrite_subdir = substr($alias['redirect_path'],1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                        unset($tmp_redirect_path);
                        unset($tmp_redirect_path_parts);
                        $alias['redirect_path'] = ($alias['redirect_type'] == 'proxy'? 'http' : '$scheme').'://'.($vhost_data['seo_redirect_enabled'] ? $vhost_data['seo_redirect_target_domain'] : $data['new']['domain']).$alias['redirect_path'];
                     } else {
                        if($alias['redirect_type'] == 'proxy'){
                           $tmp_redirect_path = $alias['redirect_path'];
                           $tmp_redirect_path_parts = parse_url($tmp_redirect_path);
                           $rewrite_subdir = $tmp_redirect_path_parts['path'];
                           if(substr($rewrite_subdir,0,1) == '/') $rewrite_subdir = substr($rewrite_subdir,1);
                           if(substr($rewrite_subdir,-1) == '/') $rewrite_subdir = substr($rewrite_subdir,0,-1);
                        }
                     }
                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));
                            else $domain_rule = '^'.$this->_rewrite_quote($alias['domain']);
                     if($alias['redirect_type'] != 'proxy'){
                        if(substr($alias['redirect_path'],-1) == '/') $alias['redirect_path'] = substr($alias['redirect_path'],0,-1);
                     }
                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '*.'.substr($alias['domain'], 2);
                            else $domain_rule = $alias['domain'];
                     $rewrite_rules[] = array(   'rewrite_domain'    => $domain_rule,
                     'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                     'rewrite_target'    => $alias['redirect_path'],
                     'rewrite_exclude'   => $rewrite_exclude);
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path'],
                        'rewrite_subdir'   => $rewrite_subdir,
                        'use_rewrite'   => ($alias['redirect_type'] == 'proxy' ? false:true),
                        'use_proxy'   => ($alias['redirect_type'] == 'proxy' ? true:false));
               }
            }
         }
@@ -1201,9 +1273,12 @@
      if(count($rewrite_rules) > 0) {
         $tpl->setLoop('redirects',$rewrite_rules);
      }
      if(count($own_rewrite_rules) > 0) {
         $tpl->setLoop('own_redirects',$own_rewrite_rules);
      }
      
      //* Create basic http auth for website statistics
      $tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/.htpasswd_stats");
      $tpl->setVar('stats_auth_passwd_file', $data['new']['document_root']."/web/stats/.htpasswd_stats");
      
      // Create basic http auth for other directories
      $basic_auth_locations = $this->_create_web_folder_auth_configuration($data['new']);
@@ -1271,11 +1346,11 @@
      }
      
      // create password file for stats directory
      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->file_put_contents($data['new']['document_root'].'/.htpasswd_stats',$htp_file);
            $app->system->chmod($data['new']['document_root'].'/.htpasswd_stats',0755);
            $app->system->file_put_contents($data['new']['document_root'].'/web/stats/.htpasswd_stats',$htp_file);
            $app->system->chmod($data['new']['document_root'].'/web/stats/.htpasswd_stats',0755);
            unset($htp_file);
         }
      }
@@ -2043,9 +2118,12 @@
         $locations = array();
         $islocation = false;
         $linecount = sizeof($lines);
         $server_count = 0;

         for($i=0;$i<$linecount;$i++){
            $l = trim($lines[$i]);
            if(substr($l, 0, 8) == 'server {') $server_count += 1;
            if($server_count > 1) break;
            if(substr($l, 0, 8) == 'location' && !$islocation){
            
               $islocation = true;
@@ -2149,6 +2227,7 @@
   }
   
   public function create_relative_link($f, $t) {
      global $app;
      // $from already exists
      $from = realpath($f);

@@ -2177,6 +2256,68 @@
    private function _rewrite_quote($string) {
        return str_replace(array('.', '*', '?', '+'), array('\\.', '\\*', '\\?', '\\+'), $string);
    }
	
   private function url_is_local($hostname, $domain_id){
      global $app;

      // ORDER BY clause makes sure wildcard subdomains (*) are listed last in the result array so that we can find direct matches first
      $webs = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' ORDER BY subdomain ASC");
      if(is_array($webs) && !empty($webs)){
         foreach($webs as $web){
            // web domain doesn't match hostname
            if(substr($hostname,-strlen($web['domain'])) != $web['domain']) continue;
            // own vhost and therefore server {} container of its own
            //if($web['type'] == 'vhostsubdomain') continue;
            // alias domains/subdomains using rewrites and therefore a server {} container of their own
            //if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') continue;
				
            if($web['subdomain'] == '*'){
               $pattern = '/\.?'.str_replace('.', '\.', $web['domain']).'$/i';
            }
            if($web['subdomain'] == 'none'){
               if($web['domain'] == $hostname){
                  if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
                     // own vhost and therefore server {} container of its own
                     if($web['type'] == 'vhostsubdomain') return false;
                     // alias domains/subdomains using rewrites and therefore a server {} container of their own
                     if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
                     return true;
                  } else {
                     return false;
                  }
               }
               $pattern = '/^'.str_replace('.', '\.', $web['domain']).'$/i';
            }
            if($web['subdomain'] == 'www'){
               if($web['domain'] == $hostname || $web['subdomain'].'.'.$web['domain'] == $hostname){
                  if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
                     // own vhost and therefore server {} container of its own
                     if($web['type'] == 'vhostsubdomain') return false;
                     // alias domains/subdomains using rewrites and therefore a server {} container of their own
                     if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
                     return true;
                  } else {
                     return false;
                  }
               }
               $pattern = '/^(www\.)?'.str_replace('.', '\.', $web['domain']).'$/i';
            }
            if(preg_match($pattern, $hostname)){
               if($web['domain_id'] == $domain_id || $web['parent_domain_id'] == $domain_id){
                  // own vhost and therefore server {} container of its own
                  if($web['type'] == 'vhostsubdomain') return false;
                  // alias domains/subdomains using rewrites and therefore a server {} container of their own
                  if(($web['type'] == 'alias' || $web['type'] == 'subdomain') && $web['redirect_type'] != '' && $web['redirect_path'] != '') return false;
                  return true;
               } else {
                  return false;
               }
            }
         }
      }
		
      return false;
   }

} // end class