Add pagenator to contact list

Move contacts from plugin back to core

rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php

@@ -196,7 +196,10 @@ class Actions
 	private function fabrica($sName, $oAccount = null)
 	{
 		$oResult = null;
-		$this->Plugins()->RunHook('main.fabrica', array($sName, &$oResult), false);
+		$this->Plugins()
+			->RunHook('main.fabrica', array($sName, &$oResult), false)
+			->RunHook('main.fabrica[v2]', array($sName, &$oResult, &$oAccount), false)
+		;
 
 		if (null === $oResult)
 		{
@@ -225,6 +228,15 @@ class Actions
 					break;
 				case 'personal-address-book':
 					// \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface
+					if ($this->Config()->Get('contacts', 'enable', false))
+					{
+						$sDsn = \trim($this->Config()->Get('contacts', 'pdo_dsn', ''));
+						$sUser = \trim($this->Config()->Get('contacts', 'pdo_user', ''));
+						$sPassword = (string) $this->Config()->Get('contacts', 'pdo_password', '');
+
+						$oResult = new \RainLoop\Providers\PersonalAddressBook\MySqlPersonalAddressBook($sDsn, $sUser, $sPassword);
+						$oResult->SetLogger($this->Logger());
+					}
 					break;
 				case 'suggestions':
 					// \RainLoop\Providers\Suggestions\SuggestionsInterface
@@ -3973,13 +3985,15 @@ class Actions
 
 		if ($this->PersonalAddressBookProvider($oAccount)->IsActive())
 		{
+			$iCount = 0;
 			$mResult = $this->PersonalAddressBookProvider($oAccount)->GetContacts($oAccount, 
-				$iOffset, $iLimit, $sSearch, false);
+				$iOffset, $iLimit, $sSearch, false, $iCount);
 		}
 
 		return $this->DefaultResponse(__FUNCTION__, array(
 			'Offset' => $iOffset,
 			'Limit' => $iLimit,
+			'Count' => $iCount,
 			'Search' => $sSearch,
 			'List' => $mResult
 		));
@@ -4012,6 +4026,8 @@ class Actions
 	 */
 	public function DoContactSave()
 	{
+		$iStart = \time();
+
 		$oAccount = $this->getAccountFromToken();
 
 		$bResult = false;
@@ -4048,6 +4064,11 @@ class Actions
 			$bResult = $oPab->ContactSave($oAccount, $oContact);
 		}
 
+		if (\time() === $iStart)
+		{
+			sleep(1);
+		}
+
 		return $this->DefaultResponse(__FUNCTION__, array(
 			'RequestUid' => $sRequestUid,
 			'ResultID' => $bResult ? $oContact->IdContact : '',
@@ -5608,6 +5629,7 @@ class Actions
 					/* @var $mResponse \RainLoop\Providers\PersonalAddressBook\Classes\Contact */
 					'IdContact' => $mResponse->IdContact,
 					'Display' => \MailSo\Base\Utils::Utf8Clear($mResponse->Display),
+					'IdPropertyFromSearch' => $mResponse->IdPropertyFromSearch,
 					'Properties' => $this->responseObject($mResponse->Properties, $sParent, $aParameters)
 				));
 			}
@@ -5615,6 +5637,7 @@ class Actions
 			{
 				$mResult = \array_merge($this->objectData($mResponse, $sParent, $aParameters), array(
 					/* @var $mResponse \RainLoop\Providers\PersonalAddressBook\Classes\Property */
+					'IdProperty' => $mResponse->IdProperty,
 					'Type' => $mResponse->Type,
 					'TypeCustom' => $mResponse->TypeCustom,
 					'Value' => \MailSo\Base\Utils::Utf8Clear($mResponse->Value),

rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php

@@ -9,6 +9,11 @@ abstract class PdoAbstract
 	 */
 	protected $oPDO = null;
 
+	/**
+	 * @var bool
+	 */
+	protected $bExplain = false;
+
 	/**
 	 * @var \MailSo\Log\Logger
 	 */
@@ -130,22 +135,26 @@ abstract class PdoAbstract
 	}
 
 	/**
-	 * @param \RainLoop\Account $oAccount
 	 * @param string $sSql
 	 * @param array $aParams
-	 * @param bool $bMultParams = false
+	 * @param bool $bMultiplyParams = false
 	 *
 	 * @return \PDOStatement|null
 	 */
-	protected function prepareAndExecute($sSql, $aParams = array(), $bMultParams = false)
+	protected function prepareAndExecute($sSql, $aParams = array(), $bMultiplyParams = false)
 	{
+		if ($this->bExplain && !$bMultiplyParams)
+		{
+			$this->prepareAndExplain($sSql, $aParams);
+		}
+
 		$mResult = null;
 
 		$this->writeLog($sSql);
 		$oStmt = $this->getPDO()->prepare($sSql);
 		if ($oStmt)
 		{
-			$aRootParams = $bMultParams ? $aParams : array($aParams);
+			$aRootParams = $bMultiplyParams ? $aParams : array($aParams);
 			foreach ($aRootParams as $aSubParams)
 			{
 				foreach ($aSubParams as $sName => $aValue)
@@ -153,12 +162,45 @@ abstract class PdoAbstract
 					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
 				}
 
-				$mResult = $oStmt->execute() && !$bMultParams ? $oStmt : null;
+				$mResult = $oStmt->execute() && !$bMultiplyParams ? $oStmt : null;
 			}
 		}
 
 		return $mResult;
 	}
+
+	/**
+	 * @param string $sSql
+	 * @param array $aParams
+	 */
+	protected function prepareAndExplain($sSql, $aParams = array())
+	{
+		$mResult = null;
+		if (0 === strpos($sSql, 'SELECT '))
+		{
+			$sSql = 'EXPLAIN '.$sSql;
+			$this->writeLog($sSql);
+			$oStmt = $this->getPDO()->prepare($sSql);
+			if ($oStmt)
+			{
+				foreach ($aParams as $sName => $aValue)
+				{
+					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
+				}
+
+				$mResult = $oStmt->execute() ? $oStmt : null;
+			}
+		}
+
+		if ($mResult)
+		{
+			$aFetch = $mResult->fetchAll(\PDO::FETCH_ASSOC);
+			$this->oLogger->WriteDump($aFetch);
+
+			unset($aFetch);
+			$mResult->closeCursor();
+		}
+	}
 	
 	/**
 	 * @param string $sSql

rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php

@@ -81,6 +81,14 @@ class Application extends \RainLoop\Config\AbstractConfig
 0 for unlimited.')
 			),
 
+			'contacts' => array(
+				'enable'			=> array(false, 'Enable contacts'),
+				'type'				=> array('mysql', ''),
+				'pdo_dsn'			=> array('mysql:host=127.0.0.1;port=3306;dbname=rainloop', ''),
+				'pdo_user'			=> array('root', ''),
+				'pdo_password'		=> array('', ''),
+			),
+
 			'security' => array(
 				'csrf_protection'	=> array(true,
 					'Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)'),

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook.php

@@ -69,14 +69,15 @@ class PersonalAddressBook extends \RainLoop\Providers\AbstractProvider
 	 * @param type $iLimit = 20
 	 * @param string $sSearch = ''
 	 * @param bool $bAutoOnly = false
+	 * @param int $iResultCount = 0
 	 *
 	 * @return array
 	 */
 	public function GetContacts($oAccount,
-		$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false)
+		$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false, &$iResultCount = 0)
 	{
 		return $this->IsActive() ? $this->oDriver->GetContacts($oAccount,
-			$iOffset, $iLimit, $sSearch, $bAutoOnly) : array();
+			$iOffset, $iLimit, $sSearch, $bAutoOnly, $iResultCount) : array();
 	}
 
 	/**
@@ -96,12 +97,13 @@ class PersonalAddressBook extends \RainLoop\Providers\AbstractProvider
 	/**
 	 * @param \RainLoop\Account $oAccount
 	 * @param array $aEmails
+	 *  @param bool $bCreateAuto = true
 	 *
 	 * @return bool
 	 */
-	public function IncFrec($oAccount, $aEmails)
+	public function IncFrec($oAccount, $aEmails, $bCreateAuto = true)
 	{
-		return $this->IsActive() ? $this->oDriver->IncFrec($oAccount, $aEmails) : false;
+		return $this->IsActive() ? $this->oDriver->IncFrec($oAccount, $aEmails, $bCreateAuto) : false;
 	}
 
 	/**

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Contact.php

@@ -29,6 +29,11 @@ class Contact
 	 */
 	public $Auto;
 
+	/**
+	 * @var bool
+	 */
+	public $Shared;
+
 	/**
 	 * @var int
 	 */
@@ -39,6 +44,11 @@ class Contact
 	 */
 	public $Tags;
 
+	/**
+	 * @var int
+	 */
+	public $IdPropertyFromSearch;
+
 	/**
 	 * @var array
 	 */
@@ -57,8 +67,10 @@ class Contact
 		$this->DisplayName = '';
 		$this->DisplayEmail = '';
 		$this->Auto = false;
+		$this->Shared = false;
 		$this->Changed = \time();
 		$this->Tags = array();
+		$this->IdPropertyFromSearch = 0;
 		$this->Properties = array();
 	}
 	

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/Classes/Property.php

@@ -6,6 +6,11 @@ use RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType;
 
 class Property
 {
+	/**
+	 * @var int
+	 */
+	public $IdProperty;
+	
 	/**
 	 * @var int
 	 */
@@ -38,6 +43,8 @@ class Property
 
 	public function Clear()
 	{
+		$this->IdProperty = 0;
+		
 		$this->Type = PropertyType::UNKNOWN;
 		$this->TypeCustom = '';
 

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/MySqlPersonalAddressBook.php

@@ -0,0 +1,870 @@
+<?php
+
+namespace RainLoop\Providers\PersonalAddressBook;
+
+use \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType;
+
+class MySqlPersonalAddressBook
+	extends \RainLoop\Common\PdoAbstract
+	implements \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface
+{
+	/**
+	 * @var string
+	 */
+	private $sDsn;
+	
+	/**
+	 * @var string
+	 */
+	private $sUser;
+
+	/**
+	 * @var string
+	 */
+	private $sPassword;
+
+	public function __construct($sDsn, $sUser, $sPassword)
+	{
+		$this->sDsn = $sDsn;
+		$this->sUser = $sUser;
+		$this->sPassword = $sPassword;
+		
+		$this->bExplain = false;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function IsSupported()
+	{
+		$aDrivers = \class_exists('PDO') ? \PDO::getAvailableDrivers() : array();
+		return \is_array($aDrivers) ? \in_array('mysql', $aDrivers) : false;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param \RainLoop\Providers\PersonalAddressBook\Classes\Contact $oContact
+	 *
+	 * @return bool
+	 */
+	public function ContactSave($oAccount, &$oContact)
+	{
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+		$iIdContact = \strlen($oContact->IdContact) && \is_numeric($oContact->IdContact) ? (int) $oContact->IdContact : 0;
+
+		$bUpdate = 0 < $iIdContact;
+
+		$oContact->UpdateDependentValues();
+		$oContact->Changed = \time();
+
+		if (!$oContact->Auto)
+		{
+			$aEmail = $oContact->GetEmails();
+			if (0 < \count($aEmail))
+			{
+				$aEmail = \array_map(function ($sValue) {
+					return \strtolower(\trim($sValue));
+				}, $aEmail);
+				
+				$aEmail = \array_filter($aEmail, function ($sValue) {
+					return !empty($sValue);
+				});
+
+				if (0 < \count($aEmail))
+				{
+					$self = $this;
+					$aEmail = \array_map(function ($sValue) use ($self) {
+						return $self->quoteValue($sValue);
+					}, $aEmail);
+
+
+					// clear autocreated contacts
+					$this->prepareAndExecute(
+						'DELETE FROM `rainloop_pab_contacts` WHERE `id_user` = :id_user AND `auto` = 1 AND `display_email` IN ('.\implode(',', $aEmail).')',
+						array(
+							':id_user' => array($iUserID, \PDO::PARAM_INT)
+						)
+					);
+				}
+			}
+		}
+
+		try
+		{
+			$this->beginTransaction();
+
+			$aFreq = array();
+			if ($bUpdate)
+			{
+				$aFreq = $this->getContactFreq($iUserID, $iIdContact);
+
+				$sSql = 'UPDATE `rainloop_pab_contacts` SET `display` = :display, `display_name` = :display_name, `display_email` = :display_email, '.
+					'`auto` = :auto, `shared` = :shared, `changed` = :changed  WHERE id_user = :id_user AND `id_contact` = :id_contact';
+
+				$this->prepareAndExecute($sSql,
+					array(
+						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_contact' => array($iIdContact, \PDO::PARAM_INT),
+						':display' => array($oContact->Display, \PDO::PARAM_STR),
+						':display_name' => array($oContact->DisplayName, \PDO::PARAM_STR),
+						':display_email' => array($oContact->DisplayEmail, \PDO::PARAM_STR),
+						':auto' => array($oContact->Auto, \PDO::PARAM_INT),
+						':shared' => array($oContact->Shared, \PDO::PARAM_INT),
+						':changed' => array($oContact->Changed, \PDO::PARAM_INT),
+					)
+				);
+
+				// clear previos props
+				$this->prepareAndExecute(
+					'DELETE FROM `rainloop_pab_properties` WHERE `id_user` = :id_user AND `id_contact` = :id_contact',
+					array(
+						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_contact' => array($iIdContact, \PDO::PARAM_INT)
+					)
+				);
+			}
+			else
+			{
+				$sSql = 'INSERT INTO `rainloop_pab_contacts` '.
+					'(`id_user`, `display`, `display_name`, `display_email`, `auto`, `shared`, `changed`) VALUES '.
+					'(:id_user,  :display,  :display_name,  :display_email,  :auto,  :shared,  :changed)';
+
+				$this->prepareAndExecute($sSql,
+					array(
+						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':display' => array($oContact->Display, \PDO::PARAM_STR),
+						':display_name' => array($oContact->DisplayName, \PDO::PARAM_STR),
+						':display_email' => array($oContact->DisplayEmail, \PDO::PARAM_STR),
+						':auto' => array($oContact->Auto, \PDO::PARAM_INT),
+						':shared' => array($oContact->Shared, \PDO::PARAM_INT),
+						':changed' => array($oContact->Changed, \PDO::PARAM_INT)
+					)
+				);
+
+				$sLast = $this->lastInsertId('id_contact');
+				if (\is_numeric($sLast) && 0 < (int) $sLast)
+				{
+					$iIdContact = (int) $sLast;
+					$oContact->IdContact = (string) $iIdContact;
+				}
+			}
+
+			if (0 < $iIdContact)
+			{
+				$aParams = array();
+				foreach ($oContact->Properties as /* @var $oProp \RainLoop\Providers\PersonalAddressBook\Classes\Property */ $oProp)
+				{
+					$iFreq = $oProp->Frec;
+					if ($oProp->IsEmail() && isset($aFreq[$oProp->Value]))
+					{
+						$iFreq = $aFreq[$oProp->Value];
+					}
+
+					$aParams[] = array(
+						':id_contact' => array($iIdContact, \PDO::PARAM_INT),
+						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':type' => array($oProp->Type, \PDO::PARAM_INT),
+						':type_custom' => array($oProp->TypeCustom, \PDO::PARAM_STR),
+						':value' => array($oProp->Value, \PDO::PARAM_STR),
+						':value_custom' => array($oProp->ValueClear, \PDO::PARAM_STR),
+						':auto' => array($oContact->Auto, \PDO::PARAM_INT),
+						':shared' => array($oContact->Shared, \PDO::PARAM_INT),
+						':frec' => array($iFreq, \PDO::PARAM_INT),
+					);
+				}
+
+				$sSql = 'INSERT INTO `rainloop_pab_properties` '.
+					'(`id_contact`, `id_user`, `type`, `type_custom`, `value`, `value_custom`, `auto`, `shared`, `frec`) VALUES '.
+					'(:id_contact,  :id_user,  :type,  :type_custom,  :value,  :value_custom,  :auto,  :shared,  :frec)';
+
+				$this->prepareAndExecute($sSql, $aParams, true);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$this->rollBack();
+			throw $oException;
+		}
+
+		$this->commit();
+
+		return 0 < $iIdContact;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param array $aContactIds
+	 *
+	 * @return bool
+	 */
+	public function DeleteContacts($oAccount, $aContactIds)
+	{
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+
+		$aContactIds = \array_filter($aContactIds, function (&$mItem) {
+			$mItem = (int) \trim($mItem);
+			return 0 < $mItem;
+		});
+
+		if (0 === \count($aContactIds))
+		{
+			return false;
+		}
+
+		$sIDs = \implode(',', $aContactIds);
+		$aParams = array(':id_user' => array($iUserID, \PDO::PARAM_INT));
+
+		$this->prepareAndExecute('DELETE FROM `rainloop_pab_tags_contacts` WHERE `id_contact` IN ('.$sIDs.')');
+		$this->prepareAndExecute('DELETE FROM `rainloop_pab_properties` WHERE `id_user` = :id_user AND `id_contact` IN ('.$sIDs.')', $aParams);
+		$this->prepareAndExecute('DELETE FROM `rainloop_pab_contacts` WHERE `id_user` = :id_user AND `id_contact` IN ('.$sIDs.')', $aParams);
+
+		return true;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param array $aTagsIds
+	 *
+	 * @return bool
+	 */
+	public function DeleteTags($oAccount, $aTagsIds)
+	{
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+
+		$aTagsIds = \array_filter($aTagsIds, function (&$mItem) {
+			$mItem = (int) \trim($mItem);
+			return 0 < $mItem;
+		});
+
+		if (0 === \count($aTagsIds))
+		{
+			return false;
+		}
+
+		$sIDs = \implode(',', $aTagsIds);
+		$aParams = array(':id_user' => array($iUserID, \PDO::PARAM_INT));
+
+		$this->prepareAndExecute('DELETE FROM `rainloop_pab_tags_contacts` WHERE `id_tag` IN ('.$sIDs.')');
+		$this->prepareAndExecute('DELETE FROM `rainloop_pab_tags` WHERE `id_user` = :id_user AND `id_tag` IN ('.$sIDs.')', $aParams);
+
+		return true;
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param int $iOffset = 0
+	 * @param int $iLimit = 20
+	 * @param string $sSearch = ''
+	 * @param bool $bAutoOnly = false
+	 * @param int $iResultCount = 0
+	 * 
+	 * @return array
+	 */
+	public function GetContacts($oAccount, $iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false, &$iResultCount = 0)
+	{
+		$iOffset = 0 <= $iOffset ? $iOffset : 0;
+		$iLimit = 0 < $iLimit ? (int) $iLimit : 20;
+		$sSearch = \trim($sSearch);
+
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+
+		$iCount = 0;
+		$aSearchIds = array();
+		$aPropertyFromSearchIds = array();
+		
+		if (0 < \strlen($sSearch))
+		{
+			$sSql = 'SELECT `id_prop`, `id_contact` FROM `rainloop_pab_properties` WHERE `id_user` = :id_user AND `auto` = :auto AND `value` LIKE :search ESCAPE \'=\' GROUP BY `id_contact`';
+			$aParams = array(
+				':id_user' => array($iUserID, \PDO::PARAM_INT),
+				':auto' => array($bAutoOnly ? 1 : 0, \PDO::PARAM_INT),
+				':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
+			);
+
+			$oStmt = $this->prepareAndExecute($sSql, $aParams);
+			if ($oStmt)
+			{
+				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+				if (\is_array($aFetch) && 0 < \count($aFetch))
+				{
+					foreach ($aFetch as $aItem)
+					{
+						$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
+						if (0 < $iIdContact)
+						{
+							$aSearchIds[] = $iIdContact;
+							$aPropertyFromSearchIds[$iIdContact] = isset($aItem['id_prop']) ? (int) $aItem['id_prop'] : 0;
+						}
+					}
+				}
+
+				$iCount = \count($aSearchIds);
+			}
+		}
+		else
+		{
+			$sSql = 'SELECT COUNT(DISTINCT `id_contact`) as `contact_count` FROM `rainloop_pab_properties` WHERE `id_user` = :id_user AND `auto` = :auto';
+			$aParams = array(
+				':id_user' => array($iUserID, \PDO::PARAM_INT),
+				':auto' => array($bAutoOnly ? 1 : 0, \PDO::PARAM_INT)
+			);
+
+			$oStmt = $this->prepareAndExecute($sSql, $aParams);
+			if ($oStmt)
+			{
+				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+				if ($aFetch && isset($aFetch[0]['contact_count']) && is_numeric($aFetch[0]['contact_count']) && 0 < (int) $aFetch[0]['contact_count'])
+				{
+					$iCount = (int) $aFetch[0]['contact_count'];
+				}
+			}
+		}
+
+		$iResultCount = $iCount;
+
+		if (0 < $iCount)
+		{
+			$sSql = 'SELECT * FROM `rainloop_pab_contacts` WHERE id_user = :id_user AND `auto` = :auto';
+			$aParams = array(
+				':id_user' => array($iUserID, \PDO::PARAM_INT),
+				':auto' => array($bAutoOnly ? 1 : 0, \PDO::PARAM_INT)
+			);
+
+			if (0 < \count($aSearchIds))
+			{
+				$sSql .= ' AND `id_contact` IN ('.implode(',', $aSearchIds).')';
+			}
+
+			$sSql .= ' ORDER BY `display` ASC LIMIT :limit OFFSET :offset';
+			$aParams[':limit'] = array($iLimit, \PDO::PARAM_INT);
+			$aParams[':offset'] = array($iOffset, \PDO::PARAM_INT);
+
+			$oStmt = $this->prepareAndExecute($sSql, $aParams);
+			if ($oStmt)
+			{
+				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+
+				$aContacts = array();
+				$aIdContacts = array();
+				if (\is_array($aFetch) && 0 < \count($aFetch))
+				{
+					foreach ($aFetch as $aItem)
+					{
+						$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
+						if (0 < $iIdContact)
+						{
+							$aIdContacts[] = $iIdContact;
+							$oContact = new \RainLoop\Providers\PersonalAddressBook\Classes\Contact();
+
+							$oContact->IdContact = (string) $iIdContact;
+							$oContact->Display = isset($aItem['display']) ? (string) $aItem['display'] : '';
+							$oContact->DisplayName = isset($aItem['display_name']) ? (string) $aItem['display_name'] : '';
+							$oContact->DisplayEmail = isset($aItem['display_email']) ? (string) $aItem['display_email'] : '';
+							$oContact->Auto = isset($aItem['auto']) ? (bool) $aItem['auto'] : false;
+							$oContact->Changed = isset($aItem['changed']) ? (int) $aItem['changed'] : 0;
+							$oContact->IdPropertyFromSearch = isset($aPropertyFromSearchIds[$iIdContact]) &&
+								0 < $aPropertyFromSearchIds[$iIdContact] ? $aPropertyFromSearchIds[$iIdContact] : 0;
+
+							$aContacts[$iIdContact] = $oContact;
+						}
+					}
+				}
+
+				unset($aFetch);
+
+				if (0 < count($aIdContacts))
+				{
+					$oStmt->closeCursor();
+
+					$sSql = 'SELECT * FROM `rainloop_pab_properties` WHERE id_user = :id_user AND `id_contact` IN ('.\implode(',', $aIdContacts).')';
+					$oStmt = $this->prepareAndExecute($sSql, array(
+						':id_user' => array($iUserID, \PDO::PARAM_INT)
+					));
+
+					if ($oStmt)
+					{
+						$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+						if (\is_array($aFetch) && 0 < \count($aFetch))
+						{
+							foreach ($aFetch as $aItem)
+							{
+								if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['type'], $aItem['value']))
+								{
+									$iId = (int) $aItem['id_contact'];
+									if (0 < $iId && isset($aContacts[$iId]))
+									{
+										$oProperty = new \RainLoop\Providers\PersonalAddressBook\Classes\Property();
+										$oProperty->IdProperty = (int) $aItem['id_prop'];
+										$oProperty->Type = (int) $aItem['type'];
+										$oProperty->TypeCustom = isset($aItem['type_custom']) ? (string) $aItem['type_custom'] : '';
+										$oProperty->Value = (string) $aItem['value'];
+										$oProperty->ValueClear = isset($aItem['value_clear']) ? (string) $aItem['value_clear'] : '';
+										$oProperty->Frec = isset($aItem['frec']) ? (int) $aItem['frec'] : 0;
+
+										$aContacts[$iId]->Properties[] = $oProperty;
+									}
+								}
+							}
+						}
+
+						unset($aFetch);
+
+						foreach ($aContacts as &$oItem)
+						{
+							$oItem->UpdateDependentValues();
+						}
+
+						return \array_values($aContacts);
+					}
+				}
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param string $sSearch
+	 * @param int $iLimit = 20
+	 *
+	 * @return array
+	 *
+	 * @throws \InvalidArgumentException
+	 */
+	public function GetSuggestions($oAccount, $sSearch, $iLimit = 20)
+	{
+		$sSearch = \trim($sSearch);
+		if (0 === \strlen($sSearch))
+		{
+			throw new \InvalidArgumentException('Empty Search argument');
+		}
+
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+
+		$sTypes = implode(',', array(
+			PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER, PropertyType::FULLNAME
+		));
+		
+		$sSql = 'SELECT `id_contact`, `id_prop`, `type`, `value` FROM `rainloop_pab_properties` '.
+			'WHERE id_user = :id_user AND `type` IN ('.$sTypes.') AND `value` LIKE :search ESCAPE \'=\'';
+		
+		$aParams = array(
+			':id_user' => array($iUserID, \PDO::PARAM_INT),
+			':limit' => array($iLimit, \PDO::PARAM_INT),
+			':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
+		);
+
+		$sSql .= ' ORDER BY `frec` DESC';
+		$sSql .= ' LIMIT :limit';
+
+		$aResult = array();
+		$aFirstResult = array();
+		$aSkipIds = array();
+		
+		$oStmt = $this->prepareAndExecute($sSql, $aParams);
+		if ($oStmt)
+		{
+			$aIdContacts = array();
+			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+			if (\is_array($aFetch) && 0 < \count($aFetch))
+			{
+				foreach ($aFetch as $aItem)
+				{
+					$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
+					if (0 < $iIdContact)
+					{
+						$aIdContacts[$iIdContact] = $iIdContact;
+						$iType = isset($aItem['type']) ? (int) $aItem['type'] : PropertyType::UNKNOWN;
+						
+						if (\in_array($iType, array(PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER, PropertyType::FULLNAME)))
+						{
+							if (!\in_array($iIdContact, $aSkipIds))
+							{
+								if (PropertyType::FULLNAME === $iType)
+								{
+									$aSkipIds[] = $iIdContact;
+								}
+
+								$aFirstResult[] = array(
+									'id_prop' => isset($aItem['id_prop']) ? (int) $aItem['id_prop'] : 0,
+									'id_contact' => $iIdContact,
+									'value' => isset($aItem['value']) ? (string) $aItem['value'] : '',
+									'type' => $iType
+								);
+							}
+						}
+					}
+				}
+			}
+
+			unset($aFetch);
+
+			$aIdContacts = \array_values($aIdContacts);
+			if (0 < count($aIdContacts))
+			{
+				$oStmt->closeCursor();
+				
+				$sTypes = \implode(',', array(
+					PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER, PropertyType::FULLNAME
+				));
+
+				$sSql = 'SELECT `id_prop`, `id_contact`, `type`, `value` FROM `rainloop_pab_properties` '.
+					'WHERE id_user = :id_user AND `type` IN ('.$sTypes.') AND `id_contact` IN ('.\implode(',', $aIdContacts).')';
+
+				$oStmt = $this->prepareAndExecute($sSql, array(
+					':id_user' => array($iUserID, \PDO::PARAM_INT)
+				));
+				if ($oStmt)
+				{
+					$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+					if (\is_array($aFetch) && 0 < \count($aFetch))
+					{
+						$aNames = array();
+						$aEmails = array();
+
+						foreach ($aFetch as $aItem)
+						{
+							if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['type'], $aItem['value']))
+							{
+								$iIdContact = (int) $aItem['id_contact'];
+								$iType = (int) $aItem['type'];
+								
+								if (PropertyType::FULLNAME === $iType)
+								{
+									$aNames[$iIdContact] = $aItem['value'];
+								}
+								else if (\in_array($iType,
+									array(PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER)))
+								{
+									if (!isset($aEmails[$iIdContact]))
+									{
+										$aEmails[$iIdContact] = array();
+									}
+
+									$aEmails[$iIdContact][] = $aItem['value'];
+								}
+							}
+						}
+
+						foreach ($aFirstResult as $aItem)
+						{
+							if ($aItem && !empty($aItem['value']))
+							{
+								$iIdContact = (int) $aItem['id_contact'];
+								$iType = (int) $aItem['type'];
+								
+								if (PropertyType::FULLNAME === $iType)
+								{
+									if (isset($aEmails[$iIdContact]) && \is_array($aEmails[$iIdContact]))
+									{
+										foreach ($aEmails[$iIdContact] as $sEmail)
+										{
+											if (!empty($sEmail))
+											{
+												$aResult[] = array($sEmail, (string) $aItem['value']);
+											}
+										}
+									}
+								}
+								else if (\in_array($iType,
+									array(PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER)))
+								{
+									$aResult[] = array((string) $aItem['value'],
+										isset($aNames[$iIdContact]) ? (string) $aNames[$iIdContact] : '');
+								}
+							}
+						}
+					}
+
+					unset($aFetch);
+
+					if ($iLimit < \count($aResult))
+					{
+						$aResult = \array_slice($aResult, 0, $iLimit);
+					}
+					
+					return $aResult;
+				}
+			}
+		}
+
+		return array();
+	}
+
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param array $aEmails
+	 * @param bool $bCreateAuto = true
+	 *
+	 * @return bool
+	 */
+	public function IncFrec($oAccount, $aEmails, $bCreateAuto = true)
+	{
+		$iUserID = $this->getUserId($oAccount->ParentEmailHelper());
+
+		$self = $this;
+		$aEmailsObjects = \array_map(function ($mItem) {
+			$oResult = null;
+			try
+			{
+				$oResult = \MailSo\Mime\Email::Parse(\trim($mItem));
+			}
+			catch (\Exception $oException) {}
+			return $oResult;
+		}, $aEmails);
+		
+		if (0 === \count($aEmailsObjects))
+		{
+			throw new \InvalidArgumentException('Empty Emails argument');
+		}
+
+		$sTypes = \implode(',', array(
+			PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER
+		));
+
+		$aExists = array();
+		$aEmailsToCreate = array();
+		$aEmailsToUpdate = array();
+
+		if ($bCreateAuto)
+		{
+			$sSql = 'SELECT `value` FROM `rainloop_pab_properties` WHERE id_user = :id_user AND `type` IN ('.$sTypes.')';
+			$oStmt = $this->prepareAndExecute($sSql, array(
+				':id_user' => array($iUserID, \PDO::PARAM_INT)
+			));
+
+			if ($oStmt)
+			{
+				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+				if (\is_array($aFetch) && 0 < \count($aFetch))
+				{
+					foreach ($aFetch as $aItem)
+					{
+						if ($aItem && !empty($aItem['value']))
+						{
+							$aExists[] = \strtolower(\trim($aItem['value']));
+						}
+					}
+				}
+			}
+		
+			$aEmailsToCreate = \array_filter($aEmailsObjects, function ($oItem) use ($aExists, &$aEmailsToUpdate) {
+				if ($oItem)
+				{
+					$sEmail = \strtolower(\trim($oItem->GetEmail()));
+					if (0 < \strlen($sEmail))
+					{
+						$aEmailsToUpdate[] = $sEmail;
+						return !\in_array($sEmail, $aExists);
+					}
+				}
+
+				return false;
+			});
+		}
+		else
+		{
+			foreach ($aEmailsObjects as $oItem)
+			{
+				if ($oItem)
+				{
+					$sEmail = \strtolower(\trim($oItem->GetEmail()));
+					if (0 < \strlen($sEmail))
+					{
+						$aEmailsToUpdate[] = $sEmail;
+					}
+				}
+			}
+		}
+		
+		unset($aEmails, $aEmailsObjects);
+
+		if (0 < \count($aEmailsToCreate))
+		{
+			$oContact = new \RainLoop\Providers\PersonalAddressBook\Classes\Contact();
+			foreach ($aEmailsToCreate as $oEmail)
+			{
+				$oContact->Auto = true;
+
+				if ('' !== \trim($oEmail->GetEmail()))
+				{
+					$oPropEmail = new \RainLoop\Providers\PersonalAddressBook\Classes\Property();
+					$oPropEmail->Type = \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType::EMAIl_PERSONAL;
+					$oPropEmail->Value = \strtolower(\trim($oEmail->GetEmail()));
+
+					$oContact->Properties[] = $oPropEmail;
+				}
+
+				if ('' !== \trim($oEmail->GetDisplayName()))
+				{
+					$oPropName = new \RainLoop\Providers\PersonalAddressBook\Classes\Property();
+					$oPropName->Type = \RainLoop\Providers\PersonalAddressBook\Enumerations\PropertyType::FULLNAME;
+					$oPropName->Value = \trim($oEmail->GetDisplayName());
+
+					$oContact->Properties[] = $oPropName;
+				}
+
+				if (0 < \count($oContact->Properties))
+				{
+					$this->ContactSave($oAccount, $oContact);
+				}
+				
+				$oContact->Clear();
+			}
+		}
+		
+		$sSql = 'UPDATE `rainloop_pab_properties` SET `frec` = `frec` + 1 WHERE id_user = :id_user AND `type` IN ('.$sTypes;
+
+		$aEmailsQuoted = \array_map(function ($mItem) use ($self) {
+			return $self->quoteValue($mItem);
+		}, $aEmailsToUpdate);
+		
+		if (1 === \count($aEmailsQuoted))
+		{
+			$sSql .= ') AND `value` = '.$aEmailsQuoted[0];
+		}
+		else
+		{
+			$sSql .= ') AND `value` IN ('.\implode(',', $aEmailsQuoted).')';
+		}
+
+		return !!$this->prepareAndExecute($sSql, array(
+			':id_user' => array($iUserID, \PDO::PARAM_INT),
+		));
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Version()
+	{
+		return 'MySqlPersonalAddressBookDriver-v14';
+	}
+	
+	/**
+	 * @return bool
+	 */
+	public function SynchronizeStorage()
+	{
+		return $this->dataBaseUpgrade('mysql-pab-version', array(
+			1 => array(
+
+// -- rainloop_pab_contacts --
+'CREATE TABLE IF NOT EXISTS `rainloop_pab_contacts` (
+	
+	`id_contact` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`id_user` int(11) UNSIGNED NOT NULL,
+	`display` varchar(255) NOT NULL DEFAULT \'\',
+	`display_name` varchar(255) NOT NULL DEFAULT \'\',
+	`display_email` varchar(255) NOT NULL DEFAULT \'\',
+	`auto` int(1) UNSIGNED NOT NULL DEFAULT \'0\',
+	`shared` int(1) UNSIGNED NOT NULL DEFAULT \'0\',
+	`changed` int(11) UNSIGNED NOT NULL DEFAULT \'0\',
+
+	PRIMARY KEY(`id_contact`),
+	INDEX `id_user_index` (`id_user`)
+
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;',
+
+// -- rainloop_pab_properties --
+'CREATE TABLE IF NOT EXISTS `rainloop_pab_properties` (
+	
+	`id_prop` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`id_contact` int(11) UNSIGNED NOT NULL,
+	`id_user` int(11) UNSIGNED NOT NULL,
+	`type` int(11) UNSIGNED NOT NULL,
+	`type_custom` varchar(50) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL DEFAULT \'\',
+	`value` varchar(255) NOT NULL DEFAULT \'\',
+	`value_custom` varchar(255) NOT NULL DEFAULT \'\',
+	`auto` int(1) UNSIGNED NOT NULL DEFAULT \'0\',
+	`shared` int(1) UNSIGNED NOT NULL DEFAULT \'0\',
+	`frec` int(11) UNSIGNED NOT NULL DEFAULT \'0\',
+
+	PRIMARY KEY(`id_prop`),
+	INDEX `id_user_index` (`id_user`),
+	INDEX `id_user_id_contact_index` (`id_user`, `id_contact`)
+
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;',
+
+// -- rainloop_pab_tags --
+'CREATE TABLE IF NOT EXISTS `rainloop_pab_tags` (
+	
+	`id_tag` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+	`id_user` int(11) UNSIGNED NOT NULL,
+	`name` varchar(255) NOT NULL,
+
+	PRIMARY KEY(`id_tag`),
+	INDEX `id_user_index` (`id_user`)
+		
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;',
+
+// -- rainloop_pab_tags_contacts --
+'CREATE TABLE IF NOT EXISTS `rainloop_pab_tags_contacts` (
+	
+	`id_tag` int(11) UNSIGNED NOT NULL,
+	`id_contact` int(11) UNSIGNED NOT NULL,
+
+	INDEX `id_contact_id_tag_index` (`id_contact`, `id_tag`)
+
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;'
+		)));
+	}
+
+	/**
+	 * @param int $iUserID
+	 * @param int $iIdContact
+	 * @return array
+	 */
+	private function getContactFreq($iUserID, $iIdContact)
+	{
+		$aResult = array();
+
+		$sTypes = \implode(',', array(
+			PropertyType::EMAIl_PERSONAL, PropertyType::EMAIl_BUSSINES, PropertyType::EMAIl_OTHER
+		));
+
+		$sSql = 'SELECT `value`, `frec` FROM `rainloop_pab_properties` WHERE id_user = :id_user AND `id_contact` = :id_contact AND `type` IN ('.$sTypes.')';
+		$aParams = array(
+			':id_user' => array($iUserID, \PDO::PARAM_INT),
+			':id_contact' => array($iIdContact, \PDO::PARAM_INT)
+		);
+
+		$oStmt = $this->prepareAndExecute($sSql, $aParams);
+		if ($oStmt)
+		{
+			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+			if (\is_array($aFetch))
+			{
+				foreach ($aFetch as $aItem)
+				{
+					if ($aItem && !empty($aItem['value']) && !empty($aItem['frec']))
+					{
+						$aResult[$aItem['value']] = (int) $aItem['frec'];
+					}
+				}
+			}
+		}
+
+		return $aResult;
+	}
+
+	/**
+	 * @param string $sSearch
+	 *
+	 * @return string
+	 */
+	private function specialConvertSearchValue($sSearch, $sEscapeSign = '=')
+	{
+		return '%'.\str_replace(array($sEscapeSign, '_', '%'),
+			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'), $sSearch).'%';
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function getPdoAccessData()
+	{
+		return array('mysql', $this->sDsn, $this->sUser, $this->sPassword);
+	}
+}

rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/PersonalAddressBookInterface.php

@@ -30,17 +30,26 @@ interface PersonalAddressBookInterface
 	 */
 	public function DeleteContacts($oAccount, $aContactIds);
 
+	/**
+	 * @param \RainLoop\Account $oAccount
+	 * @param array $aTagsIds
+	 *
+	 * @return bool
+	 */
+	public function DeleteTags($oAccount, $aTagsIds);
+
 	/**
 	 * @param \RainLoop\Account $oAccount
 	 * @param int $iOffset = 0
 	 * @param type $iLimit = 20
 	 * @param string $sSearch = ''
 	 * @param bool $bAutoOnly = false
+	 * @param int $iResultCount = 0
 	 *
 	 * @return array
 	 */
 	public function GetContacts($oAccount,
-		$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false);
+		$iOffset = 0, $iLimit = 20, $sSearch = '', $bAutoOnly = false, &$iResultCount = 0);
 
 	/**
 	 * @param \RainLoop\Account $oAccount