Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/plugins/Live/API.php
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Live/API.php')
-rw-r--r--plugins/Live/API.php57
1 files changed, 31 insertions, 26 deletions
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index a9fd58a6f6..8a739a0b17 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -9,10 +9,15 @@
* @package Piwik_Live
*/
use Piwik\Config;
+use Piwik\DataAccess\LogAggregator;
+use Piwik\DataTable\Filter\ColumnDelete;
+use Piwik\DataTable\Row;
use Piwik\Period;
-use Piwik\Period_Range;
+use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Common;
+use Piwik\Date;
+use Piwik\DataTable;
use Piwik\Segment;
use Piwik\Site;
@@ -82,7 +87,7 @@ class Piwik_Live_API
$bind = array(
$idSite,
- Piwik_Date::factory(time() - $lastMinutes * 60)->toString('Y-m-d H:i:s')
+ Date::factory(time() - $lastMinutes * 60)->toString('Y-m-d H:i:s')
);
$segment = new Segment($segment, $idSite);
@@ -110,7 +115,7 @@ class Piwik_Live_API
* @param int $filter_limit
* @param bool $flat Whether to flatten the visitor details array
*
- * @return Piwik_DataTable
+ * @return DataTable
*/
public function getLastVisitsForVisitor($visitorId, $idSite, $filter_limit = 10, $flat = false)
{
@@ -133,7 +138,7 @@ class Piwik_Live_API
* @param bool|int $minTimestamp (optional) Minimum timestamp to restrict the query to (useful when paginating or refreshing visits)
* @param bool $flat
* @param bool $doNotFetchActions
- * @return Piwik_DataTable
+ * @return DataTable
*/
public function getLastVisitsDetails($idSite, $period, $date, $segment = false, $filter_limit = false, $filter_offset = false, $minTimestamp = false, $flat = false, $doNotFetchActions = false)
{
@@ -162,13 +167,13 @@ class Piwik_Live_API
* @param bool $flat whether to flatten the array (eg. 'customVariables' names/values will appear in the root array rather than in 'customVariables' key
* @param bool $doNotFetchActions If set to true, we only fetch visit info and not actions (much faster)
*
- * @return Piwik_DataTable
+ * @return DataTable
*/
private function getCleanedVisitorsFromDetails($visitorDetails, $idSite, $flat = false, $doNotFetchActions = false)
{
$actionsLimit = (int)Config::getInstance()->General['visitor_log_maximum_actions_per_visit'];
- $table = new Piwik_DataTable();
+ $table = new DataTable();
$site = new Site($idSite);
$timezone = $site->getTimezone();
@@ -181,11 +186,11 @@ class Piwik_Live_API
$visitorDetailsArray['siteCurrency'] = $site->getCurrency();
$visitorDetailsArray['siteCurrencySymbol'] = @$currencies[$site->getCurrency()];
$visitorDetailsArray['serverTimestamp'] = $visitorDetailsArray['lastActionTimestamp'];
- $dateTimeVisit = Piwik_Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone);
+ $dateTimeVisit = Date::factory($visitorDetailsArray['lastActionTimestamp'], $timezone);
$visitorDetailsArray['serverTimePretty'] = $dateTimeVisit->getLocalized('%time%');
$visitorDetailsArray['serverDatePretty'] = $dateTimeVisit->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat'));
- $dateTimeVisitFirstAction = Piwik_Date::factory($visitorDetailsArray['firstActionTimestamp'], $timezone);
+ $dateTimeVisitFirstAction = Date::factory($visitorDetailsArray['firstActionTimestamp'], $timezone);
$visitorDetailsArray['serverDatePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat'));
$visitorDetailsArray['serverTimePrettyFirstAction'] = $dateTimeVisitFirstAction->getLocalized('%time%');
@@ -197,7 +202,7 @@ class Piwik_Live_API
if($flat) {
$visitorDetailsArray = $this->flattenVisitorDetailsArray($visitorDetailsArray);
}
- $table->addRowFromArray(array(Piwik_DataTable_Row::COLUMNS => $visitorDetailsArray));
+ $table->addRowFromArray(array(Row::COLUMNS => $visitorDetailsArray));
}
return $table;
}
@@ -240,7 +245,7 @@ class Piwik_Live_API
if (!empty($action['customVariables'])) {
foreach ($action['customVariables'] as $thisCustomVar) {
foreach ($thisCustomVar as $cvKey => $cvValue) {
- $flattenedKeyName = $cvKey . Piwik_DataTable_Filter_ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $flattenedKeyName = $cvKey . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
$visitorDetailsArray[$flattenedKeyName] = $cvValue;
$count++;
}
@@ -252,7 +257,7 @@ class Piwik_Live_API
$count = 1;
foreach($visitorDetailsArray['actionDetails'] as $action) {
if(!empty($action['goalId'])) {
- $flattenedKeyName = 'visitConvertedGoalId' . Piwik_DataTable_Filter_ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $flattenedKeyName = 'visitConvertedGoalId' . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
$visitorDetailsArray[$flattenedKeyName] = $action['goalId'];
$count++;
}
@@ -262,17 +267,17 @@ class Piwik_Live_API
$count = 1;
foreach($visitorDetailsArray['actionDetails'] as $action) {
if(!empty($action['url'])) {
- $flattenedKeyName = 'pageUrl' . Piwik_DataTable_Filter_ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $flattenedKeyName = 'pageUrl' . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
$visitorDetailsArray[$flattenedKeyName] = $action['url'];
}
if(!empty($action['pageTitle'])) {
- $flattenedKeyName = 'pageTitle' . Piwik_DataTable_Filter_ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $flattenedKeyName = 'pageTitle' . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
$visitorDetailsArray[$flattenedKeyName] = $action['pageTitle'];
}
if(!empty($action['siteSearchKeyword'])) {
- $flattenedKeyName = 'siteSearchKeyword' . Piwik_DataTable_Filter_ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
+ $flattenedKeyName = 'siteSearchKeyword' . ColumnDelete::APPEND_TO_COLUMN_NAME_TO_KEEP . $count;
$visitorDetailsArray[$flattenedKeyName] = $action['siteSearchKeyword'];
}
$count++;
@@ -354,15 +359,15 @@ class Piwik_Live_API
$dateString = $date;
if ($period == 'range') {
- $processedPeriod = new Period_Range('range', $date);
- if ($parsedDate = Period_Range::parseDateRange($date)) {
+ $processedPeriod = new Range('range', $date);
+ if ($parsedDate = Range::parseDateRange($date)) {
$dateString = $parsedDate[2];
}
} else {
- $processedDate = Piwik_Date::factory($date);
+ $processedDate = Date::factory($date);
if ($date == 'today'
|| $date == 'now'
- || $processedDate->toString() == Piwik_Date::factory('now', $currentTimezone)->toString()
+ || $processedDate->toString() == Date::factory('now', $currentTimezone)->toString()
) {
$processedDate = $processedDate->subDay(1);
}
@@ -375,7 +380,7 @@ class Piwik_Live_API
if (!in_array($date, array('now', 'today', 'yesterdaySameTime'))
&& strpos($date, 'last') === false
&& strpos($date, 'previous') === false
- && Piwik_Date::factory($dateString)->toString('Y-m-d') != Piwik_Date::factory('now', $currentTimezone)->toString()
+ && Date::factory($dateString)->toString('Y-m-d') != Date::factory('now', $currentTimezone)->toString()
) {
$dateEnd = $processedPeriod->getDateEnd()->setTimezone($currentTimezone);
$where[] = " log_visit.visit_last_action_time <= ?";
@@ -551,11 +556,11 @@ class Piwik_Live_API
$sql = "SELECT
case idgoal when " . Piwik_Tracker_GoalManager::IDGOAL_CART . " then '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_CART . "' else '" . Piwik::LABEL_ID_GOAL_IS_ECOMMERCE_ORDER . "' end as type,
idorder as orderId,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('revenue') . " as revenue,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
+ " . LogAggregator::getSqlRevenue('revenue') . " as revenue,
+ " . LogAggregator::getSqlRevenue('revenue_subtotal') . " as revenueSubTotal,
+ " . LogAggregator::getSqlRevenue('revenue_tax') . " as revenueTax,
+ " . LogAggregator::getSqlRevenue('revenue_shipping') . " as revenueShipping,
+ " . LogAggregator::getSqlRevenue('revenue_discount') . " as revenueDiscount,
items as items,
log_conversion.server_time as serverTimePretty
@@ -592,7 +597,7 @@ class Piwik_Live_API
log_action_sku.name as itemSKU,
log_action_name.name as itemName,
log_action_category.name as itemCategory,
- " . Piwik_DataAccess_LogAggregator::getSqlRevenue('price') . " as price,
+ " . LogAggregator::getSqlRevenue('price') . " as price,
quantity as quantity
FROM " . Common::prefixTable('log_conversion_item') . "
INNER JOIN " . Common::prefixTable('log_action') . " AS log_action_sku
@@ -652,7 +657,7 @@ class Piwik_Live_API
break;
}
// Convert datetimes to the site timezone
- $dateTimeVisit = Piwik_Date::factory($details['serverTimePretty'], $timezone);
+ $dateTimeVisit = Date::factory($details['serverTimePretty'], $timezone);
$details['serverTimePretty'] = $dateTimeVisit->getLocalized(Piwik_Translate('CoreHome_ShortDateFormat') . ' %time%');
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 13:44:37 +0300