bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Require Cleanup

Browse source 
Remove instances of require_once for email.php
This commit is contained in:
Adam Magness 2017-12-01 14:57:13 -05:00
parent 6008e3df11
commit f21feb975d
5 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/dbstructure.php
View file

@ -94,8 +94,8 @@ function update_fail($update_id, $error_message) {
'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION) '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
)); ));
$subject=sprintf(t('Update Error at %s'), System::baseUrl()); $subject=sprintf(t('Update Error at %s'), System::baseUrl());
require_once('include/email.php');
$subject = Email::emailHeaderEncode($subject,'UTF-8'); $subject = Email::emailHeaderEncode($subject,'UTF-8'); // use Friendica\Protocol\Email;
mail($a->config['admin_email'], $subject, $email_msg, mail($a->config['admin_email'], $subject, $email_msg,
'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n" 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n"
.'Content-type: text/plain; charset=UTF-8'."\n" .'Content-type: text/plain; charset=UTF-8'."\n"

1
include/enotify.php
View file

@ -8,7 +8,6 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
require_once 'include/email.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';

1
include/items.php
View file

@ -22,7 +22,6 @@ require_once 'include/crypto.php';
require_once 'include/tags.php'; require_once 'include/tags.php';
require_once 'include/files.php'; require_once 'include/files.php';
require_once 'include/text.php'; require_once 'include/text.php';
require_once 'include/email.php';
require_once 'include/threads.php'; require_once 'include/threads.php';
require_once 'include/plaintext.php'; require_once 'include/plaintext.php';
require_once 'include/feed.php'; require_once 'include/feed.php';

9
mod/lostpass.php
View file

@ -1,12 +1,13 @@
<?php <?php
/**
* @file mod/lostpass.php
*/
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
require_once('include/email.php'); require_once 'include/enotify.php';
require_once('include/enotify.php'); require_once 'include/text.php';
require_once('include/text.php');
function lostpass_post(App $a) { function lostpass_post(App $a) {

1
src/Worker/Notifier.php
View file

@ -19,7 +19,6 @@ require_once 'include/salmon.php';
require_once 'include/datetime.php'; require_once 'include/datetime.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
require_once 'include/email.php';
/* /*
* This file was at one time responsible for doing all deliveries, but this caused * This file was at one time responsible for doing all deliveries, but this caused