Explorar o código

FIX php8.1 warning

Regis Houssin %!s(int64=3) %!d(string=hai) anos
pai
achega
82e19879d5
Modificáronse 2 ficheiros con 6 adicións e 2 borrados
  1. 5 1
      htdocs/admin/dict.php
  2. 1 1
      htdocs/user/perms.php

+ 5 - 1
htdocs/admin/dict.php

@@ -585,6 +585,10 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls
 $i = 0;
 foreach ($tabcomplete as $key => $value) {
 	$i++;
+	// When a dictionnary is commented
+	if (!isset($tabcond[$i])) {
+		continue;
+	}
 	$tabcomplete[$key]['id'] = $i;
 	$tabcomplete[$key]['cond'] = $tabcond[$i];
 	$tabcomplete[$key]['rowid'] = $tabrowid[$i];
@@ -607,7 +611,7 @@ if (empty($sortfield)) {
 	$tmp1 = explode(',', empty($tabcomplete[$keytable]['sqlsort']) ? '' : $tabcomplete[$keytable]['sqlsort']);
 	$tmp2 = explode(' ', $tmp1[0]);
 	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
-	$sortorder = $tmp2[1];
+	$sortorder = (!empty($tmp2[1]) ? $tmp2[1] : '');
 	//var_dump($sortfield);var_dump($sortorder);
 }
 

+ 1 - 1
htdocs/user/perms.php

@@ -340,7 +340,7 @@ if ($result) {
 		$obj = $db->fetch_object($result);
 
 		// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
-		if (empty($modules[$obj->module])) {
+		if (!isset($obj->module) || empty($modules[$obj->module])) {
 			$i++;
 			continue;
 		}