Changeset 1523 for trunk/expressoAdmin1_2/inc

Timestamp:

10/26/09 12:48:29 (15 years ago)

Author:

wmerlotto

Message:

Ticket #690 - emailadmin alterado permitindo a integração, ou não, com anti-spam

File:

• trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php (modified) (3 diffs)

trunk/expressoAdmin1_2/inc/class.imap_functions.inc.php

@@ -23 +23 @@
                 $this->imap_server      = $_SESSION['phpgw_info']['expresso']['email_server']['imapServer'];
                 $this->imap_port        = $_SESSION['phpgw_info']['expresso']['email_server']['imapPort'];
+                $this->imap_createspamfolder    = $_SESSION['phpgw_info']['expresso']['email_server']['imapCreateSpamFolder'];
+                $this->imap_cyrususerspam = $_SESSION['phpgw_info']['expresso']['email_server']['imapCyrusUserPostSpam'] ? $_SESSION['phpgw_info']['expresso']['email_server']['imapCyrusUserPostSpam'] : "anonymous";
                 $this->imap_trashfolder  = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder']  ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultTrashFolder']  : str_replace("*","", $this->functions->lang("trash"));
                 $this->imap_sentfolder   = $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder']   ? $_SESSION['phpgw_info']['expresso']['email_server']['imapDefaultSentFolder']   : str_replace("*","", $this->functions->lang("sent"));
@@ -68 +70 @@
                         return $result;
                 }
-                /* Esperando correção do william (prognus) sobre a utilização do DSPAM
-                if (!empty($this->imap_sentfolder))
+                if (!empty($this->imap_spamfolder) && $this->imap_createspamfolder == 'yes')
                 {
                     if (!imap_createmailbox($this->imap, '{'.$this->imap_server.'}' . "user" . $this->imapDelimiter . $uid . $this->imapDelimiter . $this->imap_spamfolder))
@@ -77 +78 @@
                             $result['msg'] = $this->functions->lang('Error on function') . " imap_functions->create(".$this->imap_spamfolder."):" . $error[0];
                             return $result;
-                        }
-                }
-                */
+                        } else {
+                                imap_setacl($this->imap, "user" . $this->imapDelimiter . $uid.  $this->imapDelimiter . $this->imap_spamfolder , $this->imap_cyrususerspam, 'p');                        
+         }
+                }               
 
                 if (!imap_set_quota($this->imap,"user" . $this->imapDelimiter . $uid, ($mailquota*1024)))