Date: Saturday, April 15, 2023 @ 17:44:43
Author: spupykin
Revision: 1446191
archrelease: copy trunk to community-any
Added:
phpldapadmin/repos/community-any/PKGBUILD
(from rev 1446190, phpldapadmin/trunk/PKGBUILD)
phpldapadmin/repos/community-any/disable-mcrypt.patch
(from rev 1446190, phpldapadmin/trunk/disable-mcrypt.patch)
phpldapadmin/repos/community-any/more-php8-fixes.patch
(from rev 1446190, phpldapadmin/trunk/more-php8-fixes.patch)
phpldapadmin/repos/community-any/password-unescape.patch
(from rev 1446190, phpldapadmin/trunk/password-unescape.patch)
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch
(from rev 1446190, phpldapadmin/trunk/phpldapadmin-1.2.3-php7_4.patch)
phpldapadmin/repos/community-any/sort-in-templates.patch
(from rev 1446190, phpldapadmin/trunk/sort-in-templates.patch)
Deleted:
phpldapadmin/repos/community-any/PKGBUILD
phpldapadmin/repos/community-any/disable-mcrypt.patch
phpldapadmin/repos/community-any/more-php8-fixes.patch
phpldapadmin/repos/community-any/password-unescape.patch
phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch
phpldapadmin/repos/community-any/sort-in-templates.patch
---------------------------------+
PKGBUILD | 83 +++++++--------
disable-mcrypt.patch | 72 ++++++-------
more-php8-fixes.patch | 198 +++++++++++++++++++-------------------
password-unescape.patch | 20 +--
phpldapadmin-1.2.3-php7_4.patch | 48 ++++-----
sort-in-templates.patch | 24 ++--
6 files changed, 221 insertions(+), 224 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-04-15 17:43:40 UTC (rev 1446190)
+++ PKGBUILD 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,43 +0,0 @@
-# Maintainer: Sergej Pupykin <[email protected]>
-
-pkgname=phpldapadmin
-pkgver=1.2.6.4
-pkgrel=8
-pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
-arch=('any')
-url="https://github.com/leenooks/phpLDAPadmin";
-license=('GPL')
-depends=('libldap' 'php')
-makedepends=('optipng')
-backup=("etc/webapps/phpldapadmin/config.php")
-source=($pkgname-$pkgver.tar.gz::https://github.com/leenooks/phpLDAPadmin/archive/$pkgver.tar.gz
-
https://github.com/leenooks/phpLDAPadmin/commit/661cab652b279680c07e81b4b71d1955ee2818ab.patch
- disable-mcrypt.patch
- sort-in-templates.patch
- more-php8-fixes.patch)
-sha256sums=('92e390c013714c75439737633ad4576bc642d87b0091fab6226cbbcb13a0ea48'
- '828984c8e015ea3ee43cfb61006b7502c5513007f710120bbc2102f7ad4e1a47'
- 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
- 'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f'
- '57e52f6a78c13ac231bc667932f2cde3d6d9dfa17b7011fb1ab6ab2ce0b966c1')
-
-prepare() {
- cd "$srcdir"/phpLDAPadmin-${pkgver}/
- find -type f -name '*.png' -exec optipng -quiet -force -fix {} \;
- patch -p1 -i "$srcdir"/disable-mcrypt.patch
- patch -p1 -i "$srcdir"/sort-in-templates.patch
- patch -p1 -i "$srcdir"/661cab652b279680c07e81b4b71d1955ee2818ab.patch
- patch -p1 -i "$srcdir"/more-php8-fixes.patch
- find -type f -name '*.orig' -exec rm -f {} \;
-}
-
-package() {
- _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
- mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
- cd ${_instdir}
-
- cp -ra "$srcdir"/phpLDAPadmin-${pkgver}/* .
-
- ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
- cp ${_instdir}/config/config.php.example
"$pkgdir"/etc/webapps/phpldapadmin/config.php
-}
Copied: phpldapadmin/repos/community-any/PKGBUILD (from rev 1446190,
phpldapadmin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,40 @@
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname=phpldapadmin
+pkgver=1.2.6.6
+pkgrel=1
+pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
+arch=('any')
+url="https://github.com/leenooks/phpLDAPadmin";
+license=('GPL')
+depends=('libldap' 'php')
+makedepends=('optipng')
+backup=("etc/webapps/phpldapadmin/config.php")
+source=($pkgname-$pkgver.tar.gz::https://github.com/leenooks/phpLDAPadmin/archive/$pkgver.tar.gz
+ disable-mcrypt.patch
+ sort-in-templates.patch
+ more-php8-fixes.patch)
+sha256sums=('7a8c02a611e60aa6713d1cf863dfac9637e23c3f4d401ea5e47dbe2b22d4895a'
+ 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
+ 'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f'
+ '57e52f6a78c13ac231bc667932f2cde3d6d9dfa17b7011fb1ab6ab2ce0b966c1')
+
+prepare() {
+ cd "$srcdir"/phpLDAPadmin-${pkgver}/
+ find -type f -name '*.png' -exec optipng -quiet -force -fix {} \;
+ patch -p1 -i "$srcdir"/disable-mcrypt.patch
+ patch -p1 -i "$srcdir"/sort-in-templates.patch
+ patch -p1 -i "$srcdir"/more-php8-fixes.patch
+ find -type f -name '*.orig' -exec rm -f {} \;
+}
+
+package() {
+ _instdir="$pkgdir"/usr/share/webapps/phpldapadmin
+ mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin
+ cd ${_instdir}
+
+ cp -ra "$srcdir"/phpLDAPadmin-${pkgver}/* .
+
+ ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php
+ cp ${_instdir}/config/config.php.example
"$pkgdir"/etc/webapps/phpldapadmin/config.php
+}
Deleted: disable-mcrypt.patch
===================================================================
--- disable-mcrypt.patch 2023-04-15 17:43:40 UTC (rev 1446190)
+++ disable-mcrypt.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,36 +0,0 @@
-diff -wbBur phpldapadmin-1.2.3/lib/functions.php
phpldapadmin-1.2.3.my/lib/functions.php
---- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000
+0400
-+++ phpldapadmin-1.2.3.my/lib/functions.php 2017-02-02 20:02:14.424245233
+0300
-@@ -745,6 +745,7 @@
- if (! trim($secret))
- return $data;
-
-+/*
- if (function_exists('mcrypt_module_open') && ! empty($data)) {
- $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
- $iv =
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -754,7 +755,7 @@
-
- return $encrypted_data;
- }
--
-+*/
- if (file_exists(LIBDIR.'blowfish.php'))
- require_once LIBDIR.'blowfish.php';
- else
-@@ -801,6 +802,7 @@
- if (! trim($secret))
- return $encdata;
-
-+/*
- if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
- $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
- $iv =
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
-@@ -810,6 +812,7 @@
-
- return $decrypted_data;
- }
-+*/
-
- if (file_exists(LIBDIR.'blowfish.php'))
- require_once LIBDIR.'blowfish.php';
Copied: phpldapadmin/repos/community-any/disable-mcrypt.patch (from rev
1446190, phpldapadmin/trunk/disable-mcrypt.patch)
===================================================================
--- disable-mcrypt.patch (rev 0)
+++ disable-mcrypt.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,36 @@
+diff -wbBur phpldapadmin-1.2.3/lib/functions.php
phpldapadmin-1.2.3.my/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000
+0400
++++ phpldapadmin-1.2.3.my/lib/functions.php 2017-02-02 20:02:14.424245233
+0300
+@@ -745,6 +745,7 @@
+ if (! trim($secret))
+ return $data;
+
++/*
+ if (function_exists('mcrypt_module_open') && ! empty($data)) {
+ $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+ $iv =
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -754,7 +755,7 @@
+
+ return $encrypted_data;
+ }
+-
++*/
+ if (file_exists(LIBDIR.'blowfish.php'))
+ require_once LIBDIR.'blowfish.php';
+ else
+@@ -801,6 +802,7 @@
+ if (! trim($secret))
+ return $encdata;
+
++/*
+ if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
+ $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+ $iv =
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -810,6 +812,7 @@
+
+ return $decrypted_data;
+ }
++*/
+
+ if (file_exists(LIBDIR.'blowfish.php'))
+ require_once LIBDIR.'blowfish.php';
Deleted: more-php8-fixes.patch
===================================================================
--- more-php8-fixes.patch 2023-04-15 17:43:40 UTC (rev 1446190)
+++ more-php8-fixes.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,99 +0,0 @@
-diff -wbBur phpLDAPadmin-1.2.6.4/lib/functions.php
phpLDAPadmin-1.2.6.4.my/lib/functions.php
---- phpLDAPadmin-1.2.6.4/lib/functions.php 2022-12-21 18:43:40.596996754
+0300
-+++ phpLDAPadmin-1.2.6.4.my/lib/functions.php 2022-12-21 18:43:30.240329853
+0300
-@@ -2113,9 +2113,11 @@
-
- } else {
- $jpeg_dimensions = getimagesize($jpeg_filename);
-+ if (!empty($jpeg_dimensions)) {
- $width = $jpeg_dimensions[0];
- $height = $jpeg_dimensions[1];
- }
-+ }
-
- unlink($jpeg_filename);
- }
-@@ -2131,7 +2133,7 @@
- $img_height = $height;
- }
-
-- $href =
sprintf('view_jpeg_photo.php?dn=%s&index=%s&attr=%s',rawurlencode($dn),$index,$attr_name);
-+ $href =
sprintf('view_jpeg_photo.php?dn=%s&index=%s&attr=%s',rawurlencode((string)$dn),$index,$attr_name);
-
- printf('<acronym title="%s %s. %s x %s
%s.">',number_format($outjpeg),_('bytes'),$width,$height,_('pixels'));
-
-@@ -2649,7 +2649,7 @@
- * encoded) into \<hexcode>.
- */
- function ldap_explode_dn_patch($dn,$with_attrib) {
-- $result = ldap_explode_dn($dn,$with_attrib);
-+ $result = ldap_explode_dn((string)$dn,$with_attrib);
- if (! $result)
- return null;
-
-diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/page.php
phpLDAPadmin-1.2.6.4/lib/page.php
---- phpLDAPadmin-1.2.6.4.q/lib/page.php 2022-08-05 03:49:10.000000000
+0300
-+++ phpLDAPadmin-1.2.6.4/lib/page.php 2023-02-05 02:45:35.280735011 +0300
-@@ -12,6 +12,7 @@
- * @package phpLDAPadmin
- * @subpackage Page
- */
-+#[AllowDynamicProperties]
- class page {
- # pre-HTML headers
- protected $_pageheader;
-diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/Template.php
phpLDAPadmin-1.2.6.4/lib/Template.php
---- phpLDAPadmin-1.2.6.4.q/lib/Template.php 2022-08-05 03:49:10.000000000
+0300
-+++ phpLDAPadmin-1.2.6.4/lib/Template.php 2023-02-05 02:45:24.740735139
+0300
-@@ -28,6 +28,7 @@
- * @todo RDN attributes need to be checked that are included in the schema,
otherwise mark it is invalid
- * @todo askcontainer is no longer used?
- */
-+#[AllowDynamicProperties]
- class Template extends xmlTemplate {
- # If this template visible on the template choice list
- private $visible = true;
-diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/TemplateRender.php
phpLDAPadmin-1.2.6.4/lib/TemplateRender.php
---- phpLDAPadmin-1.2.6.4.q/lib/TemplateRender.php 2023-02-05
02:45:05.520735361 +0300
-+++ phpLDAPadmin-1.2.6.4/lib/TemplateRender.php 2023-02-05
02:45:29.850735078 +0300
-@@ -12,6 +12,7 @@
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-+#[AllowDynamicProperties]
- class TemplateRender extends PageRender {
- # Page number
- private $pagelast;
-diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/PLAAttribute.php
phpLDAPadmin-1.2.6.4/lib/PLAAttribute.php
---- phpLDAPadmin-1.2.6.4.org/lib/PLAAttribute.php 2022-08-05
03:49:10.000000000 +0300
-+++ phpLDAPadmin-1.2.6.4/lib/PLAAttribute.php 2023-02-10 18:26:14.114672713
+0300
-@@ -12,6 +12,7 @@
- * @package phpLDAPadmin
- * @subpackage Templates
- */
-+#[AllowDynamicProperties]
- class PLAAttribute {
- # Attribute Name
- public $name;
-diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/import_functions.php
phpLDAPadmin-1.2.6.4/lib/import_functions.php
---- phpLDAPadmin-1.2.6.4.org/lib/import_functions.php 2022-08-05
03:49:10.000000000 +0300
-+++ phpLDAPadmin-1.2.6.4/lib/import_functions.php 2023-02-16
02:05:49.159978183 +0300
-@@ -144,6 +144,7 @@
- * @package phpLDAPadmin
- * @subpackage Import
- */
-+#[AllowDynamicProperties]
- class ImportLDIF extends Import {
- private $_currentLineNumber = 0;
- private $_currentLine = '';
-diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/Query.php
phpLDAPadmin-1.2.6.4/lib/Query.php
---- phpLDAPadmin-1.2.6.4.org/lib/Query.php 2022-08-05 03:49:10.000000000
+0300
-+++ phpLDAPadmin-1.2.6.4/lib/Query.php 2023-02-16 02:05:15.176645250 +0300
-@@ -12,6 +12,7 @@
- * @package phpLDAPadmin
- * @subpackage Queries
- */
-+#[AllowDynamicProperties]
- class Query extends xmlTemplate {
- protected $description = '';
- public $results = array();
Copied: phpldapadmin/repos/community-any/more-php8-fixes.patch (from rev
1446190, phpldapadmin/trunk/more-php8-fixes.patch)
===================================================================
--- more-php8-fixes.patch (rev 0)
+++ more-php8-fixes.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,99 @@
+diff -wbBur phpLDAPadmin-1.2.6.4/lib/functions.php
phpLDAPadmin-1.2.6.4.my/lib/functions.php
+--- phpLDAPadmin-1.2.6.4/lib/functions.php 2022-12-21 18:43:40.596996754
+0300
++++ phpLDAPadmin-1.2.6.4.my/lib/functions.php 2022-12-21 18:43:30.240329853
+0300
+@@ -2113,9 +2113,11 @@
+
+ } else {
+ $jpeg_dimensions = getimagesize($jpeg_filename);
++ if (!empty($jpeg_dimensions)) {
+ $width = $jpeg_dimensions[0];
+ $height = $jpeg_dimensions[1];
+ }
++ }
+
+ unlink($jpeg_filename);
+ }
+@@ -2131,7 +2133,7 @@
+ $img_height = $height;
+ }
+
+- $href =
sprintf('view_jpeg_photo.php?dn=%s&index=%s&attr=%s',rawurlencode($dn),$index,$attr_name);
++ $href =
sprintf('view_jpeg_photo.php?dn=%s&index=%s&attr=%s',rawurlencode((string)$dn),$index,$attr_name);
+
+ printf('<acronym title="%s %s. %s x %s
%s.">',number_format($outjpeg),_('bytes'),$width,$height,_('pixels'));
+
+@@ -2649,7 +2649,7 @@
+ * encoded) into \<hexcode>.
+ */
+ function ldap_explode_dn_patch($dn,$with_attrib) {
+- $result = ldap_explode_dn($dn,$with_attrib);
++ $result = ldap_explode_dn((string)$dn,$with_attrib);
+ if (! $result)
+ return null;
+
+diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/page.php
phpLDAPadmin-1.2.6.4/lib/page.php
+--- phpLDAPadmin-1.2.6.4.q/lib/page.php 2022-08-05 03:49:10.000000000
+0300
++++ phpLDAPadmin-1.2.6.4/lib/page.php 2023-02-05 02:45:35.280735011 +0300
+@@ -12,6 +12,7 @@
+ * @package phpLDAPadmin
+ * @subpackage Page
+ */
++#[AllowDynamicProperties]
+ class page {
+ # pre-HTML headers
+ protected $_pageheader;
+diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/Template.php
phpLDAPadmin-1.2.6.4/lib/Template.php
+--- phpLDAPadmin-1.2.6.4.q/lib/Template.php 2022-08-05 03:49:10.000000000
+0300
++++ phpLDAPadmin-1.2.6.4/lib/Template.php 2023-02-05 02:45:24.740735139
+0300
+@@ -28,6 +28,7 @@
+ * @todo RDN attributes need to be checked that are included in the schema,
otherwise mark it is invalid
+ * @todo askcontainer is no longer used?
+ */
++#[AllowDynamicProperties]
+ class Template extends xmlTemplate {
+ # If this template visible on the template choice list
+ private $visible = true;
+diff -wbBur phpLDAPadmin-1.2.6.4.q/lib/TemplateRender.php
phpLDAPadmin-1.2.6.4/lib/TemplateRender.php
+--- phpLDAPadmin-1.2.6.4.q/lib/TemplateRender.php 2023-02-05
02:45:05.520735361 +0300
++++ phpLDAPadmin-1.2.6.4/lib/TemplateRender.php 2023-02-05
02:45:29.850735078 +0300
+@@ -12,6 +12,7 @@
+ * @package phpLDAPadmin
+ * @subpackage Templates
+ */
++#[AllowDynamicProperties]
+ class TemplateRender extends PageRender {
+ # Page number
+ private $pagelast;
+diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/PLAAttribute.php
phpLDAPadmin-1.2.6.4/lib/PLAAttribute.php
+--- phpLDAPadmin-1.2.6.4.org/lib/PLAAttribute.php 2022-08-05
03:49:10.000000000 +0300
++++ phpLDAPadmin-1.2.6.4/lib/PLAAttribute.php 2023-02-10 18:26:14.114672713
+0300
+@@ -12,6 +12,7 @@
+ * @package phpLDAPadmin
+ * @subpackage Templates
+ */
++#[AllowDynamicProperties]
+ class PLAAttribute {
+ # Attribute Name
+ public $name;
+diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/import_functions.php
phpLDAPadmin-1.2.6.4/lib/import_functions.php
+--- phpLDAPadmin-1.2.6.4.org/lib/import_functions.php 2022-08-05
03:49:10.000000000 +0300
++++ phpLDAPadmin-1.2.6.4/lib/import_functions.php 2023-02-16
02:05:49.159978183 +0300
+@@ -144,6 +144,7 @@
+ * @package phpLDAPadmin
+ * @subpackage Import
+ */
++#[AllowDynamicProperties]
+ class ImportLDIF extends Import {
+ private $_currentLineNumber = 0;
+ private $_currentLine = '';
+diff -wbBur phpLDAPadmin-1.2.6.4.org/lib/Query.php
phpLDAPadmin-1.2.6.4/lib/Query.php
+--- phpLDAPadmin-1.2.6.4.org/lib/Query.php 2022-08-05 03:49:10.000000000
+0300
++++ phpLDAPadmin-1.2.6.4/lib/Query.php 2023-02-16 02:05:15.176645250 +0300
+@@ -12,6 +12,7 @@
+ * @package phpLDAPadmin
+ * @subpackage Queries
+ */
++#[AllowDynamicProperties]
+ class Query extends xmlTemplate {
+ protected $description = '';
+ public $results = array();
Deleted: password-unescape.patch
===================================================================
--- password-unescape.patch 2023-04-15 17:43:40 UTC (rev 1446190)
+++ password-unescape.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,10 +0,0 @@
---- a/htdocs/login.php 2020-06-17 18:17:18.926320916 -0600
-+++ b/htdocs/login.php 2020-06-17 18:16:59.796222429 -0600
-@@ -14,6 +14,7 @@
- $user = array();
- $user['login'] = get_request('login');
- $user['password'] = get_request('login_pass');
-+ $user['password'] = str_replace('&', '&', $user['password']);
-
- if ($user['login'] && ! strlen($user['password']))
- system_message(array(
Copied: phpldapadmin/repos/community-any/password-unescape.patch (from rev
1446190, phpldapadmin/trunk/password-unescape.patch)
===================================================================
--- password-unescape.patch (rev 0)
+++ password-unescape.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,10 @@
+--- a/htdocs/login.php 2020-06-17 18:17:18.926320916 -0600
++++ b/htdocs/login.php 2020-06-17 18:16:59.796222429 -0600
+@@ -14,6 +14,7 @@
+ $user = array();
+ $user['login'] = get_request('login');
+ $user['password'] = get_request('login_pass');
++ $user['password'] = str_replace('&', '&', $user['password']);
+
+ if ($user['login'] && ! strlen($user['password']))
+ system_message(array(
Deleted: phpldapadmin-1.2.3-php7_4.patch
===================================================================
--- phpldapadmin-1.2.3-php7_4.patch 2023-04-15 17:43:40 UTC (rev 1446190)
+++ phpldapadmin-1.2.3-php7_4.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,24 +0,0 @@
-diff -wbBur phpldapadmin-1.2.3.org/lib/functions.php
phpldapadmin-1.2.3/lib/functions.php
---- phpldapadmin-1.2.3.org/lib/functions.php 2012-10-01 10:54:14.000000000
+0400
-+++ phpldapadmin-1.2.3/lib/functions.php 2020-04-25 10:41:00.000000000
+0300
-@@ -1588,7 +1591,7 @@
-
- # Return icon filename based upon objectClass value
- if (in_array('sambaaccount',$object_classes) &&
-- '$' == $rdn{ strlen($rdn) - 1 })
-+ '$' == $rdn[ strlen($rdn) - 1 ])
- return 'nt_machine.png';
-
- if (in_array('sambaaccount',$object_classes))
-diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php
phpldapadmin-1.2.3/lib/TemplateRender.php
---- phpldapadmin-1.2.3.org/lib/TemplateRender.php 2012-10-01
10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3/lib/TemplateRender.php 2020-04-25 10:43:00.000000000
+0300
-@@ -200,7 +200,7 @@
- $next_number = $vals;
-
- foreach ($mod as $calc) {
-- $operand = $calc{0};
-+ $operand = $calc[0];
- $operator = substr ($calc,1);
-
- switch ($operand) {
Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php7_4.patch (from
rev 1446190, phpldapadmin/trunk/phpldapadmin-1.2.3-php7_4.patch)
===================================================================
--- phpldapadmin-1.2.3-php7_4.patch (rev 0)
+++ phpldapadmin-1.2.3-php7_4.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,24 @@
+diff -wbBur phpldapadmin-1.2.3.org/lib/functions.php
phpldapadmin-1.2.3/lib/functions.php
+--- phpldapadmin-1.2.3.org/lib/functions.php 2012-10-01 10:54:14.000000000
+0400
++++ phpldapadmin-1.2.3/lib/functions.php 2020-04-25 10:41:00.000000000
+0300
+@@ -1588,7 +1591,7 @@
+
+ # Return icon filename based upon objectClass value
+ if (in_array('sambaaccount',$object_classes) &&
+- '$' == $rdn{ strlen($rdn) - 1 })
++ '$' == $rdn[ strlen($rdn) - 1 ])
+ return 'nt_machine.png';
+
+ if (in_array('sambaaccount',$object_classes))
+diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php
phpldapadmin-1.2.3/lib/TemplateRender.php
+--- phpldapadmin-1.2.3.org/lib/TemplateRender.php 2012-10-01
10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3/lib/TemplateRender.php 2020-04-25 10:43:00.000000000
+0300
+@@ -200,7 +200,7 @@
+ $next_number = $vals;
+
+ foreach ($mod as $calc) {
+- $operand = $calc{0};
++ $operand = $calc[0];
+ $operator = substr ($calc,1);
+
+ switch ($operand) {
Deleted: sort-in-templates.patch
===================================================================
--- sort-in-templates.patch 2023-04-15 17:43:40 UTC (rev 1446190)
+++ sort-in-templates.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -1,12 +0,0 @@
-diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php
phpldapadmin-1.2.3/lib/TemplateRender.php
---- phpldapadmin-1.2.3.org/lib/TemplateRender.php 2012-10-01
10:54:14.000000000 +0400
-+++ phpldapadmin-1.2.3/lib/TemplateRender.php 2018-02-02 19:06:45.674760057
+0300
-@@ -321,6 +321,8 @@
-
- $vals = array();
-
-+ asort($picklistvalues);
-+
- foreach ($picklistvalues as $key => $values) {
- $display = $args[3];
-
Copied: phpldapadmin/repos/community-any/sort-in-templates.patch (from rev
1446190, phpldapadmin/trunk/sort-in-templates.patch)
===================================================================
--- sort-in-templates.patch (rev 0)
+++ sort-in-templates.patch 2023-04-15 17:44:43 UTC (rev 1446191)
@@ -0,0 +1,12 @@
+diff -wbBur phpldapadmin-1.2.3.org/lib/TemplateRender.php
phpldapadmin-1.2.3/lib/TemplateRender.php
+--- phpldapadmin-1.2.3.org/lib/TemplateRender.php 2012-10-01
10:54:14.000000000 +0400
++++ phpldapadmin-1.2.3/lib/TemplateRender.php 2018-02-02 19:06:45.674760057
+0300
+@@ -321,6 +321,8 @@
+
+ $vals = array();
+
++ asort($picklistvalues);
++
+ foreach ($picklistvalues as $key => $values) {
+ $display = $args[3];
+
