openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit e769b36a2a257922c17b7259df2b3ead3f85e1ff
parent 08888d1ecfff2bd5db599b6462d98dcbc2866d59
Author: dankert <openrat@jandankert.de>
Date:   Mon,  6 Dec 2021 21:44:58 +0100

Fix: Possibility to send the new passowrd to the user.

Diffstat:
Mmodules/cms/action/user/UserPwAction.class.php | 2++
Mmodules/cms/ui/themes/default/html/views/user/pw.php | 40++++++++++++++++++++--------------------
Mmodules/cms/ui/themes/default/html/views/user/pw.tpl.src.xml | 18+++++++++---------
3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/modules/cms/action/user/UserPwAction.class.php b/modules/cms/action/user/UserPwAction.class.php @@ -9,8 +9,10 @@ use util\exception\ValidationException; class UserPwAction extends UserAction implements Method { + public function view() { $this->setTemplateVar('enabled',$this->user->type == User::AUTH_TYPE_INTERNAL ); + $this->setTemplateVar('mail' ,(boolean) $this->user->mail ); $this->setTemplateVar('password_proposal', $this->user->createPassword() ); } diff --git a/modules/cms/ui/themes/default/html/views/user/pw.php b/modules/cms/ui/themes/default/html/views/user/pw.php @@ -17,14 +17,14 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('password_proposal') ?>" value="<?php echo O::escapeHtml(''.@$password_proposal.'') ?>" /><?php echo O::escapeHtml('') ?> </div> </section> - <?php $if4=(O::config(['mail','enabled'])); if($if4) { ?> - <section class="<?php echo O::escapeHtml('or-group or-collapsible or-collapsible--is-open or-collapsible--is-visible or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> - <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-closed or-collapsible--on-closed') ?>"><?php echo O::escapeHtml('') ?></i> - <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-open or-collapsible--on-open') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml(''.@O::lang('options').'') ?></span> - </h2> - <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <section class="<?php echo O::escapeHtml('or-group or-collapsible or-collapsible--is-open or-collapsible--is-visible or-collapsible--show') ?>"><?php echo O::escapeHtml('') ?> + <h2 class="<?php echo O::escapeHtml('or-collapsible-title or-group-title or-collapsible-act-switch') ?>"><?php echo O::escapeHtml('') ?> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-closed or-collapsible--on-closed') ?>"><?php echo O::escapeHtml('') ?></i> + <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--node-open or-collapsible--on-open') ?>"><?php echo O::escapeHtml('') ?></i> + <span><?php echo O::escapeHtml(''.@O::lang('options').'') ?></span> + </h2> + <div class="<?php echo O::escapeHtml('or-collapsible-value or-group-value') ?>"><?php echo O::escapeHtml('') ?> + <?php $if5=(O::config(['mail','enabled'])); if($if5) { ?> <?php $if6=(isset($mail)); if($if6) { ?> <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> @@ -35,19 +35,19 @@ </label> </div> </section> - <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> - <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> - <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> - <label><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('timeout') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$timeout){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> - <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_password_timeout').'') ?></span> - </label> - </div> - </section> <?php } ?> - </div> - </section> - <?php } ?> + <?php } ?> + <section class="<?php echo O::escapeHtml('or-fieldset') ?>"><?php echo O::escapeHtml('') ?> + <h3 class="<?php echo O::escapeHtml('or-fieldset-label') ?>"><?php echo O::escapeHtml('') ?></h3> + <div class="<?php echo O::escapeHtml('or-fieldset-value') ?>"><?php echo O::escapeHtml('') ?> + <label><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('timeout') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$timeout){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> class="<?php echo O::escapeHtml('or-form-checkbox') ?>" /><?php echo O::escapeHtml('') ?> + <span class="<?php echo O::escapeHtml('or-form-label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_password_timeout').'') ?></span> + </label> + </div> + </section> + </div> + </section> </div> <div class="<?php echo O::escapeHtml('or-form-actionbar') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-btn or-btn--control or-btn--secondary or-act-form-cancel') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/pw.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/pw.tpl.src.xml @@ -9,22 +9,22 @@ <hidden name="password_proposal"/> </fieldset> - <if true="${config:mail/enabled}"> - <group title="${message:options}"> + <group title="${message:options}"> + <if true="${config:mail/enabled}"> <if present="mail"> <fieldset> <checkbox name="email" label="${message:user_mail_new_password}"/> </fieldset> - - <fieldset> - <checkbox name="timeout" label="${message:user_password_timeout}"/> - </fieldset> </if> - </group> - </if> + </if> + + <fieldset> + <checkbox name="timeout" label="${message:user_password_timeout}"/> + </fieldset> + </group> </form> </if> <else> - <text class="message" value="${message:PWCHANGE_NOT_ALLOWED}" /> + <text class="message" value="${message:PWCHANGE_NOT_ALLOWED}"/> </else> </output>