Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 02:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed a couple of bugs

Browse source
This commit is contained in:
Chris Case 2011-05-21 23:19:50 -07:00
parent 4cff911939
commit f4cb6b9b08
2 changed files with 52 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
mod/dfrn_notify.php
View file

@ -79,6 +79,9 @@ function dfrn_notify_post(&$a) {
// $importer in this case contains the contact record for the remote contact joined with the user record of our user. // $importer in this case contains the contact record for the remote contact joined with the user record of our user.
$importer = $r[0]; $importer = $r[0];
foreach($importer as $key => $val) {
logger( "importer - key: " . $key . " val: " . $val);
}
if(($writable != (-1)) && ($writable != $importer['writable'])) { if(($writable != (-1)) && ($writable != $importer['writable'])) {
q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1", q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
@ -212,31 +215,31 @@ function dfrn_notify_post(&$a) {
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('mail_received_html_body_eml.tpl'); $tpl = get_intltext_template('mail_received_html_body_eml.tpl');
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$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' => $importer['thumb'], // thumbnail url for sender icon '$thumb' => $importer['thumb'], // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $importer['url'], // full url for the site '$url' => $importer['url'], // full url for the site
'$from' => $msg['from-name'], // name of the person sending the message '$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message '$title' => stripslashes($msg['title']), // subject of the message
'$htmlversion' => $msg['htmlversion'], // html version of the message '$htmlversion' => $msg['htmlversion'], // html version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider '$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$hostname' => $a->get_hostname() // name of this host '$hostname' => $a->get_hostname() // name of this host
)); ));
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('mail_received_text_body_eml.tpl'); $tpl = get_intltext_template('mail_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$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' => $importer['thumb'], // thumbnail url for sender icon '$thumb' => $importer['thumb'], // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $importer['url'], // full url for the site '$url' => $importer['url'], // full url for the site
'$from' => $msg['from-name'], // name of the person sending the message '$from' => $msg['from-name'], // name of the person sending the message
'$title' => stripslashes($msg['title']), // subject of the message '$title' => stripslashes($msg['title']), // subject of the message
'$textversion' => $msg['textversion'], // text version of the message '$textversion' => $msg['textversion'], // text version of the message
'$mimeboundary' => $msg['mimeboundary'], // mime message divider '$mimeboundary' => $msg['mimeboundary'], // mime message divider
'$hostname' => $a->get_hostname() // name of this host '$hostname' => $a->get_hostname() // name of this host
)); ));
// use the EmailNotification library to send the message // use the EmailNotification library to send the message
@ -408,27 +411,27 @@ function dfrn_notify_post(&$a) {
// 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(
'$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' => $datarray['author-avatar'], // 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
'$body' => 'q1' .$msg['htmlversion'], // html version of the message '$body' => 'q1' .$msg['htmlversion'], // html version of the message
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
)); ));
// load the template for private message notifications // load the template for private message notifications
$tpl = get_intltext_template('cmnt_received_text_body_eml.tpl'); $tpl = get_intltext_template('cmnt_received_text_body_eml.tpl');
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$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' => $datarray['author-avatar'], // 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
'$body' => $msg['textversion'], // text version of the message '$body' => $msg['textversion'], // text version of the message
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
)); ));
// use the EmailNotification library to send the message // use the EmailNotification library to send the message
@ -539,9 +542,9 @@ function dfrn_notify_post(&$a) {
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon
'$url' => $conv['author-link'], // full url for the site '$url' => $conv['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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
)); ));
// load the template for private message notifications // load the template for private message notifications
@ -551,9 +554,9 @@ function dfrn_notify_post(&$a) {
'$siteurl' => $a->get_baseurl(), // descriptive url of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site
'$thumb' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon
'$url' => $conv['author-link'], // full url for the site '$url' => $conv['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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
)); ));
// use the EmailNotification library to send the message // use the EmailNotification library to send the message

35
mod/item.php
View file

@ -485,12 +485,12 @@ function item_post(&$a) {
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$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' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $conv['author-link'], // full url for the site '$url' => $author['url'], // 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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
)); ));
// load the template for private message notifications // load the template for private message notifications
@ -498,12 +498,12 @@ function item_post(&$a) {
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$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' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
'$email' => $importer['email'], // email address to send to '$email' => $importer['email'], // email address to send to
'$url' => $conv['author-link'], // full url for the site '$url' => $author['url'], // 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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
)); ));
// use the EmailNotification library to send the message // use the EmailNotification library to send the message
@ -548,11 +548,11 @@ function item_post(&$a) {
$email_html_body_tpl = replace_macros($tpl,array( $email_html_body_tpl = replace_macros($tpl,array(
'$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' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
'$url' => $conv['author-link'], // full url for the site '$url' => $author['url'], // 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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
)); ));
// load the template for private message notifications // load the template for private message notifications
@ -560,11 +560,11 @@ function item_post(&$a) {
$email_text_body_tpl = replace_macros($tpl,array( $email_text_body_tpl = replace_macros($tpl,array(
'$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' => $conv['author-avatar'], // thumbnail url for sender icon '$thumb' => $author['thumb'], // thumbnail url for sender icon
'$url' => $conv['author-link'], // full url for the site '$url' => $author['url'], // 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
'$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $r, '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
)); ));
// use the EmailNotification library to send the message // use the EmailNotification library to send the message
@ -589,6 +589,9 @@ function item_post(&$a) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($post_id) intval($post_id)
); );
foreach( $r as $key => $val) {
logger("key: " . $key . " val: " . $val);
}
// photo comments turn the corresponding item visible to the profile wall // photo comments turn the corresponding item visible to the profile wall
// This way we don't see every picture in your new photo album posted to your wall at once. // This way we don't see every picture in your new photo album posted to your wall at once.