Merge pull request #4208 from annando/thr-parent

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 056a584e56ca1e620922bc1c7c5340640f3e8ac9..0608e8679be8987606666b7d7e03aff5ab9c3adf 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,6 +8,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -19,7 +20,7 @@ function events_init(App $a) {
                return;
        }
 
-       if ($a->argc == 1) {
+       if ($a->argc > 1) {
                // If it's a json request abort here because we don't
                // need the widget data
                if ($a->argv[1] === 'json') {
@@ -179,7 +180,7 @@ function events_post(App $a) {
        $item_id = event_store($datarray);
 
        if (! $cid) {
-               Worker::add(PRIORITY_HIGH, "notifier", "event", $item_id);
+               Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
        }
 
        goaway($_SESSION['return_url']);
@@ -233,6 +234,7 @@ function events_content(App $a) {
        ));
 
        $o = '';
+       $tabs = '';
        // tabs
        if ($a->theme_events_in_profile) {
                $tabs = profile_tabs($a, true);
@@ -308,10 +310,13 @@ function events_content(App $a) {
                $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') {
-                       if (x($_GET, 'start')) {$start  = $_GET['start'];}
-                       if (x($_GET, 'end'))   {$finish = $_GET['end'];}
+               if ($a->argc > 1 && $a->argv[1] === 'json') {
+                       if (x($_GET, 'start')) {
+                               $start  = $_GET['start'];
+                       }
+                       if (x($_GET, 'end'))   {
+                               $finish = $_GET['end'];
+                       }
                }
 
                $start  = datetime_convert('UTC', 'UTC', $start);
@@ -339,7 +344,7 @@ function events_content(App $a) {
 
                $links = array();
 
-               if (dbm::is_result($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'));
@@ -352,12 +357,12 @@ function events_content(App $a) {
                $events = array();
 
                // transform the event in a usable array
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $r = sort_by_date($r);
                        $events = process_events($r);
                }
 
-               if ($a->argv[1] === 'json'){
+               if ($a->argc > 1 && $a->argv[1] === 'json'){
                        echo json_encode($events);
                        killme();
                }
@@ -410,7 +415,7 @@ function events_content(App $a) {
                        intval($event_id),
                        intval(local_user())
                );
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
                        $orig_event = $r[0];
                }
        }
@@ -470,11 +475,6 @@ function events_content(App $a) {
                $fhour   = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
                $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
 
-               $f = Config::get('system','event_input_format');
-               if (! $f) {
-                       $f = 'ymd';
-               }
-
                require_once 'include/acl_selectors.php' ;
 
                $perms = get_acl_permissions($orig_event);
@@ -506,11 +506,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(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(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:'),
@@ -545,7 +545,7 @@ function events_content(App $a) {
                $ev = event_by_id(local_user(), $params);
 
                // Delete only real events (no birthdays)
-               if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
+               if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
                        $del = drop_item($ev[0]['itemid'], false);
                }