From 847d33abc6c17813098d4eb5cd55ab89496215d6 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Tue, 27 Feb 2024 02:31:53 +0100
Subject: [PATCH] Chaned some error_log() to MailSo Logger()

---
 .../v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php       | 2 +-
 .../v/0.0.0/app/libraries/RainLoop/Actions/SMime.php     | 2 +-
 .../v/0.0.0/app/libraries/snappymail/smime/openssl.php   | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
index 768855c19..fd0e38158 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
@@ -81,7 +81,7 @@ trait Pgp
 				if (\is_link($link) || \symlink($homedir, $link)) {
 					$homedir = $link;
 				} else {
-					\error_log("symlink('{$homedir}', '{$link}') failed");
+					$this->logWrite("symlink('{$homedir}', '{$link}') failed", \LOG_WARNING, 'GnuPG');
 				}
 			}
 			// Else try ~/.gnupg/ + hash(email address)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
index 6c1f47b13..5068679ea 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
@@ -142,7 +142,7 @@ trait SMime
 			\openssl_pkcs7_read(
 				"-----BEGIN PKCS7-----\n\n{$sBody}\n-----END PKCS7-----",
 				$certificates
-			) || \error_log("OpenSSL openssl_pkcs7_read: " . \openssl_error_string());
+			) || $this->logWrite("openssl_pkcs7_read: " . \openssl_error_string(), \LOG_ERR, 'OpenSSL');
 			foreach ($certificates as $certificate) {
 				$this->SMIME()->storeCertificate($certificate);
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
index 4bbd3617c..2f5b88f89 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
@@ -34,12 +34,15 @@ class OpenSSL
 	{
 		$data = \openssl_x509_parse(\openssl_x509_read($certificate));
 		if (!$data) {
-			\error_log("OpenSSL parse: " . \openssl_error_string());
+			\SnappyMail\Log::error('OpenSSL', "parse: " . \openssl_error_string());
 			return false;
 		}
 		$key = \str_replace(':', '', $data['extensions']['subjectKeyIdentifier'] ?? $data['hash']);
 		$filename = "{$this->homedir}/{$key}.crt";
-		if (!\file_exists($filename)) {
+		if (\file_exists($filename)) {
+			\SnappyMail\Log::debug('OpenSSL', 'certificate already imported');
+		} else {
+			\SnappyMail\Log::debug('OpenSSL', 'certificate imported');
 			\file_put_contents("{$this->homedir}/{$key}.crt", $certificate);
 //			\unlink("{$this->homedir}/certificates.json");
 			$this->certificates(true);
@@ -98,7 +101,7 @@ class OpenSSL
 					}
 					$result[] = $short;
 				} else {
-					\error_log("OpenSSL parse({$file}): " . \openssl_error_string());
+					\SnappyMail\Log::error('OpenSSL', "parse({$file}): " . \openssl_error_string());
 				}
 			}
 			\file_put_contents($cacheFile, \json_encode($result));