Updated host and product handling

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

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
index 7dfa32139c03e9ed9757a9fa7e0f219009102ce7..b7c2ce5f99e8c3ce68fecd5dedd2a574614d7152 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
@@ -56,7 +56,7 @@ class licenseByProduct extends plugin
     }else{
 
       $res = $this->si->getLicensesForProduct($this->cn);
-      if($this->si->is_error()){
+      if($this->si->is_error() || !$res){
         $this->init_successfull = FALSE;
         return;
       }

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
index 9b38d320ad1d22ca18ff2d14bdd649df1ee02102..a6ba92f37c3bc22cfb72cff4f3f1a009cfa7bc0c 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
@@ -56,7 +56,7 @@ class licenseUsageByHost extends plugin
     }else{
 
       $res = $this->si->getLicenseUsage($this->cn);
-      if($this->si->is_error()){
+      if($this->si->is_error() || !$res){
         $this->init_successfull = FALSE;
         return;
       }

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
index 2fafdae3b0db9ce38aceccfcda736405f7841a33..63e472935c823af1c62319ce93fae364097fee66 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenseHandler.inc
@@ -304,10 +304,12 @@ class opsiLicenceHandler extends opsi  {
     $data['productId'] = htmlentities($productId);
     $res = $this->send_data("gosa_opsi_getLicenseInformationForProduct",$this->target,$data,TRUE);
 
-    print_a($res);
-
+    if(isset($res['XML'][0]['ERROR_OPSI_GETLICENSEINFORMATIONFORPRODUCT'])){
+#      $this->set_error($res['XML'][0]['ERROR_OPSI_GETLICENSEINFORMATIONFORPRODUCT']);
+      return(FALSE);
+    }
     if(isset($res['XML'][0]['ANSWER_OPSI_UNASSIGNALLSOFTWARELICENSESFROMHOST'])){
-      return(TRUE);
+      return($res['XML'][0]);
     }
     return(FALSE);
   }