Request 3178 (accepted)

buildroundcubemailtarball.sh Changed

roundcubemail-1.5.tar.gz/composer.json Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ,
-    "content-hash": "40398d947556f0b4fed19d61bfd005b6",
+    "content-hash": "23bf59023591e912aa8b9802e63b7f3e",
     "packages": 
         {
             "name": "caxy/php-htmldiff",
@@ -1190,29 +1190,23 @@
         },
         {
             "name": "kolab/net_ldap3",
-            "version": "v1.1.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "git@gitlab.com:roundcube/net_ldap3.git",
-                "reference": "ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/roundcube%2Fnet_ldap3/repository/archive.zip?sha=ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab",
-                "reference": "ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab",
-                "shasum": ""
+                "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
+                "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
                 "php": ">=5.3.3"
             },
+            "default-branch": true,
             "type": "library",
             "autoload": {
                 "classmap": 
                     "lib/"
                 
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": 
                 "GPL-3.0+"
             ,
@@ -1236,11 +1230,11 @@
             "description": "A successor of the PEAR:Net_LDAP2 module providing advanced functionality for accessing LDAP directories",
             "homepage": "http://git.kolab.org/pear/Net_LDAP3/",
             "keywords": 
-                "PEAR",
                 "ldap",
+                "pear",
                 "vlv"
             ,
-            "time": "2021-11-11T09:02:56+00:00"
+            "time": "2023-06-07T08:32:15+00:00"
         },
         {
             "name": "kolab/nextcloud_link",
@@ -5690,7 +5684,9 @@
     ,
     "aliases": ,
     "minimum-stability": "stable",
-    "stability-flags": ,
+    "stability-flags": {
+        "kolab/net_ldap3": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

roundcubemail-1.5.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5
+class ComposerAutoloaderInit0617067ec580b01ba3426ee0746c531e
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit0617067ec580b01ba3426ee0746c531e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit7f4507b951cb5ef5ef8e43e35656bda5', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit0617067ec580b01ba3426ee0746c531e', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit0617067ec580b01ba3426ee0746c531e::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -57,19 +57,19 @@
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire7f4507b951cb5ef5ef8e43e35656bda5($fileIdentifier, $file);
+            composerRequire0617067ec580b01ba3426ee0746c531e($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire7f4507b951cb5ef5ef8e43e35656bda5($fileIdentifier, $file)
+function composerRequire0617067ec580b01ba3426ee0746c531e($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

roundcubemail-1.5.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5
+class ComposerStaticInit0617067ec580b01ba3426ee0746c531e
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -1029,11 +1029,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit7f4507b951cb5ef5ef8e43e35656bda5::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit0617067ec580b01ba3426ee0746c531e::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -1332,32 +1332,26 @@
         },
         {
             "name": "kolab/net_ldap3",
-            "version": "v1.1.4",
-            "version_normalized": "1.1.4.0",
+            "version": "dev-master",
+            "version_normalized": "dev-master",
             "source": {
                 "type": "git",
-                "url": "git@gitlab.com:roundcube/net_ldap3.git",
-                "reference": "ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://gitlab.com/api/v4/projects/roundcube%2Fnet_ldap3/repository/archive.zip?sha=ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab",
-                "reference": "ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab",
-                "shasum": ""
+                "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
+                "reference": "5a319cf437d75aad564ce7fd076cc5423722868b"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
                 "php": ">=5.3.3"
             },
-            "time": "2021-11-11T09:02:56+00:00",
+            "time": "2023-06-07T08:32:15+00:00",
+            "default-branch": true,
             "type": "library",
-            "installation-source": "dist",
+            "installation-source": "source",
             "autoload": {
                 "classmap": 
                     "lib/"
                 
             },
-            "notification-url": "https://packagist.org/downloads/",
             "license": 
                 "GPL-3.0+"
             ,
@@ -1381,8 +1375,8 @@
             "description": "A successor of the PEAR:Net_LDAP2 module providing advanced functionality for accessing LDAP directories",
             "homepage": "http://git.kolab.org/pear/Net_LDAP3/",
             "keywords": 
-                "PEAR",
                 "ldap",
+                "pear",
                 "vlv"
             ,
             "install-path": "../kolab/net_ldap3"

roundcubemail-1.5.tar.gz/vendor/composer/installed.php Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/HEAD Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/branches Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/config Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/description Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/applypatch-msg.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/commit-msg.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/fsmonitor-watchman.sample Added

@@ -0,0 +1,174 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	my $last_update_line = "";
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+		$last_update_line = qq\n"since": $last_update_token,;
+	}
+	my $query = <<"	END";
+		"query", "$git_work_tree", {$last_update_line
+			"fields": "name",
+			"expression": "not", "dirname", ".git"
+		}
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/post-update.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-applypatch.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-commit.sample Added

@@ -0,0 +1,49 @@
+#!/usr/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if  "$allownonascii" != "true"  &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d ' -~\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-merge-commit.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-push.sample Added

@@ -0,0 +1,53 @@
+#!/usr/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local oid> <remote ref> <remote oid>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+zero=$(git hash-object --stdin </dev/null | tr '0-9a-f' '0')
+
+while read local_ref local_oid remote_ref remote_oid
+do
+	if test "$local_oid" = "$zero"
+	then
+		# Handle delete
+		:
+	else
+		if test "$remote_oid" = "$zero"
+		then
+			# New branch, examine all commits
+			range="$local_oid"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_oid..$local_oid"
+		fi
+
+		# Check for WIP commit
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-rebase.sample Added

@@ -0,0 +1,169 @@
+#!/usr/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up to date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV0;
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^(0-9a-f+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV1);
+		for my $elem (map {
+				/^(0-9a-f+) (.*)$/;
+				$1 => $2;
+			} split(/\n/, $ARGV2)) {
+			if (!exists $not_in_next{$elem->0}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->1\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+<<\DOC_END
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".
+
+DOC_END

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/pre-receive.sample Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/prepare-commit-msg.sample Added

@@ -0,0 +1,42 @@
+#!/usr/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
+
+# case "$COMMIT_SOURCE,$SHA1" in
+#  ,|template,)
+#    /usr/bin/perl -i.bak -pe '
+#       print "\n" . `git diff --cached --name-status -r`
+# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+#  *) ;;
+# esac
+
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^$.*>$.*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/push-to-checkout.sample Added

@@ -0,0 +1,78 @@
+#!/usr/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/hooks/update.sample Added

@@ -0,0 +1,128 @@
+#!/usr/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if  -z "$GIT_DIR" ; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if  -z "$refname" -o -z "$oldrev" -o -z "$newrev" ; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero=$(git hash-object --stdin </dev/null | tr '0-9a-f' '0')
+if  "$newrev" = "$zero" ; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if  "$allowunannotated" != "true" ; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag  -a | -s ' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if  "$allowdeletetag" != "true" ; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if  "$allowmodifytag" != "true"  && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if  "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if  "$allowdeletebranch" != "true" ; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if  "$allowdeletebranch" != "true" ; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info/exclude Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Added

@@ -0,0 +1,30 @@
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/heads/master
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/HEAD
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/remotes/origin/master
+b51b8121f82b9296565e93cc95788ddff1b06514	refs/tags/pear-Net-LDAP3-1.0.0
+6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480	refs/tags/pear-Net-LDAP3-1.0.0^{}
+3e7503645609fac9d54bc963afbbddc668bef16c	refs/tags/pear-Net-LDAP3-1.0.1
+e86b803738ae7278fc05ffcc48839f195fa19a19	refs/tags/pear-Net-LDAP3-1.0.1^{}
+5a02b1ff1ec9f26bf0b5bd5cf83d529d29c1bb51	refs/tags/pear-Net-LDAP3-1.0.2
+a5953c2afb3c26f93dfa6bd5237bc1cfa679397d	refs/tags/pear-Net-LDAP3-1.0.2^{}
+fdc0592691a569b12df6714b172fe8ea4d93a044	refs/tags/pear-Net-LDAP3-1.0.3
+64b4f7f81ef7e9f6a21bb6c72327120c95d8e214	refs/tags/pear-Net-LDAP3-1.0.3^{}
+fe52e70d4cbb505a8f55adeb40816ba58e6e306e	refs/tags/pear-Net-LDAP3-1.0.4
+7339e3aa0fdcb1f52feb4da3924de078846c09d7	refs/tags/pear-Net-LDAP3-1.0.4^{}
+abe29a40a73661f7412a298e1e13baba696caac1	refs/tags/pear-Net-LDAP3-1.0.5
+4c21bdebaa62d05a36f3ef3eee4e9742875d7e57	refs/tags/pear-Net-LDAP3-1.0.6
+373ff2401c134c5689ef01c778199ddefbd5eeb1	refs/tags/pear-Net-LDAP3-1.0.7
+349551e80eb2fcfd85e57d6e75f3db31f20ffaa0	refs/tags/pear-Net-LDAP3-1.1.0
+4dbc8c189d7c23d68d859ce79c4fbbe27c8a034f	refs/tags/pear-Net-LDAP3-1.1.0^{}
+3a82308c84441847b914fc4f71eb791d8dda12cd	refs/tags/pear-Net-LDAP3-1.1.1
+56371ea520949289745915377f678e7e97218b2d	refs/tags/pear-Net-LDAP3-1.1.1^{}
+594f7b23c67888c5e7685ebafbb8f93fb3bba828	refs/tags/pear-Net-LDAP3-1.1.2
+9992f6627cc24793f033c48564bd9b2583c80617	refs/tags/pear-Net-LDAP3-1.1.2^{}
+1b5db5d2e3dd64560372c77583460366bf9f16bf	refs/tags/pear-Net-LDAP3-1.1.3
+e1835e36fa5d3434f9804670fc3cdd16992ec66a	refs/tags/pear-Net-LDAP3-1.1.3^{}
+ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab	refs/tags/pear-Net-LDAP3-1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/tags/pear-Net-LDAP3-1.1.5
+4a380eeb67eb433976d47fd47f44745fb0978c50	refs/tags/v1.1.1
+e1835e36fa5d3434f9804670fc3cdd16992ec66a	refs/tags/v1.1.3
+ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab	refs/tags/v1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b	refs/tags/v1.1.5

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.idx Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-c885a578207b2d2d8d2d19f7b0dedbb6f2c16071.pack Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Added

@@ -0,0 +1,29 @@
+# pack-refs with: peeled fully-peeled sorted 
+5a319cf437d75aad564ce7fd076cc5423722868b refs/remotes/origin/master
+b51b8121f82b9296565e93cc95788ddff1b06514 refs/tags/pear-Net-LDAP3-1.0.0
+^6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480
+3e7503645609fac9d54bc963afbbddc668bef16c refs/tags/pear-Net-LDAP3-1.0.1
+^e86b803738ae7278fc05ffcc48839f195fa19a19
+5a02b1ff1ec9f26bf0b5bd5cf83d529d29c1bb51 refs/tags/pear-Net-LDAP3-1.0.2
+^a5953c2afb3c26f93dfa6bd5237bc1cfa679397d
+fdc0592691a569b12df6714b172fe8ea4d93a044 refs/tags/pear-Net-LDAP3-1.0.3
+^64b4f7f81ef7e9f6a21bb6c72327120c95d8e214
+fe52e70d4cbb505a8f55adeb40816ba58e6e306e refs/tags/pear-Net-LDAP3-1.0.4
+^7339e3aa0fdcb1f52feb4da3924de078846c09d7
+abe29a40a73661f7412a298e1e13baba696caac1 refs/tags/pear-Net-LDAP3-1.0.5
+4c21bdebaa62d05a36f3ef3eee4e9742875d7e57 refs/tags/pear-Net-LDAP3-1.0.6
+373ff2401c134c5689ef01c778199ddefbd5eeb1 refs/tags/pear-Net-LDAP3-1.0.7
+349551e80eb2fcfd85e57d6e75f3db31f20ffaa0 refs/tags/pear-Net-LDAP3-1.1.0
+^4dbc8c189d7c23d68d859ce79c4fbbe27c8a034f
+3a82308c84441847b914fc4f71eb791d8dda12cd refs/tags/pear-Net-LDAP3-1.1.1
+^56371ea520949289745915377f678e7e97218b2d
+594f7b23c67888c5e7685ebafbb8f93fb3bba828 refs/tags/pear-Net-LDAP3-1.1.2
+^9992f6627cc24793f033c48564bd9b2583c80617
+1b5db5d2e3dd64560372c77583460366bf9f16bf refs/tags/pear-Net-LDAP3-1.1.3
+^e1835e36fa5d3434f9804670fc3cdd16992ec66a
+ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab refs/tags/pear-Net-LDAP3-1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b refs/tags/pear-Net-LDAP3-1.1.5
+4a380eeb67eb433976d47fd47f44745fb0978c50 refs/tags/v1.1.1
+e1835e36fa5d3434f9804670fc3cdd16992ec66a refs/tags/v1.1.3
+ec4f0d6918aa4b5364e99e1132e0a5a9b3ab23ab refs/tags/v1.1.4
+5a319cf437d75aad564ce7fd076cc5423722868b refs/tags/v1.1.5

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/remotes Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/remotes/origin Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/remotes/origin/HEAD Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/refs/tags Added

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php Changed

@@ -49,22 +49,22 @@
     public $conn;
     public $vlv_active = false;
 
-    private $attribute_level_rights_map = array(
-        "r" => "read",
-        "s" => "search",
-        "w" => "write",
-        "o" => "delete",
-        "c" => "compare",
-        "W" => "write",
-        "O" => "delete"
-    );
-
-    private $entry_level_rights_map = array(
-        "a" => "add",
-        "d" => "delete",
-        "n" => "modrdn",
-        "v" => "read"
-    );
+    private $attribute_level_rights_map = 
+        'r' => 'read',
+        's' => 'search',
+        'w' => 'write',
+        'o' => 'delete',
+        'c' => 'compare',
+        'W' => 'write',
+        'O' => 'delete'
+    ;
+
+    private $entry_level_rights_map = 
+        'a' => 'add',
+        'd' => 'delete',
+        'n' => 'modrdn',
+        'v' => 'read'
+    ;
 
     /*
      * Manipulate configuration through the config_set and config_get methods.
@@ -87,16 +87,17 @@
      *       'service_bind_pw' => 'Welcome2KolabSystems',
      *       'root_dn'         => 'dc=example,dc=org',
      */
-    protected $config = array(
+    protected $config = 
         'sizelimit'      => 0,
         'timelimit'      => 0,
         'config_root_dn' => 'cn=config',
-    );
+        'vlv'            => null,
+    ;
 
     protected $debug_level = false;
     protected $list_page   = 1;
     protected $page_size   = 10;
-    protected $icache      = array();
+    protected $icache      = ;
     protected $cache;
 
     // Use public method config_set('log_hook', $callback) to have $callback be
@@ -129,7 +130,7 @@
      * @param array $config Configuration parameters. After initialization use
      *                      the config_set() method.
      */
-    public function __construct($config = array())
+    public function __construct($config = )
     {
         if (!empty($config) && is_array($config)) {
             foreach ($config as $key => $value) {
@@ -150,7 +151,7 @@
     /**
      *  Add multiple entries to the directory information tree in one go.
      */
-    public function add_entries($entries, $attributes = array())
+    public function add_entries($entries, $attributes = )
     {
         // If $entries is an associative array, it's keys are DNs and its
         // values are the attributes for that DN.
@@ -158,7 +159,7 @@
         // If $entries is a non-associative array, the attributes are expected
         // to be positional in $attributes.
 
-        $result_set = array();
+        $result_set = ;
 
         if (array_keys($entries) == range(0, count($entries) - 1)) {
             // $entries is sequential
@@ -274,28 +275,28 @@
         // Then add the replication agreements
         foreach ($replica_hosts as $num => $replica_host) {
             $ldap = new Net_LDAP3($this->config);
-            $ldap->config_set('hosts', array($replica_host));
+            $ldap->config_set('hosts', $replica_host);
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $attrs = array(
+            $attrs = 
                 'nsDS5ReplicaBindDN',
                 'nsDS5ReplicaType',
                 'nsds5ReplicaPurgeDelay',
                 'nsDS5Flags'
-            );
+            ;
 
             $replica_attrs = $ldap->get_entry_attributes($replica_dn, $attrs);
-            $replica_attrs = array_merge((array) $replica_attrs, array(
+            $replica_attrs = array_merge((array) $replica_attrs, 
                 'cn' => 'replica',
-                'objectclass' => array(
+                'objectclass' => 
                     'top',
                     'nsds5replica',
                     'extensibleobject',
-                ),
-                'nsDS5ReplicaId'   => ($max_repl_id + $num + 1),
+                ,
+                'nsDS5ReplicaId'   => $max_repl_id + $num + 1,
                 'nsDS5ReplicaRoot' => $domain_root_dn,
-            ));
+            );
 
             $new_replica_dn = 'cn=replica,cn="' . $domain_root_dn . '",cn=mapping tree,cn=config';
 
@@ -328,19 +329,21 @@
 
                 $this->_debug("Adding a replication agreement for $domain_root_dn to $replicate_to_host on " . $replica_host);
 
-                $attrs = array(
+                $attrs = 
                     'objectclass',
                     'nsDS5ReplicaBindDN',
                     'nsDS5ReplicaCredentials',
                     'nsDS5ReplicaTransportInfo',
-                    'nsDS5ReplicaBindMethod',
-                    'nsDS5ReplicaHost',
-                    'nsDS5ReplicaPort'
-                );
+                    'nsDS5ReplicaBindMethod'
+                ;
+
+                list($host, $port) = strpos($replicate_to_host, ':') !== false ? explode(':', $replicate_to_host) : $replicate_to_host, 389;
 
                 $replica_agreement_attrs = $ldap->get_entry_attributes($replica_agreement_tpl_dn, $attrs);
-                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace(array('dc=',','), array('_',''), $domain_root_dn);
+                $replica_agreement_attrs'cn' = array_shift(explode('.', $replicate_to_host)) . str_replace('dc=', ',', '_', '', $domain_root_dn);
                 $replica_agreement_attrs'nsDS5ReplicaRoot' = $domain_root_dn;
+                $replica_agreement_attrs'nsDS5ReplicaHost' = $host;
+                $replica_agreement_attrs'nsDS5ReplicaPort' = $port;
                 $replica_agreement_dn = "cn=" . $replica_agreement_attrs'cn' . "," . $new_replica_dn;
 
                 $this->_debug("Adding $replica_agreement_dn to $replica_host with attributes: " . var_export($replica_agreement_attrs, true));
@@ -363,27 +366,27 @@
             foreach ($result->entries(true) as $agreement_dn => $agreement_attrs) {
                 $this->modify_entry_attributes(
                     $agreement_dn,
-                    array(
-                        'replace' => array(
+                    
+                        'replace' => 
                             'nsds5BeginReplicaRefresh' => 'start',
-                        ),
-                    )
+                        ,
+                    
                 );
             }
         }
     }
 
-    public function attribute_details($attributes = array())
+    public function attribute_details($attributes = )
     {
         $schema = $this->init_schema();
 
         if (!$schema) {
-            return array();
+            return ;
         }
 
         $attribs = $schema->getAll('attributes');
 
-        $attributes_details = array();
+        $attributes_details = ;
 
         foreach ($attributes as $attribute) {
             if (array_key_exists($attribute, $attribs)) {
@@ -415,18 +418,18 @@
             }
 
             // The relevant parts only, please
-            $attributes_details$attribute = array(
+            $attributes_details$attribute = 
                 'type'        => !empty($attrib_details'single-value') ? 'text' : 'list',
                 'description' => $attrib_details'desc',
                 'syntax'      => $attrib_details'syntax',
                 'max-length'  => $attrib_details'max-length' ?: false,
-            );
+            ;
         }
 
         return $attributes_details;
     }
 
-    public function attributes_allowed($objectclasses = array())
+    public function attributes_allowed($objectclasses = )
     {
         $this->_debug("Listing allowed_attributes for objectclasses", $objectclasses);
 
@@ -439,9 +442,9 @@
             return false;
         }
 
-        $may          = array();
-        $must         = array();
-        $superclasses = array();
+        $may          = ;
+        $must         = ;
+        $superclasses = ;
 
         foreach ($objectclasses as $objectclass) {
             $superclass = $schema->superclass($objectclass);
@@ -464,7 +467,7 @@
         $must         = array_unique($must);
         $superclasses = array_unique($superclasses);
 
-        return array('may' => $may, 'must' => $must, 'super' => $superclasses);
+        return 'may' => $may, 'must' => $must, 'super' => $superclasses;
     }
 
     public function classes_allowed()
@@ -475,7 +478,7 @@
         }
 
         $list    = $schema->getAll('objectclasses');
-        $classes = array();
+        $classes = ;
 
         foreach ($list as $class) {
             $classes = $class'name';
@@ -542,17 +545,18 @@
     public function config_get($key, $default = null)
     {
         if (!empty($this->_config_get_hook)) {
-            return call_user_func_array($this->_config_get_hook, array($key, $value));
+            return call_user_func_array($this->_config_get_hook, $key, $value);
         }
-        else if (method_exists($this, "config_get_{$key}")) {
-            return call_user_func(array($this, "config_get_$key"), $value);
+
+        if (method_exists($this, "config_get_{$key}")) {
+            return call_user_func($this, "config_get_{$key}", $value);
         }
-        else if (!isset($this->config$key)) {
+
+        if (!isset($this->config$key)) {
             return $default;
         }
-        else {
-            return $this->config$key;
-        }
+
+        return $this->config$key;
     }
 
     /**
@@ -571,10 +575,10 @@
         }
 
         if (!empty($this->_config_set_hook)) {
-            call_user_func($this->_config_set_hook, array($key, $value));
+            call_user_func($this->_config_set_hook, $key, $value);
         }
         else if (method_exists($this, "config_set_{$key}")) {
-            call_user_func_array(array($this, "config_set_$key"), array($value));
+            call_user_func_array($this, "config_set_{$key}", $value);
         }
         else if (property_exists($this, $key)) {
             $this->$key = $value;
@@ -605,13 +609,14 @@
             return true;
         }
 
-        $hosts = !empty($host) ? $host : $this->config_get('hosts', array());
+        $hosts = !empty($host) ? $host : $this->config_get('hosts', );
         $port  = $this->config_get('port', 389);
 
         foreach ((array) $hosts as $host) {
-            $this->_debug("C: Connect $host:$port");
+            $ldap_uri = $this->_host2uri($host, $port);
+            $this->_debug("C: Connect {$ldap_uri}");
 
-            if ($lc = @ldap_connect($host, $port)) {
+            if ($lc = @ldap_connect($ldap_uri)) {
                 if ($this->config_get('use_tls', false) === true) {
                     if (!ldap_start_tls($lc)) {
                         $this->_debug("S: Could not start TLS. " . ldap_error($lc));
@@ -635,7 +640,7 @@
                     ldap_set_option($lc, LDAP_OPT_REFERRALS, (bool) $referrals);
                 }
 
-                $this->_current_host = $host;
+                $this->_current_host = $ldap_uri;
                 $this->conn          = $lc;
 
                 break;
@@ -723,23 +728,25 @@
 
         if (PHP_VERSION_ID >= 70300) {
             // Note: This get_entry() have to request all attributes to be working
-            $result = $this->get_entry($entry_dn, array('*'), array(
-                    array(
+            $result = $this->get_entry($entry_dn, '*', 
+                    
                         'oid'        => self::CONTROL_EFFECTIVE_RIGHTS,
                         'value'      => 'dn:' . $this->_current_bind_dn,
                         'iscritical' => true,
-                    ),
-                ));
+                    ,
+                );
 
             if (!empty($result)) {
-                $attributes = array(
+                $attributes = 
                     'dn'                   => $entry_dn,
-                    'attributelevelrights' => array(),
-                    'entrylevelrights'     => array(),
-                );
+                    'attributelevelrights' => ,
+                    'entrylevelrights'     => ,
+                ;
+
+                foreach ('aclrights', 'attributelevelrights', 'entrylevelrights' as $attr_name) {
+                    if (!empty($result$attr_name)) {
+                        $attr_value = $result$attr_name;
 
-                foreach (array('aclrights', 'attributelevelrights', 'entrylevelrights') as $attr_name) {
-                    if ($attr_value = $result$attr_name) {
                         switch ($attr_name) {
                         case 'aclrights':
                             $this->parse_aclrights($attributes, $attr_value);
@@ -773,6 +780,9 @@
             $moz_ldapsearch = "/usr/lib/mozldap/ldapsearch";
         }
         if (!is_file($moz_ldapsearch)) {
+            $moz_ldapsearch = "/usr/bin/ldapsearch";
+        }
+        if (!is_file($moz_ldapsearch)) {
             $moz_ldapsearch = null;
         }
 
@@ -781,23 +791,28 @@
             return null;
         }
 
-        $output = array();
-        $command = Array(
-                $moz_ldapsearch,
-                '-x',
-                '-h',
-                preg_replace('|^a-z+://|i', '', $this->_current_host),
-                '-p',
-                $this->config_get('port', 389),
-                '-b',
-                escapeshellarg($entry_dn),
-                '-s',
-                'base',
-                '-D',
-                escapeshellarg($this->_current_bind_dn),
-                '-w',
-                escapeshellarg($this->_current_bind_pw)
-            );
+        $output = ;
+        $command = 
+            $moz_ldapsearch,
+            '-x',
+            '-h',
+            parse_url($this->_current_host, PHP_URL_HOST),
+            '-b',
+            escapeshellarg($entry_dn),
+            '-s',
+            'base',
+            '-D',
+            escapeshellarg($this->_current_bind_dn),
+            '-w',
+            escapeshellarg($this->_current_bind_pw)
+        ;
+
+        if ($moz_ldapsearch != "/usr/bin/ldapsearch") {
+            $command = '-p';
+            $command = parse_url($this->_current_host, PHP_URL_PORT);
+        }
+
+        // TODO: Can we use -H instead of -h and -p?
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // For Oracle DSEE
@@ -805,6 +820,10 @@
             $command = escapeshellarg(self::CONTROL_EFFECTIVE_RIGHTS . ':true');
             $command = "-c";
             $command = escapeshellarg('dn:' . $this->_current_bind_dn);
+        } else if ($moz_ldapsearch == "/usr/bin/ldapsearch") {
+            // Modern 389 DS:
+            $command = "-E";
+            $command = escapeshellarg("!" . self::CONTROL_EFFECTIVE_RIGHTS . '=:dn:' . $this->_current_bind_dn);
         } else {
             // For 389 DS:
             $command = "-J";
@@ -839,7 +858,7 @@
             return null;
         }
 
-        $lines = array();
+        $lines = ;
         foreach ($output as $line_num => $line) {
             if (substr($line, 0, 1) == " ") {
                 $linescount($lines)-1 .= trim($line);
@@ -849,11 +868,11 @@
             }
         }
 
-        $attributes = array(
+        $attributes = 
             'dn'                   => $subject_dn,
-            'attributelevelrights' => array(),
-            'entrylevelrights'     => array(),
-        );
+            'attributelevelrights' => ,
+            'entrylevelrights'     => ,
+        ;
 
         if ($this->vendor_name() == "Oracle Corporation") {
             // Example for attribute level rights:
@@ -897,7 +916,7 @@
      *
      * @return string Entry DN string
      */
-    public function entry_dn($subject, $attributes = array(), $base_dn = null)
+    public function entry_dn($subject, $attributes = , $base_dn = null)
     {
         $this->_debug("Net_LDAP3::entry_dn($subject)");
         $is_dn = ldap_explode_dn($subject, 1);
@@ -918,7 +937,7 @@
 
         $this->_debug("Using unique_attribute " . var_export($unique_attr, true) . " at " . __FILE__ . ":" . __LINE__);
 
-        $attributes  = array_merge(array($unique_attr => $subject), (array)$attributes);
+        $attributes  = array_merge($unique_attr => $subject, (array) $attributes);
         $subject     = $this->entry_find_by_attribute($attributes, $base_dn);
 
         if (!empty($subject)) {
@@ -965,7 +984,7 @@
 
     public function find_user_groups($member_dn)
     {
-        $groups  = array();
+        $groups  = ;
         $root_dn = $this->config_get('root_dn');
 
         // TODO: Do not query for both, it's either one or the other
@@ -1002,7 +1021,7 @@
         $result = $this->get_entry($subject_dn, $attributes);
 
         if (!$result) {
-            return array();
+            return ;
         }
 
         if (!in_array('*', $attributes) && !in_array('dn', $attributes)) {
@@ -1022,7 +1041,7 @@
      *
      * @return array Hash array (keys in original case)
      */
-    public function get_entry($dn, $attributes = array("*"), $controls = array())
+    public function get_entry($dn, $attributes = "*", $controls = )
     {
         $rec = null;
 
@@ -1064,7 +1083,7 @@
         $this->_debug("Finding replicas for this server.");
 
         // Search any host that is a replica for the current host
-        $replica_hosts = $this->config_get('replica_hosts', array());
+        $replica_hosts = $this->config_get('replica_hosts', );
         $root_dn       = $this->config_get('config_root_dn');
 
         if (!empty($replica_hosts)) {
@@ -1075,7 +1094,9 @@
         $ldap->connect();
         $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
+        $host_attrs = 'nsds5replicahost', 'nsds5replicaport';
+
+        $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
 
         if (!$result) {
             $this->_debug("No replicas configured");
@@ -1085,8 +1106,9 @@
         $this->_debug("Replication agreements found: " . var_export($result->entries(true), true));
 
         foreach ($result->entries(true) as $dn => $attrs) {
-            if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
-                $replica_hosts = $attrs'nsds5replicahost';
+            $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
+            if (!in_array($host, $replica_hosts)) {
+                $replica_hosts = $host;
             }
         }
 
@@ -1099,11 +1121,11 @@
         $ldap->close();
 
         foreach ($replica_hosts as $replica_host) {
-            $ldap->config_set('hosts', array($replica_host));
+            $ldap->config_set('hosts', $replica_host);
             $ldap->connect();
             $ldap->bind($this->_current_bind_dn, $this->_current_bind_pw);
 
-            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', array('nsds5replicahost'));
+            $result = $ldap->search($root_dn, '(objectclass=nsds5replicationagreement)', 'sub', $host_attrs);
             if (!$result) {
                 $this->_debug("No replicas configured on $replica_host");
                 $ldap->close();
@@ -1111,8 +1133,9 @@
             }
 
             foreach ($result->entries(true) as $dn => $attrs) {
-                if (!in_array($attrs'nsds5replicahost', $replica_hosts)) {
-                    $replica_hosts = $attrs'nsds5replicahost';
+                $host = $attrs'nsds5replicahost' . ':' . !empty($attrs'nsds5replicaport') ? $attrs'nsds5replicaport' : 389;
+                if (!in_array($host, $replica_hosts)) {
+                    $replica_hosts = $host;
                 }
             }
 
@@ -1199,12 +1222,12 @@
 
         $this->_debug("Net::LDAP3::login() original filter: " . $filter);
 
-        $replace_patterns = array(
+        $replace_patterns = 
             '/%s/' => $username,
             '/%d/' => $domain,
             '/%U/' => $localpart,
             '/%r/' => $realm
-        );
+        ;
 
         $filter = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter);
 
@@ -1249,20 +1272,20 @@
         $this->_debug("Net_LDAP3::list_group_members($dn)");
 
         if (is_array($entry) && in_array('objectclass', $entry)) {
-            if (!in_array(array('groupofnames', 'groupofuniquenames', 'groupofurls'), $entry'objectclass')) {
+            if (!in_array('groupofnames', 'groupofuniquenames', 'groupofurls', $entry'objectclass')) {
                 $this->_debug("Called list_group_members on a non-group!");
-                return array();
+                return ;
             }
         }
         else {
-            $entry = $this->get_entry_attributes($dn, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $entry = $this->get_entry_attributes($dn, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (!$entry) {
-                return array();
+                return ;
             }
         }
 
-        $group_members = array();
+        $group_members = ;
 
         foreach ((array)$entry'objectclass' as $objectclass) {
             switch (strtolower($objectclass)) {
@@ -1295,17 +1318,19 @@
 
         $this->_debug("Net_LDAP3::modify_entry() using rdn attribute: " . $rdn_attr);
 
-        $mod_array = array(
-            'add'       => array(), // For use with ldap_mod_add()
-            'del'       => array(), // For use with ldap_mod_del()
-            'replace'   => array(), // For use with ldap_mod_replace()
-            'rename'    => array(), // For use with ldap_rename()
-        );
+        $mod_array = 
+            'add'       => , // For use with ldap_mod_add()
+            'del'       => , // For use with ldap_mod_del()
+            'replace'   => , // For use with ldap_mod_replace()
+            'rename'    => , // For use with ldap_rename()
+        ;
 
         // This is me cheating. Remove this special attribute.
         if (array_key_exists('ou', $old_attrs) || array_key_exists('ou', $new_attrs)) {
-            $old_ou = is_array($old_attrs'ou') ? array_shift($old_attrs'ou') : $old_attrs'ou';
-            $new_ou = is_array($new_attrs'ou') ? array_shift($new_attrs'ou') : $new_attrs'ou';
+            $old_ou = isset($old_attrs'ou') && is_array($old_attrs'ou')
+                ? array_shift($old_attrs'ou') : (isset($old_attrs'ou') ? $old_attrs'ou' : null);
+            $new_ou = isset($new_attrs'ou') && is_array($new_attrs'ou')
+                ? array_shift($new_attrs'ou') : (isset($new_attrs'ou') ? $new_attrs'ou' : null);
             unset($old_attrs'ou');
             unset($new_attrs'ou');
         }
@@ -1354,7 +1379,7 @@
                                     $this->_debug("old attrs. is array, new attrs. is not array. new attr. exists in old attrs.");
 
                                     $rdn_attr_value  = array_shift($old_attrs$attr);
-                                    $_attr_to_remove = array();
+                                    $_attr_to_remove = ;
 
                                     foreach ($old_attrs$attr as $value) {
                                         if (strtolower($value) != strtolower($new_attrs$attr)) {
@@ -1606,7 +1631,7 @@
      *
      * @return mixed Net_LDAP3_Result object or number of entries (if $count_only=true) or False on failure
      */
-    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array(), $count_only = false)
+    public function search($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = 'dn', $props = , $count_only = false)
     {
         $controls = null;
 
@@ -1621,7 +1646,7 @@
 
         // make sure attributes list is not empty
         if (empty($attrs)) {
-            $attrs = array('dn');
+            $attrs = 'dn';
         }
         // make sure filter is not empty
         if (empty($filter)) {
@@ -1636,7 +1661,7 @@
             // when using VLV, we get the total count by...
             // ...either reading numSubOrdinates attribute
             if (($sub_filter = $this->config_get('numsub_filter')) &&
-                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, array('numSubOrdinates'), 0, 0, 0))
+                ($result_count = @$ns_function($this->conn, $base_dn, $sub_filter, 'numSubOrdinates', 0, 0, 0))
             ) {
                 $counts = ldap_get_entries($this->conn, $result_count);
                 for ($vlv_count = $j = 0; $j < $counts'count'; $j++) {
@@ -1648,7 +1673,7 @@
             // by fetching all records dn and counting them
             else if (PHP_VERSION_ID < 70305 && !function_exists('ldap_parse_virtuallist_control')) {
                 // @FIXME: this search will ignore $props'search'
-                $vlv_count = $this->search($base_dn, $filter, $scope, array('dn'), $props, true);
+                $vlv_count = $this->search($base_dn, $filter, $scope, 'dn', $props, true);
             }
 
             $controls = $this->_vlv_set_controls($sort, $this->list_page, $this->page_size,
@@ -1747,7 +1772,7 @@
      *
      * @see Net_LDAP3::search()
      */
-    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = array('dn'), $props = array())
+    public function search_entries($base_dn, $filter = '(objectclass=*)', $scope = 'sub', $attrs = 'dn', $props = )
     {
         $this->_debug("Net_LDAP3::search_entries with search " . var_export($props, true));
 
@@ -1792,13 +1817,14 @@
             return null;
         }
 
-        $operators = array('=', '~=', '>=', '<=');
+        $operators = '=', '~=', '>=', '<=';
         $filter    = '';
 
         foreach ((array) $search'params' as $field => $param) {
             $value = (array) $param'value';
+            $type = isset($param'type') ? strval($param'type') : null;
 
-            switch ((string)$param'type') {
+            switch ($type) {
                 case 'prefix':
                     $prefix = '';
                     $suffix = '*';
@@ -1820,7 +1846,7 @@
                     // this is a common query to find entry by DN, make sure
                     // it is a unified DN so special characters are handled correctly
                     if ($field == 'entrydn') {
-                        $value = array_map(array('Net_LDAP3', 'unified_dn'), $value);
+                        $value = array_map('Net_LDAP3', 'unified_dn', $value);
                     }
 
                     break;
@@ -1838,14 +1864,14 @@
                     break;
             }
 
-            $operator = $param'type' && in_array($param'type', $operators) ? $param'type' : '=';
+            $operator = $type && in_array($type, $operators) ? $type : '=';
 
             if (count($value) < 2) {
                 $value = array_pop($value);
             }
 
             if (is_array($value)) {
-                $val_filter = array();
+                $val_filter = ;
                 foreach ($value as $val) {
                     $val          = self::quote_string($val);
                     $val_filter = "(" . $field . $operator . $prefix . $val . $suffix . ")";
@@ -1859,8 +1885,9 @@
         }
 
         // join search parameters with specified operator ('OR' or 'AND')
-        if (count($search'params') > 1) {
-            $filter = '(' . ($search'operator' == 'AND' ? '&' : '|') . $filter . ')';
+        if (!empty($search'params') && count($search'params') > 1) {
+            $operator = !empty($search'operator') && $search'operator' == 'AND' ? '&' : '|';
+            $filter = '(' . $operator . $filter . ')';
         }
 
         return $filter;
@@ -1888,7 +1915,7 @@
      */
     public static function normalize_entry($entry, $flat = false)
     {
-        $rec = array();
+        $rec = ;
 
         for ($i=0; $i < $entry'count'; $i++) {
             $attr = $entry$i;
@@ -1912,10 +1939,10 @@
     public static function normalize_result($_result)
     {
         if (!is_array($_result)) {
-            return array();
+            return ;
         }
 
-        $result = array();
+        $result = ;
 
         for ($x = 0; $x < $_result'count'; $x++) {
             $dn    = $_result$x'dn';
@@ -2120,12 +2147,12 @@
             return $this->_vlv_indexes_and_searches;
         }
 
-        $this->_vlv_indexes_and_searches = array();
+        $this->_vlv_indexes_and_searches = ;
 
         $config_root_dn = $this->config_get('config_root_dn');
 
         if (empty($config_root_dn)) {
-            return array();
+            return ;
         }
 
         if ($cached_config = $this->get_cache_data('vlvconfig')) {
@@ -2138,11 +2165,11 @@
 
         $this->_debug("C: Search base dn: $config_root_dn scope sub with filter $search_filter");
 
-        $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, array('*'), 0, 0, 0);
+        $search_result = ldap_search($this->conn, $config_root_dn, $search_filter, '*', 0, 0, 0);
 
         if ($search_result === false) {
             $this->_debug("S: " . ldap_error($this->conn));
-            return array();
+            return ;
         }
 
         $this->_debug("S: " . ldap_count_entries($this->conn, $search_result) . " record(s) found");
@@ -2150,7 +2177,7 @@
         $vlv_searches = new Net_LDAP3_Result($this->conn, $config_root_dn, $search_filter, 'sub', $search_result);
 
         if ($vlv_searches->count() < 1) {
-            return array();
+            return ;
         }
 
         foreach ($vlv_searches->entries(true) as $vlv_search_dn => $vlv_search_attrs) {
@@ -2162,7 +2189,7 @@
             $this->_debug("C: Search base dn: $vlv_search_dn scope sub with filter $index_filter");
 
             // Multiple indexes may exist
-            $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, array('*'), 0, 0, 0);
+            $index_result = ldap_search($this->conn, $vlv_search_dn, $index_filter, '*', 0, 0, 0);
 
             if ($index_result === false) {
                 $this->_debug("S: " . ldap_error($this->conn));
@@ -2175,19 +2202,19 @@
             $vlv_indexes = $vlv_indexes->entries(true);
 
             // Reset this one for each VLV search.
-            $_vlv_sort = array();
+            $_vlv_sort = ;
 
             foreach ($vlv_indexes as $vlv_index_dn => $vlv_index_attrs) {
                 $_vlv_sort = explode(' ', trim($vlv_index_attrs'vlvsort'));
             }
 
-            $this->_vlv_indexes_and_searches = array(
-                $_vlv_base_dn => array(
+            $this->_vlv_indexes_and_searches = 
+                $_vlv_base_dn => 
                     'scope'  => self::scopeint2str($_vlv_scope),
                     'filter' => strtolower($_vlv_filter),
                     'sort'   => $_vlv_sort,
-                ),
-            );
+                ,
+            ;
         }
 
         // cache this
@@ -2207,22 +2234,26 @@
         $tls  = $this->config_get('use_tls', false);
 
         foreach ((array) $this->config_get('hosts') as $host) {
-            $this->_debug("C: Connect $host:$port");
+            $ldap_uri = $this->_host2uri($host, $port);
+            $this->_debug("C: Connect {$ldap_uri}");
 
-            $_ldap_cfg = array(
+            $_ldap_cfg = 
                 'host'   => $host,
                 'port'   => $port,
                 'tls'    => $tls,
                 'version' => 3,
                 'binddn' => $this->config_get('service_bind_dn'),
                 'bindpw' => $this->config_get('service_bind_pw')
-            );
+            ;
 
-            $_ldap_schema_cache_cfg = array(
+            $_ldap_schema_cache_cfg = 
                 'max_age' => 86400,
-                'path' => sprintf('%s/%s-Net_LDAP2_Schema.cache',
-                    sys_get_temp_dir() ?: '/tmp', str_replace('://', ':', $host) . (strpos($host, ":$port") ? '' : ":$port")),
-            );
+                'path' => sprintf(
+                    '%s/%s-Net_LDAP2_Schema.cache',
+                    sys_get_temp_dir() ?: '/tmp',
+                    str_replace('://', '/', ':', $ldap_uri)
+                ),
+            ;
 
             $_ldap = Net_LDAP2::connect($_ldap_cfg);
 
@@ -2259,7 +2290,7 @@
         $this->_debug("Net_LDAP3::list_group_member($dn)");
 
         $members       = (array) $members;
-        $group_members = array();
+        $group_members = ;
 
         // remove possible 'count' item
         unset($members'count');
@@ -2267,7 +2298,7 @@
         // Use the member attributes to return an array of member ldap objects
         // NOTE that the member attribute is supposed to contain a DN
         foreach ($members as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (empty($member_entry)) {
                 continue;
@@ -2291,14 +2322,14 @@
     {
         $this->_debug("Net_LDAP3::list_group_uniquemember($dn)", $entry);
 
-        $uniquemembers = (array)($uniquemembers);
-        $group_members = array();
+        $uniquemembers = (array) $uniquemembers;
+        $group_members = ;
 
         // remove possible 'count' item
         unset($uniquemembers'count');
 
         foreach ($uniquemembers as $member) {
-            $member_entry = $this->get_entry_attributes($member, array('member', 'uniquemember', 'memberurl', 'objectclass'));
+            $member_entry = $this->get_entry_attributes($member, 'member', 'uniquemember', 'memberurl', 'objectclass');
 
             if (empty($member_entry)) {
                 continue;
@@ -2322,9 +2353,9 @@
     {
         $this->_debug("Net_LDAP3::list_group_memberurl($dn)");
 
-        $group_members = array();
+        $group_members = ;
         $memberurls    = (array) $memberurls;
-        $attributes    = array('member', 'uniquemember', 'memberurl', 'objectclass');
+        $attributes    = 'member', 'uniquemember', 'memberurl', 'objectclass';
 
         // remove possible 'count' item
         unset($memberurls'count');
@@ -2339,7 +2370,7 @@
 
             foreach ($result->entries(true) as $entry_dn => $_entry) {
                 $group_members$entry_dn = $entry_dn;
-                $this->_debug("Found " . $entry_dn);
+                $this->_debug("Found {$entry_dn}");
 
                 if ($recurse) {
                     // Nested group
@@ -2471,7 +2502,7 @@
 
         switch ($_acl_components1) {
             case "entryLevel":
-                $attributes'entrylevelrights' = Array();
+                $attributes'entrylevelrights' = ;
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2484,7 +2515,7 @@
                 break;
 
             case "attributeLevel":
-                $attributes'attributelevelrights'$_acl_components2 = Array();
+                $attributes'attributelevelrights'$_acl_components2 = ;
                 $_acl_value = explode(',', $_acl_value);
 
                 foreach ($_acl_value as $right) {
@@ -2505,14 +2536,14 @@
     {
         $attribute_value  = str_replace(", ", ",", $attribute_value);
         $attribute_values = explode(",", $attribute_value);
-        $attribute_value  = array();
+        $attribute_value  = ;
 
         foreach ($attribute_values as $access_right) {
             $access_right_components = explode(":", $access_right);
             $access_attribute        = strtolower(array_shift($access_right_components));
             $access_value            = array_shift($access_right_components);
 
-            $attribute_value$access_attribute = array();
+            $attribute_value$access_attribute = ;
 
             for ($i = 0; $i < strlen($access_value); $i++) {
                 $method = $this->attribute_level_rights_mapsubstr($access_value, $i, 1);
@@ -2528,7 +2559,7 @@
 
     protected function parse_entry_level_rights($attribute_value)
     {
-        $_attribute_value = array();
+        $_attribute_value = ;
 
         for ($i = 0; $i < strlen($attribute_value); $i++) {
             $method = $this->entry_level_rights_mapsubstr($attribute_value, $i, 1);
@@ -2560,14 +2591,14 @@
         if ($this->_metadata === null) {
             $this->_debug("Obtaining LDAP server metadata");
 
-            $result = $this->get_entry('', array('vendorname', 'supportedcontrol'));
+            $result = $this->get_entry('', 'vendorname', 'supportedcontrol');
 
             if ($result) {
                 $this->_metadata = $result;
                 $this->_debug("LDAP Server metadata: " . var_export($result, true));
             }
             else {
-                $this->_metadata = array();
+                $this->_metadata = ;
                 $this->_warning("LDAP: Failed to get server metadata");
             }
         }
@@ -2620,14 +2651,14 @@
      */
     private function __log($level, $args)
     {
-        $msg = array();
+        $msg = ;
 
         foreach ($args as $arg) {
             $msg = !is_string($arg) ? var_export($arg, true) : $arg;
         }
 
         if (!empty($this->_log_hook)) {
-            call_user_func_array($this->_log_hook, array($level, $msg));
+            call_user_func_array($this->_log_hook, $level, $msg);
             return;
         }
 
@@ -2666,7 +2697,7 @@
         }
 
         if ($is_dn) {
-            $replace = array(
+            $replace = 
                 ',' => '\2c',
                 '=' => '\3d',
                 '+' => '\2b',
@@ -2676,16 +2707,16 @@
                 "\\"=> '\5c',
                 '"' => '\22',
                 '#' => '\23'
-            );
+            ;
         }
         else {
-            $replace = array(
+            $replace = 
                 '*' => '\2a',
                 '(' => '\28',
                 ')' => '\29',
                 "\\" => '\5c',
                 '/' => '\2f'
-            );
+            ;
         }
 
         if ($reverse) {
@@ -2704,10 +2735,10 @@
      */
     public static function unified_dn($str)
     {
-        $result = array();
+        $result = ;
 
         foreach (explode(',', $str) as $token) {
-            list($attr, $value) = explode('=', $token, 2);
+            list($attr, $value) = strpos($token, '=') !== false ? explode('=', $token, 2) : $token, '';
 
             $pos = 0;
             while (preg_match('/\\\\0-9a-fA-F{2}/', $value, $matches, PREG_OFFSET_CAPTURE, $pos)) {
@@ -2787,16 +2818,16 @@
      */
     private function _vlv_set_controls($sort, $list_page, $page_size, $search = null)
     {
-        $sort_ctrl = array(
+        $sort_ctrl = 
             'oid'   => self::CONTROL_SORT_REQUEST,
             'value' => self::_sort_ber_encode($sort)
-        );
+        ;
 
         if (!empty($search)) {
             $this->_debug("_vlv_set_controls to include search: " . var_export($search, true));
         }
 
-        $vlv_ctrl  = array(
+        $vlv_ctrl  = 
             'oid' => self::CONTROL_VLV_REQUEST,
             'value' => self::_vlv_ber_encode(
                     $offset = ($list_page-1) * $page_size + 1,
@@ -2804,13 +2835,13 @@
                     $search
             ),
             'iscritical' => true
-        );
+        ;
 
         $this->_debug("C: set controls sort=" . join(' ', unpack('H'.(strlen($sort_ctrl'value')*2), $sort_ctrl'value'))
             . " (" . implode(',', (array) $sort) . ");"
             . " vlv=" . join(' ', (unpack('H'.(strlen($vlv_ctrl'value')*2), $vlv_ctrl'value'))) . " ($offset/$page_size)");
 
-        $controls = array($sort_ctrl, $vlv_ctrl);
+        $controls = $sort_ctrl, $vlv_ctrl;
 
         if (PHP_VERSION_ID >= 70305) {
             return $controls;
@@ -2952,6 +2983,26 @@
     }
 
     /**
+     * Convert LDAP host/port into URI
+     */
+    private static function _host2uri($host, $port = null)
+    {
+        if (stripos($host, 'ldapi://') === 0) {
+            return $host;
+        }
+
+        if (strpos($host, '://') === false) {
+            $host = ($port == 636 ? 'ldaps' : 'ldap') . '://' . $host;
+        }
+
+        if ($port && !preg_match('/:0-9+$/', $host)) {
+            $host .= ':' . $port;
+        }
+
+        return $host;
+    }
+
+    /**
      * Get global handle for cache access
      *
      * @return object Cache object
@@ -2985,7 +3036,7 @@
                     }
 
                     $this->mc_available += intval($this->cache->addServer(
-                        $host, $port, $pconnect, 1, 1, 15, false, array($this, 'memcache_failure')));
+                        $host, $port, $pconnect, 1, 1, 15, false, $this, 'memcache_failure'));
                 }
 
                 // test connection and failover (will result in $this->mc_available == 0 on complete failure)
@@ -3005,7 +3056,7 @@
      */
     public function memcache_failure($host, $port)
     {
-        static $seen = array();
+        static $seen = ;
 
         // only report once
         if (!$seen"$host:$port"++) {
@@ -3111,7 +3162,7 @@
      *
      * @return array|bool Domain attributes (plus 'dn' attribute) or False if not found
      */
-    public function find_domain($domain, $attributes = array('*'))
+    public function find_domain($domain, $attributes = '*')
     {
         if (empty($domain)) {
             return false;

Overview

Request 3178 (accepted)

Request History