Merge branch 'hotline#52069_google_analytics' into 'hotline-master'

Google analytics: fix analytics id extraction for new kind of GA scripts

See merge request !1992

VERSIONS_HOTLINE/52069

+ - ticket #52069 : correction de la récupération du Google Analytics ID pour les nouveaux scripts Google Analytics
\ No newline at end of file

library/Class/AdminVar/JsStat.php

@@ -60,8 +60,10 @@ class Class_AdminVar_JsStat {
 
   protected function _getGoogleAnalyticsId() {
     $script = Class_AdminVar::get('JS_STAT');
-    preg_match_all("/setAccount[\', \n\t]+\'([^\']+)\'/i", $script, $matches);
-    return isset($matches[1][0]) ? $matches[1][0] : '';
+    preg_match_all("/(UA|MO)-[0-9]+-[0-9]/", $script, $matches);
+    return (isset($matches[0][0]))
+      ? $matches[0][0]
+      : '';
   }
 
 

tests/library/Class/WebService/WebAnalyticsClientTest.php

@@ -59,6 +59,27 @@ class Class_WebService_WebAnalyticsClientInstanciationWithVarGoogleAnalyticsAndN
 
 
 
+class Class_WebService_WebAnalyticsClientInstanciationWithVarGoogleAnalyticsUsingGACreateTest extends Storm_Test_ModelTestCase {
+  public function setUp() {
+    parent::setUp();
+
+    Class_AdminVar::newInstanceWithId('JS_STAT', ['valeur' => "['_setaccount', 'a('create', 'UA-41754005-1', 'auto'); "]);
+    Class_AdminVar::newInstanceWithId('NOM_DOMAINE', ['valeur' => ""]);
+
+    $this->_web_analytics_client = new Class_WebService_Analytics_Client();
+  }
+
+
+  /** @test */
+  public function trackerAccountIdShouldBeUA_41754005_1() {
+    $this->assertEquals('UA-41754005-1', $this->_web_analytics_client->getTrackerAccountId());
+  }
+
+}
+
+
+
+
 class Class_WebService_WebAnalyticsClientInstanciationWithVarGoogleAnalyticsAndDomainNameTest extends Storm_Test_ModelTestCase {
   public function setUp() {
     parent::setUp();