';
+ }
+ $output .= event_format_date($node->event_start, 'custom', "d/m/Y") . ' ('. $node->event['timeleft'] .')';
+ $output .= l($node->terms . $node->title, "node/$node->nid", array('title' => $node->title ));
+ if (count($types) > 1) {
+ $output .= '
('. $node->event['node_type'] .')';
+ }
+ if(strlen(trim($node->teaser))>0 && strcasecmp(trim($node->teaser),"
") !=0 ){
+ $output .= '
'. $node->teaser .'';
+ }
+ if ($node->event_active === FALSE){
+ $output .='
';
+ }
+ $output .= '
';
+ return $output;
+
+
+ }
/**
* Format the upcoming event block for event calendars
Index: event_database.mysql.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/event/event_database.mysql.inc,v
retrieving revision 1.12
diff -u -r1.12 event_database.mysql.inc
--- event_database.mysql.inc 3 Dec 2007 14:38:48 -0000 1.12
+++ event_database.mysql.inc 15 Feb 2008 22:12:34 -0000
@@ -115,7 +115,7 @@
*/
function event_get_events_upcoming($time, $types, $limit, $rewrite_parameter = array()) {
$placeholders = implode(',', array_fill(0, count($types), "'%s'"));
- $query = "SELECT n.nid, n.uid, n.title, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, TIMEDIFF(e.event_start, '%s') AS time_left, DATEDIFF(e.event_start, '%s') AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + INTERVAL %d SECOND)) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
+ $query = "SELECT n.nid, n.uid, n.title, nr.body, nr.teaser, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, TIMEDIFF(e.event_start, '%s') AS time_left, DATEDIFF(e.event_start, '%s') AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid INNER JOIN {node_revisions} nr ON n.nid = nr.nid and n.vid = nr.vid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + INTERVAL %d SECOND)) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
return db_query_range(db_rewrite_sql($query, 'n', 'nid', array_merge(array('event' => TRUE, 'event_get_events' => TRUE, 'event_get_events_upcoming' => TRUE, 'event_types' => $types), $rewrite_parameter)), array_merge(array($time, $time, $time, $time, $time, (60 * 60 * 2), $time), $types), 0, $limit);
}
Index: event_database.mysqli.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/event/event_database.mysqli.inc,v
retrieving revision 1.12
diff -u -r1.12 event_database.mysqli.inc
--- event_database.mysqli.inc 3 Dec 2007 14:38:48 -0000 1.12
+++ event_database.mysqli.inc 15 Feb 2008 22:35:53 -0000
@@ -115,7 +115,7 @@
*/
function event_get_events_upcoming($time, $types, $limit, $rewrite_parameter = array()) {
$placeholders = implode(',', array_fill(0, count($types), "'%s'"));
- $query = "SELECT n.nid, n.uid, n.title, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, TIMEDIFF(e.event_start, '%s') AS time_left, DATEDIFF(e.event_start, '%s') AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + INTERVAL %d SECOND)) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
+ $query = "SELECT n.nid, n.uid, n.title, nr.body, nr.teaser, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, TIMEDIFF(e.event_start, '%s') AS time_left, DATEDIFF(e.event_start, '%s') AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid INNER JOIN {node_revisions} nr ON n.nid = nr.nid and n.vid = nr.vid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + INTERVAL %d SECOND)) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
return db_query_range(db_rewrite_sql($query, 'n', 'nid', array_merge(array('event' => TRUE, 'event_get_events' => TRUE, 'event_get_events_upcoming' => TRUE, 'event_types' => $types), $rewrite_parameter)), array_merge(array($time, $time, $time, $time, $time, (60 * 60 * 2), $time), $types), 0, $limit);
}
Index: event_database.pgsql.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/event/event_database.pgsql.inc,v
retrieving revision 1.12
diff -u -r1.12 event_database.pgsql.inc
--- event_database.pgsql.inc 3 Dec 2007 14:38:48 -0000 1.12
+++ event_database.pgsql.inc 15 Feb 2008 22:38:35 -0000
@@ -115,7 +115,7 @@
*/
function event_get_events_upcoming($time, $types, $limit, $rewrite_parameter = array()) {
$placeholders = implode(',', array_fill(0, count($types), "'%s'"));
- $query = "SELECT n.nid, n.title, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, extract('day' from event_start - '%s')*24 + cast(substring(cast(event_start - '%s' as varchar) from ' (..):') as integer) || substring(cast(event_start - '%s' as varchar) from ' ..(:..:..)') as time_left, 0 AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + '%d seconds')) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
+ $query = "SELECT n.nid, n.title, nr.body, nr.teaser, n.type, n.status, n.changed, e.event_start, e.event_end, e.timezone, e.has_time, e.has_end_date, extract('day' from event_start - '%s')*24 + cast(substring(cast(event_start - '%s' as varchar) from ' (..):') as integer) || substring(cast(event_start - '%s' as varchar) from ' ..(:..:..)') as time_left, 0 AS days_left FROM {node} n INNER JOIN {event} e ON n.nid = e.nid INNER JOIN {node_revisions} nr ON n.nid = nr.nid and n.vid = nr.vid WHERE n.status = 1 AND (((e.event_start != e.event_end) AND ('%s' >= e.event_start AND '%s' < e.event_end)) OR ((e.event_start = e.event_end) AND ('%s' <= e.event_start + '%d seconds')) OR e.event_start >= '%s') AND n.type IN ($placeholders) ORDER BY event_start";
return db_query_range(db_rewrite_sql($query, 'n', 'nid', array_merge(array('event' => TRUE, 'event_get_events' => TRUE, 'event_get_events_upcoming' => TRUE, 'event_types' => $types), $rewrite_parameter)), array_merge(array($time, $time, $time, $time, $time, $time, $time, $time, (60 * 60 * 2), $time), $types), 0, $limit);
}