From cac71716fbc2bb3e25136817ed7d184c3025a887 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Mon, 11 Jan 2016 21:51:49 +0100
Subject: [PATCH] updated readme.md improved rtrim() "/" on BASE Route

---
 README.md                          | 2 +-
 app/main/controller/api/user.php   | 4 ++--
 app/main/controller/controller.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5f6e314b..9f15c510 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## *PATHFINDER*
 Mapping tool for [*EVE ONLINE*](https://www.eveonline.com)
 
-- Project [https://www.pathfinder.exodus4d.de](https://www.pathfinder.exodus4d.de)
+- Project [https://www.pathfinder-w.space](https://www.pathfinder-w.space)
 - Official Forum post [https://forums.eveonline.com](https://forums.eveonline.com/default.aspx?g=posts&m=6021776#post6021776)
 - Screenshots [imgur.com](http://imgur.com/a/k2aVa)
 - Video [youtube.com](https://www.youtube.com/channel/UC7HU7XEoMbqRwqxDTbMjSPg)
diff --git a/app/main/controller/api/user.php b/app/main/controller/api/user.php
index 4b9e252c..ff2b1bd7 100644
--- a/app/main/controller/api/user.php
+++ b/app/main/controller/api/user.php
@@ -48,7 +48,7 @@ class User extends Controller\Controller{
             $user->updateApiData();
 
             // route user to map app
-            $return->reroute = self::getEnvironmentData('URL') . $f3->alias('map');
+            $return->reroute = rtrim(self::getEnvironmentData('URL'), '/') . $f3->alias('map');
         }
 
         echo json_encode($return);
@@ -460,7 +460,7 @@ class User extends Controller\Controller{
                         $this->logUserIn( $user->name, $settingsData['password'] );
 
                         // return reroute path
-                        $return->reroute = self::getEnvironmentData('URL') . $this->f3->alias('map');
+                        $return->reroute = rtrim(self::getEnvironmentData('URL'), '/') . $this->f3->alias('map');
                     }
 
                     // get fresh updated user object
diff --git a/app/main/controller/controller.php b/app/main/controller/controller.php
index 46682770..99c6cb6f 100644
--- a/app/main/controller/controller.php
+++ b/app/main/controller/controller.php
@@ -145,7 +145,7 @@ class Controller {
                 isset($params['reroute']) &&
                 (bool)$params['reroute']
             ){
-                $return->reroute = self::getEnvironmentData('URL') . $f3->alias('landing');
+                $return->reroute = rtrim(self::getEnvironmentData('URL'), '/') . $f3->alias('landing');
             }else{
                 // no reroute -> errors can be shown
                 $return->error[] = $this->getUserLoggedOffError();