Some fixes fpr cleanup functionality

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

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 3f9e952d63e37ce17fe8d7c0e716fc29f13ef551..2b5ae71c864e4d6a8fca2f7367dc92493ea134f6 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -233,7 +233,7 @@ class kolabAccount extends plugin
     }
 
     /* Check for URL scheme... */
-    if ($this->calFBURL != "" && !preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
+    if ($this->calFBURL != "" && !@preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
       $message[]= _("The value specified as Free Busy Information URL is invalid.");
     }
 

diff --git a/plugins/personal/samba/class_sambaAccount.inc b/plugins/personal/samba/class_sambaAccount.inc
index d0032add21f8c32333c30c973b223a591f338bd1..c02f45af9e372a8ecfcc540dce23f0ed517174cf 100644 (file)
--- a/plugins/personal/samba/class_sambaAccount.inc
+++ b/plugins/personal/samba/class_sambaAccount.inc
@@ -58,7 +58,7 @@ class sambaAccount extends plugin
   var $sambaLogonTime= "0";
   var $sambaLogoffTime= "2147483647";
   var $sambaKickoffTime= "2147483647";
-  var $sambaPwdCanChange= "0";
+  var $sambaPwdCanChange= "";
   var $sambaPwdMustChange= "0";
   var $sambaAcctFlags= "[UX        ]";
   var $sambaHomePath= "";