X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwallmessage.php;h=c0a30bdcf4cc8efc0811cc4c2ffbe8e1052dff78;hb=a7ce601580b07e9b3e7653cbdb0a9b6bbb5c474e;hp=cf349775c67ba8d946dfe1161a3ed686485345e0;hpb=f5290a5a107ef2d6c309c4a3205319c9b0d13994;p=friendica.git

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index cf349775c6..c0a30bdcf4 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -2,7 +2,7 @@
 
 require_once('include/message.php');
 
-function wallmessage_post(&$a) {
+function wallmessage_post(App $a) {
 
 	$replyto = get_my_url();
 	if(! $replyto) {
@@ -22,7 +22,7 @@ function wallmessage_post(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		logger('wallmessage: no recipient');
 		return;
 	}
@@ -48,7 +48,7 @@ function wallmessage_post(&$a) {
 	$body = str_replace("\r\n","\n",$body);
 	$body = str_replace("\n\n","\n",$body);
 
-	
+
 	$ret = send_wallmessage($user, $body, $subject, $replyto);
 
 	switch($ret){
@@ -68,12 +68,12 @@ function wallmessage_post(&$a) {
 			info( t('Message sent.') . EOL );
 	}
 
-//	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);
@@ -91,7 +91,7 @@ function wallmessage_content(&$a) {
 		dbesc($recipient)
 	);
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		notice( t('No recipient.') . EOL);
 		logger('wallmessage: no recipient');
 		return;
@@ -115,35 +115,46 @@ function wallmessage_content(&$a) {
 
 
 
-	$tpl = get_markup_template('wallmsg-header.tpl');
+	$editselect = 'none';
+	if( feature_enabled(local_user(), 'richtext') )
+		$editselect = '/(profile-jot-text|prvmail-text)/';
 
-		$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;
-	}
+	$tpl = get_markup_template('wallmsg-header.tpl');
+	$a->page['htmlhead'] .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$editselect' => $editselect,
+		'$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,
+		'$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;
+}