add dop event & fix event edit
This commit is contained in:
rabuzarus
parent
6fdc219143
commit
8ae8465d48
5 changed files with 136 additions and 95 deletions
|
|
@ -612,7 +612,14 @@ function process_events($arr) {
|
|||
$is_first = ($d !== $last_date);
|
||||
|
||||
$last_date = $d;
|
||||
$edit = ((! $rr['cid']) ? array(App::get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
|
||||
|
||||
// Show edit and drop actions only if the user is the owner of the event and the event
|
||||
// is a real event (no bithdays)
|
||||
if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
|
||||
$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);
|
||||
|
|
@ -631,6 +638,8 @@ function process_events($arr) {
|
|||
|
||||
'j' => $j,
|
||||
'd' => $d,
|
||||
'edit' => $edit,
|
||||
'drop' => $drop,
|
||||
'is_first'=>$is_first,
|
||||
'item'=>$rr,
|
||||
'html'=>$html,
|
||||
|
|
|
|||
211
mod/events.php
211
mod/events.php
|
|
@ -33,7 +33,7 @@ function events_init(App $a) {
|
|||
|
||||
function events_post(App $a) {
|
||||
|
||||
logger('post: ' . print_r($_REQUEST,true));
|
||||
logger('post: ' . print_r($_REQUEST, true));
|
||||
|
||||
if (! local_user()) {
|
||||
return;
|
||||
|
|
@ -41,7 +41,7 @@ function events_post(App $a) {
|
|||
|
||||
$event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
|
||||
$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
|
||||
$uid = local_user();
|
||||
$uid = local_user();
|
||||
|
||||
$start_text = escape_tags($_REQUEST['start_text']);
|
||||
$finish_text = escape_tags($_REQUEST['finish_text']);
|
||||
|
|
@ -54,9 +54,8 @@ function events_post(App $a) {
|
|||
|
||||
if ($start_text) {
|
||||
$start = $start_text;
|
||||
}
|
||||
else {
|
||||
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
||||
} else {
|
||||
$start = sprintf('%d-%d-%d %d:%d:0', $startyear, $startmonth, $startday, $starthour, $startminute);
|
||||
}
|
||||
|
||||
if ($nofinish) {
|
||||
|
|
@ -65,21 +64,19 @@ function events_post(App $a) {
|
|||
|
||||
if ($finish_text) {
|
||||
$finish = $finish_text;
|
||||
}
|
||||
else {
|
||||
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
|
||||
} else {
|
||||
$finish = sprintf('%d-%d-%d %d:%d:0', $finishyear, $finishmonth, $finishday, $finishhour, $finishminute);
|
||||
}
|
||||
|
||||
if ($adjust) {
|
||||
$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
|
||||
$start = datetime_convert(date_default_timezone_get(), 'UTC',$start);
|
||||
if (! $nofinish) {
|
||||
$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
|
||||
$finish = datetime_convert(date_default_timezone_get(), 'UTC',$finish);
|
||||
}
|
||||
}
|
||||
else {
|
||||
$start = datetime_convert('UTC','UTC',$start);
|
||||
} else {
|
||||
$start = datetime_convert('UTC', 'UTC', $start);
|
||||
if (! $nofinish) {
|
||||
$finish = datetime_convert('UTC','UTC',$finish);
|
||||
$finish = datetime_convert('UTC', 'UTC', $finish);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -96,7 +93,7 @@ function events_post(App $a) {
|
|||
$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";
|
||||
|
||||
if (strcmp($finish,$start) < 0 && !$nofinish) {
|
||||
if (strcmp($finish, $start) < 0 && !$nofinish) {
|
||||
notice( t('Event can not end before it has started.') . EOL);
|
||||
if (intval($_REQUEST['preview'])) {
|
||||
echo( t('Event can not end before it has started.'));
|
||||
|
|
@ -105,9 +102,9 @@ function events_post(App $a) {
|
|||
goaway($onerror_url);
|
||||
}
|
||||
|
||||
if((! $summary) || (! $start)) {
|
||||
if ((! $summary) || (! $start)) {
|
||||
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.'));
|
||||
killme();
|
||||
}
|
||||
|
|
@ -116,35 +113,33 @@ function events_post(App $a) {
|
|||
|
||||
$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())
|
||||
);
|
||||
if(count($c))
|
||||
if (count($c)) {
|
||||
$self = $c[0]['id'];
|
||||
else
|
||||
} else {
|
||||
$self = 0;
|
||||
}
|
||||
|
||||
|
||||
if($share) {
|
||||
if ($share) {
|
||||
$str_group_allow = perms2str($_POST['group_allow']);
|
||||
$str_contact_allow = perms2str($_POST['contact_allow']);
|
||||
$str_group_deny = perms2str($_POST['group_deny']);
|
||||
$str_contact_deny = perms2str($_POST['contact_deny']);
|
||||
|
||||
// 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);
|
||||
}
|
||||
// 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
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
// Note: do not set `private` field for self-only events. It will
|
||||
// keep even you from seeing them!
|
||||
$str_contact_allow = '<' . $self . '>';
|
||||
|
|
@ -173,16 +168,17 @@ function events_post(App $a) {
|
|||
$datarray['created'] = $created;
|
||||
$datarray['edited'] = $edited;
|
||||
|
||||
if(intval($_REQUEST['preview'])) {
|
||||
if (intval($_REQUEST['preview'])) {
|
||||
$html = format_event_html($datarray);
|
||||
echo $html;
|
||||
killme();
|
||||
killme();
|
||||
}
|
||||
|
||||
$item_id = event_store($datarray);
|
||||
|
||||
if(! $cid)
|
||||
if (! $cid) {
|
||||
proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
|
||||
}
|
||||
|
||||
goaway($_SESSION['return_url']);
|
||||
}
|
||||
|
|
@ -201,14 +197,14 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
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(local_user())
|
||||
);
|
||||
}
|
||||
|
||||
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(local_user())
|
||||
);
|
||||
|
|
@ -224,7 +220,7 @@ function events_content(App $a) {
|
|||
$i18n = get_event_strings();
|
||||
|
||||
$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(),
|
||||
'$module_url' => '/events',
|
||||
'$modparams' => 1,
|
||||
|
|
@ -232,14 +228,15 @@ function events_content(App $a) {
|
|||
));
|
||||
|
||||
$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(),
|
||||
));
|
||||
|
||||
$o ="";
|
||||
$o ='';
|
||||
// tabs
|
||||
if ($a->theme_events_in_profile)
|
||||
$tabs = profile_tabs($a, True);
|
||||
if ($a->theme_events_in_profile) {
|
||||
$tabs = profile_tabs($a, true);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
@ -253,6 +250,10 @@ function events_content(App $a) {
|
|||
$mode = 'edit';
|
||||
$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') {
|
||||
$mode = 'new';
|
||||
$event_id = 0;
|
||||
|
|
@ -267,9 +268,8 @@ function events_content(App $a) {
|
|||
// The view mode part is similiar to /mod/cal.php
|
||||
if ($mode == 'view') {
|
||||
|
||||
|
||||
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
|
||||
$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
|
||||
$thisyear = datetime_convert('UTC', date_default_timezone_get(),'now', 'Y');
|
||||
$thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
|
||||
if (! $y) {
|
||||
$y = intval($thisyear);
|
||||
}
|
||||
|
|
@ -289,22 +289,22 @@ function events_content(App $a) {
|
|||
|
||||
$nextyear = $y;
|
||||
$nextmonth = $m + 1;
|
||||
if($nextmonth > 12) {
|
||||
$nextmonth = 1;
|
||||
if ($nextmonth > 12) {
|
||||
$nextmonth = 1;
|
||||
$nextyear ++;
|
||||
}
|
||||
|
||||
$prevyear = $y;
|
||||
if($m > 1)
|
||||
if ($m > 1) {
|
||||
$prevmonth = $m - 1;
|
||||
else {
|
||||
} else {
|
||||
$prevmonth = 12;
|
||||
$prevyear --;
|
||||
}
|
||||
|
||||
$dim = get_dim($y,$m);
|
||||
$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);
|
||||
$dim = get_dim($y, $m);
|
||||
$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);
|
||||
|
||||
|
||||
if ($a->argv[1] === 'json'){
|
||||
|
|
@ -312,20 +312,20 @@ function events_content(App $a) {
|
|||
if (x($_GET,'end')) $finish = $_GET['end'];
|
||||
}
|
||||
|
||||
$start = datetime_convert('UTC','UTC',$start);
|
||||
$finish = datetime_convert('UTC','UTC',$finish);
|
||||
$start = datetime_convert('UTC', 'UTC', $start);
|
||||
$finish = datetime_convert('UTC', 'UTC', $finish);
|
||||
|
||||
$adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
|
||||
$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
|
||||
|
||||
// put the event parametes in an array so we can better transmit them
|
||||
$event_params = array(
|
||||
'event_id' => (x($_GET,'id') ? $_GET["id"] : 0),
|
||||
'start' => $start,
|
||||
'finish' => $finish,
|
||||
'adjust_start' => $adjust_start,
|
||||
'event_id' => (x($_GET,'id') ? $_GET["id"] : 0),
|
||||
'start' => $start,
|
||||
'finish' => $finish,
|
||||
'adjust_start' => $adjust_start,
|
||||
'adjust_finish' => $adjust_finish,
|
||||
'ignored' => $ignored,
|
||||
'ignored' => $ignored,
|
||||
);
|
||||
|
||||
// get events by id or by date
|
||||
|
|
@ -340,7 +340,7 @@ function events_content(App $a) {
|
|||
if (dbm::is_result($r)) {
|
||||
$r = sort_by_date($r);
|
||||
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)) {
|
||||
$links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
|
||||
}
|
||||
|
|
@ -356,18 +356,14 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
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')){
|
||||
$tpl = get_markup_template("event.tpl");
|
||||
} else {
|
||||
// if (get_config('experimentals','new_calendar')==1){
|
||||
$tpl = get_markup_template("events_js.tpl");
|
||||
// } else {
|
||||
// $tpl = get_markup_template("events.tpl");
|
||||
// }
|
||||
$tpl = get_markup_template("events_js.tpl");
|
||||
}
|
||||
|
||||
// Get rid of dashes in key names, Smarty3 can't handle them
|
||||
|
|
@ -385,27 +381,31 @@ function events_content(App $a) {
|
|||
'$tabs' => $tabs,
|
||||
'$title' => t('Events'),
|
||||
'$view' => t('View'),
|
||||
'$new_event' => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
|
||||
'$previous' => array(App::get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
|
||||
'$next' => array(App::get_baseurl()."/events/$nextyear/$nextmonth",t('Next'),'',''),
|
||||
'$calendar' => cal($y,$m,$links, ' eventcal'),
|
||||
'$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
|
||||
'$previous' => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
|
||||
'$next' => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
|
||||
'$calendar' => cal($y, $m, $links, ' eventcal'),
|
||||
|
||||
'$events' => $events,
|
||||
|
||||
"today" => t("today"),
|
||||
"month" => t("month"),
|
||||
"week" => t("week"),
|
||||
"day" => t("day"),
|
||||
"list" => t("list"),
|
||||
'$today' => t('today'),
|
||||
'$month' => t('month'),
|
||||
'$week' => t('week'),
|
||||
'$day' => t('day'),
|
||||
'$list' => t('list'),
|
||||
));
|
||||
|
||||
if (x($_GET,'id')){ echo $o; killme(); }
|
||||
if (x($_GET,'id')) {
|
||||
echo $o;
|
||||
killme();
|
||||
|
||||
}
|
||||
|
||||
return $o;
|
||||
|
||||
}
|
||||
|
||||
if($mode === 'edit' && $event_id) {
|
||||
if ($mode === 'edit' && $event_id) {
|
||||
$r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($event_id),
|
||||
intval(local_user())
|
||||
|
|
@ -415,16 +415,16 @@ function events_content(App $a) {
|
|||
}
|
||||
|
||||
// Passed parameters overrides anything found in the DB
|
||||
if($mode === 'edit' || $mode === 'new') {
|
||||
if(!x($orig_event)) $orig_event = array();
|
||||
if ($mode === 'edit' || $mode === 'new') {
|
||||
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
|
||||
if(x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
|
||||
if(x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
|
||||
if(x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
|
||||
if(x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
|
||||
if(x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
|
||||
if(x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start'];
|
||||
if(x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
|
||||
if (x($_REQUEST,'nofinish')) $orig_event['nofinish'] = $_REQUEST['nofinish'];
|
||||
if (x($_REQUEST,'adjust')) $orig_event['adjust'] = $_REQUEST['adjust'];
|
||||
if (x($_REQUEST,'summary')) $orig_event['summary'] = $_REQUEST['summary'];
|
||||
if (x($_REQUEST,'description')) $orig_event['description'] = $_REQUEST['description'];
|
||||
if (x($_REQUEST,'location')) $orig_event['location'] = $_REQUEST['location'];
|
||||
if (x($_REQUEST,'start')) $orig_event['start'] = $_REQUEST['start'];
|
||||
if (x($_REQUEST,'finish')) $orig_event['finish'] = $_REQUEST['finish'];
|
||||
}
|
||||
|
||||
if($mode === 'edit' || $mode === 'new') {
|
||||
|
|
@ -439,21 +439,24 @@ function events_content(App $a) {
|
|||
$uri = ((x($orig_event)) ? $orig_event['uri'] : '');
|
||||
|
||||
|
||||
if(! x($orig_event))
|
||||
if (! x($orig_event)) {
|
||||
$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" ' );
|
||||
}
|
||||
|
||||
if($cid OR ($mode !== 'new'))
|
||||
if ($cid OR ($mode !== 'new')) {
|
||||
$sh_checked .= ' disabled="disabled" ';
|
||||
}
|
||||
|
||||
|
||||
$sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
|
||||
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
|
||||
|
||||
$tz = date_default_timezone_get();
|
||||
if(x($orig_event))
|
||||
if (x($orig_event)) {
|
||||
$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
|
||||
}
|
||||
|
||||
$syear = datetime_convert('UTC', $tz, $sdt, 'Y');
|
||||
$smonth = datetime_convert('UTC', $tz, $sdt, 'm');
|
||||
|
|
@ -470,13 +473,15 @@ function events_content(App $a) {
|
|||
$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
|
||||
|
||||
$f = get_config('system','event_input_format');
|
||||
if(! $f)
|
||||
if (! $f) {
|
||||
$f = 'ymd';
|
||||
}
|
||||
|
||||
require_once('include/acl_selectors.php');
|
||||
|
||||
if ($mode === 'new')
|
||||
if ($mode === 'new') {
|
||||
$acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
|
||||
}
|
||||
|
||||
$tpl = get_markup_template('event_form.tpl');
|
||||
|
||||
|
|
@ -489,11 +494,11 @@ function events_content(App $a) {
|
|||
'$title' => t('Event details'),
|
||||
'$desc' => t('Starting date and Title are required.'),
|
||||
'$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_checked' => $n_checked,
|
||||
'$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_checked' => $a_checked,
|
||||
'$d_text' => t('Description:'),
|
||||
|
|
@ -511,12 +516,34 @@ function events_content(App $a) {
|
|||
'$preview' => t('Preview'),
|
||||
'$acl' => $acl,
|
||||
'$submit' => t('Submit'),
|
||||
'$basic' => t("Basic"),
|
||||
'$advanced' => t("Advanced"),
|
||||
'$basic' => t('Basic'),
|
||||
'$advanced' => t('Advanced'),
|
||||
'$permissions' => t('Permissions'),
|
||||
|
||||
));
|
||||
|
||||
return $o;
|
||||
}
|
||||
|
||||
// Remove an event from the calendar and its related items
|
||||
if ($mode === 'drop' && $event_id) {
|
||||
$del = 0;
|
||||
|
||||
$event_params = array('event_id' => ($event_id));
|
||||
$ev = event_by_id(local_user(), $event_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');
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
{{$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.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 class="clear"></div>
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -2193,6 +2193,9 @@ ul li:hover .contact-wrapper a.contact-action-link:hover {
|
|||
#event-edit-form-wrapper #event-edit-time {
|
||||
padding: 10px 0;
|
||||
}
|
||||
.event-buttons .plink-event-link {
|
||||
margin-left: 20px;
|
||||
}
|
||||
/* Profiles Page */
|
||||
.profile-listing-table {
|
||||
display: table;
|
||||
|
|
|
|||
|
|
@ -17,8 +17,9 @@
|
|||
</div>
|
||||
|
||||
<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="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="edit-event-link 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 class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue