Added markdown support in news and event descriptions.

2 files changed, 8 insertions, 3 deletions

diff --git a/utils/modules/events.php b/utils/modules/events.php
index f14622e..8be8f5e 100644
--- a/utils/modules/events.php
+++ b/utils/modules/events.php
@@ -2,6 +2,7 @@
 /* -*- Mode: php; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 include_once($UTIL_DIR . "/convert.php");
+include_once($UTIL_DIR . "/markdown.php");
 
 class Event {
   public $title;
@@ -26,12 +27,13 @@ class Event {
 		$icons = new Icons($ICONS_DIR."/");
 		$icon = $icons->icons[$this->flyer];
 
+    $content = Markdown(htmlspecialchars_decode($this->description));
+
 		$str = "<div class=\"event\">\n";
 		$str .= "  <div class=\"event_title\">" . 
 			htmlspecialchars_decode($this->title, ENT_QUOTES) . "</div>\n";
 		$str .= "  <div class=\"event_time\">" . date("D M jS Y", $this->time) . "</div>\n";
-		$str .= "  <div class=\"event_description\">" . 
-			htmlspecialchars_decode($this->description, ENT_QUOTES) . "</div>\n";
+		$str .= "  <div class=\"event_description\">" . $content . "</div>\n";
 		if($this->flyer) {
       $str .= "  <img class=\"event_flyer\" alt=\"flyer\" src=\"".$icon->prefix.$icon->file."\"/>\n";
     }
diff --git a/utils/modules/news.php b/utils/modules/news.php
index d7ad99c..9e542ae 100644
--- a/utils/modules/news.php
+++ b/utils/modules/news.php
@@ -5,6 +5,7 @@ include_once($UTIL_DIR . "/convert.php");
 include_once($UTIL_DIR . "/forms.php");
 include_once($UTIL_DIR . "/user.php");
 include_once($MODULES_DIR . "/icons.php");
+include_once($UTIL_DIR . "/markdown.php");
 
 class NewsEntry {
   public $title;
@@ -19,6 +20,8 @@ class NewsEntry {
 		global $users, $DATA_DIR, $ICONS_DIR;
 		if(!isset($users)) $users = new Users($DATA_DIR . "/users.xml");
 
+    $content = Markdown(htmlspecialchars_decode($this->description));
+
 		$icons = new Icons($ICONS_DIR."/");
 		$icon = $icons->icons[$this->icon];
 
@@ -29,7 +32,7 @@ class NewsEntry {
 		$str .= "  <div class=\"news_user\">By: " . $users->findUser($this->userid)->userid . "</div>\n";
 		$str .= "  <div class=\"news_description\">\n";
 		if($this->icon) $str .= "    <img alt=\"icon\" class=\"news_icon\" src=\"" . $icon->prefix.$icon->file . "\"/>\n";
-		$str .= "    ".htmlspecialchars_decode($this->description, ENT_QUOTES) . "\n";
+		$str .= "    ".$content. "\n";
 		$str .= "  </div>\n";
     $str .= "</div>\n";
     return $str;