Fixed #221 -- Google Analytics User ID

bireme · Sep 24, 2019 · e43b4cd · e43b4cd
1 parent 39e4eb3
commit e43b4cd
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/client/business/authentication.php b/client/business/authentication.php
@@ -78,6 +78,7 @@
                 $cookie = UserData::sendCookie($result["userTK"], true);
                 setcookie("userData", $cookie, $remember_me, '/', COOKIE_DOMAIN_SCOPE);
                 setcookie("userTK", $result["userTK"], $remember_me, '/', COOKIE_DOMAIN_SCOPE);
+                setcookie("userID", $_SESSION["userID"], $remember_me, '/', COOKIE_DOMAIN_SCOPE);
 
                 // SSO LOGIN
                 if(ENABLE_SSO_LOGIN){

diff --git a/client/business/logout.php b/client/business/logout.php
@@ -20,6 +20,7 @@
 /* destroy session data */
 session_destroy();
 $_SESSION = array();
+setcookie('userID','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 setcookie('userTK','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 setcookie('userData','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 $send_cookie = 'logout'; // remove cookie from .bvs.br

diff --git a/client/classes/Tools.php b/client/classes/Tools.php
@@ -238,18 +238,14 @@ public static function sendCookie($userTK,$return=false){
 
         $src = BVS_COOKIE_DOMAIN.'/cookies.php?userData='.$userData;
 
-        if ( $return ) {
-            return $userData;
-        } else {
-
         ?>
         <script type="text/javascript">
             var element = document.createElement("img");
             element.setAttribute('src', "<?php echo $src; ?>");
         </script>
         <?php
 
-        }
+        if ( $return ) return $userData;
     }
 
 }

diff --git a/client/templates/default/header.tpl.php b/client/templates/default/header.tpl.php
@@ -110,9 +110,11 @@
         if (navigator.userAgent.indexOf('gonative') > -1) {
             __gaTracker('create', '<?php echo APP_GOOGLE_ANALYTICS; ?>', 'auto');
             __gaTracker('send', 'pageview');
+            __gaTracker('set', 'userId', '<?php echo $_SESSION["userID"]; ?>'); // Set the user ID using signed-in user_id.
         } else {
             __gaTracker('create', '<?php echo GOOGLE_ANALYTICS; ?>', 'auto');
             __gaTracker('send', 'pageview');
+            __gaTracker('set', 'userId', '<?php echo $_SESSION["userID"]; ?>'); // Set the user ID using signed-in user_id.
         }
     </script>
     <?php endif; ?>

diff --git a/server/classes/UserDAO.php b/server/classes/UserDAO.php
@@ -807,7 +807,7 @@ public static function changePassword($userID, $oldPassword, $newPassword){
                         $newToken = Token::makeUserTK($userID,$newPassword,'ldap');
                         $_SESSION['userTK'] = $newToken;
                         setcookie("userTK", $_SESSION["userTK"], 0, '/', COOKIE_DOMAIN_SCOPE);
-                        //UserData::sendCookie($result["userTK"]);
+                        // UserData::sendCookie($result["userTK"]);
                     }
                 } else {
                     $retValue = 'invalidpass';

diff --git a/server/pub/include/logout.php b/server/pub/include/logout.php
@@ -19,6 +19,7 @@
 /* destroy session data */
 session_destroy();
 $_SESSION = array();
+setcookie('userID','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 setcookie('userTK','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 setcookie('userData','',time() -3600,'/',COOKIE_DOMAIN_SCOPE);
 $send_cookie = 'logout'; // remove cookie from .bvs.br

diff --git a/server/templates/default/header.tpl.php b/server/templates/default/header.tpl.php
@@ -84,9 +84,11 @@
         if (navigator.userAgent.indexOf('gonative') > -1) {
             __gaTracker('create', '<?php echo APP_GOOGLE_ANALYTICS; ?>', 'auto');
             __gaTracker('send', 'pageview');
+            __gaTracker('set', 'userId', '<?php echo $_SESSION["userID"]; ?>'); // Set the user ID using signed-in user_id.
         } else {
             __gaTracker('create', '<?php echo GOOGLE_ANALYTICS; ?>', 'auto');
             __gaTracker('send', 'pageview');
+            __gaTracker('set', 'userId', '<?php echo $_SESSION["userID"]; ?>'); // Set the user ID using signed-in user_id.
         }
     </script>
     <?php endif; ?>