Renaming Piwik_Tracker_Cookie to Piwik_Tracker_IgnoreCookie

Count of users in the Manage Users does not include Super User

git-svn-id: http://dev.piwik.org/svn/trunk@3688 59fd770c-687e-43c8-a1e3-f5a4ff64c105

core/Tracker/Cookie.php → core/Tracker/IgnoreCookie.php

@@ -16,7 +16,7 @@
  * @package Piwik
  * @subpackage Piwik_Tracker
  */
-class Piwik_Tracker_Cookie
+class Piwik_Tracker_IgnoreCookie
 {
 	/**
 	 * Get ignore (visit) cookie

core/Tracker/Visit.php

@@ -612,7 +612,7 @@ class Piwik_Tracker_Visit implements Piwik_Tracker_Visit_Interface
 	 */
 	protected function isIgnoreCookieFound()
 	{
-		if(Piwik_Tracker_Cookie::isIgnoreCookieFound())
+		if(Piwik_Tracker_IgnoreCookie::isIgnoreCookieFound())
 		{
 			printDebug('Piwik ignore cookie was found, visit not tracked.');
 			return true;

plugins/CoreAdminHome/Controller.php

@@ -89,12 +89,12 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller
      */
     public function optOut()
     {
-		$trackVisits = !Piwik_Tracker_Cookie::isIgnoreCookieFound();
+		$trackVisits = !Piwik_Tracker_IgnoreCookie::isIgnoreCookieFound();
 
 		$nonce = Piwik_Common::getRequestVar('nonce', false);
 		if($nonce !== false && Piwik_Nonce::verifyNonce('Piwik_OptOut', $nonce))
 		{
-			Piwik_Tracker_Cookie::setIgnoreCookie();
+			Piwik_Tracker_IgnoreCookie::setIgnoreCookie();
 			$trackVisits = !$trackVisits;
 		}
  

plugins/UsersManager/Controller.php

@@ -66,7 +66,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller
 		
 		$view->idSiteSelected = $idSiteSelected;
 		$view->users = $users;
-		$view->usersCount = count($users);
+		$view->usersCount = count($users) - 1;
 		$view->usersAccessByWebsite = $usersAccessByWebsite;
 		$view->websites = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess();
 		$this->setBasicVariablesView($view);
@@ -121,7 +121,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller
 			'year' => Piwik_Translate('General_CurrentYear'),
 		);
 		
-		$view->ignoreCookieSet = Piwik_Tracker_Cookie::isIgnoreCookieFound();
+		$view->ignoreCookieSet = Piwik_Tracker_IgnoreCookie::isIgnoreCookieFound();
 		$this->initViewAnonymousUserSettings($view);
 		$view->piwikHost = Piwik_Url::getCurrentHost();
 		$this->setBasicVariablesView($view);
@@ -134,7 +134,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller
 		Piwik::checkUserHasSomeViewAccess();
 		Piwik::checkUserIsNotAnonymous();
 		$this->checkTokenInUrl();
-		Piwik_Tracker_Cookie::setIgnoreCookie();
+		Piwik_Tracker_IgnoreCookie::setIgnoreCookie();
 		Piwik::redirectToModule('UsersManager', 'userSettings');
 	}