Removed autofs functionality

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

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index b83cbb139c2bddfca25a36efa9acf8b5ff177e42..2192dfc40ef64fb45f39211df6af6e3675003eca 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -13,10 +13,15 @@ class termstartup extends plugin
   var $gotoKernelParameters= "";
   var $gotoLdapServer= "";
   var $gotoModules= array();
-  var $gotoAutoFs= array();
-  var $gotoFilesystem= array();
   var $gotoTerminalPath= "";
 
+  /* Share */
+  var $gotoShares         = array();// Currently Share Option
+  var $gotoShare          = "";     // currently selected Share Option
+  var $gotoShareSelections= array();// Available Shares for this account in Listbox format
+  var $gotoAvailableShares= array();// Available Shares for this account
+
+
   /* attribute list for save action */
   var $attributes= array("gotoLdapServer", "gotoBootKernel", "gotoKernelParameters");
   var $objectclasses= array("GOhard");
@@ -31,7 +36,7 @@ class termstartup extends plugin
     plugin::plugin ($config, $dn);
 
     /* Get arrays */
-    foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
+    foreach (array("gotoModules") as $val){
       if (isset($this->attrs["$val"]["count"])){
         for ($i= 0; $i<$this->attrs["count"]; $i++){
           if (isset($this->attrs["$val"][$i])){
@@ -59,6 +64,22 @@ class termstartup extends plugin
       $this->customParameters= "";
     }
 
+    /* Prepare Shares */
+    if((isset($this->attrs['gotoShare']))&&(is_array($this->attrs['gotoShare']))){
+      unset($this->attrs['gotoShare']['count']);
+      foreach($this->attrs['gotoShare'] as $share){
+        $tmp = $tmp2 = array();
+        $tmp = split("\|",$share);
+        $tmp2['server']      =$tmp[0];
+        $tmp2['name']        =$tmp[1];
+        $tmp2['mountPoint']  =$tmp[2];
+        $this->gotoShares[$tmp[1]."|".$tmp[0]]=$tmp2;
+      }
+    }
+
+    $this->gotoShareSelections= $config->getShareList(true);
+    $this->gotoAvailableShares= $config->getShareList(false);
+
     $this->orig_dn= $this->dn;
   }
 
@@ -90,42 +111,51 @@ class termstartup extends plugin
       }
     }
 
-    /* Add autofs */
-    if (isset ($_POST['add_autofs'])){
-      if ($_POST['autofs'] != "" && chkacl ($this->acl, "gotoAutoFs") == ""){
-        $this->add_list ($this->gotoAutoFs, $_POST['autofs']);
-      }
-    }
+    /* Show main page */
+    $smarty= get_smarty();
 
-    /* Delete autofs */
-    if (isset ($_POST['delete_autofs'])){
-      if (count($_POST['autofs_list']) && chkacl ($this->acl, "gotoAutoFs") == ""){
-        $this->del_list ($this->gotoAutoFs, $_POST['autofs_list']);
-      }
-    }
 
-    /* Add filesystem */
-    if (isset ($_POST['add_fs'])){
-      if ($_POST['fstab'] != "" && chkacl ($this->acl, "gotoFilesystem") == ""){
-        $this->add_list ($this->gotoFilesystem, $_POST['fstab']);
+       /* In this section server shares will be defined
+     * A user can select one of the given shares and a mount point
+     *  and attach this combination to his setup.
+     */
+    $smarty->assign("gotoShareSelections",    $this->gotoShareSelections);
+    $smarty->assign("gotoShareSelectionKeys", array_flip($this->gotoShareSelections));
+
+    /* if $_POST['gotoShareAdd'] is set, we will try to add a new entry
+     * This entry will be, a combination of mountPoint and sharedefinitions
+     */
+    if(isset($_POST['gotoShareAdd'])){
+      /* We assign a share to this user, if we don't know where to mount the share */
+      if((!isset($_POST['gotoShareMountPoint']))||(empty($_POST['gotoShareMountPoint']))||(preg_match("/[\|]/i",$_POST['gotoShareMountPoint']))){
+        print_red(_("You must specify a valid mount point."));
+      }else{
+        $a_share = $this->gotoAvailableShares[$_POST['gotoShareSelection']];
+        $s_mount = $_POST['gotoShareMountPoint'];
+        /* Preparing the new assignment */
+        $this->gotoShares[$a_share['name']."|".$a_share['server']]=$a_share;
+        $this->gotoShares[$a_share['name']."|".$a_share['server']]['mountPoint']=$s_mount;
       }
     }
 
-    /* Delete filesystem */
-    if (isset ($_POST['delete_fs'])){
-      if (count($_POST['fstab_list']) && chkacl ($this->acl, "gotoFilesystem") == ""){
-        $this->del_list ($this->gotoFilesystem, $_POST['fstab_list']);
-      }
+    /* if the Post  gotoShareDel is set, someone asked GOsa to delete the selected entry (if there is one selected)
+     * If there is no defined share selected, we will abort the deletion without any message
+     */
+    if((isset($_POST['gotoShareDel']))&&(isset($_POST['gotoShare']))){
+      unset($this->gotoShares[$_POST['gotoShare']]);
     }
 
-    /* Show main page */
-    $smarty= get_smarty();
+    $smarty->assign("gotoShares",$this->printOutAssignedShares());
+    $smarty->assign("gotoShareKeys",array_flip($this->printOutAssignedShares()));
+
+
 
     /* Arrays */
     $smarty->assign("ldapservers", $this->config->data['SERVERS']['LDAP']);
     $smarty->assign("gotoLdapServer_select", $this->gotoLdapServer);
     $smarty->assign("gotoLdapServerACL", chkacl($this->acl, "gotoLdapServer"));
-    foreach (array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $val){
+    $smarty->assign("gotoShareACL", chkacl($this->acl, "gotoShareACL"));
+    foreach (array("gotoModules" ) as $val){
       $smarty->assign("$val", $this->$val);
     }
 
@@ -153,7 +183,7 @@ class termstartup extends plugin
     }
 
     /* ACL's */
-    foreach (array("gotoKernelParameters", "gotoModules", "gotoFilesystem") as $value){
+    foreach (array("gotoKernelParameters", "gotoModules") as $value){
       $smarty->assign($value."ACL", chkacl($this->acl, "$value"));
     }
 
@@ -242,7 +272,7 @@ class termstartup extends plugin
     plugin::save();
 
     /* Add missing arrays */
-    foreach (array("gotoFilesystem", "gotoAutoFs", "gotoModules") as $val){
+    foreach (array("gotoModules") as $val){
       if (isset ($this->$val) && count ($this->$val) != 0){
     
         $this->attrs["$val"]= array_unique($this->$val);
@@ -255,6 +285,15 @@ class termstartup extends plugin
       unset ($this->attrs['gotoLdapServer']);
     }
 
+     /* prepare share settings */
+    $tmp = array();
+    foreach($this->gotoShares as $name => $settings){
+      $tmp2 = split("\|",$name);
+      $name = $tmp2[0];
+      $tmp[] = $settings['server']."|".$name."|".$settings['mountPoint'];
+    }
+    $this->attrs['gotoShare']=$tmp;
+
     /* Write back to ldap */
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
@@ -286,6 +325,20 @@ class termstartup extends plugin
     $array= $tmp;
   }
 
+   /* Generate ListBox frindly output for the defined shares
+   * Possibly Add or remove an attribute here,
+   */
+  function printOutAssignedShares()
+  {
+    $a_return = array();
+    if(is_array($this->gotoShares)){
+      foreach($this->gotoShares as $share){
+        $a_return[$share['name']."|".$share['server']]= $share['name']." [".$share['server']."]";
+      }
+    }
+    return($a_return);
+  }
+
 
 }