diff --git a/core/Access.php b/core/Access.php index 93f35ad6252b7399d3e639c9e668e68c0e43690e..ef208a6f2b4b5b4b8f73207bb3a9abaf2a08ce7d 100644 --- a/core/Access.php +++ b/core/Access.php @@ -344,11 +344,13 @@ class Piwik_Access $idSitesAccessible = $this->getSitesIdWithAdminAccess(); foreach($idSites as $idsite) { - if(!in_array($idsite, $idSitesAccessible)) + if(in_array($idsite, $idSitesAccessible)) { - throw new Piwik_Access_NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAccessWebsite', array("'admin'", $idsite))); + return; } } + + throw new Piwik_Access_NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('admin'))); } /** @@ -377,11 +379,13 @@ class Piwik_Access foreach($idSites as $idsite) { - if(!in_array($idsite, $idSitesAccessible)) + if(in_array($idsite, $idSitesAccessible)) { - throw new Piwik_Access_NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAccessWebsite', array("'view'", $idsite))); + return; } } + + throw new Piwik_Access_NoAccessException(Piwik_TranslateException('General_ExceptionPrivilegeAtLeastOneWebsite', array('view'))); } } diff --git a/core/Cage.php b/core/Cage.php deleted file mode 100644 index b9b43893a8b6ecf2130114cc1a616bef4e09f0e0..0000000000000000000000000000000000000000 --- a/core/Cage.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php -/** - * Piwik - Open source web analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * @version $Id$ - * - * @category Piwik - * @package Piwik - */ - -/** - * Class to quarantine (inherently) untrusted user input, and - * provide filtering, sanitization, and validation. - * - * The current implementation is a wrapper around Inspekt. - * - * @package Piwik - * @subpackage Piwik_Access - */ -class Piwik_Cage -{ - //private - function __construct() - { - } -}