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
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/DataTable.php2
-rw-r--r--core/Piwik.php2
-rw-r--r--core/Tracker/Action.php2
-rw-r--r--core/Tracker/GoalManager.php4
-rw-r--r--plugins/CoreAdminHome/templates/jsTrackingGenerator.css6
-rw-r--r--plugins/CorePluginsAdmin/Controller.php2
-rw-r--r--plugins/Goals/Controller.php4
-rw-r--r--plugins/Live/API.php2
-rw-r--r--plugins/Referers/Controller.php4
-rw-r--r--plugins/SitesManager/API.php4
-rw-r--r--plugins/SitesManager/SitesManager.php2
-rw-r--r--plugins/VisitFrequency/Controller.php4
-rw-r--r--plugins/VisitsSummary/Controller.php4
13 files changed, 18 insertions, 24 deletions
diff --git a/core/DataTable.php b/core/DataTable.php
index c773e4a9f5..a8bd09a288 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -1176,7 +1176,7 @@ class Piwik_DataTable
// if we detect such a "simple" data structure we convert it to a row with the correct columns' names
$thisIsNotThatSimple = false;
- foreach($array as $columnName => $columnValue )
+ foreach(array_values($array) as $columnValue )
{
if(is_array($columnValue) || is_object($columnValue))
{
diff --git a/core/Piwik.php b/core/Piwik.php
index 1ca0ed3a9e..6413b335da 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1619,7 +1619,7 @@ class Piwik
{
$jsCode = file_get_contents( PIWIK_INCLUDE_PATH . "/core/Tracker/javascriptCode.tpl");
$jsCode = htmlentities($jsCode);
- $piwikUrl = preg_match('~^(http|https)://(.*)$~D', $piwikUrl, $matches);
+ preg_match('~^(http|https)://(.*)$~D', $piwikUrl, $matches);
$piwikUrl = @$matches[2];
$jsCode = str_replace('{$idSite}', $idSite, $jsCode);
$jsCode = str_replace('{$piwikUrl}', Piwik_Common::sanitizeInputValue($piwikUrl), $jsCode);
diff --git a/core/Tracker/Action.php b/core/Tracker/Action.php
index f9da32f893..bc521bfb68 100644
--- a/core/Tracker/Action.php
+++ b/core/Tracker/Action.php
@@ -1070,7 +1070,7 @@ class Piwik_Tracker_Action implements Piwik_Tracker_Action_Interface
private static function reencodeParametersArray($queryParameters, $encoding)
{
- foreach($queryParameters as $key => &$value)
+ foreach(array_values($queryParameters) as &$value)
{
if(is_array($value)) {
$value = self::reencodeParametersArray($value, $encoding);
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index 06fcf69374..bbf32d5506 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -660,14 +660,10 @@ class Piwik_Tracker_GoalManager
}
$actionsLookedUp = Piwik_Tracker_Action::loadActionId($actionsToLookupAllItems);
-// var_dump($actionsLookedUp);
-
// Replace SKU, name & category by their ID action
foreach($cleanedItems as $index => &$item)
{
- list($sku, $name, $category, $price, $quantity) = $item;
-
// SKU
$item[0] = $actionsLookedUp[ $index * $columnsInEachRow + 0][2];
// Name
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.css b/plugins/CoreAdminHome/templates/jsTrackingGenerator.css
index 48f2340663..7f242ddcc1 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.css
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.css
@@ -2,11 +2,11 @@
width:100%;
display: block;
color: #111;
- font-family: "courier";
+ font-family: "Courier New", Courier, monospace;
-webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
#javascript-output-section textarea {
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 38c8070da5..5960b4dd41 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -28,7 +28,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
$listPlugins = array_unique($listPlugins);
foreach($listPlugins as $pluginName)
{
- $oPlugin = Piwik_PluginsManager::getInstance()->loadPlugin($pluginName);
+ Piwik_PluginsManager::getInstance()->loadPlugin($pluginName);
$plugins[$pluginName] = array(
'activated' => Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName),
'alwaysActivated' => Piwik_PluginsManager::getInstance()->isPluginAlwaysActivated($pluginName),
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 6cabee1d33..abf59d02d9 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -292,9 +292,9 @@ class Piwik_Goals_Controller extends Piwik_Controller
echo $view->render();
}
- public function getEvolutionGraph( $fetch = false, $columns = false, $idGoal = false)
+ public function getEvolutionGraph( $fetch = false, array $columns = array(), $idGoal = false)
{
- if(empty($columns))
+ if(!count($columns))
{
$columns = Piwik_Common::getRequestVar('columns');
$columns = Piwik::getArrayFromApiParameter($columns);
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 72d3488b91..8f743bce9d 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -402,8 +402,6 @@ class Piwik_Live_API
private function loadLastVisitorDetailsFromDatabase($idSite, $period = false, $date = false, $segment = false, $filter_limit = false, $maxIdVisit = false, $visitorId = false, $minTimestamp = false)
{
-// var_dump($period); var_dump($date); var_dump($filter_limit); var_dump($maxIdVisit); var_dump($visitorId);
-//var_dump($minTimestamp);
if(empty($filter_limit))
{
$filter_limit = 100;
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 64c004af6a..d208fc2584 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -464,14 +464,14 @@ class Piwik_Referers_Controller extends Piwik_Controller
Piwik_Common::REFERER_TYPE_CAMPAIGN => 'Referers_Campaigns',
);
- public function getEvolutionGraph( $fetch = false, $typeReferer = false, $columns = false)
+ public function getEvolutionGraph( $fetch = false, $typeReferer = false, array $columns = array())
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, 'Referers.getRefererType');
$view->addTotalRow();
// configure displayed columns
- if(empty($columns))
+ if(!count($columns))
{
$columns = Piwik_Common::getRequestVar('columns');
$columns = Piwik::getArrayFromApiParameter($columns);
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 17add71358..3b5e5e9ec0 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -609,7 +609,7 @@ class Piwik_SitesManager_API
private function checkValidTimezone($timezone)
{
$timezones = $this->getTimezonesList();
- foreach($timezones as $continent => $cities)
+ foreach(array_values($timezones) as $cities)
{
foreach($cities as $timezoneId => $city)
{
@@ -1061,7 +1061,7 @@ class Piwik_SitesManager_API
$this->deleteSiteAliasUrls($idSite);
if(count($urls) > 1)
{
- $insertedUrls = $this->addSiteAliasUrls($idSite, array_slice($urls,1));
+ $this->addSiteAliasUrls($idSite, array_slice($urls,1));
}
$this->postUpdateWebsite($idSite);
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 939b7116b7..6f596f9f87 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -81,7 +81,7 @@ class Piwik_SitesManager extends Piwik_Plugin
*/
function recordWebsiteDataInCache($notification)
{
- $idSite = $notification->getNotificationInfo();
+ $idSite = (int)$notification->getNotificationInfo();
// add the 'hosts' entry in the website array
$array =& $notification->getNotificationObject();
$array['hosts'] = $this->getTrackerHosts($idSite);
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index ee62cdaded..e51c5f2d59 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -30,9 +30,9 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller
echo $view->render();
}
- public function getEvolutionGraph( $fetch = false, $columns = false)
+ public function getEvolutionGraph( $fetch = false, array $columns = array())
{
- if(empty($columns))
+ if(!count($columns))
{
$columns = Piwik_Common::getRequestVar('columns');
$columns = Piwik::getArrayFromApiParameter($columns);
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 00674df114..65320bb2b4 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -32,9 +32,9 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
echo $view->render();
}
- public function getEvolutionGraph( $fetch = false, $columns = false )
+ public function getEvolutionGraph( $fetch = false, array $columns = array())
{
- if(empty($columns))
+ if(!count($columns))
{
$columns = Piwik_Common::getRequestVar('columns');
$columns = Piwik::getArrayFromApiParameter($columns);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 04:32:44 +0300