Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 636cf6c579ff437e1a8a6813177614cc367ee6aa..0c1e9ae2f5f553651191d5a509fc600421f794ce 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,11 +8,12 @@ require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
 
-function events_init(&$a) {
-       if(! local_user())
+function events_init(App &$a) {
+       if (! local_user()) {
                return;
+       }
 
-       if($a->argc == 1) {
+       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')
@@ -20,8 +21,9 @@ function events_init(&$a) {
 
                $cal_widget = widget_events();
 
-               if(! x($a->page,'aside'))
+               if (! x($a->page,'aside')) {
                        $a->page['aside'] = '';
+               }
 
                $a->page['aside'] .= $cal_widget;
        }
@@ -29,12 +31,13 @@ function events_init(&$a) {
        return;
 }
 
-function events_post(&$a) {
+function events_post(App &$a) {
 
        logger('post: ' . print_r($_REQUEST,true));
 
-       if(! local_user())
+       if (! local_user()) {
                return;
+       }
 
        $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0);
        $cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
@@ -89,7 +92,7 @@ function events_post(&$a) {
        $type     = 'event';
 
        $action = ($event_id == '') ? 'new' : "event/" . $event_id;
-       $onerror_url = $a->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) {
                notice( t('Event can not end before it has started.') . EOL);
@@ -184,45 +187,48 @@ function events_post(&$a) {
 
 
 
-function events_content(&$a) {
+function events_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       if($a->argc == 1)
-               $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+       if ($a->argc == 1) {
+               $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+       }
 
-       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",
                        intval($a->argv[2]),
                        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",
                        intval($a->argv[2]),
                        intval(local_user())
                );
        }
 
-       if ($a->theme_events_in_profile)
+       if ($a->theme_events_in_profile) {
                nav_set_selected('home');
-       else
+       } else {
                nav_set_selected('events');
+       }
 
        $editselect = 'none';
-       if( feature_enabled(local_user(), 'richtext') )
+       if ( feature_enabled(local_user(), 'richtext') ) {
                $editselect = 'textareas';
+       }
 
        // get the translation strings for the callendar
        $i18n = get_event_strings();
 
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl,array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$module_url' => '/events',
                '$modparams' => 1,
                '$i18n' => $i18n,
@@ -231,7 +237,7 @@ function events_content(&$a) {
 
        $etpl = get_markup_template('event_end.tpl');
        $a->page['end'] .= replace_macros($etpl,array(
-               '$baseurl' => $a->get_baseurl(),
+               '$baseurl' => App::get_baseurl(),
                '$editselect' => $editselect
        ));
 
@@ -303,8 +309,8 @@ function events_content(&$a) {
 
 
                if ($a->argv[1] === 'json'){
-                       if (x($_GET,'start'))   $start = date("Y-m-d h:i:s", $_GET['start']);
-                       if (x($_GET,'end'))     $finish = date("Y-m-d h:i:s", $_GET['end']);
+                       if (x($_GET,'start'))   $start = $_GET['start'];
+                       if (x($_GET,'end'))     $finish = $_GET['end'];
                }
 
                $start  = datetime_convert('UTC','UTC',$start);
@@ -332,21 +338,23 @@ function events_content(&$a) {
 
                $links = array();
 
-               if(count($r)) {
+               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'));
-                               if(! x($links,$j))
-                                       $links[$j] = $a->get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+                               if(! x($links,$j)) {
+                                       $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+                               }
                        }
                }
 
                $events=array();
 
                // transform the event in a usable array
-               if(count($r))
+               if (dbm::is_result($r)) {
                        $r = sort_by_date($r);
                        $events = process_events($r);
+               }
 
                if ($a->argv[1] === 'json'){
                        echo json_encode($events); killme();
@@ -357,7 +365,7 @@ function events_content(&$a) {
                        $tpl =  get_markup_template("event.tpl");
                } 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");
 //                     }
@@ -374,14 +382,14 @@ function events_content(&$a) {
                }
 
                $o = replace_macros($tpl, array(
-                       '$baseurl'      => $a->get_baseurl(),
+                       '$baseurl'      => App::get_baseurl(),
                        '$tabs'         => $tabs,
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
-                       '$new_event'=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
-                       '$previus'      => array($a->get_baseurl()."/events/$prevyear/$prevmonth",t('Previous'),'',''),
-                       '$next'         => array($a->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'),'',''),
+                       '$previus'      => 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,
 
@@ -389,8 +397,7 @@ function events_content(&$a) {
                        "month" => t("month"),
                        "week" => t("week"),
                        "day" => t("day"),
-
-
+                       "list" => t("list"),
                ));
 
                if (x($_GET,'id')){ echo $o; killme(); }
@@ -404,7 +411,7 @@ function events_content(&$a) {
                        intval($event_id),
                        intval(local_user())
                );
-               if(count($r))
+               if (dbm::is_result($r))
                        $orig_event = $r[0];
        }
 
@@ -475,7 +482,7 @@ function events_content(&$a) {
                $tpl = get_markup_template('event_form.tpl');
 
                $o .= replace_macros($tpl,array(
-                       '$post' => $a->get_baseurl() . '/events',
+                       '$post' => App::get_baseurl() . '/events',
                        '$eid' => $eid,
                        '$cid' => $cid,
                        '$uri' => $uri,
@@ -506,7 +513,8 @@ function events_content(&$a) {
                        '$acl' => $acl,
                        '$submit' => t('Submit'),
                        '$basic' => t("Basic"),
-                       '$advanced' => t("Advanced")
+                       '$advanced' => t("Advanced"),
+                       '$permissions' => t('Permissions'),
 
                ));