fix(App) PHP 8 adjustments

tsolucio · Aug 8, 2021 · f8a0221 · f8a0221
1 parent d2b06fb
commit f8a0221
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/include/fields/DateTimeField.php b/include/fields/DateTimeField.php
@@ -204,7 +204,7 @@ public static function formatDatebaseTimeString($datetime, $fmt) {
 	 */
 	public static function twoDigit($no) {
 		$no = trim($no);
-		if ($no < 10 && strlen($no) < 2) {
+		if ((int)$no < 10 && strlen($no) < 2) {
 			$no = '0'.$no;
 		}
 		return substr($no, 0, 2);

diff --git a/include/utils/CommonUtils.php b/include/utils/CommonUtils.php
@@ -599,9 +599,8 @@ function getContactName($contact_id) {
 	global $log, $adb, $current_user;
 	$log->debug('> getContactName '.$contact_id);
 	$contact_name = '';
-	if ($contact_id != '') {
-		$sql = 'select firstname, lastname from vtiger_contactdetails where contactid=?';
-		$result = $adb->pquery($sql, array($contact_id));
+	if (!empty($contact_id)) {
+		$result = $adb->pquery('select firstname, lastname from vtiger_contactdetails where contactid=?', array($contact_id));
 		$firstname = $adb->query_result($result, 0, 'firstname');
 		$lastname = $adb->query_result($result, 0, 'lastname');
 		$contact_name = $lastname;

diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php
@@ -93,7 +93,9 @@ function vtlib_prefetchModuleActiveInfo($force = true) {
  */
 function vtlib_isModuleActive($module) {
 	global $__cache_module_activeinfo, $adb;
-
+	if (is_numeric($module) || empty($module)) {
+		return false;
+	}
 	if (in_array($module, vtlib_moduleAlwaysActive())) {
 		return true;
 	}

diff --git a/modules/GlobalVariable/SearchGlobalVarws.php b/modules/GlobalVariable/SearchGlobalVarws.php
@@ -25,7 +25,7 @@
  *  the default value given: if a variable record is not found or the current user does not have access to the Global Variable module
 */
 function cbws_SearchGlobalVar($gvname, $defaultvalue, $gvmodule, $user) {
-	global $log, $adb;
+	global $log, $adb, $default_charset;
 
 	$entityName = 'GlobalVariable';
 	$webserviceObject = VtigerWebserviceObject::fromName($adb, $entityName);
@@ -48,7 +48,7 @@ function cbws_SearchGlobalVar($gvname, $defaultvalue, $gvmodule, $user) {
 			$rs = $adb->pquery('select contentjson from vtiger_cbmap where cbmapid=?', array($rdo));
 			$rdo = array(
 				'id' => vtws_getEntityID('cbMap').'x'.$rdo,
-				'map' => $adb->query_result($rs, 0, 0),
+				'map' => html_entity_decode($adb->query_result($rs, 0, 0), ENT_QUOTES, $default_charset),
 			);
 		}
 	} else {