Merge pull request #72 from matomo-org/wordpress

Make plugin work with Matomo for WordPress

Generator.php

@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\VisitorGenerator;
 
 use Piwik\SettingsPiwik;
+use Piwik\SettingsServer;
 
 include_once __DIR__ . '/vendor/autoload.php';
 
@@ -27,6 +28,20 @@ public function __construct($matomoUrl = null)
         $this->setMatomoUrl($matomoUrl);
     }
 
+    protected function makeMatomoTracker($idSite)
+    {
+        if (SettingsServer::isMatomoForWordPress()) {
+            $trackerFile = plugin_dir_path( MATOMO_ANALYTICS_FILE ) . "tests/phpunit/framework/test-local-tracker.php";
+            if (file_exists($trackerFile)) {
+                include_once $trackerFile;
+                return new \MatomoLocalTracker($idSite, $this->getMatomoUrl());
+            } else {
+                throw new \Exception('The visitor generator in Matomo for WordPress works only when the plugin is installed from Git and is only intended for development.');
+            }
+        }
+        return new \MatomoTracker($idSite, $this->getMatomoUrl());
+    }
+
     /**
      * @param $matomoUrl
      */

Generator/VisitsFake.php

@@ -20,7 +20,7 @@ public function generate($time = false, $idSite = 1, $limit = 1000)
     {
         $date = date("Y-m-d", $time);
 
-        $tracker = new \MatomoTracker(1, $this->getMatomoUrl());
+        $tracker = $this->makeMatomoTracker($idSite);
         $tracker->setDebugStringAppend('dp=1');
         $tracker->enableBulkTracking();
         $tokenAuth = Piwik::requestTemporarySystemAuthToken('VistorGenerator', 24);

Menu.php

@@ -10,17 +10,26 @@
 
 use Piwik\Menu\MenuAdmin;
 use Piwik\Piwik;
+use Piwik\SettingsServer;
 
 class Menu extends \Piwik\Plugin\Menu
 {
     public function configureAdminMenu(MenuAdmin $menu)
     {
         if (Piwik::hasUserSuperUserAccess()) {
-            $menu->addDevelopmentItem(
-                'VisitorGenerator_VisitorGenerator',
-                ['module' => 'VisitorGenerator', 'action' => 'index'],
-                $order = 20
-            );
+            if (SettingsServer::isMatomoForWordPress()) {
+                $menu->addSystemItem(
+                    'VisitorGenerator_VisitorGenerator',
+                    ['module' => 'VisitorGenerator', 'action' => 'index'],
+                    $order = 20
+                );
+            } else {
+                $menu->addDevelopmentItem(
+                    'VisitorGenerator_VisitorGenerator',
+                    ['module' => 'VisitorGenerator', 'action' => 'index'],
+                    $order = 20
+                );
+            }
         }
     }
 }

README.md

@@ -46,15 +46,17 @@ VisitorGenerator makes a lot of requests to the Matomo tracking API to send the
 
 ## Using it in Matomo for WordPress
 
-The developer menu item is not available in Matomo for WordPress. Visits have to be generated using the command line instead:
+It only works in Matomo for WordPress if the plugin is installed through git as it's only intended for development.
+
+In Matomo for WordPress you can find the UI in the Matomo Admin under "System".
+
+You can also use the command line to generate the data:
 
 ```
 cd wp-content/plugins/matomo/app
 ./console  visitorgenerator:generate-visits --idsite=1
 ```
 
-If you are getting an error about SSL errors then you can use the `--custom-matomo-url="..."` option to specify using HTTP. For example `--custom-matomo-url="http://my-domain/wp-content/plugins/matomo/app/"`.
-
 ### Legalnotice
 
 This plugin is released under the GPLv3+ license.

templates/index.twig

@@ -38,7 +38,6 @@
                  title="{{ 'VisitorGenerator_ChoiceYes'|translate|e('html_attr') }}">
             </div>
 
-            <input type="hidden" value="{{ token_auth }}" name="token_auth"/>
             <input type="hidden" value="{{ nonce }}" name="form_nonce"/>
 
             <p>