Removes unuseful case

* Removes "^" to disable text decoration line-wise.
* CSS is no longer incorporated in the HTML page.
* Perform sanity checks against unauthorized file access.
* Properly close tags when the page exists in a non-null mode.
* Split HTML generation in two: parsing and translating.
* Create classes to handle gemtext parsing and translating.
* Create class to generate back gemtext (for future test cases).
* Fix: 404 doesn't occur for an empty file.
* Page 404 fully generated by HtmGem itself.

CHANGELOG.gmi

@@ -6,16 +6,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] v3
 * cgi-bin? Handle user input
-* Handle client certificates?
 * Page caching: don’t generate twice an unmodified file.
-* Separate project? Blog infrastructure with templates, style and RSS generator.
-* Proxy for remote and local servers.
 * Be able to move /htmgem anywhere and (for the Php part) outside the webbrowser scope.
 
 ## [Unreleased] v2
 
 ### Security
-* Check url encoding: The filename fetched on disk may differ from that was asked by URL.
 * Check unicode capability, UTF16 input, RTL/LTR, etc…
 * Manage different type of carriage return: CR CR/LF LF.
 
@@ -30,10 +26,9 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased] v1
 
 ### Security
-∅
+* Check url encoding: The filename fetched on disk may differ from that was asked by URL.
 
 ### Development
-* Command line API for script, testing, CI…
 * Automated tests like phpunit
 
 ### User interface

css/htmgem.css

@@ -95,7 +95,6 @@ a.mailto:before {
 }
 
 pre {
-    margin: 0 -1rem;
     overflow-x: auto;
 }
 

index.gmi

@@ -15,8 +15,8 @@ Gemini est un nouveau protocole internet qui :
 ```
 => https://gemini.circumlunar.space/
 
-=> https://framagit.org/Sbgodin/htmgem/-/archive/master/htmgem-master.zip Téléchargez htmgem-master.zip pour l’installer
+=> https://tildegit.org/sbgodin/HtmGem/archive/master.zip Téléchargez la branche courante pour l’installer
-=> https://framagit.org/Sbgodin/htmgem Code source, rapports de bug, commentaires…
+=> https://tildegit.org/Sbgodin/htmgem Code source, rapports de bug, commentaires…
 
 => https://gmi.sbgodin.fr/htmgem Page principale de HtmGem via le web
 => gemini://gmi.sbgodin.fr/htmgem Page principale de HtmGem via Gemini

index.php

@@ -27,7 +27,6 @@ $documentRoot = $_SERVER['DOCUMENT_ROOT'];
 $filePath = rtrim($_SERVER['DOCUMENT_ROOT'], "/")."/".ltrim($url, "/");
 
 switch(true) {
-    case false:
     case !realPath($filePath):
     case !preg_match("/\.gmi$/", $url): # not finishing by .gmi
     case strpos($filePath, $documentRoot)!==0: # not in web directory

lib-htmgem.php

@@ -107,50 +107,49 @@ class GemtextTranslate_gemtext {
     }
 
     protected function translate() {
-        ob_start();
+        $output = "";
         foreach ($this->parsedGemtext as $node) {
             $mode = $node["mode"];
             switch($mode) {
                 case "":
-                    echo $node["text"]."\n";
+                    $output .= $node["text"]."\n";
                     break;
                 case "*":
                     foreach ($node["texts"] as $text) {
-                        echo "* $text\n";
+                        $output .= "* $text\n";
                     }
                     break;
                 case "```":
-                    print("```\n");
+                    $output .= "```\n";
                     foreach ($node["texts"] as $text) {
-                        echo "$text\n";
+                        $output .= "$text\n";
                     }
-                    print("```\n");
+                    $output .= "```\n";
                     break;
                 case ">":
                     foreach ($node["texts"] as $text) {
-                        echo "> $text\n";
+                        $output .= "> $text\n";
                     }
                     break;
                 case "=>":
                     $linkText = $node["text"];
                     if (!empty($linkText)) $linkText = " $linkText";
-                    print("=> ".$node["link"].$linkText."\n");
+                    $output .= "=> ".$node["link"].$linkText."\n";
                     break;
                 case "#":
                 case "##":
                 case "###":
-                    print("$mode ".$node["title"]."\n");
+                    $output .= "$mode ".$node["title"]."\n";
                     break;
                 case "^^^":
-                    print("^^^\n");
+                    $output .= "^^^\n";
                     break;
                 default:
                     die("Unknown mode: '{$node["mode"]}'\n");
             }
         }
 
-        $this->translatedGemtext = ob_get_contents();
+        $this->translatedGemtext = $output;
-        ob_end_clean();
     }
 
     public function __toString() {
@@ -168,7 +167,7 @@ class GemtextTranslate_html {
     protected $pageTitle = "";
     public $translatedGemtext;
 
-    function __construct($parsedGemtext, $textDecorationEnabled=true) {
+    function __construct($parsedGemtext, $textDecoration=true) {
         if (empty($parsedGemtext))
             $parsedGemtext = "";
         elseif (is_string($parsedGemtext))
@@ -177,7 +176,7 @@ class GemtextTranslate_html {
             // The text must be parsed
             $parsedGemtext = gemtextParser($parsedGemtext);
         $this->parsedGemtext = $parsedGemtext;
-        $this->translate($textDecorationEnabled);
+        $this->translate($textDecoration);
     }
 
     function addCss($css) {
@@ -246,7 +245,7 @@ class GemtextTranslate_html {
     }
 
     public function translate($textDecoration=true) {
-        ob_start();
+        $output = "";
         foreach ($this->parsedGemtext as $node) {
             $mode = $node["mode"];
             switch($mode) {
@@ -254,27 +253,27 @@ class GemtextTranslate_html {
                     $text = $node["text"];
                     self::htmlPrepare($text);
                     if ($textDecoration) self::addTextDecoration($text);
-                    echo "<p>$text</p>\n";
+                    $output .= "<p>$text</p>\n";
                     break;
                 case "*":
-                    echo "<ul>\n";
+                    $output .= "<ul>\n";
                     foreach ($node["texts"] as $text) {
                         self::htmlPrepare($text);
                         if ($textDecoration) self::addTextDecoration($text);
-                        print("<li>$text\n");
+                        $output .= "<li>$text\n";
                     }
-                    echo "</ul>\n";
+                    $output .= "</ul>\n";
                     break;
                 case "```":
                     $text = implode("\n", $node["texts"]);
                     self::htmlPrepare($text);
-                    echo "<pre>\n$text\n</pre>\n";
+                    $output .= "<pre>\n$text\n</pre>\n";
                     break;
                 case ">":
                     $text = implode("\n", $node["texts"]);
                     self::htmlPrepare($text);
                     if ($textDecoration) self::addTextDecoration($text);
-                    echo "<blockquote>\n$text\n</blockquote>\n";
+                    $output .= "<blockquote>\n$text\n</blockquote>\n";
                     break;
                 case "=>":
                     $link = $node["link"];
@@ -289,34 +288,33 @@ class GemtextTranslate_html {
                     preg_match("/^([^:]+):/", $link, $matches);
                     $protocol = @$matches[1];
                     if (empty($protocol)) $protocol = "local";
-                    echo "<p><a class='$protocol' href='$link'>$linkText</a></p>\n";
+                    $output .= "<p><a class='$protocol' href='$link'>$linkText</a></p>\n";
                     break;
                 case "#":
                     $title = $node["title"];
                     self::htmlPrepare($title);
                     if (empty($this->pageTitle)) $this->pageTitle = $title;
-                    echo "<h1>$title</h1>\n";
+                    $output .= "<h1>$title</h1>\n";
                     break;
                 case "##":
                     $title = $node["title"];
                     self::htmlPrepare($title);
-                    echo "<h2>$title</h2>\n";
+                    $output .= "<h2>$title</h2>\n";
                     break;
                 case "###":
                     $title = $node["title"];
                     self::htmlPrepare($title);
-                    echo "<h3>$title</h3>\n";
+                    $output .= "<h3>$title</h3>\n";
                     break;
                 case "^^^":
-                    $this->textDecorationEnabled = !$this->textDecorationEnabled;
+                    $textDecoration = !$textDecoration;
                     break;
                 default:
                     die("Unknown mode: '{$node["mode"]}'\n");
             }
         }
 
-        $this->translatedGemtext = ob_get_contents();
+        $this->translatedGemtext = $output;
-        ob_end_clean();
     }
 
     function getFullHtml() {
@@ -324,7 +322,7 @@ class GemtextTranslate_html {
             $css = array("/htmgem/css/htmgem.css");
         else
             $css = $this->cssList;
-        echo <<<EOL
+        $output = <<<EOL
 <!DOCTYPE html>
 <html>
 <head>
@@ -332,14 +330,16 @@ class GemtextTranslate_html {
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 EOL;
         foreach ($css as $c) {
-            echo "<link type='text/css' rel='StyleSheet' href='$c'>\n";
+            $output .= "<link type='text/css' rel='StyleSheet' href='$c'>\n";
         }
-        echo <<<EOL
+        $output .= <<<EOL
 </head>
 <body>\n
 EOL;
-        echo $this->translatedGemtext;
+        $output .= $this->translatedGemtext;
-        echo "</body>\n</html>\n";
+        $output .= "</body>\n</html>\n";
+
+        echo $output;
     }
 
     public function __toString() {