diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Dashboard/templates/index.tpl | 2 | ||||
| -rw-r--r-- | plugins/Home/templates/period_select.tpl | 2 | ||||
| -rw-r--r-- | plugins/Home/templates/top_bar.tpl | 1 | ||||
| -rw-r--r-- | plugins/Installation/Controller.php | 3 | ||||
| -rw-r--r-- | plugins/Login/Auth.php | 8 |
5 files changed, 2 insertions, 14 deletions
diff --git a/plugins/Dashboard/templates/index.tpl b/plugins/Dashboard/templates/index.tpl index 113dec6697..475dfd59ab 100644 --- a/plugins/Dashboard/templates/index.tpl +++ b/plugins/Dashboard/templates/index.tpl @@ -8,7 +8,7 @@ piwik.dashboardLayout = '{$layout}';
{else}
//Load default layout...
- piwik.dashboardLayout = 'VisitsSummary.getLastVisitsGraph~VisitorInterest.getNumberOfVisitsPerVisitDuration~UserSettings.getBrowser|Referers.getKeywords|Referers.getSearchEngines~VisitTime.getVisitInformationPerServerTime~ExamplePlugin.feedburner|';
+ piwik.dashboardLayout = 'VisitsSummary.getLastVisitsGraph~VisitorInterest.getNumberOfVisitsPerVisitDuration~UserSettings.getBrowser|Referers.getKeywords~Referers.getWebsites|Referers.getSearchEngines~VisitTime.getVisitInformationPerServerTime~ExamplePlugin.feedburner|';
{/if}
piwik.availableWidgets = {$availableWidgets};
diff --git a/plugins/Home/templates/period_select.tpl b/plugins/Home/templates/period_select.tpl index 1aec046df8..f74e9b0c30 100644 --- a/plugins/Home/templates/period_select.tpl +++ b/plugins/Home/templates/period_select.tpl @@ -3,7 +3,7 @@ <span id="periods">
<span id="currentPeriod">{$periodsNames.$period}</span>
<span id="otherPeriods">
- {foreach from=$otherPeriods item=thisPeriod}| <a href='{url period=$thisPeriod}'>{$periodsNames.$thisPeriod}</a>{/foreach}
+ {foreach from=$otherPeriods item=thisPeriod} | <a href='{url period=$thisPeriod}'>{$periodsNames.$thisPeriod}</a>{/foreach}
</span>
</span>
<br/>
diff --git a/plugins/Home/templates/top_bar.tpl b/plugins/Home/templates/top_bar.tpl index d6037a2f2a..8abdac824c 100644 --- a/plugins/Home/templates/top_bar.tpl +++ b/plugins/Home/templates/top_bar.tpl @@ -29,4 +29,3 @@ </div>
</div>
-<div class="line"></div>
\ No newline at end of file diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index 66c594a5f7..e91be472d8 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -340,9 +340,6 @@ class Piwik_Installation_Controller extends Piwik_Controller // giving good names to pages
}
-
-
-
protected function initObjectsToCallAPI()
{
// connect to the database using the DB infos currently in the session
diff --git a/plugins/Login/Auth.php b/plugins/Login/Auth.php index d0b18d036a..b28f0aeb20 100644 --- a/plugins/Login/Auth.php +++ b/plugins/Login/Auth.php @@ -1,11 +1,6 @@ <?php /** - * Authentication object. - * Should be reviewed and refactor to allow simple plugin overwrite - * See OpenId authentication plugin, using Zend_Auth_OpenId on http://dev.piwik.org/trac/ticket/160 - * See Review the Login plugin to make it really modular http://dev.piwik.org/trac/ticket/144 - * * @package Piwik */ class Piwik_Login_Auth extends Zend_Auth_Adapter_DbTable implements Piwik_Auth @@ -33,9 +28,6 @@ class Piwik_Login_Auth extends Zend_Auth_Adapter_DbTable implements Piwik_Auth // we then look if the user is API authenticated // API authentication works without login name, but only with the token - // TODO the logic (sql select) should be in the Login plugin, not here - // this class should stay simple. Another Login plugin should only have to create an auth entry - // of this class in the zend_registry and it should work if(is_null($this->_identity)) { $authenticated = false; |