broken image + linkify site link in body
This commit is contained in:
		| @@ -244,6 +244,7 @@ function dfrn_notify_post(&$a) { | ||||
| 			 | ||||
| 			// import the data into the template			 | ||||
| 			$email_tpl = replace_macros($tpl, array( | ||||
| 				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site | ||||
| 				'$email'		=> $importer['email'],					// email address to send to | ||||
| 				'$from'			=> $msg['from-name'],					// name of the person sending the message | ||||
| 				'$title'		=> stripslashes($msg['title']),			// subject of the message | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
| <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 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='$siteurl/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> | ||||
|  | ||||
| @@ -16,7 +16,7 @@ | ||||
| 		<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 style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter <a href="$siteurl"$siteurl</a> 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> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
| <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 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='$siteurl/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> | ||||
|  | ||||
| @@ -16,7 +16,7 @@ | ||||
| 		<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 style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at <a href="$siteurl">$siteurl</a> 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> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
| <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 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='$siteurl/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> | ||||
|  | ||||
| @@ -16,7 +16,7 @@ | ||||
| 		<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 style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ <a href="$siteurl">$siteurl</a> 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> | ||||
|   | ||||
| @@ -7,7 +7,7 @@ | ||||
| <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 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='$siteurl/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> | ||||
|  | ||||
| @@ -16,7 +16,7 @@ | ||||
| 		<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 style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a <a href="$siteurl">$siteurl</a> 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> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user