[Piwik-svn] r397 - in trunk: modules modules/Archive plugins/Actions plugins/Provider plugins/Referers plugins/UserCountry plugins/UserSettings plugins/VisitTime plugins/VisitorInterest
svnmaster at piwik.org
svnmaster at piwik.org
Sat Mar 22 01:31:16 CET 2008
Author: matt
Date: 2008-03-22 01:31:15 +0100 (Sat, 22 Mar 2008)
New Revision: 397
Modified:
trunk/modules/Archive/Array.php
trunk/modules/Piwik.php
trunk/plugins/Actions/Controller.php
trunk/plugins/Provider/Controller.php
trunk/plugins/Referers/Controller.php
trunk/plugins/UserCountry/UserCountry.php
trunk/plugins/UserSettings/Controller.php
trunk/plugins/VisitTime/Controller.php
trunk/plugins/VisitorInterest/Controller.php
Log:
- fixing small bugs when sorting, installing, archiving
Modified: trunk/modules/Archive/Array.php
===================================================================
--- trunk/modules/Archive/Array.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/modules/Archive/Array.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -11,6 +11,7 @@
*/
require_once "DataTable/Simple.php";
+require_once "DataTable/Array.php";
/**
* This class is used to store multiple archives, when the user requests a period's archive.
Modified: trunk/modules/Piwik.php
===================================================================
--- trunk/modules/Piwik.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/modules/Piwik.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -768,6 +768,10 @@
{
$dbInfos = $config->database->toArray();
}
+ if(!isset($dbInfos['password']))
+ {
+ $dbInfos['password'] = '';
+ }
// var_dump($dbInfos);
// test with the password ='][{}!3456&&^#gegq"eQ for example
Modified: trunk/plugins/Actions/Controller.php
===================================================================
--- trunk/plugins/Actions/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/Actions/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -12,7 +12,7 @@
'Actions.getDownloads',
'getDownloadsSubDataTable' );
- $view->setColumnsToDisplay( array(0,2,3) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors','nb_hits') );
$view->setSortedColumn( 'nb_uniq_visitors','desc' );
$view->disableExcludeLowPopulation();
$view->setLimit( 15 );
@@ -28,7 +28,7 @@
'Actions.getDownloads',
'getDownloadsSubDataTable');
- $view->setColumnsToDisplay( array(0,2,3) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors','nb_hits') );
$view->setSortedColumn( 'nb_uniq_visitors','desc' );
$view->disableExcludeLowPopulation();
$view->disableSearchBox();
@@ -64,7 +64,7 @@
'Actions.getOutlinks',
'getOutlinksSubDataTable' );
- $view->setColumnsToDisplay( array(0,2,3) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors','nb_hits') );
$view->setSortedColumn( 'nb_uniq_visitors','desc' );
$view->disableExcludeLowPopulation();
$view->setLimit( 15 );
@@ -80,7 +80,7 @@
'Actions.getOutlinks',
'getOutlinksSubDataTable');
- $view->setColumnsToDisplay( array(0,2,3) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors','nb_hits') );
$view->setSortedColumn( 'nb_uniq_visitors','desc' );
$view->disableExcludeLowPopulation();
$view->disableSearchBox();
@@ -132,7 +132,7 @@
$view->disableOffsetInformation();
- $view->setColumnsToDisplay( array(0,2,3) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors','nb_hits') );
$view->setLimit( 100 );
// computing minimum value to exclude
$visitsInfo = Piwik_VisitsSummary_Controller::getVisitsSummary();
Modified: trunk/plugins/Provider/Controller.php
===================================================================
--- trunk/plugins/Provider/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/Provider/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -12,7 +12,7 @@
$view = Piwik_ViewDataTable::factory();
$view->init( 'Provider', __FUNCTION__, "Provider.getProvider" );
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors') );
$view->setSortedColumn( 1 );
$view->setLimit( 5 );
Modified: trunk/plugins/Referers/Controller.php
===================================================================
--- trunk/plugins/Referers/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/Referers/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -67,7 +67,7 @@
$view->disableExcludeLowPopulation();
$view->doNotShowFooter();
- $view->setColumnsToDisplay( array(0,1,2) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors', 'nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -81,7 +81,7 @@
'getSearchEnginesFromKeywordId'
);
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -94,7 +94,7 @@
);
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -110,7 +110,7 @@
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -124,7 +124,7 @@
);
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -138,7 +138,7 @@
);
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->setLimit(5);
$view->setGraphLimit(12);
@@ -158,7 +158,7 @@
$view->disableExcludeLowPopulation();
$view->setLimit( 5 );
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -172,7 +172,7 @@
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -185,7 +185,7 @@
);
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -201,7 +201,7 @@
$view->disableExcludeLowPopulation();
$view->setLimit( 5 );
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
@@ -214,7 +214,7 @@
);
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,2));
+ $view->setColumnsToDisplay( array('label','nb_visits') );
return $this->renderView($view, $fetch);
}
Modified: trunk/plugins/UserCountry/UserCountry.php
===================================================================
--- trunk/plugins/UserCountry/UserCountry.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/UserCountry/UserCountry.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -132,7 +132,7 @@
$view->disableSearchBox();
$view->disableOffsetInformation();
$view->disableSort();
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors') );
$view->setSortedColumn( 1 );
return $this->renderView($view, $fetch);
Modified: trunk/plugins/UserSettings/Controller.php
===================================================================
--- trunk/plugins/UserSettings/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/UserSettings/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -32,7 +32,7 @@
$view->disableSearchBox();
$view->disableExcludeLowPopulation();
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_uniq_visitors') );
$view->setSortedColumn( 1 );
$view->setLimit( 5 );
$view->setGraphLimit(5);
@@ -107,7 +107,7 @@
$view->disableSort();
$view->disableOffsetInformation();
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->setSortedColumn( 2 );
$view->setLimit( 10 );
Modified: trunk/plugins/VisitTime/Controller.php
===================================================================
--- trunk/plugins/VisitTime/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/VisitTime/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -23,7 +23,7 @@
$view->init( $this->pluginName, __FUNCTION__,
"VisitTime.getVisitInformationPerServerTime" );
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->setSortedColumn( 0, 'asc' );
$view->setLimit( 24 );
$view->setGraphLimit( 24 );
@@ -40,7 +40,7 @@
$view->init( $this->pluginName, __FUNCTION__,
"VisitTime.getVisitInformationPerLocalTime" );
- $view->setColumnsToDisplay( array(0,2) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->setSortedColumn( 0, 'asc' );
$view->setLimit( 24 );
$view->setGraphLimit( 24 );
Modified: trunk/plugins/VisitorInterest/Controller.php
===================================================================
--- trunk/plugins/VisitorInterest/Controller.php 2008-03-22 00:09:15 UTC (rev 396)
+++ trunk/plugins/VisitorInterest/Controller.php 2008-03-22 00:31:15 UTC (rev 397)
@@ -23,7 +23,7 @@
$view->init( $this->pluginName, __FUNCTION__,
"VisitorInterest.getNumberOfVisitsPerVisitDuration" );
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->disableSort();
$view->disableExcludeLowPopulation();
$view->disableOffsetInformation();
@@ -38,7 +38,7 @@
$view->init( $this->pluginName, __FUNCTION__,
"VisitorInterest.getNumberOfVisitsPerPage" );
- $view->setColumnsToDisplay( array(0,1) );
+ $view->setColumnsToDisplay( array('label','nb_visits') );
$view->setSortedColumn( 'nb_visits' );
$view->disableExcludeLowPopulation();
$view->disableOffsetInformation();
More information about the Piwik-svn
mailing list