Some updates

[gosa.git] / include / class_tabs.inc

diff --git a/include/class_tabs.inc b/include/class_tabs.inc
index c71fa94920e3988584c1371a0642647d7e7d1145..729a441d89e576a5cc511accdd7957eee3e1373d 100644 (file)
--- a/include/class_tabs.inc
+++ b/include/class_tabs.inc
@@ -90,7 +90,9 @@ class tabs
 
        $obj= $this->by_object[$this->current];
        $display.= $obj->execute();
-       $this->by_object[$this->current]= $obj;
+  if (is_php4()){
+    $this->by_object[$this->current]= $obj;
+  }
 
        /* Footer for tabbed dialog */
        $display.= "</td></tr></table>";
@@ -106,7 +108,9 @@ class tabs
 
                $obj= $this->by_object[$this->last];
                $obj->save_object ();
-               $this->by_object[$this->last]= $obj;
+    if (is_php4()){
+      $this->by_object[$this->last]= $obj;
+    }
        }
 
        /* Skip if curent and last are the same object */
@@ -122,9 +126,10 @@ class tabs
                        $this->current, "Saving (current)");
 
                $obj->save_object ();
-               $this->by_object[$this->current]= $obj;
+    if (is_php4()){
+      $this->by_object[$this->current]= $obj;
+    }
        }
-
   }
 
   function gen_tabs()
@@ -175,15 +180,8 @@ class tabs
 
   function set_acl($acl)
   {
-       /* Set local acl */
-       $this->acl= $acl;
-
-       /* Setup for all plugins */
-       foreach ($this->by_object as $key => $obj){
-               $sacl= get_module_permission($acl, "$key", $this->dn);
-               $obj->acl= $sacl;
-               $this->by_object[$key]= $obj;
-       }
+       /* Look for attribute in ACL */
+         trigger_error("Don't use tabs::set_acl() its obsolete.");
   }
 
   function delete()
@@ -217,24 +215,27 @@ class tabs
 
   function check($ignore_account= FALSE)
   {
-       $this->save_object(TRUE);
-       $messages= array();
-
-       /* Check all plugins */
-       foreach ($this->by_object as $key => $obj){
-               if ($obj->is_account || $ignore_account || $obj->ignore_account){
-                       @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
-                               $key, "Checking");
-
-                       $messages= $obj->check();
-                       if (count($messages)){
-                               $this->current= $key;
-                               break;
-                       }
-               }
-       }
-
-       return ($messages);
+    $this->save_object(TRUE);
+    $messages= array();
+
+    /* Check all plugins */
+    foreach ($this->by_object as $key => $obj){
+      if ($obj->is_account || $ignore_account || $obj->ignore_account){
+        @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,
+            $key, "Checking");
+
+        $messages= $obj->check();
+        if (is_php4()){
+          $this->by_object[$key]= $obj;
+        }
+        if (count($messages)){
+          $this->current= $key;
+          break;
+        }
+      }
+    }
+
+    return ($messages);
   }
 
   function save($ignore_account= FALSE)
@@ -264,7 +265,9 @@ class tabs
                                  $key, "Adapting");
                  $obj->parent= &$this;
                  $obj->adapt_from_template($dn);
-                 $this->by_object[$key]= $obj;
+      if (is_php4()){
+        $this->by_object[$key]= $obj;
+      }
          }
   }
 
@@ -285,20 +288,23 @@ class tabs
    */
   function getCopyDialog()
   {
-         $ret = "";
-         $this->SubDialog = false;
-         foreach ($this->by_object as $key => $obj){
-                 if($obj->is_account){
-                         $tmp = $this->by_object[$key]->getCopyDialog();
-                         if($tmp['status'] == "SubDialog"){
-                                 $this->SubDialog = true;
-                     return($tmp['string']);
-                 }else{
-                 $ret .= $tmp['string'];
-                         }
-                 }
-         }
-         return($ret);
+    $ret = "";
+    $this->SubDialog = false;
+    foreach ($this->by_object as $key => $obj){
+      if($obj->is_account){
+        $tmp = $this->by_object[$key]->getCopyDialog();
+        if($tmp['status'] == "SubDialog"){
+          $this->SubDialog = true;
+          return($tmp['string']);
+        }else{
+          if(!empty($tmp['string'])){
+            $ret .= $tmp['string'];
+            $ret .= "<p class='seperator'>&nbsp;</p>";
+          }
+        }
+      }
+    }
+    return($ret);
   }
 
 
@@ -329,5 +335,5 @@ class tabs
   }
 
 }
-
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>