index 2e30084b7e5ae67c05f41466ec2177bb96eac2f3..fb845ee416083f500297a89c8b306a45df252301 100644 (file)
$this->usedPackages = array();
}
- $ldap = $this->config->get_ldap_link();
+
+ /* Create one filter with all package names,
+ instead of calling $ldap->search for every single package
+ */
+ $PackageFilter = "";
foreach($this->usedPackages as $name){
- $ldap->search("(&(objectClass=FAIdebconfInfo)(FAIpackage=".$name."))",array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection",""));
- while($attr = $ldap->fetch()){
-
- $tmp =array();
- $tmp['Name'] = $attr['FAIvariable'][0];
- $tmp['Type'] = $attr['FAIvariableType'][0];
-
- if (isset($attr['FAIvariableContent'][0])){
- if(!in_array($attr['FAIvariableType'],array("multiselect"))){
- $tmp['Value'] = $attr['FAIvariableContent'][0];
- }else{
- $content = array();
- unset($attr['FAIvariableContent']['count']);
- foreach($attr['FAIvariableContent'] as $attr){
- $tmp['Value'][] = $attr;
- }
+ $PackageFilter .= "(FAIpackage=".$name.")";
+ }
+ $PackageFilter = "(&(objectClass=FAIdebconfInfo)(|".$PackageFilter."))";
+
+ /* Search for configuration objects */
+ $ldap = $this->config->get_ldap_link();
+ $ldap->search($PackageFilter,array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection"));
+
+ /* Walk through configurations and append them to our list of ConfiguredPackages */
+ while($attr = $ldap->fetch()){
+ $tmp =array();
+ $tmp['Name'] = $attr['FAIvariable'][0];
+ $tmp['Type'] = $attr['FAIvariableType'][0];
+
+ if (isset($attr['FAIvariableContent'][0])){
+ if(!in_array($attr['FAIvariableType'],array("multiselect"))){
+ $tmp['Value'] = $attr['FAIvariableContent'][0];
+ }else{
+ $content = array();
+ unset($attr['FAIvariableContent']['count']);
+ foreach($attr['FAIvariableContent'] as $attr){
+ $tmp['Value'][] = $attr;
}
- $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
}
+ $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
}
}
$this->is_dialog =true;
}
+ /* Configuration dialog open*/
+ if((isset($_POST['Markpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
+ foreach($_POST['usedPackages'] as $pkg){
+ if (isset($this->usedPackages[$pkg])){
+ unset($this->usedPackages[$pkg]);
+ if (preg_match('/^-/', $pkg)){
+ $pkg= preg_replace('/^-/', '', $pkg);
+ } else {
+ $pkg= preg_replace('/^/', '-', $pkg);
+ }
+ $this->usedPackages[$pkg]= $pkg;
+ }
+ }
+ print_a($this->usedPackages);
+ }
+
/* Save Configuration */
if(isset($_POST['SaveObjectConfig'])){
if($this->FAIstate != "freeze"){
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$ldap->rmdir_recursive($this->dn);
+ show_ldap_error($ldap->get_error(), _("Removing FAI package base failed"));
$this->handle_post_events("remove");
}
$c_str = " - "._("package is configured");
}
+ /* Adapt used name if we're marked for removal */
+ $dsc= "";
+ if (preg_match('/^-/', $usedName)){
+ $dsc= " - "._("Package marked for removal");
+ $usedName= preg_replace('/^-/', '! ', $usedName);
+ }
+
if(isset($this->list[$usedName][1])){
- $a_ret[$usedName] = $usedName." [".$this->list[$usedName][1]."]".$c_str;
+ $a_ret[$usedName] = $usedName." [".$this->list[$usedName][1]."]".$c_str.$dsc;
}else{
- $a_ret[$usedName] = $usedName.$c_str;
+ $a_ret[$usedName] = $usedName.$c_str.$dsc;
}
}
}
// $this->attrs["FAIinstallMethod"]= "aptitude";
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('dn'));
if($ldap->count()!=0){
/* Write FAIscript to ldap*/
$ldap->cd($this->dn);
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving FAI package base failed"));
+
+ /* Do object tagging */
+ $this->handle_object_tagging();
+ $ldap->cd($this->dn);
/* Save Package configurations */
foreach($this->ConfiguredPackages as $pkgname => $attrs){
foreach($attrs as $name => $attr){
+
+ $pkgattrs = array();
foreach($attr as $n=>$v){
if(empty($v)) $v = array();
}
/* Set attributes */
- $pkgattrs['objectClass'] = "FAIdebconfInfo";
+ $pkgattrs['objectClass'][] = "FAIdebconfInfo";
+
$pkgattrs['FAIpackage'] = $pkgname;
$pkgattrs['FAIvariable'] = $name;
$pkgattrs['FAIvariableType'] = $attr['Type'];
$pkgdn = "FAIvariable=".$name.",".$this->dn;
/* cehck if object already exists */
- $ldap->cat($pkgdn);
+ $ldap->cat($pkgdn,array("objectClass"));
+
+ /* Workaround for missing "gosaAdministrativeUnitTag" */
+ $attrs = $ldap->fetch();
+ if((isset($attrs['objectClass'])) && (in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass']))){
+ $pkgattrs['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+
if($ldap->count()!=0){
$ldap->cd($pkgdn);
$this->cleanup();
$ldap->cd($pkgdn);
$ldap->add($pkgattrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
+
+ /* Handle tagging */
+ $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
}
}