smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sat Jan 11 2025 Brian Read <brianr@koozali.org> 11.0.0-38.sme

Browse Source 
- Fix password reset for admin in user panel [SME: 12655]
This commit is contained in:
Brian Read 2025-01-11 07:04:32 +00:00
parent 174e140a04
commit 5ef3a00a05
2 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep
View File

@ -66,58 +66,65 @@
%my $password_text = l("PASSWORD_RESET"); %my $password_text = l("PASSWORD_RESET");
%if ($useraccounts_user_name eq 'admin') { %if ($useraccounts_user_name eq 'admin') {
%$actionModify = qq{ %$actionModify = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPS&user=$useraccounts_user_name">
% <button type='button' class='sme-modify-button' title='$modify_text'> % <button type='button' class='sme-modify-button' title='$modify_text'>
% $modify_text % $modify_text
% </button> % </button>
% </a> %</a>
%};
%$actionResetPw = qq{
%<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWS&user=$useraccounts_user_name">
% <button type='button' class='sme-password-button' title='$password_text' >
% $password_text
% </button>
%</a>
%}; %};
%} else { %} else {
%$actionModify = qq{ %$actionModify = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=UPD&user=$useraccounts_user_name">
% <button type='button' class='sme-modify-button' title='$modify_text' > % <button type='button' class='sme-modify-button' title='$modify_text' >
% $modify_text % $modify_text
% </button> % </button>
% </a> %</a>
%}; %};
%} %}
%if ($password_set ne 'yes') { %if ($password_set ne 'yes') {
%$actionLock = l('ACCOUNT_LOCKED'); %$actionLock = l('ACCOUNT_LOCKED');
%$actionResetPw = qq{ %$actionResetPw = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class='sme-password-button unset' title="$password_text - currently unset" style = background:pink; > % <button type='button' class='sme-password-button unset' title="$password_text - currently unset" style = background:pink; >
% $password_text % $password_text
% </button> % </button>
% </a> %</a>
%}; %};
%} else { %} elsif ($useraccounts_user_name ne 'admin') {
%my $lock_text = l('ACCOUNT LOCKED'); # Localized text %my $lock_text = l('ACCOUNT LOCKED'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security %my $csrf_token = "TOKEN"; # CSRF token for security
%my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure %my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
%$actionLock = qq{ %$actionLock = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=LCK&user=$useraccounts_user_name">
% <button type='button' class='sme-lock-button' title='$lock_text' > % <button type='button' class='sme-lock-button' title='$lock_text' >
% $lock_text % $lock_text
% </button> % </button>
% </a> %</a>
%}; %};
%$actionResetPw = qq{ %$actionResetPw = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=PWD&user=$useraccounts_user_name">
% <button type='button' class='sme-password-button' title='$password_text' > % <button type='button' class='sme-password-button' title='$password_text' >
% $password_text % $password_text
% </button> % </button>
% </a> %</a>
%}; %};
%} %}
%if ( $removable eq 'yes' ) { %if ( $removable eq 'yes' ) {
%my $remove_text = l('REMOVE'); # Localized text %my $remove_text = l('REMOVE'); # Localized text
%my $csrf_token = "TOKEN"; # CSRF token for security %my $csrf_token = "TOKEN"; # CSRF token for security
%$actionRemove = qq{ %$actionRemove = qq{
% <a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name"> %<a href="useraccountsd?CsrfDef=$csrf_token&trt=DEL&user=$useraccounts_user_name">
% <button type='button' class='sme-remove-button' title='$remove_text' > % <button type='button' class='sme-remove-button' title='$remove_text' >
% $remove_text % $remove_text
% </button> % </button>
% </a> %</a>
%}; %};
%} %}
@ -127,13 +134,12 @@
%my $csrf_token = "TOKEN"; # CSRF token for security %my $csrf_token = "TOKEN"; # CSRF token for security
%my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure %my $useraccounts_user_name = $user->key; # useraccountss_entry name extracted from the data structure
%$actionroundcube = qq{ %$actionroundcube = qq{
% <a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name"> %<a href="roundcubepanel?CsrfDef=$csrf_token&url=https://$thisdomain/roundcube?_user=$useraccounts_user_name">
% <button type='button' class='sme-email-button' title='$roundcube_text' > % <button type='button' class='sme-email-button' title='$roundcube_text' >
% $roundcube_text % $roundcube_text
% </button> % </button>
% </a> %</a>
%}; %};
<td class='sme-border' style="min-width:35em"> <td class='sme-border' style="min-width:35em">
<%= $c->render_to_string(inline => $actionModify) %> <%= $c->render_to_string(inline => $actionModify) %>
<%= $c->render_to_string(inline => $actionResetPw) %> <%= $c->render_to_string(inline => $actionResetPw) %>

7
smeserver-manager.spec
View File

@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager %define name smeserver-manager
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 37 %define release 38
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -115,8 +115,11 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Sat Jan 11 2025 Brian Read <brianr@koozali.org> 11.0.0-38.sme
- Fix password reset for admin in user panel [SME: 12655]
* Thu Jan 09 2025 Brian Read <brianr@koozali.org> 11.0.0-37.sme * Thu Jan 09 2025 Brian Read <brianr@koozali.org> 11.0.0-37.sme
- Delete userpanelaccess from base (left in incorrectly after saome testing) [SME: 12839] - Delete userpanelaccess from base (left in incorrectly after some testing) [SME: 12839]
* Thu Jan 09 2025 Brian Read <brianr@koozali.org> 11.0.0-36.sme * Thu Jan 09 2025 Brian Read <brianr@koozali.org> 11.0.0-36.sme
- Fix spamassassin status not coming through from email filter panel to email settings panel [SME: 12868] - Fix spamassassin status not coming through from email filter panel to email settings panel [SME: 12868]