Skip to content

Commit

Permalink
refs #41568, add third party require library back
Browse files Browse the repository at this point in the history
  • Loading branch information
jimyhuang committed Sep 13, 2024
1 parent 92fb77b commit b5b26d2
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 22 deletions.
1 change: 1 addition & 0 deletions CRM/Core/Report/Excel.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/


require_once 'Spout/Autoloader/autoload.php';

use Box\Spout\Writer\WriterFactory;
use Box\Spout\Reader\ReaderFactory;
Expand Down
9 changes: 2 additions & 7 deletions CRM/Mailing/Event/BAO/Reply.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,8 @@
*/









require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';


class CRM_Mailing_Event_BAO_Reply extends CRM_Mailing_Event_DAO_Reply {
Expand Down
3 changes: 2 additions & 1 deletion CRM/Mailing/MailStore/Imap.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
*/



require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';

class CRM_Mailing_MailStore_Imap extends CRM_Mailing_MailStore {

Expand Down
2 changes: 2 additions & 0 deletions CRM/Mailing/MailStore/Localdir.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
*/


require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';


class CRM_Mailing_MailStore_Localdir extends CRM_Mailing_MailStore {
Expand Down
4 changes: 2 additions & 2 deletions CRM/Mailing/MailStore/Maildir.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
*
*/



require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';

class CRM_Mailing_MailStore_Maildir extends CRM_Mailing_MailStore {

Expand Down
4 changes: 2 additions & 2 deletions CRM/Mailing/MailStore/Mbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
*
*/



require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';

class CRM_Mailing_MailStore_Mbox extends CRM_Mailing_MailStore {

Expand Down
4 changes: 2 additions & 2 deletions CRM/Mailing/MailStore/Pop3.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
*
*/



require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';

class CRM_Mailing_MailStore_Pop3 extends CRM_Mailing_MailStore {

Expand Down
2 changes: 1 addition & 1 deletion CRM/Utils/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ public static function encryptXlsxFile($filePath = NULL) {
}
else {
$outputFile = preg_replace('/\.xlsx$/', "_encrypt.xlsx", $filePath);

require_once 'secure-spreadsheet/autoload.php';
if ($config->decryptExcelOption == 1) {
// Get the user's primary email address
$session = CRM_Core_Session::singleton();
Expand Down
4 changes: 2 additions & 2 deletions CRM/Utils/Mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ static function checkSPF($email, $mailer = NULL) {
return 'Cannot resolve IP address of provided host: '.$host.'. Abort SPF verification.';
}
if (CRM_Utils_System::checkPHPVersion(7.1)) {

require_once 'SPFLib/autoload.php';
$checker = new SPFLib\Checker();
$checkResult = $checker->check(new SPFLib\Check\Environment($ip, $domain));
$result = $checkResult->getCode();
Expand All @@ -549,7 +549,7 @@ static function checkSPF($email, $mailer = NULL) {
}
}
else {

require_once 'SPFCheck/autoload.php';
$checker = new Mika56\SPFCheck\SPFCheck(new Mika56\SPFCheck\DNSRecordGetter());
$result = $checker->isIPAllowed($ip, $domain);
if ($result === Mika56\SPFCheck\SPFCheck::RESULT_PASS) {
Expand Down
9 changes: 4 additions & 5 deletions CRM/Utils/Mail/Incoming.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ static function &parse(&$file) {
));
}



require_once 'ezc/Base/src/ezc_bootstrap.php';
require_once 'ezc/autoload/mail_autoload.php';

// explode email to digestable format
$set = new ezcMailFileSet(array($file));
Expand All @@ -225,9 +225,8 @@ static function &parse(&$file) {
}

static function parseMailingObject(&$mail) {



require_once 'api/v2/Activity.php';
require_once 'api/v2/Contact.php';

$config = CRM_Core_Config::singleton();

Expand Down

0 comments on commit b5b26d2

Please sign in to comment.