diff options
| author | robocoder <anthon.pang@gmail.com> | 2011-04-14 23:00:39 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2011-04-14 23:00:39 +0400 |
| commit | 0733554e61c6a6b0fc75a34b06235b34ec3f0181 (patch) | |
| tree | 40c66f4b9f187d6e1a0feca037297c546e585504 /plugins/Login | |
| parent | 6310490d3ea0693540bf5e5a437d1caf956174cb (diff) | |
fixes #2312, refs #1679 - done
git-svn-id: http://dev.piwik.org/svn/trunk@4451 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Login')
| -rw-r--r-- | plugins/Login/Controller.php | 10 | ||||
| -rw-r--r-- | plugins/Login/templates/header.tpl | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 8bb3b968c3..e8870dbae6 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -77,13 +77,14 @@ class Piwik_Login_Controller extends Piwik_Controller { $view->linkTitle = Piwik::getRandomTitle(); - $enableFramedLogins = Zend_Registry::get('config')->General->enable_framed_logins; - $view->enableFramedLogins = $enableFramedLogins; - if(!$enableFramedLogins) + $view->enableFrames = Zend_Registry::get('config')->General->enable_framed_logins; + if(!$view->enableFrames) { $view->setXFrameOptions('sameorigin'); } + $view->forceSslLogin = Zend_Registry::get('config')->General->force_ssl_login; + // crsf token: don't trust the submitted value; generate/fetch it from session data $view->nonce = Piwik_Nonce::getNonce('Piwik_Login.login'); } @@ -232,7 +233,6 @@ class Piwik_Login_Controller extends Piwik_Controller } $this->configureView($view); echo $view->render(); - exit; } @@ -317,9 +317,7 @@ class Piwik_Login_Controller extends Piwik_Controller } $this->configureView($view); - echo $view->render(); - exit; } diff --git a/plugins/Login/templates/header.tpl b/plugins/Login/templates/header.tpl index e7e69f97b1..b292613fbd 100644 --- a/plugins/Login/templates/header.tpl +++ b/plugins/Login/templates/header.tpl @@ -8,7 +8,7 @@ <link rel="stylesheet" type="text/css" href="plugins/Login/templates/login.css" /> <meta name="description" content="{'General_OpenSourceWebAnalytics'|translate|escape}" /> -{if isset($enableFramedLogins) && !$enableFramedLogins} +{if isset($enableFrames) && !$enableFrames} {literal} <style>body { display : none; }</style> {/literal} @@ -42,7 +42,7 @@ {/if} </head> <body class="login"> -{if isset($enableFramedLogins) && !$enableFramedLogins} +{if isset($enableFrames) && !$enableFrames} {literal} <script type="text/javascript"> if(self == top) { |