Fix warnings

DoliCloud · Jan 5, 2025 · 33ca339 · 33ca339
1 parent 1c850f5
commit 33ca339
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/htdocs/concatpdf/class/actions_concatpdf.class.php b/htdocs/concatpdf/class/actions_concatpdf.class.php
@@ -329,7 +329,7 @@ public function afterPDFCreation($parameters, &$pdfhandler, &$action)
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
 					$pdf->SetCompression(false);
 				}
 				//$pdf->SetCompression(false);

diff --git a/htdocs/google/lib/google_calendar.lib.php b/htdocs/google/lib/google_calendar.lib.php
@@ -349,8 +349,8 @@ function createEvent($client, $object, $login = 'primary')
 	$end = new Google_Service_Calendar_EventDateTime();
 
 	$tzfix=0;
-	if (!empty($conf->global->GOOGLE_CAL_TZ_FIX)) {
-		$tzfix=$conf->global->GOOGLE_CAL_TZ_FIX;
+	if (getDolGlobalString('GOOGLE_CAL_TZ_FIX')) {
+		$tzfix = getDolGlobalString('GOOGLE_CAL_TZ_FIX');
 	}
 	if (empty($object->fulldayevent)) {
 		$reg = array();

diff --git a/htdocs/google/lib/google_contact.lib.php b/htdocs/google/lib/google_contact.lib.php
@@ -1455,21 +1455,21 @@ function getGContactTypeGroupID($gdata, $type)
 		$tagprefix = 'GOOGLE_TAG_PREFIX';
 		$label = empty($conf->global->GOOGLE_TAG_PREFIX) ? 'Dolibarr Thirdparties': $conf->global->GOOGLE_TAG_PREFIX;
 		// See if ref_ext exists and if it is a google group
-		if (!empty($conf->global->GOOGLE_TAG_REF_EXT) && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT, $reg)) {
+		if (getDolGlobalString('GOOGLE_TAG_REF_EXT') && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT, $reg)) {
 			$groupID = $reg[1];
 		}
 	} else if ($type === 'contact') {
 		$tagprefix = 'GOOGLE_TAG_PREFIX_CONTACTS';
 		$label = empty($conf->global->GOOGLE_TAG_PREFIX_CONTACTS) ? 'Dolibarr contacts': $conf->global->GOOGLE_TAG_PREFIX_CONTACTS;
 		// See if ref_ext exists and if it is a google group
-		if (!empty($conf->global->GOOGLE_TAG_REF_EXT_CONTACTS) && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT_CONTACTS, $reg)) {
+		if (getDolGlobalString('GOOGLE_TAG_REF_EXT_CONTACTS') && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT_CONTACTS, $reg)) {
 			$groupID = $reg[1];
 		}
 	} else if ($type === 'member') {
 		$tagprefix = 'GOOGLE_TAG_PREFIX_MEMBERS';
 		$label = empty($conf->global->GOOGLE_TAG_PREFIX_MEMBERS) ? 'Dolibarr members': $conf->global->GOOGLE_TAG_PREFIX_MEMBERS;
 		// See if ref_ext exists and if it is a google group
-		if (!empty($conf->global->GOOGLE_TAG_REF_EXT_MEMBERS) && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT_MEMBERS, $reg)) {
+		if (getDolGlobalString('GOOGLE_TAG_REF_EXT_MEMBERS') && preg_match('/google:(contactGroups\/.*)/', $conf->global->GOOGLE_TAG_REF_EXT_MEMBERS, $reg)) {
 			$groupID = $reg[1];
 		}
 	} else {

diff --git a/htdocs/ovh/admin/ovh_importinvoice.php b/htdocs/ovh/admin/ovh_importinvoice.php
@@ -126,7 +126,7 @@
 print '<input type="hidden" name="action" value="setvalue">';
 
 
-if (!empty($conf->global->OVH_OLDAPI) && (empty($conf->global->OVHSMS_NICK) || empty($WS_DOL_URL))) {  // For old API
+if (getDolGlobalString('OVH_OLDAPI') && (empty($conf->global->OVHSMS_NICK) || empty($WS_DOL_URL))) {  // For old API
 	echo '<div class="warning">' . $langs->trans("OvhSmsNotConfigured") . '</div>';
 } else {
 	$var = true;

diff --git a/htdocs/ovh/includes/ovh/ovh/src/Api.php b/htdocs/ovh/includes/ovh/ovh/src/Api.php
@@ -305,15 +305,15 @@ protected function rawCall($method, $path, $content = null, $is_authenticated =
 
         // @Change DOL_LDR
         global $conf;
-        if (!empty($conf->global->OVH_DEBUG)) {
+        if (getDolGlobalString('OVH_DEBUG')) {
 	        $logfile=DOL_DATA_ROOT.'/dolibarr_ovh.log';
 	        $filefd = fopen($logfile, 'a+');
 	        if ($filefd)
 	        {
 	        	fwrite($filefd, var_export($request->getRequestTarget(), true)."\n");
 	        	fwrite($filefd, var_export($request->getHeaders(), true)."\n");
 	        	fclose($filefd);
-	        	@chmod($logfile, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+	        	@chmod($logfile, octdec(getDolGlobalString('MAIN_UMASK', '0664')));
 	        }
         }
 

diff --git a/htdocs/ovh/wrapper.php b/htdocs/ovh/wrapper.php
@@ -130,7 +130,7 @@ function llxFooter()
 //header('Access-Control-Allow-Methods: GET, POST');
 
 
-if (!empty($conf->global->OVH_OLDAPI)) {
+if (getDolGlobalString('OVH_OLDAPI')) {
 	if (empty($login)) {
 		llxHeader();
 		print '<div class="error">'.$langs->trans("ErrorClickToDialForUserNotDefined").'</div>';