[Piwik-svn] r482 - in trunk: modules modules/API modules/DataTable modules/DataTable/Filter modules/DataTable/Renderer plugins plugins/Actions plugins/ExamplePlugin plugins/Provider plugins/Referers plugins/SitesManager plugins/UserCountry plugins/UserSettings plugins/UsersManager plugins/VisitFrequency plugins/VisitTime plugins/VisitorInterest plugins/VisitsSummary tests/modules
svnmaster at piwik.org
svnmaster at piwik.org
Sun May 18 19:22:36 CEST 2008
Author: matt
Date: 2008-05-18 19:22:35 +0200 (Sun, 18 May 2008)
New Revision: 482
Added:
trunk/modules/DataTable/Filter/Null.php
Removed:
trunk/modules/DataTable/Filter/Empty.php
trunk/plugins/Openads/
Modified:
trunk/modules/API/APIable.php
trunk/modules/DataTable/Filter.php
trunk/modules/DataTable/Filter/ReplaceColumnNames.php
trunk/modules/DataTable/Manager.php
trunk/modules/DataTable/Renderer/Json.php
trunk/modules/DataTable/Renderer/Php.php
trunk/modules/DataTable/Renderer/Xml.php
trunk/modules/Plugin.php
trunk/plugins/Actions/API.php
trunk/plugins/Actions/Actions.php
trunk/plugins/ExamplePlugin/API.php
trunk/plugins/Provider/API.php
trunk/plugins/Referers/API.php
trunk/plugins/SitesManager/API.php
trunk/plugins/UserCountry/API.php
trunk/plugins/UserSettings/API.php
trunk/plugins/UsersManager/API.php
trunk/plugins/VisitFrequency/API.php
trunk/plugins/VisitTime/API.php
trunk/plugins/VisitTime/VisitTime.php
trunk/plugins/VisitorInterest/API.php
trunk/plugins/VisitsSummary/API.php
trunk/tests/modules/SitesManager.test.php
trunk/tests/modules/UsersManager.test.php
Log:
- remove useless __construct()
- renamed empty filter to Null filter
- columns are now renamed recursively, fixing bug in not valid XML code when the columns still had a numeric name
- added a new parameter in API for Referers module: expanded. If set to true, it will load the data recursively (eg. all keywords + the search engines for each keyword).
Modified: trunk/modules/API/APIable.php
===================================================================
--- trunk/modules/API/APIable.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/API/APIable.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -40,10 +40,6 @@
*/
static public $methodsNotToPublish = array();
- protected function __construct()
- {
- }
-
/**
* @see self::$methodsNotToPublish
* @param string Method name not to be published
Deleted: trunk/modules/DataTable/Filter/Empty.php
===================================================================
--- trunk/modules/DataTable/Filter/Empty.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Filter/Empty.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -1,35 +0,0 @@
-<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_DataTable
- */
-
-/**
- * Filter template.
- * You can use it if you want to create a new filter.
- *
- * @package Piwik_DataTable
- * @subpackage Piwik_DataTable_Filter
- */
-class Piwik_DataTable_Filter_Empty extends Piwik_DataTable_Filter
-{
-
- public function __construct( $table )
- {
- parent::__construct($table);
- $this->filter();
- }
-
- protected function filter()
- {
- foreach($this->table->getRows() as $key => $row)
- {
- }
- }
-}
-
Copied: trunk/modules/DataTable/Filter/Null.php (from rev 481, trunk/modules/DataTable/Filter/Empty.php)
===================================================================
--- trunk/modules/DataTable/Filter/Null.php (rev 0)
+++ trunk/modules/DataTable/Filter/Null.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
+ * @version $Id$
+ *
+ * @package Piwik_DataTable
+ */
+
+/**
+ * Filter template.
+ * You can use it if you want to create a new filter.
+ *
+ * @package Piwik_DataTable
+ * @subpackage Piwik_DataTable_Filter
+ */
+class Piwik_DataTable_Filter_Null extends Piwik_DataTable_Filter
+{
+
+ public function __construct( $table )
+ {
+ parent::__construct($table);
+ $this->filter();
+ }
+
+ protected function filter()
+ {
+ foreach($this->table->getRows() as $key => $row)
+ {
+ }
+ }
+}
+
Modified: trunk/modules/DataTable/Filter/ReplaceColumnNames.php
===================================================================
--- trunk/modules/DataTable/Filter/ReplaceColumnNames.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Filter/ReplaceColumnNames.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -37,6 +37,7 @@
Piwik_Archive::INDEX_SUM_VISIT_LENGTH => 'sum_visit_length',
Piwik_Archive::INDEX_BOUNCE_COUNT => 'bounce_count',
);
+
/**
* @param DataTable Table
* @param array Mapping to apply. Must have the format
@@ -57,22 +58,36 @@
protected function filter()
{
- foreach($this->table->getRows() as $key => $row)
+ $this->filterTable($this->table);
+ }
+
+ protected function filterTable($table)
+ {
+ foreach($table->getRows() as $key => $row)
{
- $columns = $row->getColumns();
+ $this->renameColumns($row);
- foreach($this->mappingToApply as $oldName => $newName)
+ try {
+ $subTable = Piwik_DataTable_Manager::getInstance()->getTable( $row->getIdSubDataTable() );
+ $this->filterTable($subTable);
+ } catch(Exception $e){
+ // case idSubTable == null, or if the table is not loaded in memory
+ }
+ }
+ }
+
+ protected function renameColumns($row)
+ {
+ $columns = $row->getColumns();
+ foreach($this->mappingToApply as $oldName => $newName)
+ {
+ if(isset($columns[$oldName]))
{
- // if the old column is there
- if(isset($columns[$oldName]))
- {
- $columns[$newName] = $columns[$oldName];
- unset($columns[$oldName]);
- }
+ $columns[$newName] = $columns[$oldName];
+ unset($columns[$oldName]);
}
-
- $row->setColumns($columns);
}
+ $row->setColumns($columns);
}
}
Modified: trunk/modules/DataTable/Filter.php
===================================================================
--- trunk/modules/DataTable/Filter.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Filter.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -25,6 +25,9 @@
*/
abstract class Piwik_DataTable_Filter
{
+ /*
+ * @var Piwik_DataTable
+ */
protected $table;
public function __construct($table)
@@ -44,7 +47,7 @@
require_once "DataTable/Filter/ColumnCallbackReplace.php";
require_once "DataTable/Filter/DetailCallbackAddDetail.php";
require_once "DataTable/Filter/AddConstantDetail.php";
-require_once "DataTable/Filter/Empty.php";
+require_once "DataTable/Filter/Null.php";
require_once "DataTable/Filter/ExcludeLowPopulation.php";
require_once "DataTable/Filter/Limit.php";
require_once "DataTable/Filter/Pattern.php";
Modified: trunk/modules/DataTable/Manager.php
===================================================================
--- trunk/modules/DataTable/Manager.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Manager.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -71,7 +71,7 @@
if(!isset($this->tables[$idTable]))
{
- throw new Exception("The request table $idTable couldn't be found.");
+ throw new Exception("The requested table id=$idTable couldn't be found in the DataTable Manager");
}
return $this->tables[$idTable];
Modified: trunk/modules/DataTable/Renderer/Json.php
===================================================================
--- trunk/modules/DataTable/Renderer/Json.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Renderer/Json.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -32,7 +32,7 @@
protected function renderTable($table)
{
$renderer = new Piwik_DataTable_Renderer_Php($table, $serialize = false);
- $array = $renderer->flatRender();
+ $array = $renderer->flatRender(null, (bool)Piwik_Common::getRequestVar('expanded', false));
if(!is_array($array))
{
Modified: trunk/modules/DataTable/Renderer/Php.php
===================================================================
--- trunk/modules/DataTable/Renderer/Php.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Renderer/Php.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -74,7 +74,7 @@
{
$serializeSave = $this->serialize;
$this->serialize = false;
- $flatArray[$keyName] = $this->flatRender($table);
+ $flatArray[$keyName] = $this->flatRender($table, $doRenderSubTablesIfAvailable);
$this->serialize = $serializeSave;
}
}
@@ -125,6 +125,7 @@
}
return $flatArray;
}
+
public function render( $dataTable = null)
{
if(is_null($dataTable))
Modified: trunk/modules/DataTable/Renderer/Xml.php
===================================================================
--- trunk/modules/DataTable/Renderer/Xml.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/DataTable/Renderer/Xml.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -36,7 +36,7 @@
{
$renderer = new Piwik_DataTable_Renderer_Php($table, $serialize = false);
- $array = $renderer->flatRender();
+ $array = $renderer->flatRender(null, (bool)Piwik_Common::getRequestVar('expanded', false));
// case DataTable_Array
if($table instanceof Piwik_DataTable_Array)
Modified: trunk/modules/Plugin.php
===================================================================
--- trunk/modules/Plugin.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/modules/Plugin.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,12 @@
* @package Piwik
*/
abstract class Piwik_Plugin
-{
- function __construct()
- {
- }
-
+{
+ /**
+ * Returns the plugin details
+ */
+ abstract function getInformation();
+
public function registerTranslation( $langCode )
{
$infos = $this->getInformation();
@@ -59,18 +60,13 @@
}
else
{
- throw new Exception("The language file couldn't be find for this plugin '$name'.");
+ throw new Exception("Language file not found for the plugin '$name'.");
}
Piwik_Translate::getInstance()->addTranslationArray($translations);
}
/**
- * Returns the plugin details
- */
- abstract function getInformation();
-
- /**
* Returns the plugin name
*/
public function getName()
Modified: trunk/plugins/Actions/API.php
===================================================================
--- trunk/plugins/Actions/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/Actions/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -21,10 +21,6 @@
class Piwik_Actions_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
static public function getInstance()
{
@@ -40,7 +36,6 @@
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
-
if($idSubtable === false)
{
$idSubtable = null;
Modified: trunk/plugins/Actions/Actions.php
===================================================================
--- trunk/plugins/Actions/Actions.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/Actions/Actions.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -19,7 +19,6 @@
public function __construct()
{
- parent::__construct();
$this->setCategoryDelimiter( Zend_Registry::get('config')->General->action_category_delimiter);
}
Modified: trunk/plugins/ExamplePlugin/API.php
===================================================================
--- trunk/plugins/ExamplePlugin/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/ExamplePlugin/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -35,11 +35,6 @@
class Piwik_ExamplePlugin_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/Provider/API.php
===================================================================
--- trunk/plugins/Provider/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/Provider/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -16,10 +16,6 @@
class Piwik_Provider_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
static public function getInstance()
{
Modified: trunk/plugins/Referers/API.php
===================================================================
--- trunk/plugins/Referers/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/Referers/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -1,157 +1,166 @@
<?php
/**
* Piwik - Open source web analytics
- *
+ *
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
* @version $Id$
- *
+ *
* @package Piwik_Referers
*/
-
+
/**
- *
+ *
* @package Piwik_Referers
*/
class Piwik_Referers_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
- {
+ {
$c = __CLASS__;
self::$instance = new $c();
}
return self::$instance;
}
-
- private function getDataTable($name, $idSite, $period, $date, $idSubtable = null)
+
+ private function getDataTable($name, $idSite, $period, $date, $expanded, $idSubtable = null)
{
Piwik::checkUserHasViewAccess( $idSite );
$archive = Piwik_Archive::build($idSite, $period, $date );
-
- $dataTable = $archive->getDataTable($name, $idSubtable);
+
+ if($expanded)
+ {
+ $dataTable = $archive->getDataTableExpanded($name, $idSubtable);
+ $dataTable->enableRecursiveSort();
+ }
+ else
+ {
+ $dataTable = $archive->getDataTable($name, $idSubtable);
+ }
$dataTable->queueFilter('Piwik_DataTable_Filter_ReplaceColumnNames');
return $dataTable;
}
+
function getRefererType($idSite, $period, $date)
{
- $dataTable = $this->getDataTable('Referers_type',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_type',$idSite, $period, $date, $expanded = false);
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getRefererTypeLabel'));
return $dataTable;
}
-
- function getKeywords($idSite, $period, $date)
+
+ function getKeywords($idSite, $period, $date, $expanded = false)
{
- $dataTable = $this->getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date, $expanded);
return $dataTable;
}
-
+
function getSearchEnginesFromKeywordId($idSite, $period, $date, $idSubtable)
{
- $dataTable = $this->getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date, $idSubtable);
+ $dataTable = $this->getDataTable('Referers_searchEngineByKeyword',$idSite, $period, $date, $expanded = false, $idSubtable);
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array( 'label', 'url', 'Piwik_getSearchEngineUrlFromName') );
$dataTable->queueFilter('Piwik_DataTable_Filter_DetailCallbackAddDetail', array( 'url', 'logo', 'Piwik_getSearchEngineLogoFromName') );
- return $dataTable;
+ return $dataTable;
}
-
- function getSearchEngines($idSite, $period, $date)
+
+ function getSearchEngines($idSite, $period, $date, $expanded = false)
{
- $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded);
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array( 'label', 'url', 'Piwik_getSearchEngineUrlFromName') );
$dataTable->queueFilter('Piwik_DataTable_Filter_DetailCallbackAddDetail', array( 'url', 'logo', 'Piwik_getSearchEngineLogoFromName') );
return $dataTable;
}
-
+
function getKeywordsFromSearchEngineId($idSite, $period, $date, $idSubtable)
{
- $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $idSubtable);
- return $dataTable;
+ $dataTable = $this->getDataTable('Referers_keywordBySearchEngine',$idSite, $period, $date, $expanded = false, $idSubtable);
+ return $dataTable;
}
-
- function getCampaigns($idSite, $period, $date)
+
+ function getCampaigns($idSite, $period, $date, $expanded = false)
{
- $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded);
return $dataTable;
}
-
+
function getKeywordsFromCampaignId($idSite, $period, $date, $idSubtable)
{
- $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $idSubtable);
- return $dataTable;
+ $dataTable = $this->getDataTable('Referers_keywordByCampaign',$idSite, $period, $date, $expanded = false, $idSubtable);
+ return $dataTable;
}
-
- function getWebsites($idSite, $period, $date)
+
+ function getWebsites($idSite, $period, $date, $expanded = false)
{
- $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded);
return $dataTable;
}
function getUrlsFromWebsiteId($idSite, $period, $date, $idSubtable)
- {
- $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $idSubtable);
+ {
+ $dataTable = $this->getDataTable('Referers_urlByWebsite',$idSite, $period, $date, $expanded = false, $idSubtable);
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array( 'label', 'url', create_function('$label', 'return $label;')) );
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getPathFromUrl'));
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_truncatePath'));
- return $dataTable;
+ return $dataTable;
}
-
- function getPartners($idSite, $period, $date)
+
+ function getPartners($idSite, $period, $date, $expanded = false)
{
- $dataTable = $this->getDataTable('Referers_urlByPartner',$idSite, $period, $date);
+ $dataTable = $this->getDataTable('Referers_urlByPartner',$idSite, $period, $date, $expanded);
return $dataTable;
}
-
+
function getUrlsFromPartnerId($idSite, $period, $date, $idSubtable)
- {
- $dataTable = $this->getDataTable('Referers_urlByPartner',$idSite, $period, $date, $idSubtable);
+ {
+ $dataTable = $this->getDataTable('Referers_urlByPartner',$idSite, $period, $date, $expanded = false, $idSubtable);
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array( 'label', 'url', create_function('$label', 'return $label;')) );
$dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackReplace', array('label', 'Piwik_getPathFromUrl'));
- return $dataTable;
+ return $dataTable;
}
-
- private function getNumeric($name, $idSite, $period, $date)
- {
- Piwik::checkUserHasViewAccess( $idSite );
- $archive = Piwik_Archive::build($idSite, $period, $date );
- return $archive->getDataTableFromNumeric($name);
- }
-
+
function getNumberOfDistinctSearchEngines($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctSearchEngines', $idSite, $period, $date);
}
-
+
function getNumberOfDistinctKeywords($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctKeywords', $idSite, $period, $date);
}
+
function getNumberOfDistinctCampaigns($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctCampaigns', $idSite, $period, $date);
}
+
function getNumberOfDistinctWebsites($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctWebsites', $idSite, $period, $date);
}
+
function getNumberOfDistinctWebsitesUrls($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctWebsitesUrls', $idSite, $period, $date);
}
+
function getNumberOfDistinctPartners($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctPartners', $idSite, $period, $date);
}
+
function getNumberOfDistinctPartnersUrls($idSite, $period, $date)
{
return $this->getNumeric('Referers_distinctPartnersUrls', $idSite, $period, $date);
}
+
+ private function getNumeric($name, $idSite, $period, $date)
+ {
+ Piwik::checkUserHasViewAccess( $idSite );
+ $archive = Piwik_Archive::build($idSite, $period, $date );
+ return $archive->getDataTableFromNumeric($name);
+ }
}
function Piwik_getPathFromUrl($url)
@@ -197,39 +206,39 @@
$path = 'plugins/Referers/images/searchEngines/%s.png';
$beginningUrl = strpos($url,'//') + 2;
$normalPath = sprintf($path, substr($url,$beginningUrl));
-
+
// flags not in the package !
if(!file_exists($normalPath))
{
- return sprintf($path, 'xx');
+ return sprintf($path, 'xx');
}
return $normalPath;
}
function Piwik_getRefererTypeLabel($label)
-{
+{
$indexTranslation = '';
switch($label)
{
case Piwik_Common::REFERER_TYPE_DIRECT_ENTRY:
$indexTranslation = 'Referers_DirectEntry';
- break;
+ break;
case Piwik_Common::REFERER_TYPE_SEARCH_ENGINE:
$indexTranslation = 'Referers_SearchEngines';
- break;
+ break;
case Piwik_Common::REFERER_TYPE_WEBSITE:
$indexTranslation = 'Referers_Websites';
- break;
+ break;
case Piwik_Common::REFERER_TYPE_PARTNER:
$indexTranslation = 'Referers_Partners';
- break;
+ break;
case Piwik_Common::REFERER_TYPE_NEWSLETTER:
$indexTranslation = 'Referers_Newsletters';
- break;
+ break;
case Piwik_Common::REFERER_TYPE_CAMPAIGN:
$indexTranslation = 'Referers_Campaigns';
- break;
+ break;
}
return Piwik_Translate($indexTranslation);
}
Modified: trunk/plugins/SitesManager/API.php
===================================================================
--- trunk/plugins/SitesManager/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/SitesManager/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -16,11 +16,6 @@
class Piwik_SitesManager_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/UserCountry/API.php
===================================================================
--- trunk/plugins/UserCountry/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/UserCountry/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,6 @@
class Piwik_UserCountry_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/UserSettings/API.php
===================================================================
--- trunk/plugins/UserSettings/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/UserSettings/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -20,11 +20,6 @@
class Piwik_UserSettings_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/UsersManager/API.php
===================================================================
--- trunk/plugins/UsersManager/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/UsersManager/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -16,11 +16,6 @@
class Piwik_UsersManager_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/VisitFrequency/API.php
===================================================================
--- trunk/plugins/VisitFrequency/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/VisitFrequency/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,6 @@
class Piwik_VisitFrequency_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/VisitTime/API.php
===================================================================
--- trunk/plugins/VisitTime/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/VisitTime/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,6 @@
class Piwik_VisitTime_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/VisitTime/VisitTime.php
===================================================================
--- trunk/plugins/VisitTime/VisitTime.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/VisitTime/VisitTime.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -16,11 +16,6 @@
*/
class Piwik_VisitTime extends Piwik_Plugin
{
- public function __construct()
- {
- parent::__construct();
- }
-
public function getInformation()
{
$info = array(
Modified: trunk/plugins/VisitorInterest/API.php
===================================================================
--- trunk/plugins/VisitorInterest/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/VisitorInterest/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,6 @@
class Piwik_VisitorInterest_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/plugins/VisitsSummary/API.php
===================================================================
--- trunk/plugins/VisitsSummary/API.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/plugins/VisitsSummary/API.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -17,11 +17,6 @@
class Piwik_VisitsSummary_API extends Piwik_Apiable
{
static private $instance = null;
- protected function __construct()
- {
- parent::__construct();
- }
-
static public function getInstance()
{
if (self::$instance == null)
Modified: trunk/tests/modules/SitesManager.test.php
===================================================================
--- trunk/tests/modules/SitesManager.test.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/tests/modules/SitesManager.test.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -12,11 +12,6 @@
class Test_Piwik_SitesManager extends Test_Database
{
- function __construct()
- {
- parent::__construct();
- }
-
public function setUp()
{
parent::setUp();
Modified: trunk/tests/modules/UsersManager.test.php
===================================================================
--- trunk/tests/modules/UsersManager.test.php 2008-05-15 01:50:28 UTC (rev 481)
+++ trunk/tests/modules/UsersManager.test.php 2008-05-18 17:22:35 UTC (rev 482)
@@ -13,11 +13,6 @@
class Test_Piwik_UsersManager extends Test_Database
{
- function __construct()
- {
- parent::__construct();
- }
-
function setUp()
{
parent::setUp();
More information about the Piwik-svn
mailing list