Updated: Do not add $1 to redirect path on RewriteRule if there is no trail...

mcramer

2012-11-14 c16e77cadf5a4d7940df8aef1131615c3a105f38

Updated: Do not add $1 to redirect path on RewriteRule if there is no trailing /

 server/conf/vhost.conf.master

@@ -266,7 +266,7 @@
        RewriteCond %{REQUEST_URI} !^/webdav/
        RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
</tmpl_if>
        RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'>$1  <tmpl_var name='rewrite_type'>
        RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
</tmpl_loop>
</tmpl_if>


 server/plugins-available/apache2_plugin.inc.php

@@ -888,26 +888,30 @@
                        'rewrite_type'         => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
                        'rewrite_target'     => $rewrite_target,
                        'rewrite_target_ssl' => $rewrite_target_ssl,
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                        'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                    $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'     => $rewrite_target,
                            'rewrite_target_ssl' => $rewrite_target_ssl,
                            'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                            'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                            'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                    break;
                case '*':
                    $rewrite_rules[] = array(    'rewrite_domain'     => '(^|\.)'.$this->_rewrite_quote($data['new']['domain']),
                        'rewrite_type'         => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
                        'rewrite_target'     => $rewrite_target,
                        'rewrite_target_ssl' => $rewrite_target_ssl,
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                        'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                    break;
                default:
                    $rewrite_rules[] = array(    'rewrite_domain'     => '^'.$this->_rewrite_quote($data['new']['domain']),
                        'rewrite_type'         => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
                        'rewrite_target'     => $rewrite_target,
                        'rewrite_target_ssl' => $rewrite_target_ssl,
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                        'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                        'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
            }
        }
        
@@ -983,19 +987,22 @@
                                'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                                'rewrite_target'     => $rewrite_target,
                                'rewrite_target_ssl' => $rewrite_target_ssl,
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                                'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                            $rewrite_rules[] = array(    'rewrite_domain'     => '^' . $this->_rewrite_quote('www.'.$alias['domain']),
                                    'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                                    'rewrite_target'     => $rewrite_target,
                                    'rewrite_target_ssl' => $rewrite_target_ssl,
                                    'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                                    'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                                    'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                            break;
                        case '*':
                            $rewrite_rules[] = array(    'rewrite_domain'     => '(^|\.)'.$this->_rewrite_quote($alias['domain']),
                                'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                                'rewrite_target'     => $rewrite_target,
                                'rewrite_target_ssl' => $rewrite_target_ssl,
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                                'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                            break;
                        default:
                            if(substr($alias['domain'], 0, 2) === '*.') $domain_rule = '(^|\.)'.$this->_rewrite_quote(substr($alias['domain'], 2));
@@ -1004,7 +1011,8 @@
                                'rewrite_type'         => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                                'rewrite_target'     => $rewrite_target,
                                'rewrite_target_ssl' => $rewrite_target_ssl,
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'));
                                'rewrite_is_url'    => ($this->_is_url($rewrite_target) ? 'y' : 'n'),
                                'rewrite_add_path' => (substr($rewrite_target, -1) == '/' ? 'y' : 'n'));
                    }
                }
            }