Create faiPackageList:

[gosa.git] / plugins / admin / fai / class_faiPackage.inc

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 825a50e5efd17ac0a0e48663c3d0f70a533c364e..0635c85e4defc885e0254d02d02a67aed446f3d7 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -2,11 +2,6 @@
 
 class faiPackage extends plugin
 {
-  /* CLI vars */
-  var $cli_summary      = "Manage server basic objects";
-  var $cli_description  = "Some longer text\nfor help";
-  var $cli_parameters   = array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
-
   /* attribute list for save action */
   var $ignore_account   = TRUE;
 
@@ -186,35 +181,31 @@ class faiPackage extends plugin
 
     $smarty->assign( "FAIinstallMethods", $this->FAIinstallMethods );
 
-    if((!$this->is_account)&&(!$this->newDialogShown)){
+    if(!$this->is_account){
 
-      if($this->dialog==NULL){
-        $this->dialog = new faiPackageNew($this->config, $this->dn,$this->mirrors,$this->servers,$this->sections,$this->releases);
-        $this->is_dialog =true;
+      /* Assemble release name */
+      $tmp= preg_replace('/,ou=fai,ou=configs,ou=systems,.*$/', '', $_SESSION['faifilter']['branch']);
+      $tmp= preg_replace('/ou=/', '', $tmp);
+      $rev= array_reverse(split(',', $tmp));
+      $this->FAIdebianRelease= "";
+      foreach ($rev as $part){
+        $this->FAIdebianRelease.= "/$part";
       }
+      $this->FAIdebianRelease= preg_replace('#^/#', '', $this->FAIdebianRelease);
 
-      /* Assign posible changes, for mirror combinations */
-      $this->dialog->save_object();
-
-      /* Assign Repository settings*/ 
-      if(isset($_POST['SaveObjectNew'])){
-        $obj = $this->dialog->save();
-
-        $this->FAIdebianSection = $obj['FAIdebianSection'];
-        $this->FAIdebianRelease = $obj['FAIdebianRelease'];
+      /* Assemble sections */
+      $repos= $this->getServerInfos();
 
-        unset($this->dialog);
-        $this->dialog         = false;
-        $this->is_dialog      = false;
-        $this->newDialogShown = true;
-        $this->is_account     = true;
+      if(isset($repos[$this->FAIdebianRelease])){
+        $this->FAIdebianSection= $repos[$this->FAIdebianRelease];
+        $this->FAIdebianSection= array_unique($this->FAIdebianSection);
+      }else{
+        $this->FAIdebianSection = array();
+        print_red(sprintf(_("No repository server found that provide this release '%s'."), $this->FAIdebianRelease));
       }
 
-      /* Draw dialog */
-      if($this->dialog){
-        $display=$this->dialog->execute();
-        return($display); 
-      }
+      /* Assign Repository settings*/ 
+      $this->is_account     = true;
     }
 
     /* Assign variables */
@@ -223,7 +214,7 @@ class faiPackage extends plugin
     }
 
     /* Generate package list */
-    $this->list=$this->genPkgs();
+    $this->list= $this->genPkgs();
 
     /* + was pressed to open the package dialog */
     if(isset($_POST['Addpkg'])){
@@ -271,7 +262,7 @@ class faiPackage extends plugin
 
     /* Configuration dialog open*/
     if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
-      $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
+      $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
 
@@ -424,7 +415,8 @@ class faiPackage extends plugin
         $dsc= "";
         if (preg_match('/^-/', $usedName)){
           $dsc= " - "._("Package marked for removal");
-          $usedName= preg_replace('/^-/', '! ', $usedName);
+          // Generally a bad idea here, because the toggel triggers on -, not on !
+          //$usedName= preg_replace('/^-/', '! ', $usedName);
         }
 
         if(isset($this->list[$usedName][1])){
@@ -445,7 +437,7 @@ class faiPackage extends plugin
       $this->buffer=array();
       $a_ret = array();
       foreach($this->FAIdebianSection as $sec){
-        $strID= "/etc/gosa/fai/".$this->FAIdebianRelease."/".$sec;
+        $strID= CONFIG_DIR."/fai/".$this->FAIdebianRelease."/".$sec;
 
         if(!is_file($strID)){
           print_red(sprintf(_("Package file '%s' does not exist."),$strID));
@@ -545,19 +537,21 @@ class faiPackage extends plugin
         if((isset($attrs['objectClass'])) && (in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass']))){
           $pkgattrs['objectClass'][] = "gosaAdministrativeUnitTag";
         }
-    
-        if($ldap->count()!=0){
-          $ldap->cd($pkgdn);
-          $this->cleanup();
-          $ldap->modify ($pkgattrs); 
+  
+        if(in_array($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){
+          if($ldap->count()!=0){
+            $ldap->cd($pkgdn);
+            $this->cleanup();
+            $ldap->modify ($pkgattrs); 
 
-        }else{
-          $ldap->cd($this->config->current['BASE']);
-          $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $pkgdn));
-          $ldap->cd($pkgdn);
-          $ldap->add($pkgattrs);
+          }else{
+            $ldap->cd($this->config->current['BASE']);
+            $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $pkgdn));
+            $ldap->cd($pkgdn);
+            $ldap->add($pkgattrs);
+          }
+          show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
         }
-        show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
 
         /* Handle tagging */
         $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
@@ -586,6 +580,32 @@ class faiPackage extends plugin
       $this->cn = $_POST['cn'];
     }
   }
+
+  function getServerInfos()
+  {
+    $ret = array();
+    $ldap = $this->config->get_ldap_link();
+    $ldap->cd($this->config->current['BASE']);
+    $ldap->search("(objectClass=FAIrepositoryServer)",array("*"));
+    while($attrs = $ldap->fetch()){
+      if(isset($attrs['FAIrepository'])){
+        for($i =0 ; $i < $attrs['FAIrepository']['count']; $i++){
+          $obj = $attrs['FAIrepository'][$i];
+          $tmp = split("\|",$obj);
+          if(count($tmp)==4){
+            foreach(split(",",$tmp[3]) as $sec){
+              if(!empty($sec)){
+                $ret[$tmp[2]][] =  $sec;
+              }
+            }
+          }
+        }
+      }
+    }
+    return($ret);
+  }
+
+
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: