Merge pull request #41 from linuxgemini/master

Various fixes on viewer pages - fix on stylesheet handling when app not installed at webserver root - fix on capitalisation of server variables when determining connection protocol
aerouk · Oct 23, 2017 · ed97393 · ed97393
2 parents 7eb7575 + 8b23322
commit ed97393
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/public/protected/templates/error.phtml b/public/protected/templates/error.phtml
@@ -1,9 +1,10 @@
+<?php $stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css"; ?>
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <title><?php echo APP_NAME . " - Error"; ?></title>
-        <link rel="stylesheet" href="/assets/css/style.css">
+        <link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
     </head>
 
     <body>

diff --git a/public/protected/templates/index.phtml b/public/protected/templates/index.phtml
@@ -1,9 +1,10 @@
+<?php $stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css"; ?>
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <title><?php echo APP_NAME . " - Home"; ?></title>
-        <link rel="stylesheet" href="/assets/css/style.css">
+        <link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
     </head>
 
     <body>

diff --git a/public/protected/templates/viewer.phtml b/public/protected/templates/viewer.phtml
@@ -1,13 +1,14 @@
 <?php
     $imgurl = IMAGESERVE_DIR . "/images/$type/$file.$type";
-    $protocol = isset($_SERVER['https']) && $_SERVER['https'] != "off" ? "https" : "http";
+    $protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off" ? "https" : "http";
+    $stylesheetDir = IMAGESERVE_DIR . "/assets/css/style.css";
 ?>
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8">
         <title><?php echo APP_NAME . " - $file.$type"; ?></title>
-        <link rel="stylesheet" href="/assets/css/style.css">
+        <link rel="stylesheet" href="<?php echo $stylesheetDir; ?>">
 <?php if (TWITTER_CARDS) { ?>
         <meta name="twitter:card" content="photo" />
         <meta name="twitter:site" content="<?php echo TWITTER_HANDLE; ?>" />