Fix formatting and PHP notices in events

- Initialized variables in include/event
- Check for argc before retrieving argv in mod/events

diff --git a/include/event.php b/include/event.php
index bc9467dc80217a1c352277ebaf94ef91c4fe6c3d..584a7076768337537f7f548921e0b6b1cf0f06d2 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -13,7 +13,7 @@ use Friendica\Util\Map;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
-require_once "include/conversation.php";
+require_once 'include/conversation.php';
 
 function format_event_html($ev, $simple = false) {
        if (! ((is_array($ev)) && count($ev))) {
@@ -88,7 +88,7 @@ function format_event_html($ev, $simple = false) {
 
 /**
  * @brief Convert an array with event data to bbcode.
- * 
+ *
  * @param array $ev Array which conains the event data.
  * @return string The event as a bbcode formatted string.
  */
@@ -126,7 +126,7 @@ function format_event_bbcode($ev) {
 /**
  * @brief Extract bbcode formatted event data from a string
  *     and convert it to html.
- * 
+ *
  * @params: string $s The string which should be parsed for event data.
  * @return string The html output.
  */
@@ -143,7 +143,7 @@ function bbtovcal($s) {
 
 /**
  * @brief Extract bbcode formatted event data from a string.
- * 
+ *
  * @params: string $s The string which should be parsed for event data.
  * @return array The array with the event information.
  */
@@ -206,10 +206,10 @@ function ev_compare($a,$b) {
 
 /**
  * @brief Delete an event from the event table.
- * 
+ *
  * Note: This function does only delete the event from the event table not its
  * related entry in the item table.
- * 
+ *
  * @param int $event_id Event ID.
  * @return void
  */
@@ -224,9 +224,9 @@ function event_delete($event_id) {
 
 /**
  * @brief Store the event.
- * 
+ *
  * Store the event in the event table and create an event item in the item table.
- * 
+ *
  * @param array $arr Array with event data.
  * @return int The event id.
  */
@@ -433,7 +433,7 @@ function event_store($arr) {
 
 /**
  * @brief Create an array with translation strings used for events.
- * 
+ *
  * @return array Array with translations strings.
  */
 function get_event_strings() {
@@ -564,7 +564,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
  *     string 'adjust_start' =>
  *
  * @param string $sql_extra Additional sql conditions (e.g. permission request).
- * 
+ *
  * @return array Query results.
  */
 function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
@@ -626,6 +626,9 @@ function process_events($arr) {
 
                        // Show edit and drop actions only if the user is the owner of the event and the event
                        // is a real event (no bithdays).
+                       $edit = null;
+                       $copy = null;
+                       $drop = null;
                        if (local_user() && local_user() == $rr['uid'] && $rr['type'] == 'event') {
                                $edit = ((! $rr['cid']) ? array(System::baseUrl() . '/events/event/' . $rr['id'], t('Edit event'), '', '') : null);
                                $copy = ((! $rr['cid']) ? array(System::baseUrl() . '/events/copy/' . $rr['id'], t('Duplicate event'), '', '') : null);
@@ -768,7 +771,7 @@ function event_format_export ($events, $format = 'ical', $timezone) {
 
 /**
  * @brief Get all events for a user ID.
- * 
+ *
  *    The query for events is done permission sensitive.
  *    If the user is the owner of the calendar he/she
  *    will get all of his/her available events.
@@ -922,7 +925,7 @@ function widget_events() {
 
 /**
  * @brief Format an item array with event data to HTML.
- * 
+ *
  * @param arr $item Array with item and event data.
  * @return string HTML output.
  */
@@ -1013,12 +1016,12 @@ function format_event_item($item) {
 
 /**
  * @brief Format a string with map bbcode to an array with location data.
- * 
+ *
  * Note: The string must only contain location data. A string with no bbcode will be
  * handled as location name.
- * 
+ *
  * @param string $s The string with the bbcode formatted location data.
- * 
+ *
  * @return array The array with the location data.
  *  'name' => The name of the location,<br>
  * 'address' => The address of the location,<br>

diff --git a/mod/events.php b/mod/events.php
index 7a05274e233d8281f6ff673ddb66a28160fd374c..eb804b5d66c61c98dd0e80380a21e43c130b50ad 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -20,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') {
@@ -234,6 +234,7 @@ function events_content(App $a) {
        ));
 
        $o = '';
+       $tabs = '';
        // tabs
        if ($a->theme_events_in_profile) {
                $tabs = profile_tabs($a, true);
@@ -309,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);
@@ -358,7 +362,7 @@ function events_content(App $a) {
                        $events = process_events($r);
                }
 
-               if ($a->argv[1] === 'json'){
+               if ($a->argc > 1 && $a->argv[1] === 'json'){
                        echo json_encode($events);
                        killme();
                }