clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3241 from rabuzarus/20170316_-_fix_event_edit 

add dop event & fix event edit
This commit is contained in:
Hypolite Petovan 2017-03-20 13:18:18 -04:00 committed by GitHub
parent eaf308ad01 0557a42e2f
commit 7a95fcf02a
5 changed files with 427 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

329
include/event.php
View File

@ -4,14 +4,15 @@
* @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
@ -26,17 +27,19 @@ function format_event_html($ev, $simple = false) {
$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;
} }
@ -49,26 +52,29 @@ function format_event_html($ev, $simple = false) {
$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,9 +259,9 @@ 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();
@ -244,27 +269,29 @@ function event_store($arr) {
$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();
@ -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,6 +479,7 @@ 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"), "Sunday" => t("Sunday"),
"Monday" => t("Monday"), "Monday" => t("Monday"),
"Tuesday" => t("Tuesday"), "Tuesday" => t("Tuesday"),
@ -453,6 +487,7 @@ function get_event_strings() {
"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,6 +500,7 @@ 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"), "January" => t("January"),
"February" => t("February"), "February" => t("February"),
"March" => t("March"), "March" => t("March"),
@ -477,11 +513,11 @@ function get_event_strings() {
"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"),
@ -493,19 +529,20 @@ function get_event_strings() {
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`
@ -595,46 +634,54 @@ function process_events($arr) {
$last_date = ''; $last_date = '';
$fmt = t('l, F j'); $fmt = t('l, F j');
if (count($arr)) { if (count($arr)) {
foreach($arr as $rr) { foreach ($arr as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
$d = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], $fmt) : datetime_convert('UTC','UTC',$rr['start'],$fmt)); $d = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], $fmt) : datetime_convert('UTC', 'UTC', $rr['start'], $fmt));
$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;
$edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8')); // Show edit and drop actions only if the user is the owner of the event and the event
if(! $title) { // is a real event (no bithdays)
list($title, $_trash) = explode("<br",bbcode($rr['desc']),2); if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
$title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8')); $edit = ((! $rr['cid']) ? array(App::get_baseurl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
$drop = array(App::get_baseurl() . '/events/drop/' . $rr['id'], t('Delete event'), '', '');
}
$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (! $title) {
list($title, $_trash) = explode("<br", bbcode($rr['desc']), 2);
$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
} }
$html = format_event_html($rr); $html = format_event_html($rr);
$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,
'is_first'=>$is_first, 'edit' => $edit,
'item'=>$rr, 'drop' => $drop,
'html'=>$html, 'is_first' => $is_first,
'plink' => array($rr['plink'],t('link to source'),'',''), 'item' => $rr,
'html' => $html,
'plink' => array($rr['plink'], t('link to source'), '', ''),
); );
} }
} }
@ -652,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
@ -691,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;
} }
@ -750,14 +807,16 @@ 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) {
@ -772,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;
}
} }
/** /**
@ -792,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";
@ -851,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)
@ -860,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"),
@ -874,5 +940,4 @@ function widget_events() {
'$export_csv' => t("Export calendar as csv"), '$export_csv' => t("Export calendar as csv"),
'$user' => $user '$user' => $user
)); ));
} }

267
mod/events.php
View File

@ -1,12 +1,12 @@
<?php <?php
/** /**
* @fiel mod/events.php * @file mod/events.php
* @brief The events module * @brief The events module
*/ */
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/datetime.php'); require_once 'include/datetime.php';
require_once('include/event.php'); require_once 'include/event.php';
require_once('include/items.php'); require_once 'include/items.php';
function events_init(App $a) { function events_init(App $a) {
if (! local_user()) { if (! local_user()) {
@ -14,10 +14,11 @@ function events_init(App $a) {
} }
if ($a->argc == 1) { if ($a->argc == 1) {
// if it's a json request abort here becaus we don't // If it's a json request abort here because we don't
// need the widget data // need the widget data
if ($a->argv[1] === 'json') if ($a->argv[1] === 'json') {
return; return;
}
$cal_widget = widget_events(); $cal_widget = widget_events();
@ -33,14 +34,14 @@ function events_init(App $a) {
function events_post(App $a) { function events_post(App $a) {
logger('post: ' . print_r($_REQUEST,true)); logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
if (! local_user()) { if (! local_user()) {
return; return;
} }
$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); $event_id = ((x($_POST, 'event_id')) ? intval($_POST['event_id']) : 0);
$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0); $cid = ((x($_POST, 'cid')) ? intval($_POST['cid']) : 0);
$uid = local_user(); $uid = local_user();
$start_text = escape_tags($_REQUEST['start_text']); $start_text = escape_tags($_REQUEST['start_text']);
@ -52,34 +53,26 @@ function events_post(App $a) {
// The default setting for the `private` field in event_store() is false, so mirror that // The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false; $private_event = false;
$start = NULL_DATE;
$finish = NULL_DATE;
if ($start_text) { if ($start_text) {
$start = $start_text; $start = $start_text;
} }
else {
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
}
if ($nofinish) {
$finish = NULL_DATE;
}
if ($finish_text) { if ($finish_text) {
$finish = $finish_text; $finish = $finish_text;
} }
else {
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
}
if ($adjust) { if ($adjust) {
$start = datetime_convert(date_default_timezone_get(),'UTC',$start); $start = datetime_convert(date_default_timezone_get(), 'UTC', $start);
if (! $nofinish) { if (! $nofinish) {
$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish); $finish = datetime_convert(date_default_timezone_get(), 'UTC', $finish);
} }
} } else {
else { $start = datetime_convert('UTC', 'UTC', $start);
$start = datetime_convert('UTC','UTC',$start);
if (! $nofinish) { if (! $nofinish) {
$finish = datetime_convert('UTC','UTC',$finish); $finish = datetime_convert('UTC', 'UTC', $finish);
} }
} }
@ -96,19 +89,19 @@ function events_post(App $a) {
$action = ($event_id == '') ? 'new' : "event/" . $event_id; $action = ($event_id == '') ? 'new' : "event/" . $event_id;
$onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish"; $onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if (strcmp($finish,$start) < 0 && !$nofinish) { if (strcmp($finish, $start) < 0 && !$nofinish) {
notice( t('Event can not end before it has started.') . EOL); notice(t('Event can not end before it has started.') . EOL);
if (intval($_REQUEST['preview'])) { if (intval($_REQUEST['preview'])) {
echo( t('Event can not end before it has started.')); echo t('Event can not end before it has started.');
killme(); killme();
} }
goaway($onerror_url); goaway($onerror_url);
} }
if((! $summary) || (! $start)) { if ((! $summary) || ($start === NULL_DATE)) {
notice( t('Event title and start time are required.') . EOL); notice(t('Event title and start time are required.') . EOL);
if(intval($_REQUEST['preview'])) { if (intval($_REQUEST['preview'])) {
echo( t('Event title and start time are required.')); echo t('Event title and start time are required.');
killme(); killme();
} }
goaway($onerror_url); goaway($onerror_url);
@ -116,35 +109,33 @@ function events_post(App $a) {
$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0); $share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);
$c = q("select id from contact where uid = %d and self = 1 limit 1", $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval(local_user()) intval(local_user())
); );
if(count($c)) if (count($c)) {
$self = $c[0]['id']; $self = $c[0]['id'];
else } else {
$self = 0; $self = 0;
}
if($share) { if ($share) {
$str_group_allow = perms2str($_POST['group_allow']); $str_group_allow = perms2str($_POST['group_allow']);
$str_contact_allow = perms2str($_POST['contact_allow']); $str_contact_allow = perms2str($_POST['contact_allow']);
$str_group_deny = perms2str($_POST['group_deny']); $str_group_deny = perms2str($_POST['group_deny']);
$str_contact_deny = perms2str($_POST['contact_deny']); $str_contact_deny = perms2str($_POST['contact_deny']);
// Undo the pseudo-contact of self, since there are real contacts now // Undo the pseudo-contact of self, since there are real contacts now
if( strpos($str_contact_allow, '<' . $self . '>') !== false ) if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
{
$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow); $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
} }
// Make sure to set the `private` field as true. This is necessary to // Make sure to set the `private` field as true. This is necessary to
// have the posts show up correctly in Diaspora if an event is created // have the posts show up correctly in Diaspora if an event is created
// as visible only to self at first, but then edited to display to others. // as visible only to self at first, but then edited to display to others.
if( strlen($str_group_allow) or strlen($str_contact_allow) or strlen($str_group_deny) or strlen($str_contact_deny) ) if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
{
$private_event = true; $private_event = true;
} }
} } else {
else {
// Note: do not set `private` field for self-only events. It will // Note: do not set `private` field for self-only events. It will
// keep even you from seeing them! // keep even you from seeing them!
$str_contact_allow = '<' . $self . '>'; $str_contact_allow = '<' . $self . '>';
@ -173,7 +164,7 @@ function events_post(App $a) {
$datarray['created'] = $created; $datarray['created'] = $created;
$datarray['edited'] = $edited; $datarray['edited'] = $edited;
if(intval($_REQUEST['preview'])) { if (intval($_REQUEST['preview'])) {
$html = format_event_html($datarray); $html = format_event_html($datarray);
echo $html; echo $html;
killme(); killme();
@ -181,18 +172,17 @@ function events_post(App $a) {
$item_id = event_store($datarray); $item_id = event_store($datarray);
if(! $cid) if (! $cid) {
proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id); proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
}
goaway($_SESSION['return_url']); goaway($_SESSION['return_url']);
} }
function events_content(App $a) { function events_content(App $a) {
if (! local_user()) { if (! local_user()) {
notice( t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
@ -201,14 +191,14 @@ function events_content(App $a) {
} }
if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) { if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
$r = q("update event set ignore = 1 where id = %d and uid = %d", $r = q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
intval($a->argv[2]), intval($a->argv[2]),
intval(local_user()) intval(local_user())
); );
} }
if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) { if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
$r = q("update event set ignore = 0 where id = %d and uid = %d", $r = q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
intval($a->argv[2]), intval($a->argv[2]),
intval(local_user()) intval(local_user())
); );
@ -224,7 +214,7 @@ function events_content(App $a) {
$i18n = get_event_strings(); $i18n = get_event_strings();
$htpl = get_markup_template('event_head.tpl'); $htpl = get_markup_template('event_head.tpl');
$a->page['htmlhead'] .= replace_macros($htpl,array( $a->page['htmlhead'] .= replace_macros($htpl, array(
'$baseurl' => App::get_baseurl(), '$baseurl' => App::get_baseurl(),
'$module_url' => '/events', '$module_url' => '/events',
'$modparams' => 1, '$modparams' => 1,
@ -232,27 +222,30 @@ function events_content(App $a) {
)); ));
$etpl = get_markup_template('event_end.tpl'); $etpl = get_markup_template('event_end.tpl');
$a->page['end'] .= replace_macros($etpl,array( $a->page['end'] .= replace_macros($etpl, array(
'$baseurl' => App::get_baseurl(), '$baseurl' => App::get_baseurl(),
)); ));
$o =""; $o = '';
// tabs // tabs
if ($a->theme_events_in_profile) if ($a->theme_events_in_profile) {
$tabs = profile_tabs($a, True); $tabs = profile_tabs($a, true);
}
$mode = 'view'; $mode = 'view';
$y = 0; $y = 0;
$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') {
$mode = 'drop';
$event_id = intval($a->argv[2]);
}
if ($a->argv[1] === 'new') { if ($a->argv[1] === 'new') {
$mode = 'new'; $mode = 'new';
$event_id = 0; $event_id = 0;
@ -267,9 +260,8 @@ function events_content(App $a) {
// The view mode part is similiar to /mod/cal.php // The view mode part is similiar to /mod/cal.php
if ($mode == 'view') { if ($mode == 'view') {
$thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
if (! $y) { if (! $y) {
$y = intval($thisyear); $y = intval($thisyear);
} }
@ -289,38 +281,38 @@ function events_content(App $a) {
$nextyear = $y; $nextyear = $y;
$nextmonth = $m + 1; $nextmonth = $m + 1;
if($nextmonth > 12) { if ($nextmonth > 12) {
$nextmonth = 1; $nextmonth = 1;
$nextyear ++; $nextyear ++;
} }
$prevyear = $y; $prevyear = $y;
if($m > 1) if ($m > 1) {
$prevmonth = $m - 1; $prevmonth = $m - 1;
else { } else {
$prevmonth = 12; $prevmonth = 12;
$prevyear --; $prevyear --;
} }
$dim = get_dim($y,$m); $dim = get_dim($y, $m);
$start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); $start = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
if ($a->argv[1] === 'json'){ if ($a->argv[1] === 'json') {
if (x($_GET,'start')) $start = $_GET['start']; if (x($_GET, 'start')) {$start = $_GET['start'];}
if (x($_GET,'end')) $finish = $_GET['end']; if (x($_GET, 'end')) {$finish = $_GET['end'];}
} }
$start = datetime_convert('UTC','UTC',$start); $start = datetime_convert('UTC', 'UTC', $start);
$finish = datetime_convert('UTC','UTC',$finish); $finish = datetime_convert('UTC', 'UTC', $finish);
$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start); $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
// put the event parametes in an array so we can better transmit them // put the event parametes in an array so we can better transmit them
$event_params = array( $event_params = array(
'event_id' => (x($_GET,'id') ? $_GET["id"] : 0), 'event_id' => (x($_GET, 'id') ? $_GET['id'] : 0),
'start' => $start, 'start' => $start,
'finish' => $finish, 'finish' => $finish,
'adjust_start' => $adjust_start, 'adjust_start' => $adjust_start,
@ -329,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);
@ -340,7 +332,7 @@ function events_content(App $a) {
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$r = sort_by_date($r); $r = sort_by_date($r);
foreach ($r as $rr) { foreach ($r as $rr) {
$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j')); $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
if (! x($links,$j)) { if (! x($links,$j)) {
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j; $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
} }
@ -356,25 +348,21 @@ function events_content(App $a) {
} }
if ($a->argv[1] === 'json'){ if ($a->argv[1] === 'json'){
echo json_encode($events); killme(); echo json_encode($events);
killme();
} }
// links: array('href', 'text', 'extra css classes', 'title') if (x($_GET, 'id')) {
if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl"); $tpl = get_markup_template("event.tpl");
} else { } else {
// if (get_config('experimentals','new_calendar')==1){
$tpl = get_markup_template("events_js.tpl"); $tpl = get_markup_template("events_js.tpl");
// } else {
// $tpl = get_markup_template("events.tpl");
// }
} }
// Get rid of dashes in key names, Smarty3 can't handle them // Get rid of dashes in key names, Smarty3 can't handle them
foreach($events as $key => $event) { foreach ($events as $key => $event) {
$event_item = array(); $event_item = array();
foreach($event['item'] as $k => $v) { foreach ($event['item'] as $k => $v) {
$k = str_replace('-','_',$k); $k = str_replace('-' ,'_', $k);
$event_item[$k] = $v; $event_item[$k] = $v;
} }
$events[$key]['item'] = $event_item; $events[$key]['item'] = $event_item;
@ -385,52 +373,53 @@ function events_content(App $a) {
'$tabs' => $tabs, '$tabs' => $tabs,
'$title' => t('Events'), '$title' => t('Events'),
'$view' => t('View'), '$view' => t('View'),
'$new_event' => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''), '$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
'$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''), '$previous' => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''), '$next' => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
'$calendar' => cal($y,$m,$links, ' eventcal'), '$calendar' => cal($y, $m, $links, ' eventcal'),
'$events' => $events, '$events' => $events,
"today" => t("today"), '$today' => t('today'),
"month" => t("month"), '$month' => t('month'),
"week" => t("week"), '$week' => t('week'),
"day" => t("day"), '$day' => t('day'),
"list" => t("list"), '$list' => t('list'),
)); ));
if (x($_GET,'id')){ echo $o; killme(); } if (x($_GET, 'id')) {
echo $o;
return $o; killme();
} }
if($mode === 'edit' && $event_id) { return $o;
}
if ($mode === 'edit' && $event_id) {
$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($event_id), intval($event_id),
intval(local_user()) intval(local_user())
); );
if (dbm::is_result($r)) if (dbm::is_result($r)) {
$orig_event = $r[0]; $orig_event = $r[0];
} }
}
// Passed parameters overrides anything found in the DB // Passed parameters overrides anything found in the DB
if($mode === 'edit' || $mode === 'new') { if ($mode === 'edit' || $mode === 'new') {
if(!x($orig_event)) $orig_event = array(); if (!x($orig_event)) {$orig_event = array();}
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish']; if (x($_REQUEST, 'nofinish')) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust']; if (x($_REQUEST, 'adjust')) {$orig_event['adjust'] = $_REQUEST['adjust'];}
if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary']; if (x($_REQUEST, 'summary')) {$orig_event['summary'] = $_REQUEST['summary'];}
if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description']; if (x($_REQUEST, 'description')) {$orig_event['description'] = $_REQUEST['description'];}
if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location']; if (x($_REQUEST, 'location')) {$orig_event['location'] = $_REQUEST['location'];}
if(x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start']; if (x($_REQUEST, 'start')) {$orig_event['start'] = $_REQUEST['start'];}
if(x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish']; if (x($_REQUEST, 'finish')) {$orig_event['finish'] = $_REQUEST['finish'];}
}
if($mode === 'edit' || $mode === 'new') {
$n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : ''); $n_checked = ((x($orig_event) && $orig_event['nofinish']) ? ' checked="checked" ' : '');
$a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : ''); $a_checked = ((x($orig_event) && $orig_event['adjust']) ? ' checked="checked" ' : '');
$t_orig = ((x($orig_event)) ? $orig_event['summary'] : ''); $t_orig = ((x($orig_event)) ? $orig_event['summary'] : '');
$d_orig = ((x($orig_event)) ? $orig_event['desc'] : ''); $d_orig = ((x($orig_event)) ? $orig_event['desc'] : '');
$l_orig = ((x($orig_event)) ? $orig_event['location'] : ''); $l_orig = ((x($orig_event)) ? $orig_event['location'] : '');
@ -438,22 +427,23 @@ function events_content(App $a) {
$cid = ((x($orig_event)) ? $orig_event['cid'] : 0); $cid = ((x($orig_event)) ? $orig_event['cid'] : 0);
$uri = ((x($orig_event)) ? $orig_event['uri'] : ''); $uri = ((x($orig_event)) ? $orig_event['uri'] : '');
if (! x($orig_event)) {
if(! x($orig_event))
$sh_checked = ''; $sh_checked = '';
else } else {
$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ' ); $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
}
if($cid OR ($mode !== 'new')) if ($cid OR ($mode !== 'new')) {
$sh_checked .= ' disabled="disabled" '; $sh_checked .= ' disabled="disabled" ';
}
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now'); $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now'); $fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
$tz = date_default_timezone_get(); $tz = date_default_timezone_get();
if(x($orig_event)) if (x($orig_event)) {
$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC'); $tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
}
$syear = datetime_convert('UTC', $tz, $sdt, 'Y'); $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
$smonth = datetime_convert('UTC', $tz, $sdt, 'm'); $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
@ -470,13 +460,15 @@ function events_content(App $a) {
$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
$f = get_config('system','event_input_format'); $f = get_config('system','event_input_format');
if(! $f) if (! $f) {
$f = 'ymd'; $f = 'ymd';
}
require_once('include/acl_selectors.php'); require_once 'include/acl_selectors.php' ;
if ($mode === 'new') if ($mode === 'new') {
$acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user))); $acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
}
$tpl = get_markup_template('event_form.tpl'); $tpl = get_markup_template('event_form.tpl');
@ -489,11 +481,11 @@ function events_content(App $a) {
'$title' => t('Event details'), '$title' => t('Event details'),
'$desc' => t('Starting date and Title are required.'), '$desc' => t('Starting date and Title are required.'),
'$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>', '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>',
'$s_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$syear+5),DateTime::createFromFormat('Y-m-d H:i',"$syear-$smonth-$sday $shour:$sminute"),t('Event Starts:'),'start_text',true,true,'','',true), '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
'$n_text' => t('Finish date/time is not known or not relevant'), '$n_text' => t('Finish date/time is not known or not relevant'),
'$n_checked' => $n_checked, '$n_checked' => $n_checked,
'$f_text' => t('Event Finishes:'), '$f_text' => t('Event Finishes:'),
'$f_dsel' => datetimesel($f,new DateTime(),DateTime::createFromFormat('Y',$fyear+5),DateTime::createFromFormat('Y-m-d H:i',"$fyear-$fmonth-$fday $fhour:$fminute"),t('Event Finishes:'),'finish_text',true,true,'start_text'), '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
'$a_text' => t('Adjust for viewer timezone'), '$a_text' => t('Adjust for viewer timezone'),
'$a_checked' => $a_checked, '$a_checked' => $a_checked,
'$d_text' => t('Description:'), '$d_text' => t('Description:'),
@ -511,12 +503,33 @@ function events_content(App $a) {
'$preview' => t('Preview'), '$preview' => t('Preview'),
'$acl' => $acl, '$acl' => $acl,
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$basic' => t("Basic"), '$basic' => t('Basic'),
'$advanced' => t("Advanced"), '$advanced' => t('Advanced'),
'$permissions' => t('Permissions'), '$permissions' => t('Permissions'),
)); ));
return $o; return $o;
} }
// Remove an event from the calendar and its related items
if ($mode === 'drop' && $event_id) {
$del = 0;
$params = array('event_id' => ($event_id));
$ev = event_by_id(local_user(), $params);
// Delete only real events (no birthdays)
if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
$del = drop_item($ev[0]['itemid'], false);
}
if ($del == 0) {
notice(t('Failed to remove event' ) . EOL);
} else {
info(t('Event removed') . EOL);
}
goaway(App::get_baseurl() . '/events');
}
} }

1
view/templates/event.tpl
View File

@ -6,6 +6,7 @@
{{$event.html}} {{$event.html}}
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}} {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}} {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
{{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link icon s22 delete"></a>{{/if}}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{{/foreach}} {{/foreach}}

3
view/theme/frio/css/style.css
View File

@ -2193,6 +2193,9 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
#event-edit-form-wrapper #event-edit-time { #event-edit-form-wrapper #event-edit-time {
padding: 10px 0; padding: 10px 0;
} }
.event-buttons .plink-event-link {
margin-left: 20px;
}
/* Profiles Page */ /* Profiles Page */
.profile-listing-table { .profile-listing-table {
display: table; display: table;

5
view/theme/frio/templates/event.tpl
View File

@ -17,8 +17,9 @@
</div> </div>
<div class="event-buttons pull-right"> <div class="event-buttons pull-right">
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}} {{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="edit-event-link btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}}
{{if $event.edit}}<a onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}" class="btn"><i class="fa fa-pencil" aria-hidden="true"></i></a>{{/if}} {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>