![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 402404c8b47e5ed2027d0fa28cb8bb5536776d97..0cb3792f555ef1052129d24b16a3918d78927c72 100644 (file)
var $ignore_account = TRUE;
/* Attributes for this Object */
- var $attributes = array("cn","description","FAIpackage","FAIdebianRelease","FAIdebianSection","FAIdebianMirror");
+ var $attributes = array("cn","description","FAIpackage","FAIdebianRelease","FAIdebianSection", "FAIinstallMethod");
/* ObjectClasses for this Object*/
var $objectclasses = array("top","FAIclass","FAIpackageList","FAIrepository");
var $FAIdebianRelease = ""; // The selected release
var $FAIdebianSection = ""; // selected section
- var $FAIdebianMirror = ""; // selected mirror
+ var $FAIinstallMethod = "aptitude"; // hard coded
var $mirror = ""; // selected mirror
var $servers = array(); // All available servers
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'])){
}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."))");
- while($attr = $ldap->fetch()){
-
- $tmp =array();
- $tmp['Name'] = $attr['FAIvariable'][0];
- $tmp['Type'] = $attr['FAIvariableType'][0];
-
- if (isset($attrs['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();
- /* Extract mirror location */
- $this->mirror= preg_replace("!^[^/]+//([^/]+).*$!", '$1', $this->FAIdebianMirror);
+
+ $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= "";
- $this->genMirror();
-
- /* 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;
}
- /* alert possible missconfigurations */
- if((count($this->releases)==0)||(count($this->servers)==0)||(count($this->sections)==0)){
- print_red(_("There is no useable package list defined."));
- }
-
/* Assign posible changes, for mirror combinations */
$this->dialog->save_object();
- $this->dialog->releases = $this->releases;
- $this->dialog->servers = $this->servers;
- $this->dialog->sections = $this->sections;
- $this->dialog->mirrors = $this->mirrors;
/* Assign Repository settings*/
if(isset($_POST['SaveObjectNew'])){
- $this->FAIdebianRelease = $this->dialog->FAIdebianRelease;
- $this->FAIdebianSection = $this->dialog->FAIdebianSection;
- $this->FAIdebianMirror = $this->dialog->FAIdebianMirror;
+ $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);
}
-
- /* Set mirror if changed */
- if((isset($_POST['FAIdebianMirrorS']))&&(!empty($_POST['FAIdebianMirrorS']))){
- $this->FAIdebianMirror = $_POST['FAIdebianMirrorS'];
- }
-
- /* check servers matching release and section settings */
- $availableServer = array();
- foreach($this->mirrors as $mir){
- if($mir['release'] == $this->FAIdebianRelease){
- $pass = true;
- foreach($this->FAIdebianSection as $sec){
- if($sec != $mir['section']){
- $pass = false;
- }
- if($pass){
- $availableServer[$mir['mirror']]=$mir['mirror'];
- }
- }
- }
- }
-
+
/* Generate package list */
$this->list=$this->genPkgs();
/* Delte selected package */
if(isset($_POST['Delpkg'])){
- unset($this->usedPackages[$_POST['usedPackages']]);
+ if($this->FAIstate != "freeze"){
+ foreach($_POST['usedPackages'] as $del){
+ if(isset($this->usedPackages[$del])){
+ unset($this->usedPackages[$del]);
+ }
+ }
+ }
}
/* Abort package selection dialog */
/* 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;
- ksort($this->usedPackages);
}
}
/* Configuration dialog open*/
if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
- $path = "/etc/gosa/fai/".preg_replace("#^[^/]+//([^/]+).*$#","\\1",$this->FAIdebianMirror)."/".$this->FAIdebianRelease."/debconf.d";
+ $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
$pkg_config = array();
- if(isset($this->ConfiguredPackages[$_POST['usedPackages']])){
- $pkg_config = $this->ConfiguredPackages[$_POST['usedPackages']];
+ $pkg = $_POST['usedPackages'][0];
+
+ if(isset($this->ConfiguredPackages[$pkg])){
+ $pkg_config = $this->ConfiguredPackages[$pkg];
}
-
- $this->dialog = new faiPackageConfiguration($this->config, $this->dn,$_POST['usedPackages'], $path, $pkg_config);
+
+ $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((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'])){
- $this->ConfiguredPackages= array_merge($this->ConfiguredPackages,$this->dialog->save());
+ if($this->FAIstate != "freeze"){
+ $this->ConfiguredPackages= array_merge($this->ConfiguredPackages,$this->dialog->save());
+ }
$this->dialog = false;
$this->is_dialog=false;
}
/* Assign section to smarty */
$strsec = "";
foreach($this->FAIdebianSection as $sec){
- $strsec .= $sec." ";
+ $strsec .= $sec." ";
}
- $smarty->assign("OptionsACL","");
- if(empty($this->FAIdebianMirror)){
- $smarty->assign("OptionsACL"," disabled ");
+ foreach($this->attributes as $attr){
+ $smarty->assign($attr."ACL",chkacl($this->acl,$attr));
}
- $smarty->assign("mirrors" ,$availableServer);
- $smarty->assign("mirror" ,$this->FAIdebianMirror);
+ $smarty->assign("OptionsACL","");
+
$smarty->assign("releases",$this->releases);
$smarty->assign("release" ,$this->FAIdebianRelease);
$smarty->assign("sections",$this->sections);
return($display);
}
- 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->servers= array();
- $this->releases=array();
- $this->sections=array();
- $this->mirrors= array();
- $fd = opendir($confDir);
- while($mirror = readdir($fd)){
- if((is_dir($confDir.$mirror."/"))&&(($mirror != "." )&&($mirror!=".."))){
-
- $mirrorDir = $confDir.$mirror."/";
-
- $fe = opendir($mirrorDir);
- while($release = readdir($fe)){
- if((is_dir($mirrorDir.$release))&&(($release != "." )&&($release!=".."))){
-
- $releaseDir = $mirrorDir.$release."/";
-
- $ff = opendir($releaseDir);
- while($section = readdir($ff)){
- if((is_file($releaseDir.$section))&&(($section != "." )&&($section!="..")&&(!preg_match("/.*\.in$/",$section)))){
-
- $this->servers[$mirror]=$mirror;
- $this->releases[$release]=$release;
- $this->sections[$section]=$section;
-
- $arr=array();
- $arr['mirror'] = $mirror;
- $arr['release']= $release;
- $arr['section']= $section;
-
- $this->mirrors[] = $arr ;
- }
- }
- fclose($ff);
- }
- }
- fclose($fe);
- }
- }
- fclose($fd);
- }
-
-
- }
-
/* Delete me, and all my subtrees
*/
function remove_from_parent()
$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])){
$this->$attrs = $_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))||(empty($this->FAIdebianMirror))){
+
+ 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");
}
-
+
+ /* 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;
}
}
}
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 */
$this->buffer=array();
$a_ret = array();
foreach($this->FAIdebianSection as $sec){
- $strID= "/etc/gosa/fai/".preg_replace("#^[^/]+//([^/]+).*$#","\\1",$this->FAIdebianMirror)."/".$this->FAIdebianRelease."/".$sec;
-
+ $strID= "/etc/gosa/fai/".$this->FAIdebianRelease."/".$sec;
+
if(!is_file($strID)){
print_red(sprintf(_("Package file '%s' does not exist."),$strID));
- $this->FAIdebianMirror="";
unset($this->buffer);
return(array());
}
}
}
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;
}
- $ldap->cat($this->dn);
+ // $this->attrs["FAIinstallMethod"]= "aptitude";
+
+ $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']);
$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);
- $ldap->modify($pkgattrs);
+ $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());
+ show_ldap_error($ldap->get_error(), _("Saving FAI package entry failed"));
+
+ /* Handle tagging */
+ $this->handle_object_tagging($pkgdn, $this->gosaUnitTag);
}
}
-
+
}
}