From 0e8104b1729672182671ae1de9cd10553349955e Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 31 Aug 2017 12:01:44 +0000 Subject: [PATCH 1/3] Links to profiles in mails mow show the profile address and "redir" always works --- mod/message.php | 67 +++++++++---------- mod/redir.php | 21 +++--- view/templates/mail_conv.tpl | 2 +- view/templates/mail_list.tpl | 2 +- view/theme/frio/templates/mail_conv.tpl | 6 +- view/theme/frio/templates/mail_list.tpl | 6 +- .../frost-mobile/templates/mail_conv.tpl | 2 +- .../frost-mobile/templates/mail_list.tpl | 2 +- view/theme/frost/templates/mail_conv.tpl | 2 +- view/theme/frost/templates/mail_list.tpl | 2 +- view/theme/quattro/templates/mail_conv.tpl | 4 +- 11 files changed, 58 insertions(+), 58 deletions(-) diff --git a/mod/message.php b/mod/message.php index 01bbae7f5e..96ba599348 100644 --- a/mod/message.php +++ b/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']) { //
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'] : '' . $rr['title'] . '')); $body_e = template_escape($rr['body']); $to_name_e = template_escape($rr['name']); - } - else { + } else { $subject_e = (($rr['mailseen']) ? $rr['title'] : '' . $rr['title'] . ''); $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, diff --git a/mod/redir.php b/mod/redir.php index 739ad01034..6d3ffb2224 100644 --- a/mod/redir.php +++ b/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()) { diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl index 72f96dde37..990af5ca01 100644 --- a/view/templates/mail_conv.tpl +++ b/view/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl index f721d7e4d9..88a482af4a 100644 --- a/view/templates/mail_list.tpl +++ b/view/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frio/templates/mail_conv.tpl b/view/theme/frio/templates/mail_conv.tpl index dd091249a3..a130466cd1 100644 --- a/view/theme/frio/templates/mail_conv.tpl +++ b/view/theme/frio/templates/mail_conv.tpl @@ -1,14 +1,14 @@
- - {{$mail.from_name}} + + {{$mail.from_name}}
{{$mail.date}}
-

{{$mail.from_name}}

+

{{$mail.from_name}}

{{$mail.body}} diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl index 1adc7de46f..d74306a807 100644 --- a/view/theme/frio/templates/mail_list.tpl +++ b/view/theme/frio/templates/mail_list.tpl @@ -4,8 +4,8 @@
- - {{$from_name}} + + {{$from_name}}
@@ -26,4 +26,4 @@
- \ No newline at end of file + diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl index 7e53113d82..78afeb51f6 100644 --- a/view/theme/frost-mobile/templates/mail_conv.tpl +++ b/view/theme/frost-mobile/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl index fe6cd8b627..c0d5d1da19 100644 --- a/view/theme/frost-mobile/templates/mail_list.tpl +++ b/view/theme/frost-mobile/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl index 5402c9da8b..bdf97bd27a 100644 --- a/view/theme/frost/templates/mail_conv.tpl +++ b/view/theme/frost/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl index fe6cd8b627..c0d5d1da19 100644 --- a/view/theme/frost/templates/mail_list.tpl +++ b/view/theme/frost/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl index 69673470ed..d51c3e34a3 100644 --- a/view/theme/quattro/templates/mail_conv.tpl +++ b/view/theme/quattro/templates/mail_conv.tpl @@ -23,7 +23,7 @@
{{$mail.from_name}} {{$mail.ago}}
@@ -47,7 +47,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
From 88fb02db8d830d8a74cd0aed67ee52f41a2151ab Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 31 Aug 2017 12:10:17 +0000 Subject: [PATCH 2/3] Small correction --- mod/redir.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mod/redir.php b/mod/redir.php index 6d3ffb2224..998e9cc0bd 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -21,9 +21,12 @@ 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(($url != '' ? $url : $r[0]['url'])); + } $cid = $r[0]['id']; } else { $cid = $a->argv[1]; @@ -37,7 +40,7 @@ function redir_init(App $a) { goaway(System::baseUrl()); } if ($r[0]['network'] !== NETWORK_DFRN) { - goaway($r[0]['url']); + goaway(($url != '' ? $url : $r[0]['url'])); } } From b1668ffddaeff2aeb256cb23ab094d78b10a5108 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 1 Sep 2017 19:32:12 +0000 Subject: [PATCH 3/3] Address instead of url --- mod/message.php | 4 ++-- view/templates/mail_conv.tpl | 2 +- view/templates/mail_list.tpl | 2 +- view/theme/frio/templates/mail_conv.tpl | 6 +++--- view/theme/frio/templates/mail_list.tpl | 4 ++-- view/theme/frost-mobile/templates/mail_conv.tpl | 2 +- view/theme/frost-mobile/templates/mail_list.tpl | 2 +- view/theme/frost/templates/mail_conv.tpl | 2 +- view/theme/frost/templates/mail_list.tpl | 2 +- view/theme/quattro/templates/mail_conv.tpl | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mod/message.php b/mod/message.php index 96ba599348..f358ba975a 100644 --- a/mod/message.php +++ b/mod/message.php @@ -470,7 +470,7 @@ function message_content(App $a) { 'id' => $message['id'], 'from_name' => $from_name_e, 'from_url' => $from_url, - 'from_url2' => $message['from-url'], + 'from_addr' => $contact['addr'], 'sparkle' => $sparkle, 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), 'subject' => $subject_e, @@ -584,7 +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'], + '$from_addr' => $contact['addr'], '$sparkle' => ' sparkle', '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), '$subject' => $subject_e, diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl index 990af5ca01..9ad7fec345 100644 --- a/view/templates/mail_conv.tpl +++ b/view/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl index 88a482af4a..04f23a3714 100644 --- a/view/templates/mail_list.tpl +++ b/view/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frio/templates/mail_conv.tpl b/view/theme/frio/templates/mail_conv.tpl index a130466cd1..2ad9898495 100644 --- a/view/theme/frio/templates/mail_conv.tpl +++ b/view/theme/frio/templates/mail_conv.tpl @@ -1,14 +1,14 @@
- - {{$mail.from_name}} + + {{$mail.from_name}}
{{$mail.date}}
-

{{$mail.from_name}}

+

{{$mail.from_name}}

{{$mail.body}} diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl index d74306a807..d5062a2322 100644 --- a/view/theme/frio/templates/mail_list.tpl +++ b/view/theme/frio/templates/mail_list.tpl @@ -4,8 +4,8 @@
- - {{$from_name}} + + {{$from_name}}
diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl index 78afeb51f6..3d9eebec2b 100644 --- a/view/theme/frost-mobile/templates/mail_conv.tpl +++ b/view/theme/frost-mobile/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl index c0d5d1da19..ffde5d68f8 100644 --- a/view/theme/frost-mobile/templates/mail_list.tpl +++ b/view/theme/frost-mobile/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl index bdf97bd27a..7a43952c4c 100644 --- a/view/theme/frost/templates/mail_conv.tpl +++ b/view/theme/frost/templates/mail_conv.tpl @@ -1,7 +1,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl index c0d5d1da19..ffde5d68f8 100644 --- a/view/theme/frost/templates/mail_list.tpl +++ b/view/theme/frost/templates/mail_list.tpl @@ -1,7 +1,7 @@
- {{$from_name}} + {{$from_name}}
{{$from_name}}
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl index d51c3e34a3..89827cd314 100644 --- a/view/theme/quattro/templates/mail_conv.tpl +++ b/view/theme/quattro/templates/mail_conv.tpl @@ -23,7 +23,7 @@
{{$mail.from_name}} {{$mail.ago}}
@@ -47,7 +47,7 @@
- {{$mail.from_name}} + {{$mail.from_name}}
{{$mail.from_name}}