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 remote-tracking branch 'origin/postfixadmin_3.3'

Browse Source
This commit is contained in:
David Goodwin 2021-01-25 17:01:06 +00:00
commit 7589326c15
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.inc.php
View File

@ -2207,7 +2207,7 @@ function gen_show_status($show_alias) {
}
// Vacation CHECK
if ( $CONF['show_vacation'] == 'YES' ) {
if ( array_key_exists('show_vacation', $CONF) && $CONF['show_vacation'] == 'YES' ) {
$stat_result = db_query_one("SELECT * FROM ". table_by_key('vacation') ." WHERE email = ? AND active = ? ", array($show_alias, db_get_boolean(true) )) ;
if (!empty($stat_result)) {
$stat_string .= "<span style='background-color:" . $CONF['show_vacation_color'] . "'>" . $CONF['show_status_text'] . "</span>&nbsp;";
@ -2217,7 +2217,7 @@ function gen_show_status($show_alias) {
}
// Disabled CHECK
if ( $CONF['show_disabled'] == 'YES' ) {
if ( array_key_exists('show_disabled', $CONF) && $CONF['show_disabled'] == 'YES' ) {
$stat_result = db_query_one(
"SELECT * FROM ". table_by_key('mailbox') ." WHERE username = ? AND active = ?",
array($show_alias, db_get_boolean(false))

5
model/PFASmarty.php
View File

@ -70,7 +70,10 @@ class PFASmarty {
if (!empty($CONF['theme_custom_css'])) {
$CONF['theme_custom_css'] = $rel_path . htmlentities($CONF['theme_custom_css']);
}
$CONF['theme_favicon'] = $rel_path . htmlentities($CONF['theme_favicon']);
if (array_key_exists('theme_favicon', $CONF)) {
$CONF['theme_favicon'] = $rel_path . htmlentities($CONF['theme_favicon']);
}
$CONF['theme_logo'] = $rel_path . htmlentities($CONF['theme_logo']);
$this->assign('rel_path', $rel_path);