Merge pull request #2135 from rabuzarus/doxygen

[friendica.git] / mod / wallmessage.php

diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index 1a4882b643ee21a272700bfb3ec00b67e4db842c..b8859badd3d30504f6ea7c57f914e3a9be31ad5d 100644 (file)
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -44,7 +44,7 @@ function wallmessage_post(&$a) {
        }
 
        // Work around doubled linefeeds in Tinymce 3.5b2
-dbg(1);
+
        $body = str_replace("\r\n","\n",$body);
        $body = str_replace("\n\n","\n",$body);
 
@@ -67,7 +67,7 @@ dbg(1);
                default:
                        info( t('Message sent.') . EOL );
        }
-dbg(0);
+
 //     goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
        
 }
@@ -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('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;
-       }
+       $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;
+}