MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

notify_intro

Browse source
This commit is contained in:
friendica 2011-12-26 15:47:40 -08:00
parent 356c05c6b3
commit 5c7df6e964
3 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -701,7 +701,7 @@ function login($register = false, $hiddens=false) {
'$lpassword' => array('password', t('Password: '), '', ''),
'$openid' => !$noid,
'$lopenid' => array('openid_url', t('OpenID: '),'',''),
'$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
'$hiddens' => $hiddens,

27
include/enotify.php
View file

@ -15,8 +15,13 @@ function notification($params) {
$sender_name = t('Administrator');
$sender_email = t('noreply') . '@' . $a->get_hostname();
$title = $params['item']['title'];
$body = $params['item']['body'];
if(in_array('item',$params)) {
$title = $params['item']['title'];
$body = $params['item']['body'];
}
else {
$title = $body = '';
}
if($params['type'] == NOTIFY_MAIL) {
@ -49,6 +54,24 @@ function notification($params) {
$itemlink = $params['link'];
}
if($params['type'] == NOTIFY_INTRO) {
$subject = sprintf( t('Introduction received at %s'), $sitename);
$preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename);
$body = sprintf( t('You may visit their profile at %s'),$params['source_link']);
$sitelink = t('Please visit %s to approve or reject the introduction.');
$tsitelink = sprintf( $sitelink, $siteurl );
$hsitelink = sprintf( $sitelink, '<a href="' . $siteurl . '">' . $sitename . '</a>');
$itemlink = $params['link'];
}
if($params['type'] == NOTIFY_CONFIRM) {
}
// TODO - create notification entry in DB
// send email notification if notification preferences permit

30
mod/dfrn_request.php
View file

@ -568,24 +568,22 @@ function dfrn_request_content(&$a) {
if(count($r)) {
if($r[0]['page-flags'] != PAGE_NORMAL)
$auto_confirm = true;
if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (! $auto_confirm)) {
$email_tpl = get_intltext_template('request_notify_eml.tpl');
$email = replace_macros($email_tpl, array(
'$requestor' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'$url' => stripslashes($r[0]['url']),
'$myname' => $r[0]['username'],
'$siteurl' => $a->get_baseurl(),
'$sitename' => $a->config['sitename']
));
$res = mail($r[0]['email'],
t("Introduction received at ") . $a->config['sitename'],
$email,
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
. 'Content-transfer-encoding: 8bit' );
// This is a redundant notification - no point throwing errors if it fails.
if(! $auto_confirm) {
require_once('include/enotify.php');
notification(array(
'type' => NOTIFY_INTRO,
'notify_flags' => $r[0]['notify-flags'],
'language' => $r[0]['language'],
'to_name' => $r[0]['username'],
'to_email' => $r[0]['email'],
'link' => $a->get_baseurl() . '/notifications/intros',
'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
'source_link' => $r[0]['url'],
'source_photo' => $r[0]['photo']
));
}
if($auto_confirm) {
require_once('mod/dfrn_confirm.php');
$handsfree = array(