Don't try to build form for "None" backend.

[friendica.git] / include / enotify.php

diff --git a/include/enotify.php b/include/enotify.php
index bc9a7b9b0e6b6028ab9585131270a5a8c28e3fd2..9edfaaca82b8e2ea2a5b46365b94ad74c859fd61 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -8,12 +8,14 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
+use Friendica\Util\Strings;
 
 /**
  * @brief Creates a notification entry and possibly sends a mail
@@ -26,7 +28,7 @@ use Friendica\Util\Emailer;
  */
 function notification($params)
 {
-       $a = get_app();
+       $a = \get_app();
 
        // Temporary logging for finding the origin
        if (!isset($params['language']) || !isset($params['uid'])) {
@@ -156,7 +158,7 @@ function notification($params)
                        $item = Item::selectFirstForUser($params['uid'], Item::ITEM_FIELDLIST, ['id' => $parent_id]);
                }
 
-               $item_post_type = item_post_type($item);
+               $item_post_type = Item::postType($item);
                $itemlink = $item['plink'];
 
                // "a post"
@@ -456,7 +458,7 @@ function notification($params)
                Logger::log("adding notification entry", Logger::DEBUG);
                do {
                        $dups = false;
-                       $hash = random_string();
+                       $hash = Strings::getRandomHex();
                        if (DBA::exists('notify', ['hash' => $hash])) {
                                $dups = true;
                        }
@@ -517,7 +519,7 @@ function notification($params)
                }
 
                $itemlink = System::baseUrl().'/notify/view/'.$notify_id;
-               $msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
+               $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]);
                $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
 
                $fields = ['msg' => $msg, 'msg_cache' => $msg_cache];
@@ -589,8 +591,8 @@ function notification($params)
                $content_allowed = ((!Config::get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL));
 
                // load the template for private message notifications
-               $tpl = get_markup_template('email_notify_html.tpl');
-               $email_html_body = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('email_notify_html.tpl');
+               $email_html_body = Renderer::replaceMacros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => str_replace("\n", "<br>\n", $datarray['preamble']),
@@ -610,8 +612,8 @@ function notification($params)
                ]);
 
                // load the template for private message notifications
-               $tpl = get_markup_template('email_notify_text.tpl');
-               $email_text_body = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate('email_notify_text.tpl');
+               $email_text_body = Renderer::replaceMacros($tpl, [
                        '$banner'       => $datarray['banner'],
                        '$product'      => $datarray['product'],
                        '$preamble'     => $datarray['preamble'],
@@ -702,11 +704,11 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
                // Check for invalid profile urls. 13 should be the shortest possible profile length:
                // http://a.bc/d
                // Additionally check for invalid urls that would return the normalised value "http:"
-               if ((strlen($profile) >= 13) && (normalise_link($profile) != "http:")) {
+               if ((strlen($profile) >= 13) && (Strings::normaliseLink($profile) != "http:")) {
                        if (!in_array($profile, $profiles2))
                                $profiles2[] = $profile;
 
-                       $profile = normalise_link($profile);
+                       $profile = Strings::normaliseLink($profile);
                        if (!in_array($profile, $profiles2))
                                $profiles2[] = $profile;
 
@@ -760,7 +762,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 
                        if (DBA::isResult($tags)) {
                                foreach ($tags AS $tag) {
-                                       $condition = ['nurl' => normalise_link($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true];
+                                       $condition = ['nurl' => Strings::normaliseLink($tag["url"]), 'uid' => $uid, 'notify_new_posts' => true];
                                        $r = DBA::exists('contact', $condition);
                                        if ($r) {
                                                $send_notification = true;