Updated Opsi

-Fixed creation of clients

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12636 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/opsi/admin/opsi/class_opsi.inc b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
index 4dac33af94c6077788f50d647d6fc22531ddabab..23b4847ea95b44acb8108e445d14bae274aed8ad 100644 (file)
--- a/gosa-plugins/opsi/admin/opsi/class_opsi.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsi.inc
@@ -20,20 +20,24 @@
 
 /********
 
-  __construct($config)
-  get_hosts_for_system_management()
-  get_netboot_products($host = "")
-  get_local_products($host = "")
-  get_product_properties()
-  set_product_properties()
-  get_client_hardware()
-  get_client_software()
-  list_clients()
-  del_client()
-  job_opsi_install_client()
-  add_client()
-  add_product_to_client()
-  del_product_from_client()
+  public function __construct($config)
+  public function enabled()
+  function get_hosts_for_system_management()
+  private function xml_to_array($xml,$alternative_method = FALSE)
+  public function send_action($type,$hostId,$mac)
+  public function list_clients( $hostId = "")
+  public function add_client($hostId,$macaddress,$notes,$description)
+  public function modify_client($hostId,$mac,$notes,$description)
+  public function get_netboot_products($host = "")
+  public function get_local_products($host = "")
+  public function get_product_properties($productId,$hostId = "")
+  public function set_product_properties($productId,$cfg,$hostId = "")
+  public function add_product_to_client($productId,$hostId)
+  public function del_product_from_client($productId,$hostId)
+  public function get_client_hardware($hostId)
+  public function get_client_software($hostId)
+  public function del_client($hostId)
+  public function job_opsi_install_client($hostId,$mac)
 
  ********/
 

diff --git a/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc b/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
index 5d37531e79e3c54005619fd2bceb965264f029cb..2e8f884724b6eac13050f3de054cfb45b7068e43 100644 (file)
--- a/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
+++ b/gosa-plugins/opsi/admin/opsi/class_opsigeneric.inc
@@ -91,7 +91,8 @@ class opsiGeneric extends plugin
 
     /* Try to load client infos from the gosa support daemon
      */
-    if(! ($this->hostId == "new" || !empty($this->mac)  )){
+    if(!empty($this->hostId)){
+
       $list = $this->opsi->list_clients($this->hostId);
       $err |= $this->opsi->is_error();
 
@@ -178,7 +179,7 @@ class opsiGeneric extends plugin
     }else{
 
       /* Remember initial settings */ 
-      $this->is_account = $this->initially_was_account = TRUE;
+      $this->is_account = TRUE;
       $this->a_initial_selectedLocalProducts = $this->a_selectedLocalProducts;
       $this->s_initial_selectedNetbootProduct = $this->s_selectedNetbootProduct;
       $this->a_initial_availableNetbootProducts = $this->a_availableNetbootProducts;