Added empty check for uid

Author: iMarkus

Columns/UserId.php

@@ -43,13 +43,16 @@ class UserId extends VisitDimension
      * @return mixed|false
      */
     public function onNewVisit(Request $request, Visitor $visitor, $action)
-    {	
-	$username = $visitor->getVisitorColumn('user_id');
-	$salt = Config::getInstance()->General['salt'];
-        $usernamehash = substr( sha1( $salt.$username ), 0, 16);
-        $visitor->setVisitorColumn('user_id', $usernamehash);
-
-	return $usernamehash;
+    {
+      $uid = $visitor->getVisitorColumn('user_id');
+      if(!empty($uid))
+      {
+        $salt = Config::getInstance()->General['salt'];
+        $hash = substr(sha1($salt.$uid), 0, 16);
+        $visitor->setVisitorColumn('user_id', $hash);
+        return $hash;
+      }
+      return $uid;
     }
 
     /**
@@ -61,11 +64,14 @@ public function onNewVisit(Request $request, Visitor $visitor, $action)
      */
     public function onExistingVisit(Request $request, Visitor $visitor, $action)
     {
-	$username = $visitor->getVisitorColumn('user_id');
-	$salt = Config::getInstance()->General['salt'];
-	$usernamehash = substr( sha1( $salt.$username ), 0, 16);
-	$visitor->setVisitorColumn('user_id', $usernamehash);
-
-        return $usernamehash;
+      $uid = $visitor->getVisitorColumn('user_id');
+      if(!empty($uid))
+      {
+        $salt = Config::getInstance()->General['salt'];
+        $hash = substr(sha1($salt.$uid), 0, 16);
+        $visitor->setVisitorColumn('user_id', $hash);
+        return $hash;
+      }
+      return $uid;
     }
-}
+}

plugin.json

@@ -1,7 +1,7 @@
 {
     "name": "HashUserId",
 	"description": "Anonymize UserId using salt and sha1 hash.",
-	"version": "0.1.0",
+	"version": "0.2.0",
     "license": "GPL v3+",
     "theme": false,
 	"homepage": "https://github.com/iMarkus/Piwik-HashUserId",
@@ -14,6 +14,11 @@
             "name": "iMarkus",
             "email": "[email protected]",
             "homepage": "https://github.com/iMarkus"
+        },
+		{
+            "name": "hagor",
+            "email": "[email protected]",
+            "homepage": "https://github.com/hagor"
         }
     ],
     "support": {