X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=75aca1f68dad1e1041a74823cebcdb1a7a6ac996;hb=2503660f97c3f9588f1965c23b98d0c78109ee0b;hp=1a4882b643ee21a272700bfb3ec00b67e4db842c;hpb=7127626f55f0ae5843d38145bf80022b98e4a8d8;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 1a4882b643..75aca1f68d 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -1,12 +1,19 @@
 <?php
-
-require_once('include/message.php');
-
-function wallmessage_post(&$a) {
-
-	$replyto = get_my_url();
-	if(! $replyto) {
-		notice( t('Permission denied.') . EOL);
+/**
+ * @file mod/wallmessage.php
+ */
+use Friendica\App;
+use Friendica\Core\L10n;
+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(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -14,7 +21,7 @@ function wallmessage_post(&$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,15 +29,15 @@ function wallmessage_post(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		logger('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
+	if (! intval($user['unkmail'])) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -38,52 +45,45 @@ function wallmessage_post(&$a) {
 			intval($user['uid'])
 	);
 
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+	if ($r[0]['total'] > $user['cntunkmail']) {
+		notice(L10n::t('Number of daily wall messages for %s exceeded. Message failed.', $user['username']));
 		return;
 	}
 
-	// Work around doubled linefeeds in Tinymce 3.5b2
-dbg(1);
-	$body = str_replace("\r\n","\n",$body);
-	$body = str_replace("\n\n","\n",$body);
+	$ret = Mail::sendWall($user, $body, $subject, $replyto);
 
-	
-	$ret = send_wallmessage($user, $body, $subject, $replyto);
-
-	switch($ret){
+	switch ($ret) {
 		case -1:
-			notice( t('No recipient selected.') . EOL );
+			notice(L10n::t('No recipient selected.') . EOL);
 			break;
 		case -2:
-			notice( t('Unable to check your home location.') . EOL );
+			notice(L10n::t('Unable to check your home location.') . EOL);
 			break;
 		case -3:
-			notice( t('Message could not be sent.') . EOL );
+			notice(L10n::t('Message could not be sent.') . EOL);
 			break;
 		case -4:
-			notice( t('Message collection failure.') . EOL );
+			notice(L10n::t('Message collection failure.') . EOL);
 			break;
 		default:
-			info( t('Message sent.') . EOL );
+			info(L10n::t('Message sent.') . EOL);
 	}
-dbg(0);
-//	goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
-	
+
+	goaway('profile/'.$user['nickname']);
 }
 
 
-function wallmessage_content(&$a) {
+function wallmessage_content(App $a) {
 
-	if(! get_my_url()) {
-		notice( t('Permission denied.') . EOL);
+	if (!Profile::getMyURL()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
 	$recipient = (($a->argc > 1) ? $a->argv[1] : '');
 
-	if(! $recipient) {
-		notice( t('No recipient.') . EOL);
+	if (!$recipient) {
+		notice(L10n::t('No recipient.') . EOL);
 		return;
 	}
 
@@ -91,16 +91,16 @@ function wallmessage_content(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! count($r)) {
-		notice( t('No recipient.') . EOL);
+	if (! DBM::is_result($r)) {
+		notice(L10n::t('No recipient.') . EOL);
 		logger('wallmessage: no recipient');
 		return;
 	}
 
 	$user = $r[0];
 
-	if(! intval($user['unkmail'])) {
-		notice( t('Permission denied.') . EOL);
+	if (!intval($user['unkmail'])) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -108,42 +108,42 @@ function wallmessage_content(&$a) {
 			intval($user['uid'])
 	);
 
-	if($r[0]['total'] > $user['cntunkmail']) {
-		notice( sprintf( t('Number of daily wall messages for %s exceeded. Message failed.', $user['username'])));
+	if ($r[0]['total'] > $user['cntunkmail']) {
+		notice(L10n::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),
-			'$editselect' => '/(profile-jot-text|prvmail-text)/',
-			'$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'),
-			'$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:'),
-			'$subject' => t('Subject:'),
-			'$recipname' => $user['username'],
-			'$nickname' => $user['nickname'],
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait')
-		));
-
-		return $o;
-	}
+	$a->page['htmlhead'] .= replace_macros($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, [
+		'$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:'),
+		'$subject' => L10n::t('Subject:'),
+		'$recipname' => $user['username'],
+		'$nickname' => $user['nickname'],
+		'$subjtxt' => ((x($_REQUEST, 'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+		'$text' => ((x($_REQUEST, 'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+		'$readonly' => '',
+		'$yourmessage' => L10n::t('Your message:'),
+		'$parent' => '',
+		'$upload' => L10n::t('Upload photo'),
+		'$insert' => L10n::t('Insert web link'),
+		'$wait' => L10n::t('Please wait')
+	]);
+
+	return $o;
+}