diff options
| author | Krzysztof <ports@bsdserwis.com> | 2022-11-27 21:17:33 +0100 |
|---|---|---|
| committer | Ronald Klop <ronald@FreeBSD.org> | 2022-12-01 10:53:34 +0100 |
| commit | fee2b338d2af883ca4dd75a7d285f65b284fb73b (patch) | |
| tree | 7ac4ed5fd0e3d09bbab43b2eeb736a36758cdd56 /net/phpldapadmin/files/patch-lib_QueryRender.php | |
| parent | editors/bless: resurrect^Wreadd previously expired port (diff) | |
net/phpldapadmin: fix support for php81+
PR: 266678
Reported by: Gerard Seibert
Approved by: rene (mentor)
Differential Revision: https://reviews.freebsd.org/D37513
Diffstat (limited to 'net/phpldapadmin/files/patch-lib_QueryRender.php')
| -rw-r--r-- | net/phpldapadmin/files/patch-lib_QueryRender.php | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/net/phpldapadmin/files/patch-lib_QueryRender.php b/net/phpldapadmin/files/patch-lib_QueryRender.php new file mode 100644 index 000000000000..ee9255bd6c83 --- /dev/null +++ b/net/phpldapadmin/files/patch-lib_QueryRender.php @@ -0,0 +1,38 @@ +--- lib/QueryRender.php.orig 2021-12-12 02:35:51 UTC ++++ lib/QueryRender.php +@@ -280,7 +280,7 @@ class QueryRender extends PageRender { + + # Iterate over each attribute for this entry + foreach (explode(',',$ado) as $attr) { +- $attr = strtolower($attr); ++ $attr = strtolower((string) $attr); + + # Ignore DN, we've already displayed it. + if ($attr == 'dn') +@@ -379,7 +379,7 @@ class QueryRender extends PageRender { + + # Special case for DNs + if ($attr == 'dn') { +- $dn_display = strlen($dndetails['dn']) > 40 ++ $dn_display = strlen((string) $dndetails['dn']) > 40 + ? sprintf('<acronym title="%s">%s...</acronym>',htmlspecialchars($dndetails['dn']),htmlspecialchars(substr($dndetails['dn'],0,40))) + : htmlspecialchars($dndetails['dn']); + +@@ -461,7 +461,7 @@ class QueryRender extends PageRender { + $results = array(); + + foreach (explode(',',$this->template->getAttrDisplayOrder()) as $attr) +- $results[strtolower($attr)] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID()); ++ $results[strtolower((string) $attr)] = $attribute_factory->newAttribute($attr,array('values'=>array()),$this->getServerID()); + + return $results; + } +@@ -470,7 +470,7 @@ class QueryRender extends PageRender { + if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) + debug_log('Entered (%%)',129,0,__FILE__,__LINE__,__METHOD__,$fargs); + +- return preg_replace('/=/','.',base64_encode($dn)); ++ return preg_replace('/=/','.',is_null(base64_encode($dn)? "":base64_encode($dn)); + } + + private function drawBaseTabs() { |