diff options
author | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:45:02 +0400 |
---|---|---|
committer | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:45:02 +0400 |
commit | 03b4953f008c1063e6d7166143ba844e8c6e89cc (patch) | |
tree | 7b9f0fef13d75417c551f813c98dba1a22f2fff3 /plugins | |
parent | 9b2c0a7a450fff3b634f8119c8003ae1d20b97d0 (diff) |
Refactor class Piwik_Common to \Piwik\Core\Common
Notice that auto refactoring has created a nested namespace. Not sure this is what we want - so we might have to edit those nested namespaces afterwards (I think they don't look so good)
Diffstat (limited to 'plugins')
84 files changed, 596 insertions, 596 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index a08e046c4b..16cba3ce4e 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -9,7 +9,7 @@ * @package Piwik_API */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_API @@ -304,14 +304,14 @@ class Piwik_API_API { $logo = 'plugins/Zeitgeist/images/logo.png'; if (Config::getInstance()->branding['use_custom_logo'] == 1 - && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.png') + && file_exists(Common::getPathToPiwikRoot() . '/misc/user/logo.png') ) { $logo = 'misc/user/logo.png'; } if (!$pathOnly) { return Piwik::getPiwikUrl() . $logo; } - return Piwik_Common::getPathToPiwikRoot() . '/' . $logo; + return Common::getPathToPiwikRoot() . '/' . $logo; } /** @@ -324,14 +324,14 @@ class Piwik_API_API { $logo = 'plugins/Zeitgeist/images/logo-header.png'; if (Config::getInstance()->branding['use_custom_logo'] == 1 - && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo-header.png') + && file_exists(Common::getPathToPiwikRoot() . '/misc/user/logo-header.png') ) { $logo = 'misc/user/logo-header.png'; } if (!$pathOnly) { return Piwik::getPiwikUrl() . $logo; } - return Piwik_Common::getPathToPiwikRoot() . '/' . $logo; + return Common::getPathToPiwikRoot() . '/' . $logo; } /** @@ -345,14 +345,14 @@ class Piwik_API_API { $logo = 'plugins/Zeitgeist/images/logo.svg'; if (Config::getInstance()->branding['use_custom_logo'] == 1 - && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg') + && file_exists(Common::getPathToPiwikRoot() . '/misc/user/logo.svg') ) { $logo = 'misc/user/logo.svg'; } if (!$pathOnly) { return Piwik::getPiwikUrl() . $logo; } - return Piwik_Common::getPathToPiwikRoot() . '/' . $logo; + return Common::getPathToPiwikRoot() . '/' . $logo; } /** @@ -366,7 +366,7 @@ class Piwik_API_API /* We always have our application logo */ return true; } else if (Config::getInstance()->branding['use_custom_logo'] == 1 - && file_exists(Piwik_Common::getPathToPiwikRoot() . '/misc/user/logo.svg') + && file_exists(Common::getPathToPiwikRoot() . '/misc/user/logo.svg') ) { return true; } @@ -553,7 +553,7 @@ class Piwik_API_API } $urls = array_map('urldecode', $urls); - $urls = array_map(array('Piwik\Core\Piwik_Common', 'unsanitizeInputValue'), $urls); + $urls = array_map(array('Piwik\Core\Common', 'unsanitizeInputValue'), $urls); $result = array(); foreach ($urls as $url) { @@ -629,7 +629,7 @@ class Piwik_API_API arsort($values); $values = array_keys($values); - $values = array_map(array('Piwik\Core\Piwik_Common', 'unsanitizeInputValue'), $values); + $values = array_map(array('Piwik\Core\Common', 'unsanitizeInputValue'), $values); $values = array_slice($values, 0, $maxSuggestionsToReturn); return $values; diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php index 8d70af3650..c18bfc3e85 100644 --- a/plugins/API/Controller.php +++ b/plugins/API/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_API */ use Piwik\Core\Config; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -23,14 +23,14 @@ class Piwik_API_Controller extends Piwik_Controller if (!isset($_GET['filter_limit'])) { $_GET['filter_limit'] = Config::getInstance()->General['API_datatable_default_limit']; } - $request = new Piwik_API_Request('token_auth=' . Piwik_Common::getRequestVar('token_auth', 'anonymous', 'string')); + $request = new Piwik_API_Request('token_auth=' . Common::getRequestVar('token_auth', 'anonymous', 'string')); echo $request->process(); } public function listAllMethods() { $ApiDocumentation = new Piwik_API_DocumentationGenerator(); - echo $ApiDocumentation->getAllInterfaceString($outputExampleUrls = true, $prefixUrls = Piwik_Common::getRequestVar('prefixUrl', '')); + echo $ApiDocumentation->getAllInterfaceString($outputExampleUrls = true, $prefixUrls = Common::getRequestVar('prefixUrl', '')); } public function listAllAPI() diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 318929f1ce..2417a558ab 100644 --- a/plugins/API/ProcessedReport.php +++ b/plugins/API/ProcessedReport.php @@ -1,6 +1,6 @@ <?php use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -425,7 +425,7 @@ class Piwik_API_ProcessedReport } // remove columns if hideColumns query parameters exist - $columnsToRemove = Piwik_Common::getRequestVar('hideColumns', ''); + $columnsToRemove = Common::getRequestVar('hideColumns', ''); if ($columnsToRemove != '') { $columnsToRemove = explode(',', $columnsToRemove); foreach ($columnsToRemove as $name) { @@ -437,7 +437,7 @@ class Piwik_API_ProcessedReport } // remove columns if showColumns query parameters exist - $columnsToKeep = Piwik_Common::getRequestVar('showColumns', ''); + $columnsToKeep = Common::getRequestVar('showColumns', ''); if ($columnsToKeep != '') { $columnsToKeep = explode(',', $columnsToKeep); $columnsToKeep[] = 'label'; diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php index dfc24d6a6a..f0eca1b190 100644 --- a/plugins/API/RowEvolution.php +++ b/plugins/API/RowEvolution.php @@ -9,7 +9,7 @@ * @package Piwik_API */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * This class generates a Row evolution dataset, from input request @@ -92,7 +92,7 @@ class Piwik_API_RowEvolution // if the filter_limit query param is set, treat it as a request to limit // the number of labels used - $limit = Piwik_Common::getRequestVar('filter_limit', false); + $limit = Common::getRequestVar('filter_limit', false); if ($limit != false && $limit >= 0 ) { diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 25a21a2d8d..0f81d9d148 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -9,7 +9,7 @@ * @package Piwik_Actions */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The Actions API lets you request reports for all your Visitor Actions: Page URLs, Page titles (Piwik Events), @@ -369,7 +369,7 @@ class Piwik_Actions_API if ($searchTree === false) { // build the query parts that are searched inside the tree if ($actionType == Piwik_Tracker_Action::TYPE_ACTION_NAME) { - $searchedString = Piwik_Common::unsanitizeInputValue($search); + $searchedString = Common::unsanitizeInputValue($search); } else { $idSite = $callBackParameters[1]; try { diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index eb2171397a..2ab5dfb2d1 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -9,7 +9,7 @@ * @package Piwik_Actions */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Actions plugin @@ -144,7 +144,7 @@ class Piwik_Actions extends Piwik_Plugin $valueToMatch = preg_replace('@^http[s]?://(www\.)?@i', '', $valueToMatch); } - $valueToMatch = Piwik_Common::sanitizeInputValue(Piwik_Common::unsanitizeInputValue($valueToMatch)); + $valueToMatch = Common::sanitizeInputValue(Common::unsanitizeInputValue($valueToMatch)); // exact matches work by returning the id directly if ($matchType == Piwik_SegmentExpression::MATCH_EQUAL @@ -164,7 +164,7 @@ class Piwik_Actions extends Piwik_Plugin // now, we handle the cases =@ (contains) and !@ (does not contain) // build the expression based on the match type - $sql = 'SELECT idaction FROM ' . Piwik_Common::prefixTable('log_action') . ' WHERE '; + $sql = 'SELECT idaction FROM ' . Common::prefixTable('log_action') . ' WHERE '; $sqlMatchType = 'AND type = ' . $actionType; switch ($matchType) { case '=@': @@ -557,7 +557,7 @@ class Piwik_Actions extends Piwik_Plugin protected function isSiteSearchEnabled() { - $idSite = Piwik_Common::getRequestVar('idSite', 0, 'int'); + $idSite = Common::getRequestVar('idSite', 0, 'int'); if ($idSite == 0) { return false; } @@ -681,7 +681,7 @@ class Piwik_Actions extends Piwik_Plugin private function addExcludeLowPopDisplayProperties(&$result) { - if (Piwik_Common::getRequestVar('enable_filter_excludelowpop', '0', 'string') != '0') { + if (Common::getRequestVar('enable_filter_excludelowpop', '0', 'string') != '0') { $result['filter_excludelowpop'] = 'nb_hits'; $result['filter_excludelowpop_value'] = function () { // computing minimum value to exclude (2 percent of the total number of actions) @@ -759,7 +759,7 @@ class Piwik_Actions extends Piwik_Plugin public function getDisplayPropertiesForEntryPageUrls() { // link to the page, not just the report, but only if not a widget - $widget = Piwik_Common::getRequestVar('widget', false); + $widget = Common::getRequestVar('widget', false); $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexEntryPageUrls' : 'getEntryPageUrls' @@ -788,7 +788,7 @@ class Piwik_Actions extends Piwik_Plugin public function getDisplayPropertiesForExitPageUrls() { // link to the page, not just the report, but only if not a widget - $widget = Piwik_Common::getRequestVar('widget', false); + $widget = Common::getRequestVar('widget', false); $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexExitPageUrls' : 'getExitPageUrls' @@ -896,7 +896,7 @@ class Piwik_Actions extends Piwik_Plugin public function getDisplayPropertiesForGetPageTitles() { // link to the page, not just the report, but only if not a widget - $widget = Piwik_Common::getRequestVar('widget', false); + $widget = Common::getRequestVar('widget', false); $reportUrl = Piwik_API_Request::getCurrentUrlWithoutGenericFilters(array( 'module' => 'Actions', 'action' => $widget === false ? 'indexPageTitles' : 'getPageTitles' @@ -923,7 +923,7 @@ class Piwik_Actions extends Piwik_Plugin public function getDisplayPropertiesForGetEntryPageTitles() { $entryPageUrlAction = - Piwik_Common::getRequestVar('widget', false) === false ? 'indexEntryPageUrls' : 'getEntryPageUrls'; + Common::getRequestVar('widget', false) === false ? 'indexEntryPageUrls' : 'getEntryPageUrls'; $result = array( 'translations' => array( @@ -948,7 +948,7 @@ class Piwik_Actions extends Piwik_Plugin public function getDisplayPropertiesForGetExitPageTitles() { $exitPageUrlAction = - Piwik_Common::getRequestVar('widget', false) === false ? 'indexExitPageUrls' : 'getExitPageUrls'; + Common::getRequestVar('widget', false) === false ? 'indexExitPageUrls' : 'getExitPageUrls'; $result = array( 'translations' => array( diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index 32ad2b4931..08defbc614 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Annotations */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Controller for the Annotations plugin. @@ -41,18 +41,18 @@ class Piwik_Annotations_Controller extends Piwik_Controller */ public function getAnnotationManager($fetch = false, $date = false, $period = false, $lastN = false) { - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); if ($date === false) { - $date = Piwik_Common::getRequestVar('date', false); + $date = Common::getRequestVar('date', false); } if ($period === false) { - $period = Piwik_Common::getRequestVar('period', 'day'); + $period = Common::getRequestVar('period', 'day'); } if ($lastN === false) { - $lastN = Piwik_Common::getRequestVar('lastN', false); + $lastN = Common::getRequestVar('lastN', false); } // create & render the view @@ -141,7 +141,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller // the date used is for the annotation manager HTML that gets echo'd. we // use this date for the new annotation, unless it is a date range, in // which case we use the first date of the range. - $date = Piwik_Common::getRequestVar('date'); + $date = Common::getRequestVar('date'); if (strpos($date, ',') !== false) { $date = reset(explode(',', $date)); } @@ -149,8 +149,8 @@ class Piwik_Annotations_Controller extends Piwik_Controller // add the annotation. NOTE: permissions checked in API method Piwik_API_Request::processRequest("Annotations.add", array('date' => $date)); - $managerDate = Piwik_Common::getRequestVar('managerDate', false); - $managerPeriod = Piwik_Common::getRequestVar('managerPeriod', false); + $managerDate = Common::getRequestVar('managerDate', false); + $managerPeriod = Common::getRequestVar('managerPeriod', false); echo $this->getAnnotationManager($fetch = true, $managerDate, $managerPeriod); } } diff --git a/plugins/AnonymizeIP/AnonymizeIP.php b/plugins/AnonymizeIP/AnonymizeIP.php index e50c7386a1..7194a055fa 100644 --- a/plugins/AnonymizeIP/AnonymizeIP.php +++ b/plugins/AnonymizeIP/AnonymizeIP.php @@ -9,7 +9,7 @@ * @package Piwik_AnonymizeIP */ use Piwik\Core\Config; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Anonymize visitor IP addresses to comply with the privacy laws/guidelines in countries, such as Germany. @@ -50,7 +50,7 @@ class Piwik_AnonymizeIP extends Piwik_Plugin */ static public function applyIPMask($ip, $maskLength) { - $i = Piwik_Common::strlen($ip); + $i = Common::strlen($ip); if ($maskLength > $i) { $maskLength = $i; } diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php index 07cb1218e8..697ad3ca47 100644 --- a/plugins/CoreAdminHome/API.php +++ b/plugins/CoreAdminHome/API.php @@ -9,7 +9,7 @@ * @package Piwik_CoreAdminHome */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_CoreAdminHome @@ -171,7 +171,7 @@ class Piwik_CoreAdminHome_API } // Update piwik_site.ts_created - $query = "UPDATE " . Piwik_Common::prefixTable("site") . + $query = "UPDATE " . Common::prefixTable("site") . " SET ts_created = ?" . " WHERE idsite IN ( $sqlIdSites ) AND ts_created > ?"; diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 69344d2771..41e7898611 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -76,39 +76,39 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin public function setGeneralSettings() { Piwik::checkUserIsSuperUser(); - $response = new Piwik_API_ResponseBuilder(Piwik_Common::getRequestVar('format')); + $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); - $enableBrowserTriggerArchiving = Piwik_Common::getRequestVar('enableBrowserTriggerArchiving'); - $todayArchiveTimeToLive = Piwik_Common::getRequestVar('todayArchiveTimeToLive'); + $enableBrowserTriggerArchiving = Common::getRequestVar('enableBrowserTriggerArchiving'); + $todayArchiveTimeToLive = Common::getRequestVar('todayArchiveTimeToLive'); Piwik_ArchiveProcessor_Rules::setBrowserTriggerArchiving((bool)$enableBrowserTriggerArchiving); Piwik_ArchiveProcessor_Rules::setTodayArchiveTimeToLive($todayArchiveTimeToLive); // Update email settings $mail = array(); - $mail['transport'] = (Piwik_Common::getRequestVar('mailUseSmtp') == '1') ? 'smtp' : ''; - $mail['port'] = Piwik_Common::getRequestVar('mailPort', ''); - $mail['host'] = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('mailHost', '')); - $mail['type'] = Piwik_Common::getRequestVar('mailType', ''); - $mail['username'] = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('mailUsername', '')); - $mail['password'] = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('mailPassword', '')); - $mail['encryption'] = Piwik_Common::getRequestVar('mailEncryption', ''); + $mail['transport'] = (Common::getRequestVar('mailUseSmtp') == '1') ? 'smtp' : ''; + $mail['port'] = Common::getRequestVar('mailPort', ''); + $mail['host'] = Common::unsanitizeInputValue(Common::getRequestVar('mailHost', '')); + $mail['type'] = Common::getRequestVar('mailType', ''); + $mail['username'] = Common::unsanitizeInputValue(Common::getRequestVar('mailUsername', '')); + $mail['password'] = Common::unsanitizeInputValue(Common::getRequestVar('mailPassword', '')); + $mail['encryption'] = Common::getRequestVar('mailEncryption', ''); $config = Config::getInstance(); $config->mail = $mail; // update branding settings $branding = $config->branding; - $branding['use_custom_logo'] = Piwik_Common::getRequestVar('useCustomLogo', '0'); + $branding['use_custom_logo'] = Common::getRequestVar('useCustomLogo', '0'); $config->branding = $branding; // update beta channel setting $debug = $config->Debug; - $debug['allow_upgrades_to_beta'] = Piwik_Common::getRequestVar('enableBetaReleaseCheck', '0', 'int'); + $debug['allow_upgrades_to_beta'] = Common::getRequestVar('enableBetaReleaseCheck', '0', 'int'); $config->Debug = $debug; // update trusted host settings - $trustedHosts = Piwik_Common::getRequestVar('trustedHosts', false, 'json'); + $trustedHosts = Common::getRequestVar('trustedHosts', false, 'json'); if ($trustedHosts !== false) { Piwik_Url::saveTrustedHostnameInConfig($trustedHosts); } @@ -135,7 +135,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin $viewableIdSites = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess(); $defaultIdSite = reset($viewableIdSites); - $view->idSite = Piwik_Common::getRequestVar('idSite', $defaultIdSite, 'int'); + $view->idSite = Common::getRequestVar('idSite', $defaultIdSite, 'int'); $view->defaultReportSiteName = Piwik_Site::getNameFor($view->idSite); $view->defaultSiteRevenue = Piwik::getCurrency($view->idSite); @@ -166,8 +166,8 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin { $trackVisits = !Piwik_Tracker_IgnoreCookie::isIgnoreCookieFound(); - $nonce = Piwik_Common::getRequestVar('nonce', false); - $language = Piwik_Common::getRequestVar('language', ''); + $nonce = Common::getRequestVar('nonce', false); + $language = Common::getRequestVar('language', ''); if ($nonce !== false && Piwik_Nonce::verifyNonce('Piwik_OptOut', $nonce)) { Piwik_Nonce::discardNonce('Piwik_OptOut'); Piwik_Tracker_IgnoreCookie::setIgnoreCookie(); diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index c7758373d4..2dbe933fe5 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_CoreHome */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -37,15 +37,15 @@ class Piwik_CoreHome_Controller extends Piwik_Controller if ($defaultReport == Piwik::getLoginPluginName()) { $module = Piwik::getLoginPluginName(); } - $idSite = Piwik_Common::getRequestVar('idSite', false, 'int'); + $idSite = Common::getRequestVar('idSite', false, 'int'); parent::redirectToIndex($module, $action, !empty($idSite) ? $idSite : null); } public function showInContext() { - $controllerName = Piwik_Common::getRequestVar('moduleToLoad'); - $actionName = Piwik_Common::getRequestVar('actionToLoad', 'index'); + $controllerName = Common::getRequestVar('moduleToLoad'); + $actionName = Common::getRequestVar('actionToLoad', 'index'); if ($actionName == 'showInContext') { throw new Exception("Preventing infinite recursion..."); } @@ -65,13 +65,13 @@ class Piwik_CoreHome_Controller extends Piwik_Controller protected function setDateTodayIfWebsiteCreatedToday() { - $date = Piwik_Common::getRequestVar('date', false); + $date = Common::getRequestVar('date', false); if ($date == 'today' - || Piwik_Common::getRequestVar('period', false) == 'range' + || Common::getRequestVar('period', false) == 'range' ) { return; } - $websiteId = Piwik_Common::getRequestVar('idSite', false, 'int'); + $websiteId = Common::getRequestVar('idSite', false, 'int'); if ($websiteId) { $website = new Piwik_Site($websiteId); $datetimeCreationDate = $this->site->getCreationDate()->getDatetime(); @@ -81,7 +81,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller Piwik::redirectToModule('CoreHome', 'index', array('date' => 'today', 'idSite' => $websiteId, - 'period' => Piwik_Common::getRequestVar('period')) + 'period' => Common::getRequestVar('period')) ); } } @@ -157,7 +157,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller $rowEvolution = self::$rowEvolutionCache; if ($rowEvolution === null) { $paramName = Piwik_CoreHome_DataTableRowAction_MultiRowEvolution::IS_MULTI_EVOLUTION_PARAM; - $isMultiRowEvolution = Piwik_Common::getRequestVar($paramName, false, 'int'); + $isMultiRowEvolution = Common::getRequestVar($paramName, false, 'int'); $rowEvolution = $this->makeRowEvolution($isMultiRowEvolution, $graphType = 'graphEvolution'); $rowEvolution->useAvailableMetrics(); @@ -202,7 +202,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller public function getDonateForm() { $view = new Piwik_View('@CoreHome/getDonateForm'); - if (Piwik_Common::getRequestVar('widget', false) + if (Common::getRequestVar('widget', false) && Piwik::isUserIsSuperUser() ) { $view->footerMessage = Piwik_Translate('CoreHome_OnlyForAdmin'); diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php index cb4c49ab8a..c617a77ff3 100644 --- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_CoreHome */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * MULTI ROW EVOLUTION @@ -36,7 +36,7 @@ class Piwik_CoreHome_DataTableRowAction_MultiRowEvolution */ public function __construct($idSite, $date) { - $this->metric = Piwik_Common::getRequestVar('column', '', 'string'); + $this->metric = Common::getRequestVar('column', '', 'string'); parent::__construct($idSite, $date); } diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 22da9411f7..7b15f9c887 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_CoreHome */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * ROW EVOLUTION @@ -73,7 +73,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution */ public function __construct($idSite, $date, $graphType = null) { - $this->apiMethod = Piwik_Common::getRequestVar('apiMethod', '', 'string'); + $this->apiMethod = Common::getRequestVar('apiMethod', '', 'string'); if (empty($this->apiMethod)) throw new Exception("Parameter apiMethod not set."); $this->label = Piwik_API_ResponseBuilder::getLabelFromRequest($_GET); @@ -81,7 +81,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution if ($this->label === '') throw new Exception("Parameter label not set."); - $this->period = Piwik_Common::getRequestVar('period', '', 'string'); + $this->period = Common::getRequestVar('period', '', 'string'); if (empty($this->period)) throw new Exception("Parameter period not set."); $this->idSite = $idSite; @@ -163,7 +163,7 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution protected function extractEvolutionReport($report) { $this->dataTable = $report['reportData']; - $this->rowLabel = Piwik_Common::sanitizeInputValue($report['label']); + $this->rowLabel = Common::sanitizeInputValue($report['label']); $this->rowIcon = !empty($report['logo']) ? $report['logo'] : false; $this->availableMetrics = $report['metadata']['metrics']; $this->dimension = $report['metadata']['dimension']; diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 692ee1abd1..b5bce55327 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_CorePluginsAdmin */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -122,7 +122,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin { Piwik::checkUserIsSuperUser(); $this->checkTokenInUrl(); - $pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string'); + $pluginName = Common::getRequestVar('pluginName', null, 'string'); return $pluginName; } @@ -138,7 +138,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin $pluginName = $this->initPluginModification(); $uninstalled = Piwik_PluginsManager::getInstance()->uninstallPlugin($pluginName); if(!$uninstalled) { - $path = Piwik_Common::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/'; + $path = Common::getPathToPiwikRoot() . '/plugins/' . $pluginName . '/'; $messagePermissions = Piwik::getErrorMessageMissingPermissions($path); $messageIntro = Piwik_Translate("Warning: \"%s\" could not be uninstalled. Piwik did not have enough permission to delete the files in $path. ", diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index 3d4040a6a5..8744d4e651 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -93,8 +93,8 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller Piwik::checkUserIsSuperUser(); $view = new Piwik_View('@CoreUpdater/oneClickResults'); - $view->coreError = Piwik_Common::getRequestVar('error', '', 'string', $_POST); - $view->feedbackMessages = safe_unserialize(Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('messages', '', 'string', $_POST))); + $view->coreError = Common::getRequestVar('error', '', 'string', $_POST); + $view->feedbackMessages = safe_unserialize(Common::unsanitizeInputValue(Common::getRequestVar('messages', '', 'string', $_POST))); echo $view->render(); } @@ -220,7 +220,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller public function index() { - $language = Piwik_Common::getRequestVar('language', ''); + $language = Common::getRequestVar('language', ''); if (!empty($language)) { Piwik_LanguagesManager::setLanguageForSession($language); } @@ -237,14 +237,14 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller Piwik::setMaxExecutionTime(0); - $cli = Piwik_Common::isPhpCliMode() ? '_cli' : ''; + $cli = Common::isPhpCliMode() ? '_cli' : ''; $welcomeTemplate = '@CoreUpdater/runUpdaterAndExit_welcome' . $cli; $doneTemplate = '@CoreUpdater/runUpdaterAndExit_done' . $cli; $viewWelcome = new Piwik_View($welcomeTemplate); $viewDone = new Piwik_View($doneTemplate); $sqlQueries = $updater->getSqlQueriesToExecute(); - if (Piwik_Common::isPhpCliMode()) { + if (Common::isPhpCliMode()) { $this->doWelcomeUpdates($viewWelcome, $componentsWithUpdateFile); echo $viewWelcome->render(); @@ -253,7 +253,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller echo $viewDone->render(); } } else { - if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) { + if (Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) { $this->warningMessages = array(); $this->doExecuteUpdates($viewDone, $updater, $componentsWithUpdateFile); @@ -274,7 +274,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller private function doWelcomeUpdates($view, $componentsWithUpdateFile) { $view->new_piwik_version = Piwik_Version::VERSION; - $view->commandUpgradePiwik = "<br /><code>php " . Piwik_Common::getPathToPiwikRoot() . "/index.php -- \"module=CoreUpdater\" </code>"; + $view->commandUpgradePiwik = "<br /><code>php " . Common::getPathToPiwikRoot() . "/index.php -- \"module=CoreUpdater\" </code>"; $pluginNamesToUpdate = array(); $coreToUpdate = false; diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 72d5269000..6f14121fba 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -9,7 +9,7 @@ * @package Piwik_CoreUpdater */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -47,8 +47,8 @@ class Piwik_CoreUpdater extends Piwik_Plugin public function dispatch() { - $module = Piwik_Common::getRequestVar('module', '', 'string'); - $action = Piwik_Common::getRequestVar('action', '', 'string'); + $module = Common::getRequestVar('module', '', 'string'); + $action = Common::getRequestVar('action', '', 'string'); $updater = new Piwik_Updater(); $updater->addComponentToCheck('core', Piwik_Version::VERSION); diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php index bae7cb7066..1e2c6c74ba 100644 --- a/plugins/CustomVariables/Archiver.php +++ b/plugins/CustomVariables/Archiver.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -130,7 +130,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver if (substr($value, -2) != '"]') { $value .= '"]'; } - $decoded = @Piwik_Common::json_decode($value); + $decoded = @Common::json_decode($value); if (is_array($decoded)) { $count = 0; foreach ($decoded as $category) { diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php index 8e99fc8fec..0610b4573d 100644 --- a/plugins/DBStats/API.php +++ b/plugins/DBStats/API.php @@ -9,7 +9,7 @@ * @package Piwik_DBStats */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/DBStats/MySQLMetadataProvider.php @@ -273,19 +273,19 @@ class Piwik_DBStats_API /** Returns true if $name is the name of a numeric archive table, false if otherwise. */ private function isNumericArchiveTable($name) { - return strpos($name, Piwik_Common::prefixTable('archive_numeric_')) === 0; + return strpos($name, Common::prefixTable('archive_numeric_')) === 0; } /** Returns true if $name is the name of a blob archive table, false if otherwise. */ private function isBlobArchiveTable($name) { - return strpos($name, Piwik_Common::prefixTable('archive_blob_')) === 0; + return strpos($name, Common::prefixTable('archive_blob_')) === 0; } /** Returns true if $name is the name of a log table, false if otherwise. */ private function isTrackerTable($name) { - return strpos($name, Piwik_Common::prefixTable('log_')) === 0; + return strpos($name, Common::prefixTable('log_')) === 0; } /** diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php index 90185312cb..75ca12e6ac 100755 --- a/plugins/DBStats/MySQLMetadataProvider.php +++ b/plugins/DBStats/MySQLMetadataProvider.php @@ -9,7 +9,7 @@ * @package Piwik_DBStats */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Utility class that provides general information about databases, including the size of @@ -78,7 +78,7 @@ class Piwik_DBStats_MySQLMetadataProvider */ public function getTableStatus($table) { - $prefixed = Piwik_Common::prefixTable($table); + $prefixed = Common::prefixTable($table); // if we've already gotten every table status, don't issue an uneeded query if (!is_null($this->tableStatuses) && isset($this->tableStatuses[$prefixed])) { @@ -130,7 +130,7 @@ class Piwik_DBStats_MySQLMetadataProvider */ public function getAllLogTableStatus() { - $regex = "/^" . Piwik_Common::prefixTable('log_') . "(?!profiling)/"; + $regex = "/^" . Common::prefixTable('log_') . "(?!profiling)/"; return $this->getAllTablesStatus($regex); } @@ -141,7 +141,7 @@ class Piwik_DBStats_MySQLMetadataProvider */ public function getAllNumericArchiveStatus() { - $regex = "/^" . Piwik_Common::prefixTable('archive_numeric') . "_/"; + $regex = "/^" . Common::prefixTable('archive_numeric') . "_/"; return $this->getAllTablesStatus($regex); } @@ -152,7 +152,7 @@ class Piwik_DBStats_MySQLMetadataProvider */ public function getAllBlobArchiveStatus() { - $regex = "/^" . Piwik_Common::prefixTable('archive_blob') . "_/"; + $regex = "/^" . Common::prefixTable('archive_blob') . "_/"; return $this->getAllTablesStatus($regex); } @@ -163,7 +163,7 @@ class Piwik_DBStats_MySQLMetadataProvider */ public function getAllAdminTableStatus() { - $regex = "/^" . Piwik_Common::prefixTable('') . "(?!archive_|(?:log_(?!profiling)))/"; + $regex = "/^" . Common::prefixTable('') . "(?!archive_|(?:log_(?!profiling)))/"; return $this->getAllTablesStatus($regex); } diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php index 589eb29e73..309b7a73a7 100644 --- a/plugins/Dashboard/Controller.php +++ b/plugins/Dashboard/Controller.php @@ -8,7 +8,7 @@ * @package Piwik_Dashboard */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Dashboard Controller @@ -34,10 +34,10 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $view = new Piwik_View($template); $this->setGeneralVariablesView($view); - $view->availableWidgets = Piwik_Common::json_encode(Piwik_GetWidgetsList()); + $view->availableWidgets = Common::json_encode(Piwik_GetWidgetsList()); $view->availableLayouts = $this->getAvailableLayouts(); - $view->dashboardId = Piwik_Common::getRequestVar('idDashboard', 1, 'int'); + $view->dashboardId = Common::getRequestVar('idDashboard', 1, 'int'); $view->dashboardLayout = $this->getLayout($view->dashboardId); return $view; @@ -67,14 +67,14 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $this->checkTokenInUrl(); Piwik_DataTable_Renderer_Json::sendHeaderJSON(); - echo Piwik_Common::json_encode(Piwik_GetWidgetsList()); + echo Common::json_encode(Piwik_GetWidgetsList()); } public function getDashboardLayout() { $this->checkTokenInUrl(); - $idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int'); + $idDashboard = Common::getRequestVar('idDashboard', 1, 'int'); $layout = $this->getLayout($idDashboard); @@ -88,7 +88,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { $this->checkTokenInUrl(); $layout = $this->dashboard->getDefaultLayout(); - $idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int'); + $idDashboard = Common::getRequestVar('idDashboard', 1, 'int'); if (Piwik::isUserIsAnonymous()) { $session = new Piwik_Session_Namespace("Piwik_Dashboard"); $session->dashboardLayout = $layout; @@ -109,7 +109,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { $paramsBind = array($login, $idDashboard, $layout, $layout); $query = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, $paramsBind); } @@ -124,7 +124,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { $paramsBind = array($name, $login, $idDashboard); $query = sprintf('UPDATE %s SET name = ? WHERE login = ? AND iddashboard = ?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, $paramsBind); } @@ -139,12 +139,12 @@ class Piwik_Dashboard_Controller extends Piwik_Controller return; } - $idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int'); + $idDashboard = Common::getRequestVar('idDashboard', 1, 'int'); // first layout can't be removed if ($idDashboard != 1) { $query = sprintf('DELETE FROM %s WHERE iddashboard = ? AND login = ?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, array($idDashboard, Piwik::getCurrentUserLogin())); } } @@ -167,7 +167,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $dashboards = $this->dashboard->getAllDashboards($login); Piwik_DataTable_Renderer_Json::sendHeaderJSON(); - echo Piwik_Common::json_encode($dashboards); + echo Common::json_encode($dashboards); } /** @@ -185,8 +185,8 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $user = Piwik::getCurrentUserLogin(); $nextId = $this->getNextIdDashboard($user); - $name = urldecode(Piwik_Common::getRequestVar('name', '', 'string')); - $type = urldecode(Piwik_Common::getRequestVar('type', 'default', 'string')); + $name = urldecode(Common::getRequestVar('name', '', 'string')); + $type = urldecode(Common::getRequestVar('type', 'default', 'string')); $layout = '{}'; if ($type == 'default') { @@ -194,17 +194,17 @@ class Piwik_Dashboard_Controller extends Piwik_Controller } $query = sprintf('INSERT INTO %s (login, iddashboard, name, layout) VALUES (?, ?, ?, ?)', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, array($user, $nextId, $name, $layout)); Piwik_DataTable_Renderer_Json::sendHeaderJSON(); - echo Piwik_Common::json_encode($nextId); + echo Common::json_encode($nextId); } private function getNextIdDashboard($login) { $nextIdQuery = sprintf('SELECT MAX(iddashboard)+1 FROM %s WHERE login = ?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); $nextId = Piwik_FetchOne($nextIdQuery, array($login)); if (empty($nextId)) { @@ -223,20 +223,20 @@ class Piwik_Dashboard_Controller extends Piwik_Controller return; } $login = Piwik::getCurrentUserLogin(); - $name = urldecode(Piwik_Common::getRequestVar('name', '', 'string')); - $user = urldecode(Piwik_Common::getRequestVar('user', '', 'string')); - $idDashboard = Piwik_Common::getRequestVar('dashboardId', 0, 'int'); + $name = urldecode(Common::getRequestVar('name', '', 'string')); + $user = urldecode(Common::getRequestVar('user', '', 'string')); + $idDashboard = Common::getRequestVar('dashboardId', 0, 'int'); $layout = $this->dashboard->getLayoutForUser($login, $idDashboard); if ($layout !== false) { $nextId = $this->getNextIdDashboard($user); $query = sprintf('INSERT INTO %s (login, iddashboard, name, layout) VALUES (?, ?, ?, ?)', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, array($user, $nextId, $name, $layout)); Piwik_DataTable_Renderer_Json::sendHeaderJSON(); - echo Piwik_Common::json_encode($nextId); + echo Common::json_encode($nextId); return; } } @@ -250,9 +250,9 @@ class Piwik_Dashboard_Controller extends Piwik_Controller { $this->checkTokenInUrl(); - $layout = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('layout')); - $idDashboard = Piwik_Common::getRequestVar('idDashboard', 1, 'int'); - $name = Piwik_Common::getRequestVar('name', '', 'string'); + $layout = Common::unsanitizeInputValue(Common::getRequestVar('layout')); + $idDashboard = Common::getRequestVar('idDashboard', 1, 'int'); + $name = Common::getRequestVar('name', '', 'string'); if (Piwik::isUserIsAnonymous()) { $session = new Piwik_Session_Namespace("Piwik_Dashboard"); $session->dashboardLayout = $layout; @@ -273,10 +273,10 @@ class Piwik_Dashboard_Controller extends Piwik_Controller $this->checkTokenInUrl(); if (Piwik::isUserIsSuperUser()) { - $layout = Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('layout')); + $layout = Common::unsanitizeInputValue(Common::getRequestVar('layout')); $paramsBind = array('', '1', $layout, $layout); $query = sprintf('INSERT INTO %s (login, iddashboard, layout) VALUES (?,?,?) ON DUPLICATE KEY UPDATE layout=?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); Piwik_Query($query, $paramsBind); } } diff --git a/plugins/Dashboard/Dashboard.php b/plugins/Dashboard/Dashboard.php index f6a0274dfe..972804a950 100644 --- a/plugins/Dashboard/Dashboard.php +++ b/plugins/Dashboard/Dashboard.php @@ -9,7 +9,7 @@ * @package Piwik_Dashboard */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_Dashboard @@ -43,7 +43,7 @@ class Piwik_Dashboard extends Piwik_Plugin { $paramsBind = array($login, $idDashboard); $query = sprintf('SELECT layout FROM %s WHERE login = ? AND iddashboard = ?', - Piwik_Common::prefixTable('user_dashboard')); + Common::prefixTable('user_dashboard')); $return = Piwik_FetchAll($query, $paramsBind); if (count($return) == 0) { @@ -95,7 +95,7 @@ class Piwik_Dashboard extends Piwik_Plugin public function getAllDashboards($login) { $dashboards = Piwik_FetchAll('SELECT iddashboard, name, layout - FROM ' . Piwik_Common::prefixTable('user_dashboard') . + FROM ' . Common::prefixTable('user_dashboard') . ' WHERE login = ? ORDER BY iddashboard', array($login)); $nameless = 1; @@ -110,7 +110,7 @@ class Piwik_Dashboard extends Piwik_Plugin $nameless++; } - $dashboard['name'] = Piwik_Common::unsanitizeInputValue($dashboard['name']); + $dashboard['name'] = Common::unsanitizeInputValue($dashboard['name']); $layout = '[]'; if (!empty($dashboard['layout'])) { @@ -181,12 +181,12 @@ class Piwik_Dashboard extends Piwik_Plugin $layout = str_replace("\\\"", "\"", $layout); $layout = str_replace("\n", "", $layout); - return Piwik_Common::json_decode($layout, $assoc = false); + return Common::json_decode($layout, $assoc = false); } public function encodeLayout($layout) { - return Piwik_Common::json_encode($layout); + return Common::json_encode($layout); } public function addMenus() @@ -211,7 +211,7 @@ class Piwik_Dashboard extends Piwik_Plugin { $tooltip = false; try { - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $tooltip = Piwik_Translate('Dashboard_TopLinkTooltip', Piwik_Site::getNameFor($idSite)); } catch (Exception $ex) { // if no idSite parameter, show no tooltip @@ -238,14 +238,14 @@ class Piwik_Dashboard extends Piwik_Plugin public function deleteDashboardLayout($userLogin) { - Piwik_Query('DELETE FROM ' . Piwik_Common::prefixTable('user_dashboard') . ' WHERE login = ?', array($userLogin)); + Piwik_Query('DELETE FROM ' . Common::prefixTable('user_dashboard') . ' WHERE login = ?', array($userLogin)); } public function install() { // we catch the exception try { - $sql = "CREATE TABLE " . Piwik_Common::prefixTable('user_dashboard') . " ( + $sql = "CREATE TABLE " . Common::prefixTable('user_dashboard') . " ( login VARCHAR( 100 ) NOT NULL , iddashboard INT NOT NULL , name VARCHAR( 100 ) NULL DEFAULT NULL , @@ -264,6 +264,6 @@ class Piwik_Dashboard extends Piwik_Plugin public function uninstall() { - Piwik_DropTables(Piwik_Common::prefixTable('user_dashboard')); + Piwik_DropTables(Common::prefixTable('user_dashboard')); } } diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index 9d09a35abe..6aac50450c 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -1,6 +1,6 @@ <?php use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -135,7 +135,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller public function refreshParsedUserAgents() { Piwik::checkUserIsSuperUser(); - $q = "SELECT idvisit, config_debug_ua FROM " . Piwik_Common::prefixTable("log_visit"); + $q = "SELECT idvisit, config_debug_ua FROM " . Common::prefixTable("log_visit"); $res = Piwik_FetchAll($q); foreach ($res as $rec) { $UAParser = new UserAgentParserEnhanced($rec['config_debug_ua']); @@ -165,7 +165,7 @@ class Piwik_DevicesDetection_Controller extends Piwik_Controller private function updateVisit($idVisit, $uaDetails) { - $q = "UPDATE " . Piwik_Common::prefixTable("log_visit") . " SET " . + $q = "UPDATE " . Common::prefixTable("log_visit") . " SET " . "config_browser_name = '" . $uaDetails['config_browser_name'] . "' ," . "config_browser_version = '" . $uaDetails['config_browser_version'] . "' ," . "config_os = '" . $uaDetails['config_os'] . "' ," . diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php index 31c12d6b07..74ee758854 100644 --- a/plugins/DevicesDetection/DevicesDetection.php +++ b/plugins/DevicesDetection/DevicesDetection.php @@ -10,7 +10,7 @@ * @package Piwik_DevicesDetection */ use Piwik\Core\Config; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; require_once PIWIK_INCLUDE_PATH . "/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php"; require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php'; @@ -187,7 +187,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin { // we catch the exception try { - $q1 = "ALTER TABLE `" . Piwik_Common::prefixTable("log_visit") . "` + $q1 = "ALTER TABLE `" . Common::prefixTable("log_visit") . "` ADD `config_os_version` VARCHAR( 10 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_os` , ADD `config_device_type` TINYINT( 10 ) NULL DEFAULT NULL AFTER `config_browser_version` , ADD `config_device_brand` VARCHAR( 100 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_type` , @@ -195,7 +195,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin Piwik_Exec($q1); // conditionaly add this column if (@Config::getInstance()->Debug['store_user_agent_in_visit']) { - $q2 = "ALTER TABLE `" . Piwik_Common::prefixTable("log_visit") . "` + $q2 = "ALTER TABLE `" . Common::prefixTable("log_visit") . "` ADD `config_debug_ua` VARCHAR( 512 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `config_device_model`"; Piwik_Exec($q2); } diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php index 73329f9270..45857cbc0b 100644 --- a/plugins/ExamplePlugin/Controller.php +++ b/plugins/ExamplePlugin/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_ExamplePlugin */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -82,7 +82,7 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller $out .= '<h3>Misc</h3>'; $out .= '<code>Piwik_AddMenu( $mainMenuName, $subMenuName, $url );</code> - Adds an entry to the menu in the Piwik interface (See the example in the <a href="https://github.com/piwik/piwik/blob/1.0/plugins/UserCountry/UserCountry.php#L76">UserCountry Plugin file</a>)<br />'; $out .= '<code>Piwik_AddWidget( $widgetCategory, $widgetName, $controllerName, $controllerAction, $customParameters = array());</code> - Adds a widget that users can add in the dashboard, or export using the Widgets link at the top of the screen. See the example in the <a href="https://github.com/piwik/piwik/blob/1.0/plugins/UserCountry/UserCountry.php#L70">UserCountry Plugin file</a> or any other plugin)<br />'; - $out .= '<code>Piwik_Common::prefixTable("site")</code> = <b>' . Piwik_Common::prefixTable("site") . '</b><br />'; + $out .= '<code>Piwik_Common::prefixTable("site")</code> = <b>' . Common::prefixTable("site") . '</b><br />'; $out .= '<h2>User access</h2>'; @@ -93,7 +93,7 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller $out .= '<code>Piwik::isUserIsSuperUser()</code> = <b>' . self::boolToString(Piwik::isUserIsSuperUser()) . '</b><br />'; $out .= '<h2>Execute SQL queries</h2>'; - $txtQuery = "SELECT token_auth FROM " . Piwik_Common::prefixTable('user') . " WHERE login = ?"; + $txtQuery = "SELECT token_auth FROM " . Common::prefixTable('user') . " WHERE login = ?"; $result = Piwik_FetchOne($txtQuery, array('anonymous')); $out .= '<code>Piwik_FetchOne("' . $txtQuery . '", array("anonymous"))</code> = <b>' . var_export($result, true) . '</b><br />'; $out .= '<br />'; diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php index 1cb48ecb5e..597dea4c0f 100644 --- a/plugins/ExampleUI/Controller.php +++ b/plugins/ExampleUI/Controller.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_ExampleUI */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_ExampleUI @@ -113,7 +113,7 @@ class Piwik_ExampleUI_Controller extends Piwik_Controller function generateSparkline() { - $serverRequested = Piwik_Common::getRequestVar('server', ''); + $serverRequested = Common::getRequestVar('server', ''); $view = Piwik_ViewDataTable::factory('sparkline'); $view->init($this->pluginName, __FUNCTION__, 'ExampleUI.getTemperaturesEvolution'); $view->setColumnsToDisplay($serverRequested); diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php index 783a64dbb5..3ba8fa5b5a 100644 --- a/plugins/Feedback/Controller.php +++ b/plugins/Feedback/Controller.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -31,10 +31,10 @@ class Piwik_Feedback_Controller extends Piwik_Controller */ function sendFeedback() { - $email = Piwik_Common::getRequestVar('email', '', 'string'); - $body = Piwik_Common::getRequestVar('body', '', 'string'); - $category = Piwik_Common::getRequestVar('category', '', 'string'); - $nonce = Piwik_Common::getRequestVar('nonce', '', 'string'); + $email = Common::getRequestVar('email', '', 'string'); + $body = Common::getRequestVar('body', '', 'string'); + $category = Common::getRequestVar('category', '', 'string'); + $nonce = Common::getRequestVar('nonce', '', 'string'); $view = new Piwik_View('@Feedback/sendFeedback'); $view->feedbackEmailAddress = Config::getInstance()->General['feedback_email_address']; @@ -59,10 +59,10 @@ class Piwik_Feedback_Controller extends Piwik_Controller Piwik_Nonce::discardNonce('Piwik_Feedback.sendFeedback'); $mail = new Piwik_Mail(); - $mail->setFrom(Piwik_Common::unsanitizeInputValue($email)); + $mail->setFrom(Common::unsanitizeInputValue($email)); $mail->addTo($view->feedbackEmailAddress, 'Piwik Team'); $mail->setSubject('[ Feedback form - Piwik ] ' . $category); - $mail->setBodyText(Piwik_Common::unsanitizeInputValue($body) . "\n" + $mail->setBodyText(Common::unsanitizeInputValue($body) . "\n" . 'Piwik ' . Piwik_Version::VERSION . "\n" . 'IP: ' . Piwik_IP::getIpFromHeader() . "\n" . 'URL: ' . Piwik_Url::getReferer() . "\n"); diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index f6fd240773..bddaf7b98e 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -9,7 +9,7 @@ * @package Piwik_Goals */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal", @@ -62,7 +62,7 @@ class Piwik_Goals_API } Piwik::checkUserHasViewAccess($idSite); $goals = Piwik_FetchAll("SELECT * - FROM " . Piwik_Common::prefixTable('goal') . " + FROM " . Common::prefixTable('goal') . " WHERE idsite IN (" . implode(", ", $idSite) . ") AND deleted = 0"); $cleanedGoals = array(); @@ -101,12 +101,12 @@ class Piwik_Goals_API // save in db $db = Zend_Registry::get('db'); $idGoal = $db->fetchOne("SELECT max(idgoal) + 1 - FROM " . Piwik_Common::prefixTable('goal') . " + FROM " . Common::prefixTable('goal') . " WHERE idsite = ?", $idSite); if ($idGoal == false) { $idGoal = 1; } - $db->insert(Piwik_Common::prefixTable('goal'), + $db->insert(Common::prefixTable('goal'), array( 'idsite' => $idSite, 'idgoal' => $idGoal, @@ -145,7 +145,7 @@ class Piwik_Goals_API $name = $this->checkName($name); $pattern = $this->checkPattern($pattern); $this->checkPatternIsValid($patternType, $pattern); - Zend_Registry::get('db')->update(Piwik_Common::prefixTable('goal'), + Zend_Registry::get('db')->update(Common::prefixTable('goal'), array( 'name' => $name, 'match_attribute' => $matchAttribute, @@ -190,12 +190,12 @@ class Piwik_Goals_API public function deleteGoal($idSite, $idGoal) { Piwik::checkUserHasAdminAccess($idSite); - Piwik_Query("UPDATE " . Piwik_Common::prefixTable('goal') . " + Piwik_Query("UPDATE " . Common::prefixTable('goal') . " SET deleted = 1 WHERE idsite = ? AND idgoal = ?", array($idSite, $idGoal)); - Piwik_DeleteAllRows(Piwik_Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal)); + Piwik_DeleteAllRows(Common::prefixTable("log_conversion"), "WHERE idgoal = ?", 100000, array($idGoal)); Piwik_Tracker_Cache::regenerateCacheWebsiteAttributes($idSite); } diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index d96730e3b5..ea38907bae 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Goals */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -49,26 +49,26 @@ class Piwik_Goals_Controller extends Piwik_Controller public function __construct() { parent::__construct(); - $this->idSite = Piwik_Common::getRequestVar('idSite', null, 'int'); + $this->idSite = Common::getRequestVar('idSite', null, 'int'); $this->goals = Piwik_Goals_API::getInstance()->getGoals($this->idSite); foreach ($this->goals as &$goal) { - $goal['name'] = Piwik_Common::sanitizeInputValue($goal['name']); + $goal['name'] = Common::sanitizeInputValue($goal['name']); if (isset($goal['pattern'])) { - $goal['pattern'] = Piwik_Common::sanitizeInputValue($goal['pattern']); + $goal['pattern'] = Common::sanitizeInputValue($goal['pattern']); } } } public function widgetGoalReport() { - $view = $this->getGoalReportView($idGoal = Piwik_Common::getRequestVar('idGoal', null, 'string')); + $view = $this->getGoalReportView($idGoal = Common::getRequestVar('idGoal', null, 'string')); $view->displayFullReport = false; echo $view->render(); } public function goalReport() { - $view = $this->getGoalReportView($idGoal = Piwik_Common::getRequestVar('idGoal', null, 'string')); + $view = $this->getGoalReportView($idGoal = Common::getRequestVar('idGoal', null, 'string')); $view->displayFullReport = true; echo $view->render(); } @@ -87,7 +87,7 @@ class Piwik_Goals_Controller extends Piwik_Controller public function getEcommerceLog($fetch = false) { $saveGET = $_GET; - $_GET['filterEcommerce'] = Piwik_Common::getRequestVar('filterEcommerce', 1, 'int'); + $_GET['filterEcommerce'] = Common::getRequestVar('filterEcommerce', 1, 'int'); $_GET['widget'] = 1; $_GET['segment'] = 'visitEcommerceStatus!=none'; $output = Piwik_FrontController::getInstance()->dispatch('Live', 'getVisitorLog', array($fetch)); @@ -129,10 +129,10 @@ class Piwik_Goals_Controller extends Piwik_Controller // conversion rate for new and returning visitors $segment = 'visitorType==returning,visitorType==returningCustomer'; - $conversionRateReturning = Piwik_Goals_API::getInstance()->getConversionRate($this->idSite, Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'), $segment, $idGoal); + $conversionRateReturning = Piwik_Goals_API::getInstance()->getConversionRate($this->idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), $segment, $idGoal); $view->conversion_rate_returning = $this->formatConversionRate($conversionRateReturning); $segment = 'visitorType==new'; - $conversionRateNew = Piwik_Goals_API::getInstance()->getConversionRate($this->idSite, Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'), $segment, $idGoal); + $conversionRateNew = Piwik_Goals_API::getInstance()->getConversionRate($this->idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), $segment, $idGoal); $view->conversion_rate_new = $this->formatConversionRate($conversionRateNew); $view->goalReportsByDimension = $this->getGoalReportsByDimensionTable( $view->nb_conversions, isset($ecommerce), !empty($view->cart_nb_conversions)); @@ -147,12 +147,12 @@ class Piwik_Goals_Controller extends Piwik_Controller // any other code/cause security issues) $goals = $this->goals; foreach ($goals as &$goal) { - $goal['name'] = Piwik_Common::unsanitizeInputValue($goal['name']); + $goal['name'] = Common::unsanitizeInputValue($goal['name']); if (isset($goal['pattern'])) { - $goal['pattern'] = Piwik_Common::unsanitizeInputValue($goal['pattern']); + $goal['pattern'] = Common::unsanitizeInputValue($goal['pattern']); } } - $view->goalsJSON = Piwik_Common::json_encode($goals); + $view->goalsJSON = Common::json_encode($goals); $view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite); $view->ecommerceEnabled = $this->site->isEcommerceEnabled(); @@ -233,14 +233,14 @@ class Piwik_Goals_Controller extends Piwik_Controller public function getEvolutionGraph($fetch = false, array $columns = array(), $idGoal = false) { if (empty($columns)) { - $columns = Piwik_Common::getRequestVar('columns'); + $columns = Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); } $columns = !is_array($columns) ? array($columns) : $columns; if (empty($idGoal)) { - $idGoal = Piwik_Common::getRequestVar('idGoal', false, 'string'); + $idGoal = Common::getRequestVar('idGoal', false, 'string'); } $view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Goals.get'); $view->setParametersToModify(array('idGoal' => $idGoal)); @@ -423,7 +423,7 @@ class Piwik_Goals_Controller extends Piwik_Controller // for non-Goals reports, we show the goals table $customParams = $ecommerceCustomParams + array('documentationForGoalsPage' => '1'); - if (Piwik_Common::getRequestVar('idGoal', '') === '') // if no idGoal, use 0 for overview + if (Common::getRequestVar('idGoal', '') === '') // if no idGoal, use 0 for overview { $customParams['idGoal'] = '0'; // NOTE: Must be string! Otherwise Piwik_View_HtmlTable_Goals fails. } diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 80a6cfc8e9..9549dc2fb1 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -9,7 +9,7 @@ * @package Piwik_Goals */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -99,7 +99,7 @@ class Piwik_Goals extends Piwik_Plugin */ function deleteSiteGoals($idSite) { - Piwik_Query("DELETE FROM " . Piwik_Common::prefixTable('goal') . " WHERE idsite = ? ", array($idSite)); + Piwik_Query("DELETE FROM " . Common::prefixTable('goal') . " WHERE idsite = ? ", array($idSite)); } /** @@ -410,7 +410,7 @@ class Piwik_Goals extends Piwik_Plugin public function addWidgets() { - $idSite = Piwik_Common::getRequestVar('idSite', null, 'int'); + $idSite = Common::getRequestVar('idSite', null, 'int'); // Ecommerce widgets $site = new Piwik_Site($idSite); @@ -427,14 +427,14 @@ class Piwik_Goals extends Piwik_Plugin $goals = Piwik_Goals_API::getInstance()->getGoals($idSite); if (count($goals) > 0) { foreach ($goals as $goal) { - Piwik_AddWidget('Goals_Goals', Piwik_Common::sanitizeInputValue($goal['name']), 'Goals', 'widgetGoalReport', array('idGoal' => $goal['idgoal'])); + Piwik_AddWidget('Goals_Goals', Common::sanitizeInputValue($goal['name']), 'Goals', 'widgetGoalReport', array('idGoal' => $goal['idgoal'])); } } } function addMenus() { - $idSite = Piwik_Common::getRequestVar('idSite', null, 'int'); + $idSite = Common::getRequestVar('idSite', null, 'int'); $goals = Piwik_Goals_API::getInstance()->getGoals($idSite); $mainGoalMenu = $this->getGoalCategoryName($idSite); $site = new Piwik_Site($idSite); @@ -570,7 +570,7 @@ class Piwik_Goals extends Piwik_Plugin private function getDisplayPropertiesForItemsReport($label) { - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $moneyColumns = array('revenue', 'avg_price'); $prettifyMoneyColumns = array( @@ -592,7 +592,7 @@ class Piwik_Goals extends Piwik_Plugin // set columns/translations which differ based on viewDataTable TODO: shouldn't have to do this check... amount of reports should be dynamic, but metadata should be static $columns = Piwik_Goals::getProductReportColumns(); - $abandonedCart = Piwik_Common::getRequestVar('viewDataTable', 'ecommerceOrder', 'string') == 'ecommerceAbandonedCart'; + $abandonedCart = Common::getRequestVar('viewDataTable', 'ecommerceOrder', 'string') == 'ecommerceAbandonedCart'; if ($abandonedCart) { $columns['abandoned_carts'] = Piwik_Translate('General_AbandonedCarts'); $columns['revenue'] = Piwik_Translate('Goals_LeftInCart', Piwik_Translate('General_ProductRevenue')); diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php index d6d7feaa42..c240a04ecc 100644 --- a/plugins/ImageGraph/API.php +++ b/plugins/ImageGraph/API.php @@ -9,7 +9,7 @@ * @package Piwik_ImageGraph */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The ImageGraph.get API call lets you generate beautiful static PNG Graphs for any existing Piwik report. @@ -283,10 +283,10 @@ class Piwik_ImageGraph_API // when no labels are specified, getRowEvolution returns the top N=filter_limit row evolutions // rows are sorted using filter_sort_column (see Piwik_API_DataTableGenericFilter for more info) if (!$labels) { - $savedFilterSortColumnValue = Piwik_Common::getRequestVar('filter_sort_column', ''); + $savedFilterSortColumnValue = Common::getRequestVar('filter_sort_column', ''); $_GET['filter_sort_column'] = $plottedMetric; - $savedFilterLimitValue = Piwik_Common::getRequestVar('filter_limit', -1, 'int'); + $savedFilterLimitValue = Common::getRequestVar('filter_limit', -1, 'int'); if ($savedFilterLimitValue == -1 || $savedFilterLimitValue > self::MAX_NB_ROW_LABELS) { $_GET['filter_limit'] = self::DEFAULT_NB_ROW_EVOLUTIONS; } @@ -382,7 +382,7 @@ class Piwik_ImageGraph_API { // $row instanceof Piwik_DataTable_Row $rowData = $row->getColumns(); // Associative Array - $abscissaSeries[] = Piwik_Common::unsanitizeInputValue($rowData['label']); + $abscissaSeries[] = Common::unsanitizeInputValue($rowData['label']); foreach ($ordinateColumns as $column) { $parsedOrdinateValue = $this->parseOrdinateValue($rowData[$column]); @@ -442,7 +442,7 @@ class Piwik_ImageGraph_API } $rowId = $periodsData[$i]->metadata['period']->getLocalizedShortString(); - $abscissaSeries[] = Piwik_Common::unsanitizeInputValue($rowId); + $abscissaSeries[] = Common::unsanitizeInputValue($rowId); } } @@ -502,7 +502,7 @@ class Piwik_ImageGraph_API $fileName = self::$DEFAULT_PARAMETERS[$graphType][self::FILENAME_KEY] . '_' . $apiModule . '_' . $apiAction . $idGoal . ' ' . str_replace(',', '-', $date) . ' ' . $idSite . '.png'; $fileName = str_replace(array(' ', '/'), '_', $fileName); - if (!Piwik_Common::isValidFilename($fileName)) { + if (!Common::isValidFilename($fileName)) { throw new Exception('Error: Image graph filename ' . $fileName . ' is not valid.'); } @@ -520,7 +520,7 @@ class Piwik_ImageGraph_API private function setFilterTruncate($default) { - $_GET['filter_truncate'] = Piwik_Common::getRequestVar('filter_truncate', $default, 'int'); + $_GET['filter_truncate'] = Common::getRequestVar('filter_truncate', $default, 'int'); } private static function parseOrdinateValue($ordinateValue) diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php index 56157a4f2a..4cabcd9633 100644 --- a/plugins/ImageGraph/Controller.php +++ b/plugins/ImageGraph/Controller.php @@ -1,6 +1,6 @@ <?php use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -18,9 +18,9 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller public function index() { Piwik::checkUserHasSomeAdminAccess(); - $idSite = Piwik_Common::getRequestVar('idSite', 1, 'int'); - $period = Piwik_Common::getRequestVar('period', 'day', 'string'); - $date = Piwik_Common::getRequestVar('date', 'today', 'string'); + $idSite = Common::getRequestVar('idSite', 1, 'int'); + $period = Common::getRequestVar('period', 'day', 'string'); + $date = Common::getRequestVar('date', 'today', 'string'); $_GET['token_auth'] = Piwik::getCurrentUserTokenAuth(); $reports = Piwik_API_API::getInstance()->getReportMetadata($idSite, $period, $date); $plot = array(); @@ -47,8 +47,8 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller $view = new Piwik_View('@ImageGraph/testAllSizes'); $this->setGeneralVariablesView($view); - $period = Piwik_Common::getRequestVar('period', 'day', 'string'); - $date = Piwik_Common::getRequestVar('date', 'today', 'string'); + $period = Common::getRequestVar('period', 'day', 'string'); + $date = Common::getRequestVar('date', 'today', 'string'); $_GET['token_auth'] = Piwik::getCurrentUserTokenAuth(); $availableReports = Piwik_API_API::getInstance()->getReportMetadata($this->idSite, $period, $date); diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php index 8cf15cd7ff..dfccc799bb 100644 --- a/plugins/ImageGraph/ImageGraph.php +++ b/plugins/ImageGraph/ImageGraph.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -95,7 +95,7 @@ class Piwik_ImageGraph extends Piwik_Plugin } } - $token_auth = Piwik_Common::getRequestVar('token_auth', false); + $token_auth = Common::getRequestVar('token_auth', false); $urlPrefix = "index.php?"; foreach ($reports as &$report) { @@ -126,7 +126,7 @@ class Piwik_ImageGraph extends Piwik_Plugin } // add the idSubtable if it exists - $idSubtable = Piwik_Common::getRequestVar('idSubtable', false); + $idSubtable = Common::getRequestVar('idSubtable', false); if ($idSubtable !== false) { $parameters['idSubtable'] = $idSubtable; } diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 26e5f23b72..cf676dbd7f 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Installation */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Installation controller @@ -159,7 +159,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $this->session->db_infos = $dbInfos; $this->redirectToNextStep(__FUNCTION__); } catch (Exception $e) { - $view->errorMessage = Piwik_Common::sanitizeInputValue($e->getMessage()); + $view->errorMessage = Common::sanitizeInputValue($e->getMessage()); } } $view->addForm($form); @@ -240,7 +240,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $this->skipThisStep(__FUNCTION__); $this->createDbFromSessionInformation(); - if (Piwik_Common::getRequestVar('deleteTables', 0, 'int') == 1) { + if (Common::getRequestVar('deleteTables', 0, 'int') == 1) { Piwik::dropTables(); $view->existingTablesDeleted = true; @@ -313,7 +313,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin 'login' => $form->getSubmitValue('login'), 'password' => md5($form->getSubmitValue('password')), 'email' => $form->getSubmitValue('email'), - 'salt' => Piwik_Common::generateUniqId(), + 'salt' => Common::generateUniqId(), ); $this->session->superuser_infos = $superUserInfos; @@ -418,7 +418,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $this->session->firstWebsiteSetupSuccessMessage = true; } $siteName = $this->session->site_name; - $siteName = Piwik_Common::sanitizeInputValue(urldecode($siteName)); + $siteName = Common::sanitizeInputValue(urldecode($siteName)); $idSite = $this->session->site_idSite; // Load the Tracking code and help text from the SitesManager @@ -547,7 +547,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin */ public function saveLanguage() { - $language = Piwik_Common::getRequestVar('language'); + $language = Common::getRequestVar('language'); Piwik_LanguagesManager::setLanguageForSession($language); Piwik_Url::redirectToReferer(); } @@ -591,7 +591,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $message = Piwik_Translate('Installation_ErrorInvalidState', array('<br /><b>', '</b>', - '<a href=\'' . Piwik_Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()) . '\'>', + '<a href=\'' . Common::sanitizeInputValue(Piwik_Url::getCurrentUrlWithoutFileName()) . '\'>', '</a>') ); Piwik::exitWithErrorMessage($message); @@ -698,7 +698,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $infos['can_auto_update'] = Piwik::canAutoUpdate(); - if (Piwik_Common::isIIS()) { + if (Common::isIIS()) { Piwik::createWebConfigFiles(); } else { Piwik::createHtAccessFiles(); @@ -807,7 +807,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $infos['memory_ok'] = $memoryValue >= $minimumMemoryLimit; } - $infos['isWindows'] = Piwik_Common::isWindows(); + $infos['isWindows'] = Common::isWindows(); $integrityInfo = Piwik::getFileIntegrityInformation(); $infos['integrity'] = $integrityInfo[0]; @@ -822,7 +822,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $infos['timezone'] = Piwik::isTimezoneSupportEnabled(); - $infos['tracker_status'] = Piwik_Common::getRequestVar('trackerStatus', 0, 'int'); + $infos['tracker_status'] = Common::getRequestVar('trackerStatus', 0, 'int'); $infos['protocol'] = Piwik_ProxyHeaders::getProtocolInformation(); if (!Piwik::isHttps() && $infos['protocol'] !== null) { @@ -945,7 +945,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin $result = array(); // check if LOAD DATA INFILE works - $optionTable = Piwik_Common::prefixTable('option'); + $optionTable = Common::prefixTable('option'); $testOptionNames = array('test_system_check1', 'test_system_check2'); $result['load_data_infile_available'] = false; diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php index bae926f4ed..0136c1a20e 100644 --- a/plugins/Installation/FormDatabaseSetup.php +++ b/plugins/Installation/FormDatabaseSetup.php @@ -9,7 +9,7 @@ * @package Piwik_Installation */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -300,7 +300,7 @@ class Piwik_Installation_FormDatabaseSetup_Rule_checkValidFilename extends HTML_ { $prefix = $this->owner->getValue(); return empty($prefix) - || Piwik_Common::isValidFilename($prefix); + || Common::isValidFilename($prefix); } } diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php index 36326a93ad..20af4fb892 100644 --- a/plugins/Installation/Installation.php +++ b/plugins/Installation/Installation.php @@ -9,7 +9,7 @@ * @package Piwik_Installation */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -55,7 +55,7 @@ class Piwik_Installation extends Piwik_Plugin Piwik_PostEvent('Installation.startInstallation', array($this)); - $step = Piwik_Common::getRequestVar('action', 'welcome', 'string'); + $step = Common::getRequestVar('action', 'welcome', 'string'); $controller = $this->getInstallationController(); if (in_array($step, array_keys($controller->getInstallationSteps())) || $step == 'saveLanguage') { $controller->$step($message); diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index a4048e99b5..14fb3ea7f5 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -10,7 +10,7 @@ * */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences. @@ -51,7 +51,7 @@ class Piwik_LanguagesManager_API public function isLanguageAvailable($languageCode) { return $languageCode !== false - && Piwik_Common::isValidFilename($languageCode) + && Common::isValidFilename($languageCode) && in_array($languageCode, $this->getAvailableLanguages()); } @@ -161,7 +161,7 @@ class Piwik_LanguagesManager_API { Piwik::checkUserIsSuperUserOrTheUser($login); Piwik::checkUserIsNotAnonymous(); - return Piwik_FetchOne('SELECT language FROM ' . Piwik_Common::prefixTable('user_language') . + return Piwik_FetchOne('SELECT language FROM ' . Common::prefixTable('user_language') . ' WHERE login = ? ', array($login)); } @@ -180,7 +180,7 @@ class Piwik_LanguagesManager_API return false; } $paramsBind = array($login, $languageCode, $languageCode); - Piwik_Query('INSERT INTO ' . Piwik_Common::prefixTable('user_language') . + Piwik_Query('INSERT INTO ' . Common::prefixTable('user_language') . ' (login, language) VALUES (?,?) ON DUPLICATE KEY UPDATE language=?', diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php index 2fbc094382..53dd6494c5 100644 --- a/plugins/LanguagesManager/Controller.php +++ b/plugins/LanguagesManager/Controller.php @@ -10,7 +10,7 @@ * */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_LanguagesManager @@ -23,7 +23,7 @@ class Piwik_LanguagesManager_Controller extends Piwik_Controller */ public function saveLanguage() { - $language = Piwik_Common::getRequestVar('language'); + $language = Common::getRequestVar('language'); // Prevent CSRF only when piwik is not installed yet (During install user can change language) if (Piwik::isInstalled()) { diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php index 5d8f6a3a72..073e7a1231 100644 --- a/plugins/LanguagesManager/LanguagesManager.php +++ b/plugins/LanguagesManager/LanguagesManager.php @@ -11,7 +11,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -88,7 +88,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin public function deleteUserLanguage($userLogin) { - Piwik_Query('DELETE FROM ' . Piwik_Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin); + Piwik_Query('DELETE FROM ' . Common::prefixTable('user_language') . ' WHERE login = ?', $userLogin); } /** @@ -98,7 +98,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin { // we catch the exception try { - $sql = "CREATE TABLE " . Piwik_Common::prefixTable('user_language') . " ( + $sql = "CREATE TABLE " . Common::prefixTable('user_language') . " ( login VARCHAR( 100 ) NOT NULL , language VARCHAR( 10 ) NOT NULL , PRIMARY KEY ( login ) @@ -118,7 +118,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin */ public function uninstall() { - Piwik_DropTables(Piwik_Common::prefixTable('user_language')); + Piwik_DropTables(Common::prefixTable('user_language')); } /** @@ -128,7 +128,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin { $languageCode = self::getLanguageFromPreferences(); if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) { - $languageCode = Piwik_Common::extractLanguageCodeFromBrowserLanguage(Piwik_Common::getBrowserLanguage(), Piwik_LanguagesManager_API::getInstance()->getAvailableLanguages()); + $languageCode = Common::extractLanguageCodeFromBrowserLanguage(Common::getBrowserLanguage(), Piwik_LanguagesManager_API::getInstance()->getAvailableLanguages()); } if (!Piwik_LanguagesManager_API::getInstance()->isLanguageAvailable($languageCode)) { $languageCode = Piwik_Translate::getInstance()->getLanguageDefault(); diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 4928570526..6c4e7ba046 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/Referers/functions.php @@ -325,7 +325,7 @@ class Piwik_Live_API $orderByParent = "sub.visit_last_action_time DESC"; if (!empty($visitorId)) { $where[] = "log_visit.idvisitor = ? "; - $whereBind[] = @Piwik_Common::hex2bin($visitorId); + $whereBind[] = @Common::hex2bin($visitorId); } if (!empty($minTimestamp)) { @@ -466,10 +466,10 @@ class Piwik_Live_API log_link_visit_action.time_spent_ref_action as timeSpentRef, log_link_visit_action.custom_float $sqlCustomVariables - FROM " . Piwik_Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action - LEFT JOIN " . Piwik_Common::prefixTable('log_action') . " AS log_action + FROM " . Common::prefixTable('log_link_visit_action') . " AS log_link_visit_action + LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action ON log_link_visit_action.idaction_url = log_action.idaction - LEFT JOIN " . Piwik_Common::prefixTable('log_action') . " AS log_action_title + LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_title ON log_link_visit_action.idaction_name = log_action_title.idaction WHERE log_link_visit_action.idvisit = ? ORDER BY server_time ASC @@ -531,8 +531,8 @@ class Piwik_Live_API log_conversion.idlink_va as goalPageId, log_conversion.server_time as serverTimePretty, log_conversion.url as url - FROM " . Piwik_Common::prefixTable('log_conversion') . " AS log_conversion - LEFT JOIN " . Piwik_Common::prefixTable('goal') . " AS goal + FROM " . Common::prefixTable('log_conversion') . " AS log_conversion + LEFT JOIN " . Common::prefixTable('goal') . " AS goal ON (goal.idsite = log_conversion.idsite AND goal.idgoal = log_conversion.idgoal) @@ -555,7 +555,7 @@ class Piwik_Live_API items as items, log_conversion.server_time as serverTimePretty - FROM " . Piwik_Common::prefixTable('log_conversion') . " AS log_conversion + FROM " . Common::prefixTable('log_conversion') . " AS log_conversion WHERE idvisit = ? AND idgoal <= " . Piwik_Tracker_GoalManager::IDGOAL_ORDER . " ORDER BY server_time ASC @@ -590,12 +590,12 @@ class Piwik_Live_API log_action_category.name as itemCategory, " . Piwik_DataAccess_LogAggregator::getSqlRevenue('price') . " as price, quantity as quantity - FROM " . Piwik_Common::prefixTable('log_conversion_item') . " - INNER JOIN " . Piwik_Common::prefixTable('log_action') . " AS log_action_sku + FROM " . Common::prefixTable('log_conversion_item') . " + INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku ON idaction_sku = log_action_sku.idaction - LEFT JOIN " . Piwik_Common::prefixTable('log_action') . " AS log_action_name + LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_name ON idaction_name = log_action_name.idaction - LEFT JOIN " . Piwik_Common::prefixTable('log_action') . " AS log_action_category + LEFT JOIN " . Common::prefixTable('log_action') . " AS log_action_category ON idaction_category = log_action_category.idaction WHERE idvisit = ? AND idorder = ? diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php index 40058843c4..13e02a5d7d 100644 --- a/plugins/Live/Controller.php +++ b/plugins/Live/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Live */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_Live @@ -79,7 +79,7 @@ class Piwik_Live_Controller extends Piwik_Controller public function indexVisitorLog() { $view = new Piwik_View('@Live/indexVisitorLog.twig'); - $view->filterEcommerce = Piwik_Common::getRequestVar('filterEcommerce', 0, 'int'); + $view->filterEcommerce = Common::getRequestVar('filterEcommerce', 0, 'int'); $view->visitorLog = $this->getVisitorLog($fetch = true); echo $view->render(); } @@ -117,7 +117,7 @@ class Piwik_Live_Controller extends Piwik_Controller // set a very high row count so that the next link in the footer of the data table is always shown $view->setCustomParameter('totalRows', 10000000); - $view->setCustomParameter('filterEcommerce', Piwik_Common::getRequestVar('filterEcommerce', 0, 'int')); + $view->setCustomParameter('filterEcommerce', Common::getRequestVar('filterEcommerce', 0, 'int')); $view->setCustomParameter('pageUrlNotDefined', Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageURL'))); return $this->renderView($view, $fetch); diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index 0efd06ba63..800e8ec914 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -9,7 +9,7 @@ * @package Piwik_Live */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/Referers/functions.php @@ -256,7 +256,7 @@ class Piwik_Live_Visitor function getContinentCode() { - return Piwik_Common::getContinent($this->details['location_country']); + return Common::getContinent($this->details['location_country']); } function getCityName() @@ -370,7 +370,7 @@ class Piwik_Live_Visitor } } } - if (Piwik_Common::isLookLikeUrl($this->details['referer_url'])) { + if (Common::isLookLikeUrl($this->details['referer_url'])) { return $this->details['referer_url']; } return null; @@ -385,7 +385,7 @@ class Piwik_Live_Visitor if (empty($url['query'])) { return null; } - $position = Piwik_Common::getParameterFromQueryString($url['query'], 'cd'); + $position = Common::getParameterFromQueryString($url['query'], 'cd'); if (!empty($position)) { return $position; } diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index a9027cd864..20eae5f377 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -9,7 +9,7 @@ * @package Piwik_Login */ use Piwik\Core\Config; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -48,7 +48,7 @@ class Piwik_Login_Auth implements Piwik_Auth $login = Piwik_FetchOne( 'SELECT login - FROM ' . Piwik_Common::prefixTable('user') . ' + FROM ' . Common::prefixTable('user') . ' WHERE token_auth = ?', array($this->token_auth) ); @@ -67,7 +67,7 @@ class Piwik_Login_Auth implements Piwik_Auth $login = $this->login; $userToken = Piwik_FetchOne( 'SELECT token_auth - FROM ' . Piwik_Common::prefixTable('user') . ' + FROM ' . Common::prefixTable('user') . ' WHERE login = ?', array($login) ); diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 135f6f3af6..6e429788eb 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Login */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Login controller @@ -29,9 +29,9 @@ class Piwik_Login_Controller extends Piwik_Controller { // mitigate rainbow table attack $passwordLen = strlen($password) / 2; - $hash = Piwik_Common::hash( + $hash = Common::hash( $userInfo . substr($password, 0, $passwordLen) - . Piwik_Common::getSalt() . substr($password, $passwordLen) + . Common::getSalt() . substr($password, $passwordLen) ); return $hash; } @@ -113,24 +113,24 @@ class Piwik_Login_Controller extends Piwik_Controller { self::checkForceSslLogin(); - $password = Piwik_Common::getRequestVar('password', null, 'string'); + $password = Common::getRequestVar('password', null, 'string'); if (strlen($password) != 32) { throw new Exception(Piwik_TranslateException('Login_ExceptionPasswordMD5HashExpected')); } - $login = Piwik_Common::getRequestVar('login', null, 'string'); + $login = Common::getRequestVar('login', null, 'string'); if ($login == Config::getInstance()->superuser['login']) { throw new Exception(Piwik_TranslateException('Login_ExceptionInvalidSuperUserAuthenticationMethod', array("logme"))); } $currentUrl = 'index.php'; - if (($idSite = Piwik_Common::getRequestVar('idSite', false, 'int')) !== false) { + if (($idSite = Common::getRequestVar('idSite', false, 'int')) !== false) { $currentUrl .= '?idSite=' . $idSite; } - $urlToRedirect = Piwik_Common::getRequestVar('url', $currentUrl, 'string'); - $urlToRedirect = Piwik_Common::unsanitizeInputValue($urlToRedirect); + $urlToRedirect = Common::getRequestVar('url', $currentUrl, 'string'); + $urlToRedirect = Common::unsanitizeInputValue($urlToRedirect); $this->authenticateAndRedirect($login, $password, false, $urlToRedirect); } @@ -289,8 +289,8 @@ class Piwik_Login_Controller extends Piwik_Controller { $errorMessage = null; - $login = Piwik_Common::getRequestVar('login', ''); - $resetToken = Piwik_Common::getRequestVar('resetToken', ''); + $login = Common::getRequestVar('login', ''); + $resetToken = Common::getRequestVar('resetToken', ''); try { // get password reset info & user info diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php index d8b88da705..52073993b0 100644 --- a/plugins/MobileMessaging/API.php +++ b/plugins/MobileMessaging/API.php @@ -9,7 +9,7 @@ * @package Piwik_MobileMessaging */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The MobileMessaging API lets you manage and access all the MobileMessaging plugin features including : @@ -399,7 +399,7 @@ class Piwik_MobileMessaging_API { Piwik_SetOption( $user . Piwik_MobileMessaging::USER_SETTINGS_POSTFIX_OPTION, - Piwik_Common::json_encode($settings) + Common::json_encode($settings) ); } @@ -426,7 +426,7 @@ class Piwik_MobileMessaging_API if (empty($userSettings)) { $userSettings = array(); } else { - $userSettings = Piwik_Common::json_decode($userSettings, true); + $userSettings = Common::json_decode($userSettings, true); } return $userSettings; diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php index d720b62236..84893cb172 100644 --- a/plugins/MobileMessaging/Controller.php +++ b/plugins/MobileMessaging/Controller.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; @@ -49,7 +49,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin // construct the list of countries from the lang files $countries = array(); - foreach (Piwik_Common::getCountriesList() as $countryCode => $continentCode) { + foreach (Common::getCountriesList() as $countryCode => $continentCode) { if (isset(Piwik_MobileMessaging_CountryCallingCodes::$countryCallingCodes[$countryCode])) { $countries[$countryCode] = array( @@ -60,7 +60,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin } $view->countries = $countries; - $view->defaultCountry = Piwik_Common::getCountry( + $view->defaultCountry = Common::getCountry( Piwik_LanguagesManager::getLanguageCodeForCurrentUser(), true, Piwik_IP::getIpFromHeader() diff --git a/plugins/MobileMessaging/ReportRenderer/Sms.php b/plugins/MobileMessaging/ReportRenderer/Sms.php index 39d10cad2f..c871e6632a 100644 --- a/plugins/MobileMessaging/ReportRenderer/Sms.php +++ b/plugins/MobileMessaging/ReportRenderer/Sms.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_MobileMessaging_ReportRenderer */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** @@ -55,7 +55,7 @@ class Piwik_MobileMessaging_ReportRenderer_Sms extends Piwik_ReportRenderer public function renderReport($processedReport) { - $isGoalPluginEnabled = Piwik_Common::isGoalPluginEnabled(); + $isGoalPluginEnabled = Common::isGoalPluginEnabled(); $prettyDate = $processedReport['prettyDate']; $reportData = $processedReport['reportData']; diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 1060129b8a..433263ebb8 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -9,7 +9,7 @@ * @package Piwik_MultiSites */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The MultiSites API lets you request the key metrics (visits, page views, revenue) for all Websites in Piwik. @@ -363,7 +363,7 @@ class Piwik_MultiSites_API } } else { $revenueMetric = ''; - if (Piwik_Common::isGoalPluginEnabled()) { + if (Common::isGoalPluginEnabled()) { $revenueMetric = Piwik_Goals_Archiver::getRecordName(self::GOAL_REVENUE_METRIC); } @@ -431,7 +431,7 @@ class Piwik_MultiSites_API public static function getApiMetrics($enhanced) { $metrics = self::$baseMetrics; - if (Piwik_Common::isGoalPluginEnabled()) { + if (Common::isGoalPluginEnabled()) { // goal revenue metric $metrics[self::GOAL_REVENUE_METRIC] = array( self::METRIC_TRANSLATION_KEY => 'Goals_ColumnRevenue', diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php index c63820a6a7..a6634df68f 100644 --- a/plugins/MultiSites/Controller.php +++ b/plugins/MultiSites/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_MultiSites */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -46,10 +46,10 @@ class Piwik_MultiSites_Controller extends Piwik_Controller public function getSitesInfo($isWidgetized = false) { Piwik::checkUserHasSomeViewAccess(); - $displayRevenueColumn = Piwik_Common::isGoalPluginEnabled(); + $displayRevenueColumn = Common::isGoalPluginEnabled(); - $date = Piwik_Common::getRequestVar('date', 'today'); - $period = Piwik_Common::getRequestVar('period', 'day'); + $date = Common::getRequestVar('date', 'today'); + $period = Common::getRequestVar('period', 'day'); $siteIds = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess(); list($minDate, $maxDate) = $this->getMinMaxDateAcrossWebsites($siteIds); @@ -210,7 +210,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller public function getEvolutionGraph($fetch = false, $columns = false) { if (empty($columns)) { - $columns = Piwik_Common::getRequestVar('columns'); + $columns = Common::getRequestVar('columns'); } $api = "API.get"; diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php index 0754731d49..e08218a23f 100644 --- a/plugins/Overlay/Controller.php +++ b/plugins/Overlay/Controller.php @@ -1,6 +1,6 @@ <?php use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -30,8 +30,8 @@ class Piwik_Overlay_Controller extends Piwik_Controller $this->setGeneralVariablesView($view); $view->idSite = $this->idSite; - $view->date = Piwik_Common::getRequestVar('date', 'today'); - $view->period = Piwik_Common::getRequestVar('period', 'day'); + $view->date = Common::getRequestVar('date', 'today'); + $view->period = Common::getRequestVar('period', 'day'); $view->ssl = Piwik::isHttps(); @@ -41,14 +41,14 @@ class Piwik_Overlay_Controller extends Piwik_Controller /** Render the area left of the iframe */ public function renderSidebar() { - $idSite = Piwik_Common::getRequestVar('idSite'); - $period = Piwik_Common::getRequestVar('period'); - $date = Piwik_Common::getRequestVar('date'); - $currentUrl = Piwik_Common::getRequestVar('currentUrl'); - $currentUrl = Piwik_Common::unsanitizeInputValue($currentUrl); + $idSite = Common::getRequestVar('idSite'); + $period = Common::getRequestVar('period'); + $date = Common::getRequestVar('date'); + $currentUrl = Common::getRequestVar('currentUrl'); + $currentUrl = Common::unsanitizeInputValue($currentUrl); $normalizedCurrentUrl = Piwik_Tracker_Action::excludeQueryParametersFromUrl($currentUrl, $idSite); - $normalizedCurrentUrl = Piwik_Common::unsanitizeInputValue($normalizedCurrentUrl); + $normalizedCurrentUrl = Common::unsanitizeInputValue($normalizedCurrentUrl); // load the appropriate row of the page urls report using the label filter Piwik_Actions_ArchivingHelper::reloadConfig(); @@ -118,7 +118,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller */ public function startOverlaySession() { - $idSite = Piwik_Common::getRequestVar('idsite', 0, 'int'); + $idSite = Common::getRequestVar('idsite', 0, 'int'); Piwik::checkUserHasViewAccess($idSite); $sitesManager = Piwik_SitesManager_API::getInstance(); @@ -147,7 +147,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller var urlToRedirect = window.location.hash.substr(1); var urlToRedirectWithoutPrefix = removeUrlPrefix(urlToRedirect); - var knownUrls = ' . Piwik_Common::json_encode($urls) . '; + var knownUrls = ' . Common::json_encode($urls) . '; for (var i = 0; i < knownUrls.length; i++) { var testUrl = removeUrlPrefix(knownUrls[i]); if (urlToRedirectWithoutPrefix.substr(0, testUrl.length) == testUrl) { @@ -186,11 +186,11 @@ class Piwik_Overlay_Controller extends Piwik_Controller */ public function showErrorWrongDomain() { - $idSite = Piwik_Common::getRequestVar('idSite', 0, 'int'); + $idSite = Common::getRequestVar('idSite', 0, 'int'); Piwik::checkUserHasViewAccess($idSite); - $url = Piwik_Common::getRequestVar('url', ''); - $url = Piwik_Common::unsanitizeInputValue($url); + $url = Common::getRequestVar('url', ''); + $url = Common::unsanitizeInputValue($url); $message = Piwik_Translate('Overlay_RedirectUrlError', array($url, "\n")); $message = nl2br(htmlentities($message)); diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php index 5a048ed1dc..f63225450c 100644 --- a/plugins/PDFReports/API.php +++ b/plugins/PDFReports/API.php @@ -9,7 +9,7 @@ * @package Piwik_PDFReports */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The PDFReports API lets you manage Scheduled Email reports, as well as generate, download or email any existing report. @@ -99,13 +99,13 @@ class Piwik_PDFReports_API $reports = self::validateRequestedReports($idSite, $reportType, $reports); $db = Zend_Registry::get('db'); - $idReport = $db->fetchOne("SELECT max(idreport) + 1 FROM " . Piwik_Common::prefixTable('report')); + $idReport = $db->fetchOne("SELECT max(idreport) + 1 FROM " . Common::prefixTable('report')); if ($idReport == false) { $idReport = 1; } - $db->insert(Piwik_Common::prefixTable('report'), + $db->insert(Common::prefixTable('report'), array( 'idreport' => $idReport, 'idsite' => $idSite, @@ -158,7 +158,7 @@ class Piwik_PDFReports_API // validation of requested reports $reports = self::validateRequestedReports($idSite, $reportType, $reports); - Zend_Registry::get('db')->update(Piwik_Common::prefixTable('report'), + Zend_Registry::get('db')->update(Common::prefixTable('report'), array( 'description' => $description, 'idsegment' => $idSegment, @@ -186,7 +186,7 @@ class Piwik_PDFReports_API $report = reset($pdfReports); Piwik::checkUserIsSuperUserOrTheUser($report['login']); - Zend_Registry::get('db')->update(Piwik_Common::prefixTable('report'), + Zend_Registry::get('db')->update(Common::prefixTable('report'), array( 'deleted' => 1, ), @@ -235,7 +235,7 @@ class Piwik_PDFReports_API } if (!empty($idSite)) { Piwik::checkUserHasViewAccess($idSite); - $sqlWhere .= " AND " . Piwik_Common::prefixTable('site') . ".idsite = ?"; + $sqlWhere .= " AND " . Common::prefixTable('site') . ".idsite = ?"; $bind[] = $idSite; } if (!empty($idReport)) { @@ -249,8 +249,8 @@ class Piwik_PDFReports_API // Joining with the site table to work around pre-1.3 where reports could still be linked to a deleted site $reports = Piwik_FetchAll("SELECT * - FROM " . Piwik_Common::prefixTable('report') . " - JOIN " . Piwik_Common::prefixTable('site') . " + FROM " . Common::prefixTable('report') . " + JOIN " . Common::prefixTable('site') . " USING (idsite) WHERE deleted = 0 $sqlWhere", $bind); @@ -263,10 +263,10 @@ class Piwik_PDFReports_API foreach ($reports as &$report) { // decode report parameters - $report['parameters'] = Piwik_Common::json_decode($report['parameters'], true); + $report['parameters'] = Common::json_decode($report['parameters'], true); // decode report list - $report['reports'] = Piwik_Common::json_decode($report['reports'], true); + $report['reports'] = Common::json_decode($report['reports'], true); } // static cache @@ -318,7 +318,7 @@ class Piwik_PDFReports_API } // override and/or validate report parameters - $report['parameters'] = Piwik_Common::json_decode( + $report['parameters'] = Common::json_decode( self::validateReportParameters($reportType, empty($parameters) ? $report['parameters'] : $parameters), true ); @@ -336,7 +336,7 @@ class Piwik_PDFReports_API // the report will be rendered with the first 23 rows and will aggregate other rows in a summary row // 23 rows table fits in one portrait page - $initialFilterTruncate = Piwik_Common::getRequestVar('filter_truncate', false); + $initialFilterTruncate = Common::getRequestVar('filter_truncate', false); $_GET['filter_truncate'] = self::REPORT_TRUNCATE; $prettyDate = null; @@ -536,7 +536,7 @@ class Piwik_PDFReports_API ); // Update flag in DB - Zend_Registry::get('db')->update(Piwik_Common::prefixTable('report'), + Zend_Registry::get('db')->update(Common::prefixTable('report'), array('ts_last_sent' => Piwik_Date::now()->getDatetime()), "idreport = " . $report['idreport'] ); @@ -591,7 +591,7 @@ class Piwik_PDFReports_API // delegate report parameter validation Piwik_PostEvent(self::VALIDATE_PARAMETERS_EVENT, array(&$parameters, $notificationInfo)); - return Piwik_Common::json_encode($parameters); + return Common::json_encode($parameters); } private static function validateAndTruncateDescription(&$description) @@ -620,7 +620,7 @@ class Piwik_PDFReports_API } } - return Piwik_Common::json_encode($requestedReports); + return Common::json_encode($requestedReports); } private static function validateCommonReportAttributes($period, $hour, &$description, &$idSegment, $reportType, $reportFormat) diff --git a/plugins/PDFReports/Controller.php b/plugins/PDFReports/Controller.php index 1203246a1e..2f8a5a9d83 100644 --- a/plugins/PDFReports/Controller.php +++ b/plugins/PDFReports/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_PDFReports */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -62,7 +62,7 @@ class Piwik_PDFReports_Controller extends Piwik_Controller } } $view->reports = $reports; - $view->reportsJSON = Piwik_Common::json_encode($reportsById); + $view->reportsJSON = Common::json_encode($reportsById); $view->downloadOutputType = Piwik_PDFReports_API::OUTPUT_INLINE; diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php index a7bc831e80..9332020010 100644 --- a/plugins/PDFReports/PDFReports.php +++ b/plugins/PDFReports/PDFReports.php @@ -9,7 +9,7 @@ * @package Piwik_PDFReports */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -504,13 +504,13 @@ class Piwik_PDFReports extends Piwik_Plugin public function deleteUserReport($userLogin) { - Piwik_Query('DELETE FROM ' . Piwik_Common::prefixTable('report') . ' WHERE login = ?', $userLogin); + Piwik_Query('DELETE FROM ' . Common::prefixTable('report') . ' WHERE login = ?', $userLogin); } public function install() { $queries[] = ' - CREATE TABLE `' . Piwik_Common::prefixTable('report') . '` ( + CREATE TABLE `' . Common::prefixTable('report') . '` ( `idreport` INT(11) NOT NULL AUTO_INCREMENT, `idsite` INTEGER(11) NOT NULL, `login` VARCHAR(100) NOT NULL, diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php index 3791d830c7..049f3a1ec8 100644 --- a/plugins/PrivacyManager/Controller.php +++ b/plugins/PrivacyManager/Controller.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -27,11 +27,11 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin Piwik::checkUserIsSuperUser(); if ($_SERVER["REQUEST_METHOD"] == "POST") { $this->checkTokenInUrl(); - switch (Piwik_Common::getRequestVar('form')) { + switch (Common::getRequestVar('form')) { case("formMaskLength"): - $this->handlePluginState(Piwik_Common::getRequestVar("anonymizeIPEnable", 0)); + $this->handlePluginState(Common::getRequestVar("anonymizeIPEnable", 0)); $trackerConfig = Config::getInstance()->Tracker; - $trackerConfig['ip_address_mask_length'] = Piwik_Common::getRequestVar("maskLength", 1); + $trackerConfig['ip_address_mask_length'] = Common::getRequestVar("maskLength", 1); Config::getInstance()->Tracker = $trackerConfig; Config::getInstance()->forceSave(); break; @@ -60,22 +60,22 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin $settings = array(); // delete logs settings - $settings['delete_logs_enable'] = Piwik_Common::getRequestVar("deleteEnable", 0); - $settings['delete_logs_schedule_lowest_interval'] = Piwik_Common::getRequestVar("deleteLowestInterval", 7); - $settings['delete_logs_older_than'] = ((int)Piwik_Common::getRequestVar("deleteOlderThan", 180) < 1) ? - 1 : Piwik_Common::getRequestVar("deleteOlderThan", 180); + $settings['delete_logs_enable'] = Common::getRequestVar("deleteEnable", 0); + $settings['delete_logs_schedule_lowest_interval'] = Common::getRequestVar("deleteLowestInterval", 7); + $settings['delete_logs_older_than'] = ((int)Common::getRequestVar("deleteOlderThan", 180) < 1) ? + 1 : Common::getRequestVar("deleteOlderThan", 180); // delete reports settings - $settings['delete_reports_enable'] = Piwik_Common::getRequestVar("deleteReportsEnable", 0); - $deleteReportsOlderThan = Piwik_Common::getRequestVar("deleteReportsOlderThan", 3); + $settings['delete_reports_enable'] = Common::getRequestVar("deleteReportsEnable", 0); + $deleteReportsOlderThan = Common::getRequestVar("deleteReportsOlderThan", 3); $settings['delete_reports_older_than'] = $deleteReportsOlderThan < 3 ? 3 : $deleteReportsOlderThan; - $settings['delete_reports_keep_basic_metrics'] = Piwik_Common::getRequestVar("deleteReportsKeepBasic", 0); - $settings['delete_reports_keep_day_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepDay", 0); - $settings['delete_reports_keep_week_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepWeek", 0); - $settings['delete_reports_keep_month_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepMonth", 0); - $settings['delete_reports_keep_year_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepYear", 0); - $settings['delete_reports_keep_range_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepRange", 0); - $settings['delete_reports_keep_segment_reports'] = Piwik_Common::getRequestVar("deleteReportsKeepSegments", 0); + $settings['delete_reports_keep_basic_metrics'] = Common::getRequestVar("deleteReportsKeepBasic", 0); + $settings['delete_reports_keep_day_reports'] = Common::getRequestVar("deleteReportsKeepDay", 0); + $settings['delete_reports_keep_week_reports'] = Common::getRequestVar("deleteReportsKeepWeek", 0); + $settings['delete_reports_keep_month_reports'] = Common::getRequestVar("deleteReportsKeepMonth", 0); + $settings['delete_reports_keep_year_reports'] = Common::getRequestVar("deleteReportsKeepYear", 0); + $settings['delete_reports_keep_range_reports'] = Common::getRequestVar("deleteReportsKeepRange", 0); + $settings['delete_reports_keep_segment_reports'] = Common::getRequestVar("deleteReportsKeepSegments", 0); $settings['delete_logs_max_rows_per_query'] = Piwik_PrivacyManager::DEFAULT_MAX_ROWS_PER_QUERY; @@ -91,7 +91,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin Piwik::checkUserIsSuperUser(); $view = new Piwik_View('@PrivacyManager/getDatabaseSize'); - $forceEstimate = Piwik_Common::getRequestVar('forceEstimate', 0); + $forceEstimate = Common::getRequestVar('forceEstimate', 0); $view->dbStats = $this->getDeleteDBSizeEstimate($getSettingsFromQuery = true, $forceEstimate); $view->language = Piwik_LanguagesManager::getLanguageCodeForCurrentUser(); @@ -137,7 +137,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin // if the request isn't a POST, redirect to index if ($_SERVER["REQUEST_METHOD"] != "POST" - && !Piwik_Common::isPhpCliMode() + && !Common::isPhpCliMode() ) { return $this->redirectToIndex('PrivacyManager', 'privacySettings'); } diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php index 6b9fc829ef..692d8435e2 100755 --- a/plugins/PrivacyManager/LogDataPurger.php +++ b/plugins/PrivacyManager/LogDataPurger.php @@ -9,7 +9,7 @@ * @package Piwik_PrivacyManager */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Purges the log_visit, log_conversion and related tables of old visit data. @@ -71,7 +71,7 @@ class Piwik_PrivacyManager_LogDataPurger $where = "WHERE idvisit <= ?"; foreach ($logTables as $logTable) { // deleting from log_action must be handled differently, so we do it later - if ($logTable != Piwik_Common::prefixTable('log_action')) { + if ($logTable != Common::prefixTable('log_action')) { Piwik_DeleteAllRows($logTable, $where, $this->maxRowsToDeletePerQuery, array($maxIdVisit)); } } @@ -105,7 +105,7 @@ class Piwik_PrivacyManager_LogDataPurger if (!empty($maxIdVisit)) { foreach ($this->getDeleteTableLogTables() as $table) { // getting an estimate for log_action is not supported since it can take too long - if ($table != Piwik_Common::prefixTable('log_action')) { + if ($table != Common::prefixTable('log_action')) { $rowCount = $this->getLogTableDeleteCount($table, $maxIdVisit); if ($rowCount > 0) { $result[$table] = $rowCount; @@ -146,7 +146,7 @@ class Piwik_PrivacyManager_LogDataPurger */ private function getDeleteIdVisitOffset() { - $logVisit = Piwik_Common::prefixTable("log_visit"); + $logVisit = Common::prefixTable("log_visit"); // get max idvisit $maxIdVisit = Piwik_FetchOne("SELECT MAX(idvisit) FROM $logVisit"); @@ -175,7 +175,7 @@ class Piwik_PrivacyManager_LogDataPurger private function createTempTable() { - $sql = "CREATE TEMPORARY TABLE " . Piwik_Common::prefixTable(self::TEMP_TABLE_NAME) . " ( + $sql = "CREATE TEMPORARY TABLE " . Common::prefixTable(self::TEMP_TABLE_NAME) . " ( idaction INT(11), PRIMARY KEY (idaction) )"; @@ -190,7 +190,7 @@ class Piwik_PrivacyManager_LogDataPurger $result = array(); foreach ($tables as $table) { $idCol = $idColumns[$table]; - $result[$table] = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Piwik_Common::prefixTable($table)); + $result[$table] = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); } return $result; @@ -198,14 +198,14 @@ class Piwik_PrivacyManager_LogDataPurger private function insertActionsToKeep($maxIds, $olderThan = true) { - $tempTableName = Piwik_Common::prefixTable(self::TEMP_TABLE_NAME); + $tempTableName = Common::prefixTable(self::TEMP_TABLE_NAME); $idColumns = $this->getTableIdColumns(); foreach ($this->getIdActionColumns() as $table => $columns) { $idCol = $idColumns[$table]; foreach ($columns as $col) { - $select = "SELECT $col FROM " . Piwik_Common::prefixTable($table) . " WHERE $idCol >= ? AND $idCol < ?"; + $select = "SELECT $col FROM " . Common::prefixTable($table) . " WHERE $idCol >= ? AND $idCol < ?"; $sql = "INSERT IGNORE INTO $tempTableName $select"; if ($olderThan) { @@ -213,7 +213,7 @@ class Piwik_PrivacyManager_LogDataPurger $finish = $maxIds[$table]; } else { $start = $maxIds[$table]; - $finish = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Piwik_Common::prefixTable($table)); + $finish = Piwik_FetchOne("SELECT MAX($idCol) FROM " . Common::prefixTable($table)); } Piwik_SegmentedQuery($sql, $start, $finish, self::$selectSegmentSize); @@ -231,11 +231,11 @@ class Piwik_PrivacyManager_LogDataPurger private function lockLogTables() { Piwik_LockTables( - $readLocks = Piwik_Common::prefixTables('log_conversion', + $readLocks = Common::prefixTables('log_conversion', 'log_link_visit_action', 'log_visit', 'log_conversion_item'), - $writeLocks = Piwik_Common::prefixTables('log_action') + $writeLocks = Common::prefixTables('log_action') ); } @@ -246,7 +246,7 @@ class Piwik_PrivacyManager_LogDataPurger private function deleteUnusedActions() { - list($logActionTable, $tempTableName) = Piwik_Common::prefixTables("log_action", self::TEMP_TABLE_NAME); + list($logActionTable, $tempTableName) = Common::prefixTables("log_action", self::TEMP_TABLE_NAME); $deleteSql = "DELETE LOW_PRIORITY QUICK IGNORE $logActionTable FROM $logActionTable @@ -294,12 +294,12 @@ class Piwik_PrivacyManager_LogDataPurger // let's hardcode, since these are not dynamically created tables public static function getDeleteTableLogTables() { - $result = Piwik_Common::prefixTables('log_conversion', + $result = Common::prefixTables('log_conversion', 'log_link_visit_action', 'log_visit', 'log_conversion_item'); if (Piwik::isLockPrivilegeGranted()) { - $result[] = Piwik_Common::prefixTable('log_action'); + $result[] = Common::prefixTable('log_action'); } return $result; } diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php index 39381d8cd2..9553275c8a 100644 --- a/plugins/PrivacyManager/PrivacyManager.php +++ b/plugins/PrivacyManager/PrivacyManager.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/PrivacyManager/LogDataPurger.php @@ -330,7 +330,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin $metricsToKeep = self::getMetricsToKeep(); // convert goal metric names to correct archive names - if (Piwik_Common::isGoalPluginEnabled()) { + if (Common::isGoalPluginEnabled()) { $goalMetricsToKeep = self::getGoalMetricsToKeep(); $maxGoalId = self::getMaxGoalId(); @@ -387,7 +387,7 @@ class Piwik_PrivacyManager extends Piwik_Plugin private static function getMaxGoalId() { - return Piwik_FetchOne("SELECT MAX(idgoal) FROM " . Piwik_Common::prefixTable('goal')); + return Piwik_FetchOne("SELECT MAX(idgoal) FROM " . Common::prefixTable('goal')); } } diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index ab06434fe4..b785229214 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Provider */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -61,7 +61,7 @@ class Piwik_Provider extends Piwik_Plugin function install() { // add column hostname / hostname ext in the visit table - $query = "ALTER IGNORE TABLE `" . Piwik_Common::prefixTable('log_visit') . "` ADD `location_provider` VARCHAR( 100 ) NULL"; + $query = "ALTER IGNORE TABLE `" . Common::prefixTable('log_visit') . "` ADD `location_provider` VARCHAR( 100 ) NULL"; // if the column already exist do not throw error. Could be installed twice... try { @@ -77,7 +77,7 @@ class Piwik_Provider extends Piwik_Plugin function uninstall() { // add column hostname / hostname ext in the visit table - $query = "ALTER TABLE `" . Piwik_Common::prefixTable('log_visit') . "` DROP `location_provider`"; + $query = "ALTER TABLE `" . Common::prefixTable('log_visit') . "` DROP `location_provider`"; Piwik_Exec($query); } @@ -127,7 +127,7 @@ class Piwik_Provider extends Piwik_Plugin if ($hostnameDomain == 'uk') { $hostnameDomain = 'gb'; } - if (array_key_exists($hostnameDomain, Piwik_Common::getCountriesList())) { + if (array_key_exists($hostnameDomain, Common::getCountriesList())) { $visitorInfo['location_country'] = $hostnameDomain; } } diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php index 1c36f8a929..36dc488a99 100644 --- a/plugins/Provider/functions.php +++ b/plugins/Provider/functions.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Provider */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Return hostname portion of a domain name @@ -66,7 +66,7 @@ function Piwik_Provider_getPrettyProviderName( $in ) { $providerName = Piwik_getHostnameName($in); - $prettyNames = Piwik_Common::getProviderNames(); + $prettyNames = Common::getProviderNames(); if(is_array($prettyNames) && array_key_exists(strtolower($providerName), $prettyNames)) diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index cac2e2505e..b97e61471c 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Proxy */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Controller for proxy services @@ -32,7 +32,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller Piwik::checkUserHasSomeViewAccess(); $view = new Piwik_View('@Proxy/exportImageWindow'); - $view->imageData = 'data:image/png;base64,' . Piwik_Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST); + $view->imageData = 'data:image/png;base64,' . Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST); echo $view->render(); } @@ -52,13 +52,13 @@ class Piwik_Proxy_Controller extends Piwik_Controller { Piwik::checkUserHasSomeViewAccess(); - $rawData = Piwik_Common::getRequestVar('imageData', '', 'string', $_POST); + $rawData = Common::getRequestVar('imageData', '', 'string', $_POST); // returns false if any illegal characters in input $data = base64_decode($rawData); if ($data !== false) { // check for PNG header - if (Piwik_Common::substr($data, 0, 8) === "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") { + if (Common::substr($data, 0, 8) === "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") { header('Content-Type: image/png'); // more robust validation (if available) @@ -119,7 +119,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller */ public function redirect() { - $url = Piwik_Common::getRequestVar('url', '', 'string', $_GET); + $url = Common::getRequestVar('url', '', 'string', $_GET); // validate referrer $referrer = Piwik_Url::getReferer(); @@ -135,7 +135,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller if (!self::isPiwikUrl($url)) { Piwik::checkUserHasSomeViewAccess(); } - if (!Piwik_Common::isLookLikeUrl($url)) { + if (!Common::isLookLikeUrl($url)) { die('Please check the &url= parameter: it should to be a valid URL'); } @header('Content-Type: text/html; charset=utf-8'); diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php index f71d3c2a45..39ad371b43 100644 --- a/plugins/Referers/API.php +++ b/plugins/Referers/API.php @@ -9,7 +9,7 @@ * @package Piwik_Referers */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The Referrers API lets you access reports about Websites, Search engines, Keywords, Campaigns used to access your website. @@ -78,13 +78,13 @@ class Piwik_Referers_API if ($idSubtable !== false) { $result = false; switch ($idSubtable) { - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: $result = $this->getKeywords($idSite, $period, $date, $segment); break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $result = $this->getWebsites($idSite, $period, $date, $segment); break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: $result = $this->getCampaigns($idSite, $period, $date, $segment); break; default: // invalid idSubtable, return whole report @@ -507,7 +507,7 @@ class Piwik_Referers_API { foreach ($dataTable->getRows() as $row) { $typeReferrer = $row->getColumn('label'); - if ($typeReferrer != Piwik_Common::REFERER_TYPE_DIRECT_ENTRY) { + if ($typeReferrer != Common::REFERER_TYPE_DIRECT_ENTRY) { if (!$expanded) // if we don't want the expanded datatable, then don't do any extra queries { $row->c[Piwik_DataTable_Row::DATATABLE_ASSOCIATED] = $typeReferrer; diff --git a/plugins/Referers/Archiver.php b/plugins/Referers/Archiver.php index 1ebab392d6..8dd540a478 100644 --- a/plugins/Referers/Archiver.php +++ b/plugins/Referers/Archiver.php @@ -1,5 +1,5 @@ <?php -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Piwik - Open source web analytics @@ -75,14 +75,14 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver protected function makeRefererTypeNonEmpty(&$row) { if (empty($row['referer_type'])) { - $row['referer_type'] = Piwik_Common::REFERER_TYPE_DIRECT_ENTRY; + $row['referer_type'] = Common::REFERER_TYPE_DIRECT_ENTRY; } } protected function aggregateVisit($row) { switch ($row['referer_type']) { - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: if (empty($row['referer_keyword'])) { $row['referer_keyword'] = Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED; } @@ -94,7 +94,7 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver $keywordsDataArray->sumMetricsVisitsPivot($row['referer_keyword'], $row['referer_name'], $row); break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsVisits($row['referer_name'], $row); $this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsVisitsPivot($row['referer_name'], $row['referer_url'], $row); @@ -104,14 +104,14 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver } break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: if (!empty($row['referer_keyword'])) { $this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsVisitsPivot($row['referer_name'], $row['referer_keyword'], $row); } $this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsVisits($row['referer_name'], $row); break; - case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY: + case Common::REFERER_TYPE_DIRECT_ENTRY: // direct entry are aggregated below in $this->metricsByType array break; @@ -155,7 +155,7 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver { $skipAggregateByType = false; switch ($row['referer_type']) { - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: if (empty($row['referer_keyword'])) { $row['referer_keyword'] = Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED; } @@ -164,18 +164,18 @@ class Piwik_Referers_Archiver extends Piwik_PluginsArchiver $this->getDataArray(self::KEYWORDS_RECORD_NAME)->sumMetricsGoals($row['referer_keyword'], $row); break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $this->getDataArray(self::WEBSITES_RECORD_NAME)->sumMetricsGoals($row['referer_name'], $row); break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: if (!empty($row['referer_keyword'])) { $this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsGoalsPivot($row['referer_name'], $row['referer_keyword'], $row); } $this->getDataArray(self::CAMPAIGNS_RECORD_NAME)->sumMetricsGoals($row['referer_name'], $row); break; - case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY: + case Common::REFERER_TYPE_DIRECT_ENTRY: // Direct entry, no sub dimension break; diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index cc3d253f29..df592528c1 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Referers */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -21,7 +21,7 @@ class Piwik_Referers_Controller extends Piwik_Controller { $view = new Piwik_View('@Referers/index'); - $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Piwik_Common::REFERER_TYPE_DIRECT_ENTRY, array('nb_visits')); + $view->graphEvolutionReferers = $this->getEvolutionGraph(true, Common::REFERER_TYPE_DIRECT_ENTRY, array('nb_visits')); $view->nameGraphEvolutionReferers = 'ReferersgetEvolutionGraph'; // building the referers summary report @@ -51,8 +51,8 @@ class Piwik_Referers_Controller extends Piwik_Controller // calculate evolution for visit metrics & distinct metrics list($lastPeriodDate, $ignore) = Piwik_Period_Range::getLastDate(); if ($lastPeriodDate !== false) { - $date = Piwik_Common::getRequestVar('date'); - $period = Piwik_Common::getRequestVar('period'); + $date = Common::getRequestVar('date'); + $period = Common::getRequestVar('period'); $prettyDate = self::getPrettyDate($date, $period); $prettyLastPeriodDate = self::getPrettyDate($lastPeriodDate, $period); @@ -67,10 +67,10 @@ class Piwik_Referers_Controller extends Piwik_Controller } // sparkline for the historical data of the above values - $view->urlSparklineSearchEngines = $this->getReferrerUrlSparkline(Piwik_Common::REFERER_TYPE_SEARCH_ENGINE); - $view->urlSparklineDirectEntry = $this->getReferrerUrlSparkline(Piwik_Common::REFERER_TYPE_DIRECT_ENTRY); - $view->urlSparklineWebsites = $this->getReferrerUrlSparkline(Piwik_Common::REFERER_TYPE_WEBSITE); - $view->urlSparklineCampaigns = $this->getReferrerUrlSparkline(Piwik_Common::REFERER_TYPE_CAMPAIGN); + $view->urlSparklineSearchEngines = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_SEARCH_ENGINE); + $view->urlSparklineDirectEntry = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_DIRECT_ENTRY); + $view->urlSparklineWebsites = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_WEBSITE); + $view->urlSparklineCampaigns = $this->getReferrerUrlSparkline(Common::REFERER_TYPE_CAMPAIGN); // sparklines for the evolution of the distinct keywords count/websites count/ etc $view->urlSparklineDistinctSearchEngines = $this->getUrlSparkline('getLastDistinctSearchEnginesGraph'); @@ -144,17 +144,17 @@ class Piwik_Referers_Controller extends Piwik_Controller $view->setLimit(10); $view->setColumnsToDisplay(array('label', 'nb_visits')); - $idSubtable = Piwik_Common::getRequestVar('idSubtable', false); + $idSubtable = Common::getRequestVar('idSubtable', false); $labelColumnTitle = Piwik_Translate('Referers_ColumnRefererType'); if ($idSubtable !== false) { switch ($idSubtable) { - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: $labelColumnTitle = Piwik_Translate('Referers_ColumnSearchEngine'); break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $labelColumnTitle = Piwik_Translate('Referers_ColumnWebsite'); break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: $labelColumnTitle = Piwik_Translate('Referers_ColumnCampaign'); break; default: @@ -207,16 +207,16 @@ class Piwik_Referers_Controller extends Piwik_Controller // get singular label for referrer type $indexTranslation = ''; switch ($referrerType) { - case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY: + case Common::REFERER_TYPE_DIRECT_ENTRY: $indexTranslation = 'Referers_DirectEntry'; break; - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: $indexTranslation = 'Referers_ColumnKeyword'; break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $indexTranslation = 'Referers_ColumnWebsite'; break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: $indexTranslation = 'Referers_ColumnCampaign'; break; default: @@ -419,7 +419,7 @@ class Piwik_Referers_Controller extends Piwik_Controller protected function getReferersVisitorsByType($date = false) { if ($date === false) { - $date = Piwik_Common::getRequestVar('date', false); + $date = Common::getRequestVar('date', false); } // we disable the queued filters because here we want to get the visits coming from search engines @@ -429,10 +429,10 @@ class Piwik_Referers_Controller extends Piwik_Controller "Referers.getRefererType", array('disable_queued_filters' => '1', 'date' => $date)); $nameToColumnId = array( - 'visitorsFromSearchEngines' => Piwik_Common::REFERER_TYPE_SEARCH_ENGINE, - 'visitorsFromDirectEntry' => Piwik_Common::REFERER_TYPE_DIRECT_ENTRY, - 'visitorsFromWebsites' => Piwik_Common::REFERER_TYPE_WEBSITE, - 'visitorsFromCampaigns' => Piwik_Common::REFERER_TYPE_CAMPAIGN, + 'visitorsFromSearchEngines' => Common::REFERER_TYPE_SEARCH_ENGINE, + 'visitorsFromDirectEntry' => Common::REFERER_TYPE_DIRECT_ENTRY, + 'visitorsFromWebsites' => Common::REFERER_TYPE_WEBSITE, + 'visitorsFromCampaigns' => Common::REFERER_TYPE_CAMPAIGN, ); $return = array(); foreach ($nameToColumnId as $nameVar => $columnId) { @@ -447,10 +447,10 @@ class Piwik_Referers_Controller extends Piwik_Controller } protected $referrerTypeToLabel = array( - Piwik_Common::REFERER_TYPE_DIRECT_ENTRY => 'Referers_DirectEntry', - Piwik_Common::REFERER_TYPE_SEARCH_ENGINE => 'Referers_SearchEngines', - Piwik_Common::REFERER_TYPE_WEBSITE => 'Referers_Websites', - Piwik_Common::REFERER_TYPE_CAMPAIGN => 'Referers_Campaigns', + Common::REFERER_TYPE_DIRECT_ENTRY => 'Referers_DirectEntry', + Common::REFERER_TYPE_SEARCH_ENGINE => 'Referers_SearchEngines', + Common::REFERER_TYPE_WEBSITE => 'Referers_Websites', + Common::REFERER_TYPE_CAMPAIGN => 'Referers_Campaigns', ); public function getEvolutionGraph($fetch = false, $typeReferer = false, array $columns = array()) @@ -461,14 +461,14 @@ class Piwik_Referers_Controller extends Piwik_Controller // configure displayed columns if (empty($columns)) { - $columns = Piwik_Common::getRequestVar('columns'); + $columns = Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); } $columns = !is_array($columns) ? array($columns) : $columns; $view->setColumnsToDisplay($columns); // configure selectable columns - if (Piwik_Common::getRequestVar('period', false) == 'day') { + if (Common::getRequestVar('period', false) == 'day') { $selectable = array('nb_visits', 'nb_uniq_visitors', 'nb_actions'); } else { $selectable = array('nb_visits', 'nb_actions'); @@ -476,7 +476,7 @@ class Piwik_Referers_Controller extends Piwik_Controller $view->setSelectableColumns($selectable); // configure displayed rows - $visibleRows = Piwik_Common::getRequestVar('rows', false); + $visibleRows = Common::getRequestVar('rows', false); if ($visibleRows !== false) { // this happens when the row picker has been used $visibleRows = Piwik::getArrayFromApiParameter($visibleRows); @@ -486,7 +486,7 @@ class Piwik_Referers_Controller extends Piwik_Controller } else { // use $typeReferer as default if ($typeReferer === false) { - $typeReferer = Piwik_Common::getRequestVar('typeReferer', false); + $typeReferer = Common::getRequestVar('typeReferer', false); } $label = self::getTranslatedReferrerTypeLabel($typeReferer); $total = Piwik_Translate('General_Total'); diff --git a/plugins/Referers/functions.php b/plugins/Referers/functions.php index e22f28cd1a..7ba0b6f776 100644 --- a/plugins/Referers/functions.php +++ b/plugins/Referers/functions.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Referers */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Returns path component from a URL @@ -18,7 +18,7 @@ use Piwik\Core\Piwik_Common; */ function Piwik_getPathFromUrl($url) { - $path = Piwik_Common::getPathAndQueryFromUrl($url); + $path = Common::getPathAndQueryFromUrl($url); if (empty($path)) { return 'index'; } @@ -114,7 +114,7 @@ function Piwik_getSocialsLogoFromUrl($domain) */ function Piwik_getSearchEngineUrlFromName($name) { - $searchEngineNames = Piwik_Common::getSearchEngineNames(); + $searchEngineNames = Common::getSearchEngineNames(); if (isset($searchEngineNames[$name])) { $url = 'http://' . $searchEngineNames[$name]; } else { @@ -182,7 +182,7 @@ function Piwik_getSearchEngineUrlFromUrlAndKeyword($url, $keyword) if ($keyword === Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED) { return 'http://piwik.org/faq/general/#faq_144'; } - $searchEngineUrls = Piwik_Common::getSearchEngineUrls(); + $searchEngineUrls = Common::getSearchEngineUrls(); $keyword = urlencode($keyword); $keyword = str_replace(urlencode('+'), urlencode(' '), $keyword); $path = @$searchEngineUrls[Piwik_getSearchEngineHostPathFromUrl($url)][2]; @@ -217,16 +217,16 @@ function Piwik_getRefererTypeLabel($label) { $indexTranslation = ''; switch ($label) { - case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY: + case Common::REFERER_TYPE_DIRECT_ENTRY: $indexTranslation = 'Referers_DirectEntry'; break; - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: $indexTranslation = 'Referers_SearchEngines'; break; - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: $indexTranslation = 'Referers_Websites'; break; - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: $indexTranslation = 'Referers_Campaigns'; break; default: @@ -246,10 +246,10 @@ function Piwik_getRefererTypeLabel($label) function Piwik_getRefererTypeFromShortName($name) { $map = array( - Piwik_Common::REFERER_TYPE_SEARCH_ENGINE => 'search', - Piwik_Common::REFERER_TYPE_WEBSITE => 'website', - Piwik_Common::REFERER_TYPE_DIRECT_ENTRY => 'direct', - Piwik_Common::REFERER_TYPE_CAMPAIGN => 'campaign', + Common::REFERER_TYPE_SEARCH_ENGINE => 'search', + Common::REFERER_TYPE_WEBSITE => 'website', + Common::REFERER_TYPE_DIRECT_ENTRY => 'direct', + Common::REFERER_TYPE_CAMPAIGN => 'campaign', ); if (isset($map[$name])) { return $map[$name]; diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php index 00abd8337e..9e9945de83 100644 --- a/plugins/SEO/Controller.php +++ b/plugins/SEO/Controller.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_SEO */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_SEO @@ -17,16 +17,16 @@ class Piwik_SEO_Controller extends Piwik_Controller { function getRank() { - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $site = new Piwik_Site($idSite); - $url = urldecode(Piwik_Common::getRequestVar('url', '', 'string')); + $url = urldecode(Common::getRequestVar('url', '', 'string')); if (!empty($url) && strpos($url, 'http://') !== 0 && strpos($url, 'https://') !== 0) { $url = 'http://' . $url; } - if (empty($url) || !Piwik_Common::isLookLikeUrl($url)) { + if (empty($url) || !Common::isLookLikeUrl($url)) { $url = $site->getMainUrl(); } diff --git a/plugins/SEO/MajesticClient.php b/plugins/SEO/MajesticClient.php index 4834a66e8c..2e0b2ee5e6 100644 --- a/plugins/SEO/MajesticClient.php +++ b/plugins/SEO/MajesticClient.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_SEO */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Client for Majestic SEO's HTTP API. @@ -64,7 +64,7 @@ class Piwik_SEO_MajesticClient 'referrer_domains_count' => false ); - $apiResponse = Piwik_Common::json_decode($apiResponse, $assoc = true); + $apiResponse = Common::json_decode($apiResponse, $assoc = true); if (!empty($apiResponse) && !empty($apiResponse['Data']) ) { diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index 2d5aa2b714..7d90bee310 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -9,7 +9,7 @@ * @package Piwik_SegmentEditor */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The SegmentEditor API lets you add, update, delete custom Segments, and list saved segments.a @@ -36,7 +36,7 @@ class Piwik_SegmentEditor_API protected function checkSegmentValue($definition, $idSite) { // unsanitize so we don't record the HTML entitied segment - $definition = Piwik_Common::unsanitizeInputValue($definition); + $definition = Common::unsanitizeInputValue($definition); $definition = str_replace("#", '%23', $definition); // hash delimiter $definition = str_replace("'", '%27', $definition); // not encoded in JS $definition = str_replace("&", '%26', $definition); @@ -134,7 +134,7 @@ class Piwik_SegmentEditor_API $segment = $this->getSegmentOrFail($idSegment); $db = Zend_Registry::get('db'); - $db->delete(Piwik_Common::prefixTable('segment'), 'idsegment = ' . $idSegment); + $db->delete(Common::prefixTable('segment'), 'idsegment = ' . $idSegment); return true; } @@ -171,7 +171,7 @@ class Piwik_SegmentEditor_API ); $db = Zend_Registry::get('db'); - $db->update(Piwik_Common::prefixTable("segment"), + $db->update(Common::prefixTable("segment"), $bind, "idsegment = $idSegment" ); @@ -209,7 +209,7 @@ class Piwik_SegmentEditor_API 'ts_created' => Piwik_Date::now()->getDatetime(), 'deleted' => 0, ); - $db->insert(Piwik_Common::prefixTable("segment"), $bind); + $db->insert(Common::prefixTable("segment"), $bind); return $db->lastInsertId(); } @@ -227,7 +227,7 @@ class Piwik_SegmentEditor_API throw new Exception("idSegment should be numeric."); } $segment = Zend_Registry::get('db')->fetchRow("SELECT * " . - " FROM " . Piwik_Common::prefixTable("segment") . + " FROM " . Common::prefixTable("segment") . " WHERE idsegment = ?", $idSegment); if (empty($segment)) { @@ -278,7 +278,7 @@ class Piwik_SegmentEditor_API // Query $sql = "SELECT * " . - " FROM " . Piwik_Common::prefixTable("segment") . + " FROM " . Common::prefixTable("segment") . " WHERE ($whereIdSite enable_only_idsite = 0) AND (enable_all_users = 1 OR login = ?) AND deleted = 0 diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php index 8fc5b6871a..b48374deb1 100644 --- a/plugins/SegmentEditor/Controller.php +++ b/plugins/SegmentEditor/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_SegmentEditor */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_SegmentEditor @@ -20,7 +20,7 @@ class Piwik_SegmentEditor_Controller extends Piwik_Controller public function getSelector() { $view = new Piwik_View('@SegmentEditor/getSelector'); - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $this->setGeneralVariablesView($view); $segments = Piwik_API_API::getInstance()->getSegmentsMetadata($idSite); @@ -40,12 +40,12 @@ class Piwik_SegmentEditor_Controller extends Piwik_Controller $savedSegments = Piwik_SegmentEditor_API::getInstance()->getAll($idSite); foreach($savedSegments as &$savedSegment) { - $savedSegment['name'] = Piwik_Common::sanitizeInputValue($savedSegment['name']); + $savedSegment['name'] = Common::sanitizeInputValue($savedSegment['name']); } - $view->savedSegmentsJson = Piwik_Common::json_encode($savedSegments); + $view->savedSegmentsJson = Common::json_encode($savedSegments); $view->authorizedToCreateSegments = !Piwik::isUserIsAnonymous(); - $view->segmentTranslations = Piwik_Common::json_encode($this->getTranslations()); + $view->segmentTranslations = Common::json_encode($this->getTranslations()); $out = $view->render(); echo $out; } diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index 4dd4f163ac..41b79dcd1d 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_SegmentEditor */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_SegmentEditor @@ -68,7 +68,7 @@ class Piwik_SegmentEditor extends Piwik_Plugin public function install() { - $queries[] = 'CREATE TABLE `' . Piwik_Common::prefixTable('segment') . '` ( + $queries[] = 'CREATE TABLE `' . Common::prefixTable('segment') . '` ( `idsegment` INT(11) NOT NULL AUTO_INCREMENT, `name` VARCHAR(255) NOT NULL, `definition` TEXT NOT NULL, diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 69a72e92cd..19a8db3d2e 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -9,7 +9,7 @@ * @package Piwik_SitesManager */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes. @@ -68,7 +68,7 @@ class Piwik_SitesManager_API if (empty($piwikUrl)) { $piwikUrl = Piwik_Url::getCurrentUrlWithoutFileName(); } - $piwikUrl = Piwik_Common::sanitizeInputValues($piwikUrl); + $piwikUrl = Common::sanitizeInputValues($piwikUrl); $htmlEncoded = Piwik::getJavascriptCode($idSite, $piwikUrl); $htmlEncoded = str_replace(array('<br>', '<br />', '<br/>'), '', $htmlEncoded); @@ -85,7 +85,7 @@ class Piwik_SitesManager_API $group = trim($group); $sites = Zend_Registry::get('db')->fetchAll("SELECT * - FROM " . Piwik_Common::prefixTable("site") . " + FROM " . Common::prefixTable("site") . " WHERE `group` = ?", $group); return $sites; } @@ -99,7 +99,7 @@ class Piwik_SitesManager_API public function getSitesGroups() { Piwik::checkUserIsSuperUser(); - $groups = Zend_Registry::get('db')->fetchAll("SELECT DISTINCT `group` FROM " . Piwik_Common::prefixTable("site")); + $groups = Zend_Registry::get('db')->fetchAll("SELECT DISTINCT `group` FROM " . Common::prefixTable("site")); $cleanedGroups = array(); foreach ($groups as $group) { $cleanedGroups[] = $group['group']; @@ -119,7 +119,7 @@ class Piwik_SitesManager_API { Piwik::checkUserHasViewAccess($idSite); $site = Zend_Registry::get('db')->fetchRow("SELECT * - FROM " . Piwik_Common::prefixTable("site") . " + FROM " . Common::prefixTable("site") . " WHERE idsite = ?", $idSite); return $site; } @@ -135,7 +135,7 @@ class Piwik_SitesManager_API { $db = Zend_Registry::get('db'); $result = $db->fetchAll("SELECT url - FROM " . Piwik_Common::prefixTable("site_url") . " + FROM " . Common::prefixTable("site_url") . " WHERE idsite = ?", $idSite); $urls = array(); foreach ($result as $url) { @@ -167,7 +167,7 @@ class Piwik_SitesManager_API */ private function getSitesId() { - $result = Piwik_FetchAll("SELECT idsite FROM " . Piwik_Common::prefixTable('site')); + $result = Piwik_FetchAll("SELECT idsite FROM " . Common::prefixTable('site')); $idSites = array(); foreach ($result as $idSite) { $idSites[] = $idSite['idsite']; @@ -183,7 +183,7 @@ class Piwik_SitesManager_API public function getAllSites() { Piwik::checkUserIsSuperUser(); - $sites = Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Piwik_Common::prefixTable("site")); + $sites = Zend_Registry::get('db')->fetchAll("SELECT * FROM " . Common::prefixTable("site")); $return = array(); foreach ($sites as $site) { $return[$site['idsite']] = $site; @@ -226,10 +226,10 @@ class Piwik_SitesManager_API SELECT idsite FROM - " . Piwik_Common::prefixTable('site') . " s + " . Common::prefixTable('site') . " s WHERE EXISTS ( SELECT 1 - FROM " . Piwik_Common::prefixTable('log_visit') . " v + FROM " . Common::prefixTable('log_visit') . " v WHERE v.idsite = s.idsite AND visit_last_action_time > ? AND visit_last_action_time <= ? @@ -351,7 +351,7 @@ class Piwik_SitesManager_API $db = Zend_Registry::get('db'); $sites = $db->fetchAll("SELECT * - FROM " . Piwik_Common::prefixTable("site") . " + FROM " . Common::prefixTable("site") . " WHERE idsite IN (" . implode(", ", $idSites) . ") ORDER BY idsite ASC $limit"); return $sites; @@ -380,22 +380,22 @@ class Piwik_SitesManager_API if (Piwik::isUserIsSuperUser()) { $ids = Zend_Registry::get('db')->fetchAll( 'SELECT idsite - FROM ' . Piwik_Common::prefixTable('site') . ' + FROM ' . Common::prefixTable('site') . ' WHERE (main_url = ? OR main_url = ?) ' . 'UNION SELECT idsite - FROM ' . Piwik_Common::prefixTable('site_url') . ' + FROM ' . Common::prefixTable('site_url') . ' WHERE (url = ? OR url = ?) ', array($url, $urlBis, $url, $urlBis)); } else { $login = Piwik::getCurrentUserLogin(); $ids = Zend_Registry::get('db')->fetchAll( 'SELECT idsite - FROM ' . Piwik_Common::prefixTable('site') . ' + FROM ' . Common::prefixTable('site') . ' WHERE (main_url = ? OR main_url = ?)' . 'AND idsite IN (' . Piwik_Access::getSqlAccessSite('idsite') . ') ' . 'UNION SELECT idsite - FROM ' . Piwik_Common::prefixTable('site_url') . ' + FROM ' . Common::prefixTable('site_url') . ' WHERE (url = ? OR url = ?)' . 'AND idsite IN (' . Piwik_Access::getSqlAccessSite('idsite') . ')', array($url, $urlBis, $login, $url, $urlBis, $login)); @@ -418,8 +418,8 @@ class Piwik_SitesManager_API $timezones = array_unique($timezones); $ids = Zend_Registry::get('db')->fetchAll( 'SELECT idsite - FROM ' . Piwik_Common::prefixTable('site') . ' - WHERE timezone IN (' . Piwik_Common::getSqlStringFieldsArray($timezones) . ') + FROM ' . Common::prefixTable('site') . ' + WHERE timezone IN (' . Common::getSqlStringFieldsArray($timezones) . ') ORDER BY idsite ASC', $timezones); $return = array(); @@ -525,7 +525,7 @@ class Piwik_SitesManager_API $bind['group'] = ""; } - $db->insert(Piwik_Common::prefixTable("site"), $bind); + $db->insert(Common::prefixTable("site"), $bind); $idSite = $db->lastInsertId(); @@ -569,13 +569,13 @@ class Piwik_SitesManager_API $db = Zend_Registry::get('db'); - $db->query("DELETE FROM " . Piwik_Common::prefixTable("site") . " + $db->query("DELETE FROM " . Common::prefixTable("site") . " WHERE idsite = ?", $idSite); - $db->query("DELETE FROM " . Piwik_Common::prefixTable("site_url") . " + $db->query("DELETE FROM " . Common::prefixTable("site_url") . " WHERE idsite = ?", $idSite); - $db->query("DELETE FROM " . Piwik_Common::prefixTable("access") . " + $db->query("DELETE FROM " . Common::prefixTable("access") . " WHERE idsite = ?", $idSite); // we do not delete logs here on purpose (you can run these queries on the log_ tables to delete all data) @@ -1033,7 +1033,7 @@ class Piwik_SitesManager_API $bind['name'] = $siteName; $db = Zend_Registry::get('db'); - $db->update(Piwik_Common::prefixTable("site"), + $db->update(Common::prefixTable("site"), $bind, "idsite = $idSite" ); @@ -1161,7 +1161,7 @@ class Piwik_SitesManager_API public function getUniqueSiteTimezones() { Piwik::checkUserIsSuperUser(); - $results = Piwik_FetchAll("SELECT distinct timezone FROM " . Piwik_Common::prefixTable('site')); + $results = Piwik_FetchAll("SELECT distinct timezone FROM " . Common::prefixTable('site')); $timezones = array(); foreach ($results as $result) { $timezones[] = $result['timezone']; @@ -1178,7 +1178,7 @@ class Piwik_SitesManager_API if (count($urls) != 0) { $db = Zend_Registry::get('db'); foreach ($urls as $url) { - $db->insert(Piwik_Common::prefixTable("site_url"), array( + $db->insert(Common::prefixTable("site_url"), array( 'idsite' => $idSite, 'url' => $url ) @@ -1193,7 +1193,7 @@ class Piwik_SitesManager_API private function deleteSiteAliasUrls($idsite) { $db = Zend_Registry::get('db'); - $db->query("DELETE FROM " . Piwik_Common::prefixTable("site_url") . " + $db->query("DELETE FROM " . Common::prefixTable("site_url") . " WHERE idsite = ?", $idsite); } @@ -1222,7 +1222,7 @@ class Piwik_SitesManager_API */ private function isValidUrl($url) { - return Piwik_Common::isLookLikeUrl($url); + return Common::isLookLikeUrl($url); } /** @@ -1310,7 +1310,7 @@ class Piwik_SitesManager_API $url = 'http://' . $url; } $url = trim($url); - $url = Piwik_Common::sanitizeInputValue($url); + $url = Common::sanitizeInputValue($url); } $urls = array_unique($urls); return $urls; @@ -1339,7 +1339,7 @@ class Piwik_SitesManager_API $where = 'OR s.idsite = ?'; } $sites = $db->fetchAll("SELECT idsite, name, main_url - FROM " . Piwik_Common::prefixTable('site') . " s + FROM " . Common::prefixTable('site') . " s WHERE ( s.name like ? OR s.main_url like ? $where ) diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 3a73b32d60..eca7970aca 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_SitesManager */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -44,10 +44,10 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin $timezones = Piwik_SitesManager_API::getInstance()->getTimezonesList(); $view->timezoneSupported = Piwik::isTimezoneSupportEnabled(); - $view->timezones = Piwik_Common::json_encode($timezones); + $view->timezones = Common::json_encode($timezones); $view->defaultTimezone = Piwik_SitesManager_API::getInstance()->getDefaultTimezone(); - $view->currencies = Piwik_Common::json_encode(Piwik_SitesManager_API::getInstance()->getCurrencyList()); + $view->currencies = Common::json_encode(Piwik_SitesManager_API::getInstance()->getCurrencyList()); $view->defaultCurrency = Piwik_SitesManager_API::getInstance()->getDefaultCurrency(); $view->utcTime = Piwik_Date::now()->getDatetime(); @@ -69,7 +69,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin $view->currentIpAddress = Piwik_IP::getIpFromHeader(); - $view->showAddSite = (boolean)Piwik_Common::getRequestVar('showaddsite', false); + $view->showAddSite = (boolean)Common::getRequestVar('showaddsite', false); $this->setBasicVariablesView($view); echo $view->render(); @@ -80,19 +80,19 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin */ public function setGlobalSettings() { - $response = new Piwik_API_ResponseBuilder(Piwik_Common::getRequestVar('format')); + $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); - $timezone = Piwik_Common::getRequestVar('timezone', false); - $excludedIps = Piwik_Common::getRequestVar('excludedIps', false); - $excludedQueryParameters = Piwik_Common::getRequestVar('excludedQueryParameters', false); - $excludedUserAgents = Piwik_Common::getRequestVar('excludedUserAgents', false); - $currency = Piwik_Common::getRequestVar('currency', false); - $searchKeywordParameters = Piwik_Common::getRequestVar('searchKeywordParameters', $default = ""); - $searchCategoryParameters = Piwik_Common::getRequestVar('searchCategoryParameters', $default = ""); - $enableSiteUserAgentExclude = Piwik_Common::getRequestVar('enableSiteUserAgentExclude', $default = 0); - $keepURLFragments = Piwik_Common::getRequestVar('keepURLFragments', $default = 0); + $timezone = Common::getRequestVar('timezone', false); + $excludedIps = Common::getRequestVar('excludedIps', false); + $excludedQueryParameters = Common::getRequestVar('excludedQueryParameters', false); + $excludedUserAgents = Common::getRequestVar('excludedUserAgents', false); + $currency = Common::getRequestVar('currency', false); + $searchKeywordParameters = Common::getRequestVar('searchKeywordParameters', $default = ""); + $searchCategoryParameters = Common::getRequestVar('searchCategoryParameters', $default = ""); + $enableSiteUserAgentExclude = Common::getRequestVar('enableSiteUserAgentExclude', $default = 0); + $keepURLFragments = Common::getRequestVar('keepURLFragments', $default = 0); $api = Piwik_SitesManager_API::getInstance(); $api->setDefaultTimezone($timezone); @@ -117,7 +117,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin */ function displayJavascriptCode() { - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); Piwik::checkUserHasViewAccess($idSite); $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName()); $view = new Piwik_View('@SitesManager/displayJavascriptCode'); @@ -147,10 +147,10 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin function displayAlternativeTagsHelp() { $view = new Piwik_View('@SitesManager/displayAlternativeTagsHelp'); - $view->idSite = Piwik_Common::getRequestVar('idSite'); - $url = Piwik_Common::getRequestVar('piwikUrl', '', 'string'); + $view->idSite = Common::getRequestVar('idSite'); + $url = Common::getRequestVar('piwikUrl', '', 'string'); if (empty($url) - || !Piwik_Common::isLookLikeUrl($url) + || !Common::isLookLikeUrl($url) ) { $url = $view->piwikUrl; } @@ -161,7 +161,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin function getSitesForAutocompleter() { - $pattern = Piwik_Common::getRequestVar('term'); + $pattern = Common::getRequestVar('term'); $sites = Piwik_SitesManager_API::getInstance()->getPatternMatchSites($pattern); $pattern = str_replace('%', '', $pattern); if (!count($sites)) { @@ -187,6 +187,6 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin } Piwik_DataTable_Renderer_Json::sendHeaderJSON(); - print Piwik_Common::json_encode($results); + print Common::json_encode($results); } } diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 4e4d0ab038..2b35a6e271 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -9,7 +9,7 @@ * @package Piwik_Transitions */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @package Piwik_Transitions @@ -128,7 +128,7 @@ class Piwik_Transitions_API switch ($actionType) { case 'url': $originalActionName = $actionName; - $actionName = Piwik_Common::unsanitizeInputValue($actionName); + $actionName = Common::unsanitizeInputValue($actionName); $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', Piwik_SegmentExpression::MATCH_EQUAL, 'pageUrl'); if ($id < 0) { @@ -343,18 +343,18 @@ class Piwik_Transitions_API $rankingQuery->addLabelColumn('referrer_data'); $selects = array( 'CASE log_visit.referer_type - WHEN ' . Piwik_Common::REFERER_TYPE_DIRECT_ENTRY . ' THEN \'\' - WHEN ' . Piwik_Common::REFERER_TYPE_SEARCH_ENGINE . ' THEN log_visit.referer_keyword - WHEN ' . Piwik_Common::REFERER_TYPE_WEBSITE . ' THEN log_visit.referer_url - WHEN ' . Piwik_Common::REFERER_TYPE_CAMPAIGN . ' THEN CONCAT(log_visit.referer_name, \' \', log_visit.referer_keyword) + WHEN ' . Common::REFERER_TYPE_DIRECT_ENTRY . ' THEN \'\' + WHEN ' . Common::REFERER_TYPE_SEARCH_ENGINE . ' THEN log_visit.referer_keyword + WHEN ' . Common::REFERER_TYPE_WEBSITE . ' THEN log_visit.referer_url + WHEN ' . Common::REFERER_TYPE_CAMPAIGN . ' THEN CONCAT(log_visit.referer_name, \' \', log_visit.referer_keyword) END AS `referrer_data`'); // get one limited group per referrer type $rankingQuery->partitionResultIntoMultipleGroups('referer_type', array( - Piwik_Common::REFERER_TYPE_DIRECT_ENTRY, - Piwik_Common::REFERER_TYPE_SEARCH_ENGINE, - Piwik_Common::REFERER_TYPE_WEBSITE, - Piwik_Common::REFERER_TYPE_CAMPAIGN + Common::REFERER_TYPE_DIRECT_ENTRY, + Common::REFERER_TYPE_SEARCH_ENGINE, + Common::REFERER_TYPE_WEBSITE, + Common::REFERER_TYPE_CAMPAIGN )); $type = $this->getColumnTypeSuffix($actionType); @@ -368,12 +368,12 @@ class Piwik_Transitions_API foreach ($data as $referrerType => &$subData) { $referrerData[$referrerType] = array(Piwik_Metrics::INDEX_NB_VISITS => 0); - if ($referrerType != Piwik_Common::REFERER_TYPE_DIRECT_ENTRY) { + if ($referrerType != Common::REFERER_TYPE_DIRECT_ENTRY) { $referrerSubData[$referrerType] = array(); } foreach ($subData as &$row) { - if ($referrerType == Piwik_Common::REFERER_TYPE_SEARCH_ENGINE && empty($row['referrer_data'])) { + if ($referrerType == Common::REFERER_TYPE_SEARCH_ENGINE && empty($row['referrer_data'])) { $row['referrer_data'] = Piwik_Referers_API::LABEL_KEYWORD_NOT_DEFINED; } @@ -581,8 +581,8 @@ class Piwik_Transitions_API // causes an exception. if (count($report['referrers']) == 0) { $report['referrers'][] = array( - 'label' => $this->getReferrerLabel(Piwik_Common::REFERER_TYPE_DIRECT_ENTRY), - 'shortName' => Piwik_getRefererTypeLabel(Piwik_Common::REFERER_TYPE_DIRECT_ENTRY), + 'label' => $this->getReferrerLabel(Common::REFERER_TYPE_DIRECT_ENTRY), + 'shortName' => Piwik_getRefererTypeLabel(Common::REFERER_TYPE_DIRECT_ENTRY), 'visits' => 0 ); } @@ -591,13 +591,13 @@ class Piwik_Transitions_API private function getReferrerLabel($referrerId) { switch ($referrerId) { - case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY: + case Common::REFERER_TYPE_DIRECT_ENTRY: return Piwik_Transitions_Controller::getTranslation('directEntries'); - case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE: + case Common::REFERER_TYPE_SEARCH_ENGINE: return Piwik_Transitions_Controller::getTranslation('fromSearchEngines'); - case Piwik_Common::REFERER_TYPE_WEBSITE: + case Common::REFERER_TYPE_WEBSITE: return Piwik_Transitions_Controller::getTranslation('fromWebsites'); - case Piwik_Common::REFERER_TYPE_CAMPAIGN: + case Common::REFERER_TYPE_CAMPAIGN: return Piwik_Transitions_Controller::getTranslation('fromCampaigns'); default: return Piwik_Translate('General_Others'); diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php index b6ffad1963..355f771e68 100644 --- a/plugins/UserCountry/Controller.php +++ b/plugins/UserCountry/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -104,7 +104,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $result = Piwik_Http::downloadChunk( $url = Piwik_UserCountry_LocationProvider_GeoIp::GEO_LITE_URL, $outputPath, - $continue = Piwik_Common::getRequestVar('continue', true, 'int') + $continue = Common::getRequestVar('continue', true, 'int') ); // if the file is done @@ -121,9 +121,9 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $result['next_screen'] = $this->getGeoIpUpdaterManageScreen(); } - echo Piwik_Common::json_encode($result); + echo Common::json_encode($result); } catch (Exception $ex) { - echo Piwik_Common::json_encode(array('error' => $ex->getMessage())); + echo Common::json_encode(array('error' => $ex->getMessage())); } } } @@ -190,13 +190,13 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin // the browser so it can download it next $info = $this->getNextMissingDbUrlInfo(); if ($info !== false) { - echo Piwik_Common::json_encode($info); + echo Common::json_encode($info); return; } else { echo 1; } } catch (Exception $ex) { - echo Piwik_Common::json_encode(array('error' => $ex->getMessage())); + echo Common::json_encode(array('error' => $ex->getMessage())); } } } @@ -229,7 +229,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin // based on the database type (provided by the 'key' query param) determine the // url & output file name - $key = Piwik_Common::getRequestVar('key', null, 'string'); + $key = Common::getRequestVar('key', null, 'string'); $url = Piwik_UserCountry_GeoIPAutoUpdater::getConfiguredUrl($key); $ext = Piwik_UserCountry_GeoIPAutoUpdater::getGeoIPUrlExtension($url); @@ -242,7 +242,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin // download part of the file $result = Piwik_Http::downloadChunk( - $url, $outputPath, Piwik_Common::getRequestVar('continue', true, 'int')); + $url, $outputPath, Common::getRequestVar('continue', true, 'int')); // if the file is done if ($result['current_size'] >= $result['expected_file_size']) { @@ -250,14 +250,14 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin $info = $this->getNextMissingDbUrlInfo(); if ($info !== false) { - echo Piwik_Common::json_encode($info); + echo Common::json_encode($info); return; } } - echo Piwik_Common::json_encode($result); + echo Common::json_encode($result); } catch (Exception $ex) { - echo Piwik_Common::json_encode(array('error' => $ex->getMessage())); + echo Common::json_encode(array('error' => $ex->getMessage())); } } } @@ -277,7 +277,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin if ($_SERVER["REQUEST_METHOD"] == "POST") { $this->checkTokenInUrl(); - $providerId = Piwik_Common::getRequestVar('id'); + $providerId = Common::getRequestVar('id'); $provider = Piwik_UserCountry_LocationProvider::setCurrentProvider($providerId); if ($provider === false) { throw new Exception("Invalid provider ID: '$providerId'."); @@ -297,14 +297,14 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin */ public function getLocationUsingProvider() { - $providerId = Piwik_Common::getRequestVar('id'); + $providerId = Common::getRequestVar('id'); $provider = $provider = Piwik_UserCountry_LocationProvider::getProviderById($providerId); if ($provider === false) { throw new Exception("Invalid provider ID: '$providerId'."); } $location = $provider->getLocation(array('ip' => Piwik_IP::getIpFromHeader(), - 'lang' => Piwik_Common::getBrowserLanguage(), + 'lang' => Common::getBrowserLanguage(), 'disable_fallbacks' => true)); $location = Piwik_UserCountry_LocationProvider::prettyFormatLocation( $location, $newline = '<br/>', $includeExtra = true); diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php index 15e207edeb..febeccdee0 100755 --- a/plugins/UserCountry/GeoIPAutoUpdater.php +++ b/plugins/UserCountry/GeoIPAutoUpdater.php @@ -9,7 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Used to automatically update installed GeoIP databases, and manages the updater's @@ -274,10 +274,10 @@ class Piwik_UserCountry_GeoIPAutoUpdater public static function setUpdaterOptionsFromUrl() { self::setUpdaterOptions(array( - 'loc' => Piwik_Common::getRequestVar('loc_db', false, 'string'), - 'isp' => Piwik_Common::getRequestVar('isp_db', false, 'string'), - 'org' => Piwik_Common::getRequestVar('org_db', false, 'string'), - 'period' => Piwik_Common::getRequestVar('period', false, 'string'), + 'loc' => Common::getRequestVar('loc_db', false, 'string'), + 'isp' => Common::getRequestVar('isp_db', false, 'string'), + 'org' => Common::getRequestVar('org_db', false, 'string'), + 'period' => Common::getRequestVar('period', false, 'string'), )); } diff --git a/plugins/UserCountry/LocationProvider.php b/plugins/UserCountry/LocationProvider.php index 983d0f6839..d05fbfba76 100755 --- a/plugins/UserCountry/LocationProvider.php +++ b/plugins/UserCountry/LocationProvider.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_UserCountry */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/UserCountry/LocationProvider/Default.php @@ -217,7 +217,7 @@ abstract class Piwik_UserCountry_LocationProvider if ($workingOrError === true) // if the implementation is configured correctly, get the location { $locInfo = array('ip' => Piwik_IP::getIpFromHeader(), - 'lang' => Piwik_Common::getBrowserLanguage(), + 'lang' => Common::getBrowserLanguage(), 'disable_fallbacks' => true); $location = $provider->getLocation($locInfo); @@ -325,7 +325,7 @@ abstract class Piwik_UserCountry_LocationProvider && !empty($location[self::COUNTRY_CODE_KEY]) ) { $countryCode = strtolower($location[self::COUNTRY_CODE_KEY]); - $location[self::CONTINENT_CODE_KEY] = Piwik_Common::getContinent($countryCode); + $location[self::CONTINENT_CODE_KEY] = Common::getContinent($countryCode); } // fill in continent name if continent code is present diff --git a/plugins/UserCountry/LocationProvider/Default.php b/plugins/UserCountry/LocationProvider/Default.php index 703c1441ec..18ef73ce3e 100755 --- a/plugins/UserCountry/LocationProvider/Default.php +++ b/plugins/UserCountry/LocationProvider/Default.php @@ -9,7 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Core\Config; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The default LocationProvider, this LocationProvider guesses a visitor's country @@ -33,9 +33,9 @@ class Piwik_UserCountry_LocationProvider_Default extends Piwik_UserCountry_Locat $enableLanguageToCountryGuess = Config::getInstance()->Tracker['enable_language_to_country_guess']; if (empty($info['lang'])) { - $info['lang'] = Piwik_Common::getBrowserLanguage(); + $info['lang'] = Common::getBrowserLanguage(); } - $country = Piwik_Common::getCountry($info['lang'], $enableLanguageToCountryGuess, $info['ip']); + $country = Common::getCountry($info['lang'], $enableLanguageToCountryGuess, $info['ip']); $location = array(parent::COUNTRY_CODE_KEY => $country); $this->completeLocationResult($location); diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index c7d559b289..3171a92e7c 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -9,7 +9,7 @@ * @package Piwik_UserCountry */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @see plugins/UserCountry/GeoIPAutoUpdater.php @@ -64,7 +64,7 @@ class Piwik_UserCountry extends Piwik_Plugin { require_once PIWIK_INCLUDE_PATH . "/plugins/UserCountry/LocationProvider.php"; - $id = Piwik_Common::getCurrentLocationProviderId(); + $id = Common::getCurrentLocationProviderId(); $provider = Piwik_UserCountry_LocationProvider::getProviderById($id); if ($provider === false) { $id = Piwik_UserCountry_LocationProvider_Default::ID; @@ -271,7 +271,7 @@ class Piwik_UserCountry extends Piwik_Plugin { $result = array(); $continent = strtolower($continent); - foreach (Piwik_Common::getCountriesList() as $countryCode => $continentCode) { + foreach (Common::getCountriesList() as $countryCode => $continentCode) { if ($continent == $continentCode) { $result[] = $countryCode; } diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index 8e732b399c..6eee81eed6 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_UserCountryMap */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -25,11 +25,11 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller { $this->checkUserCountryPluginEnabled(); - $idSite = Piwik_Common::getRequestVar('idSite', 1, 'int'); + $idSite = Common::getRequestVar('idSite', 1, 'int'); Piwik::checkUserHasViewAccess($idSite); - $period = Piwik_Common::getRequestVar('period'); - $date = Piwik_Common::getRequestVar('date'); + $period = Common::getRequestVar('period'); + $date = Common::getRequestVar('date'); $token_auth = Piwik::getCurrentUserTokenAuth(); $view = new Piwik_View('@UserCountryMap/visitorMap'); @@ -56,7 +56,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $view->defaultMetric = 'nb_visits'; // some translations - $view->localeJSON = Piwik_Common::json_encode(array( + $view->localeJSON = Common::json_encode(array( 'nb_visits' => Piwik_Translate('VisitsSummary_NbVisits'), 'one_visit' => Piwik_Translate('General_OneVisit'), 'no_visit' => Piwik_Translate('UserCountryMap_NoVisit'), @@ -80,7 +80,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $view->metrics = $config['metrics'] = $this->getMetrics($idSite, $period, $date, $token_auth); $config['svgBasePath'] = 'plugins/UserCountryMap/svg/'; $config['mapCssPath'] = 'plugins/UserCountryMap/stylesheets/map.css'; - $view->config = Piwik_Common::json_encode($config); + $view->config = Common::json_encode($config); $view->noData = empty($config['visitsSummary']['nb_visits']); echo $view->render(); @@ -101,7 +101,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller { $this->checkUserCountryPluginEnabled(); - $idSite = Piwik_Common::getRequestVar('idSite', 1, 'int'); + $idSite = Common::getRequestVar('idSite', 1, 'int'); Piwik::checkUserHasViewAccess($idSite); $token_auth = Piwik::getCurrentUserTokenAuth(); @@ -118,7 +118,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $view->hasGoals = !empty($goals) || $site->isEcommerceEnabled() ? 'true' : 'false'; // maximum number of visits to be displayed in the map - $view->maxVisits = Piwik_Common::getRequestVar('format_limit', 100, 'int'); + $view->maxVisits = Common::getRequestVar('format_limit', 100, 'int'); // some translations $view->localeJSON = json_encode(array( @@ -156,7 +156,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $params['segment'] = $segment; } - return Piwik_Common::json_encode($params); + return Common::json_encode($params); } @@ -182,7 +182,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller $metrics = array(); foreach ($metaData[0]['metrics'] as $id => $val) { - if (Piwik_Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') { + if (Common::getRequestVar('period') == 'day' || $id != 'nb_uniq_visitors') { $metrics[] = array($id, $val); } } diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index 817b8b9a5e..95f7f5f107 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -9,7 +9,7 @@ * @package Piwik_UserSettings */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; @@ -120,10 +120,10 @@ class Piwik_UserSettings_Archiver extends Piwik_PluginsArchiver protected function aggregateByLanguage() { $query = $this->getLogAggregator()->queryVisitsByDimension( array("label" => self::LANGUAGE_DIMENSION) ); - $languageCodes = array_keys(Piwik_Common::getLanguagesList()); + $languageCodes = array_keys(Common::getLanguagesList()); $metricsByLanguage = new Piwik_DataArray(); while ($row = $query->fetch()) { - $code = Piwik_Common::extractLanguageCodeFromBrowserLanguage($row['label'], $languageCodes); + $code = Common::extractLanguageCodeFromBrowserLanguage($row['label'], $languageCodes); $metricsByLanguage->sumMetricsVisits($code, $row); } diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index 411cd735a2..0ed1aaf7aa 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -10,7 +10,7 @@ */ use Piwik\Core\Config; use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * The UsersManager API lets you Manage Users and their permissions to access specific websites. @@ -120,12 +120,12 @@ class Piwik_UsersManager_API $bind = array(); if (!empty($userLogins)) { $userLogins = explode(',', $userLogins); - $where = 'WHERE login IN (' . Piwik_Common::getSqlStringFieldsArray($userLogins) . ')'; + $where = 'WHERE login IN (' . Common::getSqlStringFieldsArray($userLogins) . ')'; $bind = $userLogins; } $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT * - FROM " . Piwik_Common::prefixTable("user") . " + FROM " . Common::prefixTable("user") . " $where ORDER BY login ASC", $bind); // Non Super user can only access login & alias @@ -148,7 +148,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT login - FROM " . Piwik_Common::prefixTable("user") . " + FROM " . Common::prefixTable("user") . " ORDER BY login ASC"); $return = array(); foreach ($users as $login) { @@ -180,7 +180,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT login,idsite - FROM " . Piwik_Common::prefixTable("access") + FROM " . Common::prefixTable("access") . " WHERE access = ? ORDER BY login, idsite", $access); $return = array(); @@ -212,7 +212,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT login,access - FROM " . Piwik_Common::prefixTable("access") + FROM " . Common::prefixTable("access") . " WHERE idsite = ?", $idSite); $return = array(); foreach ($users as $user) { @@ -228,7 +228,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT login - FROM " . Piwik_Common::prefixTable("access") + FROM " . Common::prefixTable("access") . " WHERE idsite = ? AND access = ?", array($idSite, $access)); $logins = array(); foreach ($users as $user) { @@ -265,7 +265,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $users = $db->fetchAll("SELECT idsite,access - FROM " . Piwik_Common::prefixTable("access") + FROM " . Common::prefixTable("access") . " WHERE login = ?", $userLogin); $return = array(); foreach ($users as $user) { @@ -292,7 +292,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $user = $db->fetchRow("SELECT * - FROM " . Piwik_Common::prefixTable("user") + FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); return $user; } @@ -311,7 +311,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); $user = $db->fetchRow("SELECT * - FROM " . Piwik_Common::prefixTable("user") + FROM " . Common::prefixTable("user") . " WHERE email = ?", $userEmail); return $user; } @@ -367,7 +367,7 @@ class Piwik_UsersManager_API $this->checkUserIsNotSuperUser($userLogin); $this->checkEmail($email); - $password = Piwik_Common::unsanitizeInputValue($password); + $password = Common::unsanitizeInputValue($password); Piwik_UsersManager::checkPassword($password); $alias = $this->getCleanAlias($alias, $userLogin); @@ -377,7 +377,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); - $db->insert(Piwik_Common::prefixTable("user"), array( + $db->insert(Common::prefixTable("user"), array( 'login' => $userLogin, 'password' => $passwordTransformed, 'alias' => $alias, @@ -413,7 +413,7 @@ class Piwik_UsersManager_API if (empty($password)) { $password = $userInfo['password']; } else { - $password = Piwik_Common::unsanitizeInputValue($password); + $password = Common::unsanitizeInputValue($password); if (!$_isPasswordHashed) { Piwik_UsersManager::checkPassword($password); $password = Piwik_UsersManager::getPasswordHash($password); @@ -437,7 +437,7 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); - $db->update(Piwik_Common::prefixTable("user"), + $db->update(Common::prefixTable("user"), array( 'password' => $password, 'alias' => $alias, @@ -483,7 +483,7 @@ class Piwik_UsersManager_API public function userExists($userLogin) { $count = Piwik_FetchOne("SELECT count(*) - FROM " . Piwik_Common::prefixTable("user") . " + FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); return $count != 0; } @@ -498,7 +498,7 @@ class Piwik_UsersManager_API { Piwik::checkUserIsNotAnonymous(); $count = Piwik_FetchOne("SELECT count(*) - FROM " . Piwik_Common::prefixTable("user") . " + FROM " . Common::prefixTable("user") . " WHERE email = ?", $userEmail); return $count != 0 || Config::getInstance()->superuser['email'] == $userEmail; @@ -558,7 +558,7 @@ class Piwik_UsersManager_API // when no access are specified if ($access != 'noaccess') { foreach ($idSites as $idsite) { - $db->insert(Piwik_Common::prefixTable("access"), + $db->insert(Common::prefixTable("access"), array("idsite" => $idsite, "login" => $userLogin, "access" => $access) @@ -633,7 +633,7 @@ class Piwik_UsersManager_API private function deleteUserOnly($userLogin) { $db = Zend_Registry::get('db'); - $db->query("DELETE FROM " . Piwik_Common::prefixTable("user") . " WHERE login = ?", $userLogin); + $db->query("DELETE FROM " . Common::prefixTable("user") . " WHERE login = ?", $userLogin); Piwik_PostEvent('UsersManager.deleteUser', array($userLogin)); } @@ -653,12 +653,12 @@ class Piwik_UsersManager_API $db = Zend_Registry::get('db'); if (is_null($idSites)) { - $db->query("DELETE FROM " . Piwik_Common::prefixTable("access") . + $db->query("DELETE FROM " . Common::prefixTable("access") . " WHERE login = ?", array($userLogin)); } else { foreach ($idSites as $idsite) { - $db->query("DELETE FROM " . Piwik_Common::prefixTable("access") . + $db->query("DELETE FROM " . Common::prefixTable("access") . " WHERE idsite = ? AND login = ?", array($idsite, $userLogin) ); diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 322a4ebff0..ac3aaab360 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_UsersManager */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -36,7 +36,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin if (count($IdSitesAdmin) > 0) { $defaultWebsiteId = $IdSitesAdmin[0]; - $idSiteSelected = Piwik_Common::getRequestVar('idSite', $defaultWebsiteId); + $idSiteSelected = Common::getRequestVar('idSite', $defaultWebsiteId); } if ($idSiteSelected === 'all') { @@ -224,13 +224,13 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin */ public function recordAnonymousUserSettings() { - $response = new Piwik_API_ResponseBuilder(Piwik_Common::getRequestVar('format')); + $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); try { Piwik::checkUserIsSuperUser(); $this->checkTokenInUrl(); - $anonymousDefaultReport = Piwik_Common::getRequestVar('anonymousDefaultReport'); - $anonymousDefaultDate = Piwik_Common::getRequestVar('anonymousDefaultDate'); + $anonymousDefaultReport = Common::getRequestVar('anonymousDefaultReport'); + $anonymousDefaultDate = Common::getRequestVar('anonymousDefaultDate'); $userLogin = 'anonymous'; Piwik_UsersManager_API::getInstance()->setUserPreference($userLogin, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT, @@ -251,18 +251,18 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin */ public function recordUserSettings() { - $response = new Piwik_API_ResponseBuilder(Piwik_Common::getRequestVar('format')); + $response = new Piwik_API_ResponseBuilder(Common::getRequestVar('format')); try { $this->checkTokenInUrl(); - $alias = Piwik_Common::getRequestVar('alias'); - $email = Piwik_Common::getRequestVar('email'); - $defaultReport = Piwik_Common::getRequestVar('defaultReport'); - $defaultDate = Piwik_Common::getRequestVar('defaultDate'); + $alias = Common::getRequestVar('alias'); + $email = Common::getRequestVar('email'); + $defaultReport = Common::getRequestVar('defaultReport'); + $defaultDate = Common::getRequestVar('defaultDate'); $newPassword = false; - $password = Piwik_Common::getRequestvar('password', false); - $passwordBis = Piwik_Common::getRequestvar('passwordBis', false); + $password = Common::getRequestvar('password', false); + $passwordBis = Common::getRequestvar('passwordBis', false); if (!empty($password) || !empty($passwordBis) ) { @@ -285,7 +285,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin $updatedSuperUser = false; if ($newPassword !== false) { - $newPassword = Piwik_Common::unsanitizeInputValue($newPassword); + $newPassword = Common::unsanitizeInputValue($newPassword); $md5PasswordSuperUser = md5($newPassword); $superUser['password'] = $md5PasswordSuperUser; $updatedSuperUser = true; @@ -301,7 +301,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin } else { Piwik_UsersManager_API::getInstance()->updateUser($userLogin, $newPassword, $email, $alias); if ($newPassword !== false) { - $newPassword = Piwik_Common::unsanitizeInputValue($newPassword); + $newPassword = Common::unsanitizeInputValue($newPassword); } } diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index 0c32d3dcf6..6cac26d504 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_VisitFrequency */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -35,7 +35,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller public function getEvolutionGraph($fetch = false, array $columns = array()) { if (empty($columns)) { - $columns = Piwik_Common::getRequestVar('columns'); + $columns = Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); } @@ -59,7 +59,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller 'avg_time_on_site' ); - $period = Piwik_Common::getRequestVar('period', false); + $period = Common::getRequestVar('period', false); if ($period == 'day') { // add number of unique (returning) visitors for period=day $selectableColumns = array_merge( diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index dee8d07368..990bf350e3 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_VisitTime */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -154,7 +154,7 @@ class Piwik_VisitTime extends Piwik_Plugin ); // add the visits by day of week as a related report, if the current period is not 'day' - if (Piwik_Common::getRequestVar('period', 'day') != 'day') { + if (Common::getRequestVar('period', 'day') != 'day') { $reportViewProperties['VisitTime.getVisitInformationPerLocalTime']['relatedReports'] = array( 'VisitTime.getByDayOfWeek' => Piwik_Translate('VisitTime_VisitsByDayOfWeek') ); @@ -185,9 +185,9 @@ class Piwik_VisitTime extends Piwik_Plugin private static function getDateRangeForFooterMessage() { // get query params - $idSite = Piwik_Common::getRequestVar('idSite'); - $date = Piwik_Common::getRequestVar('date'); - $period = Piwik_Common::getRequestVar('period'); + $idSite = Common::getRequestVar('idSite'); + $date = Common::getRequestVar('date'); + $period = Common::getRequestVar('period'); // create a period instance $oPeriod = Piwik_Period::makePeriodFromQueryParams(Piwik_Site::getTimezoneFor($idSite), $period, $date); diff --git a/plugins/VisitorGenerator/Controller.php b/plugins/VisitorGenerator/Controller.php index cb9a567b52..813984b2ed 100644 --- a/plugins/VisitorGenerator/Controller.php +++ b/plugins/VisitorGenerator/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_VisitorGenerator */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -46,19 +46,19 @@ class Piwik_VisitorGenerator_Controller extends Piwik_Controller_Admin public function generate() { Piwik::checkUserIsSuperUser(); - $nonce = Piwik_Common::getRequestVar('form_nonce', '', 'string', $_POST); - if (Piwik_Common::getRequestVar('choice', 'no') != 'yes' || + $nonce = Common::getRequestVar('form_nonce', '', 'string', $_POST); + if (Common::getRequestVar('choice', 'no') != 'yes' || !Piwik_Nonce::verifyNonce('Piwik_VisitorGenerator.generate', $nonce) ) { Piwik::redirectToModule('VisitorGenerator', 'index'); } Piwik_Nonce::discardNonce('Piwik_VisitorGenerator.generate'); - $daysToCompute = Piwik_Common::getRequestVar('daysToCompute', 1, 'int'); + $daysToCompute = Common::getRequestVar('daysToCompute', 1, 'int'); // get idSite from POST with fallback to GET - $idSite = Piwik_Common::getRequestVar('idSite', false, 'int', $_GET); - $idSite = Piwik_Common::getRequestVar('idSite', $idSite, 'int', $_POST); + $idSite = Common::getRequestVar('idSite', false, 'int', $_GET); + $idSite = Common::getRequestVar('idSite', $idSite, 'int', $_POST); Piwik::setMaxExecutionTime(0); diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 3dc80647a4..02ab257ac5 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_VisitsSummary */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -37,7 +37,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller public function getEvolutionGraph($fetch = false, array $columns = array()) { if (empty($columns)) { - $columns = Piwik_Common::getRequestVar('columns'); + $columns = Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); } @@ -75,7 +75,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller 'avg_time_generation' ); - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $displaySiteSearch = Piwik_Site::isSiteSearchEnabledFor($idSite); if ($displaySiteSearch) { @@ -121,7 +121,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $view->urlSparklineBounceRate = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('bounce_rate'))); $view->urlSparklineAvgGenerationTime = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('avg_time_generation'))); - $idSite = Piwik_Common::getRequestVar('idSite'); + $idSite = Common::getRequestVar('idSite'); $displaySiteSearch = Piwik_Site::isSiteSearchEnabledFor($idSite); if ($displaySiteSearch) { $view->urlSparklineNbSearches = $this->getUrlSparkline('getEvolutionGraph', array('columns' => array('nb_searches', 'nb_keywords'))); @@ -131,7 +131,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $dataTableVisit = self::getVisitsSummary(); $dataRow = $dataTableVisit->getRowsCount() == 0 ? new Piwik_DataTable_Row() : $dataTableVisit->getFirstRow(); - $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Piwik_Common::getRequestVar('period'), Piwik_Common::getRequestVar('date'), Piwik_ViewDataTable::getRawSegmentFromRequest()); + $dataTableActions = Piwik_Actions_API::getInstance()->get($idSite, Common::getRequestVar('period'), Common::getRequestVar('date'), Piwik_ViewDataTable::getRawSegmentFromRequest()); $dataActionsRow = $dataTableActions->getRowsCount() == 0 ? new Piwik_DataTable_Row() : $dataTableActions->getFirstRow(); diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index c8751b6b7b..be6b56a37b 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -8,7 +8,7 @@ * @category Piwik_Plugins * @package Piwik_Widgetize */ -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * @@ -19,7 +19,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller public function index() { $view = new Piwik_View('@Widgetize/index'); - $view->availableWidgets = Piwik_Common::json_encode(Piwik_GetWidgetsList()); + $view->availableWidgets = Common::json_encode(Piwik_GetWidgetsList()); $this->setGeneralVariablesView($view); echo $view->render(); } @@ -45,8 +45,8 @@ class Piwik_Widgetize_Controller extends Piwik_Controller { Piwik_API_Request::reloadAuthUsingTokenAuth(); $this->init(); - $controllerName = Piwik_Common::getRequestVar('moduleToWidgetize'); - $actionName = Piwik_Common::getRequestVar('actionToWidgetize'); + $controllerName = Common::getRequestVar('moduleToWidgetize'); + $actionName = Common::getRequestVar('actionToWidgetize'); $parameters = array($fetch = true); $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters); if ($controllerName == 'Dashboard' && $actionName == 'index') { |