add option to track user id (fix #29)

sualko · Oct 28, 2018 · f971a91 · f971a91
1 parent 6e348e4
commit f971a91
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/js/track.js b/js/track.js
@@ -49,7 +49,7 @@ var _paq = _paq || [];
       _paq.push(['setCustomVariable', '1', 'App', app, 'page']);
    }
 
-   if (OC && OC.currentUser) {
+   if (OC && OC.currentUser && options.trackUser) {
       // set user id
       _paq.push(['setUserId', OC.currentUser]);
    }

diff --git a/lib/Controller/JavaScriptController.php b/lib/Controller/JavaScriptController.php
@@ -40,6 +40,7 @@ public function tracking()
             'url' => $this->config->getAppValue('url'),
             'siteId' => $this->config->getAppValue('siteId'),
             'trackDir' => $this->config->getBooleanAppValue('trackDir'),
+            'trackUser' => $this->config->getBooleanAppValue('trackUser'),
         ];
 
         $script = "var cloudPiwikOptions = '".json_encode($options)."';";

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -37,7 +37,7 @@ public function index()
 
     public function update($key)
     {
-        if (!in_array($key, ['url', 'siteId', 'trackDir'])) {
+        if (!in_array($key, ['url', 'siteId', 'trackDir', 'trackUser'])) {
             return [
                 'result' => 'error',
                 'message' => 'Tried to update not allowed param.',

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -30,6 +30,7 @@ public function getForm()
             'url' => $this->config->getAppValue('piwik', 'url'),
             'siteId' => $this->config->getAppValue('piwik', 'siteId'),
             'trackDir' => $this->config->getAppValue('piwik', 'trackDir'),
+            'trackUser' => $this->config->getAppValue('piwik', 'trackUser'),
         ];
 
         return new TemplateResponse('piwik', 'settings/admin', $parameters);

diff --git a/templates/settings/admin.php b/templates/settings/admin.php
@@ -20,7 +20,13 @@
 			<tr>
 				<td colspan="2">
 					<input type="checkbox" name="trackDir" id="piwikTrackDir" class="checkbox" <?php if ($_['trackDir']): ?> checked="checked"<?php endif; ?> />
-					<label for="piwikTrackDir">Track file browsing </label>	
+					<label for="piwikTrackDir">Track file browsing</label>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<input type="checkbox" name="trackUser" id="piwikTrackUser" class="checkbox" <?php if ($_['trackUser']): ?> checked="checked"<?php endif; ?> />
+					<label for="piwikTrackUser">Track user id</label>
 				</td>
 			</tr>
 		</table>