From b2736e0145fcd4c13552777634c3ca1169f0e031 Mon Sep 17 00:00:00 2001 From: zzdrojewskipaw Date: Tue, 12 Aug 2025 16:16:00 +0200 Subject: [PATCH] refactor sugar_config --- config_override.php | 10 +++++----- importE5EDISales.php | 10 +++++----- modules/Users/GeneratePassword.php | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config_override.php b/config_override.php index 04b351f1..793a1f87 100644 --- a/config_override.php +++ b/config_override.php @@ -26,10 +26,10 @@ $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_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'; +$sugar_config['GMail_SMTPAuth'] = true; +$sugar_config['GMail_SMTPSecure'] = 'tls'; +$sugar_config['GMail_port'] = 587; +$sugar_config['GMail_CharSet'] = 'UTF-8'; /***CONFIGURATOR***/ \ No newline at end of file diff --git a/importE5EDISales.php b/importE5EDISales.php index 9fa127bf..b30e6cdf 100644 --- a/importE5EDISales.php +++ b/importE5EDISales.php @@ -117,12 +117,12 @@ function checkEDISales() $mail->isSMTP(); $mail->setFrom($sugar_config['GMail_address'], 'Usługa importu EDI'); $mail->Host = $sugar_config['GMail_host']; - $mail->SMTPAuth = $sugar_config['SMTPAuth']; + $mail->SMTPAuth = $sugar_config['GMail_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->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'); diff --git a/modules/Users/GeneratePassword.php b/modules/Users/GeneratePassword.php index ce66a402..b61e6ca6 100755 --- a/modules/Users/GeneratePassword.php +++ b/modules/Users/GeneratePassword.php @@ -185,14 +185,14 @@ $mail->From = $defaults['email']; $mail->FromName = $defaults['name']; $mail->isSMTP(); // Set mailer to use SMTP $mail->Host = $sugar_config['GMail_host']; -$mail->SMTPAuth = $sugar_config['SMTPAuth']; +$mail->SMTPAuth = $sugar_config['GMail_SMTPAuth']; $mail->Username = $sugar_config['GMail_address']; -$mail->Password = $sugar_config['password']; +$mail->Password = $sugar_config['GMail_password']; -$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->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);