Merge pull request #3991 from MrPetovan/bug/undefined-variables

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index e0c702cdb0ca45abfcb9e1cdd96e405c058325a1..1ac54c9f8a035e01e7b72cea3355b9ca3cad223d 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,8 +1,12 @@
 <?php
 
+use Friendica\App;
+use \Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/message.php');
 
-function wallmessage_post(App &$a) {
+function wallmessage_post(App $a) {
 
        $replyto = get_my_url();
        if(! $replyto) {
@@ -22,7 +26,7 @@ function wallmessage_post(App &$a) {
                dbesc($recipient)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('wallmessage: no recipient');
                return;
        }
@@ -43,12 +47,6 @@ function wallmessage_post(App &$a) {
                return;
        }
 
-       // Work around doubled linefeeds in Tinymce 3.5b2
-
-       $body = str_replace("\r\n","\n",$body);
-       $body = str_replace("\n\n","\n",$body);
-
-
        $ret = send_wallmessage($user, $body, $subject, $replyto);
 
        switch($ret){
@@ -73,7 +71,7 @@ function wallmessage_post(App &$a) {
 }
 
 
-function wallmessage_content(App &$a) {
+function wallmessage_content(App $a) {
 
        if(! get_my_url()) {
                notice( t('Permission denied.') . EOL);
@@ -91,7 +89,7 @@ function wallmessage_content(App &$a) {
                dbesc($recipient)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                notice( t('No recipient.') . EOL);
                logger('wallmessage: no recipient');
                return;
@@ -113,30 +111,20 @@ function wallmessage_content(App &$a) {
                return;
        }
 
-
-
-       $editselect = 'none';
-       if( feature_enabled(local_user(), 'richtext') )
-               $editselect = '/(profile-jot-text|prvmail-text)/';
-
        $tpl = get_markup_template('wallmsg-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(true),
-               '$editselect' => $editselect,
+               '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
 
        $tpl = get_markup_template('wallmsg-end.tpl');
        $a->page['end'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(true),
-               '$editselect' => $editselect,
+               '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));
-       
 
-       
        $tpl = get_markup_template('wallmessage.tpl');
        $o .= replace_macros($tpl,array(
                '$header' => t('Send Private Message'),