From b7a46ae83806a52a752ee65e1e7576b52189c1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 20 Mar 2021 21:50:47 +0100 Subject: [PATCH 1/2] fix php8 warnings --- htdocs/adherents/admin/website.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index d13b4a27c43..ce58641bb12 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -178,7 +178,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) { print ''; $listofval = array(); $listofval += $adht->liste_array(); - $forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1; + $forcetype = !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) ? $conf->global->MEMBER_NEWFORM_FORCETYPE : -1; print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0); print "\n"; @@ -232,7 +232,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) { print '
'; //print $langs->trans('FollowingLinksArePublic').'
'; print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':
'; - if ($conf->multicompany->enabled) { + if (!empty($conf->multicompany->enabled)) { $entity_qr = '?entity='.$conf->entity; } else { $entity_qr = ''; From 6cdfbc2e8cb1ff81021d87352a533b15ee63b4fe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 Mar 2021 20:50:00 +0100 Subject: [PATCH 2/2] Update website.php --- htdocs/adherents/admin/website.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php index ce58641bb12..d4f2df25c0c 100644 --- a/htdocs/adherents/admin/website.php +++ b/htdocs/adherents/admin/website.php @@ -178,7 +178,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) { print ''; $listofval = array(); $listofval += $adht->liste_array(); - $forcetype = !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) ? $conf->global->MEMBER_NEWFORM_FORCETYPE : -1; + $forcetype = empty($conf->global->MEMBER_NEWFORM_FORCETYPE) ? -1 : $conf->global->MEMBER_NEWFORM_FORCETYPE; print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0); print "\n";