Updated sambaAccount - Couldn't set Logon hours in adminitration->users->samba

Updated goImap-Service trim spaces from connect uris

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13063 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
index e324d0c83c21e449833ef805977270ef5a758260..7652c26fb64912f179a58a032de0189247988652 100644 (file)
--- a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
@@ -108,10 +108,11 @@ class goImapServer extends goService {
     $message = plugin::check();
     if(empty($this->goImapName)){
       $message[] = msgPool::required(_("Server identifier"));
-    }  
+    } 
+
     if(empty($this->goImapConnect)){
       $message[] = msgPool::required(_("Connect URL"));
-    }elseif(!preg_match('/^\{[^:]+:[0-9]+.*\}$/', $this->goImapConnect)){
+    }elseif(!preg_match('/^\{[^:]+:[0-9]*\/.*\}$/', $this->goImapConnect)){
       $message[]= msgPool::invalid(_("Connect URL"),"","","{server-name:port/options}");
     } 
 
@@ -154,6 +155,8 @@ class goImapServer extends goService {
           }
         }
       }
+      $this->goImapConnect = trim($this->goImapConnect);
+      $this->goImapSieveServer = trim($this->goImapSieveServer);
     }
   }
 

diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
index e366f9848fc1296e43d19c208b229a815dfa677d..9b32cd88b63512682d0e123de80f841e3cae5637 100644 (file)
--- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
+++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc
@@ -282,7 +282,7 @@ class sambaAccount extends plugin
       $smarty->assign($var."ACL",$this->getacl($var,$SkipWrite));
     }
 
-    if(!session::is_set('edit')){
+    if(!session::is_set('edit') && !isset($this->parent)){
       $smarty->assign("sambaLogonHoursACL","");
     }