X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_faiPackage.inc;h=d32f26a64d41e27de24dc2c150bd47363a5deaee;hb=ac00a6eccb7dd4f40043288482e701a3f17fcc6e;hp=1814daf6f3275e359a797d847e7d9e6b5532a451;hpb=05d0bc993b499469745e6e5194c2a95410819d77;p=gosa.git
diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index 1814daf6f..d32f26a64 100644
--- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
@@ -40,13 +40,15 @@ class faiPackage extends plugin
var $usedPackages = array();
var $buffer = NULL;
- var $newDialogShown =false;
+ var $newDialogShown = false;
var $FAIstate = "";
var $view_logged = FALSE;
var $base;
var $FAIpackage ;
+ var $packageSelect ;
+
var $FAIinstallMethods = array( "install", "ninstall", "remove",
"dselect-upgrade", "taskinst", "taskrm",
"hold", "clean", "aptitude", "aptitude-r",
@@ -65,18 +67,14 @@ class faiPackage extends plugin
if($dn != "new"){
$this->dn =$dn;
- /* Get FAIstate */
- if(isset($this->attrs['FAIstate'][0])){
- $this->FAIstate = $this->attrs['FAIstate'][0];
- }
-
/* Check if there are already some packages in this list
*/
$this->usedPackages = array();
if(isset($this->attrs['FAIpackage'])){
unset($this->attrs['FAIpackage']['count']);
foreach($this->attrs['FAIpackage'] as $pkg){
- $this->usedPackages[$pkg] = $pkg;
+ $name = preg_replace("/\-$/","",$pkg);
+ $this->usedPackages[$name] = $pkg;
}
ksort($this->usedPackages);
}
@@ -84,7 +82,7 @@ class faiPackage extends plugin
/* Fetch all package configurations from ldap
*/
$PackageFilter = "";
- foreach($this->usedPackages as $name){
+ foreach($this->usedPackages as $name => $value){
$PackageFilter .= "(FAIpackage=".$name.")";
}
$PackageFilter = "(&(objectClass=FAIdebconfInfo)(|".$PackageFilter."))";
@@ -176,15 +174,15 @@ class faiPackage extends plugin
if(!$this->is_account){
/* Assemble release name */
- $faifilter = session::get('faifilter');
- $tmp= preg_replace('/,'.normalizePreg(get_ou('faiou')).'.*$/', '', $faifilter['branch']);
+ $release = $this->parent->parent->fai_release;
+ $tmp= preg_replace('/[,]*'.preg_quote(get_ou('faiBaseRDN'), '/').'.*$/i', '', $release);
$tmp= preg_replace('/ou=/', '', $tmp);
- $rev= array_reverse(split(',', $tmp));
- $this->FAIdebianRelease= "";
+ $rev= array_reverse(explode(',', $tmp));
+ $this->FAIdebianRelease= "/";
foreach ($rev as $part){
$this->FAIdebianRelease.= "/$part";
}
- $this->FAIdebianRelease= preg_replace('#^/#', '', $this->FAIdebianRelease);
+ $this->FAIdebianRelease= preg_replace('#^[/]*#', '', $this->FAIdebianRelease);
/* Assemble sections */
$repos= $this->getServerInfos();
@@ -196,95 +194,185 @@ class faiPackage extends plugin
/* Assign Repository settings*/
$this->is_account = true;
}
-
+
/******
- * Add && Remove Packages
+ * Add
******/
- /* + was pressed to open the package dialog */
- if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage")){
- $this->dialog = new faiPackageEntry($this->config, $this->FAIdebianRelease,$this->usedPackages);
- $this->is_dialog =true;
- }
-
- /* Delete selected package */
- if(isset($_POST['Delpkg']) && $this->acl_is_writeable("FAIpackage")){
- if(!preg_match("/^freeze/", $this->FAIstate)){
- foreach($_POST['usedPackages'] as $del){
- if(isset($this->usedPackages[$del])){
- unset($this->usedPackages[$del]);
+ if(isset($_POST['AddManualpkg']) &&
+ isset($_POST['addPpkgsText']) &&
+ strlen($_POST['addPpkgsText']) &&
+ $this->acl_is_writeable("FAIpackage") &&
+ !preg_match("/freeze/",$this->FAIstate)){
+
+ // Check all splitted packages for valid package names
+ $add_packages = preg_split( "/[\s,]+/", get_post('addPpkgsText'), -1, PREG_SPLIT_NO_EMPTY );
+ if( is_array($add_packages) ) {
+ $invalid_packages = array();
+ foreach ($add_packages as $value) {
+ if(!preg_match( "/^[a-z0-9][-0-9a-z+\.]+$/",$value)){
+ $invalid_packages[] = trim($value);
+ }else{
+ $valid_packages[] = trim($value);
}
}
+ if(count($invalid_packages)){
+ $str = implode(", ",$invalid_packages);
+ msg_dialog::display(_("Invalid package names"),
+ sprintf(_("The following package names don't match the Debian policy: %s"),$str),
+ ERROR_DIALOG);
+ }
- /* Generate package list */
- $this->list= $this->genPkgs(TRUE);
- }
- }
- /* Abort package selection dialog */
- if(isset($_POST['CancelSubObject'])){
- $this->dialog = false;
- $this->is_dialog=false;
- }
+ // If we have a complete list of valid packages, add them
+ if(count($valid_packages)){
- /* attach new packages */
- if(isset($_POST['SaveSubObject'])) {
- if(!preg_match("/^freeze/", $this->FAIstate)){
- $this->dialog->save_object();
- if(count($this->dialog->check())){
- foreach($this->dialog->check() as $msgs){
- msg_dialog::display(_("Error"), $msgs, ERROR_DIALOG);
+ foreach($valid_packages as $key => $value){
+ if(array_key_exists($value,$this->usedPackages)) {
+ unset($valid_packages[$key]);
+ }
}
- }else{
- $use = $this->dialog->save();
- $this->usedPackages = $use;
- $this->dialog = false;
- $this->is_dialog=false;
+
+ // Query SI-Deamon for additional package information
+ $daemon = new gosaSupportDaemon();
+ $query_attrs = array("distribution", "package","version", "section", "description", "timestamp");
+ $do_si_query = true;
+
+
+ foreach ($valid_packages as $value) {
+
+ if( $do_si_query == true ) {
+ $res = $daemon->FAI_get_packages($this->FAIdebianRelease,$query_attrs,array($value),0,1);
+ if( ! $daemon->is_error()){
+
+ if(count($res)){
+
+ // We just use the last answer - there shouldn't be multiple
+ $res_attrs = array_pop( $res );
+ $this->list[$value] = $res_attrs;
+ $this->usedPackages[$value] = $res_attrs['PACKAGE'];
+
+ }else{
+ $this->usedPackages[$value] = $value;
+ }
+ }else{
+ msg_dialog::display(_("Service infrastructure"),
+ msgPool::siError($daemon->get_error()),
+ ERROR_DIALOG);
+ $do_si_query = false;
+ }
+ }
+ }
+
ksort($this->usedPackages);
/* Generate package list */
$this->list= $this->genPkgs(TRUE);
}
- }else{
- $this->dialog = false;
- $this->is_dialog=false;
}
}
+ // Open the packageSelect dialog to allow adding packages out of a list.
+ if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage") && !preg_match("/freeze/",$this->FAIstate)){
+ $this->packageSelect = new packageSelect($this->config, get_userinfo());
+ session::set('packageSelect_Release',$this->FAIdebianRelease);
+ $this->dialog =true;
+ }
- /******
- * Configure Packages
- ******/
+ // Close packageSelect dialog.
+ if(isset($_POST['packageSelect_cancel'])){
+ $this->packageSelect = FALSE;
+ $this->dialog =FALSE;
+ }
- /* Configuration dialog open*/
- if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'][0])) && $this->acl_is_writeable("FAIdebconfInfo")){
- $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, $this->FAIdebianRelease , $pkg_config);
- $this->is_dialog =true;
- }
-
- /* Configuration dialog open*/
- if(preg_match('/^freeze/', $this->FAIstate) && $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;
+ // Close packageSelect dialog and add the selected packages.
+ if(isset($_POST['packageSelect_save']) && $this->packageSelect instanceOf packageSelect){
+ if(!preg_match("/freeze/i", $this->FAIstate)){
+ $use = $this->packageSelect->save();
+
+ foreach($use as $pkg){
+ $item = array();
+ for($i =0; $i < $pkg['count']; $i++){
+ $item[$pkg[$i]] = $pkg[$pkg[$i]][0];
}
+ $this->usedPackages[$item['PACKAGE']] = $item['PACKAGE'];
}
+
+ ksort($this->usedPackages);
+
/* Generate package list */
$this->list= $this->genPkgs(TRUE);
}
+ $this->packageSelect = FALSE;
+ $this->dialog =FALSE;
+ }
+
+ // Display package add dialog
+ if($this->packageSelect instanceOf packageSelect){
+
+ session::set('filterBlacklist', array('PACKAGE' => $this->usedPackages));
+ return $this->packageSelect->execute();
+ }
+
+
+ /* Check image Posts
+ */
+ foreach($_POST as $name => $value){
+
+ /******
+ * Mark as removed
+ ******/
+
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^removal_package_/",$name)){
+ $id = @base64_decode(preg_replace("/^removal_package_(.*)_[xy]*$/","\\1",$name));
+ if(isset($this->usedPackages[$id])){
+ $pkg = $this->usedPackages[$id];
+ if (preg_match('/\-$/', $pkg)){
+ $pkg= preg_replace('/\-$/', '', $pkg);
+ } else {
+ $pkg= preg_replace('/$/', '-', $pkg);
+ }
+ $this->usedPackages[$id] = $pkg;
+ }
+ break;
+ }
+
+ /******
+ * Delete Pkgs
+ ******/
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^remove_package_/",$name)){
+ $id = @base64_decode(preg_replace("/^remove_package_(.*)_[xy]*$/","\\1",$name));
+ if(isset($this->usedPackages[$id])){
+ unset($this->usedPackages[$id]);
+ }
+ break;
+ }
+
+ /******
+ * Configure Pkgs
+ ******/
+ if(!preg_match('/freeze/i', $this->FAIstate) && preg_match("/^configure_package_/",$name)){
+ $pkg = @base64_decode(preg_replace("/^configure_package_(.*)_[xy]*$/","\\1",$name));
+
+ if(isset($this->usedPackages[$pkg])){
+
+ /* Configuration dialog open*/
+ $pkg_config = array();
+ if(isset($this->ConfiguredPackages[$pkg])){
+ $pkg_config = $this->ConfiguredPackages[$pkg];
+ }
+ $this->dialog = new faiPackageConfiguration($this->config, $this->dn,$pkg, $this->FAIdebianRelease , $pkg_config);
+ $this->is_dialog =true;
+ }
+ break;
+ }
+ }
+
+ /* Abort package selection dialog */
+ if(isset($_POST['CancelSubObject'])){
+ $this->dialog = false;
+ $this->is_dialog=false;
}
/* Save Configuration */
@@ -313,6 +401,66 @@ class faiPackage extends plugin
* Display UI / HTML / smarty
******/
+ /* Create divlist to display a list of all currently used packages
+ */
+ $divlist = new divSelectBox("faiPackages");
+
+ ksort($this->usedPackages);
+ if(is_array($this->usedPackages)){
+ foreach($this->usedPackages as $usedName => $name){
+
+ $actions = "";
+
+ /* Append message if package is configured */
+ $configured = "
";
+ if(isset($this->ConfiguredPackages[$usedName])){
+ $configured = "
";
+ }
+
+ /* Adapt used name if we're marked for removal */
+ $removal = "";
+ if (preg_match('/\-$/', $name)){
+ $removal = "
";
+ }
+
+ /* Get Version */
+ $version = " ";
+ if(isset($this->list[$usedName]['VERSION'])){
+ $version = $this->list[$usedName]['VERSION'];
+ }
+
+ /* Get description */
+ $description = " ";
+ if(isset($this->list[$usedName]['DESCRIPTION'])){
+ $description = base64_decode($this->list[$usedName]['DESCRIPTION']);
+ }
+
+ if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
+ $actions = "";
+ }
+
+ if(isset($this->list[$usedName]['TEMPLATE']) &&
+ !preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
+ $actions.= " ";
+ }
+ if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
+ $actions.= " ";
+ }
+
+ $field1 = array("string" => $configured." ".$removal,"attach" => "style='width:40px;'");
+ $field2 = array("string" => $usedName ,"attach" => "style='width:200px;'");
+ $field3 = array("string" => $version);
+ $field4 = array("string" => $description);
+ $field5 = array("string" => $actions ,"attach" => "style='width:60px; border-right:0px;'");
+ $divlist->AddEntry(array($field1,$field2,$field3,$field4,$field5));
+ }
+ }
+
/* Assign variables */
foreach($this->attributes as $attrs){
$smarty->assign($attrs,$this->$attrs);
@@ -329,11 +477,12 @@ class faiPackage extends plugin
foreach($tmp['plProvidedAcls'] as $name => $translated){
$smarty->assign($name."ACL",$this->getacl($name,preg_match("/freeze/",$this->FAIstate)));
}
-
+
+ $smarty->assign("freeze", preg_match("/freeze/",$this->FAIstate));
+ $smarty->assign("divlist",$divlist->DrawList());
$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);
}
@@ -345,24 +494,14 @@ class faiPackage extends plugin
{
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
-
- $faifilter = session::get('faifilter');
- $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $faifilter['branch'], $this->dn);
- if($faifilter['branch'] == "main"){
- $use_dn = $this->dn;
- }
-
+ $release = $this->parent->parent->fai_release;
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $this->dn);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
-
new log("remove","fai/".get_class($this),$use_dn,$this->attributes);
-
foreach($this->ConfiguredPackages as $pkgname => $attrs){
foreach($attrs as $name => $attr){
$pkgdn = "FAIvariable=".$name.",".$this->dn;
- $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $faifilter['branch'], $pkgdn);
- if($faifilter['branch'] == "main"){
- $use_dn = $obj['dn'];
- }
+ $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $pkgdn);
FAI::prepare_to_save_FAI_object($use_dn,array(),true);
}
}
@@ -398,12 +537,8 @@ class faiPackage extends plugin
/* Ensure that we do not overwrite an allready existing entry
*/
if($this->is_new){
- $new_dn= 'cn='.$this->cn.",".get_ou('faipackageou').get_ou('faiou').session::get('CurrentMainBase');
- $faifilter = session::get('faifilter');
- if($faifilter['branch']!="main"){
- $new_dn ='cn='.$this->cn.",".get_ou('faipackageou').$faifilter['branch'];
- }
-
+ $release = $this->parent->parent->fai_release;
+ $new_dn= 'cn='.$this->cn.",".get_ou('faiPackageRDN').get_ou('faiBaseRDN').$release;
$res = faiManagement::check_class_name("FAIpackageList",$this->cn,$new_dn);
if(isset($res[$this->cn])){
$message[] = msgPool::duplicated(_("Name"));
@@ -413,50 +548,20 @@ class faiPackage extends plugin
}
- /*! \brief Returns all selected packages in a printable format
- @return Array Containing all package infos.
- */
- function printUsedPackages()
- {
- $a_ret=array();
- if(is_array($this->usedPackages)){
- foreach($this->usedPackages as $usedName){
-
- /* Append message if package is configured */
- $c_str ="";
- if(isset($this->ConfiguredPackages[$usedName])){
- $c_str = " - "._("package is configured");
- }
-
- /* Adapt used name if we're marked for removal */
- $dsc= "";
- if (preg_match('/^-/', $usedName)){
- $dsc= " - "._("Package marked for removal");
- }else{
- $usedName2= $usedName;
- }
-
- /* Append version string, if available */
- if(isset($this->list[$usedName]['VERSION'])){
- $a_ret[$usedName] = $usedName2." [".$this->list[$usedName]['VERSION']."]".$c_str.$dsc;
- }else{
- $a_ret[$usedName] = $usedName2.$c_str.$dsc;
- }
- }
- }
- return($a_ret);
- }
-
-
/*! \brief Reload the list of cached packages.
@return Returns the currently cached list of packages.
*/
function genPkgs($force = false)
{
+ if(empty($this->FAIdebianRelease)) return;
+
if(!count($this->buffer) || $force){
$q = new gosaSupportDaemon();
- $attrs = array("distribution", "package","version", "section", "description", "timestamp");
- $ret = $q->FAI_get_packages($this->FAIdebianRelease,$attrs,$this->usedPackages);
+ $attrs = array("distribution", "package","version", "section", "description", "timestamp","template");
+
+ $packages = array_keys($this->usedPackages);
+
+ $ret = $q->FAI_get_packages($this->FAIdebianRelease,$attrs,$packages);
if($q->is_error()){
msg_dialog::display(_("Service infrastructure"),msgPool::siError($q->get_error()),ERROR_DIALOG);
}else{
@@ -476,10 +581,11 @@ class faiPackage extends plugin
/* Assemble release name */
if($this->FAIdebianRelease == "ClearFromCopyPaste"){
- $faifilter = session::get('faifilter');
- $tmp= preg_replace('/,'.normalizePreg(get_ou('faiou')).'.*$/', '', $faifilter['branch']);
+
+ $current_release = $this->parent->parent->fai_release;
+ $tmp= preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'.*$/i', '', $current_release);
$tmp= preg_replace('/ou=/', '', $tmp);
- $rev= array_reverse(split(',', $tmp));
+ $rev= array_reverse(explode(',', $tmp));
$this->FAIdebianRelease= "";
foreach ($rev as $part){
$this->FAIdebianRelease.= "/$part";
@@ -492,7 +598,7 @@ class faiPackage extends plugin
$ldap = $this->config->get_ldap_link();
$this->attrs['FAIpackage'] = array();
- foreach($this->usedPackages as $pkg => $obj){
+ foreach($this->usedPackages as $pkg){
$this->attrs['FAIpackage'][] = $pkg;
}
@@ -658,9 +764,9 @@ class faiPackage extends plugin
if(isset($attrs['FAIrepository'])){
for($i =0 ; $i < $attrs['FAIrepository']['count']; $i++){
$obj = $attrs['FAIrepository'][$i];
- $tmp = split("\|",$obj);
+ $tmp = explode("|",$obj);
if(count($tmp)==4){
- foreach(split(",",$tmp[3]) as $sec){
+ foreach(explode(",",$tmp[3]) as $sec){
if(!empty($sec)){
$ret[$tmp[2]][] = $sec;
}