From 0c32618b5c62f70a0a9c88735f58667df54b2658 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 12 Jun 2025 17:36:10 +0100 Subject: [PATCH] Don't hard code http as scheme anymore --- display.php | 42 +++++++++++++++++++++--------------------- index.php | 3 ++- keyboard.js.php | 4 ++-- objects.php | 2 +- show.php | 2 +- slidelist.php | 2 +- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/display.php b/display.php index 9f19c6e..5f711e9 100644 --- a/display.php +++ b/display.php @@ -58,7 +58,7 @@ class html extends display { - + {$presentation->title} HEADER; @@ -130,7 +130,7 @@ FOOTER; switch($this->pres->template) { case 'simple': $slide->titleColor = '#000000'; - echo "
titleAlign\" style=\"font-size: $titlesize; margin: 0 ".$offset."em 0 0;\">baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."
"; + echo "
titleAlign\" style=\"font-size: $titlesize; margin: 0 ".$offset."em 0 0;\">baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."
"; break; case 'empty': $slide->titleColor = '#000000'; @@ -150,7 +150,7 @@ FOOTER; } ?> - pres->slides[$this->slideNum]->filename."\" href=\"http://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."";?> + pres->slides[$this->slideNum]->filename."\" href=\"$_SERVER[REQUEST_SCHEME]://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."";?>
@@ -162,16 +162,16 @@ FOOTER; slideNum > 0){ $prevSlide = $this->slideNum - 1; - echo "prevTitle\" href=\"http://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$prevSlide\">" + echo "prevTitle\" href=\"$_SERVER[REQUEST_SCHEME]://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$prevSlide\">" . ''; } if($this->slideNum < $this->maxSlideNum) $this->nextSlideNum = $this->slideNum + 1; ?>
   - baseDir}/slidelist.php" ?>" onClick="window.open('baseDir}/slidelist.php" ?>','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=winW-300 ?>,top=0'); return false" class="linka">slideNum ?>     + baseDir}/slidelist.php" ?>" onClick="window.open('baseDir}/slidelist.php" ?>','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=winW-300 ?>,top=0'); return false" class="linka">slideNum ?>     nextSlideNum) ) - echo "nextTitle\" href=\"http://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$this->nextSlideNum\">" + echo "nextTitle\" href=\"$_SERVER[REQUEST_SCHEME]://$_SERVER[HTTP_HOST]$this->baseDir$this->showScript/$currentPres/$this->nextSlideNum\">" . ''; ?> @@ -209,16 +209,16 @@ FOOTER; slideNum > 0){ $prevSlide = $this->slideNum - 1; - echo "baseDir$this->showScript/$currentPres/$prevSlide\">" + echo "baseDir$this->showScript/$currentPres/$prevSlide\">" . ''; } if($this->slideNum < $this->maxSlideNum) $this->nextSlideNum = $this->slideNum + 1; ?>
   - baseDir}/slidelist.php" ?>" onClick="window.open('baseDir}/slidelist.php" ?>','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=winW-300 ?>,top=0'); return false" class="linka">slideNum ?>     + baseDir}/slidelist.php" ?>" onClick="window.open('baseDir}/slidelist.php" ?>','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=winW-300 ?>,top=0'); return false" class="linka">slideNum ?>     nextSlideNum) ) - echo "baseDir$this->showScript/$currentPres/$this->nextSlideNum\">" + echo "baseDir$this->showScript/$currentPres/$this->nextSlideNum\">" . ''; ?> @@ -233,7 +233,7 @@ FOOTER; case 'css': echo "
titleAlign\" style=\"width: 100%;\">
"; echo <<baseDir}{$this->showScript}/$currentPres/{$this->slideNum}' style='navbar_title_a'> +
baseDir}{$this->showScript}/$currentPres/{$this->slideNum}' style='navbar_title_a'> ENDT; echo $slide->title."
"; if (isset($slide->subtitle)) { @@ -243,11 +243,11 @@ ENDST; } echo "
"; echo <<baseDir}/slidelist.php' class='navbar-title' onClick="window.open('http://{$_SERVER['HTTP_HOST']}{$this->baseDir}/slidelist.php','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=10,top=0'); return false">{$this->slideNum}/{$this->maxSlideNum}
+baseDir}/slidelist.php' class='navbar-title' onClick="window.open('{$_SERVER[REQUEST_SCHEME]}://{$_SERVER['HTTP_HOST']}{$this->baseDir}/slidelist.php','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=500,left=10,top=0'); return false">{$this->slideNum}/{$this->maxSlideNum}
ENDD; if ($this->pres->navbartopiclinks) { - echo "
baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->prevTitle)."
"; - echo "
navcolor; font-size: $navsize;\">baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->nextTitle)."
"; + echo "
baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->prevTitle)."
"; + echo "
navcolor; font-size: $navsize;\">baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->nextTitle)."
"; } echo "
\n"; echo "
\n"; @@ -264,7 +264,7 @@ ENDD; echo "\"".$this-pres->slides[$this->slideNum]->filename."\">"; $offset+=2; } - echo "
baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."
"; + echo "
baseDir$this->showScript/$currentPres/$this->slideNum\" style=\"text-decoration: none; color: $titlecolor;\">".markup_text($slide->title)."
"; echo "
"; if(!empty($slide->logo2)) $logo2 = $slide->logo2; else $logo2 = $this->pres->logo2; @@ -272,10 +272,10 @@ ENDD; echo "
"; $offset-=2; } - echo "baseDir}/slidelist.php\" style=\"text-decoration: none; color: $slide->titleColor;\" onClick=\"window.open('http://$_SERVER[HTTP_HOST]{$this->baseDir}/slidelist.php','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=$slidelistH,left=".($this->winW-300).",top=0'); return false\">".($this->slideNum)."/".($this->maxSlideNum)."
"; + echo "baseDir}/slidelist.php\" style=\"text-decoration: none; color: $slide->titleColor;\" onClick=\"window.open('$_SERVER[REQUEST_SCHEME]://$_SERVER[HTTP_HOST]{$this->baseDir}/slidelist.php','slidelist','toolbar=no,directories=no,location=no,status=no,menubar=no,resizable=no,scrollbars=yes,width=300,height=$slidelistH,left=".($this->winW-300).",top=0'); return false\">".($this->slideNum)."/".($this->maxSlideNum)."
"; if ($this->pres->navbartopiclinks) { - echo "
baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->prevTitle)."
"; - echo "
navcolor; font-size: $navsize;\">baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->nextTitle)."
"; + echo "
baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->prevTitle)."
"; + echo "
navcolor; font-size: $navsize;\">baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none; color: $slide->navcolor;\">".markup_text($this->nextTitle)."
"; } echo ''; break; @@ -886,7 +886,7 @@ class plainhtml extends html { - + {$presentation->title} @@ -927,8 +927,8 @@ FOOTER; echo "\n"; if ($pres->navbartopiclinks) { echo ""; - if($this->prevTitle) echo "baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none;\">Previous: ".markup_text($this->prevTitle)."\n"; - if($this->nextTitle) echo "baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none;\">Next: ".markup_text($this->nextTitle).""; + if($this->prevTitle) echo "baseDir$this->showScript/$currentPres/$prev\" style=\"text-decoration: none;\">Previous: ".markup_text($this->prevTitle)."\n"; + if($this->nextTitle) echo "baseDir$this->showScript/$currentPres/$next\" style=\"text-decoration: none;\">Next: ".markup_text($this->nextTitle).""; } echo ""; if(!empty($slide->logo2)) $logo2 = $slide->logo2; @@ -1718,7 +1718,7 @@ class pdf extends display { switch($example->type) { case 'genimage': $fn = tempnam("/tmp","pres2"); - $img = file_get_contents("http://".$_SERVER['HTTP_HOST']."/".$this->baseDir.$this->slideDir.$example->filename); + $img = file_get_contents("$_SERVER[REQUEST_SCHEME]://".$_SERVER['HTTP_HOST']."/".$this->baseDir.$this->slideDir.$example->filename); $fp_out = fopen($fn,"wb"); fwrite($fp_out,$img); fclose($fp_out); diff --git a/index.php b/index.php index e202379..cd1baa2 100644 --- a/index.php +++ b/index.php @@ -102,11 +102,12 @@ function change_mode() { } - + HEAD_RAND; $HEAD_RAND = str_replace("%1", htmlspecialchars($_SERVER['HTTP_HOST']).$baseDir, $HEAD_RAND); + $HEAD_RAND = str_replace("%2", htmlspecialchars($_SERVER['REQUEST_SCHEME']), $HEAD_RAND); $TITLE = "Presentation System"; diff --git a/keyboard.js.php b/keyboard.js.php index 12688ae..c5fc7c2 100644 --- a/keyboard.js.php +++ b/keyboard.js.php @@ -28,11 +28,11 @@ function keypressHandler(e) { } currentEffect = currentEffect+1; } else if (nextSlideNum; ?>) { - top.location='baseDir$this->showScript/{$_SESSION['currentPres']}/$this->nextSlideNum"; ?>'; + top.location='baseDir$this->showScript/{$_SESSION['currentPres']}/$this->nextSlideNum"; ?>'; } } if (e == 37 && prevSlideNum+1; ?>) /* left arrow */ - top.location='baseDir$this->showScript/{$_SESSION['currentPres']}/$this->prevSlideNum"; ?>'; + top.location='baseDir$this->showScript/{$_SESSION['currentPres']}/$this->prevSlideNum"; ?>'; } window.onkeyup = keypressHandler; diff --git a/objects.php b/objects.php index 1c185f1..a557a0f 100644 --- a/objects.php +++ b/objects.php @@ -153,7 +153,7 @@ function strip_markups($str) { $this->outputbackground = '#eeee33'; $this->shadowbackground = '#777777'; $this->stylesheet = 'css.php'; - $this->logoimage1url = 'http://' . $_SERVER['HTTP_HOST'] . $baseDir; + $this->logoimage1url = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'] . $baseDir; $this->animate=false; } } diff --git a/show.php b/show.php index 1690414..d507eca 100644 --- a/show.php +++ b/show.php @@ -6,7 +6,7 @@ set_time_limit(0); // PDF generation can take a while if(!strlen($_SERVER['PATH_INFO'])) { - header('Location: http://'.$_SERVER['HTTP_HOST'].$baseDir); + header('Location: ' . $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$baseDir); exit; } diff --git a/slidelist.php b/slidelist.php index cbd784d..b8fcbef 100644 --- a/slidelist.php +++ b/slidelist.php @@ -37,7 +37,7 @@ window.opener.location=url } $lastSection = isset($v['section']) ? $v['section'] : ''; $lastChapter = isset($v['chapter']) ? $v['chapter'] : ''; - echo "".($k)."$spacer$v[title]\n"; + echo "".($k)."$spacer$v[title]\n"; } echo "\n"; ?>