diff options
author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-03-22 14:26:54 +0300 |
---|---|---|
committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-03-22 14:26:54 +0300 |
commit | ff01ac4df1e88950bcdec82c75c90fa084044ac5 (patch) | |
tree | 361fcb6d0eb1a6b81af455f2028a1f2b7c75de95 /plugins/SitesManager/Controller.php | |
parent | 103c1f33a13babcbce01b51f2e9e93e3568209ea (diff) |
Fixes #43
- modify websites admin UI, API to add a column Exclude IPs
- IPs contain wildcards, unlimited IPs per website
- below the website table, added a "Global IP exclude" list. Ips there are excluded from all websites automatically.
- IPs are stored in the tracker cache file for fast access at Tracking time.
- added new field in website table "excluded_ips"
- refactored the ajax loading/error display to allow multiple loading/error div per page
Diffstat (limited to 'plugins/SitesManager/Controller.php')
-rw-r--r-- | plugins/SitesManager/Controller.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index bd349b16dc..2647008093 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -23,9 +23,13 @@ class Piwik_SitesManager_Controller extends Piwik_Controller foreach($sites as &$site) { $site['alias_urls'] = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($site['idsite']); + $site['excluded_ips'] = str_replace(',','<br/>', $site['excluded_ips']); } $view->adminSites = $sites; + $view->currentIpAddress = Piwik_Common::getIpString(); $this->setGeneralVariablesView($view); + $excludedIpsGlobal = Piwik_SitesManager_API::getInstance()->getExcludedIpsGlobal(); + $view->globalExcludedIps = str_replace(',',"\n", $excludedIpsGlobal); $view->menu = Piwik_GetAdminMenu(); echo $view->render(); } |