Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable password reset in saas-dev (moved to saas-email branch)

Browse source
This commit is contained in:
Duncan Sommerville 2015-07-23 13:00:34 -04:00
parent abdc94ccc3
commit ce0cc946ab
2 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/controllers/LoginController.php
View file

@ -140,9 +140,9 @@ class LoginController extends Zend_Controller_Action
Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale)); Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', $stationLocale));
// if (!Application_Model_Preference::GetEnableSystemEmail()) { if (!Application_Model_Preference::GetEnableSystemEmail()) {
// $this->_redirect('login'); $this->_redirect('login');
// } else { } else {
//uses separate layout without a navigation. //uses separate layout without a navigation.
$this->_helper->layout->setLayout('login'); $this->_helper->layout->setLayout('login');
@ -176,7 +176,7 @@ class LoginController extends Zend_Controller_Action
} }
$this->view->form = $form; $this->view->form = $form;
// } }
} }
public function passwordRestoreAfterAction() public function passwordRestoreAfterAction()

4
airtime_mvc/application/views/scripts/form/login.phtml
View file

@ -30,12 +30,12 @@
<?php echo $this->element->getElement('csrf') ?> <?php echo $this->element->getElement('csrf') ?>
<!-- --><?php //if (Application_Model_Preference::GetEnableSystemEmail()): ?> <?php if (Application_Model_Preference::GetEnableSystemEmail()): ?>
<dt id="reset-label" class="hidden">&nbsp;</dt> <dt id="reset-label" class="hidden">&nbsp;</dt>
<dd id="reset-element" class="text-right"> <dd id="reset-element" class="text-right">
<a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a> <a href="<?php echo $this->baseUrl('login/password-restore'); ?>" class="link reset"><?php echo _("Reset password") ?></a>
</dd> </dd>
<!-- --><?php //endif; ?> <?php endif; ?>
<?php echo $this->element->getElement('captcha') ?> <?php echo $this->element->getElement('captcha') ?>
<dt id="submit-label">&nbsp;</dt> <dt id="submit-label">&nbsp;</dt>
<dd id="submit-element"> <dd id="submit-element">