Updated several service dialogs, fixed typos, string, html, post handling and more.

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

diff --git a/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc b/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
index 0f32c49ffbbaa7ab8fc9de3c5230ca74e682619b..095bab508126bba5e34b827193e51617ea1fab96 100644 (file)
--- a/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
+++ b/gosa-plugins/goto/admin/systems/services/shares/class_goShareServer.inc
@@ -2,443 +2,442 @@
 
 class goShareServer extends goService{
 
-  var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server supports shares.";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
-  /* This plugin only writes its objectClass */
-  var $objectclasses    = array("goShareServer");
-  var $attributes       = array("goExportEntry");
-  var $StatusFlag       = "goShareServerStatus";
-
-  /* This class can't be assigned twice so it conflicts with itsself */
-  var $conflicts        = array("goShareServer");
-
-  var $DisplayName      = "";
-  var $dn               = NULL;
-  var $cn                   = "";
-  var $goShareServerStatus  = "";
-  var $goExportEntry        = array();
-  var $allow_mounts         = false;
-  var $mounts_to_remove     = array();
-  var $mounts_to_add        = array();
-  var $view_logged  =FALSE;
-
-  function goShareServer(&$config,$dn)
-  {
-    goService::goService($config,$dn);
-
-    $this->DisplayName = _("File service (Shares)");
-
-    $tmp =array();
-    if(isset($this->attrs['goExportEntry'])){
-      if(isset($this->attrs['goExportEntry']['count'])){
-        for($i= 0; $i<$this->attrs['goExportEntry']['count']; $i++){
-          $entry= $this->attrs['goExportEntry'][$i];
-          $tmp[preg_replace('/\|.*$/', '', $entry)]= $entry;
+    var $cli_summary      = "This plugin is used within the ServerService Pluign \nand indicates that this server supports shares.";
+    var $cli_description  = "Some longer text\nfor help";
+    var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
+
+    /* This plugin only writes its objectClass */
+    var $objectclasses    = array("goShareServer");
+    var $attributes       = array("goExportEntry");
+    var $StatusFlag       = "goShareServerStatus";
+
+    /* This class can't be assigned twice so it conflicts with itsself */
+    var $conflicts        = array("goShareServer");
+
+    var $DisplayName      = "";
+    var $dn               = NULL;
+    var $cn                   = "";
+    var $goShareServerStatus  = "";
+    var $goExportEntry        = array();
+    var $allow_mounts         = false;
+    var $mounts_to_remove     = array();
+    var $mounts_to_add        = array();
+    var $view_logged  =FALSE;
+
+    function goShareServer(&$config,$dn)
+    {
+        goService::goService($config,$dn);
+
+        $this->DisplayName = _("File service (Shares)");
+
+        $tmp =array();
+        if(isset($this->attrs['goExportEntry'])){
+            if(isset($this->attrs['goExportEntry']['count'])){
+                for($i= 0; $i<$this->attrs['goExportEntry']['count']; $i++){
+                    $entry= $this->attrs['goExportEntry'][$i];
+                    $tmp[preg_replace('/\|.*$/', '', $entry)]= $entry;
+                }
+            }
+        } 
+        $this->goExportEntryList = $tmp;
+
+        $ldap = $this->config->get_ldap_link();
+        $avl_objectclasses = $ldap->get_objectclasses();
+        if (isset($avl_objectclasses["mount"])) {
+            $this->allow_mounts = true;
         }
-      }
-    } 
-    $this->goExportEntryList = $tmp;
-
-    $ldap = $this->config->get_ldap_link();
-    $avl_objectclasses = $ldap->get_objectclasses();
-    if (isset($avl_objectclasses["mount"])) {
-      $this->allow_mounts = true;
     }
-  }
 
 
-  function execute()
-  { 
-    $smarty = get_smarty(); 
+    function execute()
+    { 
+        $smarty = get_smarty(); 
 
-    if($this->is_account && !$this->view_logged){
-      $this->view_logged = TRUE;
-      new log("view","server/".get_class($this),$this->dn);
-    }
+        if($this->is_account && !$this->view_logged){
+            $this->view_logged = TRUE;
+            new log("view","server/".get_class($this),$this->dn);
+        }
 
 
-    if((isset($_POST['DelNfsEnt']))&&(isset($_POST['goExportEntryList'])) && ($this->acl_is_writeable("name"))){
-      if($this->allow_mounts){
-        foreach($_POST['goExportEntryList'] as $entry){
-          $this->deleteFromMountList($this->goExportEntryList[$entry]);
+        if((isset($_POST['DelNfsEnt']))&&(isset($_POST['goExportEntryList'])) && ($this->acl_is_writeable("name"))){
+            if($this->allow_mounts){
+                foreach(get_post('goExportEntryList') as $entry){
+                    $this->deleteFromMountList($this->goExportEntryList[$entry]);
+                }
+            }
+            foreach(get_post('goExportEntryList') as $entry){
+                $this->deleteFromList($entry);
+            }
         }
-      }
-      foreach($_POST['goExportEntryList'] as $entry){
-        $this->deleteFromList($entry);
-      }
-    }
 
-    if(isset($_POST['NewNfsAdd']) && ($this->acl_is_writeable("name"))){
-      $this->oldone = NULL;
-      $this->o_subWindow = new servnfs($this->config, $this);
-      $this->o_subWindow->set_acl_category("server");
-      $this->o_subWindow->set_acl_base($this->dn);
-      $this->dialog = true;
-    }
+        if(isset($_POST['NewNfsAdd']) && ($this->acl_is_writeable("name"))){
+            $this->oldone = NULL;
+            $this->o_subWindow = new servnfs($this->config, $this);
+            $this->o_subWindow->set_acl_category("server");
+            $this->o_subWindow->set_acl_base($this->dn);
+            $this->dialog = true;
+        }
 
-    if((isset($_POST['NewNfsEdit']))&&(isset($_POST['goExportEntryList']))){
-      $entry = $this->goExportEntryList[$_POST['goExportEntryList'][0]];
-      $add_mount=isset($this->mounts_to_add[$entry]);
-      $this->oldone=$entry;
-      $this->o_subWindow = new servnfs($this->config,$this,$entry,$add_mount);
-      $this->o_subWindow->set_acl_base($this->dn);
-      $this->o_subWindow->set_acl_category("server");
-      $this->dialog = true;
-    }
-    if(isset($this->o_subWindow)){
-      $this->o_subWindow->save_object(TRUE);
-    }
+        if((isset($_POST['NewNfsEdit']))&&(isset($_POST['goExportEntryList']))){
+            $entry = $this->goExportEntryList[$_POST['goExportEntryList'][0]];
+            $add_mount=isset($this->mounts_to_add[$entry]);
+            $this->oldone=$entry;
+            $this->o_subWindow = new servnfs($this->config,$this,$entry,$add_mount);
+            $this->o_subWindow->set_acl_base($this->dn);
+            $this->o_subWindow->set_acl_category("server");
+            $this->dialog = true;
+        }
+        if(isset($this->o_subWindow)){
+            $this->o_subWindow->save_object(TRUE);
+        }
 
-    /* Save NFS setup */
-    if(isset($_POST['NFSsave']) && isset($this->o_subWindow) && is_object($this->o_subWindow)){
-      if(count($this->o_subWindow->check())>0){
-        foreach($this->o_subWindow->check() as $msg) {
-          msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
+        /* Save NFS setup */
+        if(isset($_POST['NFSsave']) && isset($this->o_subWindow) && is_object($this->o_subWindow)){
+            if(count($this->o_subWindow->check())>0){
+                foreach($this->o_subWindow->check() as $msg) {
+                    msg_dialog::display(_("Error"), $msg, ERROR_DIALOG);
+                }
+            }else{
+                $this->o_subWindow->save_object();
+                $newone = $this->o_subWindow->save();
+
+                $this->addToList($newone);
+                if($this->allow_mounts){
+                    if($this->oldone != NULL) {
+                        $this->deleteFromMountList($this->oldone);
+                    }
+                    if ($this->o_subWindow->should_create_mount()) {
+                        $this->addToMountList($newone);
+                    }
+                }
+                unset($this->o_subWindow);
+                $this->dialog = false;
+            }
         }
-      }else{
-        $this->o_subWindow->save_object();
-        $newone = $this->o_subWindow->save();
-
-        $this->addToList($newone);
-        if($this->allow_mounts){
-          if($this->oldone != NULL) {
-            $this->deleteFromMountList($this->oldone);
-          }
-          if ($this->o_subWindow->should_create_mount()) {
-            $this->addToMountList($newone);
-          }
+
+        /* Cancel NFS setup */
+        if(isset($_POST['NFScancel'])){
+            $this->oldone = NULL;
+            unset($this->o_subWindow);
+            $this->dialog = false;
         }
-        unset($this->o_subWindow);
-        $this->dialog = false;
-      }
-    }
 
-    /* Cancel NFS setup */
-    if(isset($_POST['NFScancel'])){
-      $this->oldone = NULL;
-      unset($this->o_subWindow);
-      $this->dialog = false;
-    }
+        /* Execute NFS setup dialog*/
+        if(isset($this->o_subWindow)){
+            return $this->o_subWindow->execute();
+        }
 
-    /* Execute NFS setup dialog*/
-    if(isset($this->o_subWindow)){
-      return $this->o_subWindow->execute();
-    }
+        foreach($this->attributes as $attr){
+            $smarty->assign($attr,set_post($this->$attr));
+        }
 
-    foreach($this->attributes as $attr){
-      $smarty->assign($attr,$this->$attr);
+        /* Set acls */
+        $tmp = $this->plInfo();
+        foreach($tmp['plProvidedAcls'] as $name => $translated){
+            $smarty->assign($name."ACL",$this->getacl($name));
+        }
+        $smarty->assign("createable",$this->acl_is_createable());
+        $smarty->assign("removeable",$this->acl_is_removeable());
+
+        $tellSmarty= array();
+        ksort($this->goExportEntryList);
+        foreach($this->goExportEntryList as $name=>$values){
+            $tmp = explode("|",$values);
+            $tellSmarty[$name] = $tmp[0]." ".$tmp[4]." (".$tmp[2].")";
+        }
+        $smarty->assign("goExportEntry",        array_keys($tellSmarty));
+        $smarty->assign("goExportEntryKeys",    ($tellSmarty));
+        return($smarty->fetch(get_template_path("goShareServer.tpl",TRUE,dirname(__FILE__))));
     }
 
-    /* Set acls */
-    $tmp = $this->plInfo();
-    foreach($tmp['plProvidedAcls'] as $name => $translated){
-      $smarty->assign($name."ACL",$this->getacl($name));
-    }
-    $smarty->assign("createable",$this->acl_is_createable());
-    $smarty->assign("removeable",$this->acl_is_removeable());
-
-    $tellSmarty= array();
-    ksort($this->goExportEntryList);
-    foreach($this->goExportEntryList as $name=>$values){
-      $tmp = explode("|",$values);
-      $tellSmarty[$name] = $tmp[0]." ".$tmp[4]." (".$tmp[2].")";
-    }
-    $smarty->assign("goExportEntry",array_keys($tellSmarty));
-    $smarty->assign("goExportEntryKeys",($tellSmarty));
-    return($smarty->fetch(get_template_path("goShareServer.tpl",TRUE,dirname(__FILE__))));
-  }
-
-
-  function getListEntry()
-  {
-    $fields = goService::getListEntry();
-    $fields['Message']    = _("File service (Shares)");
-    #$fields['AllowEdit']  = true;
-    return($fields);
-  }
-
-
-  function save()
-  {
-    plugin::save();
-
-    /* Arrays */
-    foreach (array("goExportEntryList"=>"goExportEntry") as $source => $destination){
-      $this->attrs[$destination]= array();
-      foreach ($this->$source as $element){
-        $this->attrs[$destination][]= $element;
-      }
+
+    function getListEntry()
+    {
+        $fields = goService::getListEntry();
+        $fields['Message']    = _("File service (Shares)");
+        return($fields);
     }
 
 
-    /* Process netatalk mounts */
-    if($this->allow_mounts) {
-      $this->process_mounts();
-    }
+    function save()
+    {
+        plugin::save();
 
-    /* Check if this is a new entry ... add/modify */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cat($this->dn,array("objectClass"));
-    if($ldap->count()){
-      $ldap->cd($this->dn);
-      $ldap->modify($this->attrs);
-    }else{
-      $ldap->cd($this->dn);
-      $ldap->add($this->attrs);
-    }
-    if (!$ldap->success()){
-      msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+        /* Arrays */
+        foreach (array("goExportEntryList"=>"goExportEntry") as $source => $destination){
+            $this->attrs[$destination]= array();
+            foreach ($this->$source as $element){
+                $this->attrs[$destination][]= $element;
+            }
+        }
+
+
+        /* Process netatalk mounts */
+        if($this->allow_mounts) {
+            $this->process_mounts();
+        }
+
+        /* Check if this is a new entry ... add/modify */
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cat($this->dn,array("objectClass"));
+        if($ldap->count()){
+            $ldap->cd($this->dn);
+            $ldap->modify($this->attrs);
+        }else{
+            $ldap->cd($this->dn);
+            $ldap->add($this->attrs);
+        }
+        if (!$ldap->success()){
+            msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class()));
+        }
+        if($this->initially_was_account){
+            $this->handle_post_events("modify");
+            new log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }else{
+            $this->handle_post_events("add");
+            new log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+        }
     }
-    if($this->initially_was_account){
-      $this->handle_post_events("modify");
-      new log("modify","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
-    }else{
-      $this->handle_post_events("add");
-      new log("create","server/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
+
+
+    function check()
+    { 
+        $message = plugin::check();
+        return($message);
     }
-  }
 
 
-  function check()
-  { 
-    $message = plugin::check();
-    return($message);
-  }
+    function save_object()
+    {
+        if(isset($_POST['goShareServerPosted'])){
+            plugin::save_object();
+        }
+    } 
 
+    function allow_remove()
+    {
+        /* Check if the service is still in use */
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cd($this->config->current['BASE']);
+        $cn = $ldap->getCn($this->dn);
+        $ldap->search("(&(|(objectClass=posixGroup)(objectClass=posixAccount)(objectClass=gosaGroupOfNames))(gotoShare=$cn|*))", array("dn"));
+
+        if($ldap->count()){
+            /* Number of entries shown in warning */
+            $i    = 3;
+            $str  = '<p>';
+            while(($attrs = $ldap->fetch()) && $i >= 0){
+                $i --;
+                if(isset($attrs['dn'])){
+                    $str .= '<i>' . $attrs['dn']."</i><br/>";
+                }
+            }
+            $str .= '</p>';
+            return(sprintf(_("Cannot remove share - it is still in use by these objects: %s"), $str));
+        }
+    }
 
-  function save_object()
-  {
-    if(isset($_POST['goShareServerPosted'])){
-      plugin::save_object();
+    function addToList($entry){
+        $key =  key($entry);
+        $this->goExportEntryList[$key]=$entry[$key];
     }
-  } 
-
-  function allow_remove()
-  {
-  /* Check if the service is still in use */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $cn = $ldap->getCn($this->dn);
-    $ldap->search("(&(|(objectClass=posixGroup)(objectClass=posixAccount)(objectClass=gosaGroupOfNames))(gotoShare=$cn|*))", array("dn"));
-
-    if($ldap->count()){
-      /* Number of entries shown in warning */
-      $i    = 3;
-      $str  = '<p>';
-      while(($attrs = $ldap->fetch()) && $i >= 0){
-        $i --;
-        if(isset($attrs['dn'])){
-          $str .= '<i>' . $attrs['dn']."</i><br/>";
+
+    function deleteFromList($id)
+    {
+        /* Check if the share is used by someone */
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cd($this->config->current['BASE']);
+        $cn = $ldap->getCn($this->dn);
+        $ldap->search("(|(gotoProfileServer=*|$id)(gotoShare=$cn|$id|*))", array("cn"));
+        if ($ldap->count() != 0){
+            while ($attrs= $ldap->fetch()){
+                $obj[$ldap->getDN()]= $attrs['cn'][0];
+            }
+            msg_dialog::display(_("Error"), msgPool::stillInUse(_("share"), msgPool::buildList($obj)), ERROR_DIALOG);
+
+        } else {
+            /* Finally remove it */
+            unset($this->goExportEntryList[$id]);
         }
-      }
-      $str .= '</p>';
-      return(sprintf(_("Cannot remove share - it is still in use by these objects: %s"), $str));
-      }
-  }
-
-  function addToList($entry){
-    $key =  key($entry);
-    $this->goExportEntryList[$key]=$entry[$key];
-  }
-
-  function deleteFromList($id)
-  {
-    /* Check if the share is used by someone */
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cd($this->config->current['BASE']);
-    $cn = $ldap->getCn($this->dn);
-    $ldap->search("(|(gotoProfileServer=*|$id)(gotoShare=$cn|$id|*))", array("cn"));
-    if ($ldap->count() != 0){
-      while ($attrs= $ldap->fetch()){
-        $obj[$ldap->getDN()]= $attrs['cn'][0];
-      }
-      msg_dialog::display(_("Error"), msgPool::stillInUse(_("share"), msgPool::buildList($obj)), ERROR_DIALOG);
-
-    } else {
-      /* Finally remove it */
-      unset($this->goExportEntryList[$id]);
     }
-  }
 
-   function process_mounts() {
+    function process_mounts() {
+
+        $clip = "cn=" . $this->cn . ",".get_ou("servgeneric", "serverRDN");
+        $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip));
+
+        $mounts = array(
+                "objectClass" => "container",
+                "cn" => "mounts"
+                );
+
+# load data from mounts container
+        $ldap = $this->config->get_ldap_link();
+        $ldap->cat($mountsdn, array('dn'));
+        $attrs = $ldap->fetch();
+
+# mounts container not present yet, so we create it
+        if (count($attrs) == 0) {
+            $ldap->cd($mountsdn);
+            $ldap->add($mounts);
+            if (!$ldap->success()){
+                msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_ADD, get_class()));
+            }
+            new log("modify","server/".get_class($this),$mountsdn,array_keys($mounts),$ldap->get_error());
+        }
 
-    $clip = "cn=" . $this->cn . ",".get_ou("servgeneric", "serverRDN");
-    $mountsdn = "cn=mounts," . substr($this->dn, strlen($clip));
+# remove deleted mounts from the container
+        foreach ($this->mounts_to_remove as $entry) {
+            $mount=$this->returnMountEntry($entry);
+            $mountdn = "cn=".$mount["cn"].","."$mountsdn";
 
-    $mounts = array(
-      "objectClass" => "container",
-      "cn" => "mounts"
-    );
+            $ldap->cat($mountdn, array('dn'));
+            $attrs = $ldap->fetch();
 
-    # load data from mounts container
-    $ldap = $this->config->get_ldap_link();
-    $ldap->cat($mountsdn, array('dn'));
-    $attrs = $ldap->fetch();
+            if (count($attrs) != 0) {
+                $ldap->rmdir($mountdn);
+                if (!$ldap->success()){
+                    msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $mountdn, LDAP_DEL, get_class()));
+                }
+                new log("remove","server/".get_class($this),$mountdn,array_keys($mount),$ldap->get_error());
+            }
+        }
 
-    # mounts container not present yet, so we create it
-    if (count($attrs) == 0) {
-        $ldap->cd($mountsdn);
-        $ldap->add($mounts);
-        if (!$ldap->success()){
-          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_ADD, get_class()));
+# add new mounts to the container
+        foreach ($this->mounts_to_add as $entry) {
+            $mount=$this->returnMountEntry($entry);
+            $mountdn = "cn=".$mount["cn"].","."$mountsdn";
+            $ldap->cd($mountdn);
+            $ldap->add($mount);
+            if (!$ldap->success()){
+                msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $mount, LDAP_ADD, get_class()));
+            }
+            new log("create","server/".get_class($this),$mountdn,array_keys($mount),$ldap->get_error());
         }
-        new log("modify","server/".get_class($this),$mountsdn,array_keys($mounts),$ldap->get_error());
     }
 
-    # remove deleted mounts from the container
-    foreach ($this->mounts_to_remove as $entry) {
-      $mount=$this->returnMountEntry($entry);
-      $mountdn = "cn=".$mount["cn"].","."$mountsdn";
-
-      $ldap->cat($mountdn, array('dn'));
-      $attrs = $ldap->fetch();
-
-      if (count($attrs) != 0) {
-        $ldap->rmdir($mountdn);
-        if (!$ldap->success()){
-          msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $mountdn, LDAP_DEL, get_class()));
+    function addToMountList($entry) 
+    {
+        if($this->acl_is_writeable("name")){
+            $key =  key($entry);
+            $type = $this->get_share_type($entry[$key]);
+            if (($type == "netatalk") || ($type == "NFS")) {
+                $this->mounts_to_add[$entry[$key]] = $entry[$key];
+                unset($this->mounts_to_remove[$entry[$key]]);
+            }
         }
-        new log("remove","server/".get_class($this),$mountdn,array_keys($mount),$ldap->get_error());
-      }
     }
 
-    # add new mounts to the container
-    foreach ($this->mounts_to_add as $entry) {
-      $mount=$this->returnMountEntry($entry);
-      $mountdn = "cn=".$mount["cn"].","."$mountsdn";
-      $ldap->cd($mountdn);
-      $ldap->add($mount);
-      if (!$ldap->success()){
-        msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $mount, LDAP_ADD, get_class()));
-      }
-      new log("create","server/".get_class($this),$mountdn,array_keys($mount),$ldap->get_error());
-    }
-  }
-
-  function addToMountList($entry) 
-  {
-    if($this->acl_is_writeable("name")){
-      $key =  key($entry);
-      $type = $this->get_share_type($entry[$key]);
-      if (($type == "netatalk") || ($type == "NFS")) {
-        $this->mounts_to_add[$entry[$key]] = $entry[$key];
-        unset($this->mounts_to_remove[$entry[$key]]);
-      }
+    function deleteFromMountList($entry) 
+    {
+        if($this->acl_is_writeable("name")){
+            $type = $this->get_share_type($entry);
+            if (($type == "netatalk") || ($type == "NFS")) {
+                $this->mounts_to_remove[$entry] = $entry;
+                unset($this->mounts_to_add[$entry]);
+            }
+        }
     }
-  }
-
-  function deleteFromMountList($entry) 
-  {
-    if($this->acl_is_writeable("name")){
-      $type = $this->get_share_type($entry);
-      if (($type == "netatalk") || ($type == "NFS")) {
-        $this->mounts_to_remove[$entry] = $entry;
-        unset($this->mounts_to_add[$entry]);
-      }
+
+    function get_share_type($share) 
+    {
+        $tmp = explode("|", $share);
+        return $tmp[2];
     }
-  }
-
-  function get_share_type($share) 
-  {
-    $tmp = explode("|", $share);
-    return $tmp[2];
-  }
-
-  function returnMountEntry($entry)
-  {
-    $item = explode("|", $entry);
-    $name = $item[0];
-    $description = $item[1];
-    $type = $item[2];
-    $charset = $item[3];
-    $path = $item[4];
-    $options = $item[5];
-
-    switch ($type) {
-      case "netatalk" : {
-        $mount = array(
-            "mountDirectory" => "/Network/Servers/",
-            "mountOption" => array(
-              "net",
-              "url==afp://;AUTH=NO%20USER%20AUTHENT@".$this->cn."/$name/"
-              ),
-            "mountType" => "url",
-            "objectClass" => "mount",
-            "cn" => $this->cn .":/".$name
-            );
-        break;
-      }
-      case "NFS" : {
-        $mount = array(
-            "mountDirectory" => "/Network/Servers/",
-            "mountOption" => "net",
-            "mountType" => "nfs",
-            "objectClass" => "mount",
-            "cn" => $this->cn .":".$path
-            );
-        break;
-      }
-      default : {
-                  continue;
-                }
+
+    function returnMountEntry($entry)
+    {
+        $item = explode("|", $entry);
+        $name = $item[0];
+        $description = $item[1];
+        $type = $item[2];
+        $charset = $item[3];
+        $path = $item[4];
+        $options = $item[5];
+
+        switch ($type) {
+            case "netatalk" : {
+                $mount = array(
+                        "mountDirectory" => "/Network/Servers/",
+                        "mountOption" => array(
+                            "net",
+                            "url==afp://;AUTH=NO%20USER%20AUTHENT@".$this->cn."/$name/"
+                            ),
+                        "mountType" => "url",
+                        "objectClass" => "mount",
+                        "cn" => $this->cn .":/".$name
+                        );
+                break;
+            }
+            case "NFS" : {
+                $mount = array(
+                        "mountDirectory" => "/Network/Servers/",
+                        "mountOption" => "net",
+                        "mountType" => "nfs",
+                        "objectClass" => "mount",
+                        "cn" => $this->cn .":".$path
+                        );
+                break;
+            }
+            default : {
+                          continue;
+                      }
+        }
+        return $mount;
     }
-    return $mount;
-  }
 
 
-  function PrepareForCopyPaste($source)
-  {
-    plugin::PrepareForCopyPaste($source);
+    function PrepareForCopyPaste($source)
+    {
+        plugin::PrepareForCopyPaste($source);
 
-    $tmp =array();
-    if(isset($source['goExportEntry'])){
-      if(isset($source['goExportEntry']['count'])){
-        for($i= 0; $i<$source['goExportEntry']['count']; $i++){
-          $entry= $source['goExportEntry'][$i];
-          $tmp[preg_replace('/\|.*$/', '', $entry)]= $entry;
+        $tmp =array();
+        if(isset($source['goExportEntry'])){
+            if(isset($source['goExportEntry']['count'])){
+                for($i= 0; $i<$source['goExportEntry']['count']; $i++){
+                    $entry= $source['goExportEntry'][$i];
+                    $tmp[preg_replace('/\|.*$/', '', $entry)]= $entry;
+                }
+            }
         }
-      }
+        $this->goExportEntryList = $tmp;
+        $this->goExportEntry = $tmp;
+    }
+
+
+    /* Return plugin informations for acl handling */
+    static function plInfo()
+    {
+        return (array(
+                    "plShortName"   => _("File service (Shares)"),
+                    "plDescription" => _("File service - Shares")." ("._("Services").")",
+                    "plSelfModify"  => FALSE,
+                    "plDepends"     => array(),
+                    "plPriority"    => 90,
+                    "plSection"     => array("administration"),
+                    "plRequirements"=> array(
+                        'ldapSchema' => array('goShareServer' => '>=2.7'),
+                        'onFailureDisablePlugin' => array(get_class())
+                        ),
+                    "plCategory"    => array("server"),
+
+                    "plProvidedAcls"=> array(
+                        "start"         => _("Start"),
+                        "stop"          => _("Stop"),
+                        "restart"       => _("Restart"),
+                        "name"          => _("Name"),
+                        "goExportEntry" => _("Share entries"),
+                        "appleMounts"   => _("Apple mounts"),
+                        "netatalkmount" => _("Apple mounts"),
+                        "description"   => _("Description"),
+                        "type"          => _("Type"),
+                        "charset"       => _("Charset"),
+                        "path"          => _("Path"),
+                        "option"        => _("Option"),
+                        "volume"        => _("Volume"))
+
+                        ));
     }
-    $this->goExportEntryList = $tmp;
-    $this->goExportEntry = $tmp;
-  }
-
-
-  /* Return plugin informations for acl handling */
-  static function plInfo()
-  {
-    return (array(
-          "plShortName"   => _("File service (Shares)"),
-          "plDescription" => _("File service - Shares")." ("._("Services").")",
-          "plSelfModify"  => FALSE,
-          "plDepends"     => array(),
-          "plPriority"    => 90,
-          "plSection"     => array("administration"),
-          "plRequirements"=> array(
-              'ldapSchema' => array('goShareServer' => '>=2.7'),
-              'onFailureDisablePlugin' => array(get_class())
-              ),
-          "plCategory"    => array("server"),
-
-          "plProvidedAcls"=> array(
-              "start"         => _("Start"),
-              "stop"          => _("Stop"),
-              "restart"       => _("Restart"),
-              "name"          => _("Name"),
-              "goExportEntry" => _("Share entries"),
-              "appleMounts"   => _("Apple mounts"),
-              "netatalkmount" => _("Apple mounts"),
-              "description"   => _("Description"),
-              "type"          => _("Type"),
-              "charset"       => _("Charset"),
-              "path"          => _("Path"),
-              "option"        => _("Option"),
-              "volume"        => _("Volume"))
-
-          ));
-  }
 
 
 }