friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-20 07:17:02 +00:00
Code Issues Releases Wiki Activity

Merge ef57c704db into 800d15e40a

Browse source
This commit is contained in:
Hypolite Petovan 2017-11-22 23:39:50 +00:00 • committed by GitHub
commit 0c2ae7ae5c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dav/friendica/main.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
use Friendica\Util\Emailer;
require_once('include/security.php'); require_once('include/security.php');
function dav_install() function dav_install()

4
notifyall/notifyall.php
View file

@ -42,7 +42,7 @@ function notifyall_post(&$a) {
$sender_name = sprintf(t('%s Administrator'), $sitename); $sender_name = sprintf(t('%s Administrator'), $sitename);
else else
$sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename); $sender_name = sprintf(t('%1$s, %2$s Administrator'), $a->config['admin_name'], $sitename);
if (! x($a->config['sender_email'])) if (! x($a->config['sender_email']))
$sender_email = 'noreply@' . $a->get_hostname(); $sender_email = 'noreply@' . $a->get_hostname();
else else
@ -54,7 +54,7 @@ function notifyall_post(&$a) {
$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"),array( "", "\n"), $text))),ENT_QUOTES,'UTF-8')); $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"),array( "", "\n"), $text))),ENT_QUOTES,'UTF-8'));
$htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$text))); $htmlversion = bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","<br />\n"),$text)));
// if this is a test, send it only to the admin(s) // if this is a test, send it only to the admin(s)
// admin_email might be a comma separated list, but we need "a@b','c@d','e@f // admin_email might be a comma separated list, but we need "a@b','c@d','e@f
if ( intval($_REQUEST['test'])) { if ( intval($_REQUEST['test'])) {