Change xml format to use character data as description instead of attributes.

2 files changed, 8 insertions, 10 deletions

diff --git a/utils/modules/events.php b/utils/modules/events.php
index bbe7d4f..cf04734 100644
--- a/utils/modules/events.php
+++ b/utils/modules/events.php
@@ -18,9 +18,8 @@ class Event {
 		fwrite($fp, "  <event title=\"" .
 					 htmlspecialchars($this->title, ENT_QUOTES, "UTF-8") . "\"\n");
 		fwrite($fp, "         time=\"" . $this->time . "\"\n");
-		fwrite($fp, "         description=\"" .
-					 htmlspecialchars($this->description, ENT_QUOTES, "UTF-8") . "\"\n");
-		fwrite($fp, "         flyer=\"" . $this->flyer . "\">\n");
+		fwrite($fp, "         flyer=\"" . $this->flyer . "\">");
+		fwrite($fp, htmlspecialchars($this->description, ENT_QUOTES, "UTF-8"));
 		fwrite($fp, "  </event>\n");
 	}
 
@@ -392,9 +391,9 @@ class Events {
 
     foreach ($params as $param) {
       $event = new Event($param->getAttribute('title'),
-			 $param->getAttribute('time'),
-			 $param->getAttribute('description'),
-			 $param->getAttribute('flyer'));
+												 $param->getAttribute('time'),
+												 $param->textContent,
+												 $param->getAttribute('flyer'));
       $this->add($event);
     }
   }
diff --git a/utils/modules/news.php b/utils/modules/news.php
index 57e9da7..0f4318c 100644
--- a/utils/modules/news.php
+++ b/utils/modules/news.php
@@ -56,9 +56,8 @@ class NewsEntry {
 		fwrite($fp, "             time=\"" . $this->time . "\"\n");
 		fwrite($fp, "             category=\"" . $this->category . "\"\n");
 		fwrite($fp, "             userid=\"" . $this->userid . "\"\n");
-		fwrite($fp, "             icon=\"" . $this->icon . "\"\n");
-		fwrite($fp, "             description=\"" .
-					 htmlspecialchars($this->description, ENT_QUOTES, "UTF-8") . "\">\n");
+		fwrite($fp, "             icon=\"" . $this->icon . "\">");
+		fwrite($fp, htmlspecialchars($this->description, ENT_QUOTES, "UTF-8"));
 		fwrite($fp, "  </newsentry>\n");
 	}
 
@@ -366,7 +365,7 @@ class News {
       $newsentry = new NewsEntry($param->getAttribute('title'),
 																 $param->getAttribute('time'),
 																 $param->getAttribute('category'),
-																 $param->getAttribute('description'),
+																 $param->textContent,
 																 $param->getAttribute('userid'),
 																 $param->getAttribute('icon'));
       $this->add($newsentry);