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:
authorFabian Becker <halfdan@xnorfz.de>2013-03-01 04:19:49 +0400
committerFabian Becker <halfdan@xnorfz.de>2013-03-01 04:19:49 +0400
commit203b2e0417afa7a8c09fa0dfafb58e84f2f9f45c (patch)
treec11daaa47a2fe980570d487c4da0ca44bd3dd206 /plugins
parent39107a5d4f56ad81c60d496889c53647e376c9b5 (diff)
Code cleanup
- Removal of unneeded CSS - Type hinting for some methods - Removal of commented var_dump's
Diffstat (limited to 'plugins')
-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
9 files changed, 15 insertions, 17 deletions
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);