![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc
index c79079334a42f6fa7d12d97f5b6a452fe19318fd..4380ba3c7a10ec1bc44349d5393c21e9e5cf1f76 100644 (file)
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);
}
/* 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."))";
/* Assemble release name */
$release = $this->parent->parent->fai_release;
- $tmp= preg_replace('/[,]*'.normalizePreg(get_ou('faiou')).'.*$/', '', $release);
+ $tmp= preg_replace('/[,]*'.preg_quote(get_ou('faiBaseRDN'), '/').'.*$/', '', $release);
$tmp= preg_replace('/ou=/', '', $tmp);
$rev= array_reverse(split(',', $tmp));
$this->FAIdebianRelease= "/";
/******
- * Add && Remove Packages
+ * Add
******/
/* + was pressed to open the package dialog */
- if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage")){
+ if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage") && !preg_match("/freeze/",$this->FAIstate)){
$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]);
+ /* 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;
+ }
- /* Generate package list */
- $this->list= $this->genPkgs(TRUE);
+ /******
+ * 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;
}
}
/* attach new packages */
if(isset($_POST['SaveSubObject'])) {
- if(!preg_match("/^freeze/", $this->FAIstate)){
+ if(!preg_match("/freeze/i", $this->FAIstate)){
$this->dialog->save_object();
if(count($this->dialog->check())){
foreach($this->dialog->check() as $msgs){
}
}
-
- /******
- * Configure Packages
- ******/
-
- /* 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;
- }
- }
- /* Generate package list */
- $this->list= $this->genPkgs(TRUE);
- }
- }
-
/* Save Configuration */
if(isset($_POST['SaveObjectConfig'])){
if(!preg_match("/^freeze/", $this->FAIstate)){
* 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 = "<img src='images/empty.png' alt=' ' class='center'>";
+ if(isset($this->ConfiguredPackages[$usedName])){
+ $configured = "<img src='plugins/fai/images/package_configure.png' alt='"._("Configured")."'
+ title='"._("Configured")."' class='center'>";
+ }
+
+ /* Adapt used name if we're marked for removal */
+ $removal = "<img src='images/empty.png' alt=' ' class='center'>";
+ if (preg_match('/\-$/', $name)){
+ $removal = "<img src='plugins/fai/images/removal_mark.png' alt='"._("Package marked for removal")."'
+ title='"._("Package marked for removal")."' class='center'>";
+ }
+
+ /* 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 = "<input type='image' class='center' title='"._("Mark package for removal")."'
+ src='plugins/fai/images/removal_mark.png' name='removal_package_".base64_encode($usedName)."' >";
+ }
+
+ if(isset($this->list[$usedName]['TEMPLATE']) &&
+ !preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIdebconfInfo")){
+ $actions.= " <input type='image' class='center' title='"._("Configure this package")."'
+ src='plugins/fai/images/package_configure.png' name='configure_package_".base64_encode($usedName)."' >";
+ }
+ if(!preg_match('/^freeze/', $this->FAIstate) && $this->acl_is_writeable("FAIpackage")){
+ $actions.= " <input type='image' class='center' title='"._("Remove this package")."'
+ src='images/lists/trash.png' name='remove_package_".base64_encode($usedName)."' >";
+ }
+
+ $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);
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);
}
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$release = $this->parent->parent->fai_release;
- $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $release, $this->dn);
+ $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", $release, $pkgdn);
+ $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);
}
}
*/
if($this->is_new){
$release = $this->parent->parent->fai_release;
- $new_dn= 'cn='.$this->cn.",".get_ou('faipackageou').get_ou('faiou').$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"));
}
- /*! \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{
if($this->FAIdebianRelease == "ClearFromCopyPaste"){
$current_release = $this->parent->parent->fai_release;
- $tmp= preg_replace('/,'.normalizePreg(get_ou('faiou')).'.*$/', '', $current_release);
+ $tmp= preg_replace('/,'.preg_quote(get_ou('faiBaseRDN'), '/').'.*$/', '', $current_release);
$tmp= preg_replace('/ou=/', '', $tmp);
$rev= array_reverse(split(',', $tmp));
$this->FAIdebianRelease= "";
$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;
}