diff --git a/core/Twig.php b/core/Twig.php
index a08a8a484a9..0bf82d40f79 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -40,11 +40,12 @@ public function __construct($theme = self::DEFAULT_THEME)
// Create new Twig Environment and set cache dir
$this->twig = new Twig_Environment($chainLoader,
array(
+ 'debug' => true, // to use {{ dump(var) }} in twig templates
//'cache' => PIWIK_DOCUMENT_ROOT . '/tmp/templates_c',
)
);
+ $this->twig->addExtension(new Twig_Extension_Debug());
$this->twig->clearTemplateCache();
-
// Add default filters
$this->addFilters();
// Register namespaces
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 27d0f5e2125..ab6f60b584e 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -1289,6 +1289,7 @@ private function cleanParameterUrls($urls)
if (strpos($url, 'http') !== 0) {
$url = 'http://' . $url;
}
+ $url = trim($url);
$url = Piwik_Common::sanitizeInputValue($url);
}
$urls = array_unique($urls);
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 235037a1b1e..74eda62af7a 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -33,9 +33,9 @@ public function index()
foreach ($sites as &$site) {
$site['alias_urls'] = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($site['idsite']);
- $site['excluded_ips'] = str_replace(',', '
', $site['excluded_ips']);
- $site['excluded_parameters'] = str_replace(',', '
', $site['excluded_parameters']);
- $site['excluded_user_agents'] = str_replace(',', '
', $site['excluded_user_agents']);
+ $site['excluded_ips'] = explode(',', $site['excluded_ips']);
+ $site['excluded_parameters'] = explode(',', $site['excluded_parameters']);
+ $site['excluded_user_agents'] = explode(',', $site['excluded_user_agents']);
}
$view->adminSites = $sites;
$view->adminSitesCount = count($sites);
diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
index 4ff38d21593..8067e5ff214 100644
--- a/plugins/SitesManager/javascripts/SitesManager.js
+++ b/plugins/SitesManager/javascripts/SitesManager.js
@@ -78,6 +78,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
urls = urls.trim().split("\n");
var excludedIps = $(row).find('textarea#excludedIps').val();
excludedIps = piwikHelper.getApiFormatTextarea(excludedIps);
+
var excludedQueryParameters = $(row).find('textarea#excludedQueryParameters').val();
excludedQueryParameters = piwikHelper.getApiFormatTextarea(excludedQueryParameters);
var excludedUserAgents = $(row).find('textarea#excludedUserAgents').val();
@@ -234,7 +235,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
var idName = $(n).attr('id');
if (idName == 'siteName') {
siteBeingEditedName = contentBefore;
- var contentAfter = '';
+ var contentAfter = '';
var inputSave = $('
')
.click(function () { submitUpdateSite($(this).parent()); });
@@ -248,8 +249,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc
}
else if (idName == 'urls') {
var keepURLFragmentsForSite = $(this).closest('tr').attr('data-keep-url-fragments');
-
- var contentAfter = '';
+ var contentAfter = '';
contentAfter += '
' + aliasUrlsHelp + keepURLFragmentSelectHTML;
$(n).html(contentAfter).find('select').val(keepURLFragmentsForSite);
}
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 16704bc7dd0..c0d52b0ecde 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -204,18 +204,27 @@ $(document).ready(function () {
{% for i,site in adminSites %}