Commit 167e6142 authored by stimpy's avatar stimpy
Browse files

fixed bug filtering all netmails

parent 74ff3edd
......@@ -43,8 +43,8 @@
if ( ( array_search( 'MSG_PRIVATE', $r['attribute1'] ) !== false ) OR ( $echos[$echo]['group'] == 'netmail' ) ) {
if ( ( !array_search( $r['OADDRESS'][0], $user['groups'] ) )
AND ( !array_search( $r['DADDRESS'][0], $user['groups'] ) )
AND ( strtolower( $r['RECEIVERNAME'][0] != strtolower( $user['realname'] ) ) )
AND ( strtolower( $r['SENDERNAME'][0] != strtolower( $user['realname'] ) ) )
AND ( strtolower( $r['RECEIVERNAME'][0] ) != strtolower( $user['realname'] ) )
AND ( strtolower( $r['SENDERNAME'][0] ) != strtolower( $user['realname'] ) )
AND ( !array_search( strtolower( $r['RECEIVERNAME'][0] ), $user['aliases'] ) )
AND ( !array_search( strtolower( $r['SENDERNAME'][0] ), $user['aliases'] ) ) ) {
$r = false;
......
This diff is collapsed.
......@@ -43,8 +43,8 @@
if ( ( array_search( 'MSG_PRIVATE', $r['attribute1'] ) !== false ) OR ( $echos[$echo]['group'] == 'netmail' ) ) {
if ( ( !array_search( $r['OADDRESS'][0], $user['groups'] ) )
AND ( !array_search( $r['DADDRESS'][0], $user['groups'] ) )
AND ( strtolower( $r['RECEIVERNAME'][0] != strtolower( $user['realname'] ) ) )
AND ( strtolower( $r['SENDERNAME'][0] != strtolower( $user['realname'] ) ) )
AND ( strtolower( $r['RECEIVERNAME'][0] ) != strtolower( $user['realname'] ) )
AND ( strtolower( $r['SENDERNAME'][0] ) != strtolower( $user['realname'] ) )
AND ( !array_search( strtolower( $r['RECEIVERNAME'][0] ), $user['aliases'] ) )
AND ( !array_search( strtolower( $r['SENDERNAME'][0] ), $user['aliases'] ) ) ) {
$r = false;
......
......@@ -165,9 +165,9 @@ function getMessageHeaders( $echo, $start, $async, $count ) {
for ( i = 0; i < msg.length; i++ ) {
if ( msg[i] !== false ) {
var $tr = document.createElement('tr');
if ( msg[i]['RECEIVERNAME'] == $user['realname'] || $user['aliases'].indexOf( msg[i]['RECEIVERNAME'] ) >= 0 ) {
if ( msg[i]['RECEIVERNAME'][0] == $user['realname'] || $user['aliases'].indexOf( msg[i]['RECEIVERNAME'][0] ) >= 0 ) {
$tr.className = 'personal';
} else if ( msg[i]['SENDERNAME'] == $user['realname'] || $user['aliases'].indexOf( msg[i]['SENDERNAME'] ) >= 0 ) {
} else if ( msg[i]['SENDERNAME'][0] == $user['realname'] || $user['aliases'].indexOf( msg[i]['SENDERNAME'][0] ) >= 0 ) {
$tr.className = 'sent';
}
$tr.dataset.messagenumber = msg[i]['messagenumber'];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment