![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index bf9b32ba937d86391dad6d4a85cf2122a821f7a0..2a9e4043a31c4864af744d2bfc3aaf607f806d74 100644 (file)
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 */
}else{
$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->confDir = CONFIG_DIR."/fai/";
$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 */
+ /* Call parent execute */
- plugin::execute();
+ plugin::execute();
/* Fill templating stuff */
$smarty= get_smarty();
$display= "";
- /* Check if we exist already - no need to ask for revisions, etc. then */
- if ($this->dn != "new"){
- $this->newDialogShown= true;
- }
+ $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 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->dialog = false;
+ $this->is_dialog = false;
$this->newDialogShown = true;
+ $this->is_account = true;
}
/* Draw dialog */
foreach($this->attributes as $attrs){
$smarty->assign($attrs,$this->$attrs);
}
-
+
/* Generate package list */
$this->list=$this->genPkgs();
$path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
$pkg_config = array();
$pkg = $_POST['usedPackages'][0];
-
+
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;
}
-
+
/* Save Configuration */
if(isset($_POST['SaveObjectConfig'])){
if($this->FAIstate != "freeze"){
/* Assign section to smarty */
$strsec = "";
foreach($this->FAIdebianSection as $sec){
- $strsec .= $sec." ";
+ $strsec .= $sec." ";
}
foreach($this->attributes as $attr){
$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");
}
*/
function save_object()
{
-
+
if($this->FAIstate == "freeze") return;
plugin::save_object();
-
+
foreach($this->attributes as $attrs){
if(isset($_POST[$attrs])){
/* Check supplied data */
function check()
{
- $message= array();
-
+ /* 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.");
}
$a_ret=array();
if(is_array($this->usedPackages)) {
foreach($this->usedPackages as $usedName){
-
+
$config = 0;
-
+
foreach($this->ConfiguredPackages as $name => $value){
if($name == $usedName){
$config ++;
}
}
-
+
$c_str ="";
if($config){
$c_str = " - "._("package is configured");
}
-
+
if(isset($this->list[$usedName][1])){
$a_ret[$usedName] = $usedName." [".$this->list[$usedName][1]."]".$c_str;
}else{
return($a_ret);
}
- function genPkgs(){
+ function genPkgs(){
/* Generate a list off available packages for this mirror, section and release
*/
/* Only read this file if it wasn't read before */
$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);
}
}
fclose($fp);
- /* Save our Data, to avoid reading it again */
+ /* Save our Data, to avoid reading it again */
}
$this->buffer = $a_ret;
ksort($a_ret);
function save()
{
plugin::save();
-
+
$ldap = $this->config->get_ldap_link();
$this->attrs['FAIpackage'] = array();
foreach($this->usedPackages as $pkg => $obj){
$this->attrs['FAIpackage'][] = $pkg;
}
-
+
$this->attrs['FAIdebianSection'] = array();
foreach($this->FAIdebianSection as $sec){
$this->attrs['FAIdebianSection'][] = $sec;
}
- $this->attrs["FAIinstallMethod"]= "aptitude";
+ // $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);
$this->cleanup();
-$ldap->modify ($this->attrs);
+ $ldap->modify ($this->attrs);
}else{
/* Write FAIscript to ldap*/
$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 */
+ /* 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->modify ($pkgattrs);
+ $ldap->modify ($pkgattrs);
}else{
$ldap->cd($this->config->current['BASE']);
$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);
}
}
-
+
}
}