Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow...

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index e5ebf8646531cf1e2688966a6e6171dea7928d1f..f147e005459ab85f1b7c21710007c368a833254e 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -9,15 +9,18 @@ use Friendica\Content\Nav;
 use Friendica\Content\Widget\CalendarExport;
 use Friendica\Core\ACL;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
+use Friendica\Module\Login;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
-use Friendica\Module\Login;
 
 require_once 'include/items.php';
 
@@ -47,7 +50,7 @@ function events_init(App $a)
 function events_post(App $a)
 {
 
-       logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
+       Logger::log('post: ' . print_r($_REQUEST, true), Logger::DATA);
 
        if (!local_user()) {
                return;
@@ -57,8 +60,8 @@ function events_post(App $a)
        $cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
        $uid = local_user();
 
-       $start_text  = escape_tags(defaults($_REQUEST, 'start_text', ''));
-       $finish_text = escape_tags(defaults($_REQUEST, 'finish_text', ''));
+       $start_text  = Strings::escapeHtml(defaults($_REQUEST, 'start_text', ''));
+       $finish_text = Strings::escapeHtml(defaults($_REQUEST, 'finish_text', ''));
 
        $adjust   = intval(defaults($_POST, 'adjust', 0));
        $nofinish = intval(defaults($_POST, 'nofinish', 0));
@@ -66,8 +69,8 @@ function events_post(App $a)
        // The default setting for the `private` field in event_store() is false, so mirror that
        $private_event = false;
 
-       $start  = NULL_DATE;
-       $finish = NULL_DATE;
+       $start  = DBA::NULL_DATETIME;
+       $finish = DBA::NULL_DATETIME;
 
        if ($start_text) {
                $start = $start_text;
@@ -94,13 +97,13 @@ function events_post(App $a)
        // and we'll waste a bunch of time responding to it. Time that
        // could've been spent doing something else.
 
-       $summary  = escape_tags(trim(defaults($_POST, 'summary', '')));
-       $desc     = escape_tags(trim(defaults($_POST, 'desc', '')));
-       $location = escape_tags(trim(defaults($_POST, 'location', '')));
+       $summary  = Strings::escapeHtml(trim(defaults($_POST, 'summary', '')));
+       $desc     = Strings::escapeHtml(trim(defaults($_POST, 'desc', '')));
+       $location = Strings::escapeHtml(trim(defaults($_POST, 'location', '')));
        $type     = 'event';
 
        $action = ($event_id == '') ? 'new' : "event/" . $event_id;
-       $onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+       $onerror_path = "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(L10n::t('Event can not end before it has started.') . EOL);
@@ -108,16 +111,16 @@ function events_post(App $a)
                        echo L10n::t('Event can not end before it has started.');
                        killme();
                }
-               goaway($onerror_url);
+               $a->internalRedirect($onerror_path);
        }
 
-       if (!$summary || ($start === NULL_DATE)) {
+       if (!$summary || ($start === DBA::NULL_DATETIME)) {
                notice(L10n::t('Event title and start time are required.') . EOL);
                if (intval($_REQUEST['preview'])) {
                        echo L10n::t('Event title and start time are required.');
                        killme();
                }
-               goaway($onerror_url);
+               $a->internalRedirect($onerror_path);
        }
 
        $share = intval(defaults($_POST, 'share', 0));
@@ -187,7 +190,7 @@ function events_post(App $a)
                Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
        }
 
-       goaway($_SESSION['return_url']);
+       $a->internalRedirect('events');
 }
 
 function events_content(App $a)
@@ -198,7 +201,7 @@ function events_content(App $a)
        }
 
        if ($a->argc == 1) {
-               $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+               $_SESSION['return_path'] = $a->cmd;
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@@ -224,8 +227,8 @@ function events_content(App $a)
        // get the translation strings for the callendar
        $i18n = Event::getStrings();
 
-       $htpl = get_markup_template('event_head.tpl');
-       $a->page['htmlhead'] .= replace_macros($htpl, [
+       $htpl = Renderer::getMarkupTemplate('event_head.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$baseurl' => System::baseUrl(),
                '$module_url' => '/events',
                '$modparams' => 1,
@@ -366,9 +369,9 @@ function events_content(App $a)
                }
 
                if (!empty($_GET['id'])) {
-                       $tpl = get_markup_template("event.tpl");
+                       $tpl = Renderer::getMarkupTemplate("event.tpl");
                } else {
-                       $tpl = get_markup_template("events_js.tpl");
+                       $tpl = Renderer::getMarkupTemplate("events_js.tpl");
                }
 
                // Get rid of dashes in key names, Smarty3 can't handle them
@@ -381,7 +384,7 @@ function events_content(App $a)
                        $events[$key]['item'] = $event_item;
                }
 
-               $o = replace_macros($tpl, [
+               $o = Renderer::replaceMacros($tpl, [
                        '$baseurl'   => System::baseUrl(),
                        '$tabs'      => $tabs,
                        '$title'     => L10n::t('Events'),
@@ -496,9 +499,9 @@ function events_content(App $a)
                        $uri = '';
                }
 
-               $tpl = get_markup_template('event_form.tpl');
+               $tpl = Renderer::getMarkupTemplate('event_form.tpl');
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$post' => System::baseUrl() . '/events',
                        '$eid'  => $eid,
                        '$cid'  => $cid,
@@ -577,6 +580,6 @@ function events_content(App $a)
                        info(L10n::t('Event removed') . EOL);
                }
 
-               goaway(System::baseUrl() . '/events');
+               $a->internalRedirect('events');
        }
 }