KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying small fix for redirecting and such

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-03-16 14:37:53 +01:00
parent 18e6c82e28
commit 9ae2634ec8
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.htaccess
View File

@@ -3,18 +3,20 @@ RewriteEngine on
RewriteBase / RewriteBase /
RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
RewriteCond %{HTTP_HOST} ^zoff.me
RewriteCond %{HTTPS} !=on RewriteCond %{HTTPS} !=on
RewriteRule ^(.*)$ https://zoff.me/$1 [L] RewriteRule ^(.*)$ https://zoff.me/$1 [L]
RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
RewriteCond %{HTTP_HOST} ^zoff.me
RewriteRule ^(.*)$ https://zoff.me/$1 [L] RewriteRule ^(.*)$ https://zoff.me/$1 [L]
RewriteCond %{HTTP_HOST} ^(.*zoff.me.*)$ RewriteCond %{HTTP_HOST} ^(.*zoff.me.*)$
RewriteCond %{HTTPS} !=on RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://zoff.me/$1 [L] RewriteRule ^/?(.*) https://zoff.me/$1 [L]
RewriteCond %{HTTP_HOST} ^zoff.no #RewriteCond %{HTTP_HOST} ^zoff.no
RewriteRule ^/?(.*) https://zoff.me/$1 [L] #RewriteRule ^/?(.*) https://zoff.me/$1 [L]
RewriteCond %{HTTP_HOST} ^remote.zoff.no RewriteCond %{HTTP_HOST} ^remote.zoff.no
RewriteRule ^/?(.*) https://remote.zoff.me/$1 [L] RewriteRule ^/?(.*) https://remote.zoff.me/$1 [L]

8
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/frontpage.js
View File

@@ -372,6 +372,7 @@ function initfp(){
//Materialize.toast('<p id="aprilfools">We suck at pranks..<a class="waves-effect waves-light btn light-green" style="pointer-events:none;">Agreed</a></p>', 100000); //Materialize.toast('<p id="aprilfools">We suck at pranks..<a class="waves-effect waves-light btn light-green" style="pointer-events:none;">Agreed</a></p>', 100000);
} }
if(window.location.hostname == "zoff.no") window.location.href = "https://zoff.me";
window.onpopstate = function(e){ window.onpopstate = function(e){
var url_split = window.location.href.split("/"); var url_split = window.location.href.split("/");