Once again, notices ... (#5535)
This commit is contained in:
parent
4bd7daa205
commit
71b1638d9a
6 changed files with 15 additions and 4 deletions
|
@ -95,6 +95,7 @@ function notification($params)
|
|||
|
||||
if ($params['type'] == NOTIFY_MAIL) {
|
||||
$itemlink = $siteurl.'/message/'.$params['item']['id'];
|
||||
$params["link"] = $itemlink;
|
||||
|
||||
$subject = L10n::t('[Friendica:Notify] New mail received at %s', $sitename);
|
||||
|
||||
|
|
|
@ -48,9 +48,13 @@ class Event extends BaseObject
|
|||
}
|
||||
|
||||
if ($simple) {
|
||||
if (!empty($event['summary'])) {
|
||||
$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
|
||||
}
|
||||
|
||||
if (!empty($event['desc'])) {
|
||||
$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
|
||||
}
|
||||
|
||||
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
|
||||
|
||||
|
|
|
@ -705,6 +705,10 @@ class GContact
|
|||
$doprobing = (((time() - $last_contact) > (90 * 86400)) && ((time() - $last_failure) > (90 * 86400)));
|
||||
}
|
||||
} else {
|
||||
$contact['location'] = defaults($contact, 'location', '');
|
||||
$contact['about'] = defaults($contact, 'about', '');
|
||||
$contact['generation'] = defaults($contact, 'generation', 0);
|
||||
|
||||
q(
|
||||
"INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
|
||||
VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
|
||||
|
|
|
@ -1848,6 +1848,8 @@ class DFRN
|
|||
|
||||
DBA::insert('mail', $msg);
|
||||
|
||||
$msg["id"] = DBA::lastInsertId();
|
||||
|
||||
// send notifications.
|
||||
/// @TODO Arange this mess
|
||||
$notif_params = [
|
||||
|
|
|
@ -3543,7 +3543,7 @@ class Diaspora
|
|||
|
||||
if ($item["attach"]) {
|
||||
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
|
||||
if (cnt) {
|
||||
if ($cnt) {
|
||||
$body .= "\n".L10n::t("Attachments:")."\n";
|
||||
foreach ($matches as $mtch) {
|
||||
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
|
||||
|
|
|
@ -1356,7 +1356,7 @@ class OStatus
|
|||
"href" => $siteinfo["url"],
|
||||
"type" => "text/html; charset=UTF-8",
|
||||
"length" => "",
|
||||
"title" => $siteinfo["title"]];
|
||||
"title" => defaults($siteinfo, "title", $siteinfo["url"])];
|
||||
XML::addElement($doc, $root, "link", "", $attributes);
|
||||
break;
|
||||
default:
|
||||
|
|
Loading…
Reference in a new issue