better url generation to cover subfolder case. fix #552

still perfectible though…
elabftw · Dec 13, 2017 · 9d3c711 · 9d3c711
1 parent 5f252cd
commit 9d3c711
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 9 deletions.
diff --git a/app/classes/AbstractMake.php b/app/classes/AbstractMake.php
@@ -81,7 +81,7 @@ protected function getTmpPath()
     protected function getUrl()
     {
         $Request = Request::createFromGlobals();
-        $url = 'https://' . $Request->getHttpHost() . '/' . $this->Entity->page . '.php';
+        $url = Tools::getUrl($Request) . '/' . $this->Entity->page . '.php';
 
         return $url . "?mode=view&id=" . $this->Entity->id;
     }

diff --git a/app/classes/Email.php b/app/classes/Email.php
@@ -190,7 +190,7 @@ public function alertAdmin($team)
         }
         // get url
         $Request = Request::createFromGlobals();
-        $url = 'https://' . $Request->getHttpHost() . '/admin.php';
+        $url = 'https://' . $Request->getHost() . ':' . $Request->getPort() . $Request->getBaseUrl() . '/admin.php';
 
         // Create the message
         $footer = "\n\n~~~\nSent from eLabFTW https://www.elabftw.net\n";
@@ -228,7 +228,7 @@ public function alertUserIsValidated($email)
 
         // now let's get the URL so we can have a nice link in the email
         $Request = Request::createFromGlobals();
-        $url = 'https://' . $Request->getHttpHost() . '/login.php';
+        $url = 'https://' . $Request->getHost() . ':' . $Request->getPort() . $Request->getBaseUrl() . '/login.php';
 
         $footer = "\n\n~~~\nSent from eLabFTW https://www.elabftw.net\n";
         // Create the message

diff --git a/app/classes/MakePdf.php b/app/classes/MakePdf.php
@@ -155,7 +155,9 @@ private function addLinkedItems()
 
         // create Request object
         $Request = Request::createFromGlobals();
-        $url = 'https://' . $Request->getHttpHost() . '/database.php';
+        $url = Tools::getUrl($Request) . '/' . $this->Entity->page . '.php';
+        // not pretty but gets the job done
+        $url = str_replace('app/classes/', '', $url);
 
         foreach ($linksArr as $link) {
             $fullItemUrl = $url . "?mode=view&id=" . $link['link_id'];

diff --git a/app/classes/Tools.php b/app/classes/Tools.php
@@ -10,6 +10,8 @@
  */
 namespace Elabftw\Elabftw;
 
+use Symfony\Component\HttpFoundation\Request;
+
 /**
  * Toolbelt full of useful functions
  */
@@ -344,4 +346,15 @@ public static function getCleanTitle($title)
     {
         return str_replace(array('#', "&39;", "&34;"), '', $title) . " - eLabFTW";
     }
+
+    /**
+     * Return a full URL of the elabftw install
+     *
+     * @param Request $Request
+     * @return string the url
+     */
+    public static function getUrl($Request)
+    {
+        return 'https://' . $Request->getHost() . ':' . $Request->getPort() . $Request->getBasePath();
+    }
 }
diff --git a/app/controllers/ResetPasswordController.php b/app/controllers/ResetPasswordController.php
@@ -54,7 +54,9 @@
         $deadline = Crypto::encrypt(time() + 3600, Key::loadFromAsciiSafeString(SECRET_KEY));
 
         // build the reset link
-        $resetLink = 'https://' . $Request->getHttpHost() . '/change-pass.php';
+        $resetLink = Tools::getUrl($Request) . '/change-pass.php';
+        // not pretty but gets the job done
+        $resetLink = str_replace('app/controllers/', '', $resetLink);
         $resetLink .='?key=' . $key . '&deadline=' . $deadline . '&userid=' . $user['userid'];
 
         // Send an email with the reset link

diff --git a/app/init.inc.php b/app/init.inc.php
@@ -41,7 +41,9 @@
     $configFilePath = dirname(dirname(__FILE__)) . '/config.php';
     // redirect to install page if the config file is not here
     if (!is_readable($configFilePath)) {
-        $url = 'https://' . $Request->getHttpHost() . '/install/index.php';
+        $url = Tools::getUrl($Request) . '/install/index.php';
+        // not pretty but gets the job done
+        $url = str_replace('app/', '', $url);
         header('Location: ' . $url);
         throw new Exception('Redirecting to install folder');
     }

diff --git a/app/models/Comments.php b/app/models/Comments.php
@@ -93,7 +93,9 @@ private function alertOwner()
 
         // Create the message
         $Request = Request::createFromGlobals();
-        $url = 'https://' . $Request->getHttpHost() . '/experiments.php';
+        $url = Tools::getUrl($Request) . '/' . $this->Entity->page . '.php';
+        // not pretty but gets the job done
+        $url = str_replace('app/models/', '', $url);
         $url .= "?mode=view&id=" . $this->Entity->id;
 
         $footer = "\n\n~~~\nSent from eLabFTW https://www.elabftw.net\n";

diff --git a/install/index.php b/install/index.php
@@ -115,7 +115,9 @@
     // if we are not in https, die saying we work only in https
     if (!$Request->isSecure() && !$Request->server->has('HTTP_X_FORWARDED_PROTO')) {
         // get the url to display a link to click (without the port)
-        $url = 'https://' . $Request->getHttpHost();
+        $url = Tools::getUrl($Request);
+        // not pretty but gets the job done
+        $url = str_replace('install/', '', $url);
         $message = "eLabFTW works only in HTTPS. Please enable HTTPS on your server. Or click this link : <a href='" .
             $url . "'>$url</a>";
         throw new Exception($message);

diff --git a/login.php b/login.php
@@ -35,7 +35,7 @@
     // if we are not in https, die saying we work only in https
     if (!$Request->isSecure() && !$Request->server->has('HTTP_X_FORWARDED_PROTO')) {
         // get the url to display a link to click (without the port)
-        $url = 'https://' . $Request->getHttpHost();
+        $url = Tools::getUrl($Request);
         $message = "eLabFTW works only in HTTPS. Please enable HTTPS on your server. Or click this link : <a href='" .
             $url . "'>$url</a>";
         throw new Exception($message);