X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiPackage.inc;h=d2fe6bac321db3ae79789cea38e31bdb74b915f7;hb=78fd52f682986d25fb95c171757d58384f7f58f8;hp=1688637e148cf0adb3d448ea50d77c022855a2e0;hpb=0fd77fbc3189b2acfe1f78961d6bd98c663ea4f1;p=gosa.git diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc index 1688637e1..d2fe6bac3 100644 --- a/plugins/admin/fai/class_faiPackage.inc +++ b/plugins/admin/fai/class_faiPackage.inc @@ -11,10 +11,10 @@ class faiPackage extends plugin var $ignore_account = TRUE; /* Attributes for this Object */ - var $attributes = array("cn","description","FAIpackage","section","mirror","release"); + var $attributes = array("cn","description","FAIpackage","FAIdebianRelease","FAIdebianSection", "FAIinstallMethod"); /* ObjectClasses for this Object*/ - var $objectclasses = array("top","FAIclass","FAIpackageList"); + var $objectclasses = array("top","FAIclass","FAIpackageList","FAIrepository"); /* Class name of the Ldap ObjectClass for the Sub Object */ var $subClass = ""; @@ -27,6 +27,8 @@ class faiPackage extends plugin var $subAttributes = array("cn","description"); var $sub64coded = array(); + var $ConfiguredPackages = array(); + /* Specific attributes */ var $cn = ""; // The class name for this object var $description = ""; // The description for this set of partitions @@ -34,157 +36,303 @@ class faiPackage extends plugin var $dialog = NULL; // a dialog, e.g. new disk dialog var $SubObjects = array(); // All leafobjects of this object - var $section = ""; // The selected section - var $release = ""; // selected release - var $mirror = ""; // selected mirror + var $FAIdebianRelease = ""; // The selected release + var $FAIdebianSection = ""; // selected section + var $FAIinstallMethod = "aptitude"; // hard coded + var $mirror = ""; // selected mirror var $servers = array(); // All available servers - var $sections = array(); // All possible sections - var $releases = array(); // All release types + var $releases = array(); // All possible releases + var $sections = array(); // All section types + + var $list = NULL; - var $mirrors = array(); // The combination of server/section/release + var $mirrors = array(); // The combination of server/release/section var $confDir = ""; - var $usedPackages = array(); + var $usedPackages = array(); + var $buffer = NULL; + var $strID =""; + var $newDialogShown =false; + + var $FAIstate = ""; + + var $FAIinstallMethods = array( "install", "ninstall", "remove", + "dselect-upgrade", "taskinst", "taskrm", + "hold", "clean", "aptitude", "aptitude-r", + "pending", "dpkgc" ); + function faiPackage ($config, $dn= NULL) { /* 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->FAIstate = $this->attrs['FAIstate'][0]; + } + } + + if(isset($this->attrs['FAIpackage'])){ + unset($this->attrs['FAIpackage']['count']); + foreach($this->attrs['FAIpackage'] as $pkg){ + $this->usedPackages[$pkg] = $pkg; + } + ksort($this->usedPackages); + }else{ + $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->cd($this->dn); + $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; + } + } } - unset($this->attrs['FAIpackage']['count']); - foreach($this->attrs['FAIpackage'] as $pkg){ - $this->usedPackages[] = $pkg; + if (isset($this->attrs['FAIdebianSection']['count'])){ + unset($this->attrs['FAIdebianSection']['count']); + } + if((isset($this->attrs['FAIdebianSection']))&&(is_array($this->attrs['FAIdebianSection']))){ + $this->FAIdebianSection = array(); + foreach($this->attrs['FAIdebianSection'] as $sec){ + $this->FAIdebianSection[$sec]=$sec; + } + } + + if((isset($this->attrs['FAIdebianSection']))&&(is_string($this->attrs['FAIdebianSection']))){ + $this->FAIdebianSection=array($this->attrs['FAIdebianSection']=>$this->attrs['FAIdebianSection']) ; } $this->confDir = CONFIG_DIR."/fai/"; - $this->FAIpackage = "test"; + $this->FAIpackage = array(); + + + $methods = array(); + foreach($this->FAIinstallMethods as $method){ + $methods[$method] = $method; + } + $this->FAIinstallMethods = $methods; + /* Check if we exist already - no need to ask for revisions, etc. then */ + if ($this->dn != "new"){ + $this->newDialogShown= true; + } + } function execute() { + /* Call parent execute */ + + plugin::execute(); + /* Fill templating stuff */ $smarty= get_smarty(); $display= ""; + $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; + } + + /* 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; + } + + /* Draw dialog */ + if($this->dialog){ + $display=$this->dialog->execute(); + return($display); + } + } + /* Assign variables */ foreach($this->attributes as $attrs){ $smarty->assign($attrs,$this->$attrs); } - $this->genMirror(); - - $availableServer = array(); - foreach($this->mirrors as $mir){ - if(($mir['section'] == $this->section)&&($mir['release']==$this->release)){ - $availableServer[$mir['mirror']]=$mir['mirror']; - } - } + /* Generate package list */ + $this->list=$this->genPkgs(); + /* + was pressed to open the package dialog */ if(isset($_POST['Addpkg'])){ - $this->dialog = new faiPackageEntry($this->config, $this->dn,$this->confDir.$this->mirror."/".$this->section."/".$this->release,$this->usedPackages); + $this->dialog = new faiPackageEntry($this->config, $this->dn,$this->list,$this->usedPackages); $this->is_dialog =true; } - + + /* Delte selected package */ + if(isset($_POST['Delpkg'])){ + if($this->FAIstate != "freeze"){ + foreach($_POST['usedPackages'] as $del){ + if(isset($this->usedPackages[$del])){ + unset($this->usedPackages[$del]); + } + } + } + } + + /* Abort package selection dialog */ if(isset($_POST['CancelSubObject'])){ $this->dialog = false; $this->is_dialog=false; } + /* attach new packages */ if(isset($_POST['SaveSubObject'])) { - $this->dialog->save_object(); - if(count($this->dialog->check())){ - foreach($this->dialog->check() as $msgs){ - print_red($msgs); + if($this->FAIstate != "freeze"){ + $this->dialog->save_object(); + if(count($this->dialog->check())){ + foreach($this->dialog->check() as $msgs){ + print_red($msgs); + } + }else{ + $use = $this->dialog->save(); + $this->usedPackages = $use; + $this->dialog = false; + $this->is_dialog=false; + ksort($this->usedPackages); } }else{ - $use = $this->dialog->save(); - $this->usedPackages = $use; $this->dialog = false; $this->is_dialog=false; } } - - if($this->is_dialog){ - return $this->dialog->execute(); - } - - $smarty->assign("mirrors" ,$availableServer); - $smarty->assign("mirror" ,$this->mirror); - $smarty->assign("sections",$this->sections); - $smarty->assign("section" ,$this->section); - $smarty->assign("releases",$this->releases); - $smarty->assign("release" ,$this->release); - $smarty->assign("usedPackages",$this->printUsedPackages()); - $display.= $smarty->fetch(get_template_path('faiPackage.tpl', TRUE)); - return($display); - } + /* Configuration dialog open*/ + if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){ + $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d"; + $pkg_config = array(); + $pkg = $_POST['usedPackages'][0]; - function genMirror(){ - $confDir = $this->confDir; - if(!is_readable($confDir)){ - print_red(sprintf(_("Can't read configuration folder '%s'."),$confDir)); - }else{ - - /* Try to catch all available mirrors - Possibly check if each server is reachable - */ - $this->mirrors= array(); - $fd = opendir($confDir); - while($mirror = readdir($fd)){ - if((is_dir($confDir.$mirror."/"))&&(($mirror != "." )&&($mirror!=".."))){ - - $mirrorDir = $confDir.$mirror."/"; - - $fe = opendir($mirrorDir); - while($section = readdir($fe)){ - if((is_dir($mirrorDir.$section))&&(($section != "." )&&($section!=".."))){ - - $sectionDir = $mirrorDir.$section."/"; - - $ff = opendir($sectionDir); - while($release = readdir($ff)){ - if((is_file($sectionDir.$release))&&(($release != "." )&&($release!="..")&&(!preg_match("/.*\.in$/",$release)))){ - - $this->servers[$mirror]=$mirror; - $this->sections[$section]=$section; - $this->releases[$release]=$release; - - if(empty($this->mirror)){ - $this->mirror= $mirror; - } - if(empty($this->section)){ - $this->section = $section; - } - if(empty($this->release)){ - $this->release = $release; - } - - $arr=array(); - $arr['mirror'] = $mirror; - $arr['section']= $section; - $arr['release']= $release; - - $this->mirrors[] = $arr ; - } - } - fclose($ff); + if(isset($this->ConfiguredPackages[$pkg])){ + $pkg_config = $this->ConfiguredPackages[$pkg]; + } + + $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"){ + 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; } - fclose($fe); } } - fclose($fd); + } + + /* Save Configuration */ + if(isset($_POST['SaveObjectConfig'])){ + if($this->FAIstate != "freeze"){ + $this->ConfiguredPackages= array_merge($this->ConfiguredPackages,$this->dialog->save()); + } + $this->dialog = false; + $this->is_dialog=false; + } + + /* cancel configuration */ + if(isset($_POST['CancelObjectConfig'])){ + $this->dialog = false; + $this->is_dialog=false; + } + + /* Display dialog */ + if($this->is_dialog){ + return $this->dialog->execute(); + } + + /* Assign section to smarty */ + $strsec = ""; + foreach($this->FAIdebianSection as $sec){ + $strsec .= $sec." "; + } + + foreach($this->attributes as $attr){ + $smarty->assign($attr."ACL",chkacl($this->acl,$attr)); } + $smarty->assign("OptionsACL",""); + $smarty->assign("releases",$this->releases); + $smarty->assign("release" ,$this->FAIdebianRelease); + $smarty->assign("sections",$this->sections); + $smarty->assign("section" ,$strsec); + $smarty->assign("usedPackages",$this->printUsedPackages()); + $display.= $smarty->fetch(get_template_path('faiPackage.tpl', TRUE)); + return($display); } /* Delete me, and all my subtrees @@ -194,6 +342,7 @@ class faiPackage extends plugin $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"); } @@ -202,7 +351,11 @@ class faiPackage extends plugin */ function save_object() { + + if($this->FAIstate == "freeze") return; plugin::save_object(); + + foreach($this->attributes as $attrs){ if(isset($_POST[$attrs])){ $this->$attrs = $_POST[$attrs]; @@ -214,11 +367,17 @@ class faiPackage extends plugin /* Check supplied data */ function check() { - $message= array(); - $str = utf8_encode("üöä"); - if((preg_match("/[^a-z0-9".$str."\.,;:\-_\? ]/i",$this->description))){ - $message[]=_("Please enter a valid description."); + /* Call common method to give check the hook */ + $message= plugin::check(); + + if(count($this->usedPackages)==0){ + $message[]=_("Please select a least one Package."); } + + if((empty($this->FAIdebianRelease))||(empty($this->FAIdebianSection))){ + $message[]=_("Please choose a valid combination for your repository setup."); + } + return ($message); } @@ -226,17 +385,79 @@ class faiPackage extends plugin $a_ret=array(); if(is_array($this->usedPackages)) { foreach($this->usedPackages as $usedName){ - $a_ret[$usedName] = $usedName; + + $config = 0; + + foreach($this->ConfiguredPackages as $name => $value){ + if($name == $usedName){ + $config ++; + } + } + + $c_str =""; + if($config){ + $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.$dsc; + }else{ + $a_ret[$usedName] = $usedName.$c_str.$dsc; + } } } return($a_ret); } + function genPkgs(){ + /* Generate a list off available packages for this mirror, section and release + */ + /* Only read this file if it wasn't read before */ + if($this->buffer==NULL){ + $this->buffer=array(); + $a_ret = array(); + foreach($this->FAIdebianSection as $sec){ + $strID= "/etc/gosa/fai/".$this->FAIdebianRelease."/".$sec; + + if(!is_file($strID)){ + print_red(sprintf(_("Package file '%s' does not exist."),$strID)); + unset($this->buffer); + return(array()); + } + $fp = fopen($strID,"r"); + + /* Parse every line and create an array */ + while(!feof($fp)){ + $str= fgets($fp,512); + $stra= split("\|",$str); + if(count($stra)==4){ + $a_ret[$stra[0]] = $stra; + } + } + fclose($fp); + /* Save our Data, to avoid reading it again */ + } + $this->buffer = $a_ret; + ksort($a_ret); + return($a_ret); + }else{ + return $this->buffer; + } + } + + /* Save to LDAP */ function save() { plugin::save(); - + $ldap = $this->config->get_ldap_link(); $this->attrs['FAIpackage'] = array(); @@ -244,15 +465,20 @@ class faiPackage extends plugin $this->attrs['FAIpackage'][] = $pkg; } - unset($this->attrs['section']); - unset($this->attrs['mirror']); - unset($this->attrs['release']); + $this->attrs['FAIdebianSection'] = array(); + foreach($this->FAIdebianSection as $sec){ + $this->attrs['FAIdebianSection'][] = $sec; + } + + // $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->modify($this->attrs); + $this->cleanup(); + $ldap->modify ($this->attrs); + }else{ /* Write FAIscript to ldap*/ $ldap->cd($this->config->current['BASE']); @@ -260,7 +486,61 @@ class faiPackage extends plugin $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['FAIpackage'] = $pkgname; + $pkgattrs['FAIvariable'] = $name; + $pkgattrs['FAIvariableType'] = $attr['Type']; + $pkgattrs['FAIvariableContent'] = $attr['Value']; + $pkgdn = "FAIvariable=".$name.",".$this->dn; + + /* cehck if object already exists */ + $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->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")); + + /* Handle tagging */ + $this->handle_object_tagging($pkgdn, $this->gosaUnitTag); + } + } + + + + } }