geos_one/go-mailzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add patch for amavis 2.7 http://sourceforge.net/p/mailzu/patches/10/

Browse Source
This commit is contained in:
Mario Fetka
2014-04-16 11:25:38 +02:00
parent d21230a2ed
commit 401edac1a7
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Quarantine.lib.php
View File

@@ -65,9 +65,9 @@ function releaseMessages($emailaddresses, $mail_id_array) {
foreach ($mail_id_array as $mail_id_recip) {
// Get mail_id and recipient email address
$temp = preg_split('/_/', $mail_id_recip, 2);
$mail_id = $temp[0];
$recip_email = $temp[1];
$temp = preg_split('/_/', $mail_id_recip);
$mail_id = str_replace("_" . $temp[(sizeof($temp) - 1)], "", $mail_id_recip);
$recip_email = $temp[(sizeof($temp) - 1)];
// Check if logged in user is admin or logged in user is trying to release his own messages
if ( Auth::isMailAdmin() || Auth::isDomainAdmin() || in_array($recip_email, $emailaddresses) )
@@ -258,9 +258,9 @@ function updateMessages($flag, $content_type, $emailaddresses, $mail_id_array, $
foreach ($mail_id_array as $mail_id_recip) {
// Get mail_id and recipient email address
$temp = preg_split('/_/', $mail_id_recip, 2);
$mail_id = $temp[0];
$recip_email = $temp[1];
$temp = preg_split('/_/', $mail_id_recip);
$mail_id = str_replace("_" . $temp[(sizeof($temp) - 1)], "", $mail_id_recip);
$recip_email = $temp[(sizeof($temp) - 1)];
// Check if logged in user is admin or logged in user is trying to delete his own messages
if ( Auth::isMailAdmin() || Auth::isDomainAdmin() || in_array($recip_email, $emailaddresses) ) {