- Introduced placeholder [scheme] also for the website's "Redirect" tab.

ftimme

2011-09-20 45ee6715430870197d26c41d14d2d7c45de2d76c

- Introduced placeholder [scheme] also for the website's "Redirect" tab.

 interface/web/sites/form/web_domain.tform.php

@@ -236,7 +236,7 @@
        'redirect_path' => array (
            'datatype'    => 'VARCHAR',
            'validators'    => array (     0 => array (    'type'    => 'REGEX',
                                                        'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'regex' => '@^(([.]{0})|(https?://([-\w\.]+)+(:\d+)?(/([\w/_\.\,\-\+\?\~]*(\?\S+)?)?)?)|(\[scheme\]://([-\w\.]+)+(:\d+)?(/([\w/_\.\-\,\+\?\~]*(\?\S+)?)?)?)|(/[\w/_\.\-]{1,255}/))$@',
                                                        'errmsg'=> 'redirect_error_regex'),
                                    ),
            'formtype'    => 'TEXT',

 server/plugins-available/apache2_plugin.inc.php

@@ -693,8 +693,13 @@
        $rewrite_rules = array();
        if($data['new']['redirect_type'] != '') {
            if(substr($data['new']['redirect_path'],-1) != '/') $data['new']['redirect_path'] .= '/';
            $rewrite_target = $data['new']['redirect_path'];
            $rewrite_target_ssl = $data['new']['redirect_path'];
            if(substr($data['new']['redirect_path'],0,8) == '[scheme]'){
                $rewrite_target = 'http'.substr($data['new']['redirect_path'],8);
                $rewrite_target_ssl = 'https'.substr($data['new']['redirect_path'],8);
            } else {
                $rewrite_target = $data['new']['redirect_path'];
                $rewrite_target_ssl = $data['new']['redirect_path'];
            }
            /* 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']).'/';

 server/plugins-available/nginx_plugin.inc.php

@@ -680,6 +680,7 @@
        $rewrite_rules = array();
        if($data['new']['redirect_type'] != '') {
            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']).'/';