Some acl fixes

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

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 80551fd6e1a444837c53550405e17dae00416fb3..0518d9606a55f962cbcc4692feb45afb988c8a8e 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -285,7 +285,7 @@ class kolabAccount extends plugin
     }
 
     /* Check for URL scheme... */
-    if(!empty($this->calFBURL) && !preg_match("/(https|https):\/\//",$this->calFBURL)){
+    if(!empty($this->calFBURL) && !preg_match("/http+(s)*:\/\//",$this->calFBURL)){
       $message[]= _("The value specified as Free Busy Information URL is invalid.");
     }
 

diff --git a/plugins/personal/connectivity/class_proxyAccount.inc b/plugins/personal/connectivity/class_proxyAccount.inc
index bf40e92e809bb18b90cc9524599f892ebaac0ee5..cb03ec2d10b2ae254f35478873103f98ad46307c 100644 (file)
--- a/plugins/personal/connectivity/class_proxyAccount.inc
+++ b/plugins/personal/connectivity/class_proxyAccount.inc
@@ -19,8 +19,8 @@ class proxyAccount extends plugin
   var $gosaProxyQuotaPeriod= "m";
 
   /* attribute list for save action */
-  var $attributes= array("gosaProxyID", "gosaProxyAcctFlags", "gosaProxyWorkingStart",
-      "gosaProxyWorkingStop", "gosaProxyQuota", "gosaProxyQuotaPeriod");
+  var $attributes= array(   "gosaProxyID", "gosaProxyAcctFlags", "gosaProxyWorkingStart",
+                            "gosaProxyWorkingStop", "gosaProxyQuota", "gosaProxyQuotaPeriod");
   var $objectclasses= array("gosaProxyAccount");
 
   var $uid = "";
@@ -38,8 +38,8 @@ class proxyAccount extends plugin
 
   function execute()
   {
-       /* Call parent execute */
-//     plugin::execute();
+    /* Call parent execute */
+    plugin::execute();
 
     $display= "";
 

diff --git a/plugins/personal/netatalk/class_netatalk.inc b/plugins/personal/netatalk/class_netatalk.inc
index 49a90a39d1273cf80cd572292a6b905a20e2faf1..9475f4d4b00fc16bc36f53e98385ede3d4d7314f 100644 (file)
--- a/plugins/personal/netatalk/class_netatalk.inc
+++ b/plugins/personal/netatalk/class_netatalk.inc
@@ -217,8 +217,6 @@ class netatalk extends plugin {
   function check() {
     $message = array ();
   
-    echo $this->apple_user_share;
-
     if (strlen($this->apple_user_share) == 0) {
       $message[] = _("You must select a share to use.");
     }