jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix warning of self-signed cert for photos of our own contacts in comment notification emails

Browse source
This commit is contained in:
Friendika 2011-08-20 18:27:12 -07:00
parent c6f0d997e6
commit c0be5bea16
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mod/dfrn_notify.php
View file

@ -58,6 +58,9 @@ function dfrn_notify_post(&$a) {
break; // NOTREACHED break; // NOTREACHED
} }
// be careful - $importer will contain both the contact information for the contact
// sending us the post, and also the user information for the person receiving it.
// since they are mixed together, it is easy to get them confused.
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`, `contact`.`pubkey` AS `cpubkey`,
@ -512,13 +515,15 @@ function dfrn_notify_post(&$a) {
$msg['htmlversion'] $msg['htmlversion']
= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
$imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'], '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $imgtouse, // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $datarray['author-link'], // full url for the site '$url' => $datarray['author-link'], // full url for the site
'$from' => $from, // name of the person sending the message '$from' => $from, // name of the person sending the message
@ -532,7 +537,7 @@ function dfrn_notify_post(&$a) {
'$username' => $importer['username'], '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $imgtouse, // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $datarray['author-link'], // full url for the site '$url' => $datarray['author-link'], // full url for the site
'$from' => $from, // name of the person sending the message '$from' => $from, // name of the person sending the message
@ -643,13 +648,16 @@ function dfrn_notify_post(&$a) {
$msg['htmlversion'] $msg['htmlversion']
= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body'])))); = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$datarray['body']))));
$imgtouse = ((link_compare($datarray['author-link'],$importer['url'])) ? $importer['thumb'] : $datarray['author-avatar']);
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_html_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$username' => $importer['username'], '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $imgtouse, // thumbnail url for sender icon
'$url' => $datarray['author-link'], // full url for the site '$url' => $datarray['author-link'], // full url for the site
'$from' => $from, // name of the person sending the message '$from' => $from, // name of the person sending the message
'$body' => $msg['htmlversion'], // html version of the message '$body' => $msg['htmlversion'], // html version of the message
@ -662,7 +670,7 @@ function dfrn_notify_post(&$a) {
'$username' => $importer['username'], '$username' => $importer['username'],
'$sitename' => $a->config['sitename'], // name of this site '$sitename' => $a->config['sitename'], // name of this site
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon '$thumb' => $imgtouse, // thumbnail url for sender icon
'$url' => $datarray['author-link'], // full url for the site '$url' => $datarray['author-link'], // full url for the site
'$from' => $from, // name of the person sending the message '$from' => $from, // name of the person sending the message
'$body' => $msg['textversion'], // text version of the message '$body' => $msg['textversion'], // text version of the message