![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc b/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
index 174764002265534486dfa0ac93666073ddc28b15..96993fd770daa8dfbfa2b168c4d2465591014c4b 100644 (file)
}
}
- // Get package info
- if(!empty($this->hostId)){
- $list = $this->opsi->get_full_product_host_information($this->hostId);
- }
-
+ // Get package info
+ $list = array();
+ $list = $this->opsi->get_full_product_host_information($this->hostId);
+ $err |= $this->opsi->is_error();
/* Read informations about available netboot products.
- If not already done, before.
+ If not already done, before.
*/
- if(!$err && !count($this->a_availableNetbootProducts)){
- $this->a_availableNetbootProducts = $this->opsi->get_netboot_products();
- ksort($this->a_availableNetbootProducts);
- $err |= $this->opsi->is_error();
- }
+ if(!$err){
+ foreach($list as $key => $entry){
- /* Read informations about available netboot products.
- If not already done, before.
- */
- foreach($list as $key => $entry){
- if(!$entry['installed']){
- $this->a_availableLocalProducts[$key] = array('DESC'=>$entry['data']['DESCRIPTION'],'NAME'=>$key);
- }else{
- $this->a_selectedLocalProducts[$key] = array('DESC'=>$entry['data']['DESCRIPTION'],'NAME'=>$key);
+ $tmp = array('DESC'=>$entry['data']['DESCRIPTION'],'NAME'=>$key);
if($entry['configurable']){
- $this->a_selectedLocalProducts[$key]['CFG'] = $entry['data']['PROPERTIES'];
- }
- }
- }
-# if(!$err && !count($this->a_availableLocalProducts)) {
-# $this->a_availableLocalProducts = $this->opsi->get_local_products();
-# ksort($this->a_availableLocalProducts);
-# $err |= $this->opsi->is_error();
-# }
-
- /* Get products selected by this host.
- */
- if(!$err && !empty($this->hostId)) {
- $tmp = array_keys($this->opsi->get_netboot_products($this->hostId));
- $err |= $this->opsi->is_error();
- if(count($tmp) && !$err && !isset($this->a_availableNetbootProducts[$this->s_selectedNetbootProduct]['CFG'])){
- $this->s_selectedNetbootProduct = $tmp[0];
-
- /* Read configuration for "Netboot Products" */
- if(isset($this->a_availableNetbootProducts[$this->s_selectedNetbootProduct])){
- $CFG = $this->opsi->get_product_properties($this->s_selectedNetbootProduct,$this->hostId);
- $this->a_availableNetbootProducts[$this->s_selectedNetbootProduct]['CFG'] = $CFG;
+ $tmp['CFG'] = $entry['data']['PROPERTIES'];
+ }
+
+ if($entry['data']['TYPE'] == "localboot"){
+ if(!$entry['installed']){
+ $this->a_availableLocalProducts[$key] = $tmp;
+ }else{
+ $this->a_selectedLocalProducts[$key] = $tmp;
+ }
+ }else{
+ $this->a_availableNetbootProducts[$key] = $tmp;
+ if($entry['installed']){
+ $this->s_selectedNetbootProduct= $key;
+ }
}
}
- $err |= $this->opsi->is_error();
}
-# /* Get all selected local products
-# */
-# if(!$err && !empty($this->hostId) && !count($this->a_selectedLocalProducts)) {
-# $tmp = $this->opsi->get_local_products($this->hostId);
-# $err |= $this->opsi->is_error();
-# $this->a_selectedLocalProducts = $tmp;
-# }
-#
-# /* Load product configuration for all already selected products.
-# */
-# if(!$err && !empty($this->hostId)) {
-# foreach($this->a_selectedLocalProducts as $name => $data){
-# if(!$err && !isset($this->a_selectedLocalProducts[$name]['CFG'])){
-# $CFG = $this->opsi->get_product_properties($name,$this->hostId);
-# $err |= $this->opsi->is_error();
-# $this->a_selectedLocalProducts[$name]['CFG'] = $CFG;
-# }
-# }
-# }
-
/* Check if everything went fine else reset everything and display a retry button
*/
if($err){
*/
public function execute()
{
+ plugin::execute();
$display ="";
/* The pluign initialization failed due to communication problems with the gosa daemon.
foreach($this->a_availableLocalProducts as $name => $data){
if(isset($this->a_selectedLocalProducts[$name])) continue;
- $add_tab = array("string" => "<input type='image' src='images/back.png' name='add_lp_".$name."'>");
+ $add_tab = array("string" => image('images/back.png','add_lp_'.$name));
$name_tab = array("string" => $name);
$desc_tab = array("string" => "<div style='height: 14px;overflow:hidden;'>".$data['DESC']."</div>",
"attach" => "title='".$data['DESC']."' style='border-right:0px;'");
/* Only display edit button, if there is something to edit
*/
- $edit = "<img src='images/empty.png' alt=' '>";
+ $edit = image('images/empty.png');
if(count($data['CFG'])){
- $edit = "<input type='image' src='images/lists/edit.png' name='edit_lp_".$name."'>";
+ $edit = image('images/lists/edit.png','edit_lp_'.$name);
}
- $del = "<input type='image' src='images/lists/trash.png' name='del_lp_".$name."'>";
+ $del = image('images/lists/trash.png','del_lp_'.$name);
$opt_tab = array("string" => $edit.$del,
"attach" => "style='border-right:0px; width: 40px; text-align:right;'");
*/
$res = array();
foreach($c2 as $name => $value){
- if(!isset($c1[$name]) || $c1[$name]['DEFAULT'] != $c2[$name]['DEFAULT']){
+ if(!isset($c1[$name]) || $c1[$name]['CURRENT'] != $c2[$name]['CURRENT']){
$res[$name] = $c2[$name];
}
}
foreach($c1 as $name => $value){
- if(!isset($c2[$name]) || $c2[$name]['DEFAULT'] != $c1[$name]['DEFAULT']){
+ if(!isset($c2[$name]) || $c2[$name]['CURRENT'] != $c1[$name]['CURRENT']){
$res[$name] = $c1[$name];
}
}
/* Add product
*/
if(preg_match("/^add_lp_/",$name) && $this->acl_is_writeable("localProduct")){
- $product = preg_replace("/^add_lp_(.*)_.$/","\\1",$name);
+ $product = preg_replace("/^add_lp_(.*)$/","\\1",$name);
if(isset($this->a_availableLocalProducts[$product]) && !isset($this->a_selectedLocalProducts[$product])){
$this->a_selectedLocalProducts[$product] = $this->a_availableLocalProducts[$product];
$CFG = $this->opsi->get_product_properties($product);
/* Delete product
*/
if(preg_match("/^del_lp_/",$name) && $this->acl_is_writeable("localProduct")){
- $product = preg_replace("/^del_lp_(.*)_.$/","\\1",$name);
+ $product = preg_replace("/^del_lp_(.*)$/","\\1",$name);
if(isset($this->a_selectedLocalProducts[$product])){
unset($this->a_selectedLocalProducts[$product]);
}
/* Edit a product
*/
if(preg_match("/^edit_lp_/",$name) && $this->acl_is_readable("localProduct")){
- $product = preg_replace("/^edit_lp_(.*)_.$/","\\1",$name);
+ $product = preg_replace("/^edit_lp_(.*)$/","\\1",$name);
$this->dialog = new opsiProperties($this->config,
$product,$this->a_selectedLocalProducts[$product]['CFG'],$this->hostId);
break;