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 

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();
 	}