![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 2a9e4043a31c4864af744d2bfc3aaf607f806d74..51df0c833059591b5a09707b3f16296f4c146749 100644 (file)
/* Load Attributes */
plugin::plugin ($config, $dn);
- $this->acl ="#all#";
-
/* If "dn==new" we try to create a new entry
* Else we must read all objects from ldap which belong to this entry.
* First read SubObjects from ldap ... and then the partition definitions for the SubObjects.
if($dn != "new"){
$this->dn =$dn;
- /* Set acls
- */
- $ui = get_userinfo();
- $acl = get_permissions ($this->dn, $ui->subtreeACL);
- $acli = get_module_permission($acl, "FAIclass", $this->dn);
- $this->acl=$acli;
-
/* Get FAIstate
*/
if(isset($this->attrs['FAIstate'][0])){
$this->usedPackages = array();
}
+ 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->search($PackageFilter,array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection"));
+ /* 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."))";
- /* 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];
+ /* Search for configuration objects */
+ $ldap = $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ $ldap->search($PackageFilter,array("FAIvariable","FAIvariableType","FAIvariableContent","FAIpackage","FAIdebianSection","FAIstate"));
- 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;
+ /* 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;
}
}
- $this->ConfiguredPackages[$attr['FAIpackage'][0]][$attr['FAIvariable'][0]]=$tmp;
+
+ $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->list=$this->genPkgs();
/* + was pressed to open the package dialog */
- if(isset($_POST['Addpkg'])){
+ if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage")){
$this->dialog = new faiPackageEntry($this->config, $this->dn,$this->list,$this->usedPackages);
$this->is_dialog =true;
}
/* Delte selected package */
- if(isset($_POST['Delpkg'])){
+ if(isset($_POST['Delpkg']) && $this->acl_is_writeable("FAIpackage")){
if($this->FAIstate != "freeze"){
foreach($_POST['usedPackages'] as $del){
if(isset($this->usedPackages[$del])){
}
/* Configuration dialog open*/
- if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
- $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
+ if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'])) && $this->acl_is_writeable("FAIdebconfInfo")){
+ $path = CONFIG_DIR."/fai/".$this->FAIdebianRelease."/debconf.d";
$pkg_config = array();
$pkg = $_POST['usedPackages'][0];
}
$this->dialog = new faiPackageConfiguration($this->config, $this->dn,$pkg, $path, $pkg_config);
- $this->dialog ->acl = $this->acl;
$this->is_dialog =true;
}
+ /* Configuration dialog open*/
+ if($this->FAIstate != "freeze" && $this->acl_is_writeable("FAIpackage")){
+ 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"){
$strsec .= $sec." ";
}
- foreach($this->attributes as $attr){
- $smarty->assign($attr."ACL",chkacl($this->acl,$attr));
+ $tmp = $this->plInfo();
+ foreach($tmp['plProvidedAcls'] as $name => $translated){
+ $smarty->assign($name."ACL",$this->getacl($name,preg_match("/freeze/",$this->FAIstate)));
}
- $smarty->assign("OptionsACL","");
-
$smarty->assign("releases",$this->releases);
$smarty->assign("release" ,$this->FAIdebianRelease);
$smarty->assign("sections",$this->sections);
{
$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");
+
+# $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");
}
*/
function save_object()
{
-
if($this->FAIstate == "freeze") return;
plugin::save_object();
-
-
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
- }
- }
}
$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->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));
$this->attrs['FAIdebianSection'][] = $sec;
}
- // $this->attrs["FAIinstallMethod"]= "aptitude";
-
- $ldap->cat($this->dn, array('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(), _("Saving FAI package base failed"));
+ 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));
/* Do object tagging */
$this->handle_object_tagging();
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);
- }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"));
+ 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" => 28,
+ "plSection" => array("administration"),
+ "plCategory" => array("fai"),
+ "plProvidedAcls" => array(
+ "cn" => _("Name"),
+ "description" => _("Description"),
+ "FAIpackage" => _("Packages"),
+ "FAIdebianSection" => _("Section")." ("._("Readonly").")",
+ "FAIinstallMethod" => _("Install Method"),
+ "FAIdebconfInfo" => _("Package configuration"),
+ "FAIdebianRelease" => _("Release")." ("._("Readonly").")")
+ ));
}
}