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/Actions | |
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/Actions')
-rw-r--r-- | plugins/Actions/API.php | 4 | ||||
-rw-r--r-- | plugins/Actions/Actions.php | 20 |
2 files changed, 12 insertions, 12 deletions
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( |