Merge pull request 'Fix of a bug introduced with PR #3' (#4) from rdelaage/ergol-http:main into main

Reviewed-on: https://codeberg.org/adele.work/ergol-http/pulls/4
This commit is contained in:
Adële 2021-05-24 13:27:05 +02:00
commit b540ee31e4
1 changed files with 10 additions and 1 deletions

View File

@ -276,6 +276,15 @@ exit;
function gmi2html($capsule, $body, $lang, $urlgem, $favicon) function gmi2html($capsule, $body, $lang, $urlgem, $favicon)
{ {
if(isset($_SERVER['REQUEST_SCHEME'])) {
$scheme = $_SERVER['REQUEST_SCHEME'];
}
else if(isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS'])) {
$scheme = 'https';
}
else {
$scheme = 'http';
}
$title=''; $title='';
$lines=array(); $lines=array();
$tocs=array(); $tocs=array();
@ -344,7 +353,7 @@ function gmi2html($capsule, $body, $lang, $urlgem, $favicon)
case "=>": case "=>":
$lines[]='<p>'; $lines[]='<p>';
$link = explode(' ', substr($line,3), 2); $link = explode(' ', substr($line,3), 2);
$lines[] = '<a href="'.str_replace('gemini://'.$capsule,isset($_SERVER["REQUEST_SCHEME"])?$_SERVER["REQUEST_SCHEME"]:"http".'://'.$capsule, $link[0]).'">'.htmlentities(empty($link[1])?rawurldecode($link[0]):$link[1])."</a>"; $lines[] = '<a href="'.str_replace('gemini://'.$capsule,$scheme.'://'.$capsule, $link[0]).'">'.htmlentities(empty($link[1])?rawurldecode($link[0]):$link[1])."</a>";
if(strpos($link[0], '://')===false && // relative image if(strpos($link[0], '://')===false && // relative image
in_array(strtolower(substr($link[0],-4)),array('.jpg','.png','.gif','jpeg','webp')) ) in_array(strtolower(substr($link[0],-4)),array('.jpg','.png','.gif','jpeg','webp')) )
$lines[] = ' 🖼️ <div class="inline-img"><img src="'.$link[0].'" alt="'.htmlentities(empty($link[1])?rawurldecode($link[0]):$link[1]).'" /></div>'; $lines[] = ' 🖼️ <div class="inline-img"><img src="'.$link[0].'" alt="'.htmlentities(empty($link[1])?rawurldecode($link[0]):$link[1]).'" /></div>';