Merge remote-tracking branch 'origin/Xml-#3878' into Xml-#3878

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index d2fc9109745e7d2e1aa266a83599cc95aff53ecc..1ac54c9f8a035e01e7b72cea3355b9ca3cad223d 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,11 +1,15 @@
 <?php
 
+use Friendica\App;
+use \Friendica\Core\System;
+use Friendica\Database\DBM;
+
 require_once('include/message.php');
 
 function wallmessage_post(App $a) {
 
        $replyto = get_my_url();
-       if (! $replyto) {
+       if(! $replyto) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -14,7 +18,7 @@ function wallmessage_post(App $a) {
        $body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
 
        $recipient = (($a->argc > 1) ? notags($a->argv[1]) : '');
-       if ((! $recipient) || (! $body)) {
+       if((! $recipient) || (! $body)) {
                return;
        }
 
@@ -22,14 +26,14 @@ function wallmessage_post(App $a) {
                dbesc($recipient)
        );
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                logger('wallmessage: no recipient');
                return;
        }
 
        $user = $r[0];
 
-       if (! intval($user['unkmail'])) {
+       if(! intval($user['unkmail'])) {
                notice( t('Permission denied.') . EOL);
                return;
        }
@@ -38,7 +42,7 @@ function wallmessage_post(App $a) {
                        intval($user['uid'])
        );
 
-       if ($r[0]['total'] > $user['cntunkmail']) {
+       if($r[0]['total'] > $user['cntunkmail']) {
                notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
                return;
        }
@@ -69,14 +73,14 @@ function wallmessage_post(App $a) {
 
 function wallmessage_content(App $a) {
 
-       if (! get_my_url()) {
+       if(! get_my_url()) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
        $recipient = (($a->argc > 1) ? $a->argv[1] : '');
 
-       if (! $recipient) {
+       if(! $recipient) {
                notice( t('No recipient.') . EOL);
                return;
        }
@@ -85,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;
@@ -93,33 +97,30 @@ function wallmessage_content(App $a) {
 
        $user = $r[0];
 
-       if (! intval($user['unkmail'])) {
+       if(! intval($user['unkmail'])) {
                notice( t('Permission denied.') . EOL);
                return;
        }
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `mail` WHERE `uid` = %d AND `created` > UTC_TIMESTAMP() - INTERVAL 1 DAY AND `unknown` = 1",
+       $r = q("select count(*) as total from mail where uid = %d and created > UTC_TIMESTAMP() - INTERVAL 1 day and unknown = 1",
                        intval($user['uid'])
        );
 
-       if (!dbm::is_result($r)) {
-               ///@TODO Output message to use of failed query
-               return;
-       } elseif ($r[0]['total'] > $user['cntunkmail']) {
+       if($r[0]['total'] > $user['cntunkmail']) {
                notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
                return;
        }
 
        $tpl = get_markup_template('wallmsg-header.tpl');
        $a->page['htmlhead'] .= replace_macros($tpl, array(
-               '$baseurl' => $a->get_baseurl(true),
+               '$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),
+               '$baseurl' => System::baseUrl(true),
                '$nickname' => $user['nickname'],
                '$linkurl' => t('Please enter a link URL:')
        ));