diff options
| author | benakamoorthi <benaka.moorthi@gmail.com> | 2012-10-22 08:29:38 +0400 |
|---|---|---|
| committer | benakamoorthi <benaka.moorthi@gmail.com> | 2012-10-22 08:29:38 +0400 |
| commit | 4f2ef166a698e3f583b623e76fdcdb9aaf8d1d81 (patch) | |
| tree | c481bab8c91006df2456253e6a0027dd2d6aeb18 /plugins/Login | |
| parent | 893d016ae9afc5bb256be17481190eeaa257bf9e (diff) | |
Refs #3080, added trusted host admin UI, display warning in login, normal & admin screens if hostname is not trusted, and make sure password reset is not possible if hostname is not trusted.
git-svn-id: http://dev.piwik.org/svn/trunk@7279 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/Login')
| -rw-r--r-- | plugins/Login/Controller.php | 1 | ||||
| -rw-r--r-- | plugins/Login/templates/login.tpl | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index d706538d74..5848a96f6d 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -84,6 +84,7 @@ class Piwik_Login_Controller extends Piwik_Controller $view->infoMessage = $infoMessage; $view->addForm( $form ); $this->configureView($view); + self::setHostValidationVariablesView($view); echo $view->render(); } diff --git a/plugins/Login/templates/login.tpl b/plugins/Login/templates/login.tpl index cdcef19db3..1b177de3d5 100644 --- a/plugins/Login/templates/login.tpl +++ b/plugins/Login/templates/login.tpl @@ -2,6 +2,13 @@ <div id="login"> +{* untrusted host warning *} +{if isset($isValidHost) && isset($invalidHostMessage) && !$isValidHost} +<div id="login_error"> + <strong>{'General_Warning'|translate}: </strong>{$invalidHostMessage} +</div> +{/if} + <div id="message_container"> {if $form_data.errors} <div id="login_error"> @@ -40,6 +47,7 @@ </p> </form> +{if isset($isValidHost) && $isValidHost} <form id="reset_form" style="display:none;"> <p> <label>{'Login_LoginOrEmail'|translate}:<br /> @@ -65,11 +73,14 @@ <input type="hidden" name="module" value="Login"/> <input type="hidden" name="action" value="resetPassword"/> </form> +{/if} <p id="nav"> +{if isset($isValidHost) && $isValidHost} <a id="login_form_nav" href="#" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a> -<a id="reset_form_nav" href="#" style="display:none;" title="{'Mobile_NavigationBack'|translate}">{'General_Cancel'|translate}</a> <a id="alternate_reset_nav" href="#" style="display:none;" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a> +{/if} +<a id="reset_form_nav" href="#" style="display:none;" title="{'Mobile_NavigationBack'|translate}">{'General_Cancel'|translate}</a> </p> {if isset($smarty.capture.poweredByPiwik)} <p id="piwik"> |