diff --git a/.htaccess b/.htaccess index 105d8c48..fbb84555 100755 --- a/.htaccess +++ b/.htaccess @@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC] RewriteRule ^(.*)$ http://%1/$1 [R=301,L] #Comment out the two folling lines when running server locally to fix issues with localhost -RewriteCond %{HTTPS} !=on -RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] +#RewriteCond %{HTTPS} !=on +#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L] RewriteRule ^remote/(.*) php/controller.php?id=$1 [L] diff --git a/php/controller.php b/php/controller.php index 83eea38c..4e6723de 100755 --- a/php/controller.php +++ b/php/controller.php @@ -80,13 +80,13 @@
@@ -169,7 +169,6 @@ - - +