Fixes #2830 Implementing Tracker Cache TTL (in config file, [Tracker]

4 files changed, 18 insertions, 18 deletions

diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 563b26aca4..474d24baca 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -120,7 +120,7 @@ class Piwik_Goals_API
 						'revenue' => (float)$revenue,
 						'deleted' => 0,
 					));
-		Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
+		Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite);
 		return $idGoal;
 	}
 
@@ -157,8 +157,8 @@ class Piwik_Goals_API
 						'revenue' => (float)$revenue,
 						),
 					"idsite = '$idSite' AND idgoal = '$idGoal'"
-			);	
-		Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
+			);
+		Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite);
 	}
 
 	private function checkPatternIsValid($patternType, $pattern)
@@ -197,7 +197,7 @@ class Piwik_Goals_API
 											AND idgoal = ?",
 									array($idSite, $idGoal));
 		Piwik_DeleteAllRows(Piwik_Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal));
-		Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
+		Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite);
 	}
 	
 	/**
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 667dfb065c..17add71358 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -547,7 +547,7 @@ class Piwik_SitesManager_API
 	private function postUpdateWebsite($idSite)
 	{
 		Piwik_Site::clearCache();
-		Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
+		Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite);
 	}
 
 	/**
@@ -584,7 +584,8 @@ class Piwik_SitesManager_API
 		$db->query("DELETE FROM ".Piwik_Common::prefixTable("access")." 
 					WHERE idsite = ?", $idSite);
 
-		Piwik_Common::deleteCacheWebsiteAttributes($idSite);
+		// we do not delete logs here on purpose (you can run these queries on the log_ tables to delete all data)
+		Piwik_Tracker_Cache::deleteCacheWebsiteAttributes($idSite);
 
 		Piwik_PostEvent('SitesManager.deleteSite', $idSite);
 	}
@@ -708,11 +709,10 @@ class Piwik_SitesManager_API
 		Piwik::checkUserIsSuperUser();
 		$excludedIps = $this->checkAndReturnExcludedIps($excludedIps);
 		Piwik_SetOption(self::OPTION_EXCLUDED_IPS_GLOBAL, $excludedIps);
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 		return true;
 	}
 
-
 	/**
 	 * Sets Site Search keyword/category parameter names, to be used on websites which have not specified these values
 	 * Expects Comma separated list of query params names
@@ -726,7 +726,7 @@ class Piwik_SitesManager_API
 		Piwik::checkUserIsSuperUser();
 		Piwik_SetOption(self::OPTION_SEARCH_KEYWORD_QUERY_PARAMETERS_GLOBAL, $searchKeywordParameters);
 		Piwik_SetOption(self::OPTION_SEARCH_CATEGORY_QUERY_PARAMETERS_GLOBAL, $searchCategoryParameters);
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 		return true;
 	}
 
@@ -795,7 +795,7 @@ class Piwik_SitesManager_API
 		Piwik_SetOption(self::OPTION_EXCLUDED_USER_AGENTS_GLOBAL, $excludedUserAgents);
 		
 		// make sure tracker cache will reflect change
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 	}
 	
 	/**
@@ -824,7 +824,7 @@ class Piwik_SitesManager_API
 		Piwik_SetOption(self::OPTION_SITE_SPECIFIC_USER_AGENT_EXCLUDE_ENABLE, $enabled);
 		
 		// make sure tracker cache will reflect change
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 	}
 	
 	/**
@@ -855,7 +855,7 @@ class Piwik_SitesManager_API
 		Piwik_SetOption(self::OPTION_KEEP_URL_FRAGMENTS_GLOBAL, $enabled);
 		
 		// make sure tracker cache will reflect change
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 	}
 	
 	/**
@@ -870,7 +870,7 @@ class Piwik_SitesManager_API
 		Piwik::checkUserIsSuperUser();
 		$excludedQueryParameters = $this->checkAndReturnCommaSeparatedStringList($excludedQueryParameters);
 		Piwik_SetOption(self::OPTION_EXCLUDED_QUERY_PARAMETERS_GLOBAL, $excludedQueryParameters);
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 		return true;
 	}
 	
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 6ddad37567..f34aa33efb 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -302,7 +302,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
 			}
 			
 			// make sure the tracker will use the new location provider
-			Piwik_Common::clearCacheGeneral();
+			Piwik_Tracker_Cache::clearCacheGeneral();
 		}
 	}
 	
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index f7de67302e..a5e58a703e 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -381,7 +381,7 @@ class Piwik_UsersManager_API
 		
 		// we reload the access list which doesn't yet take in consideration this new user
 		Zend_Registry::get('access')->reloadAccess();
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 
 		Piwik_PostEvent('UsersManager.addUser', $userLogin);
 	}
@@ -445,7 +445,7 @@ class Piwik_UsersManager_API
 						),
 					"login = '$userLogin'"
 			);		
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 
 		Piwik_PostEvent('UsersManager.updateUser', $userLogin);
 	}
@@ -471,7 +471,7 @@ class Piwik_UsersManager_API
 		
 		$this->deleteUserOnly( $userLogin );
 		$this->deleteUserAccess( $userLogin );
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 	}
 	
 	/**
@@ -572,7 +572,7 @@ class Piwik_UsersManager_API
 		
 		// we reload the access list which doesn't yet take in consideration this new user access
 		Zend_Registry::get('access')->reloadAccess();
-		Piwik_Common::deleteTrackerCache();
+		Piwik_Tracker_Cache::deleteTrackerCache();
 	}
 	
 	/**