X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_mail-methods-cyrus.inc;h=1c361877b8e18009fb6074399c9644ef078d8b52;hb=87a10c71fc4a79af78f6648f0dc25df415baf892;hp=239cd2e8a10522f10576c7701a2ab7246be7dfeb;hpb=c2c6a6e54355a1b67c25bb4d761d847513810d02;p=gosa.git

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 239cd2e8a..1c361877b 100644
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -18,7 +18,6 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-
 class mailMethodCyrus extends mailMethod
 {
   var $mbox= "-";
@@ -32,12 +31,21 @@ class mailMethodCyrus extends mailMethod
 
   function connect($gosaMailServer)
   {
+    $cfg=array();
+
     /* Connect to IMAP server. I don't want to see these warning here... */
-    error_reporting (0);
     $this->gosaMailServer= $gosaMailServer;
-    $cfg= $this->config[$gosaMailServer];
+    if (!isset($this->config[$gosaMailServer])){
+      print_red(_("Warning: Account has an invalid mailserver string!"));
+    } else {
+      $cfg= $this->config[$gosaMailServer];
+    }
+    /* For some reason, hiding errors with @ does not wor here... */
+    if(!isset($cfg['connect']))   $cfg['connect']="";
+    if(!isset($cfg['admin']))     $cfg['admin']="";
+    if(!isset($cfg['password']))  $cfg['password']="";
+
     $this->mbox = @imap_open($cfg['connect'], $cfg['admin'], $cfg['password'], OP_HALFOPEN);
-    error_reporting (E_ALL);
 
     /* Mailbox reachable? */
     if ($this->mbox === FALSE){
@@ -62,16 +70,30 @@ class mailMethodCyrus extends mailMethod
     if(is_array($quota_value)) {
       if (isset($quota_value["STORAGE"]) && is_array($quota_value["STORAGE"])){
         /* use for PHP >= 4.3 */
-        $result['quotaUsage']=    $quota_value["STORAGE"]['usage'];
-        $result['gosaMailQuota']= $quota_value["STORAGE"]['limit'];
+        if($quota_value["STORAGE"]['limit'] == 2147483647){
+          $result['quotaUsage']=    (int) ($quota_value["STORAGE"]['usage'] / 1024);
+          $result['gosaMailQuota']= (int) ($quota_value["STORAGE"]['limit'] );
+        }else{
+          $result['quotaUsage']=    (int) ($quota_value["STORAGE"]['usage'] / 1024);
+          $result['gosaMailQuota']= (int) ($quota_value["STORAGE"]['limit'] / 1024);
+        }
       } else {
-        /* backward compatible */
-        $result['quotaUsage']=    $quota_value['usage'];
-        $result['gosaMailQuota']= $quota_value['limit'];
+        /* backward icompatible */
+        if($quota_value['usage'] == 2147483647){
+          $result['quotaUsage']=    (int) ($quota_value['usage'] / 1024);
+          $result['gosaMailQuota']= (int) ($quota_value['limit'] );
+        }else{
+          $result['quotaUsage']=    (int) ($quota_value['usage'] / 1024);
+          $result['gosaMailQuota']= (int) ($quota_value['limit'] / 1024);
+        }
       }
+    }elseif(!$quota_value){
+
+      /* If there is no quota defined for this account, the function imap_get_quota returns false. */
+      return(array("quotaUsage"=>"","gosaMailQuota"=>""));
     }
+ 
     error_reporting (E_ALL);
-
     return ($result);
   }
 
@@ -114,10 +136,13 @@ class mailMethodCyrus extends mailMethod
   function setQuota($folder, $gosaMailQuota)
   {
     /* Workaround for the php imap extension */
-    if ($gosaMailQuota == ""){
-      $gosaMailQuota= "0";
+    if (($gosaMailQuota == "") || ($gosaMailQuota== "2147483647")){
+      $gosaMailQuota= "2147483647";
+    }elseif($gosaMailQuota > 0){
+      $gosaMailQuota = $gosaMailQuota *1024;
     }
-
+    
+    
     /* Write mail quota */
     if (!imap_set_quota($this->mbox, $folder, $gosaMailQuota)){
       print_red(sprintf(_("Can't write IMAP quota. Server says '%s'."), imap_last_error()));
@@ -129,12 +154,6 @@ class mailMethodCyrus extends mailMethod
 
   function setSharedFolderPermissions($folder, $permissions)
   {
-    /* Show warning message in case of missing imap_getacl */
-    if (!function_exists('imap_getacl')){
-      print_red (_("Warning: imap_getacl is not implemented, wouldn't modify acl informations."));
-      return;
-    }
-
     /* Get list of subfolders */
     $folders= $this->getMailboxList($folder, "");
     $folders[]= $folder;
@@ -145,10 +164,14 @@ class mailMethodCyrus extends mailMethod
       if (function_exists('imap_getacl')){
 
         /* Remove all acl's for this folder */
-        $users= imap_getacl ($this->mbox, $subfolder);
-        foreach ($users as $userid => $perms){
-          imap_setacl ($this->mbox, $subfolder, $userid, "");
+        $users= @imap_getacl ($this->mbox, $subfolder);
+        if(is_array($users)){
+          foreach ($users as $userid => $perms){
+            imap_setacl ($this->mbox, $subfolder, $userid, "");
+          }
         }
+      } else {
+        print_red (_("Warning: imap_getacl is not implemented, can't remove acl informations."));
       }
 
       /* Set permissions for this folder */