Rename removeTags to escapeTags

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 141e5e5aca64e3d3af6aea352d160782dd279151..26d7efda5250c027b80a1fa469b6c2feade3d7f2 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -15,7 +15,9 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
@@ -26,6 +28,7 @@ use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -57,7 +60,7 @@ function dfrn_request_init(App $a)
 function dfrn_request_post(App $a)
 {
        if (($a->argc != 2) || (!count($a->profile))) {
-               logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
+               Logger::log('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
                return;
        }
 
@@ -73,7 +76,7 @@ function dfrn_request_post(App $a)
        if ((x($_POST, 'localconfirm')) && ($_POST['localconfirm'] == 1)) {
                // Ensure this is a valid request
                if (local_user() && ($a->user['nickname'] == $a->argv[1]) && (x($_POST, 'dfrn_url'))) {
-                       $dfrn_url = notags(trim($_POST['dfrn_url']));
+                       $dfrn_url = Strings::escapeTags(trim($_POST['dfrn_url']));
                        $aes_allow = (((x($_POST, 'aes_allow')) && ($_POST['aes_allow'] == 1)) ? 1 : 0);
                        $confirm_key = ((x($_POST, 'confirm_key')) ? $_POST['confirm_key'] : "");
                        $hidden = ((x($_POST, 'hidden-contact')) ? intval($_POST['hidden-contact']) : 0);
@@ -85,7 +88,7 @@ function dfrn_request_post(App $a)
                                // Lookup the contact based on their URL (which is the only unique thing we have at the moment)
                                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND NOT `self` LIMIT 1",
                                        intval(local_user()),
-                                       DBA::escape(normalise_link($dfrn_url))
+                                       DBA::escape(Strings::normaliseLink($dfrn_url))
                                );
 
                                if (DBA::isResult($r)) {
@@ -139,7 +142,7 @@ function dfrn_request_post(App $a)
                                                intval(local_user()),
                                                DateTimeFormat::utcNow(),
                                                DBA::escape($dfrn_url),
-                                               DBA::escape(normalise_link($dfrn_url)),
+                                               DBA::escape(Strings::normaliseLink($dfrn_url)),
                                                $parms['addr'],
                                                $parms['fn'],
                                                $parms['nick'],
@@ -267,7 +270,7 @@ function dfrn_request_post(App $a)
                        }
                }
 
-               $real_name = x($_POST, 'realname') ? notags(trim($_POST['realname'])) : '';
+               $real_name = x($_POST, 'realname') ? Strings::escapeTags(trim($_POST['realname'])) : '';
 
                $url = trim($_POST['dfrn_url']);
                if (!strlen($url)) {
@@ -297,7 +300,7 @@ function dfrn_request_post(App $a)
                        $network = Protocol::DFRN;
                }
 
-               logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
+               Logger::log('dfrn_request: url: ' . $url . ',network=' . $network, Logger::DEBUG);
 
                if ($network === Protocol::DFRN) {
                        $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
@@ -318,7 +321,7 @@ function dfrn_request_post(App $a)
                                }
                        }
 
-                       $issued_id = random_string();
+                       $issued_id = Strings::getRandomHex();
 
                        if (is_array($contact_record)) {
                                // There is a contact record but no issued-id, so this
@@ -378,7 +381,7 @@ function dfrn_request_post(App $a)
                                        intval($uid),
                                        DBA::escape(DateTimeFormat::utcNow()),
                                        $parms['url'],
-                                       DBA::escape(normalise_link($url)),
+                                       DBA::escape(Strings::normaliseLink($url)),
                                        $parms['addr'],
                                        $parms['fn'],
                                        $parms['nick'],
@@ -413,7 +416,7 @@ function dfrn_request_post(App $a)
                                return;
                        }
 
-                       $hash = random_string() . (string) time();   // Generate a confirm_key
+                       $hash = Strings::getRandomHex() . (string) time();   // Generate a confirm_key
 
                        if (is_array($contact_record)) {
                                $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
@@ -421,7 +424,7 @@ function dfrn_request_post(App $a)
                                        intval($uid),
                                        intval($contact_record['id']),
                                        ((x($_POST,'knowyou') && ($_POST['knowyou'] == 1)) ? 1 : 0),
-                                       DBA::escape(notags(trim(defaults($_POST, 'dfrn-request-message', '')))),
+                                       DBA::escape(Strings::escapeTags(trim(defaults($_POST, 'dfrn-request-message', '')))),
                                        DBA::escape($hash),
                                        DBA::escape(DateTimeFormat::utcNow())
                                );
@@ -495,12 +498,12 @@ function dfrn_request_content(App $a)
                        return Login::form();
                }
 
-               $dfrn_url = notags(trim(hex2bin($_GET['dfrn_url'])));
+               $dfrn_url = Strings::escapeTags(trim(hex2bin($_GET['dfrn_url'])));
                $aes_allow = x($_GET, 'aes_allow') && $_GET['aes_allow'] == 1 ? 1 : 0;
                $confirm_key = x($_GET, 'confirm_key') ? $_GET['confirm_key'] : "";
 
                // Checking fastlane for validity
-               if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+               if (x($_SESSION, "fastlane") && (Strings::normaliseLink($_SESSION["fastlane"]) == Strings::normaliseLink($dfrn_url))) {
                        $_POST["dfrn_url"] = $dfrn_url;
                        $_POST["confirm_key"] = $confirm_key;
                        $_POST["localconfirm"] = 1;
@@ -513,8 +516,8 @@ function dfrn_request_content(App $a)
                        return; // NOTREACHED
                }
 
-               $tpl = get_markup_template("dfrn_req_confirm.tpl");
-               $o = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("dfrn_req_confirm.tpl");
+               $o = Renderer::replaceMacros($tpl, [
                        '$dfrn_url' => $dfrn_url,
                        '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ),
                        '$hidethem' => L10n::t('Hide this contact'),
@@ -626,9 +629,9 @@ function dfrn_request_content(App $a)
                 * it doesn't matter if they know you or not.
                 */
                if ($a->profile['page-flags'] == Contact::PAGE_NORMAL) {
-                       $tpl = get_markup_template('dfrn_request.tpl');
+                       $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl');
                } else {
-                       $tpl = get_markup_template('auto_request.tpl');
+                       $tpl = Renderer::getMarkupTemplate('auto_request.tpl');
                }
 
                $page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
@@ -638,7 +641,7 @@ function dfrn_request_content(App $a)
                        get_server() . '/servers'
                );
 
-               $o = replace_macros($tpl, [
+               $o = Renderer::replaceMacros($tpl, [
                        '$header' => L10n::t('Friend/Connection Request'),
                        '$desc' => L10n::t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@gnusocial.de'),
                        '$pls_answer' => L10n::t('Please answer the following:'),