From a6ca3c69680825b70d087fb8a1a00372b779b216 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 13 Mar 2013 19:26:15 -0400
Subject: [PATCH] - Fixed FS#2760 - Redirect on SSL enabled host redirects to http://.
---
server/plugins-available/apache2_plugin.inc.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 38d99e3..3aee4c9 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1329,6 +1329,11 @@
if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) {
$tmp_vhost_arr = array('ip_address' => $data['new']['ip_address'], 'ssl_enabled' => 1, 'port' => '443');
if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules);
+ if(is_array($alias_seo_redirects) && !empty($alias_seo_redirects)){
+ for($i=0;$i<count($alias_seo_redirects);$i++){
+ $alias_seo_redirects[$i]['ssl_enabled'] = 1;
+ }
+ }
if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects);
$vhosts[] = $tmp_vhost_arr;
unset($tmp_vhost_arr);
@@ -1359,6 +1364,11 @@
if($data['new']['ssl_domain'] != '' && $data['new']['ssl'] == 'y' && @is_file($crt_file) && @is_file($key_file) && (@filesize($crt_file)>0) && (@filesize($key_file)>0)) {
$tmp_vhost_arr = array('ip_address' => '['.$data['new']['ipv6_address'].']', 'ssl_enabled' => 1, 'port' => '443');
if(count($rewrite_rules) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('redirects' => $rewrite_rules);
+ if(is_array($alias_seo_redirects) && !empty($alias_seo_redirects)){
+ for($i=0;$i<count($alias_seo_redirects);$i++){
+ $alias_seo_redirects[$i]['ssl_enabled'] = 1;
+ }
+ }
if(count($alias_seo_redirects) > 0) $tmp_vhost_arr = $tmp_vhost_arr + array('alias_seo_redirects' => $alias_seo_redirects);
$vhosts[] = $tmp_vhost_arr;
unset($tmp_vhost_arr);
--
Gitblit v1.9.1