diff options
Diffstat (limited to 'plugins/CustomVariables/API.php')
| -rw-r--r-- | plugins/CustomVariables/API.php | 144 |
1 files changed, 69 insertions, 75 deletions
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php index 1a340e4964..3a47c837c5 100644 --- a/plugins/CustomVariables/API.php +++ b/plugins/CustomVariables/API.php @@ -1,111 +1,105 @@ <?php /** * Piwik - Open source web analytics - * + * * @link http://piwik.org * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * + * * @category Piwik_Plugins * @package Piwik_CustomVariables */ /** * The Custom Variables API lets you access reports for your <a href='http://piwik.org/docs/custom-variables/' target='_blank'>Custom Variables</a> names and values. - * + * * @package Piwik_CustomVariables */ -class Piwik_CustomVariables_API +class Piwik_CustomVariables_API { - static private $instance = null; - - /** - * @return Piwik_CustomVariables_API - */ - static public function getInstance() - { - if (self::$instance == null) - { - self::$instance = new self; - } - return self::$instance; - } + static private $instance = null; /** - * @param int $idSite - * @param string $period + * @return Piwik_CustomVariables_API + */ + static public function getInstance() + { + if (self::$instance == null) { + self::$instance = new self; + } + return self::$instance; + } + + /** + * @param int $idSite + * @param string $period * @param Piwik_Date $date - * @param string $segment - * @param bool $expanded - * @param int $idSubtable + * @param string $segment + * @param bool $expanded + * @param int $idSubtable * * @return Piwik_DataTable|Piwik_DataTable_Array */ - protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable) - { - $dataTable = Piwik_Archive::getDataTableFromArchive('CustomVariables_valueByName', $idSite, $period, $date, $segment, $expanded, $idSubtable); - $dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); - $dataTable->queueFilter('ReplaceColumnNames'); - return $dataTable; - } + protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable) + { + $dataTable = Piwik_Archive::getDataTableFromArchive('CustomVariables_valueByName', $idSite, $period, $date, $segment, $expanded, $idSubtable); + $dataTable->filter('Sort', array(Piwik_Archive::INDEX_NB_VISITS, 'desc', $naturalSort = false, $expanded)); + $dataTable->queueFilter('ReplaceColumnNames'); + return $dataTable; + } /** - * @param int $idSite - * @param string $period - * @param Piwik_Date $date - * @param string|bool $segment - * @param bool $expanded - * @param bool $_leavePiwikCoreVariables + * @param int $idSite + * @param string $period + * @param Piwik_Date $date + * @param string|bool $segment + * @param bool $expanded + * @param bool $_leavePiwikCoreVariables * * @return Piwik_DataTable|Piwik_DataTable_Array */ - public function getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false, $_leavePiwikCoreVariables = false) - { - $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable = null); + public function getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false, $_leavePiwikCoreVariables = false) + { + $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable = null); - if($dataTable instanceof Piwik_DataTable - && !$_leavePiwikCoreVariables) - { - $mapping = array('_pks', '_pkn', '_pkc', '_pkp', Piwik_Tracker_Action::CVAR_KEY_SEARCH_COUNT, Piwik_Tracker_Action::CVAR_KEY_SEARCH_CATEGORY ); - foreach($mapping as $name) - { - $row = $dataTable->getRowFromLabel($name); - if($row) - { - $dataTable->deleteRow($dataTable->getRowIdFromLabel($name)); - } - } - } - return $dataTable; - } + if ($dataTable instanceof Piwik_DataTable + && !$_leavePiwikCoreVariables + ) { + $mapping = array('_pks', '_pkn', '_pkc', '_pkp', Piwik_Tracker_Action::CVAR_KEY_SEARCH_COUNT, Piwik_Tracker_Action::CVAR_KEY_SEARCH_CATEGORY); + foreach ($mapping as $name) { + $row = $dataTable->getRowFromLabel($name); + if ($row) { + $dataTable->deleteRow($dataTable->getRowIdFromLabel($name)); + } + } + } + return $dataTable; + } /** - * @param int $idSite - * @param string $period - * @param Piwik_Date $date - * @param int $idSubtable - * @param string|bool $segment - * @param bool $_leavePriceViewedColumn + * @param int $idSite + * @param string $period + * @param Piwik_Date $date + * @param int $idSubtable + * @param string|bool $segment + * @param bool $_leavePriceViewedColumn * * @return Piwik_DataTable|Piwik_DataTable_Array */ - public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = false) - { - $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded = false, $idSubtable); + public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = false) + { + $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded = false, $idSubtable); - if(!$_leavePriceViewedColumn) - { - $dataTable->deleteColumn('price_viewed'); - } - else - { - // Hack Ecommerce product price tracking to display correctly - $dataTable->renameColumn('price_viewed', 'price'); - } - $dataTable->queueFilter('ColumnCallbackReplace', array('label', create_function('$label', ' + if (!$_leavePriceViewedColumn) { + $dataTable->deleteColumn('price_viewed'); + } else { + // Hack Ecommerce product price tracking to display correctly + $dataTable->renameColumn('price_viewed', 'price'); + } + $dataTable->queueFilter('ColumnCallbackReplace', array('label', create_function('$label', ' return $label == Piwik_CustomVariables::LABEL_CUSTOM_VALUE_NOT_DEFINED - ? "'. Piwik_Translate( 'General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) .'" + ? "' . Piwik_Translate('General_NotDefined', Piwik_Translate('CustomVariables_ColumnCustomVariableValue')) . '" : $label;'))); - return $dataTable; - } + return $dataTable; + } } |