Merge pull request #2905 from annando/1611-performance-again

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 617627ac4c5d92cba8ab3b2ccf0e854789b83629..16679ff7e7b47d952ea09b1ff87ce6304376cf1a 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,6 +8,27 @@ require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
 
+function events_init(&$a) {
+       if(! local_user())
+               return;
+
+       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')
+                       return;
+
+               $cal_widget = widget_events();
+
+               if(! x($a->page,'aside'))
+                       $a->page['aside'] = '';
+
+               $a->page['aside'] .= $cal_widget;
+       }
+
+       return;
+}
+
 function events_post(&$a) {
 
        logger('post: ' . print_r($_REQUEST,true));
@@ -156,7 +177,7 @@ function events_post(&$a) {
        $item_id = event_store($datarray);
 
        if(! $cid)
-               proc_run('php',"include/notifier.php","event","$item_id");
+               proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
 
        goaway($_SESSION['return_url']);
 }
@@ -282,8 +303,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);
@@ -336,7 +357,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");
 //                     }
@@ -357,10 +378,10 @@ function events_content(&$a) {
                        '$tabs'         => $tabs,
                        '$title'        => t('Events'),
                        '$view'         => t('View'),
-                       '$new_event'=> array($a->get_baseurl().'/events/new',t('Create New Event'),'',''),
+                       '$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'),
+                       '$calendar'     => cal($y,$m,$links, ' eventcal'),
 
                        '$events'       => $events,
 
@@ -368,8 +389,7 @@ function events_content(&$a) {
                        "month" => t("month"),
                        "week" => t("week"),
                        "day" => t("day"),
-
-
+                       "list" => t("list"),
                ));
 
                if (x($_GET,'id')){ echo $o; killme(); }
@@ -485,7 +505,8 @@ function events_content(&$a) {
                        '$acl' => $acl,
                        '$submit' => t('Submit'),
                        '$basic' => t("Basic"),
-                       '$advanced' => t("Advanced")
+                       '$advanced' => t("Advanced"),
+                       '$permissions' => t('Permissions'),
 
                ));