X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_servService.inc;h=4bf89bf30ba32c2fe86ed097cea784045484dd91;hb=387ef9fc128dd4599a2199bb31f334ea9743e255;hp=3c6fae64c4c4db91ef6e2dddc6b1cc7be17b9330;hpb=c02a9629a834fa473d9fb709e9ca3d531c936c5e;p=gosa.git

diff --git a/plugins/admin/systems/class_servService.inc b/plugins/admin/systems/class_servService.inc
index 3c6fae64c..4bf89bf30 100644
--- a/plugins/admin/systems/class_servService.inc
+++ b/plugins/admin/systems/class_servService.inc
@@ -20,131 +20,97 @@ class servservice extends plugin
 
   /* attribute list for save action */
   var $ignore_account= TRUE;
-  var $attributes       = array("goExportEntry","goTimeSource","goLdapBase","goXdmcpIsEnabled","goFontPath" );
+  var $attributes       = array("goLdapBase","goXdmcpIsEnabled","goFontPath");
+  var $possible_objectclasses= array( "goNfsServer", "goNtpServer", "goServer", "goLdapServer",
+                                      "goTerminalServer", "goSyslogServer", "goCupsServer");
   var $objectclasses    = array("top","goServer"); 
-  var $additionaloc     = array(
-                
-                          "goNfsServer"     => array("goExportEntry"),
-                          "goNtpServer"     => array("goTimeSource"),
-                          "goLdapServer"    => array("goLdapBase"),
-                          "goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath"),
-                          "goSyslogServer"  => array(),
-                          "goCupsServer"    => array()                           
-                          );
-
-
-
-
-
-
-
-
+  var $additionaloc     = array( "goNfsServer"     => array("goExportEntry"),
+                                 "goNtpServer"     => array("goTimeSource"),
+                                 "goLdapServer"    => array("goLdapBase"),
+                                 "goTerminalServer"=> array("goXdmcpIsEnabled", "goFontPath"),
+                                 "goSyslogServer"  => array(),
+                                 "goCupsServer"    => array());
 
   function servservice ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
-
+    
+    /* Assemble final object class list */
     foreach ($this->additionaloc as $oc => $dummy){
       if (isset($this->attrs['objectClass']) && in_array($oc, $this->attrs['objectClass'])){
         $this->objectclasses[$oc]= $oc;
       }
     }
+
+    /* Load arrays */
+    foreach (array("goTimeSource", "goExportEntry") as $name){
+      $tmp= array();
+      if (isset($this->attrs[$name])){
+        for ($i= 0; $i<$this->attrs[$name]['count']; $i++){
+          $tmp[$this->attrs[$name][$i]]= $this->attrs[$name][$i];
+        }
+      }
+      $this->$name= $tmp;
+    }
+
     /* Always is account... */
     $this->is_account= TRUE;
   }
 
 
-
   function execute()
   {
     /* Fill templating stuff */
     $smarty= get_smarty();
 
-    
     $smarty->assign("staticAddress", "");
-      
-    /*  
-    Handling for Nfs Export Entries
-    */
 
     /* Here we add a new entry  */
-    if(isset($_POST['NewNfsAdd']))
-      {
-      $this->attrs['goExportEntry'][]=$_POST['NewNfsExport'];
-      }
-     
+    if(isset($_POST['NewNfsAdd']) && $_POST['NewNfsExport'] != "") {
+      $this->goExportEntry[$_POST['NewNfsExport']]= $_POST['NewNfsExport'];
+      asort($this->goExportEntry);
+    }
+
     /* Deleting an Entry, is a bit more complicated than adding one*/
-    if(isset($_POST['DelNfsEnt']))
-      {
-      /* Go through all entries an skip the selected (The one we want to delete)*/
-      foreach($this->attrs['goExportEntry'] as $key => $val)
-        {
-        /* Add all entries in an new Array, because when deleting one entry, the could be broken*/
-        if(($val != $_POST['goExportEntry'] ))
-          {
-          /* Skip the entry that we want to delete*/
-          $new_arr[]=$val;
-          }
+    if(isset($_POST['DelNfsEnt']) && isset($_POST['goExportEntry'])) {
+      foreach ($_POST['goExportEntry'] as $entry){
+        if (isset($this->goExportEntry[$entry])){
+          unset($this->goExportEntry[$entry]);
         }
-      /* Deleting complete so add result to the attrs */
-      $this->attrs['goExportEntry']=$new_arr;
-      }
-
-    /* Set the entry which we want to show in the frontend */
-    if(isset($this->attrs['goExportEntry']))
-      {
-      $this->goExportEntry = ($this->attrs['goExportEntry']);
-      unset($this->goExportEntry['count']);
       }
-
-
-   /*
-    Handling for NTP Export Entries
-    */
+    }
 
     /* Here we add a new entry  */
-    if(isset($_POST['NewNTPAdd']))
-      {
-      $this->attrs['goTimeSource'][]=$_POST['NewNTPExport'];
-      }
-    
-    /*Deleting an Entry, is a bit more complicated than adding one*/
-    if(isset($_POST['DelNTPEnt']))
-      {
-      /* Go through all entries an skip the selected (The one we want to delete)*/
-      foreach($this->attrs['goTimeSource'] as $key => $val)
-        {
-        /* Add all entries in an new Array, because wehn deleting one entry, the could be broken*/
-        if($val != $_POST['goTimeSource'] )
-          {
-          /* Skip the entry that we want to delete*/
-          $new_arr[]=$val;
-          }
-        }
-      /* Deleting complete so add result to the attrs */
-      $this->attrs['goTimeSource']=$new_arr;
-      }
+    if(isset($_POST['NewNTPAdd']) && $_POST['NewNTPExport'] != "") {
+      $this->goTimeSource[$_POST['NewNTPExport']]= $_POST['NewNTPExport'];
+      asort($this->goTimeSource);
+    }
 
-    /* Set the entry which we want to show in the frontend */
-    if(isset($this->attrs['goTimeSource']))
-      {
-      $this->goTimeSource = ($this->attrs['goTimeSource']);
-      unset($this->goTimeSource['count']);
+    /* Deleting an Entry, is a bit more complicated than adding one*/
+    if(isset($_POST['DelNTPEnt'])) {
+      foreach ($_POST['goTimeSource'] as $entry){
+        if (isset($this->goTimeSource[$entry])){
+          unset($this->goTimeSource[$entry]);
+        }
       }
+    }
 
-
-
- 
-    /* Attributes... */
+    /* Attributes */
     foreach ($this->attributes as $attr){
       $smarty->assign("$attr", $this->$attr);
       $smarty->assign("$attr"."ACL", chkacl($this->acl, $attr));
       $smarty->assign($attr."State","");
     }
 
+    /* Arrays */
+    foreach (array("goTimeSource", "goExportEntry") as $name){
+      $smarty->assign("$name", $this->$name);
+      $smarty->assign("$name"."ACL", chkacl($this->acl, $name));
+      $smarty->assign($name."State","");
+    }
 
     /* Classes... */
-foreach ($this->additionaloc as $oc => $dummy){
+    foreach ($this->additionaloc as $oc => $dummy){
       if (isset($this->objectclasses[$oc])){
         $smarty->assign("$oc", "checked");
         $smarty->assign("$oc"."State", "");
@@ -157,13 +123,17 @@ foreach ($this->additionaloc as $oc => $dummy){
       }
     }
 
+    /* Different handling for checkbox */
+    if($this->goXdmcpIsEnabled == "true"){
+      $smarty->assign("goXdmcpIsEnabled","checked");
+    } else {
+      $smarty->assign("goXdmcpIsEnabled","");
+    }
 
-  if(isset($this->attrs['goXdmcpIsEnabled'])&&($this->attrs['goXdmcpIsEnabled']=="1"))
-    $smarty->assign("goXdmcpIsEnabled","checked");
-
-  return($smarty->fetch (get_template_path('servservice.tpl', TRUE)));
+    return($smarty->fetch (get_template_path('servservice.tpl', TRUE)));
   }
 
+
   function remove_from_parent()
   {
     /* This cannot be removed... */
@@ -178,14 +148,23 @@ foreach ($this->additionaloc as $oc => $dummy){
 
       /* Save checkbox state */
       foreach ($this->additionaloc as $oc => $dummy){
-        if (isset($_POST[$oc]) && $_POST[$oc] == '1'){
-          $this->objectclasses[$oc]= $oc;
-        } else {
-          unset($this->objectclasses[$oc]);
+        if (chkacl($this->acl, $oc) == ""){
+          if (isset($_POST[$oc]) && $_POST[$oc] == '1'){
+            $this->objectclasses[$oc]= $oc;
+          } else {
+            unset($this->objectclasses[$oc]);
+          }
         }
       }
+
+      /* Save xdmcp is enabled flag */
+      if (isset($_POST['goXdmcpIsEnabled'])){
+        $this->goXdmcpIsEnabled= "true";
+      } else {
+        $this->goXdmcpIsEnabled= "false";
+      }
+        
     }
- 
   }
 
 
@@ -193,6 +172,12 @@ foreach ($this->additionaloc as $oc => $dummy){
   function check()
   {
     $message= array();
+  
+    
+  
+    if((isset($_POST['goTerminalServer']))&&(empty($this->goFontPath))){
+      $message[]=_("Terminal server, must have fontpath specified.");
+    }
 
     return ($message);
   }
@@ -201,62 +186,57 @@ foreach ($this->additionaloc as $oc => $dummy){
   /* Save to LDAP */
   function save()
   {
-   
     /* Normalize lazy objectclass arrays */
     $objectclasses= array();
     foreach($this->objectclasses as $oc){
       $objectclasses[]= $oc;
     }
+    $this->objectclasses= $objectclasses;
+
     plugin::save();
- 
-    $test = $this->objectclasses;
-    $tmp = array_flip($this->attrs['objectClass']);
-   
-    
- 
-    foreach($this->additionaloc as $key=>$val) {
-      unset($tmp[$key]);
-      }
-   
 
-    $classes = (array_flip(array_merge(array_flip($test),$tmp)));
+    $tmp= array();
 
-    unset($this->attrs['objectClass']);
+    /* Remove all from this plugin */
+    foreach($this->attrs['objectClass'] as $oc){
+      if (!in_array_ics($oc, $this->possible_objectclasses)){
+        $tmp[]= $oc;
+      }
+    }
 
-    foreach($classes as $class){
-      $this->attrs['objectClass'][]=$class;
+    /* Merge our current objectclasses */
+    foreach($this->objectclasses as $oc){
+      if (!in_array_ics($oc, $tmp)){
+        $tmp[]= $oc;
+      }
     }
-      
 
-    /* Remove unneeded attributes */
+    /* Reassign cleaned value */
+    $this->attrs['objectClass']= $tmp;
+
+    /* Remove illegal attributes */
     foreach ($this->additionaloc as $oc => $attrs){
-      if (!in_array($oc, $this->attrs['objectClass'])){
+      if (!in_array($oc, $this->objectclasses)){
         foreach ($attrs as $attr){
           $this->attrs[$attr]= array();
         }
       }
     }
-    $this->attrs = array_reverse($this->attrs);
-
-    /* Check if we are able to set these attributes */
-#fixme : It Would be better to check ObjectClass rights to, but what is to do if there are insuficient rights 
-    foreach($this->additionaloc as $oc => $attrs)
-    {
-      foreach($attrs as $val)
-      {
-      if(chkacl($this->acl,$val)=="")
-        {
-        unset($this->attrs[$val]);
-        unset($this->$val);
-        }
+
+    /* Arrays */
+    foreach (array("goTimeSource", "goExportEntry") as $name){
+      $this->attrs[$name]= array();
+      foreach ($this->$name as $element){
+        $this->attrs[$name][]= $element;
       }
     }
-    
+
     /* Write 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){