added curly braces + space
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
47f88bd625
commit
bb37cac772
1 changed files with 13 additions and 11 deletions
|
@ -13,15 +13,15 @@ function events_init(&$a) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
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 becaus 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();
|
||||||
|
|
||||||
if(! x($a->page,'aside'))
|
if (! x($a->page,'aside'))
|
||||||
$a->page['aside'] = '';
|
$a->page['aside'] = '';
|
||||||
|
|
||||||
$a->page['aside'] .= $cal_widget;
|
$a->page['aside'] .= $cal_widget;
|
||||||
|
@ -51,33 +51,35 @@ function events_post(&$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;
|
||||||
|
|
||||||
if($start_text) {
|
if ($start_text) {
|
||||||
$start = $start_text;
|
$start = $start_text;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($nofinish) {
|
if ($nofinish) {
|
||||||
$finish = '0000-00-00 00:00:00';
|
$finish = '0000-00-00 00:00:00';
|
||||||
}
|
}
|
||||||
|
|
||||||
if($finish_text) {
|
if ($finish_text) {
|
||||||
$finish = $finish_text;
|
$finish = $finish_text;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
|
$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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't allow the event to finish before it begins.
|
// Don't allow the event to finish before it begins.
|
||||||
|
@ -93,9 +95,9 @@ function events_post(&$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();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue