Could not delete a user if this was removed directly on the mailchimp…

… site
compojoom · Aug 10, 2016 · 3de2c81 · 3de2c81
1 parent feaa0a2
commit 3de2c81
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/source/administrator/components/com_cmc/controllers/users.php b/source/administrator/components/com_cmc/controllers/users.php
@@ -49,6 +49,7 @@ public function delete()
 		$api_key = $params->get("api_key", '');
 		$db = JFactory::getDBO();
 
+
 		if (count($cid))
 		{
 			for ($i = 0; $i < count($cid); $i++)
@@ -63,13 +64,16 @@ public function delete()
 				}
 				catch (Exception $e)
 				{
-					// Catching the case where the user is already unsubscribed from mailchimp
-					if ($e->getCode() != 232)
+					// If we have 404 here, then the user was deleted in mailchimp and we don't need him here
+					if($e->getCode() == 404)
+					{
+						JFactory::getApplication()->enqueueMessage('User seems to be already deleted in the mailchimp list');
+					}
+					else
 					{
-						throw $e;
+						JFactory::getApplication()->enqueueMessage($e->getMessage());
 					}
 				}
-
 			}
 
 			$cids = implode(',', $cid);

diff --git a/source/administrator/components/com_cmc/helpers/basic.php b/source/administrator/components/com_cmc/helpers/basic.php
@@ -76,9 +76,12 @@ public static function unsubscribeList($user)
 
 		$api->listUnsubscribe($user->list_id, $user->email, true);
 
+
 		if ($api->getLastError())
 		{
-			throw new Exception(JTEXT::_("COM_CMC_UNSUBSCRIBE_FAILED") . ": " . $api->getLastError(), 500);
+			$response = $api->getLastResponse();
+
+			throw new Exception(JTEXT::_("COM_CMC_UNSUBSCRIBE_FAILED") . ": " . $api->getLastError(), $response['headers']['http_code'] );
 		}
 
 		return true;