[debian-edu-commits] debian-edu/pkg-team/ 04/05: rebase 1003

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa-plugin-netgroups.

commit 5eb6071ec72cedea136c38ce92dc9b704e9bd19b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 20 14:38:09 2016 +0100

    rebase 1003
---
 debian/patches/1003_php7-compliance.patch | 37 +++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/debian/patches/1003_php7-compliance.patch b/debian/patches/1003_php7-compliance.patch
index 2f2b4a7..2b1d5ae 100644
--- a/debian/patches/1003_php7-compliance.patch
+++ b/debian/patches/1003_php7-compliance.patch
@@ -1,17 +1,23 @@
+Description: Make code fully PHP7 compliant
+Author: Wolfgang Schweer <wschweer at arcor.de>
+
 --- a/admin/netgroups/class_netgroup.inc
 +++ b/admin/netgroups/class_netgroup.inc
-@@ -57,7 +57,7 @@
+@@ -57,9 +57,9 @@
  
  	/* Constructor which load object attributes aso.
   	 * */
 -    function netgroup(&$config, $dn= NULL) {
 +    function __construct(&$config, $dn= NULL) {
  
-         plugin::plugin($config, $dn);
+-        plugin::plugin($config, $dn);
++        plugin::__construct($config, $dn);
  		$this->objectInfo = array("triple" => array(), "groups" => array());
+         $this->orig_dn = $dn;
+         $this->orig_cn = $this->cn;
 --- a/admin/systems/netgroups/class_netgroupSystem.inc
 +++ b/admin/systems/netgroups/class_netgroupSystem.inc
-@@ -48,7 +48,7 @@
+@@ -48,12 +48,12 @@
  
  	/* Constructor: Prepare values, lists, ...
   	 * */
@@ -20,9 +26,15 @@
  	{
  		$this->config = $config;
  
+ 		/* Load bases attributes */
+-		plugin::plugin($config, $dn);
++		plugin::__construct($config, $dn);
+ 
+ 		/* Setting cn to default */
+ 		if (isset($this->attrs['cn'][0])) {
 --- a/personal/netgroups/class_netgroupAccount.inc
 +++ b/personal/netgroups/class_netgroupAccount.inc
-@@ -51,7 +51,7 @@
+@@ -51,12 +51,12 @@
  
  	/* Constructor: Prepare values, lists, ...
   	 * */
@@ -31,3 +43,20 @@
  	{
  		$this->config = $config;
  
+ 		/* Load bases attributes */
+-		plugin::plugin($config, $dn);
++		plugin::__construct($config, $dn);
+ 
+ 		/* Setting uid to default */
+ 		if (isset($this->attrs['uid'][0])) {
+--- a/admin/netgroups/tabs_netgroup.inc
++++ b/admin/netgroups/tabs_netgroup.inc
+@@ -24,7 +24,7 @@
+ class netgrouptabs extends tabs {
+ 
+     function netgrouptabs($config, $data, $dn, $cat = "", $hide_refs = FALSE, $hide_acls = FALSE) {
+-        tabs::tabs($config, $data, $dn, "netgroups", $hide_refs, $hide_acls);
++        tabs::__plugin($config, $data, $dn, "netgroups", $hide_refs, $hide_acls);
+         $this->addSpecialTabs();
+     }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa-plugin-netgroups.git