![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 2e30084b7e5ae67c05f41466ec2177bb96eac2f3..f40c1eaea65bda8efa4fd7e2a31bbd13474a2c31 100644 (file)
$this->usedPackages = array();
}
- $ldap = $this->config->get_ldap_link();
- foreach($this->usedPackages as $name){
- $ldap->search("(&(objectClass=FAIdebconfInfo)(FAIpackage=".$name."))",array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection",""));
+ if($dn != "new"){
+
+ /* Create one filter with all package names,
+ instead of calling $ldap->search for every single package
+ */
+ $PackageFilter = "";
+ foreach($this->usedPackages as $name){
+ $PackageFilter .= "(FAIpackage=".$name.")";
+ }
+ $PackageFilter = "(&(objectClass=FAIdebconfInfo)(|".$PackageFilter."))";
+
+ /* Search for configuration objects */
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ $ldap->search($PackageFilter,array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection","FAIstate"));
+
+ /* Walk through configurations and append them to our list of ConfiguredPackages */
while($attr = $ldap->fetch()){
+ /* Skip objects, that are tagged as removed */
+ if(isset($object['FAIstate'][0])){
+ if(preg_match("/removed$/",$attr['FAIstate'][0])){
+ continue;
+ }
+ }
+
$tmp =array();
$tmp['Name'] = $attr['FAIvariable'][0];
$tmp['Type'] = $attr['FAIvariableType'][0];
$this->is_dialog =true;
}
+ /* Configuration dialog open*/
+ if($this->FAIstate != "freeze"){
+ 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;
+ }
+ }
+ }
+ }
+
/* 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);
- $this->handle_post_events("remove");
+
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $this->dn);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $this->dn);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $this->dn;
+ }
+
+ prepare_to_save_FAI_object($use_dn,array(),true);
+
+ foreach($this->ConfiguredPackages as $pkgname => $attrs){
+ foreach($attrs as $name => $attr){
+ $pkgdn = "FAIvariable=".$name.",".$this->dn;
+# $use_dn = str_ireplace( get_release_dn($this->dn), $_SESSION['faifilter']['branch'], $pkgdn);
+ $use_dn = preg_replace("/".normalizePreg(get_release_dn($this->dn))."/i", $_SESSION['faifilter']['branch'], $pkgdn);
+ if($_SESSION['faifilter']['branch'] == "main"){
+ $use_dn = $obj['dn'];
+ }
+ prepare_to_save_FAI_object($use_dn,array(),true);
+ }
+ }
+ $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");
+ $usedName2= preg_replace('/^-/', '! ', $usedName);
+ }else{
+ $usedName2= $usedName;
+ }
+
if(isset($this->list[$usedName][1])){
- $a_ret[$usedName] = $usedName." [".$this->list[$usedName][1]."]".$c_str;
+ $a_ret[$usedName] = $usedName2." [".$this->list[$usedName][1]."]".$c_str.$dsc;
}else{
- $a_ret[$usedName] = $usedName.$c_str;
+ $a_ret[$usedName] = $usedName2.$c_str.$dsc;
}
}
}
$this->attrs['FAIdebianSection'][] = $sec;
}
- // $this->attrs["FAIinstallMethod"]= "aptitude";
+ prepare_to_save_FAI_object($this->dn,$this->attrs);
+ show_ldap_error($ldap->get_error(), sprintf(_("Saving of FAI/package list with dn '%s' failed."),$this->dn));
- $ldap->cat($this->dn);
- if($ldap->count()!=0){
- /* Write FAIscript to ldap*/
- $ldap->cd($this->dn);
- $this->cleanup();
- $ldap->modify ($this->attrs);
-
- }else{
- /* Write FAIscript to ldap*/
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
- $ldap->cd($this->dn);
- $ldap->add($this->attrs);
- }
- show_ldap_error($ldap->get_error());
+ /* 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);
- if($ldap->count()!=0){
- $ldap->cd($pkgdn);
- $this->cleanup();
- $ldap->modify ($pkgattrs);
+ $ldap->cat($pkgdn,array("objectClass"));
- }else{
- $ldap->cd($this->config->current['BASE']);
- $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $pkgdn));
- $ldap->cd($pkgdn);
- $ldap->add($pkgattrs);
+ /* Workaround for missing "gosaAdministrativeUnitTag" */
+ $attrs = $ldap->fetch();
+ if((isset($attrs['objectClass'])) && (in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass']))){
+ $pkgattrs['objectClass'][] = "gosaAdministrativeUnitTag";
}
- show_ldap_error($ldap->get_error());
- }
- }
-
+ prepare_to_save_FAI_object($pkgdn,$pkgattrs);
+ /* Handle tagging */
+ $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
+ }
+ }
+ }
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Package"),
+ "plDescription" => _("FAI Package list"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("fai"),
+ "plProvidedAcls" => array(
+ "cn" => _("Name"),
+ "description" => _("Description"),
+ "FAIpackage" => _("Packages"),
+ "FAIdebianSection" => _("Section"),
+ "FAIinstallMethod" => _("Install Method"),
+ "FAIdebianRelease" => _("Release"))
+ ));
}
}