get markup template

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 75aca1f68dad1e1041a74823cebcdb1a7a6ac996..78cdd5a55a4f8bf86afc4711c82ccf3998a3b286 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -4,8 +4,10 @@
  */
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Mail;
 use Friendica\Model\Profile;
 
@@ -26,11 +28,11 @@ function wallmessage_post(App $a) {
        }
 
        $r = q("select * from user where nickname = '%s' limit 1",
-               dbesc($recipient)
+               DBA::escape($recipient)
        );
 
-       if (! DBM::is_result($r)) {
-               logger('wallmessage: no recipient');
+       if (! DBA::isResult($r)) {
+               Logger::log('wallmessage: no recipient');
                return;
        }
 
@@ -69,7 +71,7 @@ function wallmessage_post(App $a) {
                        info(L10n::t('Message sent.') . EOL);
        }
 
-       goaway('profile/'.$user['nickname']);
+       $a->internalRedirect('profile/'.$user['nickname']);
 }
 
 
@@ -88,12 +90,12 @@ function wallmessage_content(App $a) {
        }
 
        $r = q("select * from user where nickname = '%s' limit 1",
-               dbesc($recipient)
+               DBA::escape($recipient)
        );
 
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                notice(L10n::t('No recipient.') . EOL);
-               logger('wallmessage: no recipient');
+               Logger::log('wallmessage: no recipient');
                return;
        }
 
@@ -113,22 +115,15 @@ function wallmessage_content(App $a) {
                return;
        }
 
-       $tpl = get_markup_template('wallmsg-header.tpl');
-       $a->page['htmlhead'] .= replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl');
+       $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
                '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => L10n::t('Please enter a link URL:')
        ]);
 
-       $tpl = get_markup_template('wallmsg-end.tpl');
-       $a->page['end'] .= replace_macros($tpl, [
-               '$baseurl' => System::baseUrl(true),
-               '$nickname' => $user['nickname'],
-               '$linkurl' => L10n::t('Please enter a link URL:')
-       ]);
-
-       $tpl = get_markup_template('wallmessage.tpl');
-       $o = replace_macros($tpl, [
+       $tpl = Renderer::getMarkupTemplate('wallmessage.tpl');
+       $o = Renderer::replaceMacros($tpl, [
                '$header' => L10n::t('Send Private Message'),
                '$subheader' => L10n::t('If you wish for %s to respond, please check that the privacy settings on your site allow private mail from unknown senders.', $user['username']),
                '$to' => L10n::t('To:'),