Date: Tue, 3 Sep 2019 21:09:28 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511040 - in head/net/phpldapadmin: . files Message-ID: <201909032109.x83L9SGv019477@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Tue Sep 3 21:09:28 2019 New Revision: 511040 URL: https://svnweb.freebsd.org/changeset/ports/511040 Log: net/phpldapadmin: fix search button in PHP 7.3 Add a patch to fix the search button which is only broken with PHP 7.3. PR: 240296 Submitted by: Krzysztof (maintainer) Added: head/net/phpldapadmin/files/extra-patch-lib__PageRender.php (contents, props changed) Modified: head/net/phpldapadmin/Makefile Modified: head/net/phpldapadmin/Makefile ============================================================================== --- head/net/phpldapadmin/Makefile Tue Sep 3 21:03:00 2019 (r511039) +++ head/net/phpldapadmin/Makefile Tue Sep 3 21:09:28 2019 (r511040) @@ -3,11 +3,11 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} -PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} +PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} MAINTAINER= ports@bsdserwis.com COMMENT= PHP application to administer LDAP over the web @@ -34,6 +34,12 @@ SUB_FILES+= pkg-message .SILENT: +.include <bsd.port.pre.mk> + +.if (${PHP_VER} == 73) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-lib__PageRender.php +.endif + post-patch: cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ @@ -52,4 +58,4 @@ do-install: fi \ done -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/net/phpldapadmin/files/extra-patch-lib__PageRender.php ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/phpldapadmin/files/extra-patch-lib__PageRender.php Tue Sep 3 21:09:28 2019 (r511040) @@ -0,0 +1,42 @@ +--- lib/QueryRender.php.orig 2019-08-07 01:14:46.000000000 +0200 ++++ lib/QueryRender.php 2019-09-02 10:45:44.632080000 +0200 +@@ -284,10 +284,10 @@ class QueryRender extends PageRender { + + # Ignore DN, we've already displayed it. + if ($attr == 'dn') +- continue; ++ continue 2; + + if (! isset($dndetails[$attr])) +- continue; ++ continue 2; + + # Set our object with our values + $afattrs[$attr]->clearValue(); +@@ -321,7 +321,7 @@ class QueryRender extends PageRender { + if (! $results) { + echo _('Search returned no results'); + +- continue; ++ continue 2; + } + + printf('<form action="cmd.php" method="post" id="massform_%s">',$counter); +@@ -374,7 +374,7 @@ class QueryRender extends PageRender { + # If the entry is blank, we'll draw an empty box and continue. + if (! isset($dndetails[$attr])) { + echo '<td> </td>'; +- continue; ++ continue 2; + } + + # Special case for DNs +@@ -384,7 +384,7 @@ class QueryRender extends PageRender { + : htmlspecialchars($dndetails['dn']); + + printf('<td><a href="cmd.php?%s">%s</a></td>',htmlspecialchars($href),$dn_display); +- continue; ++ continue 2; + } + + # Set our object with our values
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909032109.x83L9SGv019477>