From 016eecebd8ed2b9a177b0c6a9d3d1371c36f6430 Mon Sep 17 00:00:00 2001
From: mmk2410 <marcelmichaelkapfer@yahoo.co.nz>
Date: Tue, 24 Feb 2015 23:05:30 +0100
Subject: [PATCH] Version 1.1

---
 index.php               | 43 +++++++++++++++++++++++++++++++++--------
 res/umlautconverter.php | 15 ++++++++++++++
 xml/posts.xml           |  7 +++++++
 3 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 res/umlautconverter.php

diff --git a/index.php b/index.php
index e8909aa..546bbbf 100644
--- a/index.php
+++ b/index.php
@@ -27,19 +27,25 @@
         <!--Set here the link to your Homepage or delete the following line-->
         <a href="../" class="home">Home</a>
     </div>
+    <!-- This is the Intro section. You can set your intro text in md/intro.md. In case you don't want an intro delete this whole section until the next comment-->
     <section>
         <span class="text">
             <?php
                 require_once 'res/Parsedown.php';
+                require_once 'res/umlautconverter.php';
                 if(file_exists('md/intro.md')){
                     $file = file_get_contents('md/intro.md');
-                    echo Parsedown::instance()
+                    $intro = Parsedown::instance()
                         ->setBreaksEnabled(true)
                         ->text($file);
+                    $UmlautConverter = new UmlautConverter;
+                    $intro = $UmlautConverter->convert($intro);
+                    echo $intro;
                 }
             ?>
         </span>
     </section>
+    <!-- In case you don't want a Intro section delete the above section-->
     <!--DON'T CHANGE ANYTHING HERE!-->
     <?php
         $xml = simplexml_load_file('xml/posts.xml');
@@ -50,19 +56,28 @@
         <section>
             <p class="texttitle">
         <?php
-            echo $post->title;
+            $title = $post->title;
+            $UmlautConverter = new UmlautConverter;
+            $title = $UmlautConverter->convert($title);
+            echo $title;
         ?>
             </p>
             <small>
         <?php
-            echo $post->pubdate;
+            $pubdate = $post->pubdate;
+            $UmlautConverter = new UmlautConverter;
+            $pubdate = $UmlautConverter->convert($pubdate);
+            echo $pubdate;
         ?>
             </small>
             <p class="text">
         <?php
-            echo Parsedown::instance()
+            $content = Parsedown::instance()
                 ->setBreaksEnabled(true)
                 ->text($post->content);
+            $UmlautConverter = new UmlautConverter;
+            $content = $UmlautConverter->convert($content);
+            echo $content;
         ?>
             </p>
             <p align="right">
@@ -71,11 +86,17 @@
         ?>
             <a class="button_white" target="_blank" href="
             <?php
-                echo $olb->otherurl;
+                $otherurl = $olb->otherurl;
+                $UmlautConverter = new UmlautConverter;
+                $otherurl = $UmlautConverter->convert($otherurl);
+                echo $otherurl;
             ?>
             ">
         <?php
-            echo $olb->otherlink;
+            $otherlink = $olb->otherlink;
+            $UmlautConverter = new UmlautConverter;
+            $otherlink = $UmlautConverter->convert($otherlink);
+            echo $otherlink;
         ?>
             </a>
         <?php
@@ -84,11 +105,17 @@
         ?>
                 <a class="button_color" target="_blank" href="
                    <?php
-                            echo $post->mainurl;
+                    $mainurl = $post->mainurl;
+                    $UmlautConverter = new UmlautConverter;
+                    $mainurl = $UmlautConverter->convert($mainurl);
+                    echo $mainurl;
                     ?>
                    ">
         <?php
-                 echo $post->mainlink;
+                $mainlink = $post->mainlink;
+                $UmlautConverter = new UmlautConverter;
+                $mainlink = $UmlautConverter->convert($mainlink);
+                echo $mainlink;
         ?>
                 </a>
         <?php } ?>
diff --git a/res/umlautconverter.php b/res/umlautconverter.php
new file mode 100644
index 0000000..2bf1b70
--- /dev/null
+++ b/res/umlautconverter.php
@@ -0,0 +1,15 @@
+<?php
+class UmlautConverter
+{
+    function convert($text)
+    {
+        $output = str_replace("ä","&auml;",$text);
+        $output = str_replace("Ä","&Auml;",$output);
+        $output = str_replace("ö","&ouml;",$output);
+        $output = str_replace("Ö","&Ouml;",$output);
+        $output = str_replace("ü","&uuml;",$output);
+        $output = str_replace("Ü","&Uuml;",$output);
+        $output = str_replace("ß","&szlig;",$output);
+        return $output;
+    }
+}
\ No newline at end of file
diff --git a/xml/posts.xml b/xml/posts.xml
index 6802986..fb584a4 100644
--- a/xml/posts.xml
+++ b/xml/posts.xml
@@ -1,5 +1,12 @@
 <?xml version='1.0' standalone='yes'?>
 <posts>
+    <post>
+        <title>Version 1.1</title>
+        <pubdate>24th February 2015</pubdate>
+        <content>
+After I published the Version 1.0 last sunday I realized some problems with german umlauts. Now I added a function that converts every umlaut (ü, Ü, ä, Ä, ö, Ö and ß) into the html code.
+        </content>
+    </post>
     <post>
         <title>Version 1.0</title>
         <pubdate>22nd February 2015</pubdate>