Better content detection for posts to Twitter

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 19078ab26a9179b899d9ac8f12e6241c282d78a5..4e70c005690d686f3e74e1f9712e497bb6d2fd18 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -3,6 +3,10 @@
  * @file mod/events.php
  * @brief The events module
  */
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
 require_once 'include/event.php';
@@ -87,7 +91,7 @@ function events_post(App $a) {
        $type     = 'event';
 
        $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";
+       $onerror_url = System::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);
@@ -112,7 +116,7 @@ function events_post(App $a) {
        $c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
                intval(local_user())
        );
-       if (dbm::is_result($c)) {
+       if (count($c)) {
                $self = $c[0]['id'];
        } else {
                $self = 0;
@@ -126,7 +130,7 @@ function events_post(App $a) {
                $str_contact_deny  = perms2str($_POST['contact_deny']);
 
                // Undo the pseudo-contact of self, since there are real contacts now
-               if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
+               if (strpos($str_contact_allow, '<' . $self . '>') !== false ) {
                        $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
                }
                // Make sure to set the `private` field as true. This is necessary to
@@ -142,7 +146,7 @@ function events_post(App $a) {
                $str_group_allow = $str_contact_deny = $str_group_deny = '';
        }
 
-       /// @TODO One-time array initialization, one large block
+
        $datarray = array();
        $datarray['guid']      = get_guid(32);
        $datarray['start']     = $start;
@@ -187,7 +191,7 @@ function events_content(App $a) {
        }
 
        if ($a->argc == 1) {
-               $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+               $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@@ -215,7 +219,7 @@ function events_content(App $a) {
 
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl, array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$module_url' => '/events',
                '$modparams' => 1,
                '$i18n' => $i18n,
@@ -223,7 +227,7 @@ function events_content(App $a) {
 
        $etpl = get_markup_template('event_end.tpl');
        $a->page['end'] .= replace_macros($etpl, array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
        ));
 
        $o = '';
@@ -334,7 +338,7 @@ function events_content(App $a) {
                        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] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+                                       $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
                                }
                        }
                }
@@ -369,13 +373,13 @@ function events_content(App $a) {
                }
 
                $o = replace_macros($tpl, array(
-                       '$baseurl'   => App::get_baseurl(),
+                       '$baseurl'   => System::baseUrl(),
                        '$tabs'      => $tabs,
                        '$title'     => t('Events'),
                        '$view'      => t('View'),
-                       '$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
-                       '$previous'  => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
-                       '$next'      => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
+                       '$new_event' => array(System::baseUrl() . '/events/new', t('Create New Event'), '', ''),
+                       '$previous'  => array(System::baseUrl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
+                       '$next'      => array(System::baseUrl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
                        '$calendar'  => cal($y, $m, $links, ' eventcal'),
 
                        '$events'    => $events,
@@ -407,9 +411,7 @@ function events_content(App $a) {
 
        // Passed parameters overrides anything found in the DB
        if ($mode === 'edit' || $mode === 'new') {
-               if (!x($orig_event)) {
-                       $orig_event = array();
-               }
+               if (!x($orig_event)) {$orig_event = array();}
                // In case of an error the browser is redirected back here, with these parameters filled in with the previous values
                if (x($_REQUEST, 'nofinish'))    {$orig_event['nofinish']    = $_REQUEST['nofinish'];}
                if (x($_REQUEST, 'adjust'))      {$orig_event['adjust']      = $_REQUEST['adjust'];}
@@ -435,7 +437,7 @@ function events_content(App $a) {
                        $sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
                }
 
-               if ($cid OR ($mode !== 'new')) {
+               if ($cid || ($mode !== 'new')) {
                        $sh_checked .= ' disabled="disabled" ';
                }
 
@@ -475,7 +477,7 @@ function events_content(App $a) {
                $tpl = get_markup_template('event_form.tpl');
 
                $o .= replace_macros($tpl,array(
-                       '$post' => App::get_baseurl() . '/events',
+                       '$post' => System::baseUrl() . '/events',
                        '$eid' => $eid,
                        '$cid' => $cid,
                        '$uri' => $uri,
@@ -532,6 +534,6 @@ function events_content(App $a) {
                        info(t('Event removed') . EOL);
                }
 
-               goaway(App::get_baseurl() . '/events');
+               goaway(System::baseUrl() . '/events');
        }
 }