Updated divlists.

[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 bb06019cd064a4d132405ccef8579f9b525b5367..9e45b692ed8751eeea978efbdc4761052d28ed98 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -177,35 +177,27 @@ class faiPackage extends plugin
 
     $smarty->assign( "FAIinstallMethods", $this->FAIinstallMethods );
 
-    if((!$this->is_account)&&(!$this->newDialogShown)){
-
-      if($this->dialog==NULL){
-        $this->dialog = new faiPackageNew($this->config, $this->dn,$this->mirrors,$this->servers,$this->sections,$this->releases);
-        $this->is_dialog =true;
+    if(!$this->is_account){
+
+      /* 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'];
-
-        unset($this->dialog);
-        $this->dialog         = false;
-        $this->is_dialog      = false;
-        $this->newDialogShown = true;
-        $this->is_account     = true;
+      /* Assemble sections */
+      $repos= $this->getServerInfos();
+      if(isset($repos[$this->FAIdebianRelease])){
+        $this->FAIdebianSection= $repos[$this->FAIdebianRelease];
+        $this->FAIdebianSection= array_unique($this->FAIdebianSection);
       }
 
-      /* Draw dialog */
-      if($this->dialog){
-        $display=$this->dialog->execute();
-        return($display); 
-      }
+      /* Assign Repository settings*/ 
+      $this->is_account     = true;
     }
 
     /* Assign variables */
@@ -214,7 +206,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']) && $this->acl_is_writeable("FAIpackage")){
@@ -262,7 +254,7 @@ class faiPackage extends plugin
 
     /* Configuration dialog open*/
     if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'])) && $this->acl_is_writeable("FAIdebconfInfo")){
-      $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
+      $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
 
@@ -409,7 +401,8 @@ class faiPackage extends plugin
         $dsc= "";
         if (preg_match('/^-/', $usedName)){
           $dsc= " - "._("Package marked for removal");
-          $usedName2= preg_replace('/^-/', '! ', $usedName);
+          // Generally a bad idea here, because the toggel triggers on -, not on !
+          //$usedName= preg_replace('/^-/', '! ', $usedName);
         }else{
           $usedName2= $usedName;
         }
@@ -432,7 +425,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));
@@ -513,8 +506,10 @@ class faiPackage extends plugin
           $pkgattrs['objectClass'][] = "gosaAdministrativeUnitTag";
         }
 
-        prepare_to_save_FAI_object($pkgdn,$pkgattrs);
-
+        if(in_array($pkgattrs['FAIvariableType'],array("boolean","multiselect","password","select","string","text"))){
+          prepare_to_save_FAI_object($pkgdn,$pkgattrs);
+        }
+  
         /* Handle tagging */
         $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
       }
@@ -529,19 +524,45 @@ class faiPackage extends plugin
           "plDescription" => _("FAI Package list"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 30,
+          "plPriority"    => 28,
           "plSection"     => array("administration"),
           "plCategory"    => array("fai"),
           "plProvidedAcls" => array(
             "cn"                => _("Name"),
             "description"       => _("Description"),
             "FAIpackage"        => _("Packages"),
-            "FAIdebianSection"  => _("Section"),
+            "FAIdebianSection"  => _("Section")." ("._("Readonly").")",
             "FAIinstallMethod"  => _("Install Method"),
             "FAIdebconfInfo"    => _("Package configuration"),
-            "FAIdebianRelease"  => _("Release"))
+            "FAIdebianRelease"  => _("Release")." ("._("Readonly").")")
           ));
   }
+
+  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: