Commit b43ac5c6 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-998 Remove unused $store in getExistingContacts().

Released under the Affero GNU General Public License (AGPL) version 3.
parent 276777ec
...@@ -130,7 +130,7 @@ class Kopano extends ContactWorker { ...@@ -130,7 +130,7 @@ class Kopano extends ContactWorker {
$mapiprovider = new MAPIProvider($this->session, $store); $mapiprovider = new MAPIProvider($this->session, $store);
// get a list of all contacts in the target folder // get a list of all contacts in the target folder
$existingByAccount = $this->getExistingContacts($store, $folder); $existingByAccount = $this->getExistingContacts($folder);
$addrbook = mapi_openaddressbook($this->session); $addrbook = mapi_openaddressbook($this->session);
if (mapi_last_hresult()) { if (mapi_last_hresult()) {
...@@ -294,7 +294,7 @@ class Kopano extends ContactWorker { ...@@ -294,7 +294,7 @@ class Kopano extends ContactWorker {
$folder = $this->getFolder($store, $targetFolderId); $folder = $this->getFolder($store, $targetFolderId);
// get a list of all contacts in the target folder // get a list of all contacts in the target folder
$existingByAccount = $this->getExistingContacts($store, $folder); $existingByAccount = $this->getExistingContacts($folder);
// entries in the $existingByAccount array must be deleted // entries in the $existingByAccount array must be deleted
$entry_ids = array_reduce($existingByAccount, function ($result, $item) { $entry_ids = array_reduce($existingByAccount, function ($result, $item) {
...@@ -412,13 +412,12 @@ class Kopano extends ContactWorker { ...@@ -412,13 +412,12 @@ class Kopano extends ContactWorker {
/** /**
* Returns a list of contacts that have a hash (and therefore, were created by this script). * Returns a list of contacts that have a hash (and therefore, were created by this script).
* *
* @param ressource $store
* @param ressource $folder * @param ressource $folder
* *
* @access private * @access private
* @return array * @return array
*/ */
private function getExistingContacts($store, $folder) { private function getExistingContacts($folder) {
$table = mapi_folder_getcontentstable($folder); $table = mapi_folder_getcontentstable($folder);
if (!$table) if (!$table)
$this->Log(sprintf("Kopano->getExistingContacts: Error, unable to read contents table to find contacts: 0x%08X", mapi_last_hresult())); $this->Log(sprintf("Kopano->getExistingContacts: Error, unable to read contents table to find contacts: 0x%08X", mapi_last_hresult()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment