refs #4996 tests should now work in case Piwik is installed in a subd…

…irectory although could not really test it. Also encode redirect uri

core/Tracker.php

@@ -10,7 +10,7 @@
 
 use Exception;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
-use Piwik\Plugins\SitesManager\Model;
+use Piwik\Plugins\SitesManager\SiteUrls;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Db\Mysqli;
@@ -940,24 +940,34 @@ private function performRedirectToUrlIfSet()
             return;
         }
 
-        $siteIds = array();
-
-        foreach ($this->requests as $request) {
-            $siteIds[] = (int) $request['idsite'];
-        }
-
-        $siteIds = array_unique($siteIds);
-
-        $model = new Model();
+        $urls     = new SiteUrls();
+        $siteUrls = $urls->getAllCachedSiteUrls();
+        $siteIds  = $this->getAllSiteIdsWithinRequest();
 
         foreach ($siteIds as $siteId) {
-            $siteUrls = $model->getSiteUrlsFromId($siteId);
+            if (empty($siteUrls[$siteId])) {
+                continue;
+            }
 
-            if (Url::isHostInUrls($host, $siteUrls)) {
+            if (Url::isHostInUrls($host, $siteUrls[$siteId])) {
                 Url::redirectToUrl($redirectUrl);
             }
         }
     }
 
+    private function getAllSiteIdsWithinRequest()
+    {
+        if (empty($this->requests)) {
+            return array();
+        }
+
+        $siteIds = array();
+
+        foreach ($this->requests as $request) {
+            $siteIds[] = (int) $request['idsite'];
+        }
+
+        return array_unique($siteIds);
+    }
 
 }

js/piwik.js

@@ -3197,7 +3197,7 @@ if (typeof Piwik !== 'object') {
                 }
 
                 var redirectUrl = content.toAbsoluteUrl(url);
-                var request  = 'redirecturl=' + redirectUrl + '&';
+                var request  = 'redirecturl=' + encodeWrapper(redirectUrl) + '&';
                 request     += buildContentInteractionRequest(contentInteraction, contentName, contentPiece, (contentTarget || url));
 
                 var separator = '&';

misc/internal-docs/content-tracking.md

@@ -434,7 +434,6 @@ Nothing special here I think. We would probably automatically detect the type of
   * Maybe v2
 * Content piece undefined vs Unknown?
 * UI / PHP tests
-* Make JS tests work if piwik is installed in a path such as localhost/piwik
 
 ## V2:
 * "note: as a user, I see that piwik.php redirects is the default "click tracking" solution, but I want to be able to disable this piwik.php redirect and instead use the link tracking 500ms solution."