Changes of Revision 17

View file
buildtarball.sh Changed
​x
 
1
@@ -6,13 +6,6 @@
2
 GIT_REF=master
3
 NAME=kolab-webadmin-$VERSION
4
5
-if  -x "/usr/local/bin/lessc" ; then
6
-    LESSC=/usr/local/bin/lessc
7
-else
8
-    LESSC=~/node_modules/less/bin/lessc
9
-fi
10
-
11
-
12
 ROOT_DIR=$(pwd)
13
14
 rm -Rf /tmp/$NAME
15
@@ -57,19 +50,6 @@
16
 composer install
17
 popd
18
19
-# cat << EOF > ./phpstan.neon
20
-# parameters:
21
-#     level: 1
22
-#     parallel:
23
-#         processTimeout: 300.0
24
-#     paths:
25
-#         - app/
26
-# EOF
27
-
28
-# php -dmemory_limit=500M vendor/bin/phpstan analyse
29
-
30
-# popd
31
-
32
 tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME
33
34
 cd "$PWD"
35
​
View file
kolab-webadmin-3.2.16.tar.gz/composer.lock Changed
19
 
1
@@ -12,7 +12,7 @@
2
             "source": {
3
                 "type": "git",
4
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
5
-                "reference": "c00dcbd05daa8be57b60ce59b8fb03f424e76bcd"
6
+                "reference": "5fa4880317618d053afb32ee2b3a6f388ef1b38d"
7
             },
8
             "require": {
9
                 "pear/net_ldap2": ">=2.0.12",
10
@@ -52,7 +52,7 @@
11
                 "pear",
12
                 "vlv"
13
             ,
14
-            "time": "2023-04-26T17:01:57+00:00"
15
+            "time": "2023-04-28T12:37:23+00:00"
16
         },
17
         {
18
             "name": "pear/console_getopt",
19
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/autoload.php Changed
7
 
1
@@ -4,4 +4,4 @@
2
3
 require_once __DIR__ . '/composer/autoload_real.php';
4
5
-return ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec::getLoader();
6
+return ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60::getLoader();
7
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_real.php Changed
31
 
1
@@ -2,7 +2,7 @@
2
3
 // autoload_real.php @generated by Composer
4
5
-class ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec
6
+class ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60
7
 {
8
     private static $loader;
9
10
@@ -24,9 +24,9 @@
11
12
         require __DIR__ . '/platform_check.php';
13
14
-        spl_autoload_register(array('ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec', 'loadClassLoader'), true, true);
15
+        spl_autoload_register(array('ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60', 'loadClassLoader'), true, true);
16
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
17
-        spl_autoload_unregister(array('ComposerAutoloaderInit04ebda2b969986cdc27e322d5bd7b5ec', 'loadClassLoader'));
18
+        spl_autoload_unregister(array('ComposerAutoloaderInit19afba4b5a430345b9f9c9eef78fda60', 'loadClassLoader'));
19
20
         $includePaths = require __DIR__ . '/include_paths.php';
21
         $includePaths = get_include_path();
22
@@ -36,7 +36,7 @@
23
         if ($useStaticLoader) {
24
             require __DIR__ . '/autoload_static.php';
25
26
-            call_user_func(\Composer\Autoload\ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::getInitializer($loader));
27
+            call_user_func(\Composer\Autoload\ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::getInitializer($loader));
28
         } else {
29
             $map = require __DIR__ . '/autoload_namespaces.php';
30
             foreach ($map as $namespace => $path) {
31
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/composer/autoload_static.php Changed
23
 
1
@@ -4,7 +4,7 @@
2
3
 namespace Composer\Autoload;
4
5
-class ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec
6
+class ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60
7
 {
8
     public static $prefixesPsr0 = array (
9
         'N' =>
10
@@ -237,9 +237,9 @@
11
     public static function getInitializer(ClassLoader $loader)
12
     {
13
         return \Closure::bind(function () use ($loader) {
14
-            $loader->prefixesPsr0 = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$prefixesPsr0;
15
-            $loader->fallbackDirsPsr0 = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$fallbackDirsPsr0;
16
-            $loader->classMap = ComposerStaticInit04ebda2b969986cdc27e322d5bd7b5ec::$classMap;
17
+            $loader->prefixesPsr0 = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$prefixesPsr0;
18
+            $loader->fallbackDirsPsr0 = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$fallbackDirsPsr0;
19
+            $loader->classMap = ComposerStaticInit19afba4b5a430345b9f9c9eef78fda60::$classMap;
20
21
         }, null, ClassLoader::class);
22
     }
23
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.json Changed
17
 
1
@@ -7,13 +7,13 @@
2
             "source": {
3
                 "type": "git",
4
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
5
-                "reference": "c00dcbd05daa8be57b60ce59b8fb03f424e76bcd"
6
+                "reference": "5fa4880317618d053afb32ee2b3a6f388ef1b38d"
7
             },
8
             "require": {
9
                 "pear/net_ldap2": ">=2.0.12",
10
                 "php": ">=5.3.3"
11
             },
12
-            "time": "2023-04-26T17:01:57+00:00",
13
+            "time": "2023-04-28T12:37:23+00:00",
14
             "default-branch": true,
15
             "type": "library",
16
             "installation-source": "source",
17
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/composer/installed.php Changed
10
 
1
@@ -18,7 +18,7 @@
2
             'aliases' => array(
3
                 0 => '9999999-dev',
4
             ),
5
-            'reference' => 'c00dcbd05daa8be57b60ce59b8fb03f424e76bcd',
6
+            'reference' => '5fa4880317618d053afb32ee2b3a6f388ef1b38d',
7
             'dev_requirement' => false,
8
         ),
9
         'kolab/webadmin' => array(
10
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/ORIG_HEAD Changed
4
 
1
@@ -1,1 +1,1 @@
2
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd
3
+5fa4880317618d053afb32ee2b3a6f388ef1b38d
4
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/index Changed
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/info/refs Changed
11
 
1
@@ -1,6 +1,6 @@
2
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd   refs/heads/master
3
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd   refs/remotes/origin/HEAD
4
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd   refs/remotes/origin/master
5
+5fa4880317618d053afb32ee2b3a6f388ef1b38d   refs/heads/master
6
+5fa4880317618d053afb32ee2b3a6f388ef1b38d   refs/remotes/origin/HEAD
7
+5fa4880317618d053afb32ee2b3a6f388ef1b38d   refs/remotes/origin/master
8
 b51b8121f82b9296565e93cc95788ddff1b06514   refs/tags/pear-Net-LDAP3-1.0.0
9
 6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480   refs/tags/pear-Net-LDAP3-1.0.0^{}
10
 3e7503645609fac9d54bc963afbbddc668bef16c   refs/tags/pear-Net-LDAP3-1.0.1
11
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed
8
 
1
@@ -1,3 +1,3 @@
2
-0000000000000000000000000000000000000000 c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200  checkout: moving from master to master
4
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200  reset: moving to c00dcbd05daa8be57b60ce59b8fb03f424e76bcd
5
+0000000000000000000000000000000000000000 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
6
+5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200  checkout: moving from master to master
7
+5fa4880317618d053afb32ee2b3a6f388ef1b38d 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200  reset: moving to 5fa4880317618d053afb32ee2b3a6f388ef1b38d
8
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed
4
 
1
@@ -1,1 +1,1 @@
2
-0000000000000000000000000000000000000000 c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
+0000000000000000000000000000000000000000 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
4
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed
4
 
1
@@ -1,1 +1,1 @@
2
-0000000000000000000000000000000000000000 c00dcbd05daa8be57b60ce59b8fb03f424e76bcd Christian Mollekopf <mollekopf@apheleia-it.ch> 1682592098 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
3
+0000000000000000000000000000000000000000 5fa4880317618d053afb32ee2b3a6f388ef1b38d Christian Mollekopf <mollekopf@apheleia-it.ch> 1682685846 +0200  clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
4
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/info/packs Changed
5
 
1
@@ -1,2 +1,2 @@
2
-P pack-793892001401ec5d9cf66f132ba703f4de39cac4.pack
3
+P pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.pack
4
5
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-793892001401ec5d9cf66f132ba703f4de39cac4.idx Deleted
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-793892001401ec5d9cf66f132ba703f4de39cac4.pack Deleted
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.idx Added
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/objects/pack/pack-9000a48131cbccc467cb4ef37bd8b9a5236c5c4e.pack Added
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/packed-refs Changed
8
 
1
@@ -1,5 +1,5 @@
2
 # pack-refs with: peeled fully-peeled sorted
3
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd refs/remotes/origin/master
4
+5fa4880317618d053afb32ee2b3a6f388ef1b38d refs/remotes/origin/master
5
 b51b8121f82b9296565e93cc95788ddff1b06514 refs/tags/pear-Net-LDAP3-1.0.0
6
 ^6ab1a1b73e1cdc0a2ab76fd7c184b37dd9628480
7
 3e7503645609fac9d54bc963afbbddc668bef16c refs/tags/pear-Net-LDAP3-1.0.1
8
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/.git/refs/heads/master Changed
4
 
1
@@ -1,1 +1,1 @@
2
-c00dcbd05daa8be57b60ce59b8fb03f424e76bcd
3
+5fa4880317618d053afb32ee2b3a6f388ef1b38d
4
​
View file
kolab-webadmin-3.2.16.tar.gz/vendor/kolab/net_ldap3/lib/Net/LDAP3.php Changed
56
 
1
@@ -785,20 +785,40 @@
2
         }
3
4
         $output = array();
5
-        $command = Array(
6
-                $moz_ldapsearch,
7
-                '-x',
8
-                '-h',
9
-                $this->_current_host,
10
-                '-b',
11
-                escapeshellarg($entry_dn),
12
-                '-s',
13
-                'base',
14
-                '-D',
15
-                escapeshellarg($this->_current_bind_dn),
16
-                '-w',
17
-                escapeshellarg($this->_current_bind_pw)
18
-            );
19
+
20
+        if ($moz_ldapsearch == "/usr/bin/ldapsearch") {
21
+            $command = Array(
22
+                    $moz_ldapsearch,
23
+                    '-x',
24
+                    '-h',
25
+                    preg_replace('|^a-z+://|i', '', $this->_current_host),
26
+                    '-b',
27
+                    escapeshellarg($entry_dn),
28
+                    '-s',
29
+                    'base',
30
+                    '-D',
31
+                    escapeshellarg($this->_current_bind_dn),
32
+                    '-w',
33
+                    escapeshellarg($this->_current_bind_pw)
34
+                );
35
+        } else {
36
+            $command = Array(
37
+                    $moz_ldapsearch,
38
+                    '-x',
39
+                    '-h',
40
+                    preg_replace('|^a-z+://|i', '', $this->_current_host),
41
+                    '-p',
42
+                    $this->config_get('port', 389),
43
+                    '-b',
44
+                    escapeshellarg($entry_dn),
45
+                    '-s',
46
+                    'base',
47
+                    '-D',
48
+                    escapeshellarg($this->_current_bind_dn),
49
+                    '-w',
50
+                    escapeshellarg($this->_current_bind_pw)
51
+                );
52
+        }
53
54
         if ($this->vendor_name() == "Oracle Corporation") {
55
             // For Oracle DSEE
56
​
Locations
Help
Contact