From: Dan Untenzu <untenzu@webit.de>
Date: Wed, 18 Jan 2017 18:41:14 +0000 (+0100)
Subject: [FEATURE] Replace all domain depended links
X-Git-Tag: 3.0.0~24
X-Git-Url: https://git.p6c8.net/jirafeau.git/commitdiff_plain/bf0a496a102b28c08906879f18120b194793a922?ds=sidebyside

[FEATURE] Replace all domain depended links

Replace all occurences of "web_root" (domain depended links)
with "JIRAFEAU_ABSPREFIX" (absolute links to the root level).

Links like "https://example.com/foo/functions.js" are replaced
with "/foo/functions.js".

Refs #79
---

diff --git a/f.php b/f.php
index 67590eb..109ac53 100644
--- a/f.php
+++ b/f.php
@@ -129,7 +129,7 @@ if (!empty ($link['key']))
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
              '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
@@ -140,7 +140,7 @@ if (!empty ($link['key']))
              '<input type = "password" name = "key" />' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . $cfg['web_root'] . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O')
@@ -151,9 +151,8 @@ if (!empty ($link['key']))
         }
 
         ?><tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-        onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+        onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
@@ -161,9 +160,8 @@ if (!empty ($link['key']))
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
         {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit_post').action='
-            <?php
-            echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+            echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
             if (!empty($crypt_key))
                 echo '&amp;k=' . urlencode($crypt_key);
             ?>';
@@ -193,8 +191,8 @@ if (!$password_challenged && !$do_download && !$do_preview)
 {
         require (JIRAFEAU_ROOT.'lib/template/header.php');
         echo '<div>' .
-             '<form action = "';
-        echo $cfg['web_root'] . '/f.php';
+             '<form action="';
+        echo JIRAFEAU_ABSPREFIX . 'f.php';
         echo '" ' .
              'method = "post" id = "submit_post">'; ?>
              <input type = "hidden" name = "jirafeau" value = "<?php echo JIRAFEAU_VERSION ?>"/><?php
@@ -203,7 +201,7 @@ if (!$password_challenged && !$do_download && !$do_preview)
              t('You are about to download') . ' "' . htmlspecialchars($link['file_name']) . '" (' . jirafeau_human_size($link['file_size']) . ').' .
              '</td></tr>' .
              '<tr><td>' .
-             t('By using our services, you accept our'). ' <a href="' . $cfg['web_root'] . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
+             t('By using our services, you accept our'). ' <a href="' . JIRAFEAU_ABSPREFIX . 'tos.php' . '">' . t('Terms of Service') . '</a>.' .
              '</td></tr>';
 
         if ($link['onetime'] == 'O')
@@ -215,9 +213,8 @@ if (!$password_challenged && !$do_download && !$do_preview)
 
         ?>
         <tr><td><input type="submit" id = "submit_download"  value="<?php echo t('Download'); ?>"
-        onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;d=1';
+        onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;d=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
@@ -226,9 +223,8 @@ if (!$password_challenged && !$do_download && !$do_preview)
         if ($cfg['preview'] && jirafeau_is_viewable($link['mime_type']))
         {
             ?><input type="submit" id = "submit_preview"  value="<?php echo t('Preview'); ?>"
-            onclick="document.getElementById('submit_post').action='
-<?php
-        echo $cfg['web_root'] . '/f.php?h=' . $link_name . '&amp;p=1';
+            onclick="document.getElementById('submit_post').action='<?php
+        echo JIRAFEAU_ABSPREFIX . 'f.php?h=' . $link_name . '&amp;p=1';
         if (!empty($crypt_key))
             echo '&amp;k=' . urlencode($crypt_key);
 ?>';
diff --git a/lib/template/footer.php b/lib/template/footer.php
index 132ce90..2e05974 100644
--- a/lib/template/footer.php
+++ b/lib/template/footer.php
@@ -9,10 +9,10 @@
         ?>
         <!-- Installation dependend links -->
         <?php
-        if (false === empty($cfg['web_root']))
+        if (true == $cfg['installation_done'])
         {
           echo ' | ';
-          echo '<a href="' . $cfg['web_root'] . 'tos.php">' . t('Terms of Service') . '</a>';
+          echo '<a href="' . JIRAFEAU_ABSPREFIX . 'tos.php">' . t('Terms of Service') . '</a>';
         }
         ?>
     </p>
diff --git a/lib/template/header.php b/lib/template/header.php
index b4e6607..f984e1c 100644
--- a/lib/template/header.php
+++ b/lib/template/header.php
@@ -1,32 +1,19 @@
 <?php
 header('Content-Type: text/html; charset=utf-8');
 header('x-ua-compatible: ie=edge');
-
-$protocol = (bool)is_ssl() ? 'https' : 'http';
-
-if ( !empty($cfg['web_root']) ) {
-    $cfg['web_root'] = preg_replace('#https?://#', $protocol . '://', $cfg['web_root'], 1);
-}
-
-/* Avoids irritating errors with the installer (no conf file is present then). */
-if (!isset ($cfg['web_root']))
-    $web_root = $protocol+'://' . $_SERVER['HTTP_HOST'] . '/';
-else
-    $web_root = $cfg['web_root'];
-
 ?>
 <!DOCTYPE html>
 <html>
 <head>
   <meta charset="utf-8">
   <title><?php echo (true === empty($cfg['title']))? t('Jirafeau, your web file repository') : $cfg['title']; ?></title>
-  <link href="<?php echo $web_root . 'media/' . $cfg['style'] . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
+  <link href="<?php echo JIRAFEAU_ABSPREFIX . 'media/' . $cfg['style'] . '/style.css.php'; ?>" rel="stylesheet" type="text/css" />
 </head>
 <body>
-<script type="text/javascript" src="lib/functions.js.php"></script>
+<script type="text/javascript" src="<?php echo JIRAFEAU_ABSPREFIX . 'lib/functions.js.php'; ?>"></script>
 <div id="content">
   <h1>
-    <a href="<?php echo $web_root; ?>">
+    <a href="<?php echo JIRAFEAU_ABSPREFIX; ?>">
       <?php echo (true === empty($cfg['title']))? t('Jirafeau, your web file repository') : $cfg['title']; ?>
     </a>
   </h1>
diff --git a/script.php b/script.php
index c3b722f..9da9221 100644
--- a/script.php
+++ b/script.php
@@ -53,7 +53,7 @@ if ($_SERVER['REQUEST_METHOD'] == "GET" && count ($_GET) == 0)
     <h2>Scripting interface</h2>
     <p>This interface permits to script your uploads and downloads.</p>
     <p>See <a href="https://gitlab.com/mojo42/Jirafeau/blob/master/script.php">source code</a> of this interface to get available calls :)</p>
-    <p>Alternatively, go to <a href="<?php echo $cfg['web_root'] . 'script.php?lang=bash'; ?>">this page</a> to download a bash script.</p>
+    <p>You may download a preconfigured <a href="<?php echo JIRAFEAU_ABSPREFIX . 'script.php?lang=bash'; ?>">Bash Script</a> to easily send to and get files from the API via command line.</p>
     </div>
     <br />
     <?php