X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmessage.php;h=9bd5b0d72278bf0367cf79f4c3c7c59454924c17;hb=46d383369cdb2fca67122f15aa2f68dff3f625d1;hp=178d99bba5fb0383d7958bf712f95283152a2fc6;hpb=5837fd4f817c06a723af9ad27298b6bef40e37e5;p=friendica.git
diff --git a/mod/message.php b/mod/message.php
index 178d99bba5..9bd5b0d722 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,15 +2,23 @@
require_once('include/acl_selectors.php');
require_once('include/message.php');
+require_once('include/Smilies.php');
function message_init(&$a) {
- $tabs = array();
+
+ $tabs = '';
+
+ if ($a->argc >1 && is_numeric($a->argv[1])) {
+ $tabs = render_messages(get_messages(local_user(),0,5), 'mail_list.tpl');
+ }
+
$new = array(
'label' => t('New Message'),
- 'url' => $a->get_baseurl(true) . '/message/new',
+ 'url' => 'message/new',
'sel'=> ($a->argv[1] == 'new'),
+ 'accesskey' => 'm',
);
-
+
$tpl = get_markup_template('message_side.tpl');
$a->page['aside'] = replace_macros($tpl, array(
'$tabs'=>$tabs,
@@ -29,7 +37,7 @@ function message_init(&$a) {
'$baseurl' => $a->get_baseurl(true),
'$base' => $base
));
-
+
}
function message_post(&$a) {
@@ -54,7 +62,7 @@ function message_post(&$a) {
if(! $plaintext) {
$body = fix_mce_lf($body);
}
-
+
$ret = send_message($recipient, $body, $subject, $replyto);
$norecip = false;
@@ -83,7 +91,7 @@ function message_post(&$a) {
$a->argv[1] = 'new';
}
else
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
@@ -175,7 +183,7 @@ function message_content(&$a) {
return;
}
- $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
+ $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
$tpl = get_markup_template('mail_head.tpl');
$header = replace_macros($tpl, array(
@@ -214,7 +222,7 @@ function message_content(&$a) {
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
$cmd = $a->argv[1];
@@ -227,14 +235,14 @@ function message_content(&$a) {
info( t('Message deleted.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
intval(local_user())
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$parent = $r[0]['parent-uri'];
$convid = $r[0]['convid'];
@@ -245,8 +253,8 @@ function message_content(&$a) {
// remove diaspora conversation pointer
// Actually if we do this, we can never receive another reply to that conversation,
- // as we will never again have the info we need to re-create it.
- // We'll just have to orphan it.
+ // as we will never again have the info we need to re-create it.
+ // We'll just have to orphan it.
//if($convid) {
// q("delete from conv where id = %d limit 1",
@@ -258,7 +266,7 @@ function message_content(&$a) {
info( t('Conversation removed.') . EOL );
}
//goaway($a->get_baseurl(true) . '/message' );
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway($_SESSION['return_url']);
}
}
@@ -297,15 +305,31 @@ function message_content(&$a) {
$prename = $preurl = $preid = '';
if($preselect) {
- $r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
+ $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval(local_user()),
intval($a->argv[2])
);
- if(count($r)) {
+ if (!dbm::is_result($r)) {
+ $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
+ intval(local_user()),
+ dbesc(normalise_link(base64_decode($a->argv[2])))
+ );
+ }
+
+ if (!dbm::is_result($r)) {
+ $r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
+ intval(local_user()),
+ dbesc(base64_decode($a->argv[2]))
+ );
+ }
+
+ if (dbm::is_result($r)) {
$prename = $r[0]['name'];
$preurl = $r[0]['url'];
$preid = $r[0]['id'];
- }
+ $preselect = array($preid);
+ } else
+ $preselect = false;
}
$prefill = (($preselect) ? $prename : '');
@@ -334,7 +358,6 @@ function message_content(&$a) {
'$wait' => t('Please wait'),
'$submit' => t('Submit')
));
-
return $o;
}
@@ -343,75 +366,30 @@ function message_content(&$a) {
if($a->argc == 1) {
- // list messages
+ // List messages
$o .= $header;
-
$r = q("SELECT count(*) AS `total` FROM `mail`
WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
- intval(local_user()),
- dbesc($myprofile)
+ intval(local_user())
);
- if(count($r))
+
+ if (dbm::is_result($r)) {
$a->set_pager_total($r[0]['total']);
+ }
- $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
- `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
- count( * ) as count
- FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
- WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
- intval(local_user()),
- //
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
- );
+ $r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
- if(! count($r)) {
+ if(! dbm::is_result($r)) {
info( t('No messages.') . EOL);
return $o;
}
- $tpl = get_markup_template('mail_list.tpl');
- foreach($r as $rr) {
- 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 {
- $partecipants = sprintf( t("%s and You"), $rr['from-name']);
- }
-
- if($a->theme['template_engine'] === 'internal') {
- $subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''));
- $body_e = template_escape($rr['body']);
- $to_name_e = template_escape($rr['name']);
- }
- else {
- $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '');
- $body_e = $rr['body'];
- $to_name_e = $rr['name'];
- }
+ $o .= render_messages($r, 'mail_list.tpl');
- $o .= replace_macros($tpl, array(
- '$id' => $rr['id'],
- '$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']) ? $rr['thumb'] : $rr['from-photo']),
- '$subject' => $subject_e,
- '$delete' => t('Delete conversation'),
- '$body' => $body_e,
- '$to_name' => $to_name_e,
- '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
- '$ago' => relative_date($rr['mailcreated']),
- '$seen' => $rr['mailseen'],
- '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
- ));
- }
$o .= paginate($a);
+
return $o;
}
@@ -429,7 +407,7 @@ function message_content(&$a) {
intval(local_user()),
intval($a->argv[1])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$contact_id = $r[0]['contact-id'];
$convid = $r[0]['convid'];
@@ -485,9 +463,11 @@ function message_content(&$a) {
if($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
- }
- else {
- $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
+ } elseif ($message['contact-id'] != 0) {
+ $from_url = 'redir/'.$message['contact-id'];
+ $sparkle = ' sparkle';
+ } else {
+ $from_url = $message['from-url']."?zrl=".urlencode($myprofile);
$sparkle = ' sparkle';
}
@@ -499,22 +479,27 @@ function message_content(&$a) {
if($a->theme['template_engine'] === 'internal') {
$from_name_e = template_escape($message['from-name']);
$subject_e = template_escape($message['title']);
- $body_e = template_escape(smilies(bbcode($message['body'])));
+ $body_e = template_escape(Smilies::replace(bbcode($message['body'])));
$to_name_e = template_escape($message['name']);
- }
- else {
+ } else {
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
- $body_e = smilies(bbcode($message['body']));
+ $body_e = Smilies::replace(bbcode($message['body']));
$to_name_e = $message['name'];
}
+ $contact = get_contact_details_by_url($message['from-url']);
+ if (isset($contact["thumb"]))
+ $from_photo = $contact["thumb"];
+ else
+ $from_photo = $message['from-photo'];
+
$mails[] = array(
'id' => $message['id'],
'from_name' => $from_name_e,
'from_url' => $from_url,
'sparkle' => $sparkle,
- 'from_photo' => $message['from-photo'],
+ 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'subject' => $subject_e,
'body' => $body_e,
'delete' => t('Delete message'),
@@ -568,5 +553,70 @@ function message_content(&$a) {
return $o;
}
+}
+
+function get_messages($user, $lstart, $lend) {
+
+ return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
+ `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
+ count( * ) as count
+ FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
+ WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
+ intval($user), intval($lstart), intval($lend)
+ );
+}
+
+function render_messages(array $msg, $t) {
+
+ $a = get_app();
+
+ $tpl = get_markup_template($t);
+ $rslt = '';
+
+ $myprofile = $a->get_baseurl().'/profile/' . $a->user['nickname'];
+
+ foreach($msg as $rr) {
+
+ if($rr['unknown'])
+ $participants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+ elseif (link_compare($rr['from-url'], $myprofile))
+ $participants = sprintf( t("You and %s"), $rr['name']);
+ else
+ $participants = sprintf(t("%s and You"), $rr['from-name']);
+
+ if($a->theme['template_engine'] === 'internal') {
+ $subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''));
+ $body_e = template_escape($rr['body']);
+ $to_name_e = template_escape($rr['name']);
+ }
+ else {
+ $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . '');
+ $body_e = $rr['body'];
+ $to_name_e = $rr['name'];
+ }
+
+ $contact = get_contact_details_by_url($rr['url']);
+ if (isset($contact["thumb"]))
+ $from_photo = $contact["thumb"];
+ else
+ $from_photo = (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']);
+
+ $rslt .= replace_macros($tpl, array(
+ '$id' => $rr['id'],
+ '$from_name' => $participants,
+ '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
+ '$sparkle' => ' sparkle',
+ '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
+ '$subject' => $subject_e,
+ '$delete' => t('Delete conversation'),
+ '$body' => $body_e,
+ '$to_name' => $to_name_e,
+ '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
+ '$ago' => relative_date($rr['mailcreated']),
+ '$seen' => $rr['mailseen'],
+ '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
+ ));
+ }
+ return $rslt;
}