From 4253f834ac27d04c6df0f8b597985bca7129ad85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Zdrojewski?= Date: Mon, 11 Aug 2025 21:08:03 +0200 Subject: [PATCH] move globals into $sugar_config --- config_override.php | 7 +++++++ importE5EDISales.php | 21 +++++++++++---------- modules/Users/GeneratePassword.php | 16 ++++++++-------- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/config_override.php b/config_override.php index 9bbd1fdc..04b351f1 100644 --- a/config_override.php +++ b/config_override.php @@ -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['password'] = "upkb sxxb pmxw lsaj"; +$sugar_config['GMail_host'] = "smtp.gmail.com"; +$sugar_config['SMTPAuth'] = true; +$sugar_config['SMTPSecure'] = 'tls'; +$sugar_config['port'] = 587; +$sugar_config['CharSet'] = 'UTF-8'; /***CONFIGURATOR***/ \ No newline at end of file diff --git a/importE5EDISales.php b/importE5EDISales.php index a8dda1f7..9fa127bf 100644 --- a/importE5EDISales.php +++ b/importE5EDISales.php @@ -1,4 +1,5 @@ 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['SMTPAuth']; + $mail->Username = $sugar_config['GMail_address']; + $mail->Password = $sugar_config['password']; + $mail->SMTPSecure = $sugar_config['SMTPSecure']; + $mail->Port = $sugar_config['port']; + $mail->CharSet = $sugar_config['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'); diff --git a/modules/Users/GeneratePassword.php b/modules/Users/GeneratePassword.php index 4aee604b..ce66a402 100755 --- a/modules/Users/GeneratePassword.php +++ b/modules/Users/GeneratePassword.php @@ -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['SMTPAuth']; +$mail->Username = $sugar_config['GMail_address']; +$mail->Password = $sugar_config['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['CharSet']; +$mail->charSet = $sugar_config['CharSet']; +$mail->SMTPSecure = $sugar_config['SMTPSecure']; // Enable TLS encryption, `ssl` also accepted +$mail->Port = $sugar_config['port']; $mail->Subject = from_html($emailTemp->subject); if ($emailTemp->text_only != 1) { $mail->IsHTML(true);