Merge pull request #9 from DevDavido/development

Bump to v1.0.5

Author: DevDavido

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.0.5
+- Added: Possibility to check plugin audit functionality
+
 ## 1.0.4
 - Fixed: Switched to require `piwik` instead `matomo` in `plugin.json` for Matomo 3.x compatibility
 - Improved: `plugin.json` plugin description

Controller.php

@@ -10,8 +10,10 @@
 
 require PIWIK_INCLUDE_PATH . '/plugins/PerformanceAudit/vendor/autoload.php';
 
+use Exception;
 use Piwik\Plugin;
 use Piwik\Plugin\Controller as BaseController;
+use Piwik\Site;
 
 class Controller extends BaseController
 {
@@ -29,4 +31,44 @@ public function version()
             'pluginName' => $plugin->getPluginName()
         ]);
     }
+
+    /**
+     * Render plugin check page.
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function pluginCheck()
+    {
+        return $this->renderTemplate('pluginCheck', [
+            'checkStartUrl' => (new Menu())->getUrlForAction('pluginCheckStart')
+        ]);
+    }
+
+    /**
+     * Start plugin check.
+     *
+     * @return string
+     * @throws Exception
+     */
+    public function pluginCheckStart()
+    {
+        $tasks = new Tasks();
+        foreach (Site::getSites() as $site) {
+            $tasks->auditSite((int) $site['idsite'], $debug = true);
+        }
+
+        $hasErrorInOutput = false;
+        $logOutput = array_map('trim', array_map('stripslashes', $tasks->getLogOutput()));
+        foreach ($logOutput as $logEntry) {
+            if (stristr($logEntry, '[error]') || stristr($logEntry, '[warning]')) {
+                $hasErrorInOutput = true;
+            }
+        }
+
+        return $this->renderTemplate('pluginChecked', [
+            'hasErrorInOutput' => $hasErrorInOutput,
+            'logOutput' => nl2br(implode("\n", $logOutput))
+        ]);
+    }
 }

Menu.php

@@ -26,6 +26,18 @@ class Menu extends BaseMenu
      */
     public function configureAdminMenu(MenuAdmin $menu)
     {
-        $menu->addItem('PerformanceAudit_CoreAdminHome_MenuPerformance', 'PerformanceAudit_Version', $this->urlForAction('version'), $orderId = 4);
+        $menu->addItem('PerformanceAudit_CoreAdminHome_MenuPerformance', 'PerformanceAudit_PluginCheck', $this->urlForAction('pluginCheck'), $orderId = 4);
+        $menu->addItem('PerformanceAudit_CoreAdminHome_MenuPerformance', 'PerformanceAudit_Version', $this->urlForAction('version'), $orderId = 5);
+    }
+
+    /**
+     * Returns URL for action.
+     *
+     * @param string $name
+     * @return string
+     */
+    public function getUrlForAction(string $name)
+    {
+        return http_build_query($this->urlForActionWithDefaultUserParams($name));
     }
 }

PerformanceAudit.php

@@ -37,7 +37,8 @@ class PerformanceAudit extends Plugin
     public function registerEvents()
     {
         return [
-            'Db.getTablesInstalled' => 'getTablesInstalled'
+            'Db.getTablesInstalled' => 'getTablesInstalled',
+            'AssetManager.getStylesheetFiles' => 'getStylesheetFiles'
         ];
     }
 
@@ -248,12 +249,24 @@ private function deleteDatabaseTable()
      * Register the new tables.
      *
      * @param array $tablesInstalled
+     * @retrun void
      */
     public function getTablesInstalled(&$tablesInstalled)
     {
         $tablesInstalled[] = Common::prefixTable('log_performance');
     }
 
+    /**
+     * Sets array of required CSS files.
+     *
+     * @param array $cssFiles
+     * @retrun void
+     */
+    public function getStylesheetFiles(&$cssFiles)
+    {
+        $cssFiles[] = 'plugins/PerformanceAudit/stylesheets/pluginCheck.css';
+    }
+
     /**
      * Return if internet connection is required.
      *