several acl fixes

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

diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index fc53581a74c67d3029ccfaa4d047406f75d6a64f..558126b666f2a4c81d389f21bdce6c253db8f5d5 100644 (file)
--- a/plugins/personal/connectivity/class_oxchangeAccount.inc
+++ b/plugins/personal/connectivity/class_oxchangeAccount.inc
@@ -872,8 +872,8 @@ class oxchangeAccount extends plugin
       $q=sprintf($os,$uid,$calendarid[0],$contactsid[0],$tasksid[0]);
       @pg_exec($pgcon,$q);
       $q=sprintf($ugr,$uid);
-      qpg_exec($pgcon,$q);
-      pg_close($pgcon);
+      @pg_exec($pgcon,$q);
+      @pg_close($pgcon);
     }
   }
 

diff --git a/plugins/personal/connectivity/class_phpgwAccount.inc b/plugins/personal/connectivity/class_phpgwAccount.inc
index 0080bbbc9690460483f9787159584a34f0e4409b..165a1beb4e44c73d08d1765d4bd0390a7aa51dcb 100644 (file)
--- a/plugins/personal/connectivity/class_phpgwAccount.inc
+++ b/plugins/personal/connectivity/class_phpgwAccount.inc
@@ -34,7 +34,6 @@ class phpgwAccount extends plugin
     /* Load attributes */
     foreach($this->attributes as $val){
       $smarty->assign("$val", $this->$val);
-      $smarty->assign($val."ACL", chkacl($this->acl, "$val"));
     }
     if ($this->is_account){
       $smarty->assign("phpgwState", "checked");

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 2330728c1133b549d003e86213a524e1058fa4cc..02a466f9e61226d99f0f2b79feff7866b9500650 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -120,7 +120,7 @@ class pptpAccount extends plugin
   /* Save to LDAP */
   function save()
   {
-    if(chkacl($this->acl, 'gosapptp') == ""){
+    if($this->acl_is_createable()){
       plugin::save();
 
       /* Write back to ldap */

diff --git a/plugins/personal/connectivity/class_webdavAccount.inc b/plugins/personal/connectivity/class_webdavAccount.inc
index 58acf40cb86588e377560856a93650a9526c5eeb..6a33d4a38c8a460334e15e1e249ead632655f1af 100644 (file)
--- a/plugins/personal/connectivity/class_webdavAccount.inc
+++ b/plugins/personal/connectivity/class_webdavAccount.inc
@@ -50,7 +50,7 @@ class webdavAccount extends plugin
 
   function remove_from_parent()
   {
-    if(chkacl($this->acl,"webdavAccount")==""){
+    if($this->acl_is_createable() || $this->is_account){
       /* Cancel if there's nothing to do here */
       if (!$this->initially_was_account){
         return;
@@ -103,7 +103,7 @@ class webdavAccount extends plugin
   /* Save to LDAP */
   function save()
   {
-    if(chkacl($this->acl,"webdavAccount")==""){
+    if($this->acl_is_createable()){
       plugin::save();
 
       /* Write back to ldap */