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--plugins/Actions/API.php22
-rw-r--r--plugins/DBStats/API.php8
-rw-r--r--plugins/ExampleAPI/API.php16
-rw-r--r--plugins/ExampleUI/API.php10
-rw-r--r--plugins/Goals/API.php54
-rw-r--r--plugins/LanguagesManager/API.php45
-rw-r--r--plugins/Live/API.php61
-rw-r--r--plugins/Provider/API.php2
-rw-r--r--plugins/Referers/API.php64
-rw-r--r--plugins/SitesManager/API.php106
-rw-r--r--plugins/UserCountry/API.php12
-rw-r--r--plugins/UserSettings/API.php30
-rw-r--r--plugins/UsersManager/API.php124
-rw-r--r--plugins/VisitFrequency/API.php28
-rw-r--r--plugins/VisitTime/API.php10
-rw-r--r--plugins/VisitorInterest/API.php10
-rw-r--r--plugins/VisitsSummary/API.php36
17 files changed, 319 insertions, 319 deletions
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index ba9c3d1b35..658d5da13f 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -29,7 +29,7 @@ class Piwik_Actions_API
return self::$instance;
}
- static protected function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable )
+ protected function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -55,31 +55,31 @@ class Piwik_Actions_API
* Backward compatibility. Fallsback to getPageTitles() instead.
* @deprecated Deprecated since Piwik 0.5
*/
- static public function getActions( $idSite, $period, $date, $expanded = false, $idSubtable = false )
+ public function getActions( $idSite, $period, $date, $expanded = false, $idSubtable = false )
{
- return self::getPageTitles( $idSite, $period, $date, $expanded, $idSubtable );
+ return $this->getPageTitles( $idSite, $period, $date, $expanded, $idSubtable );
}
- static public function getPageUrls( $idSite, $period, $date, $expanded = false, $idSubtable = false )
+ public function getPageUrls( $idSite, $period, $date, $expanded = false, $idSubtable = false )
{
- return self::getDataTable('Actions_actions_url', $idSite, $period, $date, $expanded, $idSubtable );
+ return $this->getDataTable('Actions_actions_url', $idSite, $period, $date, $expanded, $idSubtable );
}
- static public function getPageTitles( $idSite, $period, $date, $expanded = false, $idSubtable = false)
+ public function getPageTitles( $idSite, $period, $date, $expanded = false, $idSubtable = false)
{
- $dataTable = self::getDataTable('Actions_actions', $idSite, $period, $date, $expanded, $idSubtable);
+ $dataTable = $this->getDataTable('Actions_actions', $idSite, $period, $date, $expanded, $idSubtable);
return $dataTable;
}
- static public function getDownloads( $idSite, $period, $date, $expanded = false, $idSubtable = false )
+ public function getDownloads( $idSite, $period, $date, $expanded = false, $idSubtable = false )
{
- $dataTable = self::getDataTable('Actions_downloads', $idSite, $period, $date, $expanded, $idSubtable );
+ $dataTable = $this->getDataTable('Actions_downloads', $idSite, $period, $date, $expanded, $idSubtable );
return $dataTable;
}
- static public function getOutlinks( $idSite, $period, $date, $expanded = false, $idSubtable = false )
+ public function getOutlinks( $idSite, $period, $date, $expanded = false, $idSubtable = false )
{
- $dataTable = self::getDataTable('Actions_outlink', $idSite, $period, $date, $expanded, $idSubtable );
+ $dataTable = $this->getDataTable('Actions_outlink', $idSite, $period, $date, $expanded, $idSubtable );
return $dataTable;
}
}
diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
index 9b308a35fa..4821f4e2b9 100644
--- a/plugins/DBStats/API.php
+++ b/plugins/DBStats/API.php
@@ -27,7 +27,7 @@ class Piwik_DBStats_API
return self::$instance;
}
- static public function getDBStatus()
+ public function getDBStatus()
{
Piwik::checkUserIsSuperUser();
$configDb = Zend_Registry::get('config')->database->toArray();
@@ -45,7 +45,7 @@ class Piwik_DBStats_API
return $status;
}
- static public function getTableStatus($table, $field = '')
+ public function getTableStatus($table, $field = '')
{
Piwik::checkUserIsSuperUser();
$db = Zend_Registry::get('db');
@@ -65,7 +65,7 @@ class Piwik_DBStats_API
}
}
- static public function getAllTablesStatus()
+ public function getAllTablesStatus()
{
Piwik::checkUserIsSuperUser();
$db = Zend_Registry::get('db');
@@ -75,7 +75,7 @@ class Piwik_DBStats_API
$table = array();
foreach($tablesPiwik as $tableName)
{
- $t = self::getTableStatus($tableName);
+ $t = $this->getTableStatus($tableName);
$total['Data_length'] += $t['Data_length'];
$total['Index_length'] += $t['Index_length'];
$total['Rows'] += $t['Rows'];
diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
index bcddbb3ba6..ce568e13d5 100644
--- a/plugins/ExampleAPI/API.php
+++ b/plugins/ExampleAPI/API.php
@@ -41,7 +41,7 @@ class Piwik_ExampleAPI_API
* Get Piwik version
* @return string
*/
- static public function getPiwikVersion()
+ public function getPiwikVersion()
{
Piwik::checkUserHasSomeViewAccess();
return Piwik_Version::VERSION;
@@ -51,7 +51,7 @@ class Piwik_ExampleAPI_API
* Get Answer to Life
* @return integer
*/
- static public function getAnswerToLife()
+ public function getAnswerToLife()
{
return 42;
}
@@ -60,7 +60,7 @@ class Piwik_ExampleAPI_API
* Get Golden Ratio
* @return float
*/
- static public function getGoldenRatio()
+ public function getGoldenRatio()
{
//http://en.wikipedia.org/wiki/Golden_ratio
return 1.618033988749894848204586834365;
@@ -70,7 +70,7 @@ class Piwik_ExampleAPI_API
* Get object
* @return Piwik_MagicObject
*/
- static public function getObject()
+ public function getObject()
{
return new Piwik_MagicObject();
}
@@ -79,7 +79,7 @@ class Piwik_ExampleAPI_API
* Get null
* @return null
*/
- static public function getNull()
+ public function getNull()
{
return null;
}
@@ -88,7 +88,7 @@ class Piwik_ExampleAPI_API
* Get array of descriptive text
* @return array
*/
- static public function getDescriptionArray()
+ public function getDescriptionArray()
{
return array('piwik','open source','web analytics','free');
}
@@ -97,7 +97,7 @@ class Piwik_ExampleAPI_API
* Get data table
* @return Piwik_DataTable
*/
- static public function getCompetitionDatatable()
+ public function getCompetitionDatatable()
{
$dataTable = new Piwik_DataTable();
@@ -114,7 +114,7 @@ class Piwik_ExampleAPI_API
* Get more information on the Answer to Life...
* @return string
*/
- static public function getMoreInformationAnswerToLife()
+ public function getMoreInformationAnswerToLife()
{
return "Check http://en.wikipedia.org/wiki/The_Answer_to_Life,_the_Universe,_and_Everything";
}
diff --git a/plugins/ExampleUI/API.php b/plugins/ExampleUI/API.php
index a3cabe9672..8255c1deff 100644
--- a/plugins/ExampleUI/API.php
+++ b/plugins/ExampleUI/API.php
@@ -26,7 +26,7 @@ class Piwik_ExampleUI_API
return self::$instance;
}
- static public function getTemperaturesEvolution($date, $period)
+ public function getTemperaturesEvolution($date, $period)
{
$period = new Piwik_Period_Range($period, 'last30');
$dateStart = $period->getDateStart()->get('Y-m-d'); // eg. "2009-04-01"
@@ -56,7 +56,7 @@ class Piwik_ExampleUI_API
}
// we generate an array of random server temperatures
- static public function getTemperatures()
+ public function getTemperatures()
{
$xAxis = array(
'0h', '1h', '2h', '3h', '4h', '5h', '6h', '7h', '8h', '9h', '10h', '11h',
@@ -75,7 +75,7 @@ class Piwik_ExampleUI_API
return $dataTable;
}
- static public function getPlanetRatios()
+ public function getPlanetRatios()
{
$planetRatios = array(
'Mercury' => 0.382,
@@ -93,9 +93,9 @@ class Piwik_ExampleUI_API
return $dataTable;
}
- static public function getPlanetRatiosWithLogos()
+ public function getPlanetRatiosWithLogos()
{
- $planetsDataTable = self::getPlanetRatios();
+ $planetsDataTable = $this->getPlanetRatios();
foreach($planetsDataTable->getRows() as $row)
{
$row->addMetadata('logo', "plugins/ExampleUI/images/icons-planet/".strtolower($row->getColumn('label').".png"));
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 07e26760c2..27b0818eb1 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -27,7 +27,7 @@ class Piwik_Goals_API
return self::$instance;
}
- static public function getGoals( $idSite )
+ public function getGoals( $idSite )
{
$goals = Piwik_FetchAll("SELECT *
FROM ".Piwik_Common::prefixTable('goal')."
@@ -47,7 +47,7 @@ class Piwik_Goals_API
return $cleanedGoals;
}
- static public function addGoal( $idSite, $name, $matchAttribute, $pattern, $patternType, $caseSensitive, $revenue )
+ public function addGoal( $idSite, $name, $matchAttribute, $pattern, $patternType, $caseSensitive, $revenue )
{
Piwik::checkUserHasAdminAccess($idSite);
// save in db
@@ -59,9 +59,9 @@ class Piwik_Goals_API
{
$idGoal = 1;
}
- self::checkPatternIsValid($patternType, $pattern);
- $name = self::checkName($name);
- $pattern = self::checkPattern($pattern);
+ $this->checkPatternIsValid($patternType, $pattern);
+ $name = $this->checkName($name);
+ $pattern = $this->checkPattern($pattern);
$db->insert(Piwik::prefixTable('goal'),
array(
'idsite' => $idSite,
@@ -78,12 +78,12 @@ class Piwik_Goals_API
return $idGoal;
}
- static public function updateGoal( $idSite, $idGoal, $name, $matchAttribute, $pattern, $patternType, $caseSensitive, $revenue )
+ public function updateGoal( $idSite, $idGoal, $name, $matchAttribute, $pattern, $patternType, $caseSensitive, $revenue )
{
Piwik::checkUserHasAdminAccess($idSite);
- $name = self::checkName($name);
- $pattern = self::checkPattern($pattern);
- self::checkPatternIsValid($patternType, $pattern);
+ $name = $this->checkName($name);
+ $pattern = $this->checkPattern($pattern);
+ $this->checkPatternIsValid($patternType, $pattern);
Zend_Registry::get('db')->update( Piwik::prefixTable('goal'),
array(
'name' => $name,
@@ -98,7 +98,7 @@ class Piwik_Goals_API
Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
}
- static private function checkPatternIsValid($patternType, $pattern)
+ private function checkPatternIsValid($patternType, $pattern)
{
if($patternType == 'exact'
&& substr($pattern, 0, 4) != 'http')
@@ -108,17 +108,17 @@ class Piwik_Goals_API
}
}
- static private function checkName($name)
+ private function checkName($name)
{
return urldecode($name);
}
- static private function checkPattern($pattern)
+ private function checkPattern($pattern)
{
return urldecode($pattern);
}
- static public function deleteGoal( $idSite, $idGoal )
+ public function deleteGoal( $idSite, $idGoal )
{
Piwik::checkUserHasAdminAccess($idSite);
Piwik_Query("UPDATE ".Piwik::prefixTable('goal')."
@@ -130,17 +130,17 @@ class Piwik_Goals_API
Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
}
-// static public function getConversionsReturningVisitors( $idSite, $period, $date, $idGoal = false )
+// public function getConversionsReturningVisitors( $idSite, $period, $date, $idGoal = false )
// {
//
// }
//
-// static public function getConversionsNewVisitors( $idSite, $period, $date, $idGoal = false )
+// public function getConversionsNewVisitors( $idSite, $period, $date, $idGoal = false )
// {
//
// }
- static public function getConversionRateReturningVisitors( $idSite, $period, $date, $idGoal = false )
+ public function getConversionRateReturningVisitors( $idSite, $period, $date, $idGoal = false )
{
// visits converted for returning for all goals = call Frequency API
if($idGoal === false)
@@ -151,7 +151,7 @@ class Piwik_Goals_API
// visits converted for returning = nb conversion for this goal
else
{
- $nbVisitsConvertedReturningVisitors = self::getNumeric($idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal, 1));
+ $nbVisitsConvertedReturningVisitors = $this->getNumeric($idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal, 1));
}
// all returning visits
$request = new Piwik_API_Request("method=VisitFrequency.getVisitsReturning&idSite=$idSite&period=$period&date=$date&format=original");
@@ -162,7 +162,7 @@ class Piwik_Goals_API
return Piwik::getPercentageSafe($nbVisitsConvertedReturningVisitors, $nbVisitsReturning, Piwik_Goals::ROUNDING_PRECISION);
}
- static public function getConversionRateNewVisitors( $idSite, $period, $date, $idGoal = false )
+ public function getConversionRateNewVisitors( $idSite, $period, $date, $idGoal = false )
{
// new visits converted for all goals = nb visits converted - nb visits converted for returning
if($idGoal == false)
@@ -176,7 +176,7 @@ class Piwik_Goals_API
// new visits converted for a given goal = nb conversion for this goal for new visits
else
{
- $convertedNewVisits = self::getNumeric($idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal, 0));
+ $convertedNewVisits = $this->getNumeric($idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal, 0));
}
// all new visits = all visits - all returning visits
$request = new Piwik_API_Request("method=VisitFrequency.getVisitsReturning&idSite=$idSite&period=$period&date=$date&format=original");
@@ -187,7 +187,7 @@ class Piwik_Goals_API
return Piwik::getPercentageSafe($convertedNewVisits, $newVisits, Piwik_Goals::ROUNDING_PRECISION);
}
- static public function get( $idSite, $period, $date, $idGoal = false, $columns = array() )
+ public function get( $idSite, $period, $date, $idGoal = false, $columns = array() )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -211,7 +211,7 @@ class Piwik_Goals_API
return $dataTable;
}
- static protected function getNumeric( $idSite, $period, $date, $toFetch )
+ protected function getNumeric( $idSite, $period, $date, $toFetch )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -219,18 +219,18 @@ class Piwik_Goals_API
return $dataTable;
}
- static public function getConversions( $idSite, $period, $date, $idGoal = false )
+ public function getConversions( $idSite, $period, $date, $idGoal = false )
{
- return self::getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal));
+ return $this->getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('nb_conversions', $idGoal));
}
- static public function getConversionRate( $idSite, $period, $date, $idGoal = false )
+ public function getConversionRate( $idSite, $period, $date, $idGoal = false )
{
- return self::getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('conversion_rate', $idGoal));
+ return $this->getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('conversion_rate', $idGoal));
}
- static public function getRevenue( $idSite, $period, $date, $idGoal = false )
+ public function getRevenue( $idSite, $period, $date, $idGoal = false )
{
- return self::getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('revenue', $idGoal));
+ return $this->getNumeric( $idSite, $period, $date, Piwik_Goals::getRecordName('revenue', $idGoal));
}
}
diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php
index 16199235a8..3bc34d2ff6 100644
--- a/plugins/LanguagesManager/API.php
+++ b/plugins/LanguagesManager/API.php
@@ -27,8 +27,9 @@ class Piwik_LanguagesManager_API
}
return self::$instance;
}
- static protected $availableLanguageNames = null;
- static protected $languageNames = null;
+
+ protected $availableLanguageNames = null;
+ protected $languageNames = null;
/**
* Returns true if specified language is available
@@ -36,10 +37,10 @@ class Piwik_LanguagesManager_API
* @param string $languageCode
* @return bool true if language available; false otherwise
*/
- static public function isLanguageAvailable($languageCode)
+ public function isLanguageAvailable($languageCode)
{
return $languageCode !== false
- && in_array($languageCode, self::getAvailableLanguages());
+ && in_array($languageCode, $this->getAvailableLanguages());
}
/**
@@ -47,11 +48,11 @@ class Piwik_LanguagesManager_API
*
* @return array Arry of strings, each containing its ISO language code
*/
- static public function getAvailableLanguages()
+ public function getAvailableLanguages()
{
- if(!is_null(self::$languageNames))
+ if(!is_null($this->languageNames))
{
- return self::$languageNames;
+ return $this->languageNames;
}
$path = PIWIK_INCLUDE_PATH . "/lang/";
$languages = glob($path . "*.php");
@@ -61,7 +62,7 @@ class Piwik_LanguagesManager_API
{
$languageNames[] = substr($language, $pathLength, -strlen('.php'));
}
- self::$languageNames = $languageNames;
+ $this->languageNames = $languageNames;
return $languageNames;
}
@@ -70,11 +71,11 @@ class Piwik_LanguagesManager_API
*
* @return array Array of arrays
*/
- static public function getAvailableLanguagesInfo()
+ public function getAvailableLanguagesInfo()
{
require PIWIK_INCLUDE_PATH . '/lang/en.php';
$englishTranslation = $translations;
- $filenames = self::getAvailableLanguages();
+ $filenames = $this->getAvailableLanguages();
$languagesInfo = array();
foreach($filenames as $filename)
{
@@ -99,22 +100,22 @@ class Piwik_LanguagesManager_API
*
* @return array Arry of array, each containing its ISO language code and name of the language
*/
- static public function getAvailableLanguageNames()
+ public function getAvailableLanguageNames()
{
- if(!is_null(self::$availableLanguageNames))
+ if(!is_null($this->availableLanguageNames))
{
- return self::$availableLanguageNames;
+ return $this->availableLanguageNames;
}
- $filenames = self::getAvailableLanguages();
+ $filenames = $this->getAvailableLanguages();
$languagesInfo = array();
foreach($filenames as $filename)
{
require PIWIK_INCLUDE_PATH . "/lang/$filename.php";
$languagesInfo[] = array( 'code' => $filename, 'name' => $translations['General_OriginalLanguageName']);
}
- self::$availableLanguageNames = $languagesInfo;
- return self::$availableLanguageNames;
+ $this->availableLanguageNames = $languagesInfo;
+ return $this->availableLanguageNames;
}
/**
@@ -123,9 +124,9 @@ class Piwik_LanguagesManager_API
* @param string $languageCode ISO language code
* @return array|false Array of arrays, each containing 'label' (translation index) and 'value' (translated string); false if language unavailable
*/
- static public function getTranslationsForLanguage($languageCode)
+ public function getTranslationsForLanguage($languageCode)
{
- if(!self::isLanguageAvailable($languageCode))
+ if(!$this->isLanguageAvailable($languageCode))
{
return false;
}
@@ -144,7 +145,7 @@ class Piwik_LanguagesManager_API
* @param string $login
* @param string|false $layout
*/
- static public function getLanguageForUser( $login )
+ public function getLanguageForUser( $login )
{
Piwik::checkUserIsSuperUserOrTheUser($login);
return Piwik_FetchOne('SELECT language FROM '.Piwik::prefixTable('user_language') .
@@ -157,7 +158,7 @@ class Piwik_LanguagesManager_API
* @param string $login
* @param string $languageCode
*/
- static public function setLanguageForUser($login, $languageCode)
+ public function setLanguageForUser($login, $languageCode)
{
Piwik::checkUserIsSuperUserOrTheUser($login);
$paramsBind = array($login, $languageCode, $languageCode);
@@ -173,7 +174,7 @@ class Piwik_LanguagesManager_API
*
* @return string|null
*/
- static public function getLanguageForSession()
+ public function getLanguageForSession()
{
$session = new Zend_Session_Namespace("Piwik_LanguagesManager");
if(isset($session->language))
@@ -188,7 +189,7 @@ class Piwik_LanguagesManager_API
*
* @param string $languageCode ISO language code
*/
- static public function setLanguageForSession($languageCode)
+ public function setLanguageForSession($languageCode)
{
$session = new Zend_Session_Namespace("Piwik_LanguagesManager");
$session->language = $languageCode;
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index 02c8cb9dde..15e2f09889 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -38,15 +38,15 @@ class Piwik_Live_API
/*
* @return Piwik_DataTable
*/
- static public function getLastVisitForVisitor( $visitorId, $idSite = null )
+ public function getLastVisitForVisitor( $visitorId, $idSite = null )
{
- return self::getLastVisitsForVisitor($visitorId, $idSite, 1);
+ return $this->getLastVisitsForVisitor($visitorId, $idSite, 1);
}
/*
* @return Piwik_DataTable
*/
- static public function getLastVisitsForVisitor( $visitorId, $idSite, $limit = 10 )
+ public function getLastVisitsForVisitor( $visitorId, $idSite, $limit = 10 )
{
if(is_null($idSite))
{
@@ -56,15 +56,15 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $visitorDetails = self::loadLastVisitorDetailsFromDatabase($visitorId, $idSite, $limit);
- $table = self::getCleanedVisitorsFromDetails($visitorDetails);
+ $visitorDetails = $this->loadLastVisitorDetailsFromDatabase($visitorId, $idSite, $limit);
+ $table = $this->getCleanedVisitorsFromDetails($visitorDetails);
return $table;
}
/*
* @return Piwik_DataTable
*/
- static public function getLastVisits( $idSite = false, $limit = 10, $minIdVisit = false )
+ public function getLastVisits( $idSite = false, $limit = 10, $minIdVisit = false )
{
// for checking given vars
// echo $idSite.'|'.$limit.'|'.$minIdVisit.'<br>';
@@ -76,8 +76,8 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $visitorDetails = self::loadLastVisitorDetailsFromDatabase(null, $idSite, $limit, $minIdVisit);
- $table = self::getCleanedVisitorsFromDetails($visitorDetails);
+ $visitorDetails = $this->loadLastVisitorDetailsFromDatabase(null, $idSite, $limit, $minIdVisit);
+ $table = $this->getCleanedVisitorsFromDetails($visitorDetails);
// var_dump($table);
return $table;
}
@@ -85,7 +85,7 @@ class Piwik_Live_API
/*
* @return Piwik_DataTable
*/
- static public function getLastVisitsDetails( $idSite = false, $limit = 1000, $minIdVisit = false )
+ public function getLastVisitsDetails( $idSite = false, $limit = 1000, $minIdVisit = false )
{
// for checking given vars
// echo $idSite.'|'.$limit.'|'.$minIdVisit.'<br>';
@@ -97,8 +97,8 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $visitorDetails = self::loadLastVisitorDetailsFromDatabase(null, $idSite, $limit, $minIdVisit);
- $dataTable = self::getCleanedVisitorsFromDetails($visitorDetails);
+ $visitorDetails = $this->loadLastVisitorDetailsFromDatabase(null, $idSite, $limit, $minIdVisit);
+ $dataTable = $this->getCleanedVisitorsFromDetails($visitorDetails);
//echo "hallo";
//
// $dataTable->queueFilter('ColumnCallbackAddMetadata', array('operatingSystem', 'icon', 'Piwik_Live_Visitor::getVisitLength()'));
@@ -114,12 +114,12 @@ class Piwik_Live_API
/*
* @return Piwik_DataTable
*/
- static private function getCleanedVisitorsFromDetails($visitorDetails)
+ private function getCleanedVisitorsFromDetails($visitorDetails)
{
$table = new Piwik_DataTable();
foreach($visitorDetails as $visitorDetail)
{
- self::cleanVisitorDetails($visitorDetail);
+ $this->cleanVisitorDetails($visitorDetail);
$visitor = new Piwik_Live_Visitor($visitorDetail);
$visitorDetailsArray = $visitor->getAllVisitorDetails();
$dateTimeVisit = Piwik_Date::factory($visitorDetailsArray['firstActionTimestamp']);
@@ -146,7 +146,7 @@ class Piwik_Live_API
/*
* @return array
*/
- static private function loadLastVisitorDetailsFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false )
+ private function loadLastVisitorDetailsFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false )
{
// for checking given vars
// echo $visitorId.'|'.$idSite.'|'.$limit.'|'.$minIdVisit.'<br>';
@@ -188,7 +188,7 @@ class Piwik_Live_API
/*
*
*/
- static private function cleanVisitorDetails( &$visitorDetails )
+ private function cleanVisitorDetails( &$visitorDetails )
{
$toUnset = array('config_md5config');
if(!Piwik::isUserIsSuperUser())
@@ -210,7 +210,7 @@ class Piwik_Live_API
/*
* @return Piwik_DataTable
*/
- static public function getUsersInLastXMin( $idSite = false, $limit = 10, $minIdVisit = false, $minutes = 30 )
+ public function getUsersInLastXMin( $idSite = false, $limit = 10, $minIdVisit = false, $minutes = 30 )
{
if(is_null($idSite))
{
@@ -220,16 +220,16 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $visitorDetails = self::loadLastVisitorDetailsInLastXMinFromDatabase(null, $idSite, $limit, $minIdVisit, $minutes);
+ $visitorDetails = $this->loadLastVisitorDetailsInLastXMinFromDatabase(null, $idSite, $limit, $minIdVisit, $minutes);
- $table = self::getCleanedVisitorsFromDetails($visitorDetails);
+ $table = $this->getCleanedVisitorsFromDetails($visitorDetails);
return $table;
}
/*
* @return Piwik_DataTable
*/
- static public function getUsersInLastXDays( $idSite = false, $limit = 10, $minIdVisit = false, $days = 10 )
+ public function getUsersInLastXDays( $idSite = false, $limit = 10, $minIdVisit = false, $days = 10 )
{
if(is_null($idSite))
@@ -240,9 +240,9 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $visitorDetails = self::loadLastVisitorDetailsInLastXDaysFromDatabase(null, $idSite, $limit, $minIdVisit, $days);
+ $visitorDetails = $this->loadLastVisitorDetailsInLastXDaysFromDatabase(null, $idSite, $limit, $minIdVisit, $days);
- $table = self::getCleanedVisitorsFromDetails($visitorDetails);
+ $table = $this->getCleanedVisitorsFromDetails($visitorDetails);
return $table;
}
@@ -250,7 +250,7 @@ class Piwik_Live_API
/*
* @return array
*/
- static public function getPageImpressionsInLastXDays($idSite = false, $limit = 10, $minIdVisit = false, $days = 10){
+ public function getPageImpressionsInLastXDays($idSite = false, $limit = 10, $minIdVisit = false, $days = 10){
// for checking given vars
#echo $idSite.'|'.$limit.'|'.$minIdVisit.'|'.$days.'<br>';
@@ -262,7 +262,7 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $pageDetails = self::loadLastVisitedPagesInLastXDaysFromDatabase(null, $idSite, $limit, $minIdVisit, $days);
+ $pageDetails = $this->loadLastVisitedPagesInLastXDaysFromDatabase(null, $idSite, $limit, $minIdVisit, $days);
$i = -1;
foreach ($pageDetails as $detail) {
@@ -278,7 +278,7 @@ class Piwik_Live_API
/*
* @return array
*/
- static public function getPageImpressionsInLastXMin($idSite = false, $limit = 10, $minIdVisit = false, $minutes = 30){
+ public function getPageImpressionsInLastXMin($idSite = false, $limit = 10, $minIdVisit = false, $minutes = 30){
if(is_null($idSite))
{
@@ -288,7 +288,7 @@ class Piwik_Live_API
{
Piwik::checkUserHasViewAccess($idSite);
}
- $pageDetails = self::loadLastVisitedPagesInLastXMinFromDatabase(null, $idSite, $limit, $minIdVisit, $minutes);
+ $pageDetails = $this->loadLastVisitedPagesInLastXMinFromDatabase(null, $idSite, $limit, $minIdVisit, $minutes);
$i = -1;
foreach ($pageDetails as $detail) {
@@ -307,7 +307,7 @@ class Piwik_Live_API
* TODO should be refactored with function below
* @return array
*/
- static private function loadLastVisitorDetailsInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $minutes = 0 )
+ private function loadLastVisitorDetailsInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $minutes = 0 )
{
$where = $whereBind = array();
@@ -354,7 +354,7 @@ class Piwik_Live_API
* TODO should be refactored with function above
* @return array
*/
- static private function loadLastVisitorDetailsInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $days = 0 )
+ private function loadLastVisitorDetailsInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = 1000, $minIdVisit = false, $days = 0 )
{
$where = $whereBind = array();
@@ -401,7 +401,7 @@ class Piwik_Live_API
* TODO should be refactored with function above
* @return array
*/
- static private function loadLastVisitedPagesInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $minutes = 0 )
+ private function loadLastVisitedPagesInLastXMinFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $minutes = 0 )
{
$where = $whereBind = array();
@@ -448,7 +448,7 @@ class Piwik_Live_API
* TODO should be refactored with function above
* @return array
*/
- static private function loadLastVisitedPagesInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $days = 0 )
+ private function loadLastVisitedPagesInLastXDaysFromDatabase($visitorId = null, $idSite = null, $limit = null, $minIdVisit = false, $days = 0 )
{
$where = $whereBind = array();
@@ -484,6 +484,5 @@ class Piwik_Live_API
$sqlWhere";
return Piwik_FetchAll($sql, $whereBind);
- }
-
+ }
}
diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php
index 72275bbc9a..9f29baba58 100644
--- a/plugins/Provider/API.php
+++ b/plugins/Provider/API.php
@@ -36,7 +36,7 @@ class Piwik_Provider_API
return self::$instance;
}
- static public function getProvider( $idSite, $period, $date )
+ public function getProvider( $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
diff --git a/plugins/Referers/API.php b/plugins/Referers/API.php
index 7e261feff3..817afd32bf 100644
--- a/plugins/Referers/API.php
+++ b/plugins/Referers/API.php
@@ -38,7 +38,7 @@ class Piwik_Referers_API
/**
* @return Piwik_DataTable
*/
- static protected function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable = null)
+ protected function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable = null)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -57,9 +57,9 @@ class Piwik_Referers_API
return $dataTable;
}
- static public function getRefererType($idSite, $period, $date, $typeReferer = false)
+ public function getRefererType($idSite, $period, $date, $typeReferer = false)
{
- $dataTable = self::getDataTable('Referers_type', $idSite, $period, $date, $expanded = false);
+ $dataTable = $this->getDataTable('Referers_type', $idSite, $period, $date, $expanded = false);
if($typeReferer !== false)
{
$dataTable->filter('Pattern', array('label', $typeReferer));
@@ -68,97 +68,97 @@ class Piwik_Referers_API
return $dataTable;
}
- static public function getKeywords($idSite, $period, $date, $expanded = false)
+ public function getKeywords($idSite, $period, $date, $expanded = false)
{
- $dataTable = self::getDataTable('Referers_searchEngineByKeyword', $idSite, $period, $date, $expanded);
+ $dataTable = $this->getDataTable('Referers_searchEngineByKeyword', $idSite, $period, $date, $expanded);
return $dataTable;
}
- static public function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable)
+ public function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable)
{
- $dataTable = self::getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date, $expanded = false, $idSubtable);
+ $dataTable = $this->getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date, $expanded = false, $idSubtable);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'url', 'Piwik_getSearchEngineUrlFromName') );
$dataTable->queueFilter('MetadataCallbackAddMetadata', array( 'url', 'logo', 'Piwik_getSearchEngineLogoFromUrl') );
// get the keyword and create the URL to the search result page
- $keywords = self::getKeywords($idSite, $period, $date);
+ $keywords = $this->getKeywords($idSite, $period, $date);
$keyword = $keywords->getRowFromIdSubDataTable($idSubtable)->getColumn('label');
$dataTable->queueFilter('MetadataCallbackReplace', array( 'url', 'Piwik_getSearchEngineUrlFromUrlAndKeyword', array($keyword)) );
return $dataTable;
}
- static public function getSearchEngines($idSite, $period, $date, $expanded = false)
+ public function getSearchEngines($idSite, $period, $date, $expanded = false)
{
- $dataTable = self::getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded);
+ $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'url', 'Piwik_getSearchEngineUrlFromName') );
$dataTable->queueFilter('MetadataCallbackAddMetadata', array( 'url', 'logo', 'Piwik_getSearchEngineLogoFromUrl') );
return $dataTable;
}
- static public function getKeywordsFromSearchEngineId($idSite, $period, $date, $idSubtable)
+ public function getKeywordsFromSearchEngineId($idSite, $period, $date, $idSubtable)
{
- $dataTable = self::getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded = false, $idSubtable);
+ $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded = false, $idSubtable);
// get the search engine and create the URL to the search result page
- $searchEngines = self::getSearchEngines($idSite, $period, $date);
+ $searchEngines = $this->getSearchEngines($idSite, $period, $date);
$searchEngines->applyQueuedFilters();
$searchEngineUrl = $searchEngines->getRowFromIdSubDataTable($idSubtable)->getMetadata('url');
$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'url', 'Piwik_getSearchEngineUrlFromKeywordAndUrl', array($searchEngineUrl)));
return $dataTable;
}
- static public function getCampaigns($idSite, $period, $date, $expanded = false)
+ public function getCampaigns($idSite, $period, $date, $expanded = false)
{
- $dataTable = self::getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded);
+ $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded);
return $dataTable;
}
- static public function getKeywordsFromCampaignId($idSite, $period, $date, $idSubtable)
+ public function getKeywordsFromCampaignId($idSite, $period, $date, $idSubtable)
{
- $dataTable = self::getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded = false, $idSubtable);
+ $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded = false, $idSubtable);
return $dataTable;
}
- static public function getWebsites($idSite, $period, $date, $expanded = false)
+ public function getWebsites($idSite, $period, $date, $expanded = false)
{
- $dataTable = self::getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded);
+ $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded);
return $dataTable;
}
- static public function getUrlsFromWebsiteId($idSite, $period, $date, $idSubtable)
+ public function getUrlsFromWebsiteId($idSite, $period, $date, $idSubtable)
{
- $dataTable = self::getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded = false, $idSubtable);
+ $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded = false, $idSubtable);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'url', create_function('$label', 'return $label;')) );
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getPathFromUrl'));
return $dataTable;
}
- static public function getNumberOfDistinctSearchEngines($idSite, $period, $date)
+ public function getNumberOfDistinctSearchEngines($idSite, $period, $date)
{
- return self::getNumeric('Referers_distinctSearchEngines', $idSite, $period, $date);
+ return $this->getNumeric('Referers_distinctSearchEngines', $idSite, $period, $date);
}
- static public function getNumberOfDistinctKeywords($idSite, $period, $date)
+ public function getNumberOfDistinctKeywords($idSite, $period, $date)
{
- return self::getNumeric('Referers_distinctKeywords', $idSite, $period, $date);
+ return $this->getNumeric('Referers_distinctKeywords', $idSite, $period, $date);
}
- static public function getNumberOfDistinctCampaigns($idSite, $period, $date)
+ public function getNumberOfDistinctCampaigns($idSite, $period, $date)
{
- return self::getNumeric('Referers_distinctCampaigns', $idSite, $period, $date);
+ return $this->getNumeric('Referers_distinctCampaigns', $idSite, $period, $date);
}
- static public function getNumberOfDistinctWebsites($idSite, $period, $date)
+ public function getNumberOfDistinctWebsites($idSite, $period, $date)
{
- return self::getNumeric('Referers_distinctWebsites', $idSite, $period, $date);
+ return $this->getNumeric('Referers_distinctWebsites', $idSite, $period, $date);
}
- static public function getNumberOfDistinctWebsitesUrls($idSite, $period, $date)
+ public function getNumberOfDistinctWebsitesUrls($idSite, $period, $date)
{
- return self::getNumeric('Referers_distinctWebsitesUrls', $idSite, $period, $date);
+ return $this->getNumeric('Referers_distinctWebsitesUrls', $idSite, $period, $date);
}
- static private function getNumeric($name, $idSite, $period, $date)
+ private function getNumeric($name, $idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 0597395efb..a441eac2bd 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -34,7 +34,7 @@ class Piwik_SitesManager_API
* @param int $idSite
* @return string The Javascript tag ready to be included on the HTML pages
*/
- static public function getJavascriptTag( $idSite, $piwikUrl = '', $actionName = '')
+ public function getJavascriptTag( $idSite, $piwikUrl = '', $actionName = '')
{
Piwik::checkUserHasViewAccess($idSite);
@@ -56,7 +56,7 @@ class Piwik_SitesManager_API
* @exception if the site ID doesn't exist or the user doesn't have access to it
* @return array
*/
- static public function getSiteFromId( $idSite )
+ public function getSiteFromId( $idSite )
{
Piwik::checkUserHasViewAccess( $idSite );
$site = Zend_Registry::get('db')->fetchRow("SELECT * FROM ".Piwik::prefixTable("site")." WHERE idsite = ?", $idSite);
@@ -69,7 +69,7 @@ class Piwik_SitesManager_API
*
* @return array list of alias URLs
*/
- static private function getAliasSiteUrlsFromId( $idsite )
+ private function getAliasSiteUrlsFromId( $idsite )
{
$db = Zend_Registry::get('db');
$result = $db->fetchAll("SELECT url
@@ -89,11 +89,11 @@ class Piwik_SitesManager_API
* @exception if the website ID doesn't exist or the user doesn't have access to it
* @return array list of URLs
*/
- static public function getSiteUrlsFromId( $idSite )
+ public function getSiteUrlsFromId( $idSite )
{
Piwik::checkUserHasViewAccess($idSite);
- $site = self::getSiteFromId($idSite);
- $urls = self::getAliasSiteUrlsFromId($idSite);
+ $site = $this->getSiteFromId($idSite);
+ $urls = $this->getAliasSiteUrlsFromId($idSite);
return array_merge(array($site['main_url']), $urls);
}
@@ -102,7 +102,7 @@ class Piwik_SitesManager_API
*
* @return array the list of websites ID
*/
- static public function getAllSitesId()
+ public function getAllSitesId()
{
Piwik::checkUserIsSuperUser();
$result = Piwik_FetchAll("SELECT idsite FROM ".Piwik::prefixTable('site'));
@@ -121,10 +121,10 @@ class Piwik_SitesManager_API
*
* @return array for each site, an array of information (idsite, name, main_url, etc.)
*/
- static public function getSitesWithAdminAccess()
+ public function getSitesWithAdminAccess()
{
- $sitesId = self::getSitesIdWithAdminAccess();
- return self::getSitesFromIds($sitesId);
+ $sitesId = $this->getSitesIdWithAdminAccess();
+ return $this->getSitesFromIds($sitesId);
}
/**
@@ -133,10 +133,10 @@ class Piwik_SitesManager_API
*
* @return array for each site, an array of information (idsite, name, main_url, etc.)
*/
- static public function getSitesWithViewAccess()
+ public function getSitesWithViewAccess()
{
- $sitesId = self::getSitesIdWithViewAccess();
- return self::getSitesFromIds($sitesId);
+ $sitesId = $this->getSitesIdWithViewAccess();
+ return $this->getSitesFromIds($sitesId);
}
/**
@@ -145,10 +145,10 @@ class Piwik_SitesManager_API
*
* @return array array for each site, an array of information (idsite, name, main_url, etc.)
*/
- static public function getSitesWithAtLeastViewAccess()
+ public function getSitesWithAtLeastViewAccess()
{
- $sitesId = self::getSitesIdWithAtLeastViewAccess();
- return self::getSitesFromIds($sitesId);
+ $sitesId = $this->getSitesIdWithAtLeastViewAccess();
+ return $this->getSitesFromIds($sitesId);
}
/**
@@ -157,7 +157,7 @@ class Piwik_SitesManager_API
*
* @return array list of websites ID
*/
- static public function getSitesIdWithAdminAccess()
+ public function getSitesIdWithAdminAccess()
{
$sitesId = Zend_Registry::get('access')->getSitesIdWithAdminAccess();
return $sitesId;
@@ -169,7 +169,7 @@ class Piwik_SitesManager_API
*
* @return array list of websites ID
*/
- static public function getSitesIdWithViewAccess()
+ public function getSitesIdWithViewAccess()
{
return Zend_Registry::get('access')->getSitesIdWithViewAccess();
}
@@ -180,7 +180,7 @@ class Piwik_SitesManager_API
*
* @return array list of websites ID
*/
- static public function getSitesIdWithAtLeastViewAccess()
+ public function getSitesIdWithAtLeastViewAccess()
{
return Zend_Registry::get('access')->getSitesIdWithAtLeastViewAccess();
}
@@ -191,7 +191,7 @@ class Piwik_SitesManager_API
*
* @param array list of website ID
*/
- static private function getSitesFromIds( $idSites )
+ private function getSitesFromIds( $idSites )
{
if(count($idSites) === 0)
{
@@ -218,14 +218,14 @@ class Piwik_SitesManager_API
*
* @return int the website ID created
*/
- static public function addSite( $siteName, $urls )
+ public function addSite( $siteName, $urls )
{
Piwik::checkUserIsSuperUser();
- self::checkName($siteName);
- $urls = self::cleanParameterUrls($urls);
- self::checkUrls($urls);
- self::checkAtLeastOneUrl($urls);
+ $this->checkName($siteName);
+ $urls = $this->cleanParameterUrls($urls);
+ $this->checkUrls($urls);
+ $this->checkAtLeastOneUrl($urls);
$db = Zend_Registry::get('db');
@@ -240,16 +240,16 @@ class Piwik_SitesManager_API
$idSite = $db->lastInsertId();
- self::insertSiteUrls($idSite, $urls);
+ $this->insertSiteUrls($idSite, $urls);
// we reload the access list which doesn't yet take in consideration this new website
Zend_Registry::get('access')->reloadAccess();
- self::postUpdateWebsite($idSite);
+ $this->postUpdateWebsite($idSite);
return (int)$idSite;
}
- static private function postUpdateWebsite($idSite)
+ private function postUpdateWebsite($idSite)
{
Piwik_Common::regenerateCacheWebsiteAttributes($idSite);
}
@@ -261,7 +261,7 @@ class Piwik_SitesManager_API
*
* @param int $idSite
*/
- static public function deleteSite( $idSite )
+ public function deleteSite( $idSite )
{
Piwik::checkUserIsSuperUser();
@@ -296,7 +296,7 @@ class Piwik_SitesManager_API
*
* @exception if the parameter is not an array or if array empty
*/
- static private function checkAtLeastOneUrl( $urls )
+ private function checkAtLeastOneUrl( $urls )
{
if(!is_array($urls)
|| count($urls) == 0)
@@ -313,17 +313,17 @@ class Piwik_SitesManager_API
*
* @return int the number of inserted URLs
*/
- static public function addSiteAliasUrls( $idSite, $urls)
+ public function addSiteAliasUrls( $idSite, $urls)
{
Piwik::checkUserHasAdminAccess( $idSite );
- $urls = self::cleanParameterUrls($urls);
- self::checkUrls($urls);
+ $urls = $this->cleanParameterUrls($urls);
+ $this->checkUrls($urls);
- $urlsInit = self::getSiteUrlsFromId($idSite);
+ $urlsInit = $this->getSiteUrlsFromId($idSite);
$toInsert = array_diff($urls, $urlsInit);
- self::insertSiteUrls($idSite, $toInsert);
- self::postUpdateWebsite($idSite);
+ $this->insertSiteUrls($idSite, $toInsert);
+ $this->postUpdateWebsite($idSite);
return count($toInsert);
}
@@ -341,20 +341,20 @@ class Piwik_SitesManager_API
*
* @return bool true on success
*/
- static public function updateSite( $idSite, $siteName, $urls = null)
+ public function updateSite( $idSite, $siteName, $urls = null)
{
Piwik::checkUserHasAdminAccess($idSite);
- self::checkName($siteName);
+ $this->checkName($siteName);
// SQL fields to update
$bind = array();
if(!is_null($urls))
{
- $urls = self::cleanParameterUrls($urls);
- self::checkUrls($urls);
- self::checkAtLeastOneUrl($urls);
+ $urls = $this->cleanParameterUrls($urls);
+ $this->checkUrls($urls);
+ $this->checkAtLeastOneUrl($urls);
$url = $urls[0];
$bind['main_url'] = $url;
@@ -369,19 +369,19 @@ class Piwik_SitesManager_API
);
// we now update the main + alias URLs
- self::deleteSiteAliasUrls($idSite);
+ $this->deleteSiteAliasUrls($idSite);
if(count($urls) > 1)
{
- $insertedUrls = self::addSiteAliasUrls($idSite, array_slice($urls,1));
+ $insertedUrls = $this->addSiteAliasUrls($idSite, array_slice($urls,1));
}
- self::postUpdateWebsite($idSite);
+ $this->postUpdateWebsite($idSite);
}
/**
* Insert the list of alias URLs for the website.
* The URLs must not exist already for this website!
*/
- static private function insertSiteUrls($idSite, $urls)
+ private function insertSiteUrls($idSite, $urls)
{
if(count($urls) != 0)
{
@@ -400,7 +400,7 @@ class Piwik_SitesManager_API
/**
* Delete all the alias URLs for the given idSite.
*/
- static private function deleteSiteAliasUrls($idsite)
+ private function deleteSiteAliasUrls($idsite)
{
$db = Zend_Registry::get('db');
$db->query("DELETE FROM ".Piwik::prefixTable("site_url") ."
@@ -412,7 +412,7 @@ class Piwik_SitesManager_API
*
* @return string the URL without the trailing slash
*/
- static private function removeTrailingSlash($url)
+ private function removeTrailingSlash($url)
{
// if there is a final slash, we take the URL without this slash (expected URL format)
if(strlen($url) > 5
@@ -428,7 +428,7 @@ class Piwik_SitesManager_API
*
* @return bool
*/
- static private function isValidUrl( $url )
+ private function isValidUrl( $url )
{
return Piwik_Common::isLookLikeUrl($url);
}
@@ -438,7 +438,7 @@ class Piwik_SitesManager_API
*
* @exception if the website name is empty
*/
- static private function checkName($siteName)
+ private function checkName($siteName)
{
if(empty($siteName))
{
@@ -452,11 +452,11 @@ class Piwik_SitesManager_API
* @exception if any of the urls is not valid
* @param array
*/
- static private function checkUrls($urls)
+ private function checkUrls($urls)
{
foreach($urls as $url)
{
- if(!self::isValidUrl($url))
+ if(!$this->isValidUrl($url))
{
throw new Exception(sprintf(Piwik_TranslateException("SitesManager_ExceptionInvalidUrl"),$url));
}
@@ -471,7 +471,7 @@ class Piwik_SitesManager_API
* @param string|array urls
* @return array the array of cleaned URLs
*/
- static private function cleanParameterUrls( $urls )
+ private function cleanParameterUrls( $urls )
{
if(!is_array($urls))
{
@@ -479,7 +479,7 @@ class Piwik_SitesManager_API
}
foreach($urls as &$url)
{
- $url = self::removeTrailingSlash($url);
+ $url = $this->removeTrailingSlash($url);
}
$urls = array_unique($urls);
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index 12e075bf8c..3b83786e9a 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -37,9 +37,9 @@ class Piwik_UserCountry_API
return self::$instance;
}
- static public function getCountry( $idSite, $period, $date )
+ public function getCountry( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserCountry_country', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserCountry_country', $idSite, $period, $date);
// apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label)
$dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;')));
$dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getFlagFromCode'));
@@ -49,15 +49,15 @@ class Piwik_UserCountry_API
return $dataTable;
}
- static public function getContinent( $idSite, $period, $date )
+ public function getContinent( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserCountry_continent', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserCountry_continent', $idSite, $period, $date);
$dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_ContinentTranslate'));
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;')));
return $dataTable;
}
- static protected function getDataTable($name, $idSite, $period, $date)
+ protected function getDataTable($name, $idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -67,7 +67,7 @@ class Piwik_UserCountry_API
return $dataTable;
}
- static public function getNumberOfDistinctCountries($idSite, $period, $date)
+ public function getNumberOfDistinctCountries($idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index e87de7efe6..6d5e9c81d8 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -35,7 +35,7 @@ class Piwik_UserSettings_API
return self::$instance;
}
- static protected function getDataTable($name, $idSite, $period, $date)
+ protected function getDataTable($name, $idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -45,56 +45,56 @@ class Piwik_UserSettings_API
return $dataTable;
}
- static public function getResolution( $idSite, $period, $date )
+ public function getResolution( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_resolution', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_resolution', $idSite, $period, $date);
return $dataTable;
}
- static public function getConfiguration( $idSite, $period, $date )
+ public function getConfiguration( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_configuration', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_configuration', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getConfigurationLabel'));
return $dataTable;
}
- static public function getOS( $idSite, $period, $date )
+ public function getOS( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_os', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_os', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getOSLogo'));
$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'shortLabel', 'Piwik_getOSShortLabel') );
$dataTable->queueFilter('ColumnCallbackReplace', array( 'label', 'Piwik_getOSLabel') );
return $dataTable;
}
- static public function getBrowser( $idSite, $period, $date )
+ public function getBrowser( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_browser', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_browser', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getBrowsersLogo'));
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'shortLabel', 'Piwik_getBrowserShortLabel'));
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserLabel'));
return $dataTable;
}
- static public function getBrowserType( $idSite, $period, $date )
+ public function getBrowserType( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_browserType', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_browserType', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'shortLabel', 'ucfirst'));
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserTypeLabel'));
return $dataTable;
}
- static public function getWideScreen( $idSite, $period, $date )
+ public function getWideScreen( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_wideScreen', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_wideScreen', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getScreensLogo'));
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
return $dataTable;
}
- static public function getPlugin( $idSite, $period, $date )
+ public function getPlugin( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('UserSettings_plugin', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('UserSettings_plugin', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getPluginsLogo'));
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
return $dataTable;
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index fda72c78c3..4c226b65e3 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -32,7 +32,7 @@ class Piwik_UsersManager_API
*
* @return array the list of all the users
*/
- static public function getUsers()
+ public function getUsers()
{
Piwik::checkUserIsSuperUser();
@@ -46,7 +46,7 @@ class Piwik_UsersManager_API
*
* @return array the list of all the users login
*/
- static public function getUsersLogin()
+ public function getUsersLogin()
{
Piwik::checkUserHasSomeAdminAccess();
@@ -75,11 +75,11 @@ class Piwik_UsersManager_API
* )
*
*/
- static public function getUsersSitesFromAccess( $access )
+ public function getUsersSitesFromAccess( $access )
{
Piwik::checkUserIsSuperUser();
- self::checkAccessType($access);
+ $this->checkAccessType($access);
$db = Zend_Registry::get('db');
$users = $db->fetchAll("SELECT login,idsite
@@ -109,7 +109,7 @@ class Piwik_UsersManager_API
* ...
* )
*/
- static public function getUsersAccessFromSite( $idSite )
+ public function getUsersAccessFromSite( $idSite )
{
Piwik::checkUserHasAdminAccess( $idSite );
@@ -142,11 +142,11 @@ class Piwik_UsersManager_API
* ...
* )
*/
- static public function getSitesAccessFromUser( $userLogin )
+ public function getSitesAccessFromUser( $userLogin )
{
Piwik::checkUserIsSuperUser();
- self::checkUserExists($userLogin);
- self::checkUserIsNotSuperUser($userLogin);
+ $this->checkUserExists($userLogin);
+ $this->checkUserIsNotSuperUser($userLogin);
$db = Zend_Registry::get('db');
$users = $db->fetchAll("SELECT idsite,access
@@ -170,11 +170,11 @@ class Piwik_UsersManager_API
*
* @return array the user information
*/
- static public function getUser( $userLogin )
+ public function getUser( $userLogin )
{
Piwik::checkUserIsSuperUser();
- self::checkUserExists($userLogin);
- self::checkUserIsNotSuperUser($userLogin);
+ $this->checkUserExists($userLogin);
+ $this->checkUserIsNotSuperUser($userLogin);
$db = Zend_Registry::get('db');
$user = $db->fetchRow("SELECT *
@@ -190,10 +190,10 @@ class Piwik_UsersManager_API
*
* @return array the user information
*/
- static public function getUserByEmail( $userEmail )
+ public function getUserByEmail( $userEmail )
{
Piwik::checkUserIsSuperUser();
- self::checkUserEmailExists($userEmail);
+ $this->checkUserEmailExists($userEmail);
$db = Zend_Registry::get('db');
$user = $db->fetchRow("SELECT *
@@ -202,9 +202,9 @@ class Piwik_UsersManager_API
return $user;
}
- static private function checkLogin($userLogin)
+ private function checkLogin($userLogin)
{
- if(self::userExists($userLogin))
+ if($this->userExists($userLogin))
{
throw new Exception(Piwik_TranslateException('UsersManager_ExceptionLoginExists', $userLogin));
}
@@ -221,17 +221,17 @@ class Piwik_UsersManager_API
}
}
- static private function checkPassword($password)
+ private function checkPassword($password)
{
- if(!self::isValidPasswordString($password))
+ if(!$this->isValidPasswordString($password))
{
throw new Exception(Piwik_TranslateException('UsersManager_ExceptionInvalidPassword'));
}
}
- static private function checkEmail($email)
+ private function checkEmail($email)
{
- if(self::userEmailExists($email))
+ if($this->userEmailExists($email))
{
throw new Exception(Piwik_TranslateException('UsersManager_ExceptionEmailExists', $email));
}
@@ -242,7 +242,7 @@ class Piwik_UsersManager_API
}
}
- static private function getCleanAlias($alias,$userLogin)
+ private function getCleanAlias($alias,$userLogin)
{
if(empty($alias))
{
@@ -251,7 +251,7 @@ class Piwik_UsersManager_API
return $alias;
}
- static private function getCleanPassword($password)
+ private function getCleanPassword($password)
{
// if change here, should also edit the installation process
// to change how the root pwd is saved in the config file
@@ -273,19 +273,19 @@ class Piwik_UsersManager_API
*
* @exception in case of an invalid parameter
*/
- static public function addUser( $userLogin, $password, $email, $alias = false )
+ public function addUser( $userLogin, $password, $email, $alias = false )
{
Piwik::checkUserIsSuperUser();
- self::checkLogin($userLogin);
- self::checkUserIsNotSuperUser($userLogin);
- self::checkPassword($password);
- self::checkEmail($email);
+ $this->checkLogin($userLogin);
+ $this->checkUserIsNotSuperUser($userLogin);
+ $this->checkPassword($password);
+ $this->checkEmail($email);
- $alias = self::getCleanAlias($alias,$userLogin);
- $passwordTransformed = self::getCleanPassword($password);
+ $alias = $this->getCleanAlias($alias,$userLogin);
+ $passwordTransformed = $this->getCleanPassword($password);
- $token_auth = self::getTokenAuth($userLogin, $passwordTransformed);
+ $token_auth = $this->getTokenAuth($userLogin, $passwordTransformed);
$db = Zend_Registry::get('db');
@@ -311,12 +311,12 @@ class Piwik_UsersManager_API
*
* @see addUser() for all the parameters
*/
- static public function updateUser( $userLogin, $password = false, $email = false, $alias = false )
+ public function updateUser( $userLogin, $password = false, $email = false, $alias = false )
{
Piwik::checkUserIsSuperUserOrTheUser($userLogin);
- self::checkUserIsNotAnonymous( $userLogin );
- self::checkUserIsNotSuperUser($userLogin);
- $userInfo = self::getUser($userLogin);
+ $this->checkUserIsNotAnonymous( $userLogin );
+ $this->checkUserIsNotSuperUser($userLogin);
+ $userInfo = $this->getUser($userLogin);
if(empty($password))
{
@@ -324,8 +324,8 @@ class Piwik_UsersManager_API
}
else
{
- self::checkPassword($password);
- $password = self::getCleanPassword($password);
+ $this->checkPassword($password);
+ $password = $this->getCleanPassword($password);
}
if(empty($alias))
@@ -340,11 +340,11 @@ class Piwik_UsersManager_API
if($email != $userInfo['email'])
{
- self::checkEmail($email);
+ $this->checkEmail($email);
}
- $alias = self::getCleanAlias($alias,$userLogin);
- $token_auth = self::getTokenAuth($userLogin,$password);
+ $alias = $this->getCleanAlias($alias,$userLogin);
+ $token_auth = $this->getTokenAuth($userLogin,$password);
$db = Zend_Registry::get('db');
@@ -368,19 +368,19 @@ class Piwik_UsersManager_API
*
* @return bool true on success
*/
- static public function deleteUser( $userLogin )
+ public function deleteUser( $userLogin )
{
Piwik::checkUserIsSuperUser();
- self::checkUserIsNotAnonymous( $userLogin );
- self::checkUserIsNotSuperUser($userLogin);
- if(!self::userExists($userLogin))
+ $this->checkUserIsNotAnonymous( $userLogin );
+ $this->checkUserIsNotSuperUser($userLogin);
+ if(!$this->userExists($userLogin))
{
throw new Exception(Piwik_TranslateException("UsersManager_ExceptionDeleteDoesNotExist", $userLogin));
}
- self::deleteUserOnly( $userLogin );
- self::deleteUserAccess( $userLogin );
+ $this->deleteUserOnly( $userLogin );
+ $this->deleteUserAccess( $userLogin );
}
/**
@@ -388,7 +388,7 @@ class Piwik_UsersManager_API
*
* @return bool true if the user is known
*/
- static public function userExists( $userLogin )
+ public function userExists( $userLogin )
{
Piwik::checkUserHasSomeAdminAccess();
$count = Piwik_FetchOne("SELECT count(*)
@@ -402,7 +402,7 @@ class Piwik_UsersManager_API
*
* @return bool true if the user is known
*/
- static public function userEmailExists( $userEmail )
+ public function userEmailExists( $userEmail )
{
Piwik::checkUserHasSomeAdminAccess();
$count = Piwik_FetchOne("SELECT count(*)
@@ -428,11 +428,11 @@ class Piwik_UsersManager_API
*
* @return bool true on success
*/
- static public function setUserAccess( $userLogin, $access, $idSites)
+ public function setUserAccess( $userLogin, $access, $idSites)
{
- self::checkAccessType( $access );
- self::checkUserExists( $userLogin);
- self::checkUserIsNotSuperUser($userLogin);
+ $this->checkAccessType( $access );
+ $this->checkUserExists( $userLogin);
+ $this->checkUserIsNotSuperUser($userLogin);
if($userLogin == 'anonymous'
&& $access == 'admin')
@@ -456,7 +456,7 @@ class Piwik_UsersManager_API
// basically an admin can give the view or the admin access to any user for the websites he manages
Piwik::checkUserHasAdminAccess( $idSites );
- self::deleteUserAccess( $userLogin, $idSites);
+ $this->deleteUserAccess( $userLogin, $idSites);
// delete UserAccess
$db = Zend_Registry::get('db');
@@ -485,9 +485,9 @@ class Piwik_UsersManager_API
* @param string user login
* @exception if the user doesn't exist
*/
- static private function checkUserExists( $userLogin )
+ private function checkUserExists( $userLogin )
{
- if(!self::userExists($userLogin))
+ if(!$this->userExists($userLogin))
{
throw new Exception(Piwik_TranslateException("UsersManager_ExceptionUserDoesNotExist", $userLogin));
}
@@ -499,22 +499,22 @@ class Piwik_UsersManager_API
* @param string user email
* @exception if the user doesn't exist
*/
- static private function checkUserEmailExists( $userEmail )
+ private function checkUserEmailExists( $userEmail )
{
- if(!self::userEmailExists($userEmail))
+ if(!$this->userEmailExists($userEmail))
{
throw new Exception(Piwik_TranslateException("UsersManager_ExceptionUserDoesNotExist", $userEmail));
}
}
- static private function checkUserIsNotAnonymous( $userLogin )
+ private function checkUserIsNotAnonymous( $userLogin )
{
if($userLogin == 'anonymous')
{
throw new Exception(Piwik_TranslateException("UsersManager_ExceptionEditAnonymous"));
}
}
- static private function checkUserIsNotSuperUser( $userLogin )
+ private function checkUserIsNotSuperUser( $userLogin )
{
if($userLogin == Zend_Registry::get('config')->superuser->login)
{
@@ -522,7 +522,7 @@ class Piwik_UsersManager_API
}
}
- static private function checkAccessType($access)
+ private function checkAccessType($access)
{
$accessList = Piwik_Access::getListAccess();
@@ -542,7 +542,7 @@ class Piwik_UsersManager_API
* @param string the user login.
*
*/
- static private function deleteUserOnly( $userLogin )
+ private function deleteUserOnly( $userLogin )
{
$db = Zend_Registry::get('db');
$db->query("DELETE FROM ".Piwik::prefixTable("user")." WHERE login = ?", $userLogin);
@@ -558,7 +558,7 @@ class Piwik_UsersManager_API
*
* @return bool true on success
*/
- static private function deleteUserAccess( $userLogin, $idSites = null )
+ private function deleteUserAccess( $userLogin, $idSites = null )
{
$db = Zend_Registry::get('db');
@@ -586,7 +586,7 @@ class Piwik_UsersManager_API
* @param string Login
* @param string MD5ied string of the password
*/
- static public function getTokenAuth($userLogin, $md5Password)
+ public function getTokenAuth($userLogin, $md5Password)
{
if(strlen($md5Password) != 32)
{
@@ -602,7 +602,7 @@ class Piwik_UsersManager_API
* @param string email
* @return bool
*/
- static private function isValidPasswordString( $input )
+ private function isValidPasswordString( $input )
{
$l = strlen($input);
return $l >= 6 && $l <= 26;
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index 61513a3edc..8e770d9007 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -27,7 +27,7 @@ class Piwik_VisitFrequency_API
return self::$instance;
}
- static public function get( $idSite, $period, $date, $columns = array() )
+ public function get( $idSite, $period, $date, $columns = array() )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -60,7 +60,7 @@ class Piwik_VisitFrequency_API
return $dataTable;
}
- static protected function getNumeric( $idSite, $period, $date, $toFetch )
+ protected function getNumeric( $idSite, $period, $date, $toFetch )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -68,33 +68,33 @@ class Piwik_VisitFrequency_API
return $dataTable;
}
- static public function getVisitsReturning( $idSite, $period, $date )
+ public function getVisitsReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_visits_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_visits_returning');
}
- static public function getActionsReturning( $idSite, $period, $date )
+ public function getActionsReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_actions_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_actions_returning');
}
- static public function getMaxActionsReturning( $idSite, $period, $date )
+ public function getMaxActionsReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'max_actions_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'max_actions_returning');
}
- static public function getSumVisitsLengthReturning( $idSite, $period, $date )
+ public function getSumVisitsLengthReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'sum_visit_length_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'sum_visit_length_returning');
}
- static public function getBounceCountReturning( $idSite, $period, $date )
+ public function getBounceCountReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'bounce_count_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'bounce_count_returning');
}
- static public function getConvertedVisitsReturning( $idSite, $period, $date )
+ public function getConvertedVisitsReturning( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_visits_converted_returning');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_visits_converted_returning');
}
}
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index e37e2a716b..8869bc4a07 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -27,7 +27,7 @@ class Piwik_VisitTime_API
return self::$instance;
}
- static protected function getDataTable($name, $idSite, $period, $date )
+ protected function getDataTable($name, $idSite, $period, $date )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -38,14 +38,14 @@ class Piwik_VisitTime_API
return $dataTable;
}
- static public function getVisitInformationPerLocalTime( $idSite, $period, $date )
+ public function getVisitInformationPerLocalTime( $idSite, $period, $date )
{
- return self::getDataTable('VisitTime_localTime', $idSite, $period, $date );
+ return $this->getDataTable('VisitTime_localTime', $idSite, $period, $date );
}
- static public function getVisitInformationPerServerTime( $idSite, $period, $date )
+ public function getVisitInformationPerServerTime( $idSite, $period, $date )
{
- return self::getDataTable('VisitTime_serverTime', $idSite, $period, $date );
+ return $this->getDataTable('VisitTime_serverTime', $idSite, $period, $date );
}
}
diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
index e7971ba5fd..ad2aeb42fa 100644
--- a/plugins/VisitorInterest/API.php
+++ b/plugins/VisitorInterest/API.php
@@ -27,7 +27,7 @@ class Piwik_VisitorInterest_API
return self::$instance;
}
- static protected function getDataTable($name, $idSite, $period, $date)
+ protected function getDataTable($name, $idSite, $period, $date)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -38,16 +38,16 @@ class Piwik_VisitorInterest_API
return $dataTable;
}
- static public function getNumberOfVisitsPerVisitDuration( $idSite, $period, $date )
+ public function getNumberOfVisitsPerVisitDuration( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('VisitorInterest_timeGap', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('VisitorInterest_timeGap', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getDurationLabel'));
return $dataTable;
}
- static public function getNumberOfVisitsPerPage( $idSite, $period, $date )
+ public function getNumberOfVisitsPerPage( $idSite, $period, $date )
{
- $dataTable = self::getDataTable('VisitorInterest_pageGap', $idSite, $period, $date);
+ $dataTable = $this->getDataTable('VisitorInterest_pageGap', $idSite, $period, $date);
$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getPageGapLabel'));
return $dataTable;
}
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index ec6d04de12..ad62f569e7 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -27,7 +27,7 @@ class Piwik_VisitsSummary_API
return self::$instance;
}
- static public function get( $idSite, $period, $date, $columns = array() )
+ public function get( $idSite, $period, $date, $columns = array() )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -61,7 +61,7 @@ class Piwik_VisitsSummary_API
return $dataTable;
}
- static protected function getNumeric( $idSite, $period, $date, $toFetch )
+ protected function getNumeric( $idSite, $period, $date, $toFetch )
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
@@ -69,43 +69,43 @@ class Piwik_VisitsSummary_API
return $dataTable;
}
- static public function getVisits( $idSite, $period, $date )
+ public function getVisits( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_visits');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_visits');
}
- static public function getUniqueVisitors( $idSite, $period, $date )
+ public function getUniqueVisitors( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_uniq_visitors');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_uniq_visitors');
}
- static public function getActions( $idSite, $period, $date )
+ public function getActions( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_actions');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_actions');
}
- static public function getMaxActions( $idSite, $period, $date )
+ public function getMaxActions( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'max_actions');
+ return $this->getNumeric( $idSite, $period, $date, 'max_actions');
}
- static public function getBounceCount( $idSite, $period, $date )
+ public function getBounceCount( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'bounce_count');
+ return $this->getNumeric( $idSite, $period, $date, 'bounce_count');
}
- static public function getVisitsConverted( $idSite, $period, $date )
+ public function getVisitsConverted( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'nb_visits_converted');
+ return $this->getNumeric( $idSite, $period, $date, 'nb_visits_converted');
}
- static public function getSumVisitsLength( $idSite, $period, $date )
+ public function getSumVisitsLength( $idSite, $period, $date )
{
- return self::getNumeric( $idSite, $period, $date, 'sum_visit_length');
+ return $this->getNumeric( $idSite, $period, $date, 'sum_visit_length');
}
- static public function getSumVisitsLengthPretty( $idSite, $period, $date )
+ public function getSumVisitsLengthPretty( $idSite, $period, $date )
{
- return Piwik::getPrettyTimeFromSeconds(self::getSumVisitsLength( $idSite, $period, $date ));
+ return Piwik::getPrettyTimeFromSeconds($this->getSumVisitsLength( $idSite, $period, $date ));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 07:40:04 +0300