From 110c776d6736472874b3742c70cc383cef5aae69 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 20 Sep 2007 12:36:20 +0000
Subject: [PATCH] Updated for PHP5

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7356 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/class_mail-methods-cyrus.inc            | 2 +-
 include/php_setup.inc                           | 9 ---------
 plugins/addons/godfs/tabs_dfs.inc               | 4 +---
 plugins/addons/ldapmanager/tabs_ldif.inc        | 2 +-
 plugins/addons/logview/tabs_log.inc             | 2 +-
 plugins/admin/acl/tabs_acl.inc                  | 2 +-
 plugins/admin/acl/tabs_acl_role.inc             | 2 +-
 plugins/admin/applications/tabs_application.inc | 2 +-
 plugins/admin/departments/tabs_department.inc   | 4 ++--
 plugins/admin/groups/tabs_group.inc             | 2 +-
 plugins/admin/mimetypes/tabs_mimetypes.inc      | 2 +-
 plugins/admin/ogroups/tabs_ogroups.inc          | 2 +-
 plugins/admin/systems/tabs_component.inc        | 2 +-
 plugins/admin/systems/tabs_phone.inc            | 2 +-
 plugins/admin/systems/tabs_printers.inc         | 2 +-
 plugins/admin/systems/tabs_server.inc           | 2 +-
 plugins/admin/systems/tabs_terminal.inc         | 2 +-
 plugins/admin/systems/tabs_winstation.inc       | 2 +-
 plugins/admin/systems/tabs_workstation.inc      | 2 +-
 plugins/admin/users/tabs_user.inc               | 2 +-
 plugins/gofon/conference/tabs_conference.inc    | 2 +-
 plugins/gofon/macro/tabs_macros.inc             | 2 +-
 22 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index f191fbf07..58fe60b52 100644
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -104,7 +104,7 @@ class mailMethodCyrus extends mailMethod
 
 
   /* return all folders of the users mailbox*/
-  function getMailboxList($folder, $uid= "")
+  function getMailboxList($folder, $uid)
   {
     global $config;
     $result = array();
diff --git a/include/php_setup.inc b/include/php_setup.inc
index 94ead09be..139f195d9 100644
--- a/include/php_setup.inc
+++ b/include/php_setup.inc
@@ -40,15 +40,6 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline)
     return;
   }
 
-  /* FIXME: Workaround for PHP5 error message flooding. The new OOM
-     code want's us to use public/protected/private instead of flat
-     var declarations. For now I can't workaround this - let's ignore
-     the messages till the next major release which may drop support
-     for PHP4. */
-  if (preg_match('/var: Deprecated./', $errstr) || preg_match("/Declaration of.*should be compatible/",$errstr)){
-    return;
-  }
-
   /* Hide ldap size limit messages */
   if (preg_match('/ldap_error/', $errstr)){
     if (preg_match('/sizelimit/', $errstr)){
diff --git a/plugins/addons/godfs/tabs_dfs.inc b/plugins/addons/godfs/tabs_dfs.inc
index 3d2f0f665..02438ebae 100644
--- a/plugins/addons/godfs/tabs_dfs.inc
+++ b/plugins/addons/godfs/tabs_dfs.inc
@@ -23,16 +23,14 @@ class dfstabs extends tabs {
     return (tabs::check(TRUE));
   }
 
-  function save() {
+  function save($ignore_account= FALSE)
     $baseobject = $this->by_object['dfsManagment'];
-    #$this->dn = $new_dn;
     return tabs::save(TRUE);
   }
 
   function del() {
     $baseobject = $this->by_object['dfsManagment'];
     return tabs::delete(TRUE); 
-    #tabs::del();
   }
 
 }
diff --git a/plugins/addons/ldapmanager/tabs_ldif.inc b/plugins/addons/ldapmanager/tabs_ldif.inc
index cb956d30c..2f6b70f0d 100644
--- a/plugins/addons/ldapmanager/tabs_ldif.inc
+++ b/plugins/addons/ldapmanager/tabs_ldif.inc
@@ -14,7 +14,7 @@ class ldiftab extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
   }
 
diff --git a/plugins/addons/logview/tabs_log.inc b/plugins/addons/logview/tabs_log.inc
index fd53f2f11..bb855d28b 100644
--- a/plugins/addons/logview/tabs_log.inc
+++ b/plugins/addons/logview/tabs_log.inc
@@ -14,7 +14,7 @@ class log_tabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
   }
 
diff --git a/plugins/admin/acl/tabs_acl.inc b/plugins/admin/acl/tabs_acl.inc
index 7187e2330..0cbd1d798 100644
--- a/plugins/admin/acl/tabs_acl.inc
+++ b/plugins/admin/acl/tabs_acl.inc
@@ -42,7 +42,7 @@ class acltab extends tabs
     }
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     $ret= tabs::save();
     return $ret;
diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index 03e6c9317..a4a08dcde 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -9,7 +9,7 @@ class aclroletab extends tabs
     tabs::tabs($config, $data, $dn,"acl");
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['aclrole'];
 
diff --git a/plugins/admin/applications/tabs_application.inc b/plugins/admin/applications/tabs_application.inc
index ec83a0851..0ad27adc7 100644
--- a/plugins/admin/applications/tabs_application.inc
+++ b/plugins/admin/applications/tabs_application.inc
@@ -20,7 +20,7 @@ class apptabs extends tabs
     }
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['application'];
 
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 9e3f6675b..68118b318 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -19,13 +19,13 @@ class deptabs extends tabs
   }
 
 
-  function save($justsave = false)
+  function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['department'];
     $ou= preg_replace('/,/', '\,', $baseobject->ou);
     $new_dn= @LDAP::convert('ou='.$ou.','.$baseobject->base);
     
-    if($justsave){
+    if($ignore_account){
       if ($this->dn != $new_dn && $this->dn != "new"){
         /* if( new_dn is subtree of this->dn ) */
         $cnt1 = count(split(",",$this->dn));
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 51cb2cc82..094551de9 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -35,7 +35,7 @@ class grouptabs extends tabs
 		tabs::delete();
 	}
 
-	function save()
+  function save($ignore_account= FALSE)
 	{
 		$baseobject= $this->by_object['group'];
 
diff --git a/plugins/admin/mimetypes/tabs_mimetypes.inc b/plugins/admin/mimetypes/tabs_mimetypes.inc
index 4d09f39f2..cf4d27fdb 100755
--- a/plugins/admin/mimetypes/tabs_mimetypes.inc
+++ b/plugins/admin/mimetypes/tabs_mimetypes.inc
@@ -20,7 +20,7 @@ class mimetabs extends tabs
     }
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['mimetype'];
 
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 7676a718f..970adbcb1 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -260,7 +260,7 @@ class ogrouptabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     $baseobject= $this->by_object['ogroup'];
 
diff --git a/plugins/admin/systems/tabs_component.inc b/plugins/admin/systems/tabs_component.inc
index 19bd483b5..3d7d53dde 100644
--- a/plugins/admin/systems/tabs_component.inc
+++ b/plugins/admin/systems/tabs_component.inc
@@ -17,7 +17,7 @@ class componenttabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_phone.inc b/plugins/admin/systems/tabs_phone.inc
index cc408f60f..2c65e6385 100644
--- a/plugins/admin/systems/tabs_phone.inc
+++ b/plugins/admin/systems/tabs_phone.inc
@@ -17,7 +17,7 @@ class phonetabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_printers.inc b/plugins/admin/systems/tabs_printers.inc
index 85755a3e9..92963d6b0 100644
--- a/plugins/admin/systems/tabs_printers.inc
+++ b/plugins/admin/systems/tabs_printers.inc
@@ -41,7 +41,7 @@ class printtabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_server.inc b/plugins/admin/systems/tabs_server.inc
index b260e0971..e9cae2eda 100644
--- a/plugins/admin/systems/tabs_server.inc
+++ b/plugins/admin/systems/tabs_server.inc
@@ -17,7 +17,7 @@ class servtabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_terminal.inc b/plugins/admin/systems/tabs_terminal.inc
index 3b9a6c51d..3a3b77486 100644
--- a/plugins/admin/systems/tabs_terminal.inc
+++ b/plugins/admin/systems/tabs_terminal.inc
@@ -50,7 +50,7 @@ class termtabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_winstation.inc b/plugins/admin/systems/tabs_winstation.inc
index 7dba804dc..cada48b80 100644
--- a/plugins/admin/systems/tabs_winstation.inc
+++ b/plugins/admin/systems/tabs_winstation.inc
@@ -17,7 +17,7 @@ class wintabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/systems/tabs_workstation.inc b/plugins/admin/systems/tabs_workstation.inc
index 282c372b0..6c34fd1e8 100644
--- a/plugins/admin/systems/tabs_workstation.inc
+++ b/plugins/admin/systems/tabs_workstation.inc
@@ -47,7 +47,7 @@ class worktabs extends tabs
   }
 
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/admin/users/tabs_user.inc b/plugins/admin/users/tabs_user.inc
index 8f5244985..d4219a42b 100644
--- a/plugins/admin/users/tabs_user.inc
+++ b/plugins/admin/users/tabs_user.inc
@@ -91,7 +91,7 @@ class usertabs extends tabs
     $this->set_acl_base();
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
diff --git a/plugins/gofon/conference/tabs_conference.inc b/plugins/gofon/conference/tabs_conference.inc
index 7db12cf35..438b349f6 100644
--- a/plugins/gofon/conference/tabs_conference.inc
+++ b/plugins/gofon/conference/tabs_conference.inc
@@ -19,7 +19,7 @@ class conferencetabs extends tabs
   }
   
 
-  function save()
+  function save($ignore_account= FALSE)
   {
   	$baseobject= $this->by_object['conference'];
 	$new_dn= 'cn='.$baseobject->cn.',ou=conferences,ou=asterisk,ou=configs,ou=systems,'.$baseobject->base;
diff --git a/plugins/gofon/macro/tabs_macros.inc b/plugins/gofon/macro/tabs_macros.inc
index 7df52ef7e..5c5bcf6c9 100755
--- a/plugins/gofon/macro/tabs_macros.inc
+++ b/plugins/gofon/macro/tabs_macros.inc
@@ -11,7 +11,7 @@ class macrotabs extends tabs
 	  $this->addSpecialTabs();
   }
 
-  function save()
+  function save($ignore_account= FALSE)
   {
 	$baseobject= $this->by_object['macro'];
 
-- 
2.30.2