- Make sure no rewrite rules are created if the redirect path is empty.

ftimme

2012-04-09 790cb86a8f98ddcd5cc7cb109f2b6a990cd4814e

- Make sure no rewrite rules are created if the redirect path is empty.

 server/plugins-available/apache2_plugin.inc.php

@@ -755,7 +755,7 @@

        // Rewrite rules
        $rewrite_rules = array();
        if($data['new']['redirect_type'] != '') {
        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]'){
                $rewrite_target = 'http'.substr($data['new']['redirect_path'],8);
@@ -821,7 +821,7 @@
                }
                $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
                // Rewriting
                if($alias['redirect_type'] != '') {
                if($alias['redirect_type'] != '' && $alias['redirect_path'] != '') {
                    if(substr($alias['redirect_path'],-1) != '/') $alias['redirect_path'] .= '/';
                    if(substr($alias['redirect_path'],0,8) == '[scheme]'){
                        $rewrite_target = 'http'.substr($alias['redirect_path'],8);

 server/plugins-available/nginx_plugin.inc.php

@@ -778,7 +778,7 @@

        // Rewrite rules
        $rewrite_rules = array();
        if($data['new']['redirect_type'] != '') {
        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
@@ -834,7 +834,7 @@
                }
                $app->log('Add server alias: '.$alias['domain'],LOGLEVEL_DEBUG);
                // Rewriting
                if($alias['redirect_type'] != '') {
                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);