minor fixes

ot_stats/Classes/Controller/OtStatsController.php

@@ -2,10 +2,8 @@
 
 namespace Opentalent\OtStats\Controller;
 
-use Opentalent\OtCore\Cache\OtCacheManager;
 use Opentalent\OtCore\Controller\SelectedSiteController;
 use Opentalent\OtCore\Logging\OtLogger;
-use Opentalent\OtCore\Messaging\FlashMessageService;
 use Opentalent\OtStats\Domain\Repository\MatomoWebsiteRepository;
 use Opentalent\OtStats\Settings\StatsSettingsRepository;
 use TYPO3\CMS\Core\Messaging\AbstractMessage;

ot_stats/Classes/Domain/Repository/MatomoWebsiteRepository.php

@@ -7,18 +7,22 @@ use Opentalent\OtStats\Domain\Model\MatomoWebsite;
 use PDO;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Extbase\Persistence\Repository;
 
 class MatomoWebsiteRepository
 {
+    /**
+     * Database connection data
+     */
     const MATOMO_DB_HOST = 'tools';
     const MATOMO_DB_NAME = 'matomo';
     const MATOMO_DB_USER = 'matomo';
     const MATOMO_DB_PWD = ']:*j8GYU/n9mp+';
 
+    /**
+     * Regex
+     */
     const RELATIVE_PATH_VALIDATION = '/^\/[a-zA-Z0-9_\-]+\/?$/';
     const DOMAIN_VALIDATION = '/^(https?:\/\/)?([a-zA-Z0-9]+\.)+[a-zA-Z]{2,}(:\d+)?(\/[a-zA-Z0-9_\-]+)*\/?$/';
-//    const DOMAIN_VALIDATION = '/^(https?:\/\/)?([a-zA-Z0-9]+\.)+[a-zA-Z]{2,}$/';
 
     /**
      * Connection to the matomo DB
@@ -27,6 +31,7 @@ class MatomoWebsiteRepository
      */
     private $matomoCnn;
 
+
     public function __construct()
     {
         // Connection to the Matomo DB
@@ -147,7 +152,6 @@ class MatomoWebsiteRepository
             $uri = $host . $uri;
         }
 
-//        $uri = $site->getConfiguration()['base'];
         if (!preg_match('/https?:\/\/.*/', $uri)) {
             $uri = 'https://' . $uri;
         }

ot_stats/Classes/Middleware/RequestHandler.php

@@ -25,6 +25,8 @@ class RequestHandler implements MiddlewareInterface
     const TEMPLATE_FILE = self::TEMPLATES_ROOT_PATHS . '/Header/Include.html';
 
     /**
+     * Process the frontend request to insert the matomo script in the header
+     * if the stats module is activated
      *
      * @param ServerRequestInterface $request
      * @param RequestHandlerInterface $handler

ot_stats/Classes/Settings/StatsSettingsRepository.php

@@ -2,7 +2,6 @@
 
 namespace Opentalent\OtStats\Settings;
 
-use PDO;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Page\PageRepository;
@@ -22,7 +21,7 @@ class StatsSettingsRepository extends PageRepository
      * @return int|null
      */
     public function getMatomoSiteId(int $rootPageUid) {
-        $rootPage = $this->getPage($rootPageUid);
+        $rootPageUid = $this->getPage($rootPageUid);
 
         // Set up a connection to the typo3 DB
         $cnnPool = GeneralUtility::makeInstance(ConnectionPool::class);

ot_stats/Resources/Private/Partials/ReportCard.html

@@ -20,7 +20,7 @@
     <h4>{title}</h4>
     <div class="widgetIframe">
         <iframe width="{f:if(condition: '{width} > 0', then: width, else: '500')}"
-                height="{f:if(condition: '{height} > 0', then: height, else: '350')}"
+                height="{f:if(condition: '{height} > 0', then: height, else: '300')}"
                 id="{id}"
 				src="https://stats.2iopenservice.com/index.php?module=Widgetize
 						&action=iframe
@@ -40,7 +40,7 @@
         <f:if condition="{height}>0"><f:then>
             <f:comment><!-- no resizing --></f:comment>
         </f:then><f:else>
-            <script defer>iFrameResize(<f:format.raw value="{"/><f:format.raw value="}"/>, '#{id}')</script>
+            <script defer>iFrameResize(<f:format.raw value="{"/>heightCalculationMethod:'grow'<f:format.raw value="}"/>, '#{id}')</script>
         </f:else></f:if>
     </div>
 </div>

ot_stats/Resources/Private/Templates/Header/Include.html

@@ -2,7 +2,7 @@
 {namespace st=Opentalent\OtStats\ViewHelpers}
 
 <f:comment>
-    <!-- render the matomo script for the current website (if stats are enabled) -->
+    <!-- (Frontend) Render the matomo integration script to the current website (if stats are enabled) -->
 </f:comment>
 
 <v:variable.set name="matomo_site_id" value="{st:matomoSiteId()}" />

ot_stats/Resources/Private/Templates/OtStats/AskForActivationConfirmation.html

@@ -5,8 +5,7 @@
     <div class="ot-be-module ot-stats">
         <div class="statsConfirmationPanel">
             <p style="margin-bottom: 12px;">
-                Le suivi des statistiques d'utilisation n'est pas encore activé.
-                Pour l'activer, cliquez sur le bouton ci-dessous.
+                Le suivi des statistiques d'utilisation n'est pas activé.
             </p>
             <f:link.action
                     action="enableStats"

ot_stats/Resources/Private/Templates/OtStats/AskForDeactivationConfirmation.html

@@ -22,6 +22,14 @@
                 Désactiver le suivi de l'utilisation
             </f:link.action>
 
+            <f:link.action
+                    action="index"
+                    title="index"
+                    class="ot-btn"
+            >
+                Annuler
+            </f:link.action>
+
         </div>
     </div>
 

ot_stats/Resources/Private/Templates/OtStats/Index.html

@@ -42,17 +42,19 @@
                                       module: 'Live', action: 'widget',
                                       matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
 
-                 <f:comment><!-- Last visits graph--></f:comment>
-                <f:render partial="ReportCard"
-                          arguments="{title: 'Dernières visites', id: 'lastVisitsGraph',
-                                      module: 'VisitsSummary', action: 'getEvolutionGraph',
-                                      matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
-
-                <f:comment><!-- Visits Summary --></f:comment>
-                <f:render partial="ReportCard"
-                          arguments="{title: 'Résumé', id: 'visitsSummary',
-                                      module: 'VisitsSummary', action: 'get',
-                                      matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
+                <div class="reportSubSection">
+                    <f:comment><!-- Last visits graph--></f:comment>
+                    <f:render partial="ReportCard"
+                              arguments="{title: 'Dernières visites', id: 'lastVisitsGraph',
+                                          module: 'VisitsSummary', action: 'getEvolutionGraph',
+                                          matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
+
+                    <f:comment><!-- Visits Summary --></f:comment>
+                    <f:render partial="ReportCard"
+                              arguments="{title: 'Résumé', id: 'visitsSummary',
+                                          module: 'VisitsSummary', action: 'get',
+                                          matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
+                </div>
             </div>
 
             <div class="reportSection">
@@ -72,7 +74,7 @@
                 <f:comment><!-- Map --></f:comment>
                 <f:render partial="ReportCard"
                           arguments="{title: 'Répartition géographique', id: 'visitsMap',
-                                      module: 'UserCountryMap', action: 'visitorMap', height: '450',
+                                      module: 'UserCountryMap', action: 'visitorMap',
                                       matomoSiteId: matomoSiteId, matomoToken: matomoToken, period: period}"/>
             </div>
 

ot_stats/Resources/Public/assets/Backend/style/ot_stats.css

@@ -12,6 +12,10 @@
     margin: 0 15%;
 }
 
+.statsConfirmationPanel > * {
+    margin: 8px 0;
+}
+
 .warning {
     color: #800000;
 }