From nobody Fri Dec 16 16:30:56 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NYZNK06D9z1Cgfm; Fri, 16 Dec 2022 16:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NYZNJ6mzxz3MPP; Fri, 16 Dec 2022 16:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671208256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6z2tPrlR7PKWALkxw3z1R/JwCdzKJcA08NlDOX52IaM=; b=B95DABDb6wokXISxoa5QpxqdbcU9UdUfWQbjt+5am4Xe+ZrbkD0kSBHtZ6C61d8UsdzZDA MCta/+SWzNdQsWbdR4hRuFYSDX9DqdmhNmtlGSkp39baSODrAxwnlSI6/+un16qFPAuC3R g/jTUNckgEX0+H8ef3LrYSQbCRIih1uJDgT+pAZqGBfBd6uGQPywrcdlkSS9O000jtRFoy PKQwGZd9y8o1Q/HyyQTKx4AWM/E5B6P8qlwL2GH4cj6VvQIB64lQ+CHrySJ4j8pLBbVFVH ool0Lk0CipXpin/kS6z8y1+D73BZ+vlqYTs1xiS7DykU3uowUCm8ReMra+XMzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671208256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6z2tPrlR7PKWALkxw3z1R/JwCdzKJcA08NlDOX52IaM=; b=FhfkfodN0czm7evxP+M4SVXfzInWNJcoKb1UyPhhV4hnSrQWStNuoPMLlHPywEEplk2dTG xbFbXWIZMD6lqOQ9aXlt36StIWmNgzaRZV/UIHnc/lhMNZyZ++xRu0l8bKA3nfpnJcx+xb 1SHz4p1Jsydge8IXXQDXvnyH4xBauUQ24TL1aKbT2v1yLLpBOx/PiPPHmelwCsx9qfDboq rpXM3HKdQc9vdudu3zFSfkBE3yZSjgzmqJEMbqBx29FvSuFzhp2FnOSRb0oazVNFCVvuh9 pHbO0so3HGsxR8Htc6D/AQN7GlBAzaIgmb0zLl+xnDweU6pOZaWiz5TJbDB8BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671208256; a=rsa-sha256; cv=none; b=tIb7MkY0irSGQPBMnSTqP+oAHxSeGRL6KhKJ+5b+nTGeOl2vt0DJLgCBwlIo603wslYIqX Ne3zGbjeqIQ8Zv0BVKypYoLoPR07H2YU9R4ZMSn1xN06CTunq6G8SvC9uxrIosnhiJrh1n wxRrCwLZrKmZDGF7nMXwJsw0xLC2oJtpitt8IOol+OGrCf5+dADvZZOUn3nvBqIwgB5ZMO PZ4MhaoSti1uBMyrC7UspOy9rISbs2auYqHV5W6sCXSnRGv/MBLgmL+TWQdUhXHg0Hfla2 jlrXNAZYkmjacGohF12WulYXE3Nrr7Yfxc0BU3tpsi4oiFizKBvc9adfgPgWYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NYZNJ5rz3zKSH; Fri, 16 Dec 2022 16:30:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BGGUuxs079639; Fri, 16 Dec 2022 16:30:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BGGUu3f079637; Fri, 16 Dec 2022 16:30:56 GMT (envelope-from git) Date: Fri, 16 Dec 2022 16:30:56 GMT Message-Id: <202212161630.2BGGUu3f079637@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 5765ec9382b8 - main - net/phpldapadmin: update to 1.2.6.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5765ec9382b822381ab6de329704b94ba31f85fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=5765ec9382b822381ab6de329704b94ba31f85fb commit 5765ec9382b822381ab6de329704b94ba31f85fb Author: Ronald Klop AuthorDate: 2022-12-14 15:57:23 +0000 Commit: Ronald Klop CommitDate: 2022-12-16 16:30:43 +0000 net/phpldapadmin: update to 1.2.6.4 This includes all the fixes for php81+. Changes: https://github.com/leenooks/phpLDAPadmin/compare/1.2.6.3...1.2.6.4 PR: 268349 Approved by: rene (mentor) Differential Revision: https://reviews.freebsd.org/D37700 --- net/phpldapadmin/Makefile | 4 +- net/phpldapadmin/distinfo | 6 +- .../files/patch-htdocs_add__oclass__form.php | 11 - .../files/patch-htdocs_add__value__form.php | 32 -- net/phpldapadmin/files/patch-htdocs_cmd.php | 11 - net/phpldapadmin/files/patch-htdocs_copy.php | 11 - .../files/patch-htdocs_download__binary__attr.php | 11 - .../files/patch-htdocs_draw__tree__node.php | 11 - net/phpldapadmin/files/patch-htdocs_expand.php | 11 - .../files/patch-htdocs_export__form.php | 11 - net/phpldapadmin/files/patch-htdocs_login.php | 11 - .../files/patch-htdocs_login__form.php | 16 - net/phpldapadmin/files/patch-htdocs_monitor.php | 29 -- .../files/patch-htdocs_purge__cache.php | 11 - net/phpldapadmin/files/patch-htdocs_refresh.php | 11 - net/phpldapadmin/files/patch-htdocs_schema.php | 165 ------- .../files/patch-htdocs_server__info.php | 20 - .../files/patch-htdocs_view__jpeg__photo.php | 11 - net/phpldapadmin/files/patch-lib_AJAXTree.php | 47 -- net/phpldapadmin/files/patch-lib_Attribute.php | 59 --- .../files/patch-lib_AttributeFactory.php | 55 --- .../files/patch-lib_BinaryAttribute.php | 11 - net/phpldapadmin/files/patch-lib_DateAttribute.php | 10 - net/phpldapadmin/files/patch-lib_DnAttribute.php | 10 - net/phpldapadmin/files/patch-lib_GidAttribute.php | 10 - net/phpldapadmin/files/patch-lib_HTMLTree.php | 32 -- .../files/patch-lib_MultiLineAttribute.php | 11 - .../files/patch-lib_ObjectClassAttribute.php | 10 - net/phpldapadmin/files/patch-lib_PageRender.php | 149 ------- .../files/patch-lib_PasswordAttribute.php | 10 - net/phpldapadmin/files/patch-lib_Query.php | 68 --- net/phpldapadmin/files/patch-lib_QueryRender.php | 38 -- .../files/patch-lib_SelectionAttribute.php | 11 - .../files/patch-lib_ShadowAttribute.php | 11 - net/phpldapadmin/files/patch-lib_Template.php | 248 ----------- .../files/patch-lib_TemplateRender.php | 99 ----- net/phpldapadmin/files/patch-lib_Tree.php | 29 -- net/phpldapadmin/files/patch-lib_TreeItem.php | 11 - net/phpldapadmin/files/patch-lib_Visitor.php | 43 -- net/phpldapadmin/files/patch-lib_common.php | 25 -- net/phpldapadmin/files/patch-lib_ds.php | 29 -- net/phpldapadmin/files/patch-lib_ds__ldap.php | 490 --------------------- net/phpldapadmin/files/patch-lib_ds__ldap__pla.php | 67 --- .../files/patch-lib_export__functions.php | 46 -- net/phpldapadmin/files/patch-lib_functions.php | 483 -------------------- .../files/patch-lib_import__functions.php | 104 ----- net/phpldapadmin/files/patch-lib_page.php | 29 -- .../files/patch-lib_schema__functions.php | 365 --------------- net/phpldapadmin/files/patch-lib_xml2array.php | 20 - net/phpldapadmin/files/patch-lib_xmlTemplates.php | 56 --- net/phpldapadmin/files/patch-tools_po_Makefile | 7 - 51 files changed, 4 insertions(+), 3082 deletions(-) diff --git a/net/phpldapadmin/Makefile b/net/phpldapadmin/Makefile index 140a93c19f30..af5ae13874b2 100644 --- a/net/phpldapadmin/Makefile +++ b/net/phpldapadmin/Makefile @@ -1,6 +1,5 @@ PORTNAME= phpldapadmin -PORTVERSION= 1.2.6.3 -PORTREVISION= 3 +PORTVERSION= 1.2.6.4 CATEGORIES= net www PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -44,7 +43,6 @@ SUB_FILES+= pkg-message post-patch: cd ${WRKSRC} ; \ - ${CP} lib/Attribute.php lib/PLAAttribute.php; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ ! -name .gitignore ! -name *.orig \ ! -name Attribute.php | ${SORT} | \ diff --git a/net/phpldapadmin/distinfo b/net/phpldapadmin/distinfo index 567c137d5bf2..3045d451f81c 100644 --- a/net/phpldapadmin/distinfo +++ b/net/phpldapadmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640685573 -SHA256 (leenooks-phpLDAPadmin-1.2.6.3_GH0.tar.gz) = 718f805403279f8e54caa1046b5f43c989e3bce82c408d22d349b5393e4a2cea -SIZE (leenooks-phpLDAPadmin-1.2.6.3_GH0.tar.gz) = 1130061 +TIMESTAMP = 1670919231 +SHA256 (leenooks-phpLDAPadmin-1.2.6.4_GH0.tar.gz) = 92e390c013714c75439737633ad4576bc642d87b0091fab6226cbbcb13a0ea48 +SIZE (leenooks-phpLDAPadmin-1.2.6.4_GH0.tar.gz) = 1130930 diff --git a/net/phpldapadmin/files/patch-htdocs_add__oclass__form.php b/net/phpldapadmin/files/patch-htdocs_add__oclass__form.php deleted file mode 100644 index 18a1b8d5eb02..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_add__oclass__form.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/add_oclass_form.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/add_oclass_form.php -@@ -36,7 +36,7 @@ $ldap['attrs']['must'] = array(); - - foreach ($request['template']->getAttribute('objectclass')->getValues() as $oclass_name) { - # Exclude "top" if its there. -- if (! strcasecmp('top',$oclass_name)) -+ if (! strcasecmp('top',(string) $oclass_name)) - continue; - - if ($soc = $app['server']->getSchemaObjectClass($oclass_name)) diff --git a/net/phpldapadmin/files/patch-htdocs_add__value__form.php b/net/phpldapadmin/files/patch-htdocs_add__value__form.php deleted file mode 100644 index f7546f5c7c55..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_add__value__form.php +++ /dev/null @@ -1,32 +0,0 @@ ---- htdocs/add_value_form.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/add_value_form.php -@@ -32,12 +32,12 @@ if ($request['attribute']->isReadOnly()) - */ - - # Render the form --if (! strcasecmp($request['attr'],'objectclass') || get_request('meth','REQUEST') != 'ajax') { -+if (! strcasecmp((string) $request['attr'],'objectclass') || get_request('meth','REQUEST') != 'ajax') { - # Render the form. - $request['page']->drawTitle(sprintf('%s %s %s %s',_('Add new'),htmlspecialchars($request['attr']),_('value to'),htmlspecialchars(get_rdn($request['dn'])))); - $request['page']->drawSubTitle(); - -- if (! strcasecmp($request['attr'],'objectclass')) { -+ if (! strcasecmp((string) $request['attr'],'objectclass')) { - echo '
'; - echo '
'; - echo ''; -@@ -91,12 +91,12 @@ if (! strcasecmp($request['attr'],'objectclass') || ge - printf('%s',_('Enter the value(s) you would like to add:')); - echo ''; - -- if (! strcasecmp($request['attr'],'objectclass')) { -+ if (! strcasecmp((string) $request['attr'],'objectclass')) { - # If our attr is an objectClass, fetch all available objectClasses and remove those from the list that are already defined in the entry - $socs = $app['server']->SchemaObjectClasses(); - - foreach ($request['attribute']->getValues() as $oclass) -- unset($socs[strtolower($oclass)]); -+ unset($socs[strtolower((string) $oclass)]); - - # Draw objectClass selection - echo ''; diff --git a/net/phpldapadmin/files/patch-htdocs_cmd.php b/net/phpldapadmin/files/patch-htdocs_cmd.php deleted file mode 100644 index 1f4d7b8bf8f0..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_cmd.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/cmd.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/cmd.php -@@ -41,7 +41,7 @@ if (DEBUG_ENABLED) - $www['page'] = new page($app['server']->getIndex()); - - # See if we can render the command --if (trim($www['cmd'])) { -+if (trim((string) $www['cmd'])) { - # If this is a READ-WRITE operation, the LDAP server must not be in READ-ONLY mode. - if ($app['server']->isReadOnly() && ! in_array(get_request('cmd','REQUEST'),$app['readwrite_cmds'])) - error(_('You cannot perform updates while server is in read-only mode'),'error','index.php'); diff --git a/net/phpldapadmin/files/patch-htdocs_copy.php b/net/phpldapadmin/files/patch-htdocs_copy.php deleted file mode 100644 index 3f0a46fcfea2..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_copy.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/copy.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/copy.php -@@ -21,7 +21,7 @@ $ldap['SRC'] = $_SESSION[APPCONFIG]->getServer(get_req - $ldap['DST'] = $_SESSION[APPCONFIG]->getServer(get_request('server_id_dst')); - - # Error checking --if (! trim($request['dnDST'])) -+if (! trim((string) $request['dnDST'])) - error(_('You left the destination DN blank.'),'error','index.php'); - - if ($ldap['DST']->isReadOnly()) diff --git a/net/phpldapadmin/files/patch-htdocs_download__binary__attr.php b/net/phpldapadmin/files/patch-htdocs_download__binary__attr.php deleted file mode 100644 index e855abaaaf7f..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_download__binary__attr.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/download_binary_attr.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/download_binary_attr.php -@@ -15,7 +15,7 @@ require './common.php'; - - $request = array(); - $request['dn'] = get_request('dn','GET'); --$request['attr'] = strtolower(get_request('attr','GET',true)); -+$request['attr'] = strtolower((string) get_request('attr','GET',true)); - $request['index'] = get_request('index','GET',false,0); - $request['type'] = get_request('type','GET',false,'octet-stream'); - $request['filename'] = get_request('filename','GET',false,sprintf('%s:%s.bin',get_rdn($request['dn'],true),$request['attr'])); diff --git a/net/phpldapadmin/files/patch-htdocs_draw__tree__node.php b/net/phpldapadmin/files/patch-htdocs_draw__tree__node.php deleted file mode 100644 index 4e27a0f9497e..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_draw__tree__node.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/draw_tree_node.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/draw_tree_node.php -@@ -50,7 +50,7 @@ if ($request['dn']) { - } - - if ($treesave) -- set_cached_item($app['server']->getIndex(),'tree','null',$tree); -+ set_cached_item($app['server']->getIndex(),$tree,'tree','null'); - - if ($request['dn']) - echo $tree->draw_children($dnentry,$request['code']); diff --git a/net/phpldapadmin/files/patch-htdocs_expand.php b/net/phpldapadmin/files/patch-htdocs_expand.php deleted file mode 100644 index 62962d0bce47..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_expand.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/expand.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/expand.php -@@ -19,7 +19,7 @@ $dn = get_request('dn','GET',true); - $tree = get_cached_item($app['server']->getIndex(),'tree'); - $entry = $tree->getEntry($dn); - $entry->open(); --set_cached_item($app['server']->getIndex(),'tree','null',$tree); -+set_cached_item($app['server']->getIndex(),$tree,'tree','null'); - - header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s', - $app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param())); diff --git a/net/phpldapadmin/files/patch-htdocs_export__form.php b/net/phpldapadmin/files/patch-htdocs_export__form.php deleted file mode 100644 index 57387665fe49..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_export__form.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/export_form.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/export_form.php -@@ -166,7 +166,7 @@ function get_line_end_format() { - */ - function get_user_agent_string() { - if (isset($_SERVER['HTTP_USER_AGENT'])) -- return strtolower($_SERVER['HTTP_USER_AGENT']); -+ return strtolower((string) $_SERVER['HTTP_USER_AGENT']); - else - return ''; - } diff --git a/net/phpldapadmin/files/patch-htdocs_login.php b/net/phpldapadmin/files/patch-htdocs_login.php deleted file mode 100644 index 3ef6332048ac..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_login.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/login.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/login.php -@@ -22,7 +22,7 @@ if ($pass) { - $user['password'] = get_request('login_pass'); - $user['password'] = html_entity_decode($user['password'], ENT_QUOTES); - -- if ($user['login'] && !strlen($user['password'])) { -+ if ($user['login'] && empty($user['password'])) { - system_message(array( - 'title' => _('Authenticate to server'), - 'body' => _('You left the password blank.'), diff --git a/net/phpldapadmin/files/patch-htdocs_login__form.php b/net/phpldapadmin/files/patch-htdocs_login__form.php deleted file mode 100644 index 167c8f898f0a..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_login__form.php +++ /dev/null @@ -1,16 +0,0 @@ ---- htdocs/login_form.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/login_form.php -@@ -19,11 +19,11 @@ echo '
'; - $isHTTPS = false; - - # Check if the current connection is encrypted --if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') { -+if (isset($_SERVER['HTTPS']) && strtolower((string) $_SERVER['HTTPS']) == 'on') { - $isHTTPS = true; - } - # Check if a proxy server downstream does encryption for us --elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && strtolower($_SERVER['HTTP_X_FORWARDED_SSL']) -+elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && strtolower((string) $_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && strtolower($_SERVER['HTTP_X_FORWARDED_SSL']) - == 'on') { - $isHTTPS = true; - } diff --git a/net/phpldapadmin/files/patch-htdocs_monitor.php b/net/phpldapadmin/files/patch-htdocs_monitor.php deleted file mode 100644 index 50f11af4ad41..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_monitor.php +++ /dev/null @@ -1,29 +0,0 @@ ---- htdocs/monitor.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/monitor.php -@@ -48,7 +48,7 @@ foreach (array( - if (isset($results[$dn]['description'])) { - $description = implode(' ',$results[$dn]['description']); - -- $description = preg_replace('/"/','\'',$description); -+ $description = preg_replace('/"/','\'',is_null($description)? "":$description); - } else { - $description = ''; - } -@@ -103,7 +103,7 @@ foreach (array( - else - $sc = $results[$key][$attr]; - -- if (strcasecmp('supportedcontrol',$attr) == 0) -+ if (strcasecmp('supportedcontrol',(string) $attr) == 0) - foreach ($sc as $control) { - $oidtotext = support_oid_to_text($control); - -@@ -199,7 +199,7 @@ foreach (array( - ) as $dn ) { - - $description = implode(' ',$results[$dn]['description']); -- $description = preg_replace('/"/','\'',$description); -+ $description = preg_replace('/"/','\'',is_null($description)? "":$description); - - printf('',$description,$dn); - echo '',$counter%2 ? 'odd' : 'even',$rule->getName(), -- strcasecmp($entry['value'],$rule->getName()) ? 'none' : ''); -+ strcasecmp((string) $entry['value'],(string) $rule->getName()) ? 'none' : ''); - else - printf('',$counter%2 ? 'odd' : 'even',$rule->getName()); - printf('',$oid); -@@ -467,12 +467,12 @@ switch($entry['view']) { - echo '
'; - - foreach ($socs as $name => $oclass) { -- if (isAjaxEnabled() || (is_null($entry['value']) || ! trim($entry['value']) || $entry['value']==$oclass->getName())) { -- if ((! is_null($entry['value']) && $entry['value']==$oclass->getName()) || ! trim($entry['value'])) -+ if (isAjaxEnabled() || (is_null($entry['value']) || ! trim((string) $entry['value']) || $entry['value']==$oclass->getName())) { -+ if ((! is_null($entry['value']) && $entry['value']==$oclass->getName()) || ! trim((string) $entry['value'])) - $entry['viewed'] = true; - - if (isAjaxEnabled() && $entry['value']) -- printf('
',$oclass->getName(),strcasecmp($entry['value'],$oclass->getName()) ? 'none' : ''); -+ printf('
',(string) $oclass->getName(),strcasecmp((string) $entry['value'],(string) $oclass->getName()) ? 'none' : ''); - else - printf('
',$oclass->getName()); - -@@ -494,10 +494,10 @@ switch($entry['view']) { - - else - foreach ($oclass->getSupClasses() as $i => $object_class) { -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower($object_class))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower((string) $object_class))); - if (isAjaxEnabled()) - printf('%s', -- $href,strtolower($object_class),$object_class); -+ $href,strtolower((string) $object_class),$object_class); - else - printf('%s', - $href,$object_class,_('Jump to this objectClass definition'),$object_class); -@@ -508,7 +508,7 @@ switch($entry['view']) { - echo '
'; - - printf('',$oidtext['title']); - - else -- if (strlen($value) > 0) -+ if (strlen((string) $value) > 0) - printf('',$value); - - } else { -@@ -69,7 +69,7 @@ foreach ($attrs as $key => $values) { - - print ''; - -- if (isset($oidtext['desc']) && trim($oidtext['desc'])) -+ if (isset($oidtext['desc']) && trim((string) $oidtext['desc'])) - printf('',$oidtext['desc']); - else - echo ''; diff --git a/net/phpldapadmin/files/patch-htdocs_view__jpeg__photo.php b/net/phpldapadmin/files/patch-htdocs_view__jpeg__photo.php deleted file mode 100644 index ee1c236eac4e..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_view__jpeg__photo.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/view_jpeg_photo.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/view_jpeg_photo.php -@@ -15,7 +15,7 @@ require './common.php'; - - $request = array(); - $request['dn'] = get_request('dn','GET'); --$request['attr'] = strtolower(get_request('attr','GET',false,'jpegphoto')); -+$request['attr'] = strtolower((string) get_request('attr','GET',false,'jpegphoto')); - $request['index'] = get_request('index','GET',false,0); - $request['type'] = get_request('type','GET',false,'image/jpeg'); - $request['filename'] = get_request('filename','GET',false,sprintf('%s.jpg',get_rdn($request['dn'],true))); diff --git a/net/phpldapadmin/files/patch-lib_AJAXTree.php b/net/phpldapadmin/files/patch-lib_AJAXTree.php deleted file mode 100644 index 6cbe8ba84deb..000000000000 --- a/net/phpldapadmin/files/patch-lib_AJAXTree.php +++ /dev/null @@ -1,47 +0,0 @@ ---- lib/AJAXTree.php.orig 2021-12-12 02:35:51 UTC -+++ lib/AJAXTree.php -@@ -31,7 +31,7 @@ class AJAXTree extends HTMLTree { - # Level pre-treatment - $code = ''; - if (is_string($level)) { -- for ($i=0; $i 0) - $code = '0' * $level; - -- $level = strlen($code); -+ $level = strlen((string) $code); - - # Get entry to display as node - $entry = $this->getEntry($item); -@@ -189,7 +189,7 @@ class AJAXTree extends HTMLTree { - - $indent = ''; - -- for ($i=0; $i',IMGDIR); -@@ -223,7 +223,7 @@ class AJAXTree extends HTMLTree { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',33,0,__FILE__,__LINE__,__METHOD__,$fargs); - -- if (strlen($level) == 0) -+ if (strlen((string) $level) == 0) - return ''; - - $server = $this->getServer(); -@@ -243,7 +243,7 @@ class AJAXTree extends HTMLTree { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',33,0,__FILE__,__LINE__,__METHOD__,$fargs); - -- if (strlen($level) == 0) -+ if (strlen((string) $level) == 0) - return ''; - - $server = $this->getServer(); diff --git a/net/phpldapadmin/files/patch-lib_Attribute.php b/net/phpldapadmin/files/patch-lib_Attribute.php deleted file mode 100644 index 4d3d129dd577..000000000000 --- a/net/phpldapadmin/files/patch-lib_Attribute.php +++ /dev/null @@ -1,59 +0,0 @@ ---- lib/Attribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/Attribute.php -@@ -133,9 +133,9 @@ class PLAAttribute { - debug_log('Entered (%%)',5,0,__FILE__,__LINE__,__METHOD__,$fargs,$this->name); - - if ($real) -- return $lower ? strtolower($this->name) : $this->name; -+ return $lower ? strtolower((string) $this->name) : $this->name; - else -- return $lower ? strtolower($this->real_attr_name()) : $this->real_attr_name(); -+ return $lower ? strtolower((string) $this->real_attr_name()) : $this->real_attr_name(); - } - - public function getValues() { -@@ -389,7 +389,7 @@ class PLAAttribute { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',5,1,__FILE__,__LINE__,__METHOD__,$fargs); - -- $this->type = strtolower($type); -+ $this->type = strtolower((string) $type); - } - - public function getType() { -@@ -403,7 +403,7 @@ class PLAAttribute { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',5,1,__FILE__,__LINE__,__METHOD__,$fargs); - -- $this->ldaptype = strtolower($type); -+ $this->ldaptype = strtolower((string) $type); - } - - public function getLDAPtype() { -@@ -671,7 +671,7 @@ class PLAAttribute { - - # Store our Aliases - foreach ($sattr->getAliases() as $alias) -- array_push($this->aliases,strtolower($alias)); -+ array_push($this->aliases,strtolower((string) $alias)); - - if ($sattr->getIsSingleValue()) - $this->setMaxValueCount(1); -@@ -840,7 +840,7 @@ class PLAAttribute { - 'type'=>'warn')); - } - -- elseif (is_string($values) && (strlen($values) > 0)) -+ elseif (is_string($values) && (strlen((string) $values) > 0)) - $this->values = array($values); - } - -@@ -877,7 +877,7 @@ class PLAAttribute { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',5,1,__FILE__,__LINE__,__METHOD__,$fargs,$this->name); - -- return preg_replace('/;.*$/U','',$this->name); -+ return preg_replace('/;.*$/U','',is_null($this->name)? "":$this->name); - } - - /** diff --git a/net/phpldapadmin/files/patch-lib_AttributeFactory.php b/net/phpldapadmin/files/patch-lib_AttributeFactory.php deleted file mode 100644 index 7f53c65e6b79..000000000000 --- a/net/phpldapadmin/files/patch-lib_AttributeFactory.php +++ /dev/null @@ -1,55 +0,0 @@ ---- lib/AttributeFactory.php.orig 2021-12-12 02:35:51 UTC -+++ lib/AttributeFactory.php -@@ -83,7 +83,7 @@ class AttributeFactory { - if (isset($values['type'])) - switch ($values['type']) { - case 'password': -- if (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword')) -+ if (! strcasecmp((string) $name,'sambaLMPassword') || ! strcasecmp((string) $name,'sambaNTPassword')) - return $this->newSambaPasswordAttribute($name,$values,$server_id,$source); - else - return $this->newPasswordAttribute($name,$values,$server_id,$source); -@@ -96,7 +96,7 @@ class AttributeFactory { - return $this->newMultiLineAttribute($name,$values,$server_id,$source); - } - -- if (! strcasecmp($name,'objectClass')) { -+ if (! strcasecmp((string) $name,'objectClass')) { - return $this->newObjectClassAttribute($name,$values,$server_id,$source); - - } elseif ($app['server']->isJpegPhoto($name) || in_array($name,$app['server']->getValue('server','jpeg_attributes'))) { -@@ -105,16 +105,16 @@ class AttributeFactory { - } elseif ($app['server']->isAttrBinary($name)) { - return $this->newBinaryAttribute($name,$values,$server_id,$source); - -- } elseif (! strcasecmp($name,'userPassword')) { -+ } elseif (! strcasecmp((string) $name,'userPassword')) { - return $this->newPasswordAttribute($name,$values,$server_id,$source); - -- } elseif (! strcasecmp($name,'sambaLMPassword') || ! strcasecmp($name,'sambaNTPassword')) { -+ } elseif (! strcasecmp((string) $name,'sambaLMPassword') || ! strcasecmp((string) $name,'sambaNTPassword')) { - return $this->newSambaPasswordAttribute($name,$values,$server_id,$source); - -- } elseif (in_array(strtolower($name),array_keys(array_change_key_case($_SESSION[APPCONFIG]->getValue('appearance','date_attrs'))))) { -+ } elseif (in_array(strtolower((string) $name),array_keys(array_change_key_case($_SESSION[APPCONFIG]->getValue('appearance','date_attrs'))))) { - return $this->newDateAttribute($name,$values,$server_id,$source); - -- } elseif (in_array(strtolower($name),array('shadowlastchange','shadowmin','shadowmax','shadowexpire','shadowwarning','shadowinactive'))) { -+ } elseif (in_array(strtolower((string) $name),array('shadowlastchange','shadowmin','shadowmax','shadowexpire','shadowwarning','shadowinactive'))) { - return $this->newShadowAttribute($name,$values,$server_id,$source); - - } elseif ($app['server']->isAttrBoolean($name)) { -@@ -129,11 +129,11 @@ class AttributeFactory { - } elseif ($app['server']->isMultiLineAttr($name)) { - return $this->newMultiLineAttribute($name,$values,$server_id,$source); - -- } elseif (! strcasecmp($name,'gidNumber')) { -+ } elseif (! strcasecmp((string) $name,'gidNumber')) { - return $this->newGidAttribute($name,$values,$server_id,$source); - - } else { -- return new Attribute($name,$values,$server_id,$source); -+ return new PLAAttribute($name,$values,$server_id,$source); - } - } - diff --git a/net/phpldapadmin/files/patch-lib_BinaryAttribute.php b/net/phpldapadmin/files/patch-lib_BinaryAttribute.php deleted file mode 100644 index 841994753df5..000000000000 --- a/net/phpldapadmin/files/patch-lib_BinaryAttribute.php +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/BinaryAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/BinaryAttribute.php -@@ -12,7 +12,7 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class BinaryAttribute extends Attribute { -+class BinaryAttribute extends PLAAttribute { - protected $filepaths; - protected $filenames; - diff --git a/net/phpldapadmin/files/patch-lib_DateAttribute.php b/net/phpldapadmin/files/patch-lib_DateAttribute.php deleted file mode 100644 index 4b699a6e1474..000000000000 --- a/net/phpldapadmin/files/patch-lib_DateAttribute.php +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/DateAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/DateAttribute.php -@@ -12,6 +12,6 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class DateAttribute extends Attribute { -+class DateAttribute extends PLAAttribute { - } - ?> diff --git a/net/phpldapadmin/files/patch-lib_DnAttribute.php b/net/phpldapadmin/files/patch-lib_DnAttribute.php deleted file mode 100644 index 313ba2e56e6e..000000000000 --- a/net/phpldapadmin/files/patch-lib_DnAttribute.php +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/DnAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/DnAttribute.php -@@ -12,6 +12,6 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class DnAttribute extends Attribute { -+class DnAttribute extends PLAAttribute { - } - ?> diff --git a/net/phpldapadmin/files/patch-lib_GidAttribute.php b/net/phpldapadmin/files/patch-lib_GidAttribute.php deleted file mode 100644 index 0f13a12edca6..000000000000 --- a/net/phpldapadmin/files/patch-lib_GidAttribute.php +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/GidAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/GidAttribute.php -@@ -12,6 +12,6 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class GidAttribute extends Attribute { -+class GidAttribute extends PLAAttribute { - } - ?> diff --git a/net/phpldapadmin/files/patch-lib_HTMLTree.php b/net/phpldapadmin/files/patch-lib_HTMLTree.php deleted file mode 100644 index bcd63afee7ee..000000000000 --- a/net/phpldapadmin/files/patch-lib_HTMLTree.php +++ /dev/null @@ -1,32 +0,0 @@ ---- lib/HTMLTree.php.orig 2021-12-12 02:35:51 UTC -+++ lib/HTMLTree.php -@@ -168,9 +168,10 @@ class HTMLTree extends Tree { - printf(''; -@@ -361,7 +362,7 @@ class HTMLTree extends Tree { - $logged_in_dn_array = array(); - - } else { -- $logged_in_branch = preg_replace('/,'.$server->getContainerTop($logged_in_dn).'$/','',$logged_in_dn); -+ $logged_in_branch = preg_replace('/,'.$server->getContainerTop($logged_in_dn).'$/','',is_null($logged_in_dn)? "":$logged_in_dn); - $logged_in_dn_array = pla_explode_dn($logged_in_branch); - } - -@@ -375,7 +376,7 @@ class HTMLTree extends Tree { - if (! is_array($logged_in_dn_array)) - $logged_in_dn_array = array($logged_in_dn); - -- if (trim($logged_in_dn)) { -+ if (trim((string) $logged_in_dn)) { - if ($server->dnExists($logged_in_dn)) - foreach ($logged_in_dn_array as $rdn_piece) { - $href = sprintf('cmd.php?cmd=template_engine&server_id=%s&dn=%s',$server->getIndex(),rawurlencode($rdn)); diff --git a/net/phpldapadmin/files/patch-lib_MultiLineAttribute.php b/net/phpldapadmin/files/patch-lib_MultiLineAttribute.php deleted file mode 100644 index 2005a47c1168..000000000000 --- a/net/phpldapadmin/files/patch-lib_MultiLineAttribute.php +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/MultiLineAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/MultiLineAttribute.php -@@ -12,7 +12,7 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class MultiLineAttribute extends Attribute { -+class MultiLineAttribute extends PLAAttribute { - protected $rows = 0; - protected $cols = 0; - diff --git a/net/phpldapadmin/files/patch-lib_ObjectClassAttribute.php b/net/phpldapadmin/files/patch-lib_ObjectClassAttribute.php deleted file mode 100644 index 0d85afd7e094..000000000000 --- a/net/phpldapadmin/files/patch-lib_ObjectClassAttribute.php +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/ObjectClassAttribute.php.orig 2021-12-12 02:35:51 UTC -+++ lib/ObjectClassAttribute.php -@@ -12,6 +12,6 @@ - * @package phpLDAPadmin - * @subpackage Templates - */ --class ObjectClassAttribute extends Attribute { -+class ObjectClassAttribute extends PLAAttribute { - } - ?> diff --git a/net/phpldapadmin/files/patch-lib_PageRender.php b/net/phpldapadmin/files/patch-lib_PageRender.php deleted file mode 100644 index eaafb0cfc1f6..000000000000 --- a/net/phpldapadmin/files/patch-lib_PageRender.php +++ /dev/null @@ -1,149 +0,0 @@ ---- lib/PageRender.php.orig 2021-12-12 02:35:51 UTC -+++ lib/PageRender.php -@@ -182,7 +182,7 @@ class PageRender extends Visitor { - $attribute2 = $this->template->getAttribute($joinattr); - - if (! $attribute2) { -- if (($pv = get_request(strtolower($joinattr),'REQUEST')) && isset($pv[$attribute->getName()][$i])) { -+ if (($pv = get_request(strtolower((string) $joinattr),'REQUEST')) && isset($pv[$attribute->getName()][$i])) { - array_push($values,$pv[$attribute->getName()][$i]); - - if (! $pv[$attribute->getName()][$i]) -@@ -242,7 +242,7 @@ class PageRender extends Visitor { - return; - - # Get the attribute. -- if (preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower($args[1]),$matchall)) { -+ if (preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower((string) $args[1]),$matchall)) { - if (count($matchall[1]) != 1) - system_message(array( - 'title'=>_('Invalid value count for PasswordEncrypt'), -@@ -255,11 +255,11 @@ class PageRender extends Visitor { - } else - $passwordvalue = $args[1]; - -- if (! trim($passwordvalue) || in_array($passwordvalue,$attribute->getOldValues())) -+ if (! trim((string) $passwordvalue) || in_array($passwordvalue,$attribute->getOldValues())) - return; - - # Get the encoding -- if ($passwordattr && preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower($args[0]),$matchall)) { -+ if ($passwordattr && preg_match_all('/%(\w+)(\|.+)?(\/[lU])?%/U',strtolower((string) $args[0]),$matchall)) { - if (count($matchall[1]) != 1) - system_message(array( - 'title'=>_('Invalid value count for PasswordEncrypt'), -@@ -271,7 +271,7 @@ class PageRender extends Visitor { - } else - $enc = $args[0]; - -- $enc = strtolower($enc); -+ $enc = strtolower((string) $enc); - - switch ($enc) { - case 'lm': -@@ -403,7 +403,7 @@ class PageRender extends Visitor { - $alias_note = $this->get($note,$attribute); - - if ($alias_note) { -- if (trim($attr_note)) -+ if (trim((string) $attr_note)) - $attr_note .= ', '; - - $attr_note .= $alias_note; -@@ -423,7 +423,7 @@ class PageRender extends Visitor { - # Is there a user-friendly translation available for this attribute? - $friendly_name = $attribute->getFriendlyName(); - -- if (strtolower($friendly_name) != $attribute->getName()) -+ if (strtolower((string) $friendly_name) != $attribute->getName()) - return sprintf('%s', - _('Note'),$friendly_name,_('is an alias for'),$attribute->getName(false),_('alias')); - else -@@ -827,7 +827,7 @@ class PageRender extends Visitor { - if (! $attribute->getOldValue($i)) - return; - -- draw_jpeg_photo($this->getServer(),$this->template->getDN(),$attribute->getName(),$i,false,false); -+ draw_jpeg_photo($this->getServer(),$this->template->getDN(),$i,$attribute->getName(),false,false); - } - - /** -@@ -844,16 +844,16 @@ class PageRender extends Visitor { - # If the attribute is modified, the new value needs to be stored in a session variable for the draw_jpeg_photo callback. - if ($attribute->hasBeenModified()) { - $_SESSION['tmp'][$attribute->getName()][$i] = $attribute->getValue($i); -- draw_jpeg_photo(null,$this->template->getDN(),$attribute->getName(),$i,false,false); -+ draw_jpeg_photo(null,$this->template->getDN(),$i,$attribute->getName(),false,false); - } else -- draw_jpeg_photo($this->getServer(),$this->template->getDN(),$attribute->getName(),$i,false,false); -+ draw_jpeg_photo($this->getServer(),$this->template->getDN(),$i,$attribute->getName(),false,false); - } - - protected function drawFormReadOnlyValueJpegAttribute($attribute,$i) { - $this->draw('HiddenValue',$attribute,$i); - $_SESSION['tmp'][$attribute->getName()][$i] = $attribute->getValue($i); *** 2486 LINES SKIPPED ***
%s
'; diff --git a/net/phpldapadmin/files/patch-htdocs_purge__cache.php b/net/phpldapadmin/files/patch-htdocs_purge__cache.php deleted file mode 100644 index c72239368b37..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_purge__cache.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/purge_cache.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/purge_cache.php -@@ -16,7 +16,7 @@ $purge_session_keys = array('app_initialized','backtra - $size = 0; - foreach ($purge_session_keys as $key) - if (isset($_SESSION[$key])) { -- $size += strlen(serialize($_SESSION[$key])); -+ $size += strlen((string) serialize($_SESSION[$key])); - unset($_SESSION[$key]); - } - diff --git a/net/phpldapadmin/files/patch-htdocs_refresh.php b/net/phpldapadmin/files/patch-htdocs_refresh.php deleted file mode 100644 index 3779e73e942b..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_refresh.php +++ /dev/null @@ -1,11 +0,0 @@ ---- htdocs/refresh.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/refresh.php -@@ -34,7 +34,7 @@ if (get_request('purge','REQUEST')) { - $entry->open(); - } - -- set_cached_item($app['server']->getIndex(),'tree','null',$tree); -+ set_cached_item($app['server']->getIndex(),$tree,'tree','null'); - } - - if (get_request('meth','REQUEST') == 'ajax') diff --git a/net/phpldapadmin/files/patch-htdocs_schema.php b/net/phpldapadmin/files/patch-htdocs_schema.php deleted file mode 100644 index 191d2a2b1647..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_schema.php +++ /dev/null @@ -1,165 +0,0 @@ ---- htdocs/schema.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/schema.php -@@ -25,7 +25,7 @@ $entry['value'] = get_request('viewvalue','GET'); - - if (! is_null($entry['value'])) { - $entry['viewed'] = false; -- $entry['value'] = strtolower($entry['value']); -+ $entry['value'] = strtolower((string) $entry['value']); - } - - $schema_error_str = sprintf('%s %s.

%s
  • %s
  • %s
  • %s
  • %s
', -@@ -149,12 +149,12 @@ switch($entry['view']) { - echo '
'; - - foreach ($sattrs as $attr) { -- if (isAjaxEnabled() || (is_null($entry['value']) || ! trim($entry['value']) || $entry['value']==$attr->getName())) { -- if ((! is_null($entry['value']) && $entry['value']==$attr->getName()) || ! trim($entry['value'])) -+ if (isAjaxEnabled() || (is_null($entry['value']) || ! trim((string) $entry['value']) || $entry['value']==$attr->getName())) { -+ if ((! is_null($entry['value']) && $entry['value']==$attr->getName()) || ! trim((string) $entry['value'])) - $entry['viewed'] = true; - - if (isAjaxEnabled() && $entry['value']) -- printf('
',$attr->getName(),strcasecmp($entry['value'],$attr->getName()) ? 'none' : 'block'); -+ printf('
',(string) $attr->getName(),strcasecmp((string) $entry['value'],(string) $attr->getName()) ? 'none' : 'block'); - else - printf('
',$attr->getName()); - -@@ -193,10 +193,10 @@ switch($entry['view']) { - printf('(%s)',_('none')); - - else { -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['attributes'],strtolower($attr->getSupAttribute()))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['attributes'],strtolower((string) $attr->getSupAttribute()))); - if (isAjaxEnabled()) - printf('%s', -- $href,strtolower($attr->getSupAttribute()),$attr->getSupAttribute()); -+ $href,strtolower((string) $attr->getSupAttribute()),$attr->getSupAttribute()); - else - printf('%s',$href,$attr->getSupAttribute()); - } -@@ -287,10 +287,10 @@ switch($entry['view']) { - - else - foreach ($attr->getAliases() as $alias) { -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['attributes'],strtolower($alias))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['attributes'],strtolower((string) $alias))); - if (isAjaxEnabled()) - printf('%s', -- $href,strtolower($alias),$alias); -+ $href,strtolower((string) $alias),$alias); - else - printf('%s',$href,$alias); - } -@@ -306,10 +306,10 @@ switch($entry['view']) { - - else - foreach ($attr->getUsedInObjectClasses() as $objectclass) { -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower($objectclass))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower((string) $objectclass))); - if (isAjaxEnabled()) - printf('%s ', -- $href,$href,_('ObjectClasses'),strtolower($objectclass),$objectclass); -+ $href,$href,_('ObjectClasses'),strtolower((string) $objectclass),$objectclass); - else - printf('%s ',$href,$objectclass); - } -@@ -379,8 +379,8 @@ switch($entry['view']) { - $oid = $rule->getOID(); - $desc = $rule->getName(false); - -- if (isAjaxEnabled() || (is_null($entry['value']) || ! trim($entry['value']) || $entry['value']==$rule->getName())) { -- if ((! is_null($entry['value']) && $entry['value']==$rule->getName()) || ! trim($entry['value'])) -+ if (isAjaxEnabled() || (is_null($entry['value']) || ! trim((string) $entry['value']) || $entry['value']==$rule->getName())) { -+ if ((! is_null($entry['value']) && $entry['value']==$rule->getName()) || ! trim((string) $entry['value'])) - $entry['viewed'] = true; - - if (null != $rule->getDescription()) -@@ -391,7 +391,7 @@ switch($entry['view']) { - - if (isAjaxEnabled() && $entry['value']) - printf('
%s
%s: ',_('Parent to')); -- if (strcasecmp($oclass->getName(),'top') == 0) { -+ if (strcasecmp((string) $oclass->getName(),'top') == 0) { - $href = htmlspecialchars($entry['href']['objectclasses']); - if (isAjaxEnabled()) - printf('all', -@@ -521,10 +521,10 @@ switch($entry['view']) { - - else - foreach ($oclass->getChildObjectClasses() as $i => $object_class) { -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower($object_class))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower((string) $object_class))); - if (isAjaxEnabled()) - printf('%s', -- $href,_('Jump to this objectClass definition'),strtolower($object_class),$object_class); -+ $href,_('Jump to this objectClass definition'),strtolower((string) $object_class),$object_class); - else - printf('%s',$href,_('Jump to this objectClass definition'),$object_class); - -@@ -553,11 +553,11 @@ switch($entry['view']) { - - if ($attr->getSource() != $oclass->getName(false)) { - echo '
'; -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower($attr->getSource()))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower((string) $attr->getSource()))); - printf('(%s ',_('Inherited from')); - if (isAjaxEnabled()) - printf('%s', -- $href,_('Jump to this objectClass definition'),strtolower($attr->getSource()),$attr->getSource()); -+ $href,_('Jump to this objectClass definition'),strtolower((string) $attr->getSource()),$attr->getSource()); - else - printf('%s',$href,$attr->getSource()); - echo ')'; -@@ -586,11 +586,11 @@ switch($entry['view']) { - - if ($attr->getSource() != $oclass->getName(false)) { - echo '
'; -- $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower($attr->getSource()))); -+ $href = htmlspecialchars(sprintf('%s&viewvalue=%s',$entry['href']['objectclasses'],strtolower((string) $attr->getSource()))); - printf('(%s ',_('Inherited from')); - if (isAjaxEnabled()) - printf('%s', -- $href,_('Jump to this objectClass definition'),strtolower($attr->getSource()),$attr->getSource()); -+ $href,_('Jump to this objectClass definition'),strtolower((string) $attr->getSource()),$attr->getSource()); - else - printf('%s',$href,$attr->getSource()); - echo ')'; diff --git a/net/phpldapadmin/files/patch-htdocs_server__info.php b/net/phpldapadmin/files/patch-htdocs_server__info.php deleted file mode 100644 index cf3ce2cf59ed..000000000000 --- a/net/phpldapadmin/files/patch-htdocs_server__info.php +++ /dev/null @@ -1,20 +0,0 @@ ---- htdocs/server_info.php.orig 2021-12-12 02:35:51 UTC -+++ htdocs/server_info.php -@@ -60,7 +60,7 @@ foreach ($attrs as $key => $values) { - printf('		%s%s
%s
 
',$this->getDepth()+3-1); - printf('%s',$server->getName()); - -+ // strftime('%H:%M',$server->inactivityTime())); - if (! is_null($server->inactivityTime())) { - $m = sprintf(_('Inactivity will log you off at %s'), -- strftime('%H:%M',$server->inactivityTime())); -+ date('H:i',$server->inactivityTime())); - printf(' %s',IMGDIR,$m,'Timeout'); - } - echo '