hotline #52810 : in piwik context, directly retreive piwik site id

VERSIONS_HOTLINE/52810

+ - ticket #52810 : Administratrion : Correction du tableau de bord Piwik déconnecté lorsque Piwik et GoogleAnalytics sont tous les 2 activés.
\ No newline at end of file

application/modules/admin/controllers/StatController.php

@@ -74,7 +74,7 @@ class Admin_StatController extends ZendAfi_Controller_Action {
 
     $base_url = $js_stat->getPiwikUrl() . 'index.php';
     $auth_token = ['token_auth' => (new Class_AdminVar_Piwik())->getAuthToken()];
-    $id_site = ['idSite' => $js_stat->getTrackerId()];
+    $id_site = ['idSite' => $js_stat->getPiwikSiteId()];
 
     $dashboard_params = ['module' => 'Widgetize',
                          'action' => 'iframe',

library/Class/AdminVar/JsStat.php

@@ -73,5 +73,8 @@ class Class_AdminVar_JsStat {
     return isset($matches[1][0]) ? trim($matches[1][0]) : '';
   }
 
-}
-?>
\ No newline at end of file
+
+  public function getPiwikSiteId() {
+    return $this->_getPiwikSiteId();
+  }
+}
\ No newline at end of file

tests/scenarios/piwik/PiwikTest.php

@@ -272,4 +272,58 @@ class PiwikStatControllerPiwikActionTest extends Admin_AbstractControllerTestCas
   public function pageShouldContainsDashboardFrame() {
     $this->assertXPath('//iframe[@src="http://sandbox.pergame.net/piwik/index.php?module=Widgetize&action=iframe&moduleToWidgetize=Dashboard&actionToWidgetize=index&period=week&date=today&idSite=8&token_auth=789456123456789"]', $this->_response->getBody());
   }
+}
+
+
+
+/**
+ * @see http://forge.afi-sa.fr/issues/52810
+ */
+class PiwikStatControllerPiwikActionWithBothPiwikAndGoogleAnalyticsTest
+  extends Admin_AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  public function setUp() {
+    parent::setUp();
+
+    (new PiwikFixtures())->enablePiwik();
+    $this->fixture('Class_AdminVar',
+                   ['id' => 'JS_STAT',
+                    'valeur' => '<script type="text/javascript">
+try {
+var url = window.location.href ;
+var _paq = _paq || [];
+_paq.push([\'trackPageView\']);
+_paq.push([\'enableLinkTracking\']);
+(function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://piwik.myserver.com/";
+    _paq.push([\'setTrackerUrl\', u+\'piwik.php\']);
+    _paq.push([\'setSiteId\', 9999]);
+    var d=document, g=d.createElement(\'script\'), s=d.getElementsByTagName(\'script\')[0]; g.type=\'text/javascript\';
+    g.defer=true; g.async=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s);
+})();
+} catch ( err ) {}
+</script>
+<noscript><p><img src="http://piwik.myserver.com/piwik.php?idsite=9999" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
+<script>
+  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,\'script\',\'//www.google-analytics.com/analytics.js\',\'ga\');
+
+  ga(\'create\', \'UA-111111111111-7\', \'auto\');
+  ga(\'send\', \'pageview\');
+
+</script>']);
+
+
+    $this->dispatch('/admin/stat/piwik', true);
+  }
+
+
+  /** @test */
+  public function iframeSrcShouldContainsIdSite9999() {
+    $this->assertXPath('//iframe[contains(@src, "idSite=9999")]');
+  }
 }
\ No newline at end of file