From 258762da47ac42046e21943a2385cd1d8b700fb6 Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Sun, 18 Nov 2018 02:25:35 -0500
Subject: [PATCH 1/4] Set unique user id for google analytics and facebook
 pixel. Also logged web visitor access on each page view.

Removed unique id generation from php and using internal unique id.
---
 controller/Session.class.php               | 11 ++++++++---
 lib/thirdparty/LBRY.class.php              |  5 +++++
 view/template/layout/_analytics_footer.php |  5 ++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/controller/Session.class.php b/controller/Session.class.php
index 0da141e6..085e5741 100644
--- a/controller/Session.class.php
+++ b/controller/Session.class.php
@@ -11,13 +11,15 @@ class Session
 
     const NAMESPACE_DEFAULT = 'default',
         NAMESPACE_FLASH = 'flash',
-        NAMESPACE_FLASH_REMOVE = 'flash_remove';
+        NAMESPACE_FLASH_REMOVE = 'flash_remove',
+        USER_ID = 'user_id';
 
     public static function init()
     {
         ini_set('session.cookie_secure', IS_PRODUCTION); // send cookie over ssl only
-    ini_set('session.cookie_httponly', true); // no js access to cookies
-    session_start();
+        ini_set('session.cookie_httponly', true); // no js access to cookies
+        session_start();
+
 
         if (!static::get('secure_and_httponly_set')) {
             session_regenerate_id(); // ensure that old cookies get new settings
@@ -31,6 +33,9 @@ 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'];
+
         static::initFlashes();
     }
 
diff --git a/lib/thirdparty/LBRY.class.php b/lib/thirdparty/LBRY.class.php
index a6223d24..0bad0b26 100644
--- a/lib/thirdparty/LBRY.class.php
+++ b/lib/thirdparty/LBRY.class.php
@@ -75,4 +75,9 @@ class LBRY
             return Curl::post(static::getApiUrl("/yt/update"), ['status_token' => $status_token, 'new_email' => $email, 'new_preferred_channel' => $channel_name, 'sync_consent' => $sync_consent], ['json_response' => true]);
         }
     }
+
+    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]);
+    }
 }
diff --git a/view/template/layout/_analytics_footer.php b/view/template/layout/_analytics_footer.php
index d5432e90..5d0fe5ee 100644
--- a/view/template/layout/_analytics_footer.php
+++ b/view/template/layout/_analytics_footer.php
@@ -8,13 +8,16 @@
 
     ga('create', 'UA-60403362-1', 'auto');
     ga('require', 'GTM-NT8579P');
+    ga('set', 'userId', '<?php echo $_SESSION[Session::USER_ID] ?>');
     ga('send', 'pageview');
 
    !function(f,b,e,v,n,t,s) {if(f.fbq)return;n=f.fbq=function(){n.callMethod? n.callMethod.apply(n,arguments):n.queue.push(arguments)}; if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0'; n.queue=[];t=b.createElement(e);t.async=!0; t.src=v;s=b.getElementsByTagName(e)[0]; s.parentNode.insertBefore(t,s)}(window,document,'script', 'https://connect.facebook.net/en_US/fbevents.js');
 
-   fbq('init', '1618717031725766');
+   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>

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 2/4] 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>

From ab96e759684bc2d8fc903c00c713232dd78e2a52 Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Thu, 27 Dec 2018 16:35:17 -0500
Subject: [PATCH 3/4] check for null if not in production.

---
 controller/Session.class.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/controller/Session.class.php b/controller/Session.class.php
index 1e85c72b..04683d9d 100644
--- a/controller/Session.class.php
+++ b/controller/Session.class.php
@@ -34,12 +34,13 @@ class Session
             static::setNamespace(static::NAMESPACE_DEFAULT, $oldSession);
         }
 
-        $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']))
-        {
+        $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 (!is_null($response)
+                && key_exists('data', $response)
+                && key_exists('visitor_id', $response['data'])) {
             $_SESSION[static::USER_ID] = $response['data']['visitor_id'];
-        }else{
+        } else {
             $_SESSION[static::USER_ID] = '';
         }
 

From d1c97227f0b1a1311a06c1763bfea571221486d2 Mon Sep 17 00:00:00 2001
From: Mark Beamer Jr <markbeamerjr@gmail.com>
Date: Thu, 27 Dec 2018 19:34:51 -0500
Subject: [PATCH 4/4] changed api call to flush before call the api using
 response callback.

---
 controller/Session.class.php | 17 +++++++++--------
 view/Response.class.php      | 15 +++++++++++++++
 web/index.php                |  2 ++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/controller/Session.class.php b/controller/Session.class.php
index 04683d9d..5387dd2e 100644
--- a/controller/Session.class.php
+++ b/controller/Session.class.php
@@ -34,16 +34,17 @@ class Session
             static::setNamespace(static::NAMESPACE_DEFAULT, $oldSession);
         }
 
-        $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 (!is_null($response)
+        Response::addPostRenderCallback(function(){
+            $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 (!is_null($response)
                 && key_exists('data', $response)
                 && key_exists('visitor_id', $response['data'])) {
-            $_SESSION[static::USER_ID] = $response['data']['visitor_id'];
-        } else {
-            $_SESSION[static::USER_ID] = '';
-        }
-
+                $_SESSION[static::USER_ID] = $response['data']['visitor_id'];
+            } else {
+                $_SESSION[static::USER_ID] = '';
+            }
+        });
 
         static::initFlashes();
     }
diff --git a/view/Response.class.php b/view/Response.class.php
index 9b4526ba..f93e771b 100644
--- a/view/Response.class.php
+++ b/view/Response.class.php
@@ -35,6 +35,8 @@ class Response
     protected static $metaImages = [];
     protected static $facebookAnalyticsType = "PageView";
 
+    private static $PostRenderCallbacks = array();
+
     public static function setMetaDescription($description)
     {
         static::$metaDescription = $description;
@@ -369,6 +371,19 @@ class Response
     );
     }
 
+    public static function addPostRenderCallback( $cb )
+    {
+        array_push(static::$PostRenderCallbacks, $cb);
+    }
+
+    public static function invokePostRenderCallbacks()
+    {
+        foreach(static::$PostRenderCallbacks as &$cb )
+        {
+            $cb();
+        }
+    }
+
 
     //  public static function addBodyCssClass($classOrClasses)
 //  {
diff --git a/web/index.php b/web/index.php
index 4f06d8a7..2864c89c 100644
--- a/web/index.php
+++ b/web/index.php
@@ -28,6 +28,8 @@ try {
         View::compileCss();
     }
     Controller::dispatch(Request::getRoutingUri());
+    flush();
+    Response::invokePostRenderCallbacks();
 } catch (Throwable $e) {
     if (IS_PRODUCTION) {
         Slack::sendErrorIfProd($e);