Fixed some PHP5 errors

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

diff --git a/plugins/addons/godfs/tabs_dfs.inc b/plugins/addons/godfs/tabs_dfs.inc
index 02438ebae5ef66be8d70826a7991ed98ceb1f010..026f55aebcb9580040c3354a822d0b6cb950df0d 100644 (file)
--- a/plugins/addons/godfs/tabs_dfs.inc
+++ b/plugins/addons/godfs/tabs_dfs.inc
@@ -24,6 +24,7 @@ class dfstabs extends tabs {
   }
 
   function save($ignore_account= FALSE)
+  {
     $baseobject = $this->by_object['dfsManagment'];
     return tabs::save(TRUE);
   }

diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index 9a461b785ec261ed8e06bd8d4ac03f417f110fcc..6447d62ca47496fbeb3403e10e3ff28f2211d642 100644 (file)
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -534,7 +534,7 @@ class glpiPrinterAccount extends plugin
     /* if( cur_dialog != false || cur_dialog != NULL) 
      * There is a dialog which wants to be displayed 
      */
-    if($this->cur_dialog){
+    if($this->cur_dialog && is_object($this->cur_dialog)){
       $this->cur_dialog->save_object();
       $this->dialog=true;
       $this->cur_dialog->parent = &$this;

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 969fbf3bce4966137e5f160d2dbc8138937775be..ccadc0dd43bf57adf8ef3bdd2e5658929f9b1ed7 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -411,7 +411,7 @@ class printgeneric extends plugin
 
     /* Display ppd configure/select dialog      */
     if(isset($_POST['EditDriver'])){
-      if($this->PPDdialogToSave){
+      if($this->PPDdialogToSave && is_object($this->PPDdialogToSave)){
         $this->dialog = $this->PPDdialogToSave;
       }else{
         $this->dialog = new printerPPDDialog($this->config, $this->dn,$this->gotoPrinterPPD);