From 9ebfd30dccb23c0d9776caa03c443b5f90d8e741 Mon Sep 17 00:00:00 2001
From: BENKE Charlene <1179011+defrance@users.noreply.github.com>
Date: Tue, 24 May 2022 22:42:32 +0200
Subject: [PATCH 1/2] PHP V8 warning

---
 htdocs/contact/agenda.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 0eed6ba6219..28e6f7be9c0 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -251,17 +251,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$objthirdparty = $object->thirdparty;
 
 		$out = '';
-		$permok = $user->rights->agenda->myactions->create;
-		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
-			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
-				$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
-			}
-			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
-			$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
-		}
-
 		$newcardbutton = '';
 		if (!empty($conf->agenda->enabled)) {
+
+			$permok = $user->rights->agenda->myactions->create;
+			if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+				if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
+					$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
+				}
+				$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
+				$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
+			}
+
 			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 				$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 			}

From 82cf96fb78151732163485a6294539a57b30f462 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 24 May 2022 20:47:24 +0000
Subject: [PATCH 2/2] Fixing style errors.

---
 htdocs/contact/agenda.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 28e6f7be9c0..98b6ccea3b1 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -253,7 +253,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$out = '';
 		$newcardbutton = '';
 		if (!empty($conf->agenda->enabled)) {
-
 			$permok = $user->rights->agenda->myactions->create;
 			if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 				if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {