diff options
| author | sualko <klaus@jsxc.org> | 2018-10-28 16:34:31 +0300 |
|---|---|---|
| committer | sualko <klaus@jsxc.org> | 2018-10-28 16:34:31 +0300 |
| commit | f971a918586602ba8592363a831f19a0d247da5a (patch) | |
| tree | 300432020962d22f19ede44c31afa8da32dff77b | |
| parent | 6e348e49f29bd4b597a21ee8f445f009a6e8f424 (diff) | |
add option to track user id (fix #29)
| -rw-r--r-- | js/track.js | 2 | ||||
| -rw-r--r-- | lib/Controller/JavaScriptController.php | 1 | ||||
| -rw-r--r-- | lib/Controller/SettingsController.php | 2 | ||||
| -rw-r--r-- | lib/Settings/Admin.php | 1 | ||||
| -rw-r--r-- | templates/settings/admin.php | 8 |
5 files changed, 11 insertions, 3 deletions
diff --git a/js/track.js b/js/track.js index 0b35beb..ccd9f14 100644 --- 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 index eeeab9c..bc15c76 100644 --- a/lib/Controller/JavaScriptController.php +++ b/lib/Controller/JavaScriptController.php @@ -40,6 +40,7 @@ class JavaScriptController extends Controller '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 index b3474d2..bbfe123 100644 --- a/lib/Controller/SettingsController.php +++ b/lib/Controller/SettingsController.php @@ -37,7 +37,7 @@ class SettingsController extends Controller 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 index dcb5a6e..2478445 100644 --- a/lib/Settings/Admin.php +++ b/lib/Settings/Admin.php @@ -30,6 +30,7 @@ class Admin implements ISettings '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 index 6984027..ed4ec9e 100644 --- a/templates/settings/admin.php +++ b/templates/settings/admin.php @@ -20,7 +20,13 @@ style('piwik', 'settings'); <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> |