CC-3667 : Preferences pages should have an option to enable/disable password recovery option

This commit is contained in:
Naomi Aro 2012-04-25 15:22:38 +02:00
parent 7aeddf5bb0
commit b6bed6ce7a
3 changed files with 14 additions and 5 deletions

View File

@ -39,6 +39,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetAllow3rdPartyApi($values["preferences_general"]["thirdPartyApi"]);
Application_Model_Preference::SetTimezone($values["preferences_general"]["timezone"]);
Application_Model_Preference::SetWeekStartDay($values["preferences_general"]["weekStartDay"]);
Application_Model_Preference::SetEnableSystemEmail($values["preferences_general"]["enableSystemEmail"]);
Application_Model_Preference::SetSystemEmail($values["preferences_general"]["systemEmail"]);
Application_Model_Preference::SetAutoUploadRecordedShowToSoundcloud($values["preferences_soundcloud"]["UseSoundCloud"]);

View File

@ -794,7 +794,13 @@ class Application_Model_Preference
}
public static function GetEnableSystemEmail() {
return self::GetValue("enable_system_email");
$v = self::GetValue("enable_system_email");
if ($v === "") {
return 0;
}
return $v;
}
public static function SetSystemEmail($value) {

View File

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