summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authordeva <deva>2010-02-22 11:52:40 +0000
committerdeva <deva>2010-02-22 11:52:40 +0000
commit3a08ef9c94e6f5c92a7f3885fb316b53d13cfd5c (patch)
treee1ad608ffff5a7b0925b2aa1e6f76cff38e9826c /utils
parent23024cd1346f75acf38e1cef9536ac824380e4ed (diff)
Change xml format to use character data as description instead of attributes.
Diffstat (limited to 'utils')
-rw-r--r--utils/modules/events.php11
-rw-r--r--utils/modules/news.php7
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);