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

Domainadmin patch

Browse Source
This commit is contained in:
Mikko Husari
2008-12-10 17:41:16 +02:00
parent 2572b1814b
commit 773cf4217a
12 changed files with 407 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Quarantine.lib.php
View File

@@ -70,7 +70,7 @@ function releaseMessages($emailaddresses, $mail_id_array) {
$recip_email = $temp[1];
// Check if logged in user is admin or logged in user is trying to release his own messages
if ( Auth::isMailAdmin() || in_array($recip_email, $emailaddresses) )
if ( Auth::isMailAdmin() || Auth::isDomainAdmin() || in_array($recip_email, $emailaddresses) )
$result = $db->get_message($recip_email, $mail_id);
else
continue;
@@ -79,7 +79,7 @@ function releaseMessages($emailaddresses, $mail_id_array) {
// if content type is 'B' or 'V' and the logged in user is not admin
// add message to array of release request
if ( in_array($rs['content'], array( 'B', 'V')) && ! Auth::isMailAdmin() ) {
if ( in_array($rs['content'], array( 'B', 'V')) && (! Auth::isMailAdmin() && ! Auth::isDomainAdmin()) ) {
$release_req_messages[ $j ] = array(
"mail_id" => $mail_id,
"from_addr" => $rs[ 'from_addr' ],
@@ -234,7 +234,7 @@ function updateMessages($flag, $content_type, $emailaddresses, $mail_id_array, $
for ($i = 0; is_array($res) && $i < count($res); $i++) {
$rs = $res[$i];
if ( Auth::isMailAdmin() || in_array($rs['email'], $emailaddresses) ) {
if ( Auth::isMailAdmin() || Auth::isDomainAdmin() || in_array($rs['email'], $emailaddresses) ) {
if ( ! $db->update_msgrcpt_rs($rs['mail_id'], $rs['email'], $flag ) ) {
$rs = $result[0];
$result_array[ $i ] = array(
@@ -263,7 +263,7 @@ function updateMessages($flag, $content_type, $emailaddresses, $mail_id_array, $
$recip_email = $temp[1];
// Check if logged in user is admin or logged in user is trying to delete his own messages
if ( Auth::isMailAdmin() || in_array($recip_email, $emailaddresses) ) {
if ( Auth::isMailAdmin() || Auth::isDomainAdmin() || in_array($recip_email, $emailaddresses) ) {
$result = $db->get_message($recip_email, $mail_id);
} else {
continue;