mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
functions.inc.php:
- gen_show_status(): honor recipient_delimiter in POP/IMAP check git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@657 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
de447795da
commit
7480181a18
@ -2174,8 +2174,15 @@ function gen_show_status ($show_alias)
|
||||
// POP/IMAP CHECK
|
||||
if ( $CONF['show_popimap'] == 'YES' )
|
||||
{
|
||||
$stat_delimiter = "";
|
||||
if (!empty($CONF['recipient_delimiter'])) {
|
||||
$delimiter = preg_quote($CONF['recipient_delimiter'], "/");
|
||||
$stat_delimiter = preg_replace('/' .$delimiter. '[^' .$delimiter. '@]*@/', "@", $stat_goto);
|
||||
$stat_delimiter = ',' . $stat_delimiter;
|
||||
}
|
||||
|
||||
//if the address passed in appears in its own goto field, its POP/IMAP
|
||||
if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . ',') )
|
||||
if ( preg_match ('/,' . $show_alias . ',/', ',' . $stat_goto . $stat_delimiter . ',') )
|
||||
{
|
||||
$stat_string .= "<span style='background-color:" . $CONF['show_popimap_color'] .
|
||||
"'>" . $CONF['show_status_text'] . "</span> ";
|
||||
|
Loading…
Reference in New Issue
Block a user