[debian-edu-commits] debian-edu/pkg-team/ 01/04: debian/patches: Add 1026_fix-deprecated-constructor-format.patch. Replace old-style constructor names (equaling the class name) by methods of the name "__construct()". This patch has been generated by the shipped-with script debian/fix-constructors.sh. Thanks to Cajus Pollmeier for providing this script.
Mike Gabriel
sunweaver at debian.org
Wed Jun 1 10:53:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository gosa.
commit 8667aee84a19a5d912370fb6e2ab20fb9a4a1628
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Jun 1 12:42:55 2016 +0200
debian/patches: Add 1026_fix-deprecated-constructor-format.patch. Replace old-style constructor names (equaling the class name) by methods of the name "__construct()". This patch has been generated by the shipped-with script debian/fix-constructors.sh. Thanks to Cajus Pollmeier for providing this script.
---
debian/fix-constructors.sh | 10 +
.../1026_fix-deprecated-constructor-format.patch | 2684 ++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 2695 insertions(+)
diff --git a/debian/fix-constructors.sh b/debian/fix-constructors.sh
new file mode 100755
index 0000000..f641722
--- /dev/null
+++ b/debian/fix-constructors.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+classes=$(grep -r ^class * | sed 's/: *class *\([^ {]*\).*$/:\1/')
+
+for line in $classes; do
+ split=(${line//:/ })
+ class=${split[1]}
+
+ sed -i "s/function ${class} *(/function __construct(/" ${split[0]}
+done
diff --git a/debian/patches/1026_fix-deprecated-constructor-format.patch b/debian/patches/1026_fix-deprecated-constructor-format.patch
new file mode 100644
index 0000000..1d63e28
--- /dev/null
+++ b/debian/patches/1026_fix-deprecated-constructor-format.patch
@@ -0,0 +1,2684 @@
+Description: PHP7 deprecation: constructor methods must be named __construct(<opts>).
+Author: Cajus Pollmeier <pollmeier at gonicus.de>
+Abstract:
+ Generated by debian/fix-constructors.sh script, provided by Cajus Pollmeier.
+
+diff -ru gosa.const/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc gosa/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc
+--- gosa.const/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc 2016-06-01 12:36:40.323023383 +0200
+@@ -52,7 +52,7 @@
+ var $VhostObject = array();
+
+
+- function servapacheVhostEdit ($config, $dn= NULL,$attrs = array())
++ function __construct($config, $dn= NULL,$attrs = array())
+ {
+ plugin::plugin ($config, $dn);
+ if(!count($attrs)){
+diff -ru gosa.const/apache2/admin/systems/services/apache2/class_servApacheVhost.inc gosa/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
+--- gosa.const/apache2/admin/systems/services/apache2/class_servApacheVhost.inc 2010-07-26 17:46:27.000000000 +0200
++++ gosa/apache2/admin/systems/services/apache2/class_servApacheVhost.inc 2016-06-01 12:36:40.327023367 +0200
+@@ -38,7 +38,7 @@
+ var $initially_was_account;
+ var $krb_service_prefix = "HTTP/";
+
+- function servapache ($config, $dn= NULL, $parent= NULL)
++ function __construct($config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/connectivity/personal/connectivity/class_connectivity.inc gosa/connectivity/personal/connectivity/class_connectivity.inc
+--- gosa.const/connectivity/personal/connectivity/class_connectivity.inc 2010-12-14 15:17:57.000000000 +0100
++++ gosa/connectivity/personal/connectivity/class_connectivity.inc 2016-06-01 12:36:40.331023353 +0200
+@@ -27,7 +27,7 @@
+
+ var $multiple_support = TRUE;
+
+- function connectivity (&$config, $dn= NULL,$parent =NULL)
++ function __construct(&$config, $dn= NULL,$parent =NULL)
+ {
+ /* Preseed permissions */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/connectivity/personal/connectivity/class_intranetAccount.inc gosa/connectivity/personal/connectivity/class_intranetAccount.inc
+--- gosa.const/connectivity/personal/connectivity/class_intranetAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/connectivity/personal/connectivity/class_intranetAccount.inc 2016-06-01 12:36:40.331023353 +0200
+@@ -36,7 +36,7 @@
+ \version 1.00
+ \date 1.07.2005
+ */
+- function intranetAccount (&$config, $dn= NULL, $parent=NULL)
++ function __construct(&$config, $dn= NULL, $parent=NULL)
+ {
+ plugin::plugin ($config, $dn,$parent);
+
+Only in gosa/debian/patches: 1026.patch
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc 2016-06-01 12:36:40.335023339 +0200
+@@ -32,7 +32,7 @@
+ var $objectclasses= array();
+ var $parent;
+
+- function dhcpAdvanced()
++ function __construct()
+ {
+ /* This is always an account */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc 2010-07-27 11:17:08.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc 2016-06-01 12:36:40.347023298 +0200
+@@ -23,7 +23,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpClass', 'dhcpOptions');
+
+- function dhcpClass($parent,&$attrs)
++ function __construct($parent,&$attrs)
+ {
+ /* Load statements / options */
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc 2010-07-27 11:17:11.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc 2016-06-01 12:36:40.335023339 +0200
+@@ -34,7 +34,7 @@
+ var $objectclasses= array("top", "dhcpDnsZone");
+
+
+- function dhcpDnsZone($parent,$attrs,$host_exists_in_gosa = FALSE)
++ function __construct($parent,$attrs,$host_exists_in_gosa = FALSE)
+ {
+ global $config;
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc 2010-07-27 11:17:13.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc 2016-06-01 12:36:40.343023311 +0200
+@@ -23,7 +23,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpGroup', 'dhcpOptions');
+
+- function dhcpGroup($parent,&$attrs)
++ function __construct($parent,&$attrs)
+ {
+ /* Load statements / options */
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc 2010-07-27 11:17:16.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc 2016-06-01 12:36:40.331023353 +0200
+@@ -27,7 +27,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array("top", "dhcpHost");
+
+- function dhcpHost($parent,$attrs,$host_exists_in_gosa = FALSE)
++ function __construct($parent,$attrs,$host_exists_in_gosa = FALSE)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc 2016-06-01 12:36:40.339023325 +0200
+@@ -28,7 +28,7 @@
+ var $attributes= array();
+ var $objectclasses= array();
+
+- function dhcpNetwork()
++ function __construct()
+ {
+ /* This is always an account */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc 2010-08-02 12:08:10.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc 2016-06-01 12:36:40.335023339 +0200
+@@ -23,7 +23,7 @@
+
+
+
+- function dhcpNewSectionDialog($type)
++ function __construct($type)
+ {
+ $this->initTime = microtime(TRUE);
+ stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'open',
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc 2010-08-02 12:08:12.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc 2016-06-01 12:36:40.339023325 +0200
+@@ -34,7 +34,7 @@
+ var $attributes= array();
+ var $objectclasses= array();
+
+- function dhcpPlugin(&$parent,$attrs)
++ function __construct(&$parent,$attrs)
+ {
+ $this->initTime = microtime(TRUE);
+ $this->parent = $parent;
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc 2016-06-01 12:36:40.339023325 +0200
+@@ -28,7 +28,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpPool');
+
+- function dhcpPool($parent,$attrs)
++ function __construct($parent,$attrs)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpService.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpService.inc 2010-07-27 11:17:31.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpService.inc 2016-06-01 12:36:40.347023298 +0200
+@@ -29,7 +29,7 @@
+ var $objectclasses= array('top', 'dhcpService');
+
+
+- function dhcpService($parent,$attrs)
++ function __construct($parent,$attrs)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc 2016-06-01 12:36:40.335023339 +0200
+@@ -23,7 +23,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpSharedNetwork');
+
+- function dhcpSharedNetwork($parent,$attrs)
++ function __construct($parent,$attrs)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc 2010-07-27 11:17:38.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc 2016-06-01 12:36:40.343023311 +0200
+@@ -23,7 +23,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpSubClass', 'dhcpOptions');
+
+- function dhcpSubClass($parent,&$attrs)
++ function __construct($parent,&$attrs)
+ {
+ /* Load statements / options */
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc 2016-06-01 12:36:40.339023325 +0200
+@@ -30,7 +30,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array('top', 'dhcpSubnet', 'dhcpOptions');
+
+- function dhcpSubnet($parent,$attrs)
++ function __construct($parent,$attrs)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc gosa/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc 2010-07-27 11:17:43.000000000 +0200
++++ gosa/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc 2016-06-01 12:36:40.335023339 +0200
+@@ -27,7 +27,7 @@
+ /* attribute list for save action */
+ var $objectclasses= array("top", "dhcpTSigKey");
+
+- function dhcpTSigKey($parent,$attrs)
++ function __construct($parent,$attrs)
+ {
+ dhcpPlugin::dhcpPlugin($parent,$attrs);
+
+diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_servDHCP.inc gosa/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+--- gosa.const/dhcp/admin/systems/services/dhcp/class_servDHCP.inc 2012-01-17 11:05:34.000000000 +0100
++++ gosa/dhcp/admin/systems/services/dhcp/class_servDHCP.inc 2016-06-01 12:36:40.343023311 +0200
+@@ -26,7 +26,7 @@
+ var $take_over_id = -1;
+ var $display_warning = TRUE;
+
+- function servdhcp (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc gosa/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
+--- gosa.const/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc 2016-06-01 12:36:40.351023282 +0200
+@@ -17,7 +17,7 @@
+ var $disableDialog = false; // Dialog will be disabled, if this zone is new
+
+
+- function servDNSeditZoneEntries (&$config,$dn, &$zoneObject)
++ function __construct(&$config,$dn, &$zoneObject)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/dns/admin/systems/services/dns/class_servDNSeditZone.inc gosa/dns/admin/systems/services/dns/class_servDNSeditZone.inc
+--- gosa.const/dns/admin/systems/services/dns/class_servDNSeditZone.inc 2010-07-26 17:46:40.000000000 +0200
++++ gosa/dns/admin/systems/services/dns/class_servDNSeditZone.inc 2016-06-01 12:36:40.351023282 +0200
+@@ -41,7 +41,7 @@
+ var $ZoneObject = array();
+ var $Zone_is_used = FALSE;
+
+- function servdnseditZone (&$config, $dn= NULL,$attrs = array())
++ function __construct(&$config, $dn= NULL,$attrs = array())
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/dns/admin/systems/services/dns/class_servDNS.inc gosa/dns/admin/systems/services/dns/class_servDNS.inc
+--- gosa.const/dns/admin/systems/services/dns/class_servDNS.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/dns/admin/systems/services/dns/class_servDNS.inc 2016-06-01 12:36:40.351023282 +0200
+@@ -24,7 +24,7 @@
+ var $take_over_id = -1;
+
+
+- function servdns (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/fai/admin/fai/class_askClassName.inc gosa/fai/admin/fai/class_askClassName.inc
+--- gosa.const/fai/admin/fai/class_askClassName.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_askClassName.inc 2016-06-01 12:36:40.383023169 +0200
+@@ -13,7 +13,7 @@
+ var $ClassAlreadyExists = false;
+ var $parent;
+
+- function askClassName (&$config,$dn,$ui,$objectClass)
++ function __construct(&$config,$dn,$ui,$objectClass)
+ {
+ $this->ui = $ui;
+ $this->objectClass = $objectClass;
+diff -ru gosa.const/fai/admin/fai/class_debconfTemplate.inc gosa/fai/admin/fai/class_debconfTemplate.inc
+--- gosa.const/fai/admin/fai/class_debconfTemplate.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_debconfTemplate.inc 2016-06-01 12:36:40.375023197 +0200
+@@ -8,7 +8,7 @@
+ var $template= array();
+
+
+- function debconf($language= "")
++ function __construct($language= "")
+ {
+ $this->set_language($language);
+ }
+diff -ru gosa.const/fai/admin/fai/class_faiDiskEntry.inc gosa/fai/admin/fai/class_faiDiskEntry.inc
+--- gosa.const/fai/admin/fai/class_faiDiskEntry.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_faiDiskEntry.inc 2016-06-01 12:36:40.403023098 +0200
+@@ -26,7 +26,7 @@
+
+ var $lvmDevices = array();
+
+- function faiDiskEntry (&$config, $dn= NULL,$parent,$disk,$type)
++ function __construct(&$config, $dn= NULL,$parent,$disk,$type)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/fai/admin/fai/class_faiHookEntry.inc gosa/fai/admin/fai/class_faiHookEntry.inc
+--- gosa.const/fai/admin/fai/class_faiHookEntry.inc 2011-11-28 13:27:05.000000000 +0100
++++ gosa/fai/admin/fai/class_faiHookEntry.inc 2016-06-01 12:36:40.375023197 +0200
+@@ -27,7 +27,7 @@
+ var $write_protect = FALSE;
+
+
+- function faiHookEntry (&$config, $dn= NULL,$object=false)
++ function __construct(&$config, $dn= NULL,$object=false)
+ {
+ plugin::plugin ($config, NULL);
+ if($dn != "new"){
+diff -ru gosa.const/fai/admin/fai/class_faiHook.inc gosa/fai/admin/fai/class_faiHook.inc
+--- gosa.const/fai/admin/fai/class_faiHook.inc 2010-11-30 17:54:21.000000000 +0100
++++ gosa/fai/admin/fai/class_faiHook.inc 2016-06-01 12:36:40.359023254 +0200
+@@ -33,7 +33,7 @@
+ var $FAIstate = "";
+ var $ui;
+
+- function faiHook (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiPackageConfiguration.inc gosa/fai/admin/fai/class_faiPackageConfiguration.inc
+--- gosa.const/fai/admin/fai/class_faiPackageConfiguration.inc 2008-04-14 11:18:36.000000000 +0200
++++ gosa/fai/admin/fai/class_faiPackageConfiguration.inc 2016-06-01 12:36:40.375023197 +0200
+@@ -20,7 +20,7 @@
+ @param String The release name (e.g. edge)
+ @param Array The current package configuration.
+ */
+- function faiPackageConfiguration (&$config, $dn= NULL,$obj,$release,$pkg_config)
++ function __construct(&$config, $dn= NULL,$obj,$release,$pkg_config)
+ {
+ plugin::plugin ($config, $dn);
+ $this->obj = $obj;
+diff -ru gosa.const/fai/admin/fai/class_faiPackage.inc gosa/fai/admin/fai/class_faiPackage.inc
+--- gosa.const/fai/admin/fai/class_faiPackage.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_faiPackage.inc 2016-06-01 12:36:40.367023227 +0200
+@@ -55,7 +55,7 @@
+ "pending", "dpkgc" );
+
+
+- function faiPackage (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiPartitionTableEntry.inc gosa/fai/admin/fai/class_faiPartitionTableEntry.inc
+--- gosa.const/fai/admin/fai/class_faiPartitionTableEntry.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_faiPartitionTableEntry.inc 2016-06-01 12:36:40.399023112 +0200
+@@ -16,7 +16,7 @@
+ var $old_cn = "";
+ var $parent = null;
+
+- function faiPartitionTableEntry (&$config, $dn= NULL,&$parent,$disk=false)
++ function __construct(&$config, $dn= NULL,&$parent,$disk=false)
+ {
+ plugin::plugin ($config, $dn);
+ $this->UsedAttrs = array("cn","description","FAIpartitionType","FAIpartitionNr","FAIfsType","FAImountPoint","FAIpartitionSize",
+diff -ru gosa.const/fai/admin/fai/class_faiPartitionTable.inc gosa/fai/admin/fai/class_faiPartitionTable.inc
+--- gosa.const/fai/admin/fai/class_faiPartitionTable.inc 2011-11-09 08:29:33.000000000 +0100
++++ gosa/fai/admin/fai/class_faiPartitionTable.inc 2016-06-01 12:36:40.363023240 +0200
+@@ -25,7 +25,7 @@
+
+ var $view_logged = FALSE;
+
+- function faiPartitionTable (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiProfile.inc gosa/fai/admin/fai/class_faiProfile.inc
+--- gosa.const/fai/admin/fai/class_faiProfile.inc 2011-11-07 10:47:48.000000000 +0100
++++ gosa/fai/admin/fai/class_faiProfile.inc 2016-06-01 12:36:40.387023155 +0200
+@@ -25,7 +25,7 @@
+
+ var $classSelect;
+
+- function faiProfile(&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiScriptEntry.inc gosa/fai/admin/fai/class_faiScriptEntry.inc
+--- gosa.const/fai/admin/fai/class_faiScriptEntry.inc 2011-11-28 13:27:05.000000000 +0100
++++ gosa/fai/admin/fai/class_faiScriptEntry.inc 2016-06-01 12:36:40.359023254 +0200
+@@ -23,7 +23,7 @@
+ var $enc_after_edit = "";
+ var $write_protect = FALSE;
+
+- function faiScriptEntry (&$config, $dn= NULL,$object=false)
++ function __construct(&$config, $dn= NULL,$object=false)
+ {
+ plugin::plugin ($config, NULL);
+ if($dn != "new"){
+diff -ru gosa.const/fai/admin/fai/class_faiScript.inc gosa/fai/admin/fai/class_faiScript.inc
+--- gosa.const/fai/admin/fai/class_faiScript.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_faiScript.inc 2016-06-01 12:36:40.367023227 +0200
+@@ -37,7 +37,7 @@
+ var $view_logged = FALSE;
+ var $ui;
+
+- function faiScript (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiSummaryTab.inc gosa/fai/admin/fai/class_faiSummaryTab.inc
+--- gosa.const/fai/admin/fai/class_faiSummaryTab.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/fai/admin/fai/class_faiSummaryTab.inc 2016-06-01 12:36:40.383023169 +0200
+@@ -33,7 +33,7 @@
+ var $parent = NULL;
+ var $ui = NULL;
+
+- function faiSummaryTab(&$config,$dn)//,$parent)
++ function __construct(&$config,$dn)//,$parent)
+ {
+ plugin::plugin($config,$dn);//,$parent);
+
+diff -ru gosa.const/fai/admin/fai/class_faiTemplateEdit.inc gosa/fai/admin/fai/class_faiTemplateEdit.inc
+--- gosa.const/fai/admin/fai/class_faiTemplateEdit.inc 2011-12-02 16:54:35.000000000 +0100
++++ gosa/fai/admin/fai/class_faiTemplateEdit.inc 2016-06-01 12:36:40.387023155 +0200
+@@ -13,7 +13,7 @@
+ var $write_protect = FALSE;
+ var $mb_extension = TRUE;
+
+- function faiTemplateEdit (&$config, $dn, $value)
++ function __construct(&$config, $dn, $value)
+ {
+ plugin::plugin ($config, $dn);
+ if(!function_exists("mb_detect_encoding")){
+diff -ru gosa.const/fai/admin/fai/class_faiTemplateEntry.inc gosa/fai/admin/fai/class_faiTemplateEntry.inc
+--- gosa.const/fai/admin/fai/class_faiTemplateEntry.inc 2010-11-17 10:15:42.000000000 +0100
++++ gosa/fai/admin/fai/class_faiTemplateEntry.inc 2016-06-01 12:36:40.387023155 +0200
+@@ -23,7 +23,7 @@
+ var $parent = NULL;
+ var $FAIstate = "";
+
+- function faiTemplateEntry (&$config, $dn= NULL,$object=false)
++ function __construct(&$config, $dn= NULL,$object=false)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/fai/admin/fai/class_faiTemplate.inc gosa/fai/admin/fai/class_faiTemplate.inc
+--- gosa.const/fai/admin/fai/class_faiTemplate.inc 2011-11-07 10:37:15.000000000 +0100
++++ gosa/fai/admin/fai/class_faiTemplate.inc 2016-06-01 12:36:40.383023169 +0200
+@@ -34,7 +34,7 @@
+ var $ui;
+ var $view_logged = FALSE;
+
+- function faiTemplate (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/class_faiVariableEntry.inc gosa/fai/admin/fai/class_faiVariableEntry.inc
+--- gosa.const/fai/admin/fai/class_faiVariableEntry.inc 2010-07-09 10:46:26.000000000 +0200
++++ gosa/fai/admin/fai/class_faiVariableEntry.inc 2016-06-01 12:36:40.379023183 +0200
+@@ -16,7 +16,7 @@
+ var $parent = NULL;
+ var $FAIstate = "";
+
+- function faiVariableEntry (&$config, $dn= NULL,$object=false)
++ function __construct(&$config, $dn= NULL,$object=false)
+ {
+ plugin::plugin ($config, $dn);
+ if((isset($object['cn'])) && (!empty($object['cn']))){
+diff -ru gosa.const/fai/admin/fai/class_faiVariable.inc gosa/fai/admin/fai/class_faiVariable.inc
+--- gosa.const/fai/admin/fai/class_faiVariable.inc 2010-11-30 17:54:54.000000000 +0100
++++ gosa/fai/admin/fai/class_faiVariable.inc 2016-06-01 12:36:40.379023183 +0200
+@@ -33,7 +33,7 @@
+ var $ui ;
+ var $view_logged = FALSE;
+
+- function faiVariable (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Load Attributes */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/fai/admin/fai/tabsHook.inc gosa/fai/admin/fai/tabsHook.inc
+--- gosa.const/fai/admin/fai/tabsHook.inc 2010-07-29 15:54:26.000000000 +0200
++++ gosa/fai/admin/fai/tabsHook.inc 2016-06-01 12:36:40.379023183 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsHook($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+ /* Add references/acls/snapshots */
+diff -ru gosa.const/fai/admin/fai/tabsPackage.inc gosa/fai/admin/fai/tabsPackage.inc
+--- gosa.const/fai/admin/fai/tabsPackage.inc 2010-07-29 15:54:28.000000000 +0200
++++ gosa/fai/admin/fai/tabsPackage.inc 2016-06-01 12:36:40.383023169 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsPackage($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/fai/admin/fai/tabsPartition.inc gosa/fai/admin/fai/tabsPartition.inc
+--- gosa.const/fai/admin/fai/tabsPartition.inc 2010-07-29 15:54:31.000000000 +0200
++++ gosa/fai/admin/fai/tabsPartition.inc 2016-06-01 12:36:40.387023155 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsPartition($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/fai/admin/fai/tabsProfile.inc gosa/fai/admin/fai/tabsProfile.inc
+--- gosa.const/fai/admin/fai/tabsProfile.inc 2010-07-29 15:54:33.000000000 +0200
++++ gosa/fai/admin/fai/tabsProfile.inc 2016-06-01 12:36:40.371023211 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsProfile($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/fai/admin/fai/tabsScript.inc gosa/fai/admin/fai/tabsScript.inc
+--- gosa.const/fai/admin/fai/tabsScript.inc 2010-07-29 15:54:36.000000000 +0200
++++ gosa/fai/admin/fai/tabsScript.inc 2016-06-01 12:36:40.391023142 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsScript($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/fai/admin/fai/tabsTemplate.inc gosa/fai/admin/fai/tabsTemplate.inc
+--- gosa.const/fai/admin/fai/tabsTemplate.inc 2010-07-29 15:54:39.000000000 +0200
++++ gosa/fai/admin/fai/tabsTemplate.inc 2016-06-01 12:36:40.371023211 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsTemplate($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn, $category);
+
+diff -ru gosa.const/fai/admin/fai/tabsVariable.inc gosa/fai/admin/fai/tabsVariable.inc
+--- gosa.const/fai/admin/fai/tabsVariable.inc 2010-07-29 15:54:41.000000000 +0200
++++ gosa/fai/admin/fai/tabsVariable.inc 2016-06-01 12:36:40.363023240 +0200
+@@ -5,7 +5,7 @@
+ var $base= "";
+ var $parent ="";
+
+- function tabsVariable($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn, $category);
+
+diff -ru gosa.const/fai/admin/systems/services/repository/class_servRepository.inc gosa/fai/admin/systems/services/repository/class_servRepository.inc
+--- gosa.const/fai/admin/systems/services/repository/class_servRepository.inc 2010-11-30 18:04:38.000000000 +0100
++++ gosa/fai/admin/systems/services/repository/class_servRepository.inc 2016-06-01 12:36:40.355023268 +0200
+@@ -20,7 +20,7 @@
+
+ var $repositoryMangement = NULL;
+
+- function servrepository (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn,$parent);
+
+diff -ru gosa.const/fai/admin/systems/services/repository/class_servRepositorySetup.inc gosa/fai/admin/systems/services/repository/class_servRepositorySetup.inc
+--- gosa.const/fai/admin/systems/services/repository/class_servRepositorySetup.inc 2010-07-26 17:47:11.000000000 +0200
++++ gosa/fai/admin/systems/services/repository/class_servRepositorySetup.inc 2016-06-01 12:36:40.355023268 +0200
+@@ -17,7 +17,7 @@
+ var $cn = "";
+ var $parent = "";
+
+- function servRepositorySetup (&$config, $dn= NULL,$data = false)
++ function __construct(&$config, $dn= NULL,$data = false)
+ {
+ plugin::plugin ($config, $dn);
+
+Only in gosa: .git
+diff -ru gosa.const/gofax/admin/systems/services/gofax/class_goFaxServer.inc gosa/gofax/admin/systems/services/gofax/class_goFaxServer.inc
+--- gosa.const/gofax/admin/systems/services/gofax/class_goFaxServer.inc 2010-07-26 17:46:44.000000000 +0200
++++ gosa/gofax/admin/systems/services/gofax/class_goFaxServer.inc 2016-06-01 12:36:40.403023098 +0200
+@@ -24,7 +24,7 @@
+ var $cn = "";
+ var $view_logged =FALSE;
+
+- function goFaxServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("FAX database");
+diff -ru gosa.const/gofax/gofax/blocklists/tabs_blocklist.inc gosa/gofax/gofax/blocklists/tabs_blocklist.inc
+--- gosa.const/gofax/gofax/blocklists/tabs_blocklist.inc 2010-07-29 15:55:14.000000000 +0200
++++ gosa/gofax/gofax/blocklists/tabs_blocklist.inc 2016-06-01 12:36:40.407023084 +0200
+@@ -2,7 +2,7 @@
+
+ class faxblocktabs extends tabs
+ {
+- function faxblocktabs($config, $data, $dn)
++ function __construct($config, $data, $dn)
+ {
+ tabs::tabs($config, $data, $dn, 'gofaxlist');
+
+diff -ru gosa.const/gofax/gofax/faxaccount/class_gofaxAccount.inc gosa/gofax/gofax/faxaccount/class_gofaxAccount.inc
+--- gosa.const/gofax/gofax/faxaccount/class_gofaxAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/gofax/gofax/faxaccount/class_gofaxAccount.inc 2016-06-01 12:36:40.407023084 +0200
+@@ -47,7 +47,7 @@
+ /* Enable multiple edit support */
+ var $multiple_support = TRUE;
+
+- function gofaxAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* General initialization */
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/gofax/gofax/faxreports/class_faxreport.inc gosa/gofax/gofax/faxreports/class_faxreport.inc
+--- gosa.const/gofax/gofax/faxreports/class_faxreport.inc 2011-05-26 15:15:02.000000000 +0200
++++ gosa/gofax/gofax/faxreports/class_faxreport.inc 2016-06-01 12:36:40.415023055 +0200
+@@ -41,7 +41,7 @@
+ var $uidToDN = array();
+
+ /* Create class */
+- function faxreport (&$config, &$ui)
++ function __construct(&$config, &$ui)
+ {
+ $this->initTime = microtime(TRUE);
+
+diff -ru gosa.const/gofon/admin/ogroups/gofon/class_phonequeue.inc gosa/gofon/admin/ogroups/gofon/class_phonequeue.inc
+--- gosa.const/gofon/admin/ogroups/gofon/class_phonequeue.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/gofon/admin/ogroups/gofon/class_phonequeue.inc 2016-06-01 12:36:40.435022986 +0200
+@@ -63,7 +63,7 @@
+ * - Parse phone options flags
+ * - Get phone numbers
+ */
+- function phonequeue (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin($config, $dn);
+
+diff -ru gosa.const/gofon/admin/systems/gofon/class_phoneGeneric.inc gosa/gofon/admin/systems/gofon/class_phoneGeneric.inc
+--- gosa.const/gofon/admin/systems/gofon/class_phoneGeneric.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/gofon/admin/systems/gofon/class_phoneGeneric.inc 2016-06-01 12:36:40.431022999 +0200
+@@ -52,7 +52,7 @@
+
+ var $objectclasses= array("top", "goFonHardware");
+
+- function phoneGeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+ $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses, true);
+diff -ru gosa.const/gofon/admin/systems/gofon/tabs_phone.inc gosa/gofon/admin/systems/gofon/tabs_phone.inc
+--- gosa.const/gofon/admin/systems/gofon/tabs_phone.inc 2010-07-29 15:54:58.000000000 +0200
++++ gosa/gofon/admin/systems/gofon/tabs_phone.inc 2016-06-01 12:36:40.431022999 +0200
+@@ -3,7 +3,7 @@
+ class phonetabs extends tabs
+ {
+
+- function phonetabs($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/gofon/admin/systems/services/gofon/class_goFonServer.inc gosa/gofon/admin/systems/services/gofon/class_goFonServer.inc
+--- gosa.const/gofon/admin/systems/services/gofon/class_goFonServer.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/gofon/admin/systems/services/gofon/class_goFonServer.inc 2016-06-01 12:36:40.435022986 +0200
+@@ -28,7 +28,7 @@
+
+ var $orig_dn = "";
+
+- function goFonServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("VoIP service");
+diff -ru gosa.const/gofon/gofon/conference/class_phoneConferenceGeneric.inc gosa/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+--- gosa.const/gofon/gofon/conference/class_phoneConferenceGeneric.inc 2010-11-30 17:56:17.000000000 +0100
++++ gosa/gofon/gofon/conference/class_phoneConferenceGeneric.inc 2016-06-01 12:36:40.419023041 +0200
+@@ -68,7 +68,7 @@
+ var $orig_dn ="";
+ var $orig_base = "";
+
+- function conference (&$config, $dn, $plugin= NULL)
++ function __construct(&$config, $dn, $plugin= NULL)
+ {
+ plugin::plugin($config, $dn, $plugin);
+ $this->is_account = TRUE;
+diff -ru gosa.const/gofon/gofon/conference/tabs_conference.inc gosa/gofon/gofon/conference/tabs_conference.inc
+--- gosa.const/gofon/gofon/conference/tabs_conference.inc 2010-07-29 16:23:09.000000000 +0200
++++ gosa/gofon/gofon/conference/tabs_conference.inc 2016-06-01 12:36:40.419023041 +0200
+@@ -4,7 +4,7 @@
+ {
+ var $base= "";
+
+- function conferencetabs($config, $data, $dn, $category)
++ function __construct($config, $data, $dn, $category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+ $this->base= $this->by_object['conference']->base;
+diff -ru gosa.const/gofon/gofon/fonreports/class_fonreport.inc gosa/gofon/gofon/fonreports/class_fonreport.inc
+--- gosa.const/gofon/gofon/fonreports/class_fonreport.inc 2010-08-02 12:08:23.000000000 +0200
++++ gosa/gofon/gofon/fonreports/class_fonreport.inc 2016-06-01 12:36:40.415023055 +0200
+@@ -29,7 +29,7 @@
+ var $telephoneNumberToDN = array();
+
+ /* Construct class */
+- function fonreport (&$config, $ui)
++ function __construct(&$config, $ui)
+ {
+ /* Include config object */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/gofon/gofon/macro/class_gofonMacro.inc gosa/gofon/gofon/macro/class_gofonMacro.inc
+--- gosa.const/gofon/gofon/macro/class_gofonMacro.inc 2010-11-30 17:56:21.000000000 +0100
++++ gosa/gofon/gofon/macro/class_gofonMacro.inc 2016-06-01 12:36:40.423023027 +0200
+@@ -47,7 +47,7 @@
+
+ //! The Konstructor
+ /*! Konstructor, load class with attributes of the given dn*/
+- function macro (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/gofon/gofon/macro/class_gofonMacroParameters.inc gosa/gofon/gofon/macro/class_gofonMacroParameters.inc
+--- gosa.const/gofon/gofon/macro/class_gofonMacroParameters.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/gofon/gofon/macro/class_gofonMacroParameters.inc 2016-06-01 12:36:40.423023027 +0200
+@@ -36,7 +36,7 @@
+ - Set attributes from openldap (edit)
+ - Set attributes from default (new)
+ */
+- function macroParameter (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/gofon/gofon/macro/tabs_macros.inc gosa/gofon/gofon/macro/tabs_macros.inc
+--- gosa.const/gofon/gofon/macro/tabs_macros.inc 2010-07-29 16:23:21.000000000 +0200
++++ gosa/gofon/gofon/macro/tabs_macros.inc 2016-06-01 12:36:40.423023027 +0200
+@@ -3,7 +3,7 @@
+ class macrotabs extends tabs
+ {
+
+- function macrotabs($config, $data, $dn,$category)
++ function __construct($config, $data, $dn,$category)
+ {
+ tabs::tabs($config, $data, $dn,$category);
+
+diff -ru gosa.const/gofon/gofon/phoneaccount/class_phoneAccount.inc gosa/gofon/gofon/phoneaccount/class_phoneAccount.inc
+--- gosa.const/gofon/gofon/phoneaccount/class_phoneAccount.inc 2012-05-04 17:56:43.000000000 +0200
++++ gosa/gofon/gofon/phoneaccount/class_phoneAccount.inc 2016-06-01 12:36:40.431022999 +0200
+@@ -55,7 +55,7 @@
+ var $has_mailAccount = FALSE;
+ var $pager = "";
+
+- function phoneAccount (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/gosa-core/include/class_acl.inc gosa/gosa-core/include/class_acl.inc
+--- gosa.const/gosa-core/include/class_acl.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_acl.inc 2016-06-01 12:36:40.543022603 +0200
+@@ -60,7 +60,7 @@
+ var $roleList = NULL;
+ var $aclMemberList = NULL;
+
+- function acl (&$config, $parent, $dn= NULL)
++ function __construct(&$config, $parent, $dn= NULL)
+ {
+ /* Include config object */
+ plugin::plugin($config, $dn);
+diff -ru gosa.const/gosa-core/include/class_certificate.inc gosa/gosa-core/include/class_certificate.inc
+--- gosa.const/gosa-core/include/class_certificate.inc 2010-04-25 19:51:24.000000000 +0200
++++ gosa/gosa-core/include/class_certificate.inc 2016-06-01 12:36:40.623022319 +0200
+@@ -34,7 +34,7 @@
+ var $error;
+
+ /* Initialize all vars*/
+- function certificate()
++ function __construct()
+ {
+ $this->data= "";
+ $this->type= false;
+diff -ru gosa.const/gosa-core/include/class_config.inc gosa/gosa-core/include/class_config.inc
+--- gosa.const/gosa-core/include/class_config.inc 2015-08-24 06:40:37.000000000 +0200
++++ gosa/gosa-core/include/class_config.inc 2016-06-01 12:36:40.555022560 +0200
+@@ -76,7 +76,7 @@
+ * \param string 'basedir' base directory
+ *
+ * */
+- function config($filename, $basedir= "")
++ function __construct($filename, $basedir= "")
+ {
+ $this->parser = xml_parser_create();
+ $this->basedir= $basedir;
+diff -ru gosa.const/gosa-core/include/class_CopyPasteHandler.inc gosa/gosa-core/include/class_CopyPasteHandler.inc
+--- gosa.const/gosa-core/include/class_CopyPasteHandler.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_CopyPasteHandler.inc 2016-06-01 12:36:40.619022333 +0200
+@@ -44,7 +44,7 @@
+
+
+ /* Create CP handler */
+- function CopyPasteHandler(&$config)
++ function __construct(&$config)
+ {
+ $this->config = &$config;
+ $this->current= NULL;
+diff -ru gosa.const/gosa-core/include/class_filter.inc gosa/gosa-core/include/class_filter.inc
+--- gosa.const/gosa-core/include/class_filter.inc 2010-07-29 15:21:27.000000000 +0200
++++ gosa/gosa-core/include/class_filter.inc 2016-06-01 12:36:40.567022517 +0200
+@@ -39,7 +39,7 @@
+ var $pid;
+
+
+- function filter($filename)
++ function __construct($filename)
+ {
+ global $config;
+
+diff -ru gosa.const/gosa-core/include/class_ldap.inc gosa/gosa-core/include/class_ldap.inc
+--- gosa.const/gosa-core/include/class_ldap.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_ldap.inc 2016-06-01 12:36:40.615022347 +0200
+@@ -55,7 +55,7 @@
+ var $referrals= array();
+ var $max_ldap_query_time = 0; // 0, empty or negative values will disable this check
+
+- function LDAP($binddn,$bindpw, $hostname, $follow_referral= FALSE, $tls= FALSE)
++ function __construct($binddn,$bindpw, $hostname, $follow_referral= FALSE, $tls= FALSE)
+ {
+ global $config;
+ $this->follow_referral= $follow_referral;
+diff -ru gosa.const/gosa-core/include/class_listing.inc gosa/gosa-core/include/class_listing.inc
+--- gosa.const/gosa-core/include/class_listing.inc 2011-11-25 10:49:44.000000000 +0100
++++ gosa/gosa-core/include/class_listing.inc 2016-06-01 12:36:40.559022545 +0200
+@@ -58,7 +58,7 @@
+ var $baseSelector;
+ var $aclToObjectClass = array();
+
+- function listing($source, $isString = FALSE)
++ function __construct($source, $isString = FALSE)
+ {
+ global $config;
+ global $class_mapping;
+diff -ru gosa.const/gosa-core/include/class_log.inc gosa/gosa-core/include/class_log.inc
+--- gosa.const/gosa-core/include/class_log.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_log.inc 2016-06-01 12:36:40.535022630 +0200
+@@ -42,7 +42,7 @@
+
+ \sa log()
+ */
+- function log($action,$objecttype,$object,$changes_array = array(),$result = "")
++ function __construct($action,$objecttype,$object,$changes_array = array(),$result = "")
+ {
+ if(!is_array($changes_array)){
+ trigger_error("log(string,string,string,array(),bool). Forth parameter must be an array.");
+diff -ru gosa.const/gosa-core/include/class_plugin.inc gosa/gosa-core/include/class_plugin.inc
+--- gosa.const/gosa-core/include/class_plugin.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_plugin.inc 2016-06-01 12:36:40.599022404 +0200
+@@ -143,7 +143,7 @@
+ \param dn Distinguished name to initialize plugin from
+ \sa plugin()
+ */
+- function plugin (&$config, $dn= NULL, $object= NULL)
++ function __construct(&$config, $dn= NULL, $object= NULL)
+ {
+
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/gosa-core/include/class_pluglist.inc gosa/gosa-core/include/class_pluglist.inc
+--- gosa.const/gosa-core/include/class_pluglist.inc 2010-11-30 10:53:53.000000000 +0100
++++ gosa/gosa-core/include/class_pluglist.inc 2016-06-01 12:36:40.539022616 +0200
+@@ -77,7 +77,7 @@
+ }
+
+
+- function pluglist(&$config, &$ui)
++ function __construct(&$config, &$ui)
+ {
+ $this->ui= &$ui;
+ $this->config= &$config;
+diff -ru gosa.const/gosa-core/include/class_SnapShotDialog.inc gosa/gosa-core/include/class_SnapShotDialog.inc
+--- gosa.const/gosa-core/include/class_SnapShotDialog.inc 2010-07-29 15:19:57.000000000 +0200
++++ gosa/gosa-core/include/class_SnapShotDialog.inc 2016-06-01 12:36:40.535022630 +0200
+@@ -40,7 +40,7 @@
+ var $last_list = array();
+
+
+- function SnapShotDialog(&$config, $dn, &$parent)
++ function __construct(&$config, $dn, &$parent)
+ {
+ plugin::plugin($config,$dn);
+ $this->parent = &$parent;
+diff -ru gosa.const/gosa-core/include/class_SnapshotHandler.inc gosa/gosa-core/include/class_SnapshotHandler.inc
+--- gosa.const/gosa-core/include/class_SnapshotHandler.inc 2010-08-27 14:22:21.000000000 +0200
++++ gosa/gosa-core/include/class_SnapshotHandler.inc 2016-06-01 12:36:40.551022574 +0200
+@@ -28,7 +28,7 @@
+ var $snapshotBases= array();
+
+ /* Create handler */
+- function SnapshotHandler(&$config)
++ function __construct(&$config)
+ {
+ $this->config = &$config;
+ $config = $this->config;
+diff -ru gosa.const/gosa-core/include/class_sortableListing.inc gosa/gosa-core/include/class_sortableListing.inc
+--- gosa.const/gosa-core/include/class_sortableListing.inc 2011-11-09 08:53:36.000000000 +0100
++++ gosa/gosa-core/include/class_sortableListing.inc 2016-06-01 12:36:40.539022616 +0200
+@@ -55,7 +55,7 @@
+ private $modified= false;
+
+
+- public function sortableListing($data= array(), $displayData= null, $reorderable= false)
++ public function __construct($data= array(), $displayData= null, $reorderable= false)
+ {
+ global $config;
+
+diff -ru gosa.const/gosa-core/include/class_tabs.inc gosa/gosa-core/include/class_tabs.inc
+--- gosa.const/gosa-core/include/class_tabs.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_tabs.inc 2016-06-01 12:36:40.615022347 +0200
+@@ -58,7 +58,7 @@
+ }
+
+
+- function tabs(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ /* Save dn */
+ $this->dn= $dn;
+diff -ru gosa.const/gosa-core/include/class_userinfo.inc gosa/gosa-core/include/class_userinfo.inc
+--- gosa.const/gosa-core/include/class_userinfo.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/class_userinfo.inc 2016-06-01 12:36:40.619022333 +0200
+@@ -43,7 +43,7 @@
+
+ /* get acl's an put them into the userinfo object
+ attr subtreeACL (userdn:components, userdn:component1#sub1#sub2,component2,...) */
+- function userinfo(&$config, $userdn){
++ function __construct(&$config, $userdn){
+ $this->config= &$config;
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cat($userdn,array('sn', 'givenName', 'uid', 'gidNumber', 'preferredLanguage', 'gosaUnitTag', 'gosaLoginRestriction'));
+diff -ru gosa.const/gosa-core/include/exporter/class_csvExporter.inc gosa/gosa-core/include/exporter/class_csvExporter.inc
+--- gosa.const/gosa-core/include/exporter/class_csvExporter.inc 2011-11-22 10:30:02.000000000 +0100
++++ gosa/gosa-core/include/exporter/class_csvExporter.inc 2016-06-01 12:36:40.607022376 +0200
+@@ -4,7 +4,7 @@
+ {
+ var $result;
+
+- function csvExporter($headline, $header, $entries, $columns= array()) {
++ function __construct($headline, $header, $entries, $columns= array()) {
+ // If no preset, render all columns
+ if (!count($columns)) {
+ foreach ($header as $index => $dummy) {
+diff -ru gosa.const/gosa-core/include/exporter/class_pdfExporter.inc gosa/gosa-core/include/exporter/class_pdfExporter.inc
+--- gosa.const/gosa-core/include/exporter/class_pdfExporter.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/include/exporter/class_pdfExporter.inc 2016-06-01 12:36:40.611022361 +0200
+@@ -12,7 +12,7 @@
+ {
+ var $result;
+
+- function pdfExporter($headline, $header, $entries, $columns= array()) {
++ function __construct($headline, $header, $entries, $columns= array()) {
+ // Bail out if no FPDF available
+ if(!class_exists('FPDF')) {
+ die(_("No PDF export possible: there is no FPDF library installed."));
+diff -ru gosa.const/gosa-core/include/functions_debug.inc gosa/gosa-core/include/functions_debug.inc
+--- gosa.const/gosa-core/include/functions_debug.inc 2008-03-03 17:09:13.000000000 +0100
++++ gosa/gosa-core/include/functions_debug.inc 2016-06-01 12:36:40.603022390 +0200
+@@ -85,7 +85,7 @@
+ # print htmlspecialchars( stripslashes ( $_POST['array'] ) );
+ var $export_hash;
+
+- function Print_a_class() {
++ function __construct() {
+ $this->export_hash = uniqid('');
+ }
+
+diff -ru gosa.const/gosa-core/include/functions_helpviewer.inc gosa/gosa-core/include/functions_helpviewer.inc
+--- gosa.const/gosa-core/include/functions_helpviewer.inc 2010-07-29 18:21:26.000000000 +0200
++++ gosa/gosa-core/include/functions_helpviewer.inc 2016-06-01 12:36:40.607022376 +0200
+@@ -27,7 +27,7 @@
+ var $filename;
+ var $entries;
+
+- function parseXml($file)
++ function __construct($file)
+ {
+ $this->parser = xml_parser_create();
+ $this->filename = $file;
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-clear.inc gosa/gosa-core/include/password-methods/class_password-methods-clear.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-clear.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-clear.inc 2016-06-01 12:36:40.563022532 +0200
+@@ -24,7 +24,7 @@
+ {
+ var $lockable = FALSE;
+
+- function passwordMethodClear($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-crypt.inc gosa/gosa-core/include/password-methods/class_password-methods-crypt.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-crypt.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-crypt.inc 2016-06-01 12:36:40.563022532 +0200
+@@ -22,7 +22,7 @@
+
+ class passwordMethodCrypt extends passwordMethod
+ {
+- function passwordMethodCrypt($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods.inc gosa/gosa-core/include/password-methods/class_password-methods.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods.inc 2010-12-03 15:23:06.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods.inc 2016-06-01 12:36:40.559022545 +0200
+@@ -29,7 +29,7 @@
+ var $lockable = TRUE;
+
+ // Konstructor
+- function passwordMethod($config, $dn)
++ function __construct($config, $dn)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-md5.inc gosa/gosa-core/include/password-methods/class_password-methods-md5.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-md5.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-md5.inc 2016-06-01 12:36:40.563022532 +0200
+@@ -22,7 +22,7 @@
+
+ class passwordMethodMd5 extends passwordMethod
+ {
+- function passwordMethodMd5($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-sha.inc gosa/gosa-core/include/password-methods/class_password-methods-sha.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-sha.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-sha.inc 2016-06-01 12:36:40.563022532 +0200
+@@ -22,7 +22,7 @@
+
+ class passwordMethodsha extends passwordMethod
+ {
+- function passwordMethodsha($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-smd5.inc gosa/gosa-core/include/password-methods/class_password-methods-smd5.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-smd5.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-smd5.inc 2016-06-01 12:36:40.559022545 +0200
+@@ -22,7 +22,7 @@
+
+ class passwordMethodsmd5 extends passwordMethod
+ {
+- function passwordMethodsmd5($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-ssha.inc gosa/gosa-core/include/password-methods/class_password-methods-ssha.inc
+--- gosa.const/gosa-core/include/password-methods/class_password-methods-ssha.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/include/password-methods/class_password-methods-ssha.inc 2016-06-01 12:36:40.567022517 +0200
+@@ -22,7 +22,7 @@
+
+ class passwordMethodssha extends passwordMethod
+ {
+- function passwordMethodssha($config)
++ function __construct($config)
+ {
+ }
+
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php 2005-10-28 10:51:52.000000000 +0200
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php 2016-06-01 12:36:40.591022432 +0200
+@@ -35,7 +35,7 @@
+ /*
+ * Constructor
+ */
+- function writeexcel_biffwriter() {
++ function __construct() {
+
+ $this->byte_order = '';
+ $this->BIFF_version = 0x0500;
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_format.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_format.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_format.inc.php 2010-01-26 10:29:20.000000000 +0100
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_format.inc.php 2016-06-01 12:36:40.583022460 +0200
+@@ -63,7 +63,7 @@
+ /*
+ * Constructor
+ */
+- function writeexcel_format() {
++ function __construct() {
+ $_=func_get_args();
+
+ $this->_xf_index = (sizeof($_)>0) ? array_shift($_) : 0;
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php 2010-01-26 10:40:08.000000000 +0100
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php 2016-06-01 12:36:40.591022432 +0200
+@@ -77,7 +77,7 @@
+ #
+ # Constructor
+ #
+-function writeexcel_formula($byte_order) {
++function __construct($byte_order) {
+
+ $this->parser = false;
+ $this->ptg = array();
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php 2008-03-17 23:50:40.000000000 +0100
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php 2016-06-01 12:36:40.587022447 +0200
+@@ -42,7 +42,7 @@
+ /*
+ * Constructor
+ */
+- function writeexcel_olewriter($filename) {
++ function __construct($filename) {
+
+ $this->_OLEfilename = $filename;
+ $this->_filehandle = false;
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php 2008-05-08 09:01:34.000000000 +0200
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php 2016-06-01 12:36:40.587022447 +0200
+@@ -56,7 +56,7 @@
+ #
+ # Constructor. Creates a new Workbook object from a BIFFwriter object.
+ #
+-function writeexcel_workbook($filename) {
++function __construct($filename) {
+
+ $this->writeexcel_biffwriter();
+
+diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php gosa/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php
+--- gosa.const/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php 2010-01-26 10:29:20.000000000 +0100
++++ gosa/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php 2016-06-01 12:36:40.583022460 +0200
+@@ -103,7 +103,7 @@
+ /*
+ * Constructor. Creates a new Worksheet object from a BIFFwriter object
+ */
+- function writeexcel_worksheet($name, $index, $activesheet, $firstsheet,
++ function __construct($name, $index, $activesheet, $firstsheet,
+ $url_format, $parser, $tempdir) {
+
+ $this->writeexcel_biffwriter();
+diff -ru gosa.const/gosa-core/plugins/admin/acl/class_aclRole.inc gosa/gosa-core/plugins/admin/acl/class_aclRole.inc
+--- gosa.const/gosa-core/plugins/admin/acl/class_aclRole.inc 2010-12-10 16:14:57.000000000 +0100
++++ gosa/gosa-core/plugins/admin/acl/class_aclRole.inc 2016-06-01 12:36:40.459022899 +0200
+@@ -59,7 +59,7 @@
+ var $list =NULL;
+ var $sectionList = NULL;
+
+- function aclrole (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Include config object */
+ plugin::plugin($config, $dn);
+diff -ru gosa.const/gosa-core/plugins/admin/acl/tabs_acl.inc gosa/gosa-core/plugins/admin/acl/tabs_acl.inc
+--- gosa.const/gosa-core/plugins/admin/acl/tabs_acl.inc 2010-03-17 13:16:09.000000000 +0100
++++ gosa/gosa-core/plugins/admin/acl/tabs_acl.inc 2016-06-01 12:36:40.459022899 +0200
+@@ -23,7 +23,7 @@
+ class acltab extends tabs
+ {
+
+- function acltab($config, $data, $dn)
++ function __construct($config, $data, $dn)
+ {
+ $data = array(array("CLASS" => "acl" , "NAME" => _("ACL")));
+
+diff -ru gosa.const/gosa-core/plugins/admin/acl/tabs_acl_role.inc gosa/gosa-core/plugins/admin/acl/tabs_acl_role.inc
+--- gosa.const/gosa-core/plugins/admin/acl/tabs_acl_role.inc 2010-07-29 15:54:19.000000000 +0200
++++ gosa/gosa-core/plugins/admin/acl/tabs_acl_role.inc 2016-06-01 12:36:40.463022885 +0200
+@@ -23,7 +23,7 @@
+ class aclroletab extends tabs
+ {
+
+- function aclroletab($config, $data, $dn)
++ function __construct($config, $data, $dn)
+ {
+ $data = array(array("CLASS" => "aclrole" , "NAME" => _("ACL Templates")));
+ tabs::tabs($config, $data, $dn,"acl");
+diff -ru gosa.const/gosa-core/plugins/admin/departments/class_department.inc gosa/gosa-core/plugins/admin/departments/class_department.inc
+--- gosa.const/gosa-core/plugins/admin/departments/class_department.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/plugins/admin/departments/class_department.inc 2016-06-01 12:36:40.455022915 +0200
+@@ -64,7 +64,7 @@
+
+ var $is_root_dse = FALSE;
+
+- function department (&$config, $dn)
++ function __construct(&$config, $dn)
+ {
+ /* Add the default structural obejct class 'locality' if this is a new entry
+ */
+diff -ru gosa.const/gosa-core/plugins/admin/departments/tabs_department.inc gosa/gosa-core/plugins/admin/departments/tabs_department.inc
+--- gosa.const/gosa-core/plugins/admin/departments/tabs_department.inc 2010-06-01 09:39:09.000000000 +0200
++++ gosa/gosa-core/plugins/admin/departments/tabs_department.inc 2016-06-01 12:36:40.455022915 +0200
+@@ -26,7 +26,7 @@
+ var $moved = FALSE;
+ var $base_name = "department";
+
+- function deptabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
+
+diff -ru gosa.const/gosa-core/plugins/admin/groups/class_group.inc gosa/gosa-core/plugins/admin/groups/class_group.inc
+--- gosa.const/gosa-core/plugins/admin/groups/class_group.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/plugins/admin/groups/class_group.inc 2016-06-01 12:36:40.443022956 +0200
+@@ -75,7 +75,7 @@
+ private $partialList; // (Multiple support active)
+
+
+- function group (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Set rfc2307bis flag */
+ if ($config->get_cfg_value("core","rfc2307bis") == "true"){
+diff -ru gosa.const/gosa-core/plugins/admin/groups/tabs_group.inc gosa/gosa-core/plugins/admin/groups/tabs_group.inc
+--- gosa.const/gosa-core/plugins/admin/groups/tabs_group.inc 2010-07-29 15:54:43.000000000 +0200
++++ gosa/gosa-core/plugins/admin/groups/tabs_group.inc 2016-06-01 12:36:40.439022970 +0200
+@@ -23,7 +23,7 @@
+ class grouptabs extends tabs
+ {
+
+- function grouptabs($config, $data, $dn, $cat = "", $hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn, $cat = "", $hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,"groups", $hide_refs, $hide_acls);
+ $this->addSpecialTabs();
+diff -ru gosa.const/gosa-core/plugins/admin/ogroups/class_ogroup.inc gosa/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+--- gosa.const/gosa-core/plugins/admin/ogroups/class_ogroup.inc 2011-11-09 08:33:13.000000000 +0100
++++ gosa/gosa-core/plugins/admin/ogroups/class_ogroup.inc 2016-06-01 12:36:40.467022871 +0200
+@@ -77,7 +77,7 @@
+ var $attributes= array("cn", "description", "gosaGroupObjects","member");
+ var $objectclasses= array("top", "gosaGroupOfNames");
+
+- function ogroup (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc gosa/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+--- gosa.const/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc 2016-06-01 12:36:40.463022885 +0200
+@@ -308,7 +308,7 @@
+ return ( $str);
+ }
+
+- function ogrouptabs($config, $data, $dn,$category ="ogroups",$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category ="ogroups",$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+
+ tabs::tabs($config, $data, $dn, $category,$hide_refs, $hide_acls);
+diff -ru gosa.const/gosa-core/plugins/admin/users/tabs_user.inc gosa/gosa-core/plugins/admin/users/tabs_user.inc
+--- gosa.const/gosa-core/plugins/admin/users/tabs_user.inc 2009-08-26 10:02:49.000000000 +0200
++++ gosa/gosa-core/plugins/admin/users/tabs_user.inc 2016-06-01 12:36:40.435022986 +0200
+@@ -30,7 +30,7 @@
+ var $givenName = "";
+ var $sn;
+
+- function usertabs($config, $data, $dn, $cat = "", $hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn, $cat = "", $hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn, 'users',$hide_refs, $hide_acls);
+ $this->base= $this->by_object['user']->base;
+diff -ru gosa.const/gosa-core/plugins/generic/references/class_reference.inc gosa/gosa-core/plugins/generic/references/class_reference.inc
+--- gosa.const/gosa-core/plugins/generic/references/class_reference.inc 2010-07-29 18:21:26.000000000 +0200
++++ gosa/gosa-core/plugins/generic/references/class_reference.inc 2016-06-01 12:36:40.471022857 +0200
+@@ -29,7 +29,7 @@
+ var $objectList ="";
+ var $modifyTimestamp = "";
+
+- function reference (&$config, $dn= NULL, $parent = NULL)
++ function __construct(&$config, $dn= NULL, $parent = NULL)
+ {
+ // Init the plugin
+ plugin::plugin($config,$dn,$parent);
+diff -ru gosa.const/gosa-core/plugins/personal/generic/class_user.inc gosa/gosa-core/plugins/personal/generic/class_user.inc
+--- gosa.const/gosa-core/plugins/personal/generic/class_user.inc 2012-05-02 11:49:01.000000000 +0200
++++ gosa/gosa-core/plugins/personal/generic/class_user.inc 2016-06-01 12:36:40.491022786 +0200
+@@ -135,7 +135,7 @@
+
+ /* constructor, if 'dn' is set, the node loads the given
+ 'dn' from LDAP */
+- function user (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ global $lang;
+
+diff -ru gosa.const/gosa-core/plugins/personal/password/class_password.inc gosa/gosa-core/plugins/personal/password/class_password.inc
+--- gosa.const/gosa-core/plugins/personal/password/class_password.inc 2012-05-02 11:49:01.000000000 +0200
++++ gosa/gosa-core/plugins/personal/password/class_password.inc 2016-06-01 12:36:40.499022759 +0200
+@@ -36,7 +36,7 @@
+ var $attributes=array('userPassword');
+
+
+- function password(&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin($config, $dn, $parent);
+ }
+diff -ru gosa.const/gosa-core/plugins/personal/posix/class_posixAccount.inc gosa/gosa-core/plugins/personal/posix/class_posixAccount.inc
+--- gosa.const/gosa-core/plugins/personal/posix/class_posixAccount.inc 2012-05-02 14:24:10.000000000 +0200
++++ gosa/gosa-core/plugins/personal/posix/class_posixAccount.inc 2016-06-01 12:36:40.495022772 +0200
+@@ -99,7 +99,7 @@
+
+ /* constructor, if 'dn' is set, the node loads the given
+ 'dn' from LDAP */
+- function posixAccount (&$config, $dn= NULL, $parent =NULL)
++ function __construct(&$config, $dn= NULL, $parent =NULL)
+ {
+ global $class_mapping;
+
+diff -ru gosa.const/gosa-core/setup/class_setup.inc gosa/gosa-core/setup/class_setup.inc
+--- gosa.const/gosa-core/setup/class_setup.inc 2010-05-27 17:06:08.000000000 +0200
++++ gosa/gosa-core/setup/class_setup.inc 2016-06-01 12:36:40.523022673 +0200
+@@ -31,7 +31,7 @@
+ var $o_steps = array();
+ var $captured_values = array();
+
+- function setup()
++ function __construct()
+ {
+ $i = 1;
+ $this->o_steps[$i++] = new Step_Welcome();
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Checks.inc gosa/gosa-core/setup/class_setupStep_Checks.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Checks.inc 2012-03-26 10:44:38.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Checks.inc 2016-06-01 12:36:40.531022645 +0200
+@@ -29,7 +29,7 @@
+
+ var $b_displayCheckbutton = TRUE;
+
+- function Step_Checks()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Feedback.inc gosa/gosa-core/setup/class_setupStep_Feedback.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Feedback.inc 2010-07-29 18:21:26.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Feedback.inc 2016-06-01 12:36:40.523022673 +0200
+@@ -55,7 +55,7 @@
+ "first_use","use_since","distribution","web_server","php_version","ldap_server","object_count","want_to_see_next","gosa_version");
+
+
+- function Step_Feedback()
++ function __construct()
+ {
+ $this->is_enabled = TRUE;
+ $this->is_active = TRUE;
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Finish.inc gosa/gosa-core/setup/class_setupStep_Finish.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Finish.inc 2010-07-30 10:07:11.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Finish.inc 2016-06-01 12:36:40.531022645 +0200
+@@ -28,7 +28,7 @@
+
+ var $b_displayCheckbutton = TRUE;
+
+- function Step_Finish()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep.inc gosa/gosa-core/setup/class_setupStep.inc
+--- gosa.const/gosa-core/setup/class_setupStep.inc 2010-05-26 13:57:44.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep.inc 2016-06-01 12:36:40.527022659 +0200
+@@ -36,7 +36,7 @@
+ var $parent = NULL;
+ var $dialog = FALSE;
+
+- function setup_step()
++ function __construct()
+ {
+ }
+
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Language.inc gosa/gosa-core/setup/class_setupStep_Language.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Language.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/setup/class_setupStep_Language.inc 2016-06-01 12:36:40.527022659 +0200
+@@ -28,7 +28,7 @@
+ var $attributes = array("lang","lang_selected");
+ var $header_image = "images/setup/locale.png";
+
+- function Step_Language()
++ function __construct()
+ {
+ $this->lang = get_browser_language();
+ $this->lang_selected = "";
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Ldap.inc gosa/gosa-core/setup/class_setupStep_Ldap.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Ldap.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Ldap.inc 2016-06-01 12:36:40.523022673 +0200
+@@ -43,7 +43,7 @@
+ var $header_image= "images/setup/ldap.png";
+
+ var $b_displayCheckbutton = TRUE;
+- function Step_Ldap()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep_License.inc gosa/gosa-core/setup/class_setupStep_License.inc
+--- gosa.const/gosa-core/setup/class_setupStep_License.inc 2010-01-27 15:03:19.000000000 +0100
++++ gosa/gosa-core/setup/class_setupStep_License.inc 2016-06-01 12:36:40.523022673 +0200
+@@ -29,7 +29,7 @@
+ var $attributes = array("accepted");
+
+
+- function Step_License()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Migrate.inc gosa/gosa-core/setup/class_setupStep_Migrate.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Migrate.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Migrate.inc 2016-06-01 12:36:40.531022645 +0200
+@@ -41,7 +41,7 @@
+ var $rootOC_details = array();
+ var $b_displayCheckbutton = TRUE;
+
+- function Step_Migrate()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Schema.inc gosa/gosa-core/setup/class_setupStep_Schema.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Schema.inc 2011-07-27 08:38:29.000000000 +0200
++++ gosa/gosa-core/setup/class_setupStep_Schema.inc 2016-06-01 12:36:40.527022659 +0200
+@@ -26,7 +26,7 @@
+ var $not_checked = array();
+ var $b_displayCheckbutton = true;
+
+- function Step_Schema()
++ function __construct()
+ {
+ $this->update_strings();
+ }
+diff -ru gosa.const/gosa-core/setup/class_setupStep_Welcome.inc gosa/gosa-core/setup/class_setupStep_Welcome.inc
+--- gosa.const/gosa-core/setup/class_setupStep_Welcome.inc 2010-11-05 16:46:16.000000000 +0100
++++ gosa/gosa-core/setup/class_setupStep_Welcome.inc 2016-06-01 12:36:40.531022645 +0200
+@@ -28,7 +28,7 @@
+
+ var $instanceUUID = "";
+
+- function Step_Welcome()
++ function __construct()
+ {
+ $this->is_enabled = TRUE;
+ $this->is_active = TRUE;
+diff -ru gosa.const/goto/admin/applications/class_applicationGeneric.inc gosa/goto/admin/applications/class_applicationGeneric.inc
+--- gosa.const/goto/admin/applications/class_applicationGeneric.inc 2010-11-30 17:54:14.000000000 +0100
++++ gosa/goto/admin/applications/class_applicationGeneric.inc 2016-06-01 12:36:40.671022149 +0200
+@@ -30,7 +30,7 @@
+
+ var $baseSelector;
+
+- function application (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/goto/admin/applications/class_applicationParameters.inc gosa/goto/admin/applications/class_applicationParameters.inc
+--- gosa.const/goto/admin/applications/class_applicationParameters.inc 2010-07-09 16:27:08.000000000 +0200
++++ gosa/goto/admin/applications/class_applicationParameters.inc 2016-06-01 12:36:40.671022149 +0200
+@@ -8,7 +8,7 @@
+ /* attribute list for save action */
+ var $attributes= array("gosaApplicationParameter");
+
+- function applicationParameters (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/goto/admin/applications/tabs_application.inc gosa/goto/admin/applications/tabs_application.inc
+--- gosa.const/goto/admin/applications/tabs_application.inc 2010-07-29 15:54:21.000000000 +0200
++++ gosa/goto/admin/applications/tabs_application.inc 2016-06-01 12:36:40.667022163 +0200
+@@ -5,7 +5,7 @@
+ var $parent = FALSE;
+ var $FAIstate = "";
+
+- function apptabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
+
+diff -ru gosa.const/goto/admin/devices/class_deviceGeneric.inc gosa/goto/admin/devices/class_deviceGeneric.inc
+--- gosa.const/goto/admin/devices/class_deviceGeneric.inc 2010-11-30 17:54:17.000000000 +0100
++++ gosa/goto/admin/devices/class_deviceGeneric.inc 2016-06-01 12:36:40.663022177 +0200
+@@ -21,7 +21,7 @@
+
+ public $CopyPasteVars = array("orig_cn","description","vendor","devID","serial","base");
+
+- public function deviceGeneric(&$config,$dn = NULL)
++ public function __construct(&$config,$dn = NULL)
+ {
+ plugin::plugin($config,$dn);
+
+diff -ru gosa.const/goto/admin/devices/tabs_devices.inc gosa/goto/admin/devices/tabs_devices.inc
+--- gosa.const/goto/admin/devices/tabs_devices.inc 2010-07-29 15:54:23.000000000 +0200
++++ gosa/goto/admin/devices/tabs_devices.inc 2016-06-01 12:36:40.663022177 +0200
+@@ -4,7 +4,7 @@
+ {
+ var $Release= "";
+
+- function devicetabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
+
+diff -ru gosa.const/goto/admin/mimetypes/class_mimetypeGeneric.inc gosa/goto/admin/mimetypes/class_mimetypeGeneric.inc
+--- gosa.const/goto/admin/mimetypes/class_mimetypeGeneric.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/mimetypes/class_mimetypeGeneric.inc 2016-06-01 12:36:40.627022305 +0200
+@@ -50,7 +50,7 @@
+
+ var $baseSelector;
+
+- function mimetype(&$config,$dn= NULL)
++ function __construct(&$config,$dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/goto/admin/mimetypes/tabs_mimetypes.inc gosa/goto/admin/mimetypes/tabs_mimetypes.inc
+--- gosa.const/goto/admin/mimetypes/tabs_mimetypes.inc 2010-07-29 15:54:46.000000000 +0200
++++ gosa/goto/admin/mimetypes/tabs_mimetypes.inc 2016-06-01 12:36:40.623022319 +0200
+@@ -5,7 +5,7 @@
+ var $parent = FALSE;
+ var $FAIstate = "";
+
+- function mimetabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs , $hide_acls);
+
+diff -ru gosa.const/goto/admin/ogroups/goto/class_termgroup.inc gosa/goto/admin/ogroups/goto/class_termgroup.inc
+--- gosa.const/goto/admin/ogroups/goto/class_termgroup.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/ogroups/goto/class_termgroup.inc 2016-06-01 12:36:40.667022163 +0200
+@@ -35,7 +35,7 @@
+ var $member_of_ogroup= false;
+ var $members_inherit_from_group = false;
+
+- function termgroup (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ /***************
+ Some initialisations
+diff -ru gosa.const/goto/admin/systems/goto/class_ArpNewDevice.inc gosa/goto/admin/systems/goto/class_ArpNewDevice.inc
+--- gosa.const/goto/admin/systems/goto/class_ArpNewDevice.inc 2010-11-30 17:55:34.000000000 +0100
++++ gosa/goto/admin/systems/goto/class_ArpNewDevice.inc 2016-06-01 12:36:40.659022191 +0200
+@@ -16,7 +16,7 @@
+
+ var $gotoIntegration = FALSE;
+
+- function ArpNewDevice ($config, $dn= NULL, $parent= NULL)
++ function __construct($config, $dn= NULL, $parent= NULL)
+ {
+ plugin :: plugin($config,$dn);
+ $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses);
+diff -ru gosa.const/goto/admin/systems/goto/class_printGeneric.inc gosa/goto/admin/systems/goto/class_printGeneric.inc
+--- gosa.const/goto/admin/systems/goto/class_printGeneric.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_printGeneric.inc 2016-06-01 12:36:40.655022205 +0200
+@@ -55,7 +55,7 @@
+ var $userSelect;
+ var $adminUserSelect;
+
+- function printgeneric (&$config, $dn,$parent_init,$parent)
++ function __construct(&$config, $dn,$parent_init,$parent)
+ {
+ $this->config = &$config;
+ $this->dn = $dn;
+diff -ru gosa.const/goto/admin/systems/goto/class_SelectDeviceType.inc gosa/goto/admin/systems/goto/class_SelectDeviceType.inc
+--- gosa.const/goto/admin/systems/goto/class_SelectDeviceType.inc 2010-07-26 10:56:35.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_SelectDeviceType.inc 2016-06-01 12:36:40.647022234 +0200
+@@ -15,7 +15,7 @@
+
+ var $dn;
+
+- function SelectDeviceType (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ if(!is_array($dn)){
+ $this->dns = array($dn);
+diff -ru gosa.const/goto/admin/systems/goto/class_terminalGeneric.inc gosa/goto/admin/systems/goto/class_terminalGeneric.inc
+--- gosa.const/goto/admin/systems/goto/class_terminalGeneric.inc 2012-01-16 10:01:56.000000000 +0100
++++ gosa/goto/admin/systems/goto/class_terminalGeneric.inc 2016-06-01 12:36:40.643022248 +0200
+@@ -58,7 +58,7 @@
+ var $kerberos_key_service = NULL;
+
+
+- function termgeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ /* Check if FAI is activated */
+ $this->fai_activated = $config->pluginEnabled("faiManagement");
+diff -ru gosa.const/goto/admin/systems/goto/class_terminalInfo.inc gosa/goto/admin/systems/goto/class_terminalInfo.inc
+--- gosa.const/goto/admin/systems/goto/class_terminalInfo.inc 2010-11-30 17:55:46.000000000 +0100
++++ gosa/goto/admin/systems/goto/class_terminalInfo.inc 2016-06-01 12:36:40.643022248 +0200
+@@ -31,7 +31,7 @@
+ "ghGfxAdapter", "ghSoundAdapter", "gotoLastUser");
+ var $objectclasses= array("GOhard");
+
+- function terminfo (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config,$dn);
+
+diff -ru gosa.const/goto/admin/systems/goto/class_terminalService.inc gosa/goto/admin/systems/goto/class_terminalService.inc
+--- gosa.const/goto/admin/systems/goto/class_terminalService.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_terminalService.inc 2016-06-01 12:36:40.651022220 +0200
+@@ -61,7 +61,7 @@
+ var $selected_xdmcp_servers = array();
+ var $inherited_xdmcp_servers = array();
+
+- function termservice (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+ $this->orig_dn= $this->dn;
+diff -ru gosa.const/goto/admin/systems/goto/class_terminalStartup.inc gosa/goto/admin/systems/goto/class_terminalStartup.inc
+--- gosa.const/goto/admin/systems/goto/class_terminalStartup.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_terminalStartup.inc 2016-06-01 12:36:40.659022191 +0200
+@@ -33,7 +33,7 @@
+ var $orig_dn= "";
+ var $ignore_account= TRUE;
+
+- function termstartup (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/goto/admin/systems/goto/class_workstationGeneric.inc gosa/goto/admin/systems/goto/class_workstationGeneric.inc
+--- gosa.const/goto/admin/systems/goto/class_workstationGeneric.inc 2012-01-16 10:01:56.000000000 +0100
++++ gosa/goto/admin/systems/goto/class_workstationGeneric.inc 2016-06-01 12:36:40.655022205 +0200
+@@ -62,7 +62,7 @@
+
+ var $kerberos_key_service = NULL;
+
+- function workgeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ $this->fai_activated = $config->pluginEnabled("faiManagement");
+
+diff -ru gosa.const/goto/admin/systems/goto/class_workstationService.inc gosa/goto/admin/systems/goto/class_workstationService.inc
+--- gosa.const/goto/admin/systems/goto/class_workstationService.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_workstationService.inc 2016-06-01 12:36:40.651022220 +0200
+@@ -48,7 +48,7 @@
+ var $XKbLayouts =array();
+ var $XKbVariants =array();
+
+- function workservice (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/goto/admin/systems/goto/class_workstationStartup.inc gosa/goto/admin/systems/goto/class_workstationStartup.inc
+--- gosa.const/goto/admin/systems/goto/class_workstationStartup.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/class_workstationStartup.inc 2016-06-01 12:36:40.647022234 +0200
+@@ -56,7 +56,7 @@
+ var $o_group_dn = "";
+ var $member_of_ogroup = FALSE;
+
+- function workstartup (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ /* Check if FAI is active */
+ if($config->pluginEnabled("faiManagement")){
+diff -ru gosa.const/goto/admin/systems/goto/tabs_printers.inc gosa/goto/admin/systems/goto/tabs_printers.inc
+--- gosa.const/goto/admin/systems/goto/tabs_printers.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/tabs_printers.inc 2016-06-01 12:36:40.643022248 +0200
+@@ -3,7 +3,7 @@
+ class printtabs extends tabs
+ {
+
+- function printtabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+
+ /* Save dn */
+diff -ru gosa.const/goto/admin/systems/goto/tabs_terminal.inc gosa/goto/admin/systems/goto/tabs_terminal.inc
+--- gosa.const/goto/admin/systems/goto/tabs_terminal.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/tabs_terminal.inc 2016-06-01 12:36:40.639022262 +0200
+@@ -4,7 +4,7 @@
+ {
+ public $was_activated = FALSE;
+
+- function termtabs($config, $data, $dn, $category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn, $category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ /* Save dn */
+ $this->dn= $dn;
+diff -ru gosa.const/goto/admin/systems/goto/tabs_workstation.inc gosa/goto/admin/systems/goto/tabs_workstation.inc
+--- gosa.const/goto/admin/systems/goto/tabs_workstation.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/goto/tabs_workstation.inc 2016-06-01 12:36:40.663022177 +0200
+@@ -5,7 +5,7 @@
+
+ public $was_activated = FALSE;
+
+- function worktabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+
+ /* Save dn */
+diff -ru gosa.const/goto/admin/systems/ppd/class_ppdManager.inc gosa/goto/admin/systems/ppd/class_ppdManager.inc
+--- gosa.const/goto/admin/systems/ppd/class_ppdManager.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/ppd/class_ppdManager.inc 2016-06-01 12:36:40.631022291 +0200
+@@ -8,7 +8,7 @@
+
+ var $useGzip = true;
+
+- function ppdManager($path)
++ function __construct($path)
+ {
+ global $config;
+ if($config->boolValueIsTrue("core","ppdGzip")){
+diff -ru gosa.const/goto/admin/systems/ppd/class_printerPPDDialog.inc gosa/goto/admin/systems/ppd/class_printerPPDDialog.inc
+--- gosa.const/goto/admin/systems/ppd/class_printerPPDDialog.inc 2010-11-17 10:15:54.000000000 +0100
++++ gosa/goto/admin/systems/ppd/class_printerPPDDialog.inc 2016-06-01 12:36:40.631022291 +0200
+@@ -29,7 +29,7 @@
+ var $add_ppd_later = "";
+ var $add_later_msg_dialog = NULL;
+
+- function printerPPDDialog (&$config, $dn= NULL, $ppdfile=NULL )
++ function __construct(&$config, $dn= NULL, $ppdfile=NULL )
+ {
+ plugin::plugin ($config, $dn);
+ $this->depselect = $this->config->current['BASE'];
+diff -ru gosa.const/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc gosa/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+--- gosa.const/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc 2010-04-08 17:11:31.000000000 +0200
++++ gosa/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc 2016-06-01 12:36:40.631022291 +0200
+@@ -13,7 +13,7 @@
+ var $Vendor = "";
+ var $selectedPPD = "";
+
+- function printerPPDSelectionDialog (&$config, $dn= NULL,$list=false,$headers=false,$ppd=false)
++ function __construct(&$config, $dn= NULL,$list=false,$headers=false,$ppd=false)
+ {
+ plugin::plugin ($config, $dn);
+ $this->list = $list;
+diff -ru gosa.const/goto/admin/systems/services/cups/class_goCupsServer.inc gosa/goto/admin/systems/services/cups/class_goCupsServer.inc
+--- gosa.const/goto/admin/systems/services/cups/class_goCupsServer.inc 2010-07-27 11:17:03.000000000 +0200
++++ gosa/goto/admin/systems/services/cups/class_goCupsServer.inc 2016-06-01 12:36:40.635022276 +0200
+@@ -21,7 +21,7 @@
+ var $goCupsServerStatus = "";
+ var $view_logged =FALSE;
+
+- function goCupsServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Print service");
+diff -ru gosa.const/goto/admin/systems/services/kiosk/class_goKioskService.inc gosa/goto/admin/systems/services/kiosk/class_goKioskService.inc
+--- gosa.const/goto/admin/systems/services/kiosk/class_goKioskService.inc 2011-11-09 08:51:18.000000000 +0100
++++ gosa/goto/admin/systems/services/kiosk/class_goKioskService.inc 2016-06-01 12:36:40.635022276 +0200
+@@ -18,7 +18,7 @@
+ var $gotoKioskProfile = array();
+ var $server_path = "http://%cn/kiosk";
+
+- function goKioskService(&$config, $dn, $parent)
++ function __construct(&$config, $dn, $parent)
+ {
+ goService::goService($config,$dn);
+
+diff -ru gosa.const/goto/admin/systems/services/ldap/class_goLdapServer.inc gosa/goto/admin/systems/services/ldap/class_goLdapServer.inc
+--- gosa.const/goto/admin/systems/services/ldap/class_goLdapServer.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/goto/admin/systems/services/ldap/class_goLdapServer.inc 2016-06-01 12:36:40.635022276 +0200
+@@ -24,7 +24,7 @@
+
+ var $krb_service_prefix = "ldap/";
+
+- function goLdapServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("LDAP service");
+diff -ru gosa.const/goto/admin/systems/services/ntp/class_goNtpServer.inc gosa/goto/admin/systems/services/ntp/class_goNtpServer.inc
+--- gosa.const/goto/admin/systems/services/ntp/class_goNtpServer.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/goto/admin/systems/services/ntp/class_goNtpServer.inc 2016-06-01 12:36:40.639022262 +0200
+@@ -22,7 +22,7 @@
+ var $cn = "";
+ var $view_logged =FALSE;
+
+- function goNtpServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Time service (NTP)");
+diff -ru gosa.const/goto/admin/systems/services/shares/class_goShareServer.inc gosa/goto/admin/systems/services/shares/class_goShareServer.inc
+--- gosa.const/goto/admin/systems/services/shares/class_goShareServer.inc 2010-07-30 10:04:55.000000000 +0200
++++ gosa/goto/admin/systems/services/shares/class_goShareServer.inc 2016-06-01 12:36:40.639022262 +0200
+@@ -24,7 +24,7 @@
+ var $mounts_to_add = array();
+ var $view_logged =FALSE;
+
+- function goShareServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+
+diff -ru gosa.const/goto/admin/systems/services/shares/class_servNfs.inc gosa/goto/admin/systems/services/shares/class_servNfs.inc
+--- gosa.const/goto/admin/systems/services/shares/class_servNfs.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/services/shares/class_servNfs.inc 2016-06-01 12:36:40.639022262 +0200
+@@ -25,7 +25,7 @@
+ var $parent = NULL;
+ var $view_logged = FALSE;
+
+- function servnfs (&$config, $parent,$entry= false,$mount =false)
++ function __construct(&$config, $parent,$entry= false,$mount =false)
+ {
+ $this->parent = $parent;
+ $dn = $parent->dn;
+diff -ru gosa.const/goto/admin/systems/services/terminal/class_goTerminalServer.inc gosa/goto/admin/systems/services/terminal/class_goTerminalServer.inc
+--- gosa.const/goto/admin/systems/services/terminal/class_goTerminalServer.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/admin/systems/services/terminal/class_goTerminalServer.inc 2016-06-01 12:36:40.635022276 +0200
+@@ -20,7 +20,7 @@
+
+ var $gotoSessionType = array();
+
+- function goTerminalServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Terminal service");
+diff -ru gosa.const/goto/personal/environment/class_environment.inc gosa/goto/personal/environment/class_environment.inc
+--- gosa.const/goto/personal/environment/class_environment.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/goto/personal/environment/class_environment.inc 2016-06-01 12:36:40.679022120 +0200
+@@ -83,7 +83,7 @@
+ var $shareList = NULL;
+
+
+- function environment (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/goto/personal/environment/class_logonManagementDialog.inc gosa/goto/personal/environment/class_logonManagementDialog.inc
+--- gosa.const/goto/personal/environment/class_logonManagementDialog.inc 2010-11-17 10:16:02.000000000 +0100
++++ gosa/goto/personal/environment/class_logonManagementDialog.inc 2016-06-01 12:36:40.679022120 +0200
+@@ -20,7 +20,7 @@
+
+ var $real_LogonName = "";
+
+- function logonManagementDialog (&$config, $dn= NULL,$data=false)
++ function __construct(&$config, $dn= NULL,$data=false)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc gosa/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc
+--- gosa.const/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc 2016-06-01 12:36:40.719021979 +0200
+@@ -52,7 +52,7 @@
+ @param String The object dn we are currently editing.
+ @param Object The parent object.
+ */
+- public function goKrbServer(&$config,$dn,$parent)
++ public function __construct(&$config,$dn,$parent)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Kerberos service");
+diff -ru gosa.const/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc gosa/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
+--- gosa.const/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc 2010-07-30 18:12:29.000000000 +0200
++++ gosa/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc 2016-06-01 12:36:40.719021979 +0200
+@@ -57,7 +57,7 @@
+ var $attrs = array();
+ var $is_account = FALSE;
+
+- function passwordMethodheimdal(&$config,$dn = "new")
++ function __construct(&$config,$dn = "new")
+ {
+ $this->config= $config;
+ $this->parent_dn = $dn;
+diff -ru gosa.const/kolab/admin/systems/services/kolab/class_servKolab.inc gosa/kolab/admin/systems/services/kolab/class_servKolab.inc
+--- gosa.const/kolab/admin/systems/services/kolab/class_servKolab.inc 2011-06-22 08:32:00.000000000 +0200
++++ gosa/kolab/admin/systems/services/kolab/class_servKolab.inc 2016-06-01 12:36:40.719021979 +0200
+@@ -37,7 +37,7 @@
+ var $DisplayName = "Kolab mail service";
+ var $StatusFlag = "";
+
+- function servkolab(&$config, $dn = NULL, $parent= NULL)
++ function __construct(&$config, $dn = NULL, $parent= NULL)
+ {
+ /* Setting the hostname and tell this Plugin that we are the kolab extension*/
+ $this->hostname = preg_replace('/^cn=([^,]+),.*$/', '\1', $dn);
+diff -ru gosa.const/kolab/personal/connectivity/kolab/class_kolabAccount.inc gosa/kolab/personal/connectivity/kolab/class_kolabAccount.inc
+--- gosa.const/kolab/personal/connectivity/kolab/class_kolabAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/kolab/personal/connectivity/kolab/class_kolabAccount.inc 2016-06-01 12:36:40.723021964 +0200
+@@ -31,7 +31,7 @@
+ @param $dn DN of the currently edited object
+ @param $parent The parent object, used to fetch Attributes.
+ */
+- function kolabAccount (&$config, $dn= NULL,$parent = NULL)
++ function __construct(&$config, $dn= NULL,$parent = NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_csvimport.inc gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/class_csvimport.inc 2015-08-24 06:40:37.000000000 +0200
++++ gosa/ldapmanager/addons/ldapmanager/class_csvimport.inc 2016-06-01 12:36:40.727021950 +0200
+@@ -15,7 +15,7 @@
+ var $objectclasses= array();
+ var $view_logged = FALSE;
+
+- function csvimport (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ $this->initTime = microtime(TRUE);
+ /* Include config object */
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_export.inc gosa/ldapmanager/addons/ldapmanager/class_export.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/class_export.inc 2010-12-01 12:06:33.000000000 +0100
++++ gosa/ldapmanager/addons/ldapmanager/class_export.inc 2016-06-01 12:36:40.727021950 +0200
+@@ -13,7 +13,7 @@
+
+ var $base;
+
+- function ldifexport (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_exportxls.inc gosa/ldapmanager/addons/ldapmanager/class_exportxls.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/class_exportxls.inc 2010-08-02 12:07:27.000000000 +0200
++++ gosa/ldapmanager/addons/ldapmanager/class_exportxls.inc 2016-06-01 12:36:40.731021936 +0200
+@@ -16,7 +16,7 @@
+ var $base ="";
+ var $baseSelector ="";
+
+- function xlsexport (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Include config object */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_import.inc gosa/ldapmanager/addons/ldapmanager/class_import.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/class_import.inc 2010-11-17 10:15:20.000000000 +0100
++++ gosa/ldapmanager/addons/ldapmanager/class_import.inc 2016-06-01 12:36:40.727021950 +0200
+@@ -13,7 +13,7 @@
+ var $ui;
+ var $view_logged = FALSE;
+
+- function ldifimport (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Include config object */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_ldif.inc gosa/ldapmanager/addons/ldapmanager/class_ldif.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/class_ldif.inc 2010-08-02 12:07:32.000000000 +0200
++++ gosa/ldapmanager/addons/ldapmanager/class_ldif.inc 2016-06-01 12:36:40.731021936 +0200
+@@ -12,7 +12,7 @@
+ var $objectclasses= array();
+ var $ldif;
+
+- function ldif (&$config)
++ function __construct(&$config)
+ {
+ $this->initTime = microtime(TRUE);
+
+diff -ru gosa.const/ldapmanager/addons/ldapmanager/tabs_ldif.inc gosa/ldapmanager/addons/ldapmanager/tabs_ldif.inc
+--- gosa.const/ldapmanager/addons/ldapmanager/tabs_ldif.inc 2008-01-17 09:26:39.000000000 +0100
++++ gosa/ldapmanager/addons/ldapmanager/tabs_ldif.inc 2016-06-01 12:36:40.723021964 +0200
+@@ -3,7 +3,7 @@
+ class ldiftab extends tabs
+ {
+
+- function ldiftab($config, $data, $dn)
++ function __construct($config, $data, $dn)
+ {
+ tabs::tabs($config, $data, $dn);
+ }
+diff -ru gosa.const/log/admin/systems/services/syslog/class_goLogDBServer.inc gosa/log/admin/systems/services/syslog/class_goLogDBServer.inc
+--- gosa.const/log/admin/systems/services/syslog/class_goLogDBServer.inc 2010-07-30 18:12:29.000000000 +0200
++++ gosa/log/admin/systems/services/syslog/class_goLogDBServer.inc 2016-06-01 12:36:40.731021936 +0200
+@@ -25,7 +25,7 @@
+ var $view_logged =FALSE;
+
+
+- function goLogDBServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Syslog service database");
+diff -ru gosa.const/log/admin/systems/services/syslog/class_goSyslogServer.inc gosa/log/admin/systems/services/syslog/class_goSyslogServer.inc
+--- gosa.const/log/admin/systems/services/syslog/class_goSyslogServer.inc 2008-07-23 09:13:51.000000000 +0200
++++ gosa/log/admin/systems/services/syslog/class_goSyslogServer.inc 2016-06-01 12:36:40.731021936 +0200
+@@ -21,7 +21,7 @@
+ var $goSyslogServerStatus = "";
+ var $view_logged =FALSE;
+
+- function goSyslogServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Syslog server");
+diff -ru gosa.const/mail/addons/mailqueue/class_mailqueue.inc gosa/mail/addons/mailqueue/class_mailqueue.inc
+--- gosa.const/mail/addons/mailqueue/class_mailqueue.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/addons/mailqueue/class_mailqueue.inc 2016-06-01 12:36:40.775021780 +0200
+@@ -25,7 +25,7 @@
+ /* Logging detection */
+ var $view_logged = FALSE;
+
+- function mailqueue(&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ $this->config = &$config;
+ $this->si_queue = new si_mailqueue($this->config);
+diff -ru gosa.const/mail/admin/ogroups/mail/class_mailogroup.inc gosa/mail/admin/ogroups/mail/class_mailogroup.inc
+--- gosa.const/mail/admin/ogroups/mail/class_mailogroup.inc 2010-07-29 14:14:27.000000000 +0200
++++ gosa/mail/admin/ogroups/mail/class_mailogroup.inc 2016-06-01 12:36:40.739021908 +0200
+@@ -12,7 +12,7 @@
+ var $members= array();
+ var $view_logged = FALSE;
+
+- function mailogroup (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin($config, $dn, $parent);
+
+diff -ru gosa.const/mail/admin/systems/services/imap/class_goImapServer.inc gosa/mail/admin/systems/services/imap/class_goImapServer.inc
+--- gosa.const/mail/admin/systems/services/imap/class_goImapServer.inc 2010-07-30 18:12:29.000000000 +0200
++++ gosa/mail/admin/systems/services/imap/class_goImapServer.inc 2016-06-01 12:36:40.735021922 +0200
+@@ -41,7 +41,7 @@
+ var $Actions = array();
+ var $conflicts = array("goImapServer");
+
+- function goImapServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+
+diff -ru gosa.const/mail/admin/systems/services/mail/class_goMailServer.inc gosa/mail/admin/systems/services/mail/class_goMailServer.inc
+--- gosa.const/mail/admin/systems/services/mail/class_goMailServer.inc 2010-11-30 17:56:07.000000000 +0100
++++ gosa/mail/admin/systems/services/mail/class_goMailServer.inc 2016-06-01 12:36:40.735021922 +0200
+@@ -39,7 +39,7 @@
+ var $conflicts = array("goMailServer","kolab");
+ var $view_logged =FALSE;
+
+- function goMailServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Mail SMTP service (Postfix)");
+diff -ru gosa.const/mail/admin/systems/services/spam/class_goSpamServer.inc gosa/mail/admin/systems/services/spam/class_goSpamServer.inc
+--- gosa.const/mail/admin/systems/services/spam/class_goSpamServer.inc 2010-07-30 18:12:29.000000000 +0200
++++ gosa/mail/admin/systems/services/spam/class_goSpamServer.inc 2016-06-01 12:36:40.739021908 +0200
+@@ -35,7 +35,7 @@
+ var $acl = NULL;
+ var $view_logged =FALSE;
+
+- function gospamserver(&$config,$dn, $parent= NULL)
++ function __construct(&$config,$dn, $parent= NULL)
+ {
+ /* Init class */
+ goService::goService($config,$dn, $parent);
+diff -ru gosa.const/mail/admin/systems/services/spam/class_goSpamServerRule.inc gosa/mail/admin/systems/services/spam/class_goSpamServerRule.inc
+--- gosa.const/mail/admin/systems/services/spam/class_goSpamServerRule.inc 2010-07-26 17:47:25.000000000 +0200
++++ gosa/mail/admin/systems/services/spam/class_goSpamServerRule.inc 2016-06-01 12:36:40.739021908 +0200
+@@ -8,7 +8,7 @@
+ var $orig_name = "";
+ var $view_logged =FALSE;
+
+- function goSpamServerRule(&$config,$dn,$name = "",$rule ="")
++ function __construct(&$config,$dn,$name = "",$rule ="")
+ {
+ plugin::plugin($config,$dn);
+ $this->name = $this->orig_name= $name;
+diff -ru gosa.const/mail/admin/systems/services/virus/class_goVirusServer.inc gosa/mail/admin/systems/services/virus/class_goVirusServer.inc
+--- gosa.const/mail/admin/systems/services/virus/class_goVirusServer.inc 2010-07-30 18:12:29.000000000 +0200
++++ gosa/mail/admin/systems/services/virus/class_goVirusServer.inc 2016-06-01 12:36:40.739021908 +0200
+@@ -38,7 +38,7 @@
+ var $avDatabaseMirror = "";
+ var $view_logged =FALSE;
+
+- function govirusserver(&$config,$dn, $parent= NULL)
++ function __construct(&$config,$dn, $parent= NULL)
+ {
+ /* Init class */
+ goService::goService($config,$dn, $parent);
+diff -ru gosa.const/mail/personal/mail/sieve/class_My_Parser.inc gosa/mail/personal/mail/sieve/class_My_Parser.inc
+--- gosa.const/mail/personal/mail/sieve/class_My_Parser.inc 2007-03-30 12:38:57.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_My_Parser.inc 2016-06-01 12:36:40.747021879 +0200
+@@ -12,7 +12,7 @@
+ var $parent = NULL;
+ var $registeredExtensions_ =array();
+
+- function My_Parser($parent)
++ function __construct($parent)
+ {
+ $this->registeredExtensions_ = array();
+ $this->parent = $parent;
+diff -ru gosa.const/mail/personal/mail/sieve/class_My_Tree.inc gosa/mail/personal/mail/sieve/class_My_Tree.inc
+--- gosa.const/mail/personal/mail/sieve/class_My_Tree.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_My_Tree.inc 2016-06-01 12:36:40.759021837 +0200
+@@ -15,7 +15,7 @@
+ var $pap = array();
+ var $parent = NULL;
+
+- function My_Tree(&$root,$parent)
++ function __construct(&$root,$parent)
+ {
+ $this->parent = $parent;
+ $this->_construct($root);
+diff -ru gosa.const/mail/personal/mail/sieve/class_scanner.inc gosa/mail/personal/mail/sieve/class_scanner.inc
+--- gosa.const/mail/personal/mail/sieve/class_scanner.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_scanner.inc 2016-06-01 12:36:40.763021823 +0200
+@@ -2,7 +2,7 @@
+
+ class Scanner
+ {
+- function Scanner(&$script)
++ function __construct(&$script)
+ {
+ $this->_construct($script);
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_semantics.inc gosa/mail/personal/mail/sieve/class_semantics.inc
+--- gosa.const/mail/personal/mail/sieve/class_semantics.inc 2010-01-26 10:40:08.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_semantics.inc 2016-06-01 12:36:40.771021794 +0200
+@@ -16,7 +16,7 @@
+ var $testCommands_ = '(address|envelope|header|size|allof|anyof|exists|not|true|false)';
+ var $requireStrings_ = '(envelope|fileinto|reject|vacation|relational|subaddress|regex|imapflags|copy)';
+
+- function Semantics($command)
++ function __construct($command)
+ {
+ $this->command_ = $command;
+ $this->unknown = false;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_End.inc gosa/mail/personal/mail/sieve/class_sieveElement_Block_End.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_End.inc 2007-03-21 09:14:18.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Block_End.inc 2016-06-01 12:36:40.767021808 +0200
+@@ -4,7 +4,7 @@
+ {
+ var $object_id= -1;
+
+- function sieve_block_end($data = NULL,$object_id)
++ function __construct($data = NULL,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc gosa/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc 2007-03-21 09:14:18.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc 2016-06-01 12:36:40.755021851 +0200
+@@ -4,7 +4,7 @@
+ {
+ var $object_id= -1;
+
+- function sieve_block_start($data = NULL,$object_id)
++ function __construct($data = NULL,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Comment.inc gosa/mail/personal/mail/sieve/class_sieveElement_Comment.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Comment.inc 2007-09-19 17:47:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Comment.inc 2016-06-01 12:36:40.763021823 +0200
+@@ -13,7 +13,7 @@
+ return($str);
+ }
+
+- function sieve_comment($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Discard.inc gosa/mail/personal/mail/sieve/class_sieveElement_Discard.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Discard.inc 2007-03-22 15:17:23.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Discard.inc 2016-06-01 12:36:40.751021865 +0200
+@@ -5,7 +5,7 @@
+ var $data = array();
+ var $object_id = -1;
+
+- function sieve_discard($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc gosa/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc 2007-03-22 15:17:23.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc 2016-06-01 12:36:40.755021851 +0200
+@@ -15,7 +15,7 @@
+ return(array());
+ }
+
+- function sieve_else($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc gosa/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc 2007-09-19 17:47:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc 2016-06-01 12:36:40.755021851 +0200
+@@ -33,7 +33,7 @@
+ }
+ }
+
+- function sieve_fileinto($data,$object_id,$parent)
++ function __construct($data,$object_id,$parent)
+ {
+ $this->object_id = $object_id;
+ $this->parent = $parent;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_If.inc gosa/mail/personal/mail/sieve/class_sieveElement_If.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_If.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_If.inc 2016-06-01 12:36:40.767021808 +0200
+@@ -17,7 +17,7 @@
+ * $elements contains all tokens that belongs to this if/else tag
+ * $object_id cotains an unique tag id, to be able to create uniqe html post names
+ */
+- function sieve_if($elements,$object_id,$parent)
++ function __construct($elements,$object_id,$parent)
+ {
+ $this->parent = $parent;
+ $this->object_id = $object_id;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Keep.inc gosa/mail/personal/mail/sieve/class_sieveElement_Keep.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Keep.inc 2007-03-22 15:17:23.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Keep.inc 2016-06-01 12:36:40.755021851 +0200
+@@ -5,7 +5,7 @@
+ {
+ var $object_id = -1;
+
+- function sieve_keep($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Redirect.inc gosa/mail/personal/mail/sieve/class_sieveElement_Redirect.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Redirect.inc 2008-01-10 13:54:47.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Redirect.inc 2016-06-01 12:36:40.763021823 +0200
+@@ -27,7 +27,7 @@
+ return($msgs);
+ }
+
+- function sieve_redirect($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Reject.inc gosa/mail/personal/mail/sieve/class_sieveElement_Reject.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Reject.inc 2007-09-19 17:47:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Reject.inc 2016-06-01 12:36:40.771021794 +0200
+@@ -23,7 +23,7 @@
+ return($msgs);
+ }
+
+- function sieve_reject($data,$object_id,$parent)
++ function __construct($data,$object_id,$parent)
+ {
+ $this->object_id = $object_id;
+ $this->parent = $parent;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Require.inc gosa/mail/personal/mail/sieve/class_sieveElement_Require.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Require.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Require.inc 2016-06-01 12:36:40.751021865 +0200
+@@ -7,7 +7,7 @@
+ var $parent = NULL;
+ var $skip_save_object =FALSE;
+
+- function sieve_require($data,$object_id,$parent)
++ function __construct($data,$object_id,$parent)
+ {
+ $this->parent = $parent;
+ $this->object_id = $object_id;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Stop.inc gosa/mail/personal/mail/sieve/class_sieveElement_Stop.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Stop.inc 2007-03-22 15:17:23.000000000 +0100
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Stop.inc 2016-06-01 12:36:40.767021808 +0200
+@@ -5,7 +5,7 @@
+ {
+ var $object_id = -1;
+
+- function sieve_stop($data,$object_id)
++ function __construct($data,$object_id)
+ {
+ $this->object_id = $object_id;
+ }
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Vacation.inc gosa/mail/personal/mail/sieve/class_sieveElement_Vacation.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveElement_Vacation.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveElement_Vacation.inc 2016-06-01 12:36:40.751021865 +0200
+@@ -13,7 +13,7 @@
+ var $Expert = FALSE;
+ var $parent = NULL;
+
+- function sieve_vacation($data,$object_id,$parent)
++ function __construct($data,$object_id,$parent)
+ {
+ $this->parent = $parent;
+ $this->object_id = $object_id;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieve.inc gosa/mail/personal/mail/sieve/class_sieve.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieve.inc 2012-05-02 11:46:29.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieve.inc 2016-06-01 12:36:40.759021837 +0200
+@@ -200,7 +200,7 @@
+ } /* end else */
+ } /* end get_response() */
+
+- function sieve($host, $port, $user, $pass, $auth="",$options ="", $auth_types="PLAIN DIGEST-MD5")
++ function __construct($host, $port, $user, $pass, $auth="",$options ="", $auth_types="PLAIN DIGEST-MD5")
+ {
+ $this->host=$host;
+ $this->port=$port;
+diff -ru gosa.const/mail/personal/mail/sieve/class_sieveManagement.inc gosa/mail/personal/mail/sieve/class_sieveManagement.inc
+--- gosa.const/mail/personal/mail/sieve/class_sieveManagement.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_sieveManagement.inc 2016-06-01 12:36:40.747021879 +0200
+@@ -60,7 +60,7 @@
+ /* Initialize the class and load all sieve scripts
+ * try to parse them and display errors
+ */
+- function sieveManagement(&$config,$dn,&$parent,$uattrib)
++ function __construct(&$config,$dn,&$parent,$uattrib)
+ {
+ /* Check given parameter */
+ if(!isset($parent->$uattrib)){
+diff -ru gosa.const/mail/personal/mail/sieve/class_tree.inc gosa/mail/personal/mail/sieve/class_tree.inc
+--- gosa.const/mail/personal/mail/sieve/class_tree.inc 2007-09-19 17:47:12.000000000 +0200
++++ gosa/mail/personal/mail/sieve/class_tree.inc 2016-06-01 12:36:40.759021837 +0200
+@@ -9,7 +9,7 @@
+ var $dumpFn_;
+ var $dump_;
+
+- function Tree(&$root)
++ function __construct(&$root)
+ {
+ $this->_construct($root);
+ }
+diff -ru gosa.const/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc gosa/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc
+--- gosa.const/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc 2016-06-01 12:36:40.779021766 +0200
+@@ -52,7 +52,7 @@
+ @param String The object dn we are currently editing.
+ @param Object The parent object.
+ */
+- public function goKrbServer(&$config,$dn,$parent)
++ public function __construct(&$config,$dn,$parent)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Kerberos service");
+diff -ru gosa.const/nagios/personal/nagios/class_nagiosAccount.inc gosa/nagios/personal/nagios/class_nagiosAccount.inc
+--- gosa.const/nagios/personal/nagios/class_nagiosAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/nagios/personal/nagios/class_nagiosAccount.inc 2016-06-01 12:36:40.783021752 +0200
+@@ -59,7 +59,7 @@
+
+ /* constructor, if 'dn' is set, the node loads the given
+ 'dn' from LDAP */
+- function nagiosAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* Configuration is fine, allways */
+ $this->config= $config;
+diff -ru gosa.const/netatalk/personal/netatalk/class_netatalk.inc gosa/netatalk/personal/netatalk/class_netatalk.inc
+--- gosa.const/netatalk/personal/netatalk/class_netatalk.inc 2011-04-11 10:34:18.000000000 +0200
++++ gosa/netatalk/personal/netatalk/class_netatalk.inc 2016-06-01 12:36:40.783021752 +0200
+@@ -69,7 +69,7 @@
+ var $uid ="";
+
+ /* The constructor just saves a copy of the config. You may add what ever you need. */
+- function netatalk(&$config, $dn = NULL)
++ function __construct(&$config, $dn = NULL)
+ {
+
+ /* Include config object */
+diff -ru gosa.const/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc gosa/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc
+--- gosa.const/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc 2016-06-01 12:36:40.787021737 +0200
+@@ -35,7 +35,7 @@
+ var $view_logged = FALSE;
+ var $uid = "";
+
+- function opengwAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/opengroupware/personal/connectivity/opengroupware/class_opengw.inc gosa/opengroupware/personal/connectivity/opengroupware/class_opengw.inc
+--- gosa.const/opengroupware/personal/connectivity/opengroupware/class_opengw.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/opengroupware/personal/connectivity/opengroupware/class_opengw.inc 2016-06-01 12:36:40.787021737 +0200
+@@ -24,7 +24,7 @@
+ var $option = "";
+ var $connected = false;
+
+- function ogw($username,$password,$host,$db)
++ function __construct($username,$password,$host,$db)
+ {
+ $this->ogo = new pgre_sql($username,$password,$host,$db);
+
+diff -ru gosa.const/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc gosa/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc
+--- gosa.const/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc 2008-10-09 09:04:21.000000000 +0200
++++ gosa/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc 2016-06-01 12:36:40.787021737 +0200
+@@ -10,7 +10,7 @@
+ var $pwd;
+ var $is_connected = false;
+
+- function pgre_sql($user,$pwd,$server,$db)
++ function __construct($user,$pwd,$server,$db)
+ {
+ $this->user = $user;
+ $this->pwd = $pwd;
+diff -ru gosa.const/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc gosa/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
+--- gosa.const/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc 2010-12-01 11:09:24.000000000 +0100
++++ gosa/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc 2016-06-01 12:36:40.791021723 +0200
+@@ -42,7 +42,7 @@
+ var $uid ="";
+ var $parent = NULL;
+
+- function oxchangeAccount (&$config, $dn= NULL,&$parent)
++ function __construct(&$config, $dn= NULL,&$parent)
+ {
+ plugin::plugin ($config, $dn,$parent);
+ $this->parent = &$parent;
+Only in gosa: .pc
+diff -ru gosa.const/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc gosa/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc
+--- gosa.const/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc 2016-06-01 12:36:40.807021667 +0200
+@@ -20,7 +20,7 @@
+
+ var $multiple_support = TRUE;
+
+- function phpgwAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc gosa/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc
+--- gosa.const/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc 2010-12-01 11:09:32.000000000 +0100
++++ gosa/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc 2016-06-01 12:36:40.807021667 +0200
+@@ -33,7 +33,7 @@
+ var $ReadOnly =false;
+ var $view_logged = FALSE;
+
+- function phpscheduleitAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+ }
+diff -ru gosa.const/pptp/personal/connectivity/pptp/class_pptpAccount.inc gosa/pptp/personal/connectivity/pptp/class_pptpAccount.inc
+--- gosa.const/pptp/personal/connectivity/pptp/class_pptpAccount.inc 2010-12-01 11:09:50.000000000 +0100
++++ gosa/pptp/personal/connectivity/pptp/class_pptpAccount.inc 2016-06-01 12:36:40.811021652 +0200
+@@ -34,7 +34,7 @@
+ var $view_logged = FALSE;
+ var $uid ="";
+
+- function pptpAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc gosa/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc
+--- gosa.const/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc 2016-06-01 12:36:40.811021652 +0200
+@@ -28,7 +28,7 @@
+
+ var $multiple_support=TRUE;
+
+- function pureftpdAccount (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/rsyslog/addons/rsyslog/class_rsyslog.inc gosa/rsyslog/addons/rsyslog/class_rsyslog.inc
+--- gosa.const/rsyslog/addons/rsyslog/class_rsyslog.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/rsyslog/addons/rsyslog/class_rsyslog.inc 2016-06-01 12:36:40.819021624 +0200
+@@ -21,7 +21,7 @@
+ var $limits = array(20,50,100,200,500,1000,'-');
+ var $page = 0;
+
+- function rsyslog (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ $this->initTime = microtime(TRUE);
+
+diff -ru gosa.const/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc gosa/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+--- gosa.const/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc 2016-06-01 12:36:40.815021638 +0200
+@@ -23,7 +23,7 @@
+ var $view_logged = FALSE;
+
+
+- function rSyslogServer(&$config,$dn)
++ function __construct(&$config,$dn)
+ {
+ goService::goService($config,$dn);
+ $this->DisplayName = _("Logging");
+diff -ru gosa.const/samba/admin/systems/samba/class_winGeneric.inc gosa/samba/admin/systems/samba/class_winGeneric.inc
+--- gosa.const/samba/admin/systems/samba/class_winGeneric.inc 2011-04-11 14:02:06.000000000 +0200
++++ gosa/samba/admin/systems/samba/class_winGeneric.inc 2016-06-01 12:36:40.819021624 +0200
+@@ -46,7 +46,7 @@
+
+ var $view_logged = FALSE;
+
+- function wingeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+ $this->netConfigDNS = new termDNS($this->config,$this,$this->objectclasses,FALSE,"uid");
+diff -ru gosa.const/samba/admin/systems/samba/tabs_winstation.inc gosa/samba/admin/systems/samba/tabs_winstation.inc
+--- gosa.const/samba/admin/systems/samba/tabs_winstation.inc 2009-08-26 10:02:49.000000000 +0200
++++ gosa/samba/admin/systems/samba/tabs_winstation.inc 2016-06-01 12:36:40.819021624 +0200
+@@ -3,7 +3,7 @@
+ class wintabs extends tabs
+ {
+
+- function wintabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs , $hide_acls);
+
+diff -ru gosa.const/samba/personal/samba/class_sambaAccount.inc gosa/samba/personal/samba/class_sambaAccount.inc
+--- gosa.const/samba/personal/samba/class_sambaAccount.inc 2011-11-21 10:07:59.000000000 +0100
++++ gosa/samba/personal/samba/class_sambaAccount.inc 2016-06-01 12:36:40.827021596 +0200
+@@ -92,7 +92,7 @@
+ var $multiple_sambaUserWorkstations = array();
+
+
+- function sambaAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+
+ plugin::plugin ($config, $dn);
+diff -ru gosa.const/samba/personal/samba/class_sambaLogonHours.inc gosa/samba/personal/samba/class_sambaLogonHours.inc
+--- gosa.const/samba/personal/samba/class_sambaLogonHours.inc 2010-04-28 14:06:39.000000000 +0200
++++ gosa/samba/personal/samba/class_sambaLogonHours.inc 2016-06-01 12:36:40.823021610 +0200
+@@ -10,7 +10,7 @@
+ var $config;
+ var $acl;
+
+- function sambaLogonHours (&$config, $dn, $slh, $acl = 'rw')
++ function __construct(&$config, $dn, $slh, $acl = 'rw')
+ {
+ plugin::plugin($config,$dn);
+ $this->sambaLogonHours = $slh;
+diff -ru gosa.const/scalix/personal/scalix/class_scalixAccount.inc gosa/scalix/personal/scalix/class_scalixAccount.inc
+--- gosa.const/scalix/personal/scalix/class_scalixAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/scalix/personal/scalix/class_scalixAccount.inc 2016-06-01 12:36:40.827021596 +0200
+@@ -60,7 +60,7 @@
+
+ /* constructor, if 'dn' is set, the node loads the given
+ 'dn' from LDAP */
+- function scalixAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ /* dn shouldn't be NULL */
+ if($dn === NULL){
+diff -ru gosa.const/squid/personal/connectivity/squid/class_proxyAccount.inc gosa/squid/personal/connectivity/squid/class_proxyAccount.inc
+--- gosa.const/squid/personal/connectivity/squid/class_proxyAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/squid/personal/connectivity/squid/class_proxyAccount.inc 2016-06-01 12:36:40.827021596 +0200
+@@ -27,7 +27,7 @@
+ @param $config GOsa configuration object
+ @param $dn Object dn
+ */
+- public function proxyAccount (&$config, $dn= NULL)
++ public function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/ssh/personal/ssh/class_sshPublicKey.inc gosa/ssh/personal/ssh/class_sshPublicKey.inc
+--- gosa.const/ssh/personal/ssh/class_sshPublicKey.inc 2010-11-17 10:16:13.000000000 +0100
++++ gosa/ssh/personal/ssh/class_sshPublicKey.inc 2016-06-01 12:36:40.831021581 +0200
+@@ -31,7 +31,7 @@
+ var $enabled= false;
+ var $acl;
+
+- function sshPublicKey(&$config, $dn, $acl)
++ function __construct(&$config, $dn, $acl)
+ {
+ /* Configuration is fine, allways */
+ $this->initTime = microtime(TRUE);
+diff -ru gosa.const/sudo/admin/sudo/class_sudoGeneric.inc gosa/sudo/admin/sudo/class_sudoGeneric.inc
+--- gosa.const/sudo/admin/sudo/class_sudoGeneric.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/sudo/admin/sudo/class_sudoGeneric.inc 2016-06-01 12:36:40.835021567 +0200
+@@ -61,7 +61,7 @@
+ @param String $db "new" or the sudo role dn.
+ @return .
+ */
+- function sudo(&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/sudo/admin/sudo/class_sudoOption.inc gosa/sudo/admin/sudo/class_sudoOption.inc
+--- gosa.const/sudo/admin/sudo/class_sudoOption.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/sudo/admin/sudo/class_sudoOption.inc 2016-06-01 12:36:40.831021581 +0200
+@@ -36,7 +36,7 @@
+ @param Object $config The GOsa configuration object.
+ @param String $dn The object dn.
+ */
+- function sudoOption(&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
+diff -ru gosa.const/sudo/admin/sudo/tabs_sudo.inc gosa/sudo/admin/sudo/tabs_sudo.inc
+--- gosa.const/sudo/admin/sudo/tabs_sudo.inc 2010-07-29 15:54:54.000000000 +0200
++++ gosa/sudo/admin/sudo/tabs_sudo.inc 2016-06-01 12:36:40.831021581 +0200
+@@ -22,7 +22,7 @@
+
+ class sudotabs extends tabs
+ {
+- function sudotabs($config, $data, $dn)
++ function __construct($config, $data, $dn)
+ {
+ tabs::tabs($config, $data, $dn,"sudo");
+ $this->addSpecialTabs();
+diff -ru gosa.const/systems/admin/systems/class_componentGeneric.inc gosa/systems/admin/systems/class_componentGeneric.inc
+--- gosa.const/systems/admin/systems/class_componentGeneric.inc 2012-01-16 10:01:35.000000000 +0100
++++ gosa/systems/admin/systems/class_componentGeneric.inc 2016-06-01 12:36:40.855021496 +0200
+@@ -41,7 +41,7 @@
+ var $view_logged = FALSE;
+ var $baseSelector;
+
+- function componentGeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ plugin::plugin ($config, $dn, $parent);
+
+diff -ru gosa.const/systems/admin/systems/class_servGeneric.inc gosa/systems/admin/systems/class_servGeneric.inc
+--- gosa.const/systems/admin/systems/class_servGeneric.inc 2012-01-16 10:00:07.000000000 +0100
++++ gosa/systems/admin/systems/class_servGeneric.inc 2016-06-01 12:36:40.847021525 +0200
+@@ -67,7 +67,7 @@
+ "sysinfo" => "sysinfo");
+
+
+- function servgeneric (&$config, $dn= NULL, $parent= NULL)
++ function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+ /* Check if FAI is activated */
+ $this->fai_activated = $config->pluginEnabled("faiManagement");
+diff -ru gosa.const/systems/admin/systems/class_termDNS.inc gosa/systems/admin/systems/class_termDNS.inc
+--- gosa.const/systems/admin/systems/class_termDNS.inc 2012-01-12 10:36:53.000000000 +0100
++++ gosa/systems/admin/systems/class_termDNS.inc 2016-06-01 12:36:40.843021539 +0200
+@@ -73,7 +73,7 @@
+
+ /* Terminal dns
+ */
+- function termDNS (&$config, $parent,$objectClasses,$IPisMust = false,$namingAttr = "cn")
++ function __construct(&$config, $parent,$objectClasses,$IPisMust = false,$namingAttr = "cn")
+ {
+ /* We need to know which objectClasses are used, to store the ip/mac
+ * Because of different type of devices
+diff -ru gosa.const/systems/admin/systems/services/class_goService.inc gosa/systems/admin/systems/services/class_goService.inc
+--- gosa.const/systems/admin/systems/services/class_goService.inc 2010-07-26 17:46:29.000000000 +0200
++++ gosa/systems/admin/systems/services/class_goService.inc 2016-06-01 12:36:40.843021539 +0200
+@@ -38,7 +38,7 @@
+ var $krb_host_key = NULL;
+
+ /* Construcktion */
+- function goService(&$config,$dn,$parent = NULL)
++ function __construct(&$config,$dn,$parent = NULL)
+ {
+ plugin::plugin($config,$dn);
+ $this->DisplayName = _("Empty service");
+diff -ru gosa.const/systems/admin/systems/tabs_component.inc gosa/systems/admin/systems/tabs_component.inc
+--- gosa.const/systems/admin/systems/tabs_component.inc 2010-07-29 15:55:08.000000000 +0200
++++ gosa/systems/admin/systems/tabs_component.inc 2016-06-01 12:36:40.851021511 +0200
+@@ -23,7 +23,7 @@
+ class componenttabs extends tabs
+ {
+
+- function componenttabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
+
+diff -ru gosa.const/systems/admin/systems/tabs_server.inc gosa/systems/admin/systems/tabs_server.inc
+--- gosa.const/systems/admin/systems/tabs_server.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/systems/admin/systems/tabs_server.inc 2016-06-01 12:36:40.851021511 +0200
+@@ -24,7 +24,7 @@
+ {
+ public $was_activated = FALSE;
+
+- function servtabs($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
++ function __construct($config, $data, $dn,$category,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+ /* Save dn */
+ $this->dn= $dn;
+diff -ru gosa.const/webdav/personal/connectivity/webdav/class_webdavAccount.inc gosa/webdav/personal/connectivity/webdav/class_webdavAccount.inc
+--- gosa.const/webdav/personal/connectivity/webdav/class_webdavAccount.inc 2011-07-27 10:00:12.000000000 +0200
++++ gosa/webdav/personal/connectivity/webdav/class_webdavAccount.inc 2016-06-01 12:36:40.855021496 +0200
+@@ -15,7 +15,7 @@
+
+ var $multiple_support =TRUE;
+
+- function webdavAccount (&$config, $dn= NULL)
++ function __construct(&$config, $dn= NULL)
+ {
+ plugin::plugin ($config, $dn);
+
diff --git a/debian/patches/series b/debian/patches/series
index 7726936..4c63ef6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,6 +30,7 @@
1023_check-smbhash-creation-for-base64-encoded-pws.patch
1024_dont-overescape-dollar-signs-in-smb-passwords.patch
1025_fix-with-smarty-3-1-29.patch
+1026_fix-deprecated-constructor-format.patch
2001_fix-smarty-location.patch
2002_fix-template-location.patch
2003_fix-class-mapping.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git
More information about the debian-edu-commits
mailing list