From 37b51b8fd13adf10f65edb3728755138af5afd1a Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Thu, 27 Dec 2018 15:08:24 -0500
Subject: [PATCH] Addressed review comments.

---
 controller/Session.class.php               | 14 +++++++++++---
 lib/thirdparty/LBRY.class.php              |  5 ++++-
 view/template/layout/_analytics_footer.php |  2 --
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/controller/Session.class.php b/controller/Session.class.php
index 085e5741..1e85c72b 100644
--- a/controller/Session.class.php
+++ b/controller/Session.class.php
@@ -12,7 +12,8 @@ class Session
     const NAMESPACE_DEFAULT = 'default',
         NAMESPACE_FLASH = 'flash',
         NAMESPACE_FLASH_REMOVE = 'flash_remove',
-        USER_ID = 'user_id';
+        USER_ID = 'user_id',
+        SITE_ID = 'lbry.io';
 
     public static function init()
     {
@@ -33,8 +34,15 @@ class Session
             static::setNamespace(static::NAMESPACE_DEFAULT, $oldSession);
         }
 
-        $response = LBRY::logWebVisitor('lbry.io', $_SESSION[static::USER_ID], $_SERVER['REMOTE_ADDR']);
-        $_SESSION[static::USER_ID] = $response['data']['visitor_id'];
+        $site_visitor_id = key_exists(static::USER_ID,$_SESSION) ? $_SESSION[static::USER_ID] : '';
+        $response = LBRY::logWebVisitor(static::SITE_ID, $site_visitor_id,  $_SERVER['REMOTE_ADDR']);
+        if (key_exists('data',$response) && key_exists('visitor_id',$response['data']))
+        {
+            $_SESSION[static::USER_ID] = $response['data']['visitor_id'];
+        }else{
+            $_SESSION[static::USER_ID] = '';
+        }
+
 
         static::initFlashes();
     }
diff --git a/lib/thirdparty/LBRY.class.php b/lib/thirdparty/LBRY.class.php
index 0bad0b26..3a80394d 100644
--- a/lib/thirdparty/LBRY.class.php
+++ b/lib/thirdparty/LBRY.class.php
@@ -78,6 +78,9 @@ class LBRY
 
     public static function logWebVisitor($site, $visitorID, $IPAddress)
     {
-        return Curl::post(static::getApiUrl("/visitor/new"), ['site' => $site, 'visitor_id' => $visitorID, 'ip_address' => $IPAddress], ['json_response' => true]);
+        if (IS_PRODUCTION)
+        {
+            return Curl::post(static::getApiUrl("/visitor/new"), ['site' => $site, 'visitor_id' => $visitorID, 'ip_address' => $IPAddress], ['json_response' => true]);
+        }
     }
 }
diff --git a/view/template/layout/_analytics_footer.php b/view/template/layout/_analytics_footer.php
index 5d0fe5ee..1618d232 100644
--- a/view/template/layout/_analytics_footer.php
+++ b/view/template/layout/_analytics_footer.php
@@ -16,8 +16,6 @@
    fbq('init', '1618717031725766',{uid: '<?php echo $_SESSION[Session::USER_ID] ?>'}));
    fbq('track', '<?php echo Response::getFacebookPixelAnalyticsType() ?>');
 
-    <?php LBRY::logWebVisitor('lbry.io', $_SESSION[Session::USER_ID], $_SERVER['REMOTE_ADDR'])?>
-
   </script>
 <?php else: ?>
   <script>