mz/crm.e5.pl
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from bimbej/#1

Browse Source 
move globals into $sugar_config
This commit is contained in:
Michał Zieliński
2025-08-27 07:35:51 +02:00
committed by GitHub
parent 4bcaf85b6c f7dbb04e22
commit d068b0022d
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
config_override.php
View File

@@ -25,4 +25,11 @@ $sugar_config['passwordsetting']['systexpirationtime'] = '';
$sugar_config['passwordsetting']['SystemGeneratedPasswordON'] = '1';
$sugar_config['passwordsetting']['systexpirationtype'] = '1';
$sugar_config['verify_client_ip'] = false;
$sugar_config['GMail_address'] = "system@e5.pl";
$sugar_config['GMail_password'] = "upkb sxxb pmxw lsaj";
$sugar_config['GMail_host'] = "smtp.gmail.com";
$sugar_config['GMail_SMTPAuth'] = true;
$sugar_config['GMail_SMTPSecure'] = 'tls';
$sugar_config['GMail_port'] = 587;
$sugar_config['GMail_CharSet'] = 'UTF-8';
/***CONFIGURATOR***/

21
importE5EDISales.php
View File

@@ -1,4 +1,5 @@
<?php
global $sugar_config;
error_reporting(E_ERROR);
ini_set('display_errors', 1);
@@ -12,7 +13,6 @@ chdir(realpath(dirname(__FILE__)));
require_once('include/entryPoint.php');
require_once("include/database/MysqliManager.php");
global $sugar_config;
$config = $sugar_config['dbconfig'];
$GLOBALS['db']->connect($config, true, $config['db_name']);
@@ -25,7 +25,8 @@ return;
function checkEDISales()
{
require_once('modules/EcmSales/EcmSale.php');
global $sugar_config;
require_once('modules/EcmSales/EcmSale.php');
require_once('modules/EcmSales/readXML.php');
require_once 'include/phpMailer2/class.phpmailer.php';
@@ -114,14 +115,14 @@ function checkEDISales()
$mail = new PHPMailer2();
$mail->isSMTP();
$mail->setFrom('system@e5.pl', 'Usługa importu EDI');
$mail->Host = 'smtp.gmail.com';
$mail->SMTPAuth = true;
$mail->Username = 'system@e5.pl';
$mail->Password = 'upkb sxxb pmxw lsaj';
$mail->SMTPSecure = 'tls';
$mail->Port = 587;
$mail->CharSet = 'UTF-8';
$mail->setFrom($sugar_config['GMail_address'], 'Usługa importu EDI');
$mail->Host = $sugar_config['GMail_host'];
$mail->SMTPAuth = $sugar_config['GMail_SMTPAuth'];
$mail->Username = $sugar_config['GMail_address'];
$mail->Password = $sugar_config['GMail_password'];
$mail->SMTPSecure = $sugar_config['GMail_SMTPSecure'];
$mail->Port = $sugar_config['GMail_port'];
$mail->CharSet = $sugar_config['GMail_CharSet'];
$mail->addAddress('mz@bim-it.pl', 'Michał Zieliński');
$mail->addAddress('rl@e5.pl', 'Ryszard Lisiecki');
$mail->addAddress('mf@e5.pl', 'Małgorzata Franiewska');

16
modules/Users/GeneratePassword.php
View File

@@ -184,15 +184,15 @@ $mail = new PHPMailer2 ();
$mail->From = $defaults['email'];
$mail->FromName = $defaults['name'];
$mail->isSMTP(); // Set mailer to use SMTP
$mail->Host = 'smtp.gmail.com';
$mail->SMTPAuth = true;
$mail->Username = 'system@e5.pl';
$mail->Password = 'upkb sxxb pmxw lsaj';
$mail->Host = $sugar_config['GMail_host'];
$mail->SMTPAuth = $sugar_config['GMail_SMTPAuth'];
$mail->Username = $sugar_config['GMail_address'];
$mail->Password = $sugar_config['GMail_password'];
$mail->CharSet = 'UTF-8';
$mail->charSet = "UTF-8";
$mail->SMTPSecure = 'tls'; // Enable TLS encryption, `ssl` also accepted
$mail->Port = 587;
$mail->CharSet = $sugar_config['GMail_CharSet'];
$mail->charSet = $sugar_config['GMail_CharSet'];
$mail->SMTPSecure = $sugar_config['GMail_SMTPSecure']; // Enable TLS encryption, `ssl` also accepted
$mail->Port = $sugar_config['GMail_port'];
$mail->Subject = from_html($emailTemp->subject);
if ($emailTemp->text_only != 1) {
$mail->IsHTML(true);