Updated for PHP5

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

diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index f191fbf07edd433fd9ac49c48c54225bed8c9ac7..58fe60b5281521a2dd60a459df6152e46991a862 100644 (file)
--- 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 94ead09bebfcecdb7f45f64a3130837aced16802..139f195d92b668dfd7f2445367d8b3af69cf398b 100644 (file)
--- 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 3d2f0f665efc07514969ba97d3ee4655e5e5d7cf..02438ebae5ef66be8d70826a7991ed98ceb1f010 100644 (file)
--- 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 cb956d30cf7cb6d544d2ff8a598b96c57b34edd8..2f6b70f0d3819271da21891dc39d182cc245dcf3 100644 (file)
--- 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 fd53f2f1160e90570e70c1eb17e7f1c4121e902f..bb855d28bba3fcd739f9ea453d29e5d830bf2010 100644 (file)
--- 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 7187e23308d9a569e58d519a505401d2bce3d8ff..0cbd1d798ffe16d7b4b55e8e402c9d75e357f7b6 100644 (file)
--- 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 03e6c931767fe22a62a90ae5588565768b914446..a4a08dcdef0e8fbd76f9781fb00675f7e7fc2f35 100644 (file)
--- 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 ec83a085105fa8785b1fe9d1534e227e8307289c..0ad27adc7022ac3d56b45e09c92545e9f49b9312 100644 (file)
--- 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 9e3f6675bd435d75c7d2b63d27be774d3adf3635..68118b318e6f636c703c06eb2c3f90e61fbd7af5 100644 (file)
--- 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 51cb2cc8277c1da93edecbfafd6d5e659a69d395..094551de9d0bc5eafbb83cb537555c682607779c 100644 (file)
--- 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 4d09f39f25b88b17be2ff96cb9dd15a84fad1233..cf4d27fdb9aaac72f3df898bbb42a3aa231cd2ac 100755 (executable)
--- 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 7676a718f1b9d96f2cb84f0373aa3eed08b300f0..970adbcb1252bfc040ad1e7846f5dc696f35e900 100644 (file)
--- 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 19bd483b559d28d451300db056478f7e0208afde..3d7d53dde965e79ac08cbf69101d50f89918cd1f 100644 (file)
--- 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 cc408f60fdfc7c103dc060cdba8d32117b3be9e7..2c65e6385f5b11f23b865ffe181706f0f2cc8867 100644 (file)
--- 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 85755a3e95e8ce03e23fdb0bd627e89a90cca7c0..92963d6b01f430715fe9a63851ef06ea13e9fef6 100644 (file)
--- 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 b260e0971fd4947c9505fdae5b67ff2e84dd79b4..e9cae2eda3066a8e2de1d16701b1458ab9fdb540 100644 (file)
--- 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 3b9a6c51ddd58e1e53529163fb95d7e64e95ca85..3a3b77486d051d8344048e1af21bdd46519cbc5f 100644 (file)
--- 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 7dba804dca568b3121016059977d1092ba1b6c34..cada48b8034fbce207836de5f0af9901cebfbce7 100644 (file)
--- 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 282c372b0af29e67851d681a75c65b74573aaf3e..6c34fd1e8d8f2984d04e81694b69d644e56d8cf6 100644 (file)
--- 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 8f52449854ef88cd2b53671072d7e9e87ef2ad9f..d4219a42b4ec706297126780f6512c99a3fa2f04 100644 (file)
--- 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 7db12cf3505286d9fc38313c9438fdb589aee556..438b349f6b2efa0bcaf08205583aa9a20d296a5e 100644 (file)
--- 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 7df52ef7ea8668c0beec7fdcddb097e1384a23e4..5c5bcf6c980bbba3705e981575815c5697260ae4 100755 (executable)
--- 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'];