From d9326a1f38bf0ffe33e627fada9df71e0a00cc17 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Tue, 22 Jan 2019 20:28:20 +0000 Subject: [PATCH] remove show_expired code from 3.2 branch - see #235 --- functions.inc.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index cf8e7a26..6e94c14e 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -2157,22 +2157,6 @@ function gen_show_status($show_alias) { } } - // Expired CHECK - if ( Config::bool('password_expiration') && Config::bool('show_expired') ) { - $now = 'now()'; - if (db_sqlite()) { - $now = "datetime('now')"; - } - - $stat_result = db_query("SELECT * FROM ". $CONF['database_tables']['mailbox'] ." WHERE username = '" . $show_alias . "' AND password_expiry <= $now AND active = '" . db_get_boolean(true) . "'"); - - if ($stat_result['rows'] == 1) { - $stat_string .= "" . $CONF['show_status_text'] . " "; - } else { - $stat_string .= $CONF['show_status_text'] . " "; - } - } - // POP/IMAP CHECK if ($CONF['show_popimap'] == 'YES') { $stat_delimiter = "";