more standards work

This commit is contained in:
rabuzarus 2017-03-18 04:41:54 +01:00
parent e1d22ef5d4
commit 497df57ef7
2 changed files with 225 additions and 168 deletions

View File

@ -4,39 +4,42 @@
* @brief functions specific to event handling * @brief functions specific to event handling
*/ */
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/map.php'); require_once 'include/map.php';
require_once('include/datetime.php'); require_once 'include/datetime.php';
function format_event_html($ev, $simple = false) { function format_event_html($ev, $simple = false) {
if(! ((is_array($ev)) && count($ev))) if(! ((is_array($ev)) && count($ev))) {
return ''; return '';
}
$bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM $bd_format = t('l F d, Y \@ g:i A') ; // Friday January 18, 2011 @ 8 AM
$event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $event_start = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$ev['start'] , $bd_format )) $ev['start'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC', : day_translate(datetime_convert('UTC', 'UTC',
$ev['start'] , $bd_format))); $ev['start'] , $bd_format)));
$event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(), $event_end = (($ev['adjust']) ? day_translate(datetime_convert('UTC', date_default_timezone_get(),
$ev['finish'] , $bd_format )) $ev['finish'] , $bd_format ))
: day_translate(datetime_convert('UTC', 'UTC', : day_translate(datetime_convert('UTC', 'UTC',
$ev['finish'] , $bd_format ))); $ev['finish'] , $bd_format )));
if ($simple) { if ($simple) {
$o = "<h3>".bbcode($ev['summary'])."</h3>"; $o = "<h3>" . bbcode($ev['summary']) . "</h3>";
$o .= "<p>".bbcode($ev['desc'])."</p>"; $o .= "<p>" . bbcode($ev['desc']) . "</p>";
$o .= "<h4>".t('Starts:')."</h4><p>".$event_start."</p>"; $o .= "<h4>" . t('Starts:') . "</h4><p>" . $event_start . "</p>";
if(! $ev['nofinish']) if (! $ev['nofinish']) {
$o .= "<h4>".t('Finishes:')."</h4><p>".$event_end."</p>"; $o .= "<h4>" . t('Finishes:') . "</h4><p>" . $event_end ."</p>";
}
if(strlen($ev['location'])) if (strlen($ev['location'])) {
$o .= "<h4>".t('Location:')."</h4><p>".$ev['location']."</p>"; $o .= "<h4>" . t('Location:') . "</h4><p>" . $ev['location'] . "</p>";
}
return $o; return $o;
} }
@ -44,31 +47,34 @@ function format_event_html($ev, $simple = false) {
$o = '<div class="vevent">' . "\r\n"; $o = '<div class="vevent">' . "\r\n";
$o .= '<p class="summary event-summary">' . bbcode($ev['summary']) . '</p>' . "\r\n"; $o .= '<p class="summary event-summary">' . bbcode($ev['summary']) . '</p>' . "\r\n";
$o .= '<p class="description event-description">' . bbcode($ev['desc']) . '</p>' . "\r\n"; $o .= '<p class="description event-description">' . bbcode($ev['desc']) . '</p>' . "\r\n";
$o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="' $o .= '<p class="event-start">' . t('Starts:') . ' <abbr class="dtstart" title="'
. datetime_convert('UTC','UTC',$ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'.$event_start . '" >'.$event_start
. '</abbr></p>' . "\r\n"; . '</abbr></p>' . "\r\n";
if(! $ev['nofinish']) if (! $ev['nofinish']) {
$o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="' $o .= '<p class="event-end" >' . t('Finishes:') . ' <abbr class="dtend" title="'
. datetime_convert('UTC','UTC',$ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' )) . datetime_convert('UTC', 'UTC', $ev['finish'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
. '" >'.$event_end . '" >'.$event_end
. '</abbr></p>' . "\r\n"; . '</abbr></p>' . "\r\n";
}
if(strlen($ev['location'])){ if (strlen($ev['location'])) {
$o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">' $o .= '<p class="event-location"> ' . t('Location:') . ' <span class="location">'
. bbcode($ev['location']) . bbcode($ev['location'])
. '</span></p>' . "\r\n"; . '</span></p>' . "\r\n";
if (strpos($ev['location'], "[map") !== False) { // Include a map of the location if the [map] BBCode is used
if (strpos($ev['location'], "[map") !== false) {
$map = generate_named_map($ev['location']); $map = generate_named_map($ev['location']);
if ($map!==$ev['location']) $o.=$map; if ($map !== $ev['location']) {
$o.= $map;
}
} }
} }
$o .= '</div>' . "\r\n"; $o .= '</div>' . "\r\n";
@ -146,63 +152,81 @@ function format_event_bbcode($ev) {
$o = ''; $o = '';
if($ev['summary']) if ($ev['summary']) {
$o .= '[event-summary]' . $ev['summary'] . '[/event-summary]'; $o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
}
if($ev['desc']) if ($ev['desc']) {
$o .= '[event-description]' . $ev['desc'] . '[/event-description]'; $o .= '[event-description]' . $ev['desc'] . '[/event-description]';
}
if($ev['start']) if ($ev['start']) {
$o .= '[event-start]' . $ev['start'] . '[/event-start]'; $o .= '[event-start]' . $ev['start'] . '[/event-start]';
}
if(($ev['finish']) && (! $ev['nofinish'])) if (($ev['finish']) && (! $ev['nofinish'])) {
$o .= '[event-finish]' . $ev['finish'] . '[/event-finish]'; $o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
}
if($ev['location']) if ($ev['location']) {
$o .= '[event-location]' . $ev['location'] . '[/event-location]'; $o .= '[event-location]' . $ev['location'] . '[/event-location]';
}
if($ev['adjust']) if ($ev['adjust']) {
$o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]'; $o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]';
}
return $o; return $o;
} }
function bbtovcal($s) { function bbtovcal($s) {
$o = ''; $o = '';
$ev = bbtoevent($s); $ev = bbtoevent($s);
if($ev['desc'])
if ($ev['desc']) {
$o = format_event_html($ev); $o = format_event_html($ev);
}
return $o; return $o;
} }
function bbtoevent($s) { function bbtoevent($s) {
$ev = array(); $ev = array();
$match = ''; $match = '';
if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match)) if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match)) {
$ev['summary'] = $match[1]; $ev['summary'] = $match[1];
$match = ''; }
if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
$ev['desc'] = $match[1];
$match = '';
if(preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match))
$ev['start'] = $match[1];
$match = '';
if(preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match))
$ev['finish'] = $match[1];
$match = '';
if(preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match))
$ev['location'] = $match[1];
$match = '';
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
$ev['adjust'] = $match[1];
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
return $ev;
$match = '';
if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match)) {
$ev['desc'] = $match[1];
}
$match = '';
if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match)) {
$ev['start'] = $match[1];
}
$match = '';
if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match)) {
$ev['finish'] = $match[1];
}
$match = '';
if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match)) {
$ev['location'] = $match[1];
}
$match = '';
if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) {
$ev['adjust'] = $match[1];
}
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
return $ev;
} }
@ -212,21 +236,22 @@ function sort_by_date($a) {
return $a; return $a;
} }
function ev_compare($a,$b) { function ev_compare($a,$b) {
$date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']); $date_a = (($a['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $a['start']) : $a['start']);
$date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']); $date_b = (($b['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $b['start']) : $b['start']);
if($date_a === $date_b) if ($date_a === $date_b) {
return strcasecmp($a['desc'],$b['desc']); return strcasecmp($a['desc'], $b['desc']);
}
return strcmp($date_a,$date_b); return strcmp($date_a, $date_b);
} }
function event_delete($event_id) { function event_delete($event_id) {
if ($event_id == 0) if ($event_id == 0) {
return; return;
}
q("DELETE FROM `event` WHERE `id` = %d", intval($event_id)); q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
logger("Deleted event ".$event_id, LOGGER_DEBUG); logger("Deleted event ".$event_id, LOGGER_DEBUG);
@ -234,37 +259,39 @@ function event_delete($event_id) {
function event_store($arr) { function event_store($arr) {
require_once('include/datetime.php'); require_once 'include/datetime.php';
require_once('include/items.php'); require_once 'include/items.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
$a = get_app(); $a = get_app();
$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert()); $arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
$arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert()); $arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
$arr['type'] = (($arr['type']) ? $arr['type'] : 'event' ); $arr['type'] = (($arr['type']) ? $arr['type'] : 'event' );
$arr['cid'] = ((intval($arr['cid'])) ? intval($arr['cid']) : 0); $arr['cid'] = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
$arr['uri'] = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid'])); $arr['uri'] = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(), $arr['uid']));
$arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0); $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
$arr['guid'] = get_guid(32); $arr['guid'] = get_guid(32);
if($arr['cid']) if($arr['cid']) {
$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['cid']), intval($arr['cid']),
intval($arr['uid']) intval($arr['uid'])
); );
else } else {
$c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1", $c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($arr['uid']) intval($arr['uid'])
); );
}
if(count($c)) if (dbm::is_result($c)) {
$contact = $c[0]; $contact = $c[0];
}
// Existing event being modified // Existing event being modified
if($arr['id']) { if ($arr['id']) {
// has the event actually changed? // has the event actually changed?
@ -272,7 +299,7 @@ function event_store($arr) {
intval($arr['id']), intval($arr['id']),
intval($arr['uid']) intval($arr['uid'])
); );
if((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) { if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
// Nothing has changed. Grab the item id to return. // Nothing has changed. Grab the item id to return.
@ -280,7 +307,7 @@ function event_store($arr) {
intval($arr['id']), intval($arr['id']),
intval($arr['uid']) intval($arr['uid'])
); );
return((dbm::is_result($r)) ? $r[0]['id'] : 0); return ((dbm::is_result($r)) ? $r[0]['id'] : 0);
} }
// The event changed. Update it. // The event changed. Update it.
@ -318,7 +345,6 @@ function event_store($arr) {
$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>'; $object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
$object .= '</object>' . "\n"; $object .= '</object>' . "\n";
q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d", q("UPDATE `item` SET `body` = '%s', `object` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc(format_event_bbcode($arr)), dbesc(format_event_bbcode($arr)),
dbesc($object), dbesc($object),
@ -328,8 +354,9 @@ function event_store($arr) {
); );
$item_id = $r[0]['id']; $item_id = $r[0]['id'];
} else } else {
$item_id = 0; $item_id = 0;
}
call_hooks("event_updated", $arr['id']); call_hooks("event_updated", $arr['id']);
@ -366,8 +393,9 @@ function event_store($arr) {
dbesc($arr['uri']), dbesc($arr['uri']),
intval($arr['uid']) intval($arr['uid'])
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$event = $r[0]; $event = $r[0];
}
$item_arr = array(); $item_arr = array();
@ -399,7 +427,7 @@ function event_store($arr) {
$item_arr['body'] = format_event_bbcode($event); $item_arr['body'] = format_event_bbcode($event);
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>'; $item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>'; $item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
$item_arr['object'] .= '</object>' . "\n"; $item_arr['object'] .= '</object>' . "\n";
@ -412,7 +440,7 @@ function event_store($arr) {
// $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id; // $plink = App::get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
if($item_id) { if ($item_id) {
//q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d", //q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d",
// dbesc($plink), // dbesc($plink),
// intval($event['id']), // intval($event['id']),
@ -433,12 +461,17 @@ function event_store($arr) {
} }
function get_event_strings() { function get_event_strings() {
// First day of the week (0 = Sunday) // First day of the week (0 = Sunday)
$firstDay = get_pconfig(local_user(),'system','first_day_of_week'); $firstDay = get_pconfig(local_user(),'system', 'first_day_of_week');
if ($firstDay === false) $firstDay=0; if ($firstDay === false) {
$firstDay = 0;
}
$i18n = array( $i18n = array(
"firstDay" => $firstDay, "firstDay" => $firstDay,
"allday" => t("all-day"),
"Sun" => t("Sun"), "Sun" => t("Sun"),
"Mon" => t("Mon"), "Mon" => t("Mon"),
"Tue" => t("Tue"), "Tue" => t("Tue"),
@ -446,13 +479,15 @@ function get_event_strings() {
"Thu" => t("Thu"), "Thu" => t("Thu"),
"Fri" => t("Fri"), "Fri" => t("Fri"),
"Sat" => t("Sat"), "Sat" => t("Sat"),
"Sunday" => t("Sunday"),
"Monday" => t("Monday"), "Sunday" => t("Sunday"),
"Tuesday" => t("Tuesday"), "Monday" => t("Monday"),
"Tuesday" => t("Tuesday"),
"Wednesday" => t("Wednesday"), "Wednesday" => t("Wednesday"),
"Thursday" => t("Thursday"), "Thursday" => t("Thursday"),
"Friday" => t("Friday"), "Friday" => t("Friday"),
"Saturday" => t("Saturday"), "Saturday" => t("Saturday"),
"Jan" => t("Jan"), "Jan" => t("Jan"),
"Feb" => t("Feb"), "Feb" => t("Feb"),
"Mar" => t("Mar"), "Mar" => t("Mar"),
@ -465,47 +500,49 @@ function get_event_strings() {
"Oct" => t("Oct"), "Oct" => t("Oct"),
"Nov" => t("Nov"), "Nov" => t("Nov"),
"Dec" => t("Dec"), "Dec" => t("Dec"),
"January" => t("January"),
"February" => t("February"), "January" => t("January"),
"March" => t("March"), "February" => t("February"),
"April" => t("April"), "March" => t("March"),
"May" => t("May"), "April" => t("April"),
"June" => t("June"), "May" => t("May"),
"July" => t("July"), "June" => t("June"),
"August" => t("August"), "July" => t("July"),
"August" => t("August"),
"September" => t("September"), "September" => t("September"),
"October" => t("October"), "October" => t("October"),
"November" => t("November"), "November" => t("November"),
"December" => t("December"), "December" => t("December"),
"today" => t("today"), "today" => t("today"),
"month" => t("month"), "month" => t("month"),
"week" => t("week"), "week" => t("week"),
"day" => t("day"), "day" => t("day"),
"allday" => t("all-day"),
"noevent" => t("No events to display"), "noevent" => t("No events to display"),
"dtstart_label" => t("Starts:"), "dtstart_label" => t("Starts:"),
"dtend_label" => t("Finishes:"), "dtend_label" => t("Finishes:"),
"location_label" => t("Location:") "location_label" => t("Location:")
); );
return $i18n; return $i18n;
} }
/// @todo We should replace this with a separate update function if there is some time left
/** /**
* @brief Removes duplicated birthday events * @brief Removes duplicated birthday events
* *
* @param array $dates Array of possibly duplicated events * @param array $dates Array of possibly duplicated events
* @return array Cleaned events * @return array Cleaned events
*
* @todo We should replace this with a separate update function if there is some time left
*/ */
function event_remove_duplicates($dates) { function event_remove_duplicates($dates) {
$dates2 = array(); $dates2 = array();
foreach ($dates AS $date) { foreach ($dates AS $date) {
if ($date['type'] == 'birthday') { if ($date['type'] == 'birthday') {
$dates2[$date['uid']."-".$date['cid']."-".$date['start']] = $date; $dates2[$date['uid'] . "-" . $date['cid'] . "-" . $date['start']] = $date;
} else { } else {
$dates2[] = $date; $dates2[] = $date;
} }
@ -524,10 +561,11 @@ function event_remove_duplicates($dates) {
*/ */
function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') { function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
// ownly allow events if there is a valid owner_id // ownly allow events if there is a valid owner_id
if($owner_uid == 0) if ($owner_uid == 0) {
return; return;
}
// query for the event by event id // Query for the event by event id
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@ -556,11 +594,12 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
* @return array Query results * @return array Query results
*/ */
function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') { function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
// ownly allow events if there is a valid owner_id // Only allow events if there is a valid owner_id
if($owner_uid == 0) if($owner_uid == 0) {
return; return;
}
// query for the event by date // Query for the event by date
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
@ -602,13 +641,12 @@ function process_events($arr) {
$d = day_translate($d); $d = day_translate($d);
$start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'c') : datetime_convert('UTC', 'UTC', $rr['start'], 'c')); $start = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'c') : datetime_convert('UTC', 'UTC', $rr['start'], 'c'));
if ($rr['nofinish']){ if ($rr['nofinish']) {
$end = null; $end = null;
} else { } else {
$end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['finish'], 'c') : datetime_convert('UTC', 'UTC', $rr['finish'], 'c')); $end = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['finish'], 'c') : datetime_convert('UTC', 'UTC', $rr['finish'], 'c'));
} }
$is_first = ($d !== $last_date); $is_first = ($d !== $last_date);
$last_date = $d; $last_date = $d;
@ -630,20 +668,20 @@ function process_events($arr) {
$rr['desc'] = bbcode($rr['desc']); $rr['desc'] = bbcode($rr['desc']);
$rr['location'] = bbcode($rr['location']); $rr['location'] = bbcode($rr['location']);
$events[] = array( $events[] = array(
'id'=>$rr['id'], 'id' => $rr['id'],
'start'=> $start, 'start' => $start,
'end' => $end, 'end' => $end,
'allDay' => false, 'allDay' => false,
'title' => $title, 'title' => $title,
'j' => $j, 'j' => $j,
'd' => $d, 'd' => $d,
'edit' => $edit, 'edit' => $edit,
'drop' => $drop, 'drop' => $drop,
'is_first'=>$is_first, 'is_first' => $is_first,
'item'=>$rr, 'item' => $rr,
'html'=>$html, 'html' => $html,
'plink' => array($rr['plink'], t('link to source'), '', ''), 'plink' => array($rr['plink'], t('link to source'), '', ''),
); );
} }
} }
@ -661,34 +699,36 @@ function process_events($arr) {
* @return string Content according to selected export format * @return string Content according to selected export format
*/ */
function event_format_export ($events, $format = 'ical', $timezone) { function event_format_export ($events, $format = 'ical', $timezone) {
if(! ((is_array($events)) && count($events))) if(! ((is_array($events)) && count($events))) {
return; return;
}
switch ($format) { switch ($format) {
// format the exported data as a CSV file // Format the exported data as a CSV file
case "csv": case "csv":
header("Content-type: text/csv"); header("Content-type: text/csv");
$o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL; $o = '"Subject", "Start Date", "Start Time", "Description", "End Date", "End Time", "Location"' . PHP_EOL;
foreach ($events as $event) { foreach ($events as $event) {
/// @todo the time / date entries don't include any information about the /// @todo The time / date entries don't include any information about the
// timezone the event is scheduled in :-/ /// timezone the event is scheduled in :-/
$tmp1 = strtotime($event['start']); $tmp1 = strtotime($event['start']);
$tmp2 = strtotime($event['finish']); $tmp2 = strtotime($event['finish']);
$time_format = "%H:%M:%S"; $time_format = "%H:%M:%S";
$date_format = "%Y-%m-%d"; $date_format = "%Y-%m-%d";
$o .= '"'.$event['summary'].'", "'.strftime($date_format, $tmp1) .
'", "'.strftime($time_format, $tmp1).'", "'.$event['desc'] . $o .= '"' . $event['summary'] . '", "' . strftime($date_format, $tmp1) .
'", "'.strftime($date_format, $tmp2) . '", "' . strftime($time_format, $tmp1) . '", "' . $event['desc'] .
'", "'.strftime($time_format, $tmp2) . '", "' . strftime($date_format, $tmp2) .
'", "'.$event['location'].'"' . PHP_EOL; '", "' . strftime($time_format, $tmp2) .
'", "' . $event['location'] . '"' . PHP_EOL;
} }
break; break;
// format the exported data as a ics file // Format the exported data as a ics file
case "ical": case "ical":
header("Content-type: text/ics"); header("Content-type: text/ics");
$o = 'BEGIN:VCALENDAR'. PHP_EOL $o = 'BEGIN:VCALENDAR' . PHP_EOL
. 'VERSION:2.0' . PHP_EOL . 'VERSION:2.0' . PHP_EOL
. 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL; . 'PRODID:-//friendica calendar export//0.1//EN' . PHP_EOL;
/// @todo include timezone informations in cases were the time is not in UTC /// @todo include timezone informations in cases were the time is not in UTC
@ -700,35 +740,43 @@ function event_format_export ($events, $format = 'ical', $timezone) {
// but test your solution against http://icalvalid.cloudapp.net/ // but test your solution against http://icalvalid.cloudapp.net/
// also long lines SHOULD be split at 75 characters length // also long lines SHOULD be split at 75 characters length
foreach ($events as $event) { foreach ($events as $event) {
if ($event['adjust'] == 1) { if ($event['adjust'] == 1) {
$UTC = 'Z'; $UTC = 'Z';
} else { } else {
$UTC = ''; $UTC = '';
} }
$o .= 'BEGIN:VEVENT' . PHP_EOL; $o .= 'BEGIN:VEVENT' . PHP_EOL;
if ($event[start]) {
if ($event['start']) {
$tmp = strtotime($event['start']); $tmp = strtotime($event['start']);
$dtformat = "%Y%m%dT%H%M%S".$UTC; $dtformat = "%Y%m%dT%H%M%S" . $UTC;
$o .= 'DTSTART:'.strftime($dtformat, $tmp).PHP_EOL; $o .= 'DTSTART:' . strftime($dtformat, $tmp) . PHP_EOL;
} }
if (!$event['nofinish']) { if (!$event['nofinish']) {
$tmp = strtotime($event['finish']); $tmp = strtotime($event['finish']);
$dtformat = "%Y%m%dT%H%M%S".$UTC; $dtformat = "%Y%m%dT%H%M%S" . $UTC;
$o .= 'DTEND:'.strftime($dtformat, $tmp).PHP_EOL; $o .= 'DTEND:' . strftime($dtformat, $tmp) . PHP_EOL;
} }
if ($event['summary'])
if ($event['summary']) {
$tmp = $event['summary']; $tmp = $event['summary'];
$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp); $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
$tmp = addcslashes($tmp, ',;'); $tmp = addcslashes($tmp, ',;');
$o .= 'SUMMARY:' . $tmp . PHP_EOL; $o .= 'SUMMARY:' . $tmp . PHP_EOL;
if ($event['desc']) }
if ($event['desc']) {
$tmp = $event['desc']; $tmp = $event['desc'];
$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp); $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
$tmp = addcslashes($tmp, ',;'); $tmp = addcslashes($tmp, ',;');
$o .= 'DESCRIPTION:' . $tmp . PHP_EOL; $o .= 'DESCRIPTION:' . $tmp . PHP_EOL;
}
if ($event['location']) { if ($event['location']) {
$tmp = $event['location']; $tmp = $event['location'];
$tmp = str_replace(PHP_EOL, PHP_EOL.' ',$tmp); $tmp = str_replace(PHP_EOL, PHP_EOL . ' ', $tmp);
$tmp = addcslashes($tmp, ',;'); $tmp = addcslashes($tmp, ',;');
$o .= 'LOCATION:' . $tmp . PHP_EOL; $o .= 'LOCATION:' . $tmp . PHP_EOL;
} }
@ -759,16 +807,18 @@ function event_format_export ($events, $format = 'ical', $timezone) {
* @return array Query results * @return array Query results
*/ */
function events_by_uid($uid = 0, $sql_extra = '') { function events_by_uid($uid = 0, $sql_extra = '') {
if($uid == 0) if ($uid == 0) {
return; return;
}
// The permission condition if no condition was transmitted // The permission condition if no condition was transmitted
if($sql_extra == '') if($sql_extra == '') {
$sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' "; $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' ";
}
// does the user who requests happen to be the owner of the events // Does the user who requests happen to be the owner of the events
// requested? then show all of your events, otherwise only those that // requested? then show all of your events, otherwise only those that
// don't have limitations set in allow_cid and allow_gid // don't have limitations set in allow_cid and allow_gid
if (local_user() == $uid) { if (local_user() == $uid) {
$r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish` $r = q("SELECT `start`, `finish`, `adjust`, `summary`, `desc`, `location`, `nofinish`
FROM `event` WHERE `uid`= %d AND `cid` = 0 ", FROM `event` WHERE `uid`= %d AND `cid` = 0 ",
@ -781,8 +831,9 @@ function events_by_uid($uid = 0, $sql_extra = '') {
); );
} }
if (dbm::is_result($r)) if (dbm::is_result($r)) {
return $r; return $r;
}
} }
/** /**
@ -801,25 +852,28 @@ function event_export($uid, $format = 'ical') {
$process = false; $process = false;
// we are allowed to show events // We are allowed to show events
// get the timezone the user is in // get the timezone the user is in
$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid)); $r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$timezone = $r[0]['timezone']; $timezone = $r[0]['timezone'];
}
// get all events which are owned by a uid (respects permissions); // Get all events which are owned by a uid (respects permissions);
$events = events_by_uid($uid); $events = events_by_uid($uid);
// we have the events that are available for the requestor // We have the events that are available for the requestor
// now format the output according to the requested format // now format the output according to the requested format
if(count($events)) if (count($events)) {
$res = event_format_export($events, $format, $timezone); $res = event_format_export($events, $format, $timezone);
}
// If there are results the precess was successfull // If there are results the precess was successfull
if(x($res)) if (x($res)) {
$process = true; $process = true;
}
// get the file extension for the format // Get the file extension for the format
switch ($format) { switch ($format) {
case "ical": case "ical":
$file_ext = "ics"; $file_ext = "ics";
@ -834,10 +888,10 @@ function event_export($uid, $format = 'ical') {
} }
$arr = array( $arr = array(
'success' => $process, 'success' => $process,
'format' => $format, 'format' => $format,
'extension' => $file_ext, 'extension' => $file_ext,
'content' => $res, 'content' => $res,
); );
return $arr; return $arr;
@ -860,8 +914,9 @@ function widget_events() {
// The permission testing is a little bit tricky because we have to respect many cases // The permission testing is a little bit tricky because we have to respect many cases
// It's not the private events page (we don't get the $owner_uid for /events) // It's not the private events page (we don't get the $owner_uid for /events)
if(! local_user() && ! $owner_uid) if (! local_user() && ! $owner_uid) {
return; return;
}
// Cal logged in user (test permission at foreign profile page) // Cal logged in user (test permission at foreign profile page)
// If the $owner uid is available we know it is part of one of the profile pages (like /cal) // If the $owner uid is available we know it is part of one of the profile pages (like /cal)
@ -869,13 +924,15 @@ function widget_events() {
// or a foreign one. For foreign profile pages we need to check if the feature // or a foreign one. For foreign profile pages we need to check if the feature
// for exporting the cal is enabled (otherwise the widget would appear for logged in users // for exporting the cal is enabled (otherwise the widget would appear for logged in users
// on foreigen profile pages even if the widget is disabled) // on foreigen profile pages even if the widget is disabled)
if(intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) if (intval($owner_uid) && local_user() !== $owner_uid && ! feature_enabled($owner_uid, "export_calendar")) {
return; return;
}
// If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and // If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
// export feature isn't enabled // export feature isn't enabled
if(intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) if (intval($owner_uid) && ! local_user() && ! feature_enabled($owner_uid, "export_calendar")) {
return; return;
}
return replace_macros(get_markup_template("events_aside.tpl"), array( return replace_macros(get_markup_template("events_aside.tpl"), array(
'$etitle' => t("Export"), '$etitle' => t("Export"),

View File

@ -237,12 +237,12 @@ function events_content(App $a) {
$m = 0; $m = 0;
$ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0); $ignored = ((x($_REQUEST, 'ignored')) ? intval($_REQUEST['ignored']) : 0);
if($a->argc > 1) { if ($a->argc > 1) {
if ($a->argc > 2 && $a->argv[1] == 'event') { if ($a->argc > 2 && $a->argv[1] == 'event') {
$mode = 'edit'; $mode = 'edit';
$event_id = intval($a->argv[2]); $event_id = intval($a->argv[2]);
} }
if($a->argc > 2 && $a->argv[1] == 'drop') { if ($a->argc > 2 && $a->argv[1] == 'drop') {
$mode = 'drop'; $mode = 'drop';
$event_id = intval($a->argv[2]); $event_id = intval($a->argv[2]);
} }
@ -321,7 +321,7 @@ function events_content(App $a) {
); );
// get events by id or by date // get events by id or by date
if (x($_GET, 'id')){ if (x($_GET, 'id')) {
$r = event_by_id(local_user(), $event_params); $r = event_by_id(local_user(), $event_params);
} else { } else {
$r = events_by_date(local_user(), $event_params); $r = events_by_date(local_user(), $event_params);
@ -352,7 +352,7 @@ function events_content(App $a) {
killme(); killme();
} }
if (x($_GET, 'id')){ if (x($_GET, 'id')) {
$tpl = get_markup_template("event.tpl"); $tpl = get_markup_template("event.tpl");
} else { } else {
$tpl = get_markup_template("events_js.tpl"); $tpl = get_markup_template("events_js.tpl");