aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rwxr-xr-xmod/message.php19
-rwxr-xr-xmod/settings.php2
-rw-r--r--mod/wallmessage.php149
3 files changed, 164 insertions, 6 deletions
diff --git a/mod/message.php b/mod/message.php
index c347468d1..1369fde2e 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -223,9 +223,13 @@ function message_content(&$a) {
$tpl = get_markup_template('mail_list.tpl');
foreach($r as $rr) {
- if (link_compare($rr['from-url'],$myprofile)){
+ if($rr['unknown']) {
+ $partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+ }
+ elseif (link_compare($rr['from-url'],$myprofile)){
$partecipants = sprintf( t("You and %s"), $rr['name']);
- } else {
+ }
+ else {
$partecipants = sprintf( t("%s and You"), $rr['from-name']);
}
@@ -234,7 +238,7 @@ function message_content(&$a) {
'$from_name' => $partecipants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
'$sparkle' => ' sparkle',
- '$from_photo' => $rr['thumb'],
+ '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
'$delete' => t('Delete conversation'),
'$body' => template_escape($rr['body']),
@@ -297,7 +301,11 @@ function message_content(&$a) {
$mails = array();
$seen = 0;
+ $unknown = false;
+
foreach($messages as $message) {
+ if($message['unknown'])
+ $unknown = true;
if($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
@@ -323,7 +331,7 @@ function message_content(&$a) {
}
$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-
+
$tpl = get_markup_template('mail_display.tpl');
$o = replace_macros($tpl, array(
@@ -331,7 +339,8 @@ function message_content(&$a) {
'$thread_subject' => $message['title'],
'$thread_seen' => $seen,
'$delete' => t('Delete conversation'),
-
+ '$canreply' => (($unknown) ? false : '1'),
+ '$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),
'$mails' => $mails,
// reply
diff --git a/mod/settings.php b/mod/settings.php
index ce2d64851..926d1faa5 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -876,7 +876,7 @@ function settings_content(&$a) {
$unkmail = replace_macros($opt_tpl,array(
- '$field' => array('unkmail', t('Permit unknown people to send you private messages?'), $unkmail, '', array(t('No'),t('Yes'))),
+ '$field' => array('unkmail', t('Permit unknown people to send you private mail?'), $unkmail, '', array(t('No'),t('Yes'))),
));
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
new file mode 100644
index 000000000..1a4882b64
--- /dev/null
+++ b/mod/wallmessage.php
@@ -0,0 +1,149 @@
+<?php
+
+require_once('include/message.php');
+
+function wallmessage_post(&$a) {
+
+ $replyto = get_my_url();
+ if(! $replyto) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : '');
+ $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
+
+ $recipient = (($a->argc > 1) ? notags($a->argv[1]) : '');
+ if((! $recipient) || (! $body)) {
+ return;
+ }
+
+ $r = q("select * from user where nickname = '%s' limit 1",
+ dbesc($recipient)
+ );
+
+ if(! count($r)) {
+ logger('wallmessage: no recipient');
+ return;
+ }
+
+ $user = $r[0];
+
+ 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",
+ intval($user['uid'])
+ );
+
+ if($r[0]['total'] > $user['cntunkmail']) {
+ notice( sprintf( 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 = send_wallmessage($user, $body, $subject, $replyto);
+
+ switch($ret){
+ case -1:
+ notice( t('No recipient selected.') . EOL );
+ break;
+ case -2:
+ notice( t('Unable to check your home location.') . EOL );
+ break;
+ case -3:
+ notice( t('Message could not be sent.') . EOL );
+ break;
+ case -4:
+ notice( t('Message collection failure.') . EOL );
+ break;
+ default:
+ info( t('Message sent.') . EOL );
+ }
+dbg(0);
+// goaway($a->get_baseurl() . '/profile/' . $user['nickname']);
+
+}
+
+
+function wallmessage_content(&$a) {
+
+ if(! get_my_url()) {
+ notice( t('Permission denied.') . EOL);
+ return;
+ }
+
+ $recipient = (($a->argc > 1) ? $a->argv[1] : '');
+
+ if(! $recipient) {
+ notice( t('No recipient.') . EOL);
+ return;
+ }
+
+ $r = q("select * from user where nickname = '%s' limit 1",
+ dbesc($recipient)
+ );
+
+ if(! count($r)) {
+ notice( t('No recipient.') . EOL);
+ logger('wallmessage: no recipient');
+ return;
+ }
+
+ $user = $r[0];
+
+ 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",
+ intval($user['uid'])
+ );
+
+ 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),
+ '$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;
+ }