From 646539a11d206ace5b1fd346215b3ce9dbc24d8f Mon Sep 17 00:00:00 2001
From: Stricted <info@stricted.net>
Date: Wed, 20 Jul 2016 09:29:08 +0200
Subject: [PATCH] fix url detection

---
 lib/system/RequestHandler.class.php | 2 +-
 templates/default/login.tpl         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/system/RequestHandler.class.php b/lib/system/RequestHandler.class.php
index 54f076b..98e3fa2 100644
--- a/lib/system/RequestHandler.class.php
+++ b/lib/system/RequestHandler.class.php
@@ -150,7 +150,7 @@ class RequestHandler extends SingletonFactory {
 			$protocol = 'https://';
 		}
 		
-		return $protocol . $_SERVER['HTTP_HOST'] . '/';
+		return $protocol . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']) . '/';
 	}
 	
 	public function getLink (array $params = [], $query = '') {
diff --git a/templates/default/login.tpl b/templates/default/login.tpl
index c735610..5b035e8 100644
--- a/templates/default/login.tpl
+++ b/templates/default/login.tpl
@@ -25,7 +25,7 @@
 							<h3 class="panel-title">Please Sign In</h3>
 						</div>
 						<div class="panel-body">
-							<form method="post" action="index.php?login">
+							<form method="post" action="{link controller='Login'}{/link}">
 								<fieldset>
 									<div class="form-group">
 										<input class="form-control" placeholder="Username" name="username" type="username" autofocus>
-- 
2.20.1