Updating domain check

ushahidi · Jun 24, 2017 · b1749bc · b1749bc
1 parent 77f74e4
commit b1749bc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/application/classes/Ushahidi/Listener/IntercomAdminListener.php b/application/classes/Ushahidi/Listener/IntercomAdminListener.php
@@ -30,7 +30,8 @@ public function handle(EventInterface $event, $user = null)
         "id" => $domain
       ];
 
-      if ($intercomAppToken) {
+      if ($intercomAppToken && empty($domain)) {
+
         $client = new IntercomClient($intercomAppToken, null);
 
         try {

diff --git a/application/classes/Ushahidi/Listener/IntercomCompanyListener.php b/application/classes/Ushahidi/Listener/IntercomCompanyListener.php
@@ -24,18 +24,21 @@ class Ushahidi_Listener_IntercomCompanyListener extends AbstractListener
   public function handle(EventInterface $event, $data = null)
   {
     $intercomAppToken = getenv('INTERCOM_APP_TOKEN');
-    if ($intercomAppToken) {
+    $domain = service('site');
+
+    if ($intercomAppToken && empty($domain)) {
+
       try {
         $client = new IntercomClient($intercomAppToken, null);
-        $domain = service('site') ? service('site') : $_SERVER['HOST'];
+
 
         $company = [
           "company_id" => $domain,
           "custom_attributes" => $data
         ];
         // Update company
-        $client->companies->create($company);
-
+        $thing = $client->companies->create($company);
+        
       } catch(ClientException $e) {
         Kohana::$log->add(Log::ERROR, print_r($e,true));
       }