mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

merge postfixadmin 3.3 back into master

Browse Source
This commit is contained in:
David Goodwin 2021-01-21 20:57:30 +00:00
commit 7cf3c4c9bd
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.TXT
View File

@ -6,6 +6,11 @@
#
# Further details on the project are available at https://github.com/postfixadmin/postfixadmin
Version 3.3.5 - 2021/xx/xx
-------------------------------------------------
- Fix include path for password-change and improve UI for password-recover / password-change (nav bar was missing) (see https://github.com/postfixadmin/postfixadmin/issues/430
- ???
Version 3.3.4 - 2021/01/19
-------------------------------------------------
- Fix forgot-password (theme + trying to use class before autoload registered) (see //github.com/postfixadmin/postfixadmin/issues/427)

1
public/list.php
View File

@ -157,6 +157,7 @@ if (safeget('output') == 'csv') {
$smarty->assign('formconf', $formconf);
$smarty->assign('search', $search);
$smarty->assign('searchmode', $searchmode);
$smarty->assign('domain_selected', 'invalid'); /* stop list-virtual.tpl triggering a PHP notice */
$smarty->display('index.tpl');
}

11
templates/password-change.tpl
View File

@ -1,3 +1,14 @@
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}"
alt="Logo"/></a>
{if $CONF.show_header_text==='YES' && $CONF.header_text}
<h2>{$CONF.header_text}</h2>
{/if}
</div>
</div>
</nav>
<div id="edit_form">
<form name="mailbox" method="post">
<table>

12
templates/password-recover.tpl
View File

@ -1,3 +1,15 @@
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href='main.php'><img id="login_header_logo" src="{$CONF.theme_logo}"
alt="Logo"/></a>
{if $CONF.show_header_text==='YES' && $CONF.header_text}
<h2>{$CONF.header_text}</h2>
{/if}
</div>
</div>
</nav>
<div id="edit_form">
<form name="frmPassword" method="post" action="">
<table>