Skip to content
Extraits de code Groupes Projets
Valider 680f33e2 rédigé par Matthieu Aubry's avatar Matthieu Aubry
Parcourir les fichiers

Merge pull request #6887 from piwik/move_plugins_reports 

Move plugins reports
parents ab181718 bd05cf2a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 326 ajouts et 111 suppressions
config/global.ini.php
+ 1
− 0
Voir le fichier @ 680f33e2
...@@ -754,6 +754,7 @@ Plugins[] = Contents ...@@ -754,6 +754,7 @@ Plugins[] = Contents
Plugins[] = TestRunner Plugins[] = TestRunner
Plugins[] = BulkTracking Plugins[] = BulkTracking
Plugins[] = Resolution Plugins[] = Resolution
Plugins[] = DevicePlugins
[PluginsInstalled] [PluginsInstalled]
PluginsInstalled[] = Login PluginsInstalled[] = Login
......
core/Updates/2.10.0-b10.php 0 → 100644
+ 49
− 0
Voir le fichier @ 680f33e2
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
namespace Piwik\Updates;
use Piwik\DataAccess\ArchiveTableCreator;
use Piwik\Updater;
use Piwik\Updates;
class Updates_2_10_0_b10 extends Updates
{
static function getSql()
{
$sqls = array();
$archiveTables = ArchiveTableCreator::getTablesArchivesInstalled();
$archiveBlobTables = array_filter($archiveTables, function($name) {
return ArchiveTableCreator::getTypeFromTableName($name) == ArchiveTableCreator::BLOB_TABLE;
});
foreach ($archiveBlobTables as $table) {
$sqls["UPDATE " . $table . " SET name = 'DevicePlugins_plugin' WHERE name = 'UserSettings_plugin'"] = false;
}
return $sqls;
}
static function update()
{
$pluginManager = \Piwik\Plugin\Manager::getInstance();
try {
$pluginManager->activatePlugin('DevicePlugins');
} catch(\Exception $e) {
}
Updater::updateDatabase(__FILE__, self::getSql());
}
}
core/Version.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -20,5 +20,5 @@ final class Version ...@@ -20,5 +20,5 @@ final class Version
* The current Piwik version. * The current Piwik version.
* @var string * @var string
*/ */
const VERSION = '2.10.0-b9'; const VERSION = '2.10.0-b10';
} }
plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml
+ 18
− 18
Voir le fichier @ 680f33e2
...@@ -49,17 +49,6 @@ ...@@ -49,17 +49,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -92,6 +81,17 @@ ...@@ -92,6 +81,17 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
...@@ -147,13 +147,6 @@ ...@@ -147,13 +147,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -186,6 +179,13 @@ ...@@ -186,6 +179,13 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
......
plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml
+ 18
− 18
Voir le fichier @ 680f33e2
...@@ -49,17 +49,6 @@ ...@@ -49,17 +49,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -92,6 +81,17 @@ ...@@ -92,6 +81,17 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
...@@ -147,13 +147,6 @@ ...@@ -147,13 +147,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -186,6 +179,13 @@ ...@@ -186,6 +179,13 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
......
plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml
+ 18
− 18
Voir le fichier @ 680f33e2
...@@ -49,17 +49,6 @@ ...@@ -49,17 +49,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -92,6 +81,17 @@ ...@@ -92,6 +81,17 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
...@@ -147,13 +147,6 @@ ...@@ -147,13 +147,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -186,6 +179,13 @@ ...@@ -186,6 +179,13 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
......
plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml
+ 18
− 18
Voir le fichier @ 680f33e2
...@@ -49,17 +49,6 @@ ...@@ -49,17 +49,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -92,6 +81,17 @@ ...@@ -92,6 +81,17 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
...@@ -147,13 +147,6 @@ ...@@ -147,13 +147,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -186,6 +179,13 @@ ...@@ -186,6 +179,13 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
......
plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml
+ 18
− 18
Voir le fichier @ 680f33e2
...@@ -49,17 +49,6 @@ ...@@ -49,17 +49,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -92,6 +81,17 @@ ...@@ -92,6 +81,17 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
...@@ -147,13 +147,6 @@ ...@@ -147,13 +147,6 @@
<referrerUrl /> <referrerUrl />
<referrerSearchEngineUrl /> <referrerSearchEngineUrl />
<referrerSearchEngineIcon /> <referrerSearchEngineIcon />
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -186,6 +179,13 @@ ...@@ -186,6 +179,13 @@
<customVariables> <customVariables>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>director</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon>
<pluginName>director</pluginName>
</row>
</pluginsIcons>
......
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml
+ 11
− 11
Voir le fichier @ 680f33e2
...@@ -90,17 +90,6 @@ ...@@ -90,17 +90,6 @@
<referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl> <referrerUrl>http://www.google.com/search?q=this+keyword+should+be+ranked</referrerUrl>
<referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl>
<referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
<deviceType>Desktop</deviceType> <deviceType>Desktop</deviceType>
<operatingSystem>Windows XP</operatingSystem> <operatingSystem>Windows XP</operatingSystem>
<operatingSystemCode>WXP</operatingSystemCode> <operatingSystemCode>WXP</operatingSystemCode>
...@@ -165,6 +154,17 @@ ...@@ -165,6 +154,17 @@
</row> </row>
</customVariables> </customVariables>
<resolution>1024x768</resolution> <resolution>1024x768</resolution>
<plugins>flash, java</plugins>
<pluginsIcons>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon>
<pluginName>flash</pluginName>
</row>
<row>
<pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon>
<pluginName>java</pluginName>
</row>
</pluginsIcons>
......
plugins/DevicePlugins/API.php 0 → 100644
+ 90
− 0
Voir le fichier @ 680f33e2
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
namespace Piwik\Plugins\DevicePlugins;
use Piwik\Archive;
use Piwik\DataTable;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\Plugins\DevicesDetection\Archiver AS DDArchiver;
use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
/**
* @see plugins/DevicePlugins/functions.php
*/
require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
/**
* The DevicePlugins API lets you access reports about device plugins such as browser plugins.
*
* @method static \Piwik\Plugins\DevicePlugins\API getInstance()
*/
class API extends \Piwik\Plugin\API
{
protected function getDataTable($name, $idSite, $period, $date, $segment)
{
Piwik::checkUserHasViewAccess($idSite);
$archive = Archive::build($idSite, $period, $date, $segment);
$dataTable = $archive->getDataTable($name);
$dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS));
$dataTable->queueFilter('ReplaceColumnNames');
$dataTable->queueFilter('ReplaceSummaryRowLabel');
return $dataTable;
}
public function getPlugin($idSite, $period, $date, $segment = false)
{
// fetch all archive data required
$dataTable = $this->getDataTable(Archiver::PLUGIN_RECORD_NAME, $idSite, $period, $date, $segment);
$browserTypes = $this->getDataTable(DDArchiver::BROWSER_ENGINE_RECORD_NAME, $idSite, $period, $date, $segment);
$archive = Archive::build($idSite, $period, $date, $segment);
$visitsSums = $archive->getDataTableFromNumeric('nb_visits');
// check whether given tables are arrays
if ($dataTable instanceof DataTable\Map) {
$dataTableMap = $dataTable->getDataTables();
$browserTypesArray = $browserTypes->getDataTables();
$visitSumsArray = $visitsSums->getDataTables();
} else {
$dataTableMap = array($dataTable);
$browserTypesArray = array($browserTypes);
$visitSumsArray = array($visitsSums);
}
// walk through the results and calculate the percentage
foreach ($dataTableMap as $key => $table) {
// Calculate percentage, but ignore IE users because plugin detection doesn't work on IE
$ieVisits = 0;
$ieStats = $browserTypesArray[$key]->getRowFromLabel('Trident');
if ($ieStats !== false) {
$ieVisits = $ieStats->getColumn(Metrics::INDEX_NB_VISITS);
}
// get according visitsSum
$visits = $visitSumsArray[$key];
if ($visits->getRowsCount() == 0) {
$visitsSumTotal = 0;
} else {
$visitsSumTotal = (float) $visits->getFirstRow()->getColumn('nb_visits');
}
$visitsSum = $visitsSumTotal - $ieVisits;
$extraProcessedMetrics = $table->getMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME);
$extraProcessedMetrics[] = new VisitsPercent($visitsSum);
$table->setMetadata(DataTable::EXTRA_PROCESSED_METRICS_METADATA_NAME, $extraProcessedMetrics);
}
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getPluginsLogo'));
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
return $dataTable;
}
}
plugins/DevicePlugins/Archiver.php 0 → 100644
+ 75
− 0
Voir le fichier @ 680f33e2
<?php
/**
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*
*/
namespace Piwik\Plugins\DevicePlugins;
use Piwik\DataAccess\LogAggregator;
use Piwik\DataTable;
use Piwik\Metrics;
require_once PIWIK_INCLUDE_PATH . '/plugins/DevicePlugins/functions.php';
/**
* Archiver for DevicePlugins Plugin
*
* @see PluginsArchiver
*/
class Archiver extends \Piwik\Plugin\Archiver
{
const PLUGIN_RECORD_NAME = 'DevicePlugins_plugin';
/**
* Daily archive of DevicePlugins report. Processes reports for Visits by plugins.
*/
public function aggregateDayReport()
{
$this->aggregateByPlugin();
}
/**
* Period archiving: simply sums up daily archives
*/
public function aggregateMultipleReports()
{
$dataTableRecords = array(
self::PLUGIN_RECORD_NAME,
);
$this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows);
}
protected function aggregateByPlugin()
{
$selects = array(
"sum(case log_visit.config_pdf when 1 then 1 else 0 end) as pdf",
"sum(case log_visit.config_flash when 1 then 1 else 0 end) as flash",
"sum(case log_visit.config_java when 1 then 1 else 0 end) as java",
"sum(case log_visit.config_director when 1 then 1 else 0 end) as director",
"sum(case log_visit.config_quicktime when 1 then 1 else 0 end) as quicktime",
"sum(case log_visit.config_realplayer when 1 then 1 else 0 end) as realplayer",
"sum(case log_visit.config_windowsmedia when 1 then 1 else 0 end) as windowsmedia",
"sum(case log_visit.config_gears when 1 then 1 else 0 end) as gears",
"sum(case log_visit.config_silverlight when 1 then 1 else 0 end) as silverlight",
"sum(case log_visit.config_cookie when 1 then 1 else 0 end) as cookie"
);
$query = $this->getLogAggregator()->queryVisitsByDimension(array(), false, $selects, $metrics = array());
$data = $query->fetch();
$cleanRow = LogAggregator::makeArrayOneColumn($data, Metrics::INDEX_NB_VISITS);
$table = DataTable::makeFromIndexedArray($cleanRow);
$this->insertTable(self::PLUGIN_RECORD_NAME, $table);
}
protected function insertTable($recordName, DataTable $table)
{
$report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS);
return $this->getProcessor()->insertBlobRecord($recordName, $report);
}
}
plugins/UserSettings/Columns/Plugin.php → plugins/DevicePlugins/Columns/Plugin.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Columns\Dimension; use Piwik\Columns\Dimension;
use Piwik\Piwik; use Piwik\Piwik;
......
plugins/UserSettings/Columns/PluginCookie.php → plugins/DevicePlugins/Columns/PluginCookie.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginDirector.php → plugins/DevicePlugins/Columns/PluginDirector.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginFlash.php → plugins/DevicePlugins/Columns/PluginFlash.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginGears.php → plugins/DevicePlugins/Columns/PluginGears.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginJava.php → plugins/DevicePlugins/Columns/PluginJava.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginPdf.php → plugins/DevicePlugins/Columns/PluginPdf.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginQuickTime.php → plugins/DevicePlugins/Columns/PluginQuickTime.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
plugins/UserSettings/Columns/PluginRealPlayer.php → plugins/DevicePlugins/Columns/PluginRealPlayer.php
+ 1
− 1
Voir le fichier @ 680f33e2
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
* *
*/ */
namespace Piwik\Plugins\UserSettings\Columns; namespace Piwik\Plugins\DevicePlugins\Columns;
use Piwik\Common; use Piwik\Common;
use Piwik\Plugin\Dimension\VisitDimension; use Piwik\Plugin\Dimension\VisitDimension;
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter