[debian-edu-commits] debian-edu/pkg-team/ 02/03: debian/patches: Fix 1026_fix-deprecated-constructor-format.patch. Additionally patch occurrences of <class>::<class>(...) with <class>::_construct().
Mike Gabriel
sunweaver at debian.org
Thu Jun 2 18:35:18 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 e5da95e35f5a28c11a73c28e08a9bb33c78401d4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Jun 2 20:33:13 2016 +0200
debian/patches: Fix 1026_fix-deprecated-constructor-format.patch. Additionally patch occurrences of <class>::<class>(...) with <class>::_construct().
---
.../1026_fix-deprecated-constructor-format.patch | 2409 ++++++++++++--------
1 file changed, 1486 insertions(+), 923 deletions(-)
diff --git a/debian/patches/1026_fix-deprecated-constructor-format.patch b/debian/patches/1026_fix-deprecated-constructor-format.patch
index 1d63e28..710be06 100644
--- a/debian/patches/1026_fix-deprecated-constructor-format.patch
+++ b/debian/patches/1026_fix-deprecated-constructor-format.patch
@@ -3,33 +3,36 @@ 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 @@
+--- a/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc
++++ b/apache2/admin/systems/services/apache2/class_servApacheEditVhost.inc
+@@ -52,9 +52,9 @@
var $VhostObject = array();
- function servapacheVhostEdit ($config, $dn= NULL,$attrs = array())
+ function __construct($config, $dn= NULL,$attrs = array())
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->OldApacheServerName = "";
+ $this->isNew = true;
+--- a/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
++++ b/apache2/admin/systems/services/apache2/class_servApacheVhost.inc
+@@ -38,9 +38,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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
+ $this->orig_dn = $dn;
+
+--- a/connectivity/personal/connectivity/class_connectivity.inc
++++ b/connectivity/personal/connectivity/class_connectivity.inc
@@ -27,7 +27,7 @@
var $multiple_support = TRUE;
@@ -39,22 +42,22 @@ diff -ru gosa.const/connectivity/personal/connectivity/class_connectivity.inc go
{
/* 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 @@
+--- a/connectivity/personal/connectivity/class_intranetAccount.inc
++++ b/connectivity/personal/connectivity/class_intranetAccount.inc
+@@ -36,9 +36,9 @@
\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);
+- plugin::plugin ($config, $dn,$parent);
++ plugin::__construct ($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
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
@@ -32,7 +32,7 @@
var $objectclasses= array();
var $parent;
@@ -64,10 +67,9 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc gosa
{
/* 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 @@
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc
+@@ -23,10 +23,10 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpClass', 'dhcpOptions');
@@ -75,11 +77,14 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpClass.inc gosa/dh
+ 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 @@
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($parent,$attrs);
+ }
+
+ function execute()
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc
+@@ -34,10 +34,10 @@
var $objectclasses= array("top", "dhcpDnsZone");
@@ -87,11 +92,14 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpDnsZone.inc gosa/
+ 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 @@
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($parent,$attrs);
+
+ /* Load attributes */
+ if (!$this->new){
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
+@@ -23,10 +23,10 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpGroup', 'dhcpOptions');
@@ -99,22 +107,27 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc gosa/dh
+ 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 @@
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($parent,$attrs);
+ }
+
+ function execute()
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
+@@ -27,9 +27,9 @@
/* 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);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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
+ /* Load attributes */
+ if (!$this->new){
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
@@ -28,7 +28,7 @@
var $attributes= array();
var $objectclasses= array();
@@ -124,9 +137,8 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc gosa/
{
/* 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
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.inc
@@ -23,7 +23,7 @@
@@ -136,9 +148,8 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpNewSectionDialog.
{
$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
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
@@ -34,7 +34,7 @@
var $attributes= array();
var $objectclasses= array();
@@ -148,46 +159,51 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc gosa/d
{
$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 @@
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
+@@ -28,9 +28,9 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpPool');
- function dhcpPool($parent,$attrs)
+ function __construct($parent,$attrs)
{
- dhcpPlugin::dhcpPlugin($parent,$attrs);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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 @@
+ /* Load attributes */
+ if (!$this->new){
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
+@@ -29,9 +29,9 @@
var $objectclasses= array('top', 'dhcpService');
- function dhcpService($parent,$attrs)
+ function __construct($parent,$attrs)
{
- dhcpPlugin::dhcpPlugin($parent,$attrs);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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 @@
+ /* Load statements / options */
+ if (!$this->new){
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
+@@ -23,9 +23,9 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpSharedNetwork');
- function dhcpSharedNetwork($parent,$attrs)
+ function __construct($parent,$attrs)
{
- dhcpPlugin::dhcpPlugin($parent,$attrs);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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 @@
+ $this->advanced->setAutoStatements(array("server-identifier", "default-lease-time",
+ "max-lease-time", "min-lease-time", "authoritative", "deny unknown-clients",
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc
+@@ -23,10 +23,10 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpSubClass', 'dhcpOptions');
@@ -195,83 +211,98 @@ diff -ru gosa.const/dhcp/admin/systems/services/dhcp/class_dhcpSubClass.inc gosa
+ 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 @@
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($parent,$attrs);
+ }
+
+ function execute()
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
+@@ -30,9 +30,9 @@
/* attribute list for save action */
var $objectclasses= array('top', 'dhcpSubnet', 'dhcpOptions');
- function dhcpSubnet($parent,$attrs)
+ function __construct($parent,$attrs)
{
- dhcpPlugin::dhcpPlugin($parent,$attrs);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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 @@
+ if (!$this->new){
+ /* Load attributes */
+--- a/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
++++ b/dhcp/admin/systems/services/dhcp/class_dhcpTSigKey.inc
+@@ -27,9 +27,9 @@
/* attribute list for save action */
var $objectclasses= array("top", "dhcpTSigKey");
- function dhcpTSigKey($parent,$attrs)
+ function __construct($parent,$attrs)
{
- dhcpPlugin::dhcpPlugin($parent,$attrs);
+- dhcpPlugin::dhcpPlugin($parent,$attrs);
++ dhcpPlugin::__construct($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 @@
+ /* Load attributes */
+ if (!$this->new){
+--- a/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
++++ b/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+@@ -26,9 +26,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->serviceDN = "cn=dhcp,".$dn;
+ $this->orig_dn = $dn;
+--- a/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
++++ b/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc
+@@ -17,9 +17,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* Initialise class
+ */
+--- a/dns/admin/systems/services/dns/class_servDNSeditZone.inc
++++ b/dns/admin/systems/services/dns/class_servDNSeditZone.inc
+@@ -41,9 +41,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* All types with required attrs */
+ $this->RecordTypes = DNS::getDnsRecordTypes(true);
+--- a/dns/admin/systems/services/dns/class_servDNS.inc
++++ b/dns/admin/systems/services/dns/class_servDNS.inc
+@@ -24,9 +24,9 @@
var $take_over_id = -1;
- function servdns (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn, $parent);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->DisplayName = _("DNS service");
+
+--- a/fai/admin/fai/class_askClassName.inc
++++ b/fai/admin/fai/class_askClassName.inc
+@@ -13,11 +13,11 @@
var $ClassAlreadyExists = false;
var $parent;
@@ -280,9 +311,13 @@ diff -ru gosa.const/fai/admin/fai/class_askClassName.inc gosa/fai/admin/fai/clas
{
$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
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+ }
+
+ function execute()
+--- a/fai/admin/fai/class_debconfTemplate.inc
++++ b/fai/admin/fai/class_debconfTemplate.inc
@@ -8,7 +8,7 @@
var $template= array();
@@ -292,34 +327,37 @@ diff -ru gosa.const/fai/admin/fai/class_debconfTemplate.inc gosa/fai/admin/fai/c
{
$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 @@
+--- a/fai/admin/fai/class_faiDiskEntry.inc
++++ b/fai/admin/fai/class_faiDiskEntry.inc
+@@ -26,9 +26,9 @@
var $lvmDevices = array();
- function faiDiskEntry (&$config, $dn= NULL,$parent,$disk,$type)
+ function __construct(&$config, $dn= NULL,$parent,$disk,$type)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ // Set default attributes
+ $this->parent = $parent;
+--- a/fai/admin/fai/class_faiHookEntry.inc
++++ b/fai/admin/fai/class_faiHookEntry.inc
+@@ -27,9 +27,9 @@
var $write_protect = FALSE;
- function faiHookEntry (&$config, $dn= NULL,$object=false)
+ function __construct(&$config, $dn= NULL,$object=false)
{
- plugin::plugin ($config, NULL);
+- plugin::plugin ($config, NULL);
++ plugin::__construct ($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 @@
+ $this->orig_cn= $object['cn'];
+ $this->dn=$object['dn'];
+--- a/fai/admin/fai/class_faiHook.inc
++++ b/fai/admin/fai/class_faiHook.inc
+@@ -33,10 +33,10 @@
var $FAIstate = "";
var $ui;
@@ -327,23 +365,28 @@ diff -ru gosa.const/fai/admin/fai/class_faiHook.inc gosa/fai/admin/fai/class_fai
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* If "dn==new" we try to create a new entry
+ * Else we must read all objects from ldap which belong to this entry.
+--- a/fai/admin/fai/class_faiPackageConfiguration.inc
++++ b/fai/admin/fai/class_faiPackageConfiguration.inc
+@@ -20,9 +20,9 @@
@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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->release = $release;
+ $this->pkg_config = $pkg_config;
+--- a/fai/admin/fai/class_faiPackage.inc
++++ b/fai/admin/fai/class_faiPackage.inc
+@@ -55,10 +55,10 @@
"pending", "dpkgc" );
@@ -351,23 +394,28 @@ diff -ru gosa.const/fai/admin/fai/class_faiPackage.inc gosa/fai/admin/fai/class_
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* If "dn==new" we try to create a new entry
+ * Else we must read all objects from ldap which belong to this entry.
+--- a/fai/admin/fai/class_faiPartitionTableEntry.inc
++++ b/fai/admin/fai/class_faiPartitionTableEntry.inc
+@@ -16,9 +16,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ "FAImountOptions","FAIfsOptions","FAIpartitionFlags");
+
+--- a/fai/admin/fai/class_faiPartitionTable.inc
++++ b/fai/admin/fai/class_faiPartitionTable.inc
+@@ -25,10 +25,10 @@
var $view_logged = FALSE;
@@ -375,11 +423,14 @@ diff -ru gosa.const/fai/admin/fai/class_faiPartitionTable.inc gosa/fai/admin/fai
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* If "dn==new" we try to create a new entry
+ * Else we must read all objects from ldap which belong to this entry.
+--- a/fai/admin/fai/class_faiProfile.inc
++++ b/fai/admin/fai/class_faiProfile.inc
+@@ -25,10 +25,10 @@
var $classSelect;
@@ -387,23 +438,28 @@ diff -ru gosa.const/fai/admin/fai/class_faiProfile.inc gosa/fai/admin/fai/class_
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+ $ldap=$this->config->get_ldap_link();
+
+ $this->ui = get_userinfo();
+--- a/fai/admin/fai/class_faiScriptEntry.inc
++++ b/fai/admin/fai/class_faiScriptEntry.inc
+@@ -23,9 +23,9 @@
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);
+- plugin::plugin ($config, NULL);
++ plugin::__construct ($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 @@
+ $this->orig_cn= $object['cn'];
+ $this->dn=$object['dn'];
+--- a/fai/admin/fai/class_faiScript.inc
++++ b/fai/admin/fai/class_faiScript.inc
+@@ -37,10 +37,10 @@
var $view_logged = FALSE;
var $ui;
@@ -411,47 +467,56 @@ diff -ru gosa.const/fai/admin/fai/class_faiScript.inc gosa/fai/admin/fai/class_f
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* If "dn==new" we try to create a new entry
+ * Else we must read all objects from ldap which belong to this entry.
+--- a/fai/admin/fai/class_faiSummaryTab.inc
++++ b/fai/admin/fai/class_faiSummaryTab.inc
+@@ -33,9 +33,9 @@
var $parent = NULL;
var $ui = NULL;
- function faiSummaryTab(&$config,$dn)//,$parent)
+ function __construct(&$config,$dn)//,$parent)
{
- plugin::plugin($config,$dn);//,$parent);
+- plugin::plugin($config,$dn);//,$parent);
++ plugin::__construct($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 @@
+ $this->ui = get_userinfo();
+
+--- a/fai/admin/fai/class_faiTemplateEdit.inc
++++ b/fai/admin/fai/class_faiTemplateEdit.inc
+@@ -13,9 +13,9 @@
var $write_protect = FALSE;
var $mb_extension = TRUE;
- function faiTemplateEdit (&$config, $dn, $value)
+ function __construct(&$config, $dn, $value)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->mb_extension = FALSE;
+ }else{
+--- a/fai/admin/fai/class_faiTemplateEntry.inc
++++ b/fai/admin/fai/class_faiTemplateEntry.inc
+@@ -23,9 +23,9 @@
var $parent = NULL;
var $FAIstate = "";
- function faiTemplateEntry (&$config, $dn= NULL,$object=false)
+ function __construct(&$config, $dn= NULL,$object=false)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ if((isset($object['cn'])) && (!empty($object['cn']))){
+ $this->orig_cn= $object['cn'];
+--- a/fai/admin/fai/class_faiTemplate.inc
++++ b/fai/admin/fai/class_faiTemplate.inc
+@@ -34,10 +34,10 @@
var $ui;
var $view_logged = FALSE;
@@ -459,23 +524,28 @@ diff -ru gosa.const/fai/admin/fai/class_faiTemplate.inc gosa/fai/admin/fai/class
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* If "dn==new" we try to create a new entry
+ * Else we must read all objects from ldap which belong to this entry.
+--- a/fai/admin/fai/class_faiVariableEntry.inc
++++ b/fai/admin/fai/class_faiVariableEntry.inc
+@@ -16,9 +16,9 @@
var $parent = NULL;
var $FAIstate = "";
- function faiVariableEntry (&$config, $dn= NULL,$object=false)
+ function __construct(&$config, $dn= NULL,$object=false)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->orig_cn= $object['cn'];
+ $this->dn=$object['dn'];
+--- a/fai/admin/fai/class_faiVariable.inc
++++ b/fai/admin/fai/class_faiVariable.inc
+@@ -33,10 +33,10 @@
var $ui ;
var $view_logged = FALSE;
@@ -483,144 +553,179 @@ diff -ru gosa.const/fai/admin/fai/class_faiVariable.inc gosa/fai/admin/fai/class
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ if($dn != "new"){
+ $this->dn =$dn;
+--- a/fai/admin/fai/tabsHook.inc
++++ b/fai/admin/fai/tabsHook.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsHook($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ # $this->addSpecialTabs();
+ }
+--- a/fai/admin/fai/tabsPackage.inc
++++ b/fai/admin/fai/tabsPackage.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsPackage($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/fai/tabsPartition.inc
++++ b/fai/admin/fai/tabsPartition.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsPartition($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/fai/tabsProfile.inc
++++ b/fai/admin/fai/tabsProfile.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsProfile($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/fai/tabsScript.inc
++++ b/fai/admin/fai/tabsScript.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsScript($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/fai/tabsTemplate.inc
++++ b/fai/admin/fai/tabsTemplate.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsTemplate($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn, $category);
+- tabs::tabs($config, $data, $dn, $category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/fai/tabsVariable.inc
++++ b/fai/admin/fai/tabsVariable.inc
+@@ -5,9 +5,9 @@
var $base= "";
var $parent ="";
- function tabsVariable($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn, $category);
+- tabs::tabs($config, $data, $dn, $category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ # $this->addSpecialTabs();
+--- a/fai/admin/systems/services/repository/class_servRepository.inc
++++ b/fai/admin/systems/services/repository/class_servRepository.inc
+@@ -20,9 +20,9 @@
var $repositoryMangement = NULL;
- function servrepository (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn,$parent);
+- plugin::plugin ($config, $dn,$parent);
++ plugin::__construct ($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 @@
+ $this->DisplayName = _("Repository service");
+
+--- a/fai/admin/systems/services/repository/class_servRepositorySetup.inc
++++ b/fai/admin/systems/services/repository/class_servRepositorySetup.inc
+@@ -17,9 +17,9 @@
var $cn = "";
var $parent = "";
- function servRepositorySetup (&$config, $dn= NULL,$data = false)
+ function __construct(&$config, $dn= NULL,$data = false)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ if(isset($this->attrs['cn'][0])){
+ $this->cn=$this->attrs['cn'][0];
+--- a/gofax/admin/systems/services/gofax/class_goFaxServer.inc
++++ b/gofax/admin/systems/services/gofax/class_goFaxServer.inc
+@@ -24,9 +24,9 @@
var $cn = "";
var $view_logged =FALSE;
- function goFaxServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ }
+
+--- a/gofax/gofax/blocklists/class_blocklistGeneric.inc
++++ b/gofax/gofax/blocklists/class_blocklistGeneric.inc
+@@ -31,7 +31,7 @@
+
+ function __construct($config,$dn = "new")
+ {
+- plugin::plugin($config,$dn);
++ plugin::__construct($config,$dn);
+
+ /* Set default list type */
+ $this->type = BLOCK_LIST_SEND;
+--- a/gofax/gofax/blocklists/tabs_blocklist.inc
++++ b/gofax/gofax/blocklists/tabs_blocklist.inc
+@@ -2,9 +2,9 @@
class faxblocktabs extends tabs
{
- function faxblocktabs($config, $data, $dn)
+ function __construct($config, $data, $dn)
{
- tabs::tabs($config, $data, $dn, 'gofaxlist');
+- tabs::tabs($config, $data, $dn, 'gofaxlist');
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/gofax/gofax/faxaccount/class_gofaxAccount.inc
++++ b/gofax/gofax/faxaccount/class_gofaxAccount.inc
+@@ -47,10 +47,10 @@
/* Enable multiple edit support */
var $multiple_support = TRUE;
@@ -628,10 +733,13 @@ diff -ru gosa.const/gofax/gofax/faxaccount/class_gofaxAccount.inc gosa/gofax/gof
+ 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
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* Set uid, it is used in handle_post_events */
+ if(isset($this->attrs['uid'])){
+--- a/gofax/gofax/faxreports/class_faxreport.inc
++++ b/gofax/gofax/faxreports/class_faxreport.inc
@@ -41,7 +41,7 @@
var $uidToDN = array();
@@ -641,81 +749,92 @@ diff -ru gosa.const/gofax/gofax/faxreports/class_faxreport.inc gosa/gofax/gofax/
{
$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 @@
+--- a/gofon/admin/ogroups/gofon/class_phonequeue.inc
++++ b/gofon/admin/ogroups/gofon/class_phonequeue.inc
+@@ -63,9 +63,9 @@
* - Parse phone options flags
* - Get phone numbers
*/
- function phonequeue (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin($config, $dn);
+- plugin::plugin($config, $dn);
++ plugin::__construct($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 @@
+ /* Check server configurations
+ * Load all server configuration in $this->goFonHomeServers if available
+--- a/gofon/admin/systems/gofon/class_phoneGeneric.inc
++++ b/gofon/admin/systems/gofon/class_phoneGeneric.inc
+@@ -52,9 +52,9 @@
var $objectclasses= array("top", "goFonHardware");
- function phoneGeneric (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn, $parent);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->netConfigDNS->MACisMust =TRUE;
+
+--- a/gofon/admin/systems/gofon/tabs_phone.inc
++++ b/gofon/admin/systems/gofon/tabs_phone.inc
+@@ -3,9 +3,9 @@
class phonetabs extends tabs
{
- function phonetabs($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/gofon/admin/systems/services/gofon/class_goFonServer.inc
++++ b/gofon/admin/systems/services/gofon/class_goFonServer.inc
+@@ -28,9 +28,9 @@
var $orig_dn = "";
- function goFonServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+
+ $this->orig_dn = $dn;
+--- a/gofon/gofon/conference/class_phoneConferenceGeneric.inc
++++ b/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+@@ -68,9 +68,9 @@
var $orig_dn ="";
var $orig_base = "";
- function conference (&$config, $dn, $plugin= NULL)
+ function __construct(&$config, $dn, $plugin= NULL)
{
- plugin::plugin($config, $dn, $plugin);
+- plugin::plugin($config, $dn, $plugin);
++ plugin::__construct($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 @@
+ $this->ui = get_userinfo();
+ $this->orig_dn = $dn;
+--- a/gofon/gofon/conference/tabs_conference.inc
++++ b/gofon/gofon/conference/tabs_conference.inc
+@@ -4,9 +4,9 @@
{
var $base= "";
- function conferencetabs($config, $data, $dn, $category)
+ function __construct($config, $data, $dn, $category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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
+
+ /* Add references/acls/snapshots */
+--- a/gofon/gofon/fonreports/class_fonreport.inc
++++ b/gofon/gofon/fonreports/class_fonreport.inc
@@ -29,7 +29,7 @@
var $telephoneNumberToDN = array();
@@ -725,58 +844,65 @@ diff -ru gosa.const/gofon/gofon/fonreports/class_fonreport.inc gosa/gofon/gofon/
{
/* 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 @@
+--- a/gofon/gofon/macro/class_gofonMacro.inc
++++ b/gofon/gofon/macro/class_gofonMacro.inc
+@@ -47,9 +47,9 @@
//! 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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ /* This is always an account */
+ $this->is_account= TRUE;
+--- a/gofon/gofon/macro/class_gofonMacroParameters.inc
++++ b/gofon/gofon/macro/class_gofonMacroParameters.inc
+@@ -36,9 +36,9 @@
- 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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $tmp = array(); // temporary Var
+ $tmp2 = array(); // temporary Var ...
+--- a/gofon/gofon/macro/tabs_macros.inc
++++ b/gofon/gofon/macro/tabs_macros.inc
+@@ -3,9 +3,9 @@
class macrotabs extends tabs
{
- function macrotabs($config, $data, $dn,$category)
+ function __construct($config, $data, $dn,$category)
{
- tabs::tabs($config, $data, $dn,$category);
+- tabs::tabs($config, $data, $dn,$category);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/gofon/gofon/phoneaccount/class_phoneAccount.inc
++++ b/gofon/gofon/phoneaccount/class_phoneAccount.inc
+@@ -55,9 +55,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->delimiter = $this->config->get_cfg_value("phoneAccount","delimiter");
+
+--- a/gosa-core/include/class_acl.inc
++++ b/gosa-core/include/class_acl.inc
+@@ -60,10 +60,10 @@
var $roleList = NULL;
var $aclMemberList = NULL;
@@ -784,10 +910,13 @@ diff -ru gosa.const/gosa-core/include/class_acl.inc gosa/gosa-core/include/class
+ 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
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+
+ /* Load ACL's */
+ $this->gosaAclEntry= array();
+--- a/gosa-core/include/class_certificate.inc
++++ b/gosa-core/include/class_certificate.inc
@@ -34,7 +34,7 @@
var $error;
@@ -797,9 +926,8 @@ diff -ru gosa.const/gosa-core/include/class_certificate.inc gosa/gosa-core/inclu
{
$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
+--- a/gosa-core/include/class_config.inc
++++ b/gosa-core/include/class_config.inc
@@ -76,7 +76,7 @@
* \param string 'basedir' base directory
*
@@ -809,9 +937,8 @@ diff -ru gosa.const/gosa-core/include/class_config.inc gosa/gosa-core/include/cl
{
$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
+--- a/gosa-core/include/class_CopyPasteHandler.inc
++++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -44,7 +44,7 @@
@@ -821,9 +948,8 @@ diff -ru gosa.const/gosa-core/include/class_CopyPasteHandler.inc gosa/gosa-core/
{
$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
+--- a/gosa-core/include/class_filter.inc
++++ b/gosa-core/include/class_filter.inc
@@ -39,7 +39,7 @@
var $pid;
@@ -833,9 +959,17 @@ diff -ru gosa.const/gosa-core/include/class_filter.inc gosa/gosa-core/include/cl
{
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 @@
+ function load($filename)
+ {
+ $contents = file_get_contents($filename);
+- $xmlData= xml::xml2array($contents, 1);
++ $xmlData= xml::__construct2array($contents, 1);
+
+ if (!isset($xmlData['filterdef'])) {
+ return false;
+--- a/gosa-core/include/class_ldap.inc
++++ b/gosa-core/include/class_ldap.inc
@@ -55,7 +55,7 @@
var $referrals= array();
var $max_ldap_query_time = 0; // 0, empty or negative values will disable this check
@@ -845,9 +979,8 @@ diff -ru gosa.const/gosa-core/include/class_ldap.inc gosa/gosa-core/include/clas
{
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
+--- a/gosa-core/include/class_listing.inc
++++ b/gosa-core/include/class_listing.inc
@@ -58,7 +58,7 @@
var $baseSelector;
var $aclToObjectClass = array();
@@ -857,9 +990,17 @@ diff -ru gosa.const/gosa-core/include/class_listing.inc gosa/gosa-core/include/c
{
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
+@@ -162,7 +162,7 @@
+
+ function loadString($contents)
+ {
+- $this->xmlData= xml::xml2array($contents, 1);
++ $this->xmlData= xml::__construct2array($contents, 1);
+
+ if (!isset($this->xmlData['list'])) {
+ return false;
+--- a/gosa-core/include/class_log.inc
++++ b/gosa-core/include/class_log.inc
@@ -42,7 +42,7 @@
\sa log()
@@ -869,9 +1010,28 @@ diff -ru gosa.const/gosa-core/include/class_log.inc gosa/gosa-core/include/class
{
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
+--- a/gosa-core/include/class_multi_plug.inc
++++ b/gosa-core/include/class_multi_plug.inc
+@@ -54,7 +54,7 @@
+ Process:
+ ========
+
+-multi_plug::multi_plug()
++multi_plug::__construct()
+ |->o_tab = new tab() #Initialize ui handle
+ |
+ |->handles
+--- a/gosa-core/include/class_plugin.inc
++++ b/gosa-core/include/class_plugin.inc
+@@ -64,7 +64,7 @@
+ function, else the save function. Should be set to 'TRUE' if
+ the construtor detects a valid LDAP object.
+
+- \sa plugin::plugin()
++ \sa plugin::__construct()
+ */
+ var $is_account= FALSE;
+ var $initially_was_account= FALSE;
@@ -143,7 +143,7 @@
\param dn Distinguished name to initialize plugin from
\sa plugin()
@@ -881,9 +1041,8 @@ diff -ru gosa.const/gosa-core/include/class_plugin.inc gosa/gosa-core/include/cl
{
$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
+--- a/gosa-core/include/class_pluglist.inc
++++ b/gosa-core/include/class_pluglist.inc
@@ -77,7 +77,7 @@
}
@@ -893,21 +1052,22 @@ diff -ru gosa.const/gosa-core/include/class_pluglist.inc gosa/gosa-core/include/
{
$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 @@
+--- a/gosa-core/include/class_SnapShotDialog.inc
++++ b/gosa-core/include/class_SnapShotDialog.inc
+@@ -40,9 +40,9 @@
var $last_list = array();
- function SnapShotDialog(&$config, $dn, &$parent)
+ function __construct(&$config, $dn, &$parent)
{
- plugin::plugin($config,$dn);
+- plugin::plugin($config,$dn);
++ plugin::__construct($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
+ $this->ui = get_userinfo();
+
+--- a/gosa-core/include/class_SnapshotHandler.inc
++++ b/gosa-core/include/class_SnapshotHandler.inc
@@ -28,7 +28,7 @@
var $snapshotBases= array();
@@ -917,9 +1077,8 @@ diff -ru gosa.const/gosa-core/include/class_SnapshotHandler.inc gosa/gosa-core/i
{
$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
+--- a/gosa-core/include/class_sortableListing.inc
++++ b/gosa-core/include/class_sortableListing.inc
@@ -55,7 +55,7 @@
private $modified= false;
@@ -929,10 +1088,9 @@ diff -ru gosa.const/gosa-core/include/class_sortableListing.inc gosa/gosa-core/i
{
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 @@
+--- a/gosa-core/include/class_tabs.inc
++++ b/gosa-core/include/class_tabs.inc
+@@ -59,7 +59,7 @@
}
@@ -941,9 +1099,36 @@ diff -ru gosa.const/gosa-core/include/class_tabs.inc gosa/gosa-core/include/clas
{
/* 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
+--- a/gosa-core/include/class_userFilter.inc
++++ b/gosa-core/include/class_userFilter.inc
+@@ -16,13 +16,13 @@
+ */
+ static function userFilteringAvailable()
+ {
+- if(!session::is_set('userFilter::userFilteringAvailable')){
++ if(!session::is_set('userFilter::__constructingAvailable')){
+ global $config;
+ $ldap = $config->get_ldap_link();
+ $ocs = $ldap->get_objectclasses();
+- session::set('userFilter::userFilteringAvailable', isset($ocs['gosaProperties']));
++ session::set('userFilter::__constructingAvailable', isset($ocs['gosaProperties']));
+ }
+- return(session::get('userFilter::userFilteringAvailable'));
++ return(session::get('userFilter::__constructingAvailable'));
+ }
+
+
+@@ -32,7 +32,7 @@
+ {
+ // Initialize this plugin with the users dn to gather user defined filters.
+ $ui = get_userinfo();
+- plugin::plugin($config, $ui->dn);
++ plugin::__construct($config, $ui->dn);
+ $this->listing = &$listing;
+ $filter= $this->listing->getFilter();
+
+--- a/gosa-core/include/class_userinfo.inc
++++ b/gosa-core/include/class_userinfo.inc
@@ -43,7 +43,7 @@
/* get acl's an put them into the userinfo object
@@ -953,9 +1138,8 @@ diff -ru gosa.const/gosa-core/include/class_userinfo.inc gosa/gosa-core/include/
$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
+--- a/gosa-core/include/exporter/class_csvExporter.inc
++++ b/gosa-core/include/exporter/class_csvExporter.inc
@@ -4,7 +4,7 @@
{
var $result;
@@ -965,9 +1149,8 @@ diff -ru gosa.const/gosa-core/include/exporter/class_csvExporter.inc gosa/gosa-c
// 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
+--- a/gosa-core/include/exporter/class_pdfExporter.inc
++++ b/gosa-core/include/exporter/class_pdfExporter.inc
@@ -12,7 +12,7 @@
{
var $result;
@@ -977,9 +1160,8 @@ diff -ru gosa.const/gosa-core/include/exporter/class_pdfExporter.inc gosa/gosa-c
// 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
+--- a/gosa-core/include/functions_debug.inc
++++ b/gosa-core/include/functions_debug.inc
@@ -85,7 +85,7 @@
# print htmlspecialchars( stripslashes ( $_POST['array'] ) );
var $export_hash;
@@ -989,9 +1171,8 @@ diff -ru gosa.const/gosa-core/include/functions_debug.inc gosa/gosa-core/include
$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
+--- a/gosa-core/include/functions_helpviewer.inc
++++ b/gosa-core/include/functions_helpviewer.inc
@@ -27,7 +27,7 @@
var $filename;
var $entries;
@@ -1001,9 +1182,19 @@ diff -ru gosa.const/gosa-core/include/functions_helpviewer.inc gosa/gosa-core/in
{
$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
+--- a/gosa-core/include/functions.inc
++++ b/gosa-core/include/functions.inc
+@@ -974,7 +974,7 @@
+ return("");
+ }
+
+- /* Allow readonly access, the plugin::plugin will restrict the acls */
++ /* Allow readonly access, the plugin::__construct will restrict the acls */
+ if(isset($_POST['open_readonly'])) return("");
+
+ /* Get LDAP link, check for presence of the lock entry */
+--- a/gosa-core/include/password-methods/class_password-methods-clear.inc
++++ b/gosa-core/include/password-methods/class_password-methods-clear.inc
@@ -24,7 +24,7 @@
{
var $lockable = FALSE;
@@ -1013,9 +1204,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-cl
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods-crypt.inc
++++ b/gosa-core/include/password-methods/class_password-methods-crypt.inc
@@ -22,7 +22,7 @@
class passwordMethodCrypt extends passwordMethod
@@ -1025,9 +1215,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-cr
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods.inc
++++ b/gosa-core/include/password-methods/class_password-methods.inc
@@ -29,7 +29,7 @@
var $lockable = TRUE;
@@ -1037,9 +1226,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods.in
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods-md5.inc
++++ b/gosa-core/include/password-methods/class_password-methods-md5.inc
@@ -22,7 +22,7 @@
class passwordMethodMd5 extends passwordMethod
@@ -1049,9 +1237,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-md
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods-sha.inc
++++ b/gosa-core/include/password-methods/class_password-methods-sha.inc
@@ -22,7 +22,7 @@
class passwordMethodsha extends passwordMethod
@@ -1061,9 +1248,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-sh
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods-smd5.inc
++++ b/gosa-core/include/password-methods/class_password-methods-smd5.inc
@@ -22,7 +22,7 @@
class passwordMethodsmd5 extends passwordMethod
@@ -1073,9 +1259,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-sm
{
}
-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
+--- a/gosa-core/include/password-methods/class_password-methods-ssha.inc
++++ b/gosa-core/include/password-methods/class_password-methods-ssha.inc
@@ -22,7 +22,7 @@
class passwordMethodssha extends passwordMethod
@@ -1085,9 +1270,8 @@ diff -ru gosa.const/gosa-core/include/password-methods/class_password-methods-ss
{
}
-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
+--- a/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_biffwriter.inc.php
@@ -35,7 +35,7 @@
/*
* Constructor
@@ -1097,9 +1281,8 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_biffwriter.in
$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
+--- a/gosa-core/include/utils/excel/class.writeexcel_format.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_format.inc.php
@@ -63,7 +63,7 @@
/*
* Constructor
@@ -1109,9 +1292,8 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_format.inc.ph
$_=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
+--- a/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_formula.inc.php
@@ -77,7 +77,7 @@
#
# Constructor
@@ -1121,9 +1303,8 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_formula.inc.p
$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
+--- a/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc.php
@@ -42,7 +42,7 @@
/*
* Constructor
@@ -1133,9 +1314,8 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_olewriter.inc
$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
+--- a/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.php
@@ -56,7 +56,7 @@
#
# Constructor. Creates a new Workbook object from a BIFFwriter object.
@@ -1145,9 +1325,8 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_workbook.inc.
$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
+--- a/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php
++++ b/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc.php
@@ -103,7 +103,7 @@
/*
* Constructor. Creates a new Worksheet object from a BIFFwriter object
@@ -1157,10 +1336,9 @@ diff -ru gosa.const/gosa-core/include/utils/excel/class.writeexcel_worksheet.inc
$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 @@
+--- a/gosa-core/plugins/admin/acl/class_aclRole.inc
++++ b/gosa-core/plugins/admin/acl/class_aclRole.inc
+@@ -59,10 +59,10 @@
var $list =NULL;
var $sectionList = NULL;
@@ -1168,10 +1346,13 @@ diff -ru gosa.const/gosa-core/plugins/admin/acl/class_aclRole.inc gosa/gosa-core
+ 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
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+
+ if($this->dn == "new"){
+ $ui = get_userinfo();
+--- a/gosa-core/plugins/admin/acl/tabs_acl.inc
++++ b/gosa-core/plugins/admin/acl/tabs_acl.inc
@@ -23,7 +23,7 @@
class acltab extends tabs
{
@@ -1181,10 +1362,9 @@ diff -ru gosa.const/gosa-core/plugins/admin/acl/tabs_acl.inc gosa/gosa-core/plug
{
$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 @@
+--- a/gosa-core/plugins/admin/acl/tabs_acl_role.inc
++++ b/gosa-core/plugins/admin/acl/tabs_acl_role.inc
+@@ -23,10 +23,10 @@
class aclroletab extends tabs
{
@@ -1192,10 +1372,13 @@ diff -ru gosa.const/gosa-core/plugins/admin/acl/tabs_acl_role.inc gosa/gosa-core
+ 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
+- tabs::tabs($config, $data, $dn,"acl");
++ tabs::__construct($config, $data, $dn,"acl");
+ }
+
+ function save($ignore_account= FALSE)
+--- a/gosa-core/plugins/admin/departments/class_department.inc
++++ b/gosa-core/plugins/admin/departments/class_department.inc
@@ -64,7 +64,7 @@
var $is_root_dse = FALSE;
@@ -1205,21 +1388,31 @@ diff -ru gosa.const/gosa-core/plugins/admin/departments/class_department.inc gos
{
/* 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 @@
+@@ -88,7 +88,7 @@
+ }
+ $this->objectclasses = array_unique($this->objectclasses);
+
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+ $this->is_account= TRUE;
+ $this->ui= get_userinfo();
+ $this->dn= $dn;
+--- a/gosa-core/plugins/admin/departments/tabs_department.inc
++++ b/gosa-core/plugins/admin/departments/tabs_department.inc
+@@ -26,9 +26,9 @@
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
++ tabs::__construct($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
+ /* Detect the base class (The classs which extends from department)
+ */
+--- a/gosa-core/plugins/admin/groups/class_group.inc
++++ b/gosa-core/plugins/admin/groups/class_group.inc
@@ -75,7 +75,7 @@
private $partialList; // (Multiple support active)
@@ -1229,34 +1422,46 @@ diff -ru gosa.const/gosa-core/plugins/admin/groups/class_group.inc gosa/gosa-cor
{
/* 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 @@
+@@ -84,7 +84,7 @@
+ $this->objectclasses[]= "groupOfNames";
+ }
+
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ $this->trustModeDialog = new trustModeDialog($this->config, $this->dn,NULL);
+ $this->trustModeDialog->setAcl('groups/group');
+--- a/gosa-core/plugins/admin/groups/tabs_group.inc
++++ b/gosa-core/plugins/admin/groups/tabs_group.inc
+@@ -23,9 +23,9 @@
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);
+- tabs::tabs($config, $data, $dn,"groups", $hide_refs, $hide_acls);
++ tabs::__construct($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 @@
+ }
+
+--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
++++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+@@ -77,9 +77,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->trustModeDialog = new trustModeDialog($this->config, $this->dn,NULL);
+ $this->trustModeDialog->setAcl('ogroups/ogroup');
+--- a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
++++ b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
+@@ -308,10 +308,10 @@
return ( $str);
}
@@ -1264,23 +1469,50 @@ diff -ru gosa.const/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc gosa/gosa-c
+ 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 @@
+- tabs::tabs($config, $data, $dn, $category,$hide_refs, $hide_acls);
++ tabs::__construct($config, $data, $dn, $category,$hide_refs, $hide_acls);
+ $this->base= $this->by_object['ogroup']->base;
+ $this->acl_category = $category;
+
+--- a/gosa-core/plugins/admin/users/tabs_user.inc
++++ b/gosa-core/plugins/admin/users/tabs_user.inc
+@@ -30,9 +30,9 @@
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);
+- tabs::tabs($config, $data, $dn, 'users',$hide_refs, $hide_acls);
++ tabs::__construct($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 @@
+
+ $this->uid = &$this->by_object['user']->uid;
+--- a/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc
++++ b/gosa-core/plugins/generic/dashBoard/class_dashBoard.inc
+@@ -14,7 +14,7 @@
+
+ function __construct($config)
+ {
+- plugin::plugin($config, NULL);
++ plugin::__construct($config, NULL);
+
+ // Check if we've access to the registration server
+ if($this->config->registration->registrationRequired() && $config->registration->isServerAccessible()){
+--- a/gosa-core/plugins/generic/infoPage/class_infoPage.inc
++++ b/gosa-core/plugins/generic/infoPage/class_infoPage.inc
+@@ -12,7 +12,7 @@
+ {
+ $this->config = &$config;
+ $this->ui = get_userinfo();
+- plugin::plugin($config, $this->ui->dn);
++ plugin::__construct($config, $this->ui->dn);
+
+ // Detect managers for the current user.
+ $this->managers = $this->detectManagers();
+--- a/gosa-core/plugins/generic/references/class_reference.inc
++++ b/gosa-core/plugins/generic/references/class_reference.inc
+@@ -29,10 +29,10 @@
var $objectList ="";
var $modifyTimestamp = "";
@@ -1288,10 +1520,24 @@ diff -ru gosa.const/gosa-core/plugins/generic/references/class_reference.inc gos
+ 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
+- plugin::plugin($config,$dn,$parent);
++ plugin::__construct($config,$dn,$parent);
+
+ // Try to read the 'modifyTimestamp' - this has to be done separately.
+ $ldap = $this->config->get_ldap_link();
+--- a/gosa-core/plugins/generic/statistics/class_statistics.inc
++++ b/gosa-core/plugins/generic/statistics/class_statistics.inc
+@@ -34,7 +34,7 @@
+
+ function __construct($config)
+ {
+- plugin::plugin($config, NULL);
++ plugin::__construct($config, NULL);
+ }
+
+ function init()
+--- a/gosa-core/plugins/personal/generic/class_user.inc
++++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -135,7 +135,7 @@
/* constructor, if 'dn' is set, the node loads the given
@@ -1301,21 +1547,31 @@ diff -ru gosa.const/gosa-core/plugins/personal/generic/class_user.inc gosa/gosa-
{
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 @@
+@@ -147,7 +147,7 @@
+ }
+
+ /* Load base attributes */
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ $this->orig_dn = $this->dn;
+ $this->new_dn = $dn;
+--- a/gosa-core/plugins/personal/password/class_password.inc
++++ b/gosa-core/plugins/personal/password/class_password.inc
+@@ -36,9 +36,9 @@
var $attributes=array('userPassword');
- function password(&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin($config, $dn, $parent);
+- plugin::plugin($config, $dn, $parent);
++ plugin::__construct($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
+
+
+--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
++++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -99,7 +99,7 @@
/* constructor, if 'dn' is set, the node loads the given
@@ -1325,9 +1581,28 @@ diff -ru gosa.const/gosa-core/plugins/personal/posix/class_posixAccount.inc gosa
{
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
+@@ -107,7 +107,7 @@
+ $this->config= $config;
+
+ /* Load bases attributes */
+- plugin::plugin($config, $dn, $parent);
++ plugin::__construct($config, $dn, $parent);
+
+ $groupImage = image('plugins/groups/images/select_group.png');
+
+--- a/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
++++ b/gosa-core/plugins/personal/posix/trustModeDialog/class_trustModeDialog.inc
+@@ -11,7 +11,7 @@
+
+ function __construct(&$config, $dn, $parent = NULL)
+ {
+- plugin::plugin($config, $dn, $parent);
++ plugin::__construct($config, $dn, $parent);
+
+ $this->accessTo = array();
+ $this->trustModel= "";
+--- a/gosa-core/setup/class_setup.inc
++++ b/gosa-core/setup/class_setup.inc
@@ -31,7 +31,7 @@
var $o_steps = array();
var $captured_values = array();
@@ -1337,9 +1612,8 @@ diff -ru gosa.const/gosa-core/setup/class_setup.inc gosa/gosa-core/setup/class_s
{
$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
+--- a/gosa-core/setup/class_setupStep_Checks.inc
++++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -29,7 +29,7 @@
var $b_displayCheckbutton = TRUE;
@@ -1349,9 +1623,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Checks.inc gosa/gosa-core/se
{
$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
+--- a/gosa-core/setup/class_setupStep_Feedback.inc
++++ b/gosa-core/setup/class_setupStep_Feedback.inc
@@ -55,7 +55,7 @@
"first_use","use_since","distribution","web_server","php_version","ldap_server","object_count","want_to_see_next","gosa_version");
@@ -1361,9 +1634,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Feedback.inc gosa/gosa-core/
{
$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
+--- a/gosa-core/setup/class_setupStep_Finish.inc
++++ b/gosa-core/setup/class_setupStep_Finish.inc
@@ -28,7 +28,7 @@
var $b_displayCheckbutton = TRUE;
@@ -1373,9 +1645,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Finish.inc gosa/gosa-core/se
{
$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
+--- a/gosa-core/setup/class_setupStep.inc
++++ b/gosa-core/setup/class_setupStep.inc
@@ -36,7 +36,7 @@
var $parent = NULL;
var $dialog = FALSE;
@@ -1385,9 +1656,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep.inc gosa/gosa-core/setup/cla
{
}
-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
+--- a/gosa-core/setup/class_setupStep_Language.inc
++++ b/gosa-core/setup/class_setupStep_Language.inc
@@ -28,7 +28,7 @@
var $attributes = array("lang","lang_selected");
var $header_image = "images/setup/locale.png";
@@ -1397,9 +1667,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Language.inc gosa/gosa-core/
{
$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
+--- a/gosa-core/setup/class_setupStep_Ldap.inc
++++ b/gosa-core/setup/class_setupStep_Ldap.inc
@@ -43,7 +43,7 @@
var $header_image= "images/setup/ldap.png";
@@ -1409,9 +1678,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Ldap.inc gosa/gosa-core/setu
{
$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
+--- a/gosa-core/setup/class_setupStep_License.inc
++++ b/gosa-core/setup/class_setupStep_License.inc
@@ -29,7 +29,7 @@
var $attributes = array("accepted");
@@ -1421,9 +1689,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_License.inc gosa/gosa-core/s
{
$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
+--- a/gosa-core/setup/class_setupStep_Migrate.inc
++++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -41,7 +41,7 @@
var $rootOC_details = array();
var $b_displayCheckbutton = TRUE;
@@ -1433,9 +1700,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Migrate.inc gosa/gosa-core/s
{
$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
+--- a/gosa-core/setup/class_setupStep_Schema.inc
++++ b/gosa-core/setup/class_setupStep_Schema.inc
@@ -26,7 +26,7 @@
var $not_checked = array();
var $b_displayCheckbutton = true;
@@ -1445,9 +1711,8 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Schema.inc gosa/gosa-core/se
{
$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
+--- a/gosa-core/setup/class_setupStep_Welcome.inc
++++ b/gosa-core/setup/class_setupStep_Welcome.inc
@@ -28,7 +28,7 @@
var $instanceUUID = "";
@@ -1457,94 +1722,140 @@ diff -ru gosa.const/gosa-core/setup/class_setupStep_Welcome.inc gosa/gosa-core/s
{
$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 @@
+--- a/goto/addons/goto/class_goto_import_file.inc
++++ b/goto/addons/goto/class_goto_import_file.inc
+@@ -9,7 +9,7 @@
+
+ public function __construct($config,&$parent)
+ {
+- plugin::plugin($config,NULL);
++ plugin::__construct($config,NULL);
+ $this->parent = $parent;
+ $this->daemon_events = DaemonEvent::get_event_types( SYSTEM_EVENT | HIDDEN_EVENT);
+
+--- a/goto/addons/goto/class_gotoLogView.inc
++++ b/goto/addons/goto/class_gotoLogView.inc
+@@ -41,7 +41,7 @@
+ and use this macAddress.
+ */
+ if(is_object($parent) && $dn != "" && $dn != "new"){
+- plugin::plugin($config,$dn,$parent);
++ plugin::__construct($config,$dn,$parent);
+ }
+
+ /* Get correct macAddress.
+--- a/goto/admin/applications/class_applicationGeneric.inc
++++ b/goto/admin/applications/class_applicationGeneric.inc
+@@ -30,9 +30,9 @@
var $baseSelector;
- function application (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn, $parent);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ /* Load icon */
+ $ldap= $config->get_ldap_link();
+--- a/goto/admin/applications/class_applicationParameters.inc
++++ b/goto/admin/applications/class_applicationParameters.inc
+@@ -8,9 +8,9 @@
/* 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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->gosaApplicationParameter = array();
+
+--- a/goto/admin/applications/tabs_application.inc
++++ b/goto/admin/applications/tabs_application.inc
+@@ -5,9 +5,9 @@
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/goto/admin/devices/class_deviceGeneric.inc
++++ b/goto/admin/devices/class_deviceGeneric.inc
+@@ -21,9 +21,9 @@
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);
+- plugin::plugin($config,$dn);
++ plugin::__construct($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 @@
+ $this->is_account = TRUE;
+
+--- a/goto/admin/devices/tabs_devices.inc
++++ b/goto/admin/devices/tabs_devices.inc
+@@ -4,9 +4,9 @@
{
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/goto/admin/groups/apps/class_groupApplication.inc
++++ b/goto/admin/groups/apps/class_groupApplication.inc
+@@ -22,7 +22,7 @@
+
+ public function __construct(&$config, $dn= NULL, $parent= NULL)
+ {
+- plugin::plugin($config,$dn,$parent);
++ plugin::__construct($config,$dn,$parent);
+ $this->dn = $dn;
+ $this->_load_menu_structure();
+ $this->a_Structure_on_load = $this->a_Structure;
+--- a/goto/admin/mimetypes/class_mimetypeGeneric.inc
++++ b/goto/admin/mimetypes/class_mimetypeGeneric.inc
+@@ -50,9 +50,9 @@
var $baseSelector;
- function mimetype(&$config,$dn= NULL)
+ function __construct(&$config,$dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* Save original dn */
+ $this->orig_dn = $dn;
+--- a/goto/admin/mimetypes/tabs_mimetypes.inc
++++ b/goto/admin/mimetypes/tabs_mimetypes.inc
+@@ -5,9 +5,9 @@
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs , $hide_acls);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/goto/admin/ogroups/goto/class_termgroup.inc
++++ b/goto/admin/ogroups/goto/class_termgroup.inc
+@@ -35,13 +35,13 @@
var $member_of_ogroup= false;
var $members_inherit_from_group = false;
@@ -1553,9 +1864,15 @@ diff -ru gosa.const/goto/admin/ogroups/goto/class_termgroup.inc gosa/goto/admin/
{
/***************
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
+ ***************/
+
+- plugin::plugin($config, $dn, $parent);
++ plugin::__construct($config, $dn, $parent);
+ $ldap= $config->get_ldap_link();
+
+ $this->is_account = true;
+--- a/goto/admin/systems/goto/class_ArpNewDevice.inc
++++ b/goto/admin/systems/goto/class_ArpNewDevice.inc
@@ -16,7 +16,7 @@
var $gotoIntegration = FALSE;
@@ -1565,9 +1882,19 @@ diff -ru gosa.const/goto/admin/systems/goto/class_ArpNewDevice.inc gosa/goto/adm
{
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
+--- a/goto/admin/systems/goto/class_gotoLpdEnabled.inc
++++ b/goto/admin/systems/goto/class_gotoLpdEnabled.inc
+@@ -39,7 +39,7 @@
+ */
+ public function __construct($config,$data,&$parent)
+ {
+- plugin::plugin($config,NULL);
++ plugin::__construct($config,NULL);
+ $this->parent = $parent;
+ $this->DevID = 0;
+
+--- a/goto/admin/systems/goto/class_printGeneric.inc
++++ b/goto/admin/systems/goto/class_printGeneric.inc
@@ -55,7 +55,7 @@
var $userSelect;
var $adminUserSelect;
@@ -1577,10 +1904,18 @@ diff -ru gosa.const/goto/admin/systems/goto/class_printGeneric.inc gosa/goto/adm
{
$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 @@
+@@ -81,7 +81,7 @@
+ $this->orig_dn = $this->dn;
+
+ /* Get printer settings, possibly dn has changed */
+- plugin::plugin ($config, $this->dn);
++ plugin::__construct ($config, $this->dn);
+
+ /* Get is_account initially_was_account status */
+ $this->getTypeOfPrinter(true);
+--- a/goto/admin/systems/goto/class_SelectDeviceType.inc
++++ b/goto/admin/systems/goto/class_SelectDeviceType.inc
+@@ -15,14 +15,14 @@
var $dn;
@@ -1589,10 +1924,17 @@ diff -ru gosa.const/goto/admin/systems/goto/class_SelectDeviceType.inc gosa/goto
{
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 @@
+ }else{
+ $this->dns = $dn;
+ }
+- plugin::plugin ($config, NULL);
++ plugin::__construct ($config, NULL);
+
+ /* Get object groups */
+ $ldap = $this->config->get_ldap_link();
+--- a/goto/admin/systems/goto/class_terminalGeneric.inc
++++ b/goto/admin/systems/goto/class_terminalGeneric.inc
+@@ -58,12 +58,12 @@
var $kerberos_key_service = NULL;
@@ -1601,46 +1943,57 @@ diff -ru gosa.const/goto/admin/systems/goto/class_terminalGeneric.inc gosa/goto/
{
/* 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 @@
+
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($config, $dn, $parent);
+
+ if(class_available("krbHostKeys")){
+ $this->kerberos_key_service = new krbHostKeys($this->config,$this);
+--- a/goto/admin/systems/goto/class_terminalInfo.inc
++++ b/goto/admin/systems/goto/class_terminalInfo.inc
+@@ -31,9 +31,9 @@
"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);
+- plugin::plugin ($config,$dn);
++ plugin::__construct ($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 @@
+ /* Read arrays */
+ foreach (array("ghNetNic", "ghIdeDev", "ghScsiDev") as $val){
+--- a/goto/admin/systems/goto/class_terminalService.inc
++++ b/goto/admin/systems/goto/class_terminalService.inc
+@@ -61,9 +61,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+
+ /* Check if we are a part of an ogroup.
+--- a/goto/admin/systems/goto/class_terminalStartup.inc
++++ b/goto/admin/systems/goto/class_terminalStartup.inc
+@@ -33,9 +33,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->gotoBootKernels = array("default"=> ("default"));
+
+--- a/goto/admin/systems/goto/class_workstationGeneric.inc
++++ b/goto/admin/systems/goto/class_workstationGeneric.inc
+@@ -62,11 +62,11 @@
var $kerberos_key_service = NULL;
@@ -1649,21 +2002,27 @@ diff -ru gosa.const/goto/admin/systems/goto/class_workstationGeneric.inc gosa/go
{
$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 @@
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($config, $dn, $parent);
+
+ if(class_available("krbHostKeys")){
+ $this->kerberos_key_service = new krbHostKeys($this->config,$this);
+--- a/goto/admin/systems/goto/class_workstationService.inc
++++ b/goto/admin/systems/goto/class_workstationService.inc
+@@ -48,9 +48,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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
+ $this->XResolutions= array(
+ "640x480" => "640x480",
+--- a/goto/admin/systems/goto/class_workstationStartup.inc
++++ b/goto/admin/systems/goto/class_workstationStartup.inc
@@ -56,7 +56,7 @@
var $o_group_dn = "";
var $member_of_ogroup = FALSE;
@@ -1673,9 +2032,17 @@ diff -ru gosa.const/goto/admin/systems/goto/class_workstationStartup.inc gosa/go
{
/* 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
+@@ -66,7 +66,7 @@
+ $this->objectclasses = array("GOhard");
+ }
+
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($config, $dn, $parent);
+
+ /* Check for si daemon */
+ $this->si_active = $this->config->get_cfg_value("core","gosaSupportURI") != "";
+--- a/goto/admin/systems/goto/tabs_printers.inc
++++ b/goto/admin/systems/goto/tabs_printers.inc
@@ -3,7 +3,7 @@
class printtabs extends tabs
{
@@ -1685,9 +2052,8 @@ diff -ru gosa.const/goto/admin/systems/goto/tabs_printers.inc gosa/goto/admin/sy
{
/* 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
+--- a/goto/admin/systems/goto/tabs_terminal.inc
++++ b/goto/admin/systems/goto/tabs_terminal.inc
@@ -4,7 +4,7 @@
{
public $was_activated = FALSE;
@@ -1697,9 +2063,8 @@ diff -ru gosa.const/goto/admin/systems/goto/tabs_terminal.inc gosa/goto/admin/sy
{
/* 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
+--- a/goto/admin/systems/goto/tabs_workstation.inc
++++ b/goto/admin/systems/goto/tabs_workstation.inc
@@ -5,7 +5,7 @@
public $was_activated = FALSE;
@@ -1709,9 +2074,8 @@ diff -ru gosa.const/goto/admin/systems/goto/tabs_workstation.inc gosa/goto/admin
{
/* 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
+--- a/goto/admin/systems/ppd/class_ppdManager.inc
++++ b/goto/admin/systems/ppd/class_ppdManager.inc
@@ -8,7 +8,7 @@
var $useGzip = true;
@@ -1721,94 +2085,107 @@ diff -ru gosa.const/goto/admin/systems/ppd/class_ppdManager.inc gosa/goto/admin/
{
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 @@
+--- a/goto/admin/systems/ppd/class_printerPPDDialog.inc
++++ b/goto/admin/systems/ppd/class_printerPPDDialog.inc
+@@ -29,9 +29,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+
+ $this->ui = get_userinfo();
+--- a/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
++++ b/goto/admin/systems/ppd/class_printerPPDSelectionDialog.inc
+@@ -13,9 +13,9 @@
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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->header = $headers;
+ $this->depselect = $this->config->current['BASE'];
+--- a/goto/admin/systems/services/cups/class_goCupsServer.inc
++++ b/goto/admin/systems/services/cups/class_goCupsServer.inc
+@@ -21,9 +21,9 @@
var $goCupsServerStatus = "";
var $view_logged =FALSE;
- function goCupsServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ }
+
+--- a/goto/admin/systems/services/kiosk/class_goKioskService.inc
++++ b/goto/admin/systems/services/kiosk/class_goKioskService.inc
+@@ -18,9 +18,9 @@
var $gotoKioskProfile = array();
var $server_path = "http://%cn/kiosk";
- function goKioskService(&$config, $dn, $parent)
+ function __construct(&$config, $dn, $parent)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ /* Get the current object name.
+ */
+--- a/goto/admin/systems/services/ldap/class_goLdapServer.inc
++++ b/goto/admin/systems/services/ldap/class_goLdapServer.inc
+@@ -24,9 +24,9 @@
var $krb_service_prefix = "ldap/";
- function goLdapServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+
+ /* Suggest a default value */
+--- a/goto/admin/systems/services/ntp/class_goNtpServer.inc
++++ b/goto/admin/systems/services/ntp/class_goNtpServer.inc
+@@ -22,9 +22,9 @@
var $cn = "";
var $view_logged =FALSE;
- function goNtpServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+
+ /* Load arrays */
+--- a/goto/admin/systems/services/shares/class_goShareServer.inc
++++ b/goto/admin/systems/services/shares/class_goShareServer.inc
+@@ -24,9 +24,9 @@
var $mounts_to_add = array();
var $view_logged =FALSE;
- function goShareServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ $this->DisplayName = _("File service (Shares)");
+
+--- a/goto/admin/systems/services/shares/class_servNfs.inc
++++ b/goto/admin/systems/services/shares/class_servNfs.inc
+@@ -25,11 +25,11 @@
var $parent = NULL;
var $view_logged = FALSE;
@@ -1817,57 +2194,113 @@ diff -ru gosa.const/goto/admin/systems/services/shares/class_servNfs.inc gosa/go
{
$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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ $this->types = array("NBD" => "NBD", "CIFS" => "CIFS", "NFS"=>"NFS","samba"=>"samba","netatalk"=>"netatalk","NCP"=>"NCP");
+ if($dn){
+--- a/goto/admin/systems/services/terminal/class_goTerminalServer.inc
++++ b/goto/admin/systems/services/terminal/class_goTerminalServer.inc
+@@ -20,9 +20,9 @@
var $gotoSessionType = array();
- function goTerminalServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+
+ $tmp = array();
+--- a/goto/personal/environment/class_environment.inc
++++ b/goto/personal/environment/class_environment.inc
+@@ -83,9 +83,9 @@
var $shareList = NULL;
- function environment (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/goto/personal/environment/class_logonManagementDialog.inc
++++ b/goto/personal/environment/class_logonManagementDialog.inc
+@@ -20,9 +20,9 @@
var $real_LogonName = "";
- function logonManagementDialog (&$config, $dn= NULL,$data=false)
+ function __construct(&$config, $dn= NULL,$data=false)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ if($data){
+ $this->LogonName = $data['LogonName'];
+--- a/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc
++++ b/groupware/admin/groups/GroupwareSharedFolder/class_GroupwareSharedFolder.inc
+@@ -30,7 +30,7 @@
+ */
+ function __construct($config, $dn, $attrs = NULL)
+ {
+- plugin::plugin($config, $dn, $attrs);
++ plugin::__construct($config, $dn, $attrs);
+
+ // Get attributes from parent object
+ $this->cn = "";
+--- a/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc
++++ b/groupware/admin/ogroups/GroupwareDistributionList/class_GroupwareDistributionList.inc
+@@ -28,7 +28,7 @@
+ */
+ function __construct($config, $dn, $attrs = NULL)
+ {
+- plugin::plugin($config, $dn, $attrs);
++ plugin::__construct($config, $dn, $attrs);
+
+ // Get attributes from parent object
+ $this->cn = "";
+--- a/groupware/personal/groupware/class_FilterManager.inc
++++ b/groupware/personal/groupware/class_FilterManager.inc
+@@ -7,7 +7,7 @@
+
+ function __construct($config,$parent,$rules)
+ {
+- plugin::plugin($config);
++ plugin::__construct($config);
+
+ $this->parent = &$parent;
+
+--- a/groupware/personal/groupware/class_Groupware.inc
++++ b/groupware/personal/groupware/class_Groupware.inc
+@@ -96,7 +96,7 @@
+ */
+ function __construct ($config, $dn= NULL)
+ {
+- plugin::plugin($config,$dn);
++ plugin::__construct($config,$dn);
+
+ // Get attributes from parent object
+ if(isset($this->attrs['uid'])){
+--- a/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc
++++ b/heimdal/admin/systems/services/kerberos/class_goKrbServer.inc
+@@ -52,9 +52,9 @@
@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);
+- goService::goService($config,$dn);
++ goService::__construct($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
+ $this->parent = $parent;
+
+--- a/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
++++ b/heimdal/admin/systems/services/kerberos/class_password-methods-heimdal.inc
@@ -57,7 +57,7 @@
var $attrs = array();
var $is_account = FALSE;
@@ -1877,10 +2310,9 @@ diff -ru gosa.const/heimdal/admin/systems/services/kerberos/class_password-metho
{
$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 @@
+--- a/kolab/admin/systems/services/kolab/class_servKolab.inc
++++ b/kolab/admin/systems/services/kolab/class_servKolab.inc
+@@ -37,14 +37,14 @@
var $DisplayName = "Kolab mail service";
var $StatusFlag = "";
@@ -1889,21 +2321,30 @@ diff -ru gosa.const/kolab/admin/systems/services/kolab/class_servKolab.inc gosa/
{
/* 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 @@
+ $this->dn = "k=kolab,".$config->current['BASE'];
+
+ /* Load variables, if given*/
+- plugin::plugin($config, $this->dn);
++ plugin::__construct($config, $this->dn);
+
+ /* Copy needed attributes */
+ foreach($this->attributes as $val) {
+--- a/kolab/personal/connectivity/kolab/class_kolabAccount.inc
++++ b/kolab/personal/connectivity/kolab/class_kolabAccount.inc
+@@ -31,9 +31,9 @@
@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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/ldapmanager/addons/ldapmanager/class_csvimport.inc
++++ b/ldapmanager/addons/ldapmanager/class_csvimport.inc
@@ -15,7 +15,7 @@
var $objectclasses= array();
var $view_logged = FALSE;
@@ -1913,9 +2354,8 @@ diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_csvimport.inc gosa/ldap
{
$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
+--- a/ldapmanager/addons/ldapmanager/class_export.inc
++++ b/ldapmanager/addons/ldapmanager/class_export.inc
@@ -13,7 +13,7 @@
var $base;
@@ -1925,9 +2365,8 @@ diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_export.inc gosa/ldapman
{
$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
+--- a/ldapmanager/addons/ldapmanager/class_exportxls.inc
++++ b/ldapmanager/addons/ldapmanager/class_exportxls.inc
@@ -16,7 +16,7 @@
var $base ="";
var $baseSelector ="";
@@ -1937,9 +2376,8 @@ diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_exportxls.inc gosa/ldap
{
/* 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
+--- a/ldapmanager/addons/ldapmanager/class_import.inc
++++ b/ldapmanager/addons/ldapmanager/class_import.inc
@@ -13,7 +13,7 @@
var $ui;
var $view_logged = FALSE;
@@ -1949,9 +2387,8 @@ diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_import.inc gosa/ldapman
{
/* 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
+--- a/ldapmanager/addons/ldapmanager/class_ldif.inc
++++ b/ldapmanager/addons/ldapmanager/class_ldif.inc
@@ -12,7 +12,7 @@
var $objectclasses= array();
var $ldif;
@@ -1961,45 +2398,50 @@ diff -ru gosa.const/ldapmanager/addons/ldapmanager/class_ldif.inc gosa/ldapmanag
{
$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 @@
+--- a/ldapmanager/addons/ldapmanager/tabs_ldif.inc
++++ b/ldapmanager/addons/ldapmanager/tabs_ldif.inc
+@@ -3,9 +3,9 @@
class ldiftab extends tabs
{
- function ldiftab($config, $data, $dn)
+ function __construct($config, $data, $dn)
{
- tabs::tabs($config, $data, $dn);
+- tabs::tabs($config, $data, $dn);
++ tabs::__construct($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 @@
+
+ function save_object($save_current= FALSE)
+--- a/log/admin/systems/services/syslog/class_goLogDBServer.inc
++++ b/log/admin/systems/services/syslog/class_goLogDBServer.inc
+@@ -25,9 +25,9 @@
var $view_logged =FALSE;
- function goLogDBServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ }
+
+--- a/log/admin/systems/services/syslog/class_goSyslogServer.inc
++++ b/log/admin/systems/services/syslog/class_goSyslogServer.inc
+@@ -21,9 +21,9 @@
var $goSyslogServerStatus = "";
var $view_logged =FALSE;
- function goSyslogServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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
+ }
+
+--- a/mail/addons/mailqueue/class_mailqueue.inc
++++ b/mail/addons/mailqueue/class_mailqueue.inc
@@ -25,7 +25,7 @@
/* Logging detection */
var $view_logged = FALSE;
@@ -2009,46 +2451,62 @@ diff -ru gosa.const/mail/addons/mailqueue/class_mailqueue.inc gosa/mail/addons/m
{
$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 @@
+--- a/mail/admin/groups/mail/class_groupMail.inc
++++ b/mail/admin/groups/mail/class_groupMail.inc
+@@ -50,7 +50,7 @@
+
+ function __construct (&$config, $dn= NULL, $base_object= NULL)
+ {
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+
+ /* Get attributes from parent object
+ */
+--- a/mail/admin/ogroups/mail/class_mailogroup.inc
++++ b/mail/admin/ogroups/mail/class_mailogroup.inc
+@@ -12,9 +12,9 @@
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);
+- plugin::plugin($config, $dn, $parent);
++ plugin::__construct($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 @@
+ /* Include config object */
+ $this->config= $config;
+--- a/mail/admin/systems/services/imap/class_goImapServer.inc
++++ b/mail/admin/systems/services/imap/class_goImapServer.inc
+@@ -41,9 +41,9 @@
var $Actions = array();
var $conflicts = array("goImapServer");
- function goImapServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ $this->DisplayName = _("IMAP/POP3 service");
+
+--- a/mail/admin/systems/services/mail/class_goMailServer.inc
++++ b/mail/admin/systems/services/mail/class_goMailServer.inc
+@@ -39,9 +39,9 @@
var $conflicts = array("goMailServer","kolab");
var $view_logged =FALSE;
- function goMailServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+
+ $this->Actions = array( SERVICE_STOPPED=>SERVICE_STOPPED,
+--- a/mail/admin/systems/services/spam/class_goSpamServer.inc
++++ b/mail/admin/systems/services/spam/class_goSpamServer.inc
+@@ -35,10 +35,10 @@
var $acl = NULL;
var $view_logged =FALSE;
@@ -2056,23 +2514,28 @@ diff -ru gosa.const/mail/admin/systems/services/spam/class_goSpamServer.inc gosa
+ 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 @@
+- goService::goService($config,$dn, $parent);
++ goService::__construct($config,$dn, $parent);
+ $this->DisplayName = _("Spamassassin");
+
+ /* Get userinfo & acls */
+--- a/mail/admin/systems/services/spam/class_goSpamServerRule.inc
++++ b/mail/admin/systems/services/spam/class_goSpamServerRule.inc
+@@ -8,9 +8,9 @@
var $orig_name = "";
var $view_logged =FALSE;
- function goSpamServerRule(&$config,$dn,$name = "",$rule ="")
+ function __construct(&$config,$dn,$name = "",$rule ="")
{
- plugin::plugin($config,$dn);
+- plugin::plugin($config,$dn);
++ plugin::__construct($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 @@
+ $this->rule = $rule;
+ }
+--- a/mail/admin/systems/services/virus/class_goVirusServer.inc
++++ b/mail/admin/systems/services/virus/class_goVirusServer.inc
+@@ -38,10 +38,10 @@
var $avDatabaseMirror = "";
var $view_logged =FALSE;
@@ -2080,10 +2543,24 @@ diff -ru gosa.const/mail/admin/systems/services/virus/class_goVirusServer.inc go
+ 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
+- goService::goService($config,$dn, $parent);
++ goService::__construct($config,$dn, $parent);
+ $this->DisplayName = _("Anti virus");
+
+ /* Get userinfo & acls */
+--- a/mail/personal/mail/class_mailAccount.inc
++++ b/mail/personal/mail/class_mailAccount.inc
+@@ -117,7 +117,7 @@
+ */
+ function __construct (&$config, $dn= NULL)
+ {
+- plugin::plugin($config,$dn);
++ plugin::__construct($config,$dn);
+
+ /* Get attributes from parent object
+ */
+--- a/mail/personal/mail/sieve/class_My_Parser.inc
++++ b/mail/personal/mail/sieve/class_My_Parser.inc
@@ -12,7 +12,7 @@
var $parent = NULL;
var $registeredExtensions_ =array();
@@ -2093,9 +2570,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_My_Parser.inc gosa/mail/perso
{
$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
+--- a/mail/personal/mail/sieve/class_My_Tree.inc
++++ b/mail/personal/mail/sieve/class_My_Tree.inc
@@ -15,7 +15,7 @@
var $pap = array();
var $parent = NULL;
@@ -2105,9 +2581,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_My_Tree.inc gosa/mail/persona
{
$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
+--- a/mail/personal/mail/sieve/class_scanner.inc
++++ b/mail/personal/mail/sieve/class_scanner.inc
@@ -2,7 +2,7 @@
class Scanner
@@ -2117,9 +2592,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_scanner.inc gosa/mail/persona
{
$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
+--- a/mail/personal/mail/sieve/class_semantics.inc
++++ b/mail/personal/mail/sieve/class_semantics.inc
@@ -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)';
@@ -2129,9 +2603,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_semantics.inc gosa/mail/perso
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Block_End.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Block_End.inc
@@ -4,7 +4,7 @@
{
var $object_id= -1;
@@ -2141,9 +2614,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_End.inc go
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc
@@ -4,7 +4,7 @@
{
var $object_id= -1;
@@ -2153,9 +2625,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Block_Start.inc
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Comment.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Comment.inc
@@ -13,7 +13,7 @@
return($str);
}
@@ -2165,9 +2636,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Comment.inc gosa
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Discard.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Discard.inc
@@ -5,7 +5,7 @@
var $data = array();
var $object_id = -1;
@@ -2177,9 +2647,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Discard.inc gosa
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc
@@ -15,7 +15,7 @@
return(array());
}
@@ -2189,9 +2658,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Else_Elsif.inc g
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc
@@ -33,7 +33,7 @@
}
}
@@ -2201,9 +2669,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Fileinto.inc gos
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_If.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_If.inc
@@ -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
@@ -2213,9 +2680,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_If.inc gosa/mail
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Keep.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Keep.inc
@@ -5,7 +5,7 @@
{
var $object_id = -1;
@@ -2225,9 +2691,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Keep.inc gosa/ma
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Redirect.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Redirect.inc
@@ -27,7 +27,7 @@
return($msgs);
}
@@ -2237,9 +2702,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Redirect.inc gos
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Reject.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Reject.inc
@@ -23,7 +23,7 @@
return($msgs);
}
@@ -2249,9 +2713,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Reject.inc gosa/
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Require.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Require.inc
@@ -7,7 +7,7 @@
var $parent = NULL;
var $skip_save_object =FALSE;
@@ -2261,9 +2724,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Require.inc gosa
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Stop.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Stop.inc
@@ -5,7 +5,7 @@
{
var $object_id = -1;
@@ -2273,9 +2735,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Stop.inc gosa/ma
{
$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
+--- a/mail/personal/mail/sieve/class_sieveElement_Vacation.inc
++++ b/mail/personal/mail/sieve/class_sieveElement_Vacation.inc
@@ -13,7 +13,7 @@
var $Expert = FALSE;
var $parent = NULL;
@@ -2285,9 +2746,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveElement_Vacation.inc gos
{
$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
+--- a/mail/personal/mail/sieve/class_sieve.inc
++++ b/mail/personal/mail/sieve/class_sieve.inc
@@ -200,7 +200,7 @@
} /* end else */
} /* end get_response() */
@@ -2297,9 +2757,8 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieve.inc gosa/mail/personal/
{
$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
+--- a/mail/personal/mail/sieve/class_sieveManagement.inc
++++ b/mail/personal/mail/sieve/class_sieveManagement.inc
@@ -60,7 +60,7 @@
/* Initialize the class and load all sieve scripts
* try to parse them and display errors
@@ -2309,9 +2768,17 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_sieveManagement.inc gosa/mail
{
/* 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
+@@ -69,7 +69,7 @@
+
+ $this->uattrib = $uattrib;
+ $this->parent = &$parent;
+- plugin::plugin($config,$dn);
++ plugin::__construct($config,$dn);
+
+ // Prepare lists
+ $this->scriptList = new sortableListing();
+--- a/mail/personal/mail/sieve/class_tree.inc
++++ b/mail/personal/mail/sieve/class_tree.inc
@@ -9,7 +9,7 @@
var $dumpFn_;
var $dump_;
@@ -2321,22 +2788,31 @@ diff -ru gosa.const/mail/personal/mail/sieve/class_tree.inc gosa/mail/personal/m
{
$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.
+--- a/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc
++++ b/mit-krb5/admin/systems/services/kerberos/class_goKrbServer.inc
+@@ -54,7 +54,7 @@
*/
-- public function goKrbServer(&$config,$dn,$parent)
-+ public function __construct(&$config,$dn,$parent)
+ public function goKrbServer(&$config,$dn,$parent)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ $this->parent = $parent;
+
+--- a/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc
++++ b/mit-krb5/admin/systems/services/kerberos/class_krb_host_keys.inc
+@@ -57,7 +57,7 @@
+
+ /* Initialize this plugin
+ */
+- plugin::plugin($config, NULL);
++ plugin::__construct($config, NULL);
+ $this->object = $object;
+
+ $this->acl_category = &$this->object->acl_category;
+--- a/nagios/personal/nagios/class_nagiosAccount.inc
++++ b/nagios/personal/nagios/class_nagiosAccount.inc
+@@ -59,12 +59,12 @@
/* constructor, if 'dn' is set, the node loads the given
'dn' from LDAP */
@@ -2345,10 +2821,15 @@ diff -ru gosa.const/nagios/personal/nagios/class_nagiosAccount.inc gosa/nagios/p
{
/* 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 @@
+
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/netatalk/personal/netatalk/class_netatalk.inc
++++ b/netatalk/personal/netatalk/class_netatalk.inc
+@@ -69,12 +69,12 @@
var $uid ="";
/* The constructor just saves a copy of the config. You may add what ever you need. */
@@ -2357,21 +2838,28 @@ diff -ru gosa.const/netatalk/personal/netatalk/class_netatalk.inc gosa/netatalk/
{
/* 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 @@
+ $this->config = $config;
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+
+ /* set user id */
+ if(isset($this->attrs['uid'])){
+--- a/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc
++++ b/opengroupware/personal/connectivity/opengroupware/class_opengwAccount.inc
+@@ -35,9 +35,9 @@
var $view_logged = FALSE;
var $uid = "";
- function opengwAccount (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/opengroupware/personal/connectivity/opengroupware/class_opengw.inc
++++ b/opengroupware/personal/connectivity/opengroupware/class_opengw.inc
@@ -24,7 +24,7 @@
var $option = "";
var $connected = false;
@@ -2381,9 +2869,8 @@ diff -ru gosa.const/opengroupware/personal/connectivity/opengroupware/class_open
{
$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
+--- a/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc
++++ b/opengroupware/personal/connectivity/opengroupware/class_pgsql_opengw.inc
@@ -10,7 +10,7 @@
var $pwd;
var $is_connected = false;
@@ -2393,70 +2880,100 @@ diff -ru gosa.const/opengroupware/personal/connectivity/opengroupware/class_pgsq
{
$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 @@
+--- a/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
++++ b/openxchange/personal/connectivity/openxchange/class_oxchangeAccount.inc
+@@ -42,9 +42,9 @@
var $uid ="";
var $parent = NULL;
- function oxchangeAccount (&$config, $dn= NULL,&$parent)
+ function __construct(&$config, $dn= NULL,&$parent)
{
- plugin::plugin ($config, $dn,$parent);
+- plugin::plugin ($config, $dn,$parent);
++ plugin::__construct ($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 @@
+ for ($i=0;$i<count($this->config->data['TABS']['CONNECTIVITY']);$i++){
+ if($this->config->data['TABS']['CONNECTIVITY'][$i]['CLASS']=='oxchangeAccount') {
+--- a/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc
++++ b/phpgw/personal/connectivity/phpgw/class_phpgwAccount.inc
+@@ -20,9 +20,9 @@
var $multiple_support = TRUE;
- function phpgwAccount (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc
++++ b/phpscheduleit/personal/connectivity/phpscheduleit/class_phpscheduleitAccount.inc
+@@ -33,9 +33,9 @@
var $ReadOnly =false;
var $view_logged = FALSE;
- function phpscheduleitAccount (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+
+ function execute()
+--- a/pptp/personal/connectivity/pptp/class_pptpAccount.inc
++++ b/pptp/personal/connectivity/pptp/class_pptpAccount.inc
+@@ -34,9 +34,9 @@
var $view_logged = FALSE;
var $uid ="";
- function pptpAccount (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc
++++ b/pureftpd/personal/connectivity/pureftpd/class_pureftpdAccount.inc
+@@ -28,9 +28,9 @@
var $multiple_support=TRUE;
- function pureftpdAccount (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn, $parent);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/rolemanagement/admin/roleManagement/class_roleGeneric.inc
++++ b/rolemanagement/admin/roleManagement/class_roleGeneric.inc
+@@ -57,7 +57,7 @@
+ /* Initialize the class
+ */
+ function __construct($config,$dn){
+- plugin::plugin($config,$dn);
++ plugin::__construct($config,$dn);
+ $this->is_account = TRUE;
+
+ // Initialize list of occupants
+--- a/rolemanagement/admin/roleManagement/tabs_roles.inc
++++ b/rolemanagement/admin/roleManagement/tabs_roles.inc
+@@ -25,7 +25,7 @@
+
+ function __construct($config, $data, $dn,$hide_refs = FALSE, $hide_acls = FALSE)
+ {
+- tabs::tabs($config, $data, $dn,$hide_refs, $hide_acls);
++ tabs::__construct($config, $data, $dn,$hide_refs, $hide_acls);
+ $this->base = $baseobject= $this->by_object['roleGeneric']->base;
+ $this->addSpecialTabs();
+
+--- a/rsyslog/addons/rsyslog/class_rsyslog.inc
++++ b/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -21,7 +21,7 @@
var $limits = array(20,50,100,200,500,1000,'-');
var $page = 0;
@@ -2466,46 +2983,51 @@ diff -ru gosa.const/rsyslog/addons/rsyslog/class_rsyslog.inc gosa/rsyslog/addons
{
$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 @@
+--- a/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
++++ b/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+@@ -23,9 +23,9 @@
var $view_logged = FALSE;
- function rSyslogServer(&$config,$dn)
+ function __construct(&$config,$dn)
{
- goService::goService($config,$dn);
+- goService::goService($config,$dn);
++ goService::__construct($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 @@
+ $this->initial_use_database = $this->use_database =
+ isset($this->attrs['objectClass']) &&in_array_strict("goLogDBServer", $this->attrs['objectClass']);
+--- a/samba/admin/systems/samba/class_winGeneric.inc
++++ b/samba/admin/systems/samba/class_winGeneric.inc
+@@ -46,9 +46,9 @@
var $view_logged = FALSE;
- function wingeneric (&$config, $dn= NULL, $parent= NULL)
+ function __construct(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn, $parent);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ $this->netConfigDNS->cn = preg_replace("/\\\$\$/","",$this->uid);
+ $this->netConfigDNS->MACisMust = FALSE;
+--- a/samba/admin/systems/samba/tabs_winstation.inc
++++ b/samba/admin/systems/samba/tabs_winstation.inc
+@@ -3,9 +3,9 @@
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs , $hide_acls);
++ tabs::__construct($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 @@
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/samba/personal/samba/class_sambaAccount.inc
++++ b/samba/personal/samba/class_sambaAccount.inc
+@@ -92,10 +92,10 @@
var $multiple_sambaUserWorkstations = array();
@@ -2513,22 +3035,27 @@ diff -ru gosa.const/samba/personal/samba/class_sambaAccount.inc gosa/samba/perso
+ 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 @@
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+
+ // Set current uid if possible.
+ if(isset($this->attrs['uid'][0])){
+--- a/samba/personal/samba/class_sambaLogonHours.inc
++++ b/samba/personal/samba/class_sambaLogonHours.inc
+@@ -10,9 +10,9 @@
var $config;
var $acl;
- function sambaLogonHours (&$config, $dn, $slh, $acl = 'rw')
+ function __construct(&$config, $dn, $slh, $acl = 'rw')
{
- plugin::plugin($config,$dn);
+- plugin::plugin($config,$dn);
++ plugin::__construct($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
+ $this->acl = $acl;
+
+--- a/scalix/personal/scalix/class_scalixAccount.inc
++++ b/scalix/personal/scalix/class_scalixAccount.inc
@@ -60,7 +60,7 @@
/* constructor, if 'dn' is set, the node loads the given
@@ -2538,21 +3065,31 @@ diff -ru gosa.const/scalix/personal/scalix/class_scalixAccount.inc gosa/scalix/p
{
/* 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 @@
+@@ -68,7 +68,7 @@
+ }
+
+ /* Load bases attributes */
+- plugin::plugin($config, $dn);
++ plugin::__construct($config, $dn);
+
+ /* Load attributes */
+ if ($dn != "new"){
+--- a/squid/personal/connectivity/squid/class_proxyAccount.inc
++++ b/squid/personal/connectivity/squid/class_proxyAccount.inc
+@@ -27,9 +27,9 @@
@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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
+--- a/ssh/personal/ssh/class_sshPublicKey.inc
++++ b/ssh/personal/ssh/class_sshPublicKey.inc
@@ -31,7 +31,7 @@
var $enabled= false;
var $acl;
@@ -2562,58 +3099,65 @@ diff -ru gosa.const/ssh/personal/ssh/class_sshPublicKey.inc gosa/ssh/personal/ss
{
/* 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 @@
+--- a/sudo/admin/sudo/class_sudoGeneric.inc
++++ b/sudo/admin/sudo/class_sudoGeneric.inc
+@@ -61,9 +61,9 @@
@param String $db "new" or the sudo role dn.
@return .
*/
- function sudo(&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ $this->systemEnabled = class_available("systemSelect");
+
+--- a/sudo/admin/sudo/class_sudoOption.inc
++++ b/sudo/admin/sudo/class_sudoOption.inc
+@@ -36,9 +36,9 @@
@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);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($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 @@
+ /****
+ Create a list of known options
+--- a/sudo/admin/sudo/tabs_sudo.inc
++++ b/sudo/admin/sudo/tabs_sudo.inc
+@@ -22,9 +22,9 @@
class sudotabs extends tabs
{
- function sudotabs($config, $data, $dn)
+ function __construct($config, $data, $dn)
{
- tabs::tabs($config, $data, $dn,"sudo");
+- tabs::tabs($config, $data, $dn,"sudo");
++ tabs::__construct($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 @@
+ }
+
+--- a/systems/admin/systems/class_componentGeneric.inc
++++ b/systems/admin/systems/class_componentGeneric.inc
+@@ -41,9 +41,9 @@
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);
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($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 @@
+ /* Set base */
+ if ($this->dn == "new"){
+--- a/systems/admin/systems/class_servGeneric.inc
++++ b/systems/admin/systems/class_servGeneric.inc
+@@ -67,12 +67,12 @@
"sysinfo" => "sysinfo");
@@ -2622,9 +3166,14 @@ diff -ru gosa.const/systems/admin/systems/class_servGeneric.inc gosa/systems/adm
{
/* 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
+
+- plugin::plugin ($config, $dn, $parent);
++ plugin::__construct ($config, $dn, $parent);
+
+ /* Initialize */
+ $this->ui = get_userinfo();
+--- a/systems/admin/systems/class_termDNS.inc
++++ b/systems/admin/systems/class_termDNS.inc
@@ -73,7 +73,7 @@
/* Terminal dns
@@ -2634,33 +3183,45 @@ diff -ru gosa.const/systems/admin/systems/class_termDNS.inc gosa/systems/admin/s
{
/* 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 @@
+@@ -83,7 +83,7 @@
+ $this->IPisMust = $IPisMust;
+ $this->namingAttr = $namingAttr;
+
+- plugin::plugin ($config, $parent->dn, $this->parent);
++ plugin::__construct ($config, $parent->dn, $this->parent);
+
+ $this->attrs = &$this->parent->attrs;
+
+--- a/systems/admin/systems/services/class_goService.inc
++++ b/systems/admin/systems/services/class_goService.inc
+@@ -38,9 +38,9 @@
var $krb_host_key = NULL;
/* Construcktion */
- function goService(&$config,$dn,$parent = NULL)
+ function __construct(&$config,$dn,$parent = NULL)
{
- plugin::plugin($config,$dn);
+- plugin::plugin($config,$dn);
++ plugin::__construct($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 @@
+ }
+
+--- a/systems/admin/systems/tabs_component.inc
++++ b/systems/admin/systems/tabs_component.inc
+@@ -23,9 +23,9 @@
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);
+- tabs::tabs($config, $data, $dn,$category,$hide_refs, $hide_acls);
++ tabs::__construct($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
+ /* Add references/acls/snapshots */
+ $this->addSpecialTabs();
+--- a/systems/admin/systems/tabs_server.inc
++++ b/systems/admin/systems/tabs_server.inc
@@ -24,7 +24,7 @@
{
public $was_activated = FALSE;
@@ -2670,15 +3231,17 @@ diff -ru gosa.const/systems/admin/systems/tabs_server.inc gosa/systems/admin/sys
{
/* 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 @@
+--- a/webdav/personal/connectivity/webdav/class_webdavAccount.inc
++++ b/webdav/personal/connectivity/webdav/class_webdavAccount.inc
+@@ -15,9 +15,9 @@
var $multiple_support =TRUE;
- function webdavAccount (&$config, $dn= NULL)
+ function __construct(&$config, $dn= NULL)
{
- plugin::plugin ($config, $dn);
+- plugin::plugin ($config, $dn);
++ plugin::__construct ($config, $dn);
+ /* Setting uid to default */
+ if(isset($this->attrs['uid'][0])){
--
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