Merge branch 'chriscase-master'
This commit is contained in:
Friendika
commit
fe1a37074a
5 changed files with 219 additions and 60 deletions
|
|
@ -2,8 +2,6 @@
|
||||||
|
|
||||||
require_once('simplepie/simplepie.inc');
|
require_once('simplepie/simplepie.inc');
|
||||||
require_once('include/items.php');
|
require_once('include/items.php');
|
||||||
|
|
||||||
|
|
||||||
function dfrn_notify_post(&$a) {
|
function dfrn_notify_post(&$a) {
|
||||||
|
|
||||||
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
|
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
|
||||||
|
|
@ -52,11 +50,17 @@ function dfrn_notify_post(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
|
||||||
`contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `user`.* FROM `contact`
|
`contact`.`pubkey` AS `cpubkey`,
|
||||||
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
`contact`.`prvkey` AS `cprvkey`,
|
||||||
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
`contact`.`thumb` AS `thumb`,
|
||||||
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
|
`contact`.`url` as `url`,
|
||||||
|
`contact`.`name` as `senderName`,
|
||||||
|
`user`.*
|
||||||
|
FROM `contact`
|
||||||
|
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||||
|
WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
|
||||||
|
AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
|
||||||
dbesc($a->argv[1])
|
dbesc($a->argv[1])
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -169,29 +173,63 @@ function dfrn_notify_post(&$a) {
|
||||||
require_once('bbcode.php');
|
require_once('bbcode.php');
|
||||||
if($importer['notify-flags'] & NOTIFY_MAIL) {
|
if($importer['notify-flags'] & NOTIFY_MAIL) {
|
||||||
|
|
||||||
$body = html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
|
// $body = html_entity_decode(strip_tags(bbcode(stripslashes(nl2br($msg['body'])))),ENT_QUOTES,'UTF-8');
|
||||||
|
// $body = strip_tags(bbcode(stripslashes(nl2br($msg['body']))));
|
||||||
|
|
||||||
if(function_exists('quoted_printable_encode'))
|
/*if(function_exists('quoted_printable_encode'))
|
||||||
$body = quoted_printable_encode($body);
|
$body = quoted_printable_encode($body);
|
||||||
else
|
else
|
||||||
$body = qp($body);
|
$body = qp($body);*/
|
||||||
|
|
||||||
|
//$msg['body'] = str_replace(array("\\r\\n", "\\r", "\\n"), "<br />", $msg['body']);
|
||||||
|
//$msg['body'] = html_entity_decode(strip_tags(bbcode($msg['body'])));
|
||||||
|
$msg['mimeboundary'] =rand(0,9)."-"
|
||||||
|
.rand(10000000000,9999999999)."-"
|
||||||
|
.rand(10000000000,9999999999)."=:"
|
||||||
|
.rand(10000,99999);
|
||||||
|
|
||||||
|
$msg['notificationfromname'] = t('Administrator');
|
||||||
|
$msg['notificationfromemail'] = t('noreply') . '@' . $a->get_hostname();
|
||||||
|
$msg['headers'] =
|
||||||
|
"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" .
|
||||||
|
"Reply-To: {$msg['notificationfromemail']}\n" .
|
||||||
|
"MIME-Version: 1.0\n" .
|
||||||
|
"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
|
||||||
|
|
||||||
|
|
||||||
|
$msg['textversion']
|
||||||
|
= html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
|
||||||
|
//$TextMessage = html_entity_decode(strip_tags(bbcode(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body'])))); ;
|
||||||
|
$msg['htmlversion']
|
||||||
|
= str_replace(array("\\r\\n", "\\r", "\\n"), "<br />\n",html_entity_decode($msg['body']));
|
||||||
|
|
||||||
$tpl = load_view_file('view/mail_received_eml.tpl');
|
$tpl = load_view_file('view/mail_received_eml.tpl');
|
||||||
$email_tpl = replace_macros($tpl, array(
|
$email_tpl = replace_macros($tpl, array(
|
||||||
'$sitename' => $a->config['sitename'],
|
'$siteName' => $a->config['sitename'],
|
||||||
'$siteurl' => $a->get_baseurl(),
|
'$siteurl' => $a->get_baseurl(),
|
||||||
'$username' => $importer['username'],
|
'$username' => $importer['username'],
|
||||||
'$email' => $importer['email'],
|
'$thumb' => $importer['thumb'],
|
||||||
'$from' => $msg['from-name'],
|
'$email' => $importer['email'],
|
||||||
'$title' => stripslashes($msg['title']),
|
'$url' => $importer['url'],
|
||||||
'$body' => $body
|
'$senderName' => $importer['senderName'],
|
||||||
|
'$from' => $msg['from-name'],
|
||||||
|
'$title' => stripslashes($msg['title']),
|
||||||
|
'$textversion' => $msg['textversion'],
|
||||||
|
'$htmlversion' => $msg['htmlversion'],
|
||||||
|
'$mimeboundary' => $msg['mimeboundary'],
|
||||||
|
'$hostname' => $a->get_hostname()
|
||||||
));
|
));
|
||||||
|
|
||||||
|
logger("message headers: " . $msg['headers']);
|
||||||
|
logger("message body: " . $mail_tpl);
|
||||||
|
|
||||||
|
|
||||||
$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
|
$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
|
||||||
$email_tpl, 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
|
$email_tpl, $msg['headers']
|
||||||
|
/* 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
|
||||||
. 'MIME-Version: 1.0' . "\r\n"
|
. 'MIME-Version: 1.0' . "\r\n"
|
||||||
. 'Content-type: text/plain; charset=UTF-8' . "\r\n"
|
. 'Content-type: text/html; charset=utf-8' . "\r\n"
|
||||||
. 'Content-transfer-encoding: quoted-printable' . "\r\n"
|
. 'Content-transfer-encoding: quoted-printable' . "\r\n" */
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
xml_status(0);
|
xml_status(0);
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,47 @@
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
Lieber $username,
|
Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
|
||||||
|
|
||||||
du hast eine neue private Nachricht von '$from' auf '$sitename' erhhalten.
|
|
||||||
-----
|
|
||||||
$title
|
$title
|
||||||
-----
|
|
||||||
$body
|
$textversion
|
||||||
-----
|
|
||||||
Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
|
Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
|
||||||
beantworten.
|
beantworten.
|
||||||
|
|
||||||
Viele Grüße,
|
Viele Grüße,
|
||||||
$sitename Administrator
|
$siteName Administrator
|
||||||
|
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Friendika Nachricht</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<table style="border:1px solid #ccc">
|
||||||
|
<tbody>
|
||||||
|
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
|
||||||
|
|
||||||
|
<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
|
||||||
|
|
||||||
|
|
||||||
|
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
|
||||||
|
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
|
||||||
|
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
|
||||||
|
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
|
||||||
|
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
|
||||||
|
<tr><td></td><td>Viele Grüße,</td></tr>
|
||||||
|
<tr><td></td><td>$siteName Administrator</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
--$mimeboundary--
|
||||||
|
|
@ -1,16 +1,47 @@
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
Dear $username,
|
$from sent you a new private message at $siteName.
|
||||||
|
|
||||||
You've received a new private message at $sitename from '$from'.
|
|
||||||
-----
|
|
||||||
$title
|
$title
|
||||||
-----
|
|
||||||
$body
|
$textversion
|
||||||
-----
|
|
||||||
Please login at $siteurl to read and reply to your private messages.
|
Please login at $siteurl to read and reply to your private messages.
|
||||||
|
|
||||||
Thank you,
|
Thank you,
|
||||||
$sitename administrator
|
$siteName administrator
|
||||||
|
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Friendika Message</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<table style="border:1px solid #ccc">
|
||||||
|
<tbody>
|
||||||
|
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
|
||||||
|
|
||||||
|
<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
|
||||||
|
|
||||||
|
|
||||||
|
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
|
||||||
|
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
|
||||||
|
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
|
||||||
|
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
|
||||||
|
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr>
|
||||||
|
<tr><td></td><td>Thank You,</td></tr>
|
||||||
|
<tr><td></td><td>$siteName Administrator</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
--$mimeboundary--
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,46 @@
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
Dear $username,
|
$from t'a envoyŽ un message ˆ $siteName.
|
||||||
|
|
||||||
You've received a new private message at $sitename from '$from'.
|
|
||||||
-----
|
|
||||||
$title
|
$title
|
||||||
-----
|
|
||||||
$body
|
|
||||||
-----
|
|
||||||
Please login at $siteurl to read and reply to your private messages.
|
|
||||||
|
|
||||||
Thank you,
|
$textversion
|
||||||
$sitename administrator
|
|
||||||
|
Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
|
||||||
|
|
||||||
|
Merci,
|
||||||
|
$siteName Administrateur
|
||||||
|
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Friendika Message</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<table style="border:1px solid #ccc">
|
||||||
|
<tbody>
|
||||||
|
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
|
||||||
|
|
||||||
|
<tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr>
|
||||||
|
|
||||||
|
|
||||||
|
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
|
||||||
|
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
|
||||||
|
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
|
||||||
|
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
|
||||||
|
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.</td></tr>
|
||||||
|
<tr><td></td><td>Merci,</td></tr>
|
||||||
|
<tr><td></td><td>$siteName Administrateur</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
--$mimeboundary--
|
||||||
|
|
@ -1,16 +1,46 @@
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/plain; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
Caro/a $username,
|
Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
|
||||||
|
|
||||||
Hai ricevuto un nuovo messsaggio privato su $sitename da '$from'.
|
|
||||||
-----
|
|
||||||
$title
|
$title
|
||||||
-----
|
|
||||||
$body
|
$textversion
|
||||||
-----
|
|
||||||
Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
|
Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
|
||||||
|
|
||||||
Grazie,
|
Grazie,
|
||||||
L'amministratore di $sitename
|
L'amministratore di $siteName
|
||||||
|
|
||||||
|
--$mimeboundary
|
||||||
|
Content-Type: text/html; charset=utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Friendika Messsaggio</title>
|
||||||
|
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<table style="border:1px solid #ccc">
|
||||||
|
<tbody>
|
||||||
|
<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
|
||||||
|
|
||||||
|
<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
|
||||||
|
|
||||||
|
|
||||||
|
<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
|
||||||
|
<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
|
||||||
|
<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
|
||||||
|
<tr><td style="padding-right:22px;">$htmlversion</td></tr>
|
||||||
|
<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
|
||||||
|
<tr><td></td><td>Grazie,</td></tr>
|
||||||
|
<tr><td></td><td>L'amministratore di $siteName</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
--$mimeboundary--
|
||||||
Loading…
Reference in a new issue