Browse Source

Links to profiles in mails mow show the profile address and "redir" always works

pull/3675/head
Michael 4 years ago
parent
commit
0e8104b172
  1. 67
      mod/message.php
  2. 21
      mod/redir.php
  3. 2
      view/templates/mail_conv.tpl
  4. 2
      view/templates/mail_list.tpl
  5. 6
      view/theme/frio/templates/mail_conv.tpl
  6. 6
      view/theme/frio/templates/mail_list.tpl
  7. 2
      view/theme/frost-mobile/templates/mail_conv.tpl
  8. 2
      view/theme/frost-mobile/templates/mail_list.tpl
  9. 2
      view/theme/frost/templates/mail_conv.tpl
  10. 2
      view/theme/frost/templates/mail_list.tpl
  11. 4
      view/theme/quattro/templates/mail_conv.tpl

67
mod/message.php

@ -78,18 +78,17 @@ function message_post(App $a) {
// fake it to go back to the input form if no recipient listed
if($norecip) {
if ($norecip) {
$a->argc = 2;
$a->argv[1] = 'new';
}
else
} else
goaway($_SESSION['return_url']);
}
// Note: the code in 'item_extract_images' and 'item_redir_and_replace_images'
// is identical to the code in include/conversation.php
if(! function_exists('item_extract_images')) {
if (! function_exists('item_extract_images')) {
function item_extract_images($body) {
$saved_image = array();
@ -105,20 +104,19 @@ function item_extract_images($body) {
$img_st_close++; // make it point to AFTER the closing bracket
$img_end += $img_start;
if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
// This is an embedded image
$saved_image[$cnt] = substr($orig_body, $img_start + $img_st_close, $img_end - ($img_start + $img_st_close));
$new_body = $new_body . substr($orig_body, 0, $img_start) . '[!#saved_image' . $cnt . '#!]';
$cnt++;
}
else
} else
$new_body = $new_body . substr($orig_body, 0, $img_end + strlen('[/img]'));
$orig_body = substr($orig_body, $img_end + strlen('[/img]'));
if($orig_body === false) // in case the body ends on a closing image tag
if ($orig_body === false) // in case the body ends on a closing image tag
$orig_body = '';
$img_start = strpos($orig_body, '[img');
@ -131,7 +129,7 @@ function item_extract_images($body) {
return array('body' => $new_body, 'images' => $saved_image);
}}
if(! function_exists('item_redir_and_replace_images')) {
if (! function_exists('item_redir_and_replace_images')) {
function item_redir_and_replace_images($body, $images, $cid) {
$origbody = $body;
@ -184,18 +182,18 @@ function message_content(App $a) {
));
if(($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
if(! intval($a->argv[2]))
if (($a->argc == 3) && ($a->argv[1] === 'drop' || $a->argv[1] === 'dropconv')) {
if (! intval($a->argv[2]))
return;
// Check if we should do HTML-based delete confirmation
if($_REQUEST['confirm']) {
if ($_REQUEST['confirm']) {
// <form> can't take arguments in its "action" parameter
// so add any arguments as hidden inputs
$query = explode_querystring($a->query_string);
$inputs = array();
foreach($query['args'] as $arg) {
if(strpos($arg, 'confirm=') === false) {
if (strpos($arg, 'confirm=') === false) {
$arg_parts = explode('=', $arg);
$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
}
@ -213,12 +211,12 @@ function message_content(App $a) {
));
}
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
if ($_REQUEST['canceled']) {
goaway($_SESSION['return_url']);
}
$cmd = $a->argv[1];
if($cmd === 'drop') {
if ($cmd === 'drop') {
$r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
intval(local_user())
@ -228,8 +226,7 @@ function message_content(App $a) {
}
//goaway(System::baseUrl(true) . '/message' );
goaway($_SESSION['return_url']);
}
else {
} else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
intval(local_user())
@ -248,13 +245,13 @@ function message_content(App $a) {
// as we will never again have the info we need to re-create it.
// We'll just have to orphan it.
//if($convid) {
//if ($convid) {
// q("delete from conv where id = %d limit 1",
// intval($convid)
// );
//}
if($r)
if ($r)
info( t('Conversation removed.') . EOL );
}
//goaway(System::baseUrl(true) . '/message' );
@ -263,7 +260,7 @@ function message_content(App $a) {
}
if(($a->argc > 1) && ($a->argv[1] === 'new')) {
if (($a->argc > 1) && ($a->argv[1] === 'new')) {
$o .= $header;
@ -286,7 +283,7 @@ function message_content(App $a) {
$prename = $preurl = $preid = '';
if($preselect) {
if ($preselect) {
$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `id` = %d LIMIT 1",
intval(local_user()),
intval($a->argv[2])
@ -375,7 +372,7 @@ function message_content(App $a) {
return $o;
}
if(($a->argc > 1) && (intval($a->argv[1]))) {
if (($a->argc > 1) && (intval($a->argv[1]))) {
$o .= $header;
@ -390,7 +387,7 @@ function message_content(App $a) {
$convid = $r[0]['convid'];
$sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
if($convid)
if ($convid)
$sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
dbesc($r[0]['parent-uri']),
intval($convid)
@ -402,7 +399,7 @@ function message_content(App $a) {
intval(local_user())
);
}
if(! count($messages)) {
if (! count($messages)) {
notice( t('Message not available.') . EOL );
return $o;
}
@ -433,9 +430,9 @@ function message_content(App $a) {
$unknown = false;
foreach($messages as $message) {
if($message['unknown'])
if ($message['unknown'])
$unknown = true;
if($message['from-url'] == $myprofile) {
if ($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
} elseif ($message['contact-id'] != 0) {
@ -448,10 +445,10 @@ function message_content(App $a) {
$extracted = item_extract_images($message['body']);
if($extracted['images'])
if ($extracted['images'])
$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
if($a->theme['template_engine'] === 'internal') {
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::replace(bbcode($message['body'])));
@ -473,6 +470,7 @@ function message_content(App $a) {
'id' => $message['id'],
'from_name' => $from_name_e,
'from_url' => $from_url,
'from_url2' => $message['from-url'],
'sparkle' => $sparkle,
'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'subject' => $subject_e,
@ -492,10 +490,9 @@ function message_content(App $a) {
$tpl = get_markup_template('mail_display.tpl');
if($a->theme['template_engine'] === 'internal') {
if ($a->theme['template_engine'] === 'internal') {
$subjtxt_e = template_escape($message['title']);
}
else {
} else {
$subjtxt_e = $message['title'];
}
@ -560,19 +557,18 @@ function render_messages(array $msg, $t) {
foreach($msg as $rr) {
if($rr['unknown'])
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') {
if ($a->theme['template_engine'] === 'internal') {
$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
$body_e = template_escape($rr['body']);
$to_name_e = template_escape($rr['name']);
}
else {
} else {
$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
$body_e = $rr['body'];
$to_name_e = $rr['name'];
@ -588,6 +584,7 @@ function render_messages(array $msg, $t) {
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
'$from_url2' => $rr['url'],
'$sparkle' => ' sparkle',
'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'$subject' => $subject_e,

21
mod/redir.php

@ -11,9 +11,9 @@ function redir_init(App $a) {
// traditional DFRN
if( $con_url || (local_user() && $a->argc > 1 && intval($a->argv[1])) ) {
if ($con_url || (local_user() && $a->argc > 1 && intval($a->argv[1]))) {
if($con_url) {
if ($con_url) {
$con_url = str_replace('https', 'http', $con_url);
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
@ -21,12 +21,11 @@ function redir_init(App $a) {
intval(local_user())
);
if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
if (!dbm::is_result($r) || ($r[0]['network'] !== NETWORK_DFRN))
goaway(System::baseUrl());
$cid = $r[0]['id'];
}
else {
} else {
$cid = $a->argv[1];
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@ -34,17 +33,21 @@ function redir_init(App $a) {
intval(local_user())
);
if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
if (!dbm::is_result($r)) {
goaway(System::baseUrl());
}
if ($r[0]['network'] !== NETWORK_DFRN) {
goaway($r[0]['url']);
}
}
$dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
if($r[0]['duplex'] && $r[0]['issued-id']) {
if ($r[0]['duplex'] && $r[0]['issued-id']) {
$orig_id = $r[0]['issued-id'];
$dfrn_id = '1:' . $orig_id;
}
if($r[0]['duplex'] && $r[0]['dfrn-id']) {
if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
$orig_id = $r[0]['dfrn-id'];
$dfrn_id = '0:' . $orig_id;
}
@ -63,7 +66,7 @@ function redir_init(App $a) {
logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = (($url) ? '&destination_url=' . $url : '');
goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet);
}
if (local_user()) {

2
view/templates/mail_conv.tpl

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
<a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/templates/mail_list.tpl

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
<a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>

6
view/theme/frio/templates/mail_conv.tpl

@ -1,14 +1,14 @@
<div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}">
<div class="media">
<div class="pull-left contact-photo-wrapper">
<a href="{{$mail.from_url}}">
<img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" />
<a href="{{$mail.from_url}}" title="{{$mail.from_url2}}">
<img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" />
</a>
</div>
<div class="media-body">
<div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
<div class="mail-conv-delete-end"></div>
<h4 class="media-heading"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></h4>
<h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_url2}}">{{$mail.from_name}}</a></h4>
<div class="mail-body">
{{$mail.body}}

6
view/theme/frio/templates/mail_list.tpl

@ -4,8 +4,8 @@
<div class="media">
<div class="pull-left contact-photo-wrapper">
<a href="{{$from_url}}">
<img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" />
<a href="{{$from_url}}" title="{{$from_url2}}">
<img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_url2}}" />
</a>
</div>
<div class="media-body">
@ -26,4 +26,4 @@
<div class="mail-list-outside-wrapper-end"></div>
</li>
</li>

2
view/theme/frost-mobile/templates/mail_conv.tpl

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
<a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/theme/frost-mobile/templates/mail_list.tpl

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
<a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>

2
view/theme/frost/templates/mail_conv.tpl

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
<a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/theme/frost/templates/mail_list.tpl

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
<a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" /></a>
<a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>

4
view/theme/quattro/templates/mail_conv.tpl

@ -23,7 +23,7 @@
<div class="wall-item-actions">
<div class="wall-item-actions-author">
<a href="{{$mail.from_url}}" target="redir"
class="wall-item-name-link"><span
class="wall-item-name-link" title="{{$mail.from_url2}}"><span
class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
<span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
</div>
@ -47,7 +47,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
<a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
<a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

Loading…
Cancel
Save