Fix for issue #5103 - Company/Accounts being duplicated on CRM Sync o…

app/bundles/LeadBundle/Helper/IdentifyCompanyHelper.php

@@ -74,10 +74,14 @@ public static function findCompany(array $parameters, CompanyModel $companyModel
 
         if (isset($parameters['company'])) {
             $companyName = filter_var($parameters['company']);
-        } elseif (isset($parameters['email']) || isset($parameters['companyemail'])) {
-            $companyName = isset($parameters['email']) ? self::domainExists($parameters['email']) : self::domainExists($parameters['companyemail']);
         } elseif (isset($parameters['companyname'])) {
             $companyName = filter_var($parameters['companyname']);
+        } else {
+            // Do nothing here. Just adding this for proper syntax.
+        }
+
+        if (isset($parameters['email']) || isset($parameters['companyemail'])) {
+            $companyDomain = isset($parameters['email']) ? self::domainExists($parameters['email']) : self::domainExists($parameters['companyemail']);
         }
 
         if (empty($parameters['companywebsite']) && !empty($parameters['companyemail'])) {
@@ -129,6 +133,9 @@ public static function findCompany(array $parameters, CompanyModel $companyModel
      */
     protected static function domainExists($email)
     {
+        if (!strstr($email, '@')) { //not a valid email adress
+            return false;
+        }
         list($user, $domain) = explode('@', $email);
         $arr                 = dns_get_record($domain, DNS_MX);