Include personal title in cn/dn

[gosa.git] / plugins / personal / connectivity / class_pptpAccount.inc

diff --git a/plugins/personal/connectivity/class_pptpAccount.inc b/plugins/personal/connectivity/class_pptpAccount.inc
index 3a23148bc1e90fe490c181551b300554cdded296..ba416e37c3e040e1bbcd935877a3d7d8f5a53070 100644 (file)
--- a/plugins/personal/connectivity/class_pptpAccount.inc
+++ b/plugins/personal/connectivity/class_pptpAccount.inc
@@ -35,15 +35,23 @@ class pptpAccount extends plugin
   var $attributes= array();
   var $objectclasses= array("pptpServerAccount");
 
-  function pptpAccount ($config, $dn= NULL)
+  var $uid ="";
+
+  function pptpAccount ($config, $dn= NULL, $parent= NULL)
   {
-    plugin::plugin ($config, $dn);
+    plugin::plugin ($config, $dn, $parent);
+    
+    /* Setting uid to default */
+    if(isset($this->attrs['uid'][0])){
+      $this->uid = $this->attrs['uid'][0];
+    }
+
   }
 
   function execute()
   {
        /* Call parent execute */
-       plugin::execute();
+//     plugin::execute();
 
     /* Show tab dialog headers */
     $display= "";
@@ -58,10 +66,6 @@ class pptpAccount extends plugin
       $smarty->assign("wstate", "disabled");
     }
 
-    if ($this->parent != NULL){
-      $smarty->assign("tabbed", 1);
-    }
-
     $smarty->assign('gosapptpACL', chkacl($this->acl, 'gosapptp'));
 
     $display.= $smarty->fetch (get_template_path('pptp.tpl', TRUE, dirname(__FILE__)));
@@ -70,22 +74,26 @@ class pptpAccount extends plugin
 
   function remove_from_parent()
   {
-    /* Cancel if there's nothing to do here */
-    if (!$this->initially_was_account){
-      return;
-    }
+    if(chkacl($this->acl, 'gosapptp') == ""){
+      /* Cancel if there's nothing to do here */
+      if (!$this->initially_was_account){
+        return;
+      }
+
+      plugin::remove_from_parent();
+      $ldap= $this->config->get_ldap_link();
 
-    plugin::remove_from_parent();
-    $ldap= $this->config->get_ldap_link();
+      $ldap->cd($this->dn);
+      @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
+          $this->attributes, "Save");
+      $this->cleanup();
+      $ldap->modify ($this->attrs); 
 
-    $ldap->cd($this->dn);
-    @DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
-        $this->attributes, "Save");
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
+      show_ldap_error($ldap->get_error(), _("Removing PPTP account failed"));
 
-    /* Optionally execute a command after we're done */
-    $this->handle_post_events('remove');
+      /* Optionally execute a command after we're done */
+      $this->handle_post_events('remove',array("uid" => $this->uid));
+    }
   }
 
 
@@ -115,23 +123,26 @@ class pptpAccount extends plugin
   /* Save to LDAP */
   function save()
   {
-    plugin::save();
-
-    /* Write back to ldap */
-    $ldap= $this->config->get_ldap_link();
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
-    /* Optionally execute a command after we're done */
-    if ($this->initially_was_account == $this->is_account){
-      if ($this->is_modified){
-        $this->handle_post_events("mofify");
+    if(chkacl($this->acl, 'gosapptp') == ""){
+      plugin::save();
+
+      /* Write back to ldap */
+      $ldap= $this->config->get_ldap_link();
+      $ldap->cd($this->dn);
+      $this->cleanup();
+      $ldap->modify ($this->attrs); 
+
+      show_ldap_error($ldap->get_error(), _("Saving PPTP account failed"));
+
+      /* Optionally execute a command after we're done */
+      if ($this->initially_was_account == $this->is_account){
+        if ($this->is_modified){
+          $this->handle_post_events("modify",array("uid" => $this->uid));
+        }
+      } else {
+        $this->handle_post_events("add",array("uid" => $this->uid));
       }
-    } else {
-      $this->handle_post_events("add");
     }
-
   }
 
 }