refs #1877 added hooks to add search engines and social networks; some code improvements

3 files changed, 18 insertions, 13 deletions

diff --git a/core/Common.php b/core/Common.php
index 3312a83569..af85425ed9 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -731,6 +731,9 @@ class Common
         require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
 
         $searchEngines = $GLOBALS['Piwik_SearchEngines'];
+
+        Piwik::postEvent('Referrer.addSearchEngineUrls', array(&$searchEngines));
+
         return $searchEngines;
     }
 
@@ -743,10 +746,16 @@ class Common
      */
     public static function getSearchEngineNames()
     {
-        require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/SearchEngines.php';
+        $searchEngines = self::getSearchEngineUrls();
 
-        $searchEngines = $GLOBALS['Piwik_SearchEngines_NameToUrl'];
-        return $searchEngines;
+        $nameToUrl = array();
+        foreach ($searchEngines as $url => $info) {
+            if (!isset($nameToUrl[$info[0]])) {
+                $nameToUrl[$info[0]] = $url;
+            }
+        }
+
+        return $nameToUrl;
     }
 
     /**
@@ -760,8 +769,11 @@ class Common
     {
         require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Socials.php';
 
-        $searchEngines = $GLOBALS['Piwik_socialUrl'];
-        return $searchEngines;
+        $socialUrls = $GLOBALS['Piwik_socialUrl'];
+
+        Piwik::postEvent('Referrer.addSocialUrls', array(&$socialUrls));
+
+        return $socialUrls;
     }
 
     /**
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 2d35b1d94f..2b79e2b7d1 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -1032,11 +1032,4 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Zoznam
         'www.zoznam.sk'                  => array('Zoznam', 's', 'hladaj.fcgi?s={k}&co=svet'),
     );
-
-    $GLOBALS['Piwik_SearchEngines_NameToUrl'] = array();
-    foreach ($GLOBALS['Piwik_SearchEngines'] as $url => $info) {
-        if (!isset($GLOBALS['Piwik_SearchEngines_NameToUrl'][$info[0]])) {
-            $GLOBALS['Piwik_SearchEngines_NameToUrl'][$info[0]] = $url;
-        }
-    }
 }
diff --git a/core/DataFiles/Socials.php b/core/DataFiles/Socials.php
index 58820b5502..e4c63f6257 100755
--- a/core/DataFiles/Socials.php
+++ b/core/DataFiles/Socials.php
@@ -77,7 +77,7 @@ if (!isset($GLOBALS['Piwik_socialUrl'])) {
         'github.com'           => 'Github',
 
         // Google+
-        'url.google.com'       => 'Google+',
+        'url.google.com'       => 'Google%2B',
 
         // douban
         'douban.com'           => 'douban',