From 6bbd6db84bc1ec551632a6e2334bc61080a37a17 Mon Sep 17 00:00:00 2001
From: Givriz <damien375@outlook.fr>
Date: Mon, 17 May 2021 18:39:08 +0200
Subject: [PATCH 1/3] Compatibility phpv8

---
 htdocs/admin/system/modules.php   | 2 +-
 htdocs/admin/tools/listevents.php | 2 +-
 htdocs/main.inc.php               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index f3892e105bb..4a77d2452c4 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -277,7 +277,7 @@ if ($arrayfields['module_position']['checked']) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>empty($param) ? '' : $param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index fbc2412a9df..b894920d34e 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -245,7 +245,7 @@ if ($result) {
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
-	if ($optioncss != '') {
+	if (!empty($optioncss)) {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_code) {
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index c9a7dd21ccc..1929dcbdb37 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -928,7 +928,7 @@ if (!defined('NOLOGIN')) {
 		$_SESSION["dol_dst_second"] = isset($dol_dst_second) ? $dol_dst_second : '';
 		$_SESSION["dol_screenwidth"] = isset($dol_screenwidth) ? $dol_screenwidth : '';
 		$_SESSION["dol_screenheight"] = isset($dol_screenheight) ? $dol_screenheight : '';
-		$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
+		$_SESSION["dol_company"] = getDolGlobalString("MAIN_INFO_SOCIETE_NOM");
 		$_SESSION["dol_entity"] = $conf->entity;
 		// Store value into session (values stored only if defined)
 		if (!empty($dol_hide_topmenu)) {

From e7ac39fe35e84585564d57170c869a62d0525b03 Mon Sep 17 00:00:00 2001
From: Damien BENOIT <48482664+Givriz@users.noreply.github.com>
Date: Tue, 18 May 2021 15:23:29 +0200
Subject: [PATCH 2/3] Update modules.php

Added $param
---
 htdocs/admin/system/modules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 4a77d2452c4..150ca10a359 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -65,6 +65,7 @@ $arrayfields = array(
 );
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
+$param = '';
 
 
 /*
@@ -277,7 +278,7 @@ if ($arrayfields['module_position']['checked']) {
 }
 
 // Fields from hook
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>empty($param) ? '' : $param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 

From 38a5dfb26343258ae2a4fed72e69377483417783 Mon Sep 17 00:00:00 2001
From: Damien BENOIT <48482664+Givriz@users.noreply.github.com>
Date: Tue, 18 May 2021 15:26:55 +0200
Subject: [PATCH 3/3] Update listevents.php

Added $optioncss
---
 htdocs/admin/tools/listevents.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index b894920d34e..31287cbbb8a 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -68,6 +68,7 @@ $search_user = GETPOST("search_user", "alpha");
 $search_desc = GETPOST("search_desc", "alpha");
 $search_ua   = GETPOST("search_ua", "restricthtml");
 $search_prefix_session = GETPOST("search_prefix_session", "restricthtml");
+$optioncss = GETPOST("optioncss", "aZ"); // Option for the css output (always '' except when 'print')
 
 $now = dol_now();
 $nowarray = dol_getdate($now);
@@ -245,7 +246,7 @@ if ($result) {
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
-	if (!empty($optioncss)) {
+	if ($optioncss != '') {
 		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	if ($search_code) {