Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 04:22:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Once again, notices ... (#5535)

Browse source
This commit is contained in:
Michael Vogel 2018-07-31 18:39:23 +02:00 committed by Tobias Diekershoff
parent 4bd7daa205
commit 71b1638d9a
6 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/enotify.php
View file

@ -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);

8
src/Model/Event.php
View file

@ -48,9 +48,13 @@ class Event extends BaseObject
}
if ($simple) {
$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
if (!empty($event['summary'])) {
$o = "<h3>" . BBCode::convert($event['summary'], false, $simple) . "</h3>";
}
$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
if (!empty($event['desc'])) {
$o .= "<div>" . BBCode::convert($event['desc'], false, $simple) . "</div>";
}
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";

4
src/Model/GContact.php
View file

@ -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)",

2
src/Protocol/DFRN.php
View file

@ -1848,6 +1848,8 @@ class DFRN
DBA::insert('mail', $msg);
$msg["id"] = DBA::lastInsertId();
// send notifications.
/// @TODO Arange this mess
$notif_params = [

2
src/Protocol/Diaspora.php
View file

@ -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";

2
src/Protocol/OStatus.php
View file

@ -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: