Merge pull request #6221 from wouter705/20181201-nginx-sample-doc

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 73b57124a21613219d5f4363f05991a3eb789f81..2b0d87ca9921c651c6921dc88f1f191f9acfa061 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -11,10 +11,12 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Model;
 use Friendica\Module\Tos;
+use Friendica\Util\Strings;
 
 require_once 'include/enotify.php';
 
@@ -82,7 +84,7 @@ function register_post(App $a)
 
        $using_invites = Config::get('system', 'invitation_only');
        $num_invites   = Config::get('system', 'number_invites');
-       $invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
+       $invite_id = ((x($_POST, 'invite_id')) ? Strings::escapeTags(trim($_POST['invite_id'])) : '');
 
        if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
                if ($using_invites && $invite_id) {
@@ -228,8 +230,8 @@ function register_content(App $a)
        if (Config::get('system', 'publish_all')) {
                $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
        } else {
-               $publish_tpl = get_markup_template("profile_publish.tpl");
-               $profile_publish = replace_macros($publish_tpl, [
+               $publish_tpl = Renderer::getMarkupTemplate("profile_publish.tpl");
+               $profile_publish = Renderer::replaceMacros($publish_tpl, [
                        '$instance' => 'reg',
                        '$pubdesc' => L10n::t('Include your profile in member directory?'),
                        '$yes_selected' => '',
@@ -244,7 +246,7 @@ function register_content(App $a)
 
        $license = '';
 
-       $tpl = get_markup_template("register.tpl");
+       $tpl = Renderer::getMarkupTemplate("register.tpl");
 
        $arr = ['template' => $tpl];
 
@@ -254,7 +256,7 @@ function register_content(App $a)
 
        $tos = new Tos();
 
-       $o = replace_macros($tpl, [
+       $o = Renderer::replaceMacros($tpl, [
                '$oidhtml' => $oidhtml,
                '$invitations' => Config::get('system', 'invitation_only'),
                '$permonly'    => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,