X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_certificate.inc;h=f7e784d5f6c5484640b9aa5f7f663a91c83b252e;hb=0adbff1190cf5933e2f48f5c9022496de7bade2e;hp=c98f9450e3bde759a0419ed18f3a22314fb99c1c;hpb=f1d80f2a059d07ab5925d34c0a365ab1934a9991;p=gosa.git

diff --git a/include/class_certificate.inc b/include/class_certificate.inc
index c98f9450e..f7e784d5f 100755
--- a/include/class_certificate.inc
+++ b/include/class_certificate.inc
@@ -106,58 +106,72 @@ class certificate
   /* Return Functions */
   function getvalidto_date()
   {
-    return($this->info['validTo_time_t']);
+    if(isset($this->info['validTo_time_t'])){
+      return($this->info['validTo_time_t']);
+    }else{
+      return(false);
+    }
   } 
 
   function getvalidfrom_date()
   {
-    return($this->info['validFrom_time_t']);
+    if(isset($this->info['validFrom_time_t'])){
+      return($this->info['validFrom_time_t']);
+    }else{
+      return(false);
+    }
+
   }
 
   function getname()
   {
-    return($this->info['name']);
+    if(isset($this->info['name'])){
+      return($this->info['name']);
+    }else{
+      return(false);
+    }
   }
 
   function getCN()
   {
-    return($this->info['subject']['CN']);
+    if(isset($this->info['subject']['CN'])){
+      return($this->info['subject']['CN']);
+    }else{
+      return(false);
+    }
   }
 
   function getO()
   {
-    return($this->info['subject']['O']);
+    if(isset($this->info['subject']['O'])){
+      return($this->info['subject']['O']);
+    }else{
+      return(false);
+    }
   }
 
   function getOU()
   {
-    return($this->info['subject']['OU']);
+    if(isset($this->info['subject']['OU'])){
+      return($this->info['subject']['OU']);
+    }else{
+      return(false);
+    }
   }
 
   function getSerialNumber()
   {
-    return($this->info['serialNumber']);
-  }
-
-  function isvalid($returnstr = false)
-  {
-  if(($this->type != false)&&(count($this->info)>1))
-    {
-     if($returnstr){
-        return(_("valid"));
-      }else{
-        return(true);
-      }
+    if(isset($this->info['serialNumber'])){
+      return($this->info['serialNumber']);
     }else{
-      if($returnstr){
-        return(_("invalid"));
-      }else{
-        return(false);
-      }
-
+      return(false);
     }
   }
 
+  function isvalid()
+  {
+    return (($this->type != false)&&(count($this->info)>1));
+  }
   
 
   /* Export Certificate to specified file, with specified method*/