From b025bed83c032783f221b322be74e157709357bb Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Fri, 22 Jul 2022 11:46:46 +0200
Subject: [PATCH] Rename AddressBook contacts utils convert commands

---
 .../0.0.0/app/libraries/RainLoop/Providers/AddressBook.php  | 6 +++---
 .../app/libraries/RainLoop/Providers/AddressBook/Utils.php  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index 299acecbd..5d124f818 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -84,9 +84,9 @@ class AddressBook extends AbstractProvider
 	{
 		$iCount = 0;
 		if ($this->IsActive()) {
-			foreach (Utils::CsvArrayToVCards($aCsvData) as $oContact) {
+			foreach (AddressBook\Utils::CsvArrayToContacts($aCsvData) as $oContact) {
 				if ($this->ContactSave($oContact)) {
-					$iCount++;
+					++$iCount;
 				}
 			}
 		}
@@ -99,7 +99,7 @@ class AddressBook extends AbstractProvider
 		if ($this->IsActive()) {
 			try
 			{
-				foreach (Utils::VcfFileToVCards($sVcfData) as $oContact) {
+				foreach (AddressBook\Utils::VcfFileToContacts($sVcfData) as $oContact) {
 					if ($this->ContactSave($oContact)) {
 						++$iCount;
 					}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
index 2a16bb3ab..5893f91f4 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
@@ -193,7 +193,7 @@ class Utils
 	/**
 	 * TODO: broken
 	 */
-	public static function CsvArrayToVCards(array $aCsvData) : iterable
+	public static function CsvArrayToContacts(array $aCsvData) : iterable
 	{
 		foreach ($aCsvData as $aItem) {
 			$oContact = new Classes\Contact();
@@ -299,7 +299,7 @@ class Utils
 		return $sResult;
 	}
 
-	public static function VcfFileToVCards(string $sVcfData) : iterable
+	public static function VcfFileToContacts(string $sVcfData) : iterable
 	{
 		$sVcfData = \trim($sVcfData);
 		if ("\xef\xbb\xbf" === \substr($sVcfData, 0, 3)) {