Date: Tuesday, January 3, 2023 @ 00:51:40
Author: spupykin
Revision: 1374185
upgpkg: phpldapadmin 1.2.6.4-5
more php8 fixes
Modified:
phpldapadmin/trunk/PKGBUILD
phpldapadmin/trunk/more-php8-fixes.patch
-----------------------+
PKGBUILD | 4 ++--
more-php8-fixes.patch | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-01-03 00:26:47 UTC (rev 1374184)
+++ PKGBUILD 2023-01-03 00:51:40 UTC (rev 1374185)
@@ -2,7 +2,7 @@
pkgname=phpldapadmin
pkgver=1.2.6.4
-pkgrel=4
+pkgrel=5
pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
arch=('any')
url="https://github.com/leenooks/phpLDAPadmin";
@@ -19,7 +19,7 @@
'828984c8e015ea3ee43cfb61006b7502c5513007f710120bbc2102f7ad4e1a47'
'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837'
'fc2d4bdf4d43a90aa541fe20eeed494caa339eacf3f08b06539efcdbacc3578f'
- 'c348768f384810bbd7e36ec301a456f94d8f0016750f7cdadd7411816d39428c')
+ '0ac7f280a42e069ce77a66c585d9ab1dbc09900edd5512b5bc3fc4fe54c4889d')
prepare() {
cd "$srcdir"/phpLDAPadmin-${pkgver}/
Modified: more-php8-fixes.patch
===================================================================
--- more-php8-fixes.patch 2023-01-03 00:26:47 UTC (rev 1374184)
+++ more-php8-fixes.patch 2023-01-03 00:51:40 UTC (rev 1374185)
@@ -1,6 +1,27 @@
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>.
*/
