Use short form array syntax everywhere

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index e0c702cdb0ca45abfcb9e1cdd96e405c058325a1..547290ca9ad473fbacf3da7b41c25678fc76b691 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,10 +1,16 @@
 <?php
-
-require_once('include/message.php');
-
-function wallmessage_post(App &$a) {
-
-       $replyto = get_my_url();
+/**
+ * @file mod/wallmessage.php
+ */
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Model\Mail;
+use Friendica\Model\Profile;
+
+function wallmessage_post(App $a) {
+
+       $replyto = Profile::getMyURL();
        if(! $replyto) {
                notice( t('Permission denied.') . EOL);
                return;
@@ -22,7 +28,7 @@ function wallmessage_post(App &$a) {
                dbesc($recipient)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('wallmessage: no recipient');
                return;
        }
@@ -43,13 +49,7 @@ 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);
+       $ret = Mail::sendWall($user, $body, $subject, $replyto);
 
        switch($ret){
                case -1:
@@ -73,10 +73,10 @@ function wallmessage_post(App &$a) {
 }
 
 
-function wallmessage_content(App &$a) {
+function wallmessage_content(App $a) {
 
-       if(! get_my_url()) {
-               notice( t('Permission denied.') . EOL);
+       if (!Profile::getMyURL()) {
+               notice(t('Permission denied.') . EOL);
                return;
        }
 
@@ -91,7 +91,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,32 +113,22 @@ 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,
+       $a->page['htmlhead'] .= replace_macros($tpl, [
+               '$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,
+       $a->page['end'] .= replace_macros($tpl, [
+               '$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(
+       $o .= replace_macros($tpl,[
                '$header' => t('Send Private Message'),
                '$subheader' => sprintf( 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' => t('To:'),
@@ -154,7 +144,7 @@ function wallmessage_content(App &$a) {
                '$upload' => t('Upload photo'),
                '$insert' => t('Insert web link'),
                '$wait' => t('Please wait')
-       ));
+       ]);
 
        return $o;
 }