added missing curly braces

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 0c1e9ae2f5f553651191d5a509fc600421f794ce..ac0c444cb5068c1b6923e91edfd5bb7d176259b1 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,7 +8,7 @@ require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
 
-function events_init(App &$a) {
+function events_init(App $a) {
        if (! local_user()) {
                return;
        }
@@ -16,7 +16,7 @@ function events_init(App &$a) {
        if ($a->argc == 1) {
                // if it's a json request abort here becaus we don't
                // need the widget data
-               if($a->argv[1] === 'json')
+               if ($a->argv[1] === 'json')
                        return;
 
                $cal_widget = widget_events();
@@ -31,7 +31,7 @@ function events_init(App &$a) {
        return;
 }
 
-function events_post(App &$a) {
+function events_post(App $a) {
 
        logger('post: ' . print_r($_REQUEST,true));
 
@@ -52,33 +52,35 @@ function events_post(App &$a) {
        // The default setting for the `private` field in event_store() is false, so mirror that
        $private_event = false;
 
-       if($start_text) {
+       if ($start_text) {
                $start = $start_text;
        }
        else {
                $start    = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
        }
 
-       if($nofinish) {
+       if ($nofinish) {
                $finish = '0000-00-00 00:00:00';
        }
 
-       if($finish_text) {
+       if ($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);
-               if(! $nofinish)
+               if (! $nofinish) {
                        $finish = datetime_convert(date_default_timezone_get(),'UTC',$finish);
+               }
        }
        else {
                $start = datetime_convert('UTC','UTC',$start);
-               if(! $nofinish)
+               if (! $nofinish) {
                        $finish = datetime_convert('UTC','UTC',$finish);
+               }
        }
 
        // Don't allow the event to finish before it begins.
@@ -94,9 +96,9 @@ 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'])) {
+               if (intval($_REQUEST['preview'])) {
                        echo( t('Event can not end before it has started.'));
                        killme();
                }
@@ -187,7 +189,7 @@ function events_post(App &$a) {
 
 
 
-function events_content(App &$a) {
+function events_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -218,11 +220,6 @@ function events_content(App &$a) {
                nav_set_selected('events');
        }
 
-       $editselect = 'none';
-       if ( feature_enabled(local_user(), 'richtext') ) {
-               $editselect = 'textareas';
-       }
-
        // get the translation strings for the callendar
        $i18n = get_event_strings();
 
@@ -232,13 +229,11 @@ function events_content(App &$a) {
                '$module_url' => '/events',
                '$modparams' => 1,
                '$i18n' => $i18n,
-               '$editselect' => $editselect
        ));
 
        $etpl = get_markup_template('event_end.tpl');
        $a->page['end'] .= replace_macros($etpl,array(
                '$baseurl' => App::get_baseurl(),
-               '$editselect' => $editselect
        ));
 
        $o ="";
@@ -254,15 +249,15 @@ function events_content(App &$a) {
        $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
        if($a->argc > 1) {
-               if($a->argc > 2 && $a->argv[1] == 'event') {
+               if ($a->argc > 2 && $a->argv[1] == 'event') {
                        $mode = 'edit';
                        $event_id = intval($a->argv[2]);
                }
-               if($a->argv[1] === 'new') {
+               if ($a->argv[1] === 'new') {
                        $mode = 'new';
                        $event_id = 0;
                }
-               if($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
+               if ($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
                        $mode = 'view';
                        $y = intval($a->argv[1]);
                        $m = intval($a->argv[2]);
@@ -270,23 +265,27 @@ function events_content(App &$a) {
        }
 
        // 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');
                $thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
-               if(! $y)
+               if (! $y) {
                        $y = intval($thisyear);
-               if(! $m)
+               }
+               if (! $m) {
                        $m = intval($thismonth);
+               }
 
                // Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
                // An upper limit was chosen to keep search engines from exploring links millions of years in the future.
 
-               if($y < 1901)
+               if ($y < 1901) {
                        $y = 1900;
-               if($y > 2099)
+               }
+               if ($y > 2099) {
                        $y = 2100;
+               }
 
                $nextyear = $y;
                $nextmonth = $m + 1;
@@ -340,15 +339,15 @@ function events_content(App &$a) {
 
                if (dbm::is_result($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'));
-                               if(! x($links,$j)) {
+                               if (! x($links,$j)) {
                                        $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
                }
 
-               $events=array();
+               $events = array();
 
                // transform the event in a usable array
                if (dbm::is_result($r)) {
@@ -387,7 +386,7 @@ function events_content(App &$a) {
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
                        '$new_event'    => array(App::get_baseurl().'/events/new',t('Create New Event'),'',''),
-                       '$previus'      => 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'),'',''),
                        '$calendar'     => cal($y,$m,$links, ' eventcal'),