This commit was manufactured by cvs2svn to create tag 'Root_NewCommunity'.
diff --git a/_projectCommon.php b/_projectCommon.php
index 9449673..e14e99c 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -16,5 +16,4 @@
$Nav->addCustomNav("RCP Applications Catalogue", "/community/rcp.php", "_self", 1);
$Nav->addCustomNav("Repository Providers", "/community/team.php", "_self", 1);
$Nav->addCustomNav("Awards & opinions", "/community/awards.php", "_self", 1);
- $Nav->addCustomNav("Evangelism", "/evangelism/index.php", "_self", 1);
?>
diff --git a/events/scripts/events.php b/events/scripts/events.php
index 29f07bd..747586f 100644
--- a/events/scripts/events.php
+++ b/events/scripts/events.php
@@ -11,11 +11,7 @@
# and render as html, articles.
#
#****************************************************************************
-//require_once("events_xml.php");
-require_once("xml_simple.php");
-
-$events_web_root = "/community/events/";
-$events_doc_root = $_SERVER['DOCUMENT_ROOT'] . $events_web_root;
+require_once("events_xml.php");
function get_events_summary($count = 100) {
$html = "";
@@ -51,9 +47,8 @@
* next $count events that occur after the current date.
*/
function get_events_summary_for_community_page($count = 5) {
-
$html = "";
- $events = get_events();
+ $events = get_events($count);
usort($events, 'sort_events_by_date');
foreach ($events as $event) {
/*
@@ -113,16 +108,11 @@
} else {
$html .= date("F d, Y", $event->start_date);
}
- $image = '';
- if ($event->image) {
- $root = $GLOBALS['events_web_root'];
- $image="<a href=\"$event->link\"><img src=\"$root$event->image\" align=\"right\"></a>";
- }
$html .= " <a href=\"$event->link\">$event->name</a>";
if (strlen(trim($event->location)) > 0)
$html .= " ($event->location)";
if (strlen(trim($event->description)) > 0)
- $html .= "<blockquote>$image$event->description</blockquote>";
+ $html .= "<blockquote>$event->description</blockquote>";
$html .= "</li>";
}
return $html;
@@ -169,27 +159,6 @@
return $events;
}
-function & get_events() {
- $events_file = $GLOBALS['events_doc_root'] . "events.xml";
- $events_xml = load_xml_file($events_file);
- //$events_xml->dump();
- $events_xml = $events_xml->event;
- $events = array();
- foreach ($events_xml as $event_xml) {
- $event = new Event();
- $event->priority = $event_xml->priority[0]->text;
- $event->name = $event_xml->name[0]->text;
- $event->start_date = strtotime($event_xml->start_date[0]->text);
- $event->end_date = strtotime($event_xml->end_date[0]->text);
- $event->image = $event_xml->image[0]->text;
- $event->link = $event_xml->link[0]->text;
- $event->location = $event_xml->location[0]->text;
- $event->description = $event_xml->description[0]->text;
- array_push($events, $event);
- }
- return $events;
-}
-
function is_in_the_past(& $event) {
if ($event->end_date)
return $event->end_date < time();
@@ -203,7 +172,6 @@
var $description;
var $link;
var $location;
- var $image;
var $start_date;
var $end_date;
}
