From 06790ae429e56903cd841a0f9f783537ca07f0eb Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Mon, 20 Feb 2017 15:22:22 -0700
Subject: [PATCH] Fix some issues with the redirects

bzr-revno: 62
---
 files/.htaccess | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/.htaccess b/files/.htaccess
index 61e26c5..2a8c2a5 100644
--- a/files/.htaccess
+++ b/files/.htaccess
@@ -1,13 +1,13 @@
 RewriteEngine on
 # Remove www from URL
-RewriteCond %{HTTP_HOST} ^www.openlp.org$ [NC]
-RewriteCond %{HTTPS_HOST} ^www.openlp.org$ [NC]
-RewriteRule ^(.*)$ https://openlp.org/$1 [R=301,L]
+RewriteBase /
+RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 # Redirect HTTP to HTTPS
 RewriteCond %{HTTPS} off
 RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
 # Some old URLs start with "en", just drop it
-RewriteRule ^en/(.*)$ $1 [R=301,L]
+RewriteRule ^en/(.*)$ /$1 [R=301,L]
 # Make .html optional
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d