X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=fe3b9a82a6f641deb968c1964f2b2e65d1f760d9;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=d2fc9109745e7d2e1aa266a83599cc95aff53ecc;hpb=5a6da8b447430174ae231a3b8203fd4bd8416cc1;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index d2fc910974..fe3b9a82a6 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,11 +1,14 @@
 <?php
 
+use Friendica\App;
+use \Friendica\Core\System;
+
 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 +17,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;
 	}
 
@@ -29,7 +32,7 @@ function wallmessage_post(App $a) {
 
 	$user = $r[0];
 
-	if (! intval($user['unkmail'])) {
+	if(! intval($user['unkmail'])) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -38,7 +41,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 +72,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;
 	}
@@ -93,33 +96,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:')
 	));