From cc68c5658c79cc62c718fd939a4ca6df4e11a105 Mon Sep 17 00:00:00 2001 From: From Obelix Date: Sun, 9 Mar 2025 18:23:36 +0100 Subject: [PATCH] Fix PHP8.2 compatibility --- functions/functions_clients.php | 4 ++-- functions/functions_contrats.php | 8 ++++---- functions/functions_generals.php | 4 ++-- functions/functions_legumes.php | 4 ++-- functions/functions_lieux.php | 6 +++--- functions/functions_paniers_groupes.php | 6 +++--- functions/functions_paniers_types.php | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/functions/functions_clients.php b/functions/functions_clients.php index 0980873..ca5cc6f 100644 --- a/functions/functions_clients.php +++ b/functions/functions_clients.php @@ -16,7 +16,7 @@ $allowClientsListOrder = array( function getNbClientsInList($search=false) { $sql = getCountClientsListSelectBaseSQL()." WHERE ".CLIENTS_TABLE.".`del`=0"; - $sql = buildSqlSearch($sql, $search, buildClientsListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildClientsListSearchSQL"); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); else { @@ -31,7 +31,7 @@ function getClientsList($order='nom',$sens='ASC',$simple=false,$search=false,$li $sql = getClientsTableSelectBaseSQL()." WHERE ".CLIENTS_TABLE.".`del`=0"; // SEARCH - $sql = buildSqlSearch($sql, $search, buildClientsListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildClientsListSearchSQL"); // ORDRE $sql.=" ORDER BY "; diff --git a/functions/functions_contrats.php b/functions/functions_contrats.php index cc3d8c5..dd3a1cc 100644 --- a/functions/functions_contrats.php +++ b/functions/functions_contrats.php @@ -23,7 +23,7 @@ $allowContratsListOrder = array( function getNbContratsInList($filtres=array(), $search=false) { $sql = getCountContratsListSelectBaseSQL()." WHERE ".CONTRATS_TABLE.".`del`=0"; $sql = buildContratsListFiltresSQL($sql, $filtres); - $sql = buildSqlSearch($sql, $search, buildContratsListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildContratsListSearchSQL"); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); else { @@ -45,7 +45,7 @@ function getContratsList($order='id', $sens='ASC', $filtres=array(), $search=fal $sql = buildContratsListFiltresSQL($sql, $filtres); // SEARCH - $sql = buildSqlSearch($sql, $search, buildContratsListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildContratsListSearchSQL"); // ORDRE $sql.=" ORDER BY "; @@ -229,7 +229,7 @@ function archiveOldContrat() { $r = $GLOBALS['db_admin']['man']->select($sql); if(!$r['erreur']) { - if(count($r['datas']>0)) { + if(count($r['datas'])>0) { $date = new DateTime(DATE_TIME_ZONE); $dateInt = new DateInterval( "P".AUTO_ARCHIVE_OLD_CONTRATS_DELAY."D" ); $date->sub( $dateInt ); @@ -354,4 +354,4 @@ function printContratsList($list) { $dompdf->stream("Liste des contrats (".formatDate('', '', 'strdate').").pdf"); die(); -} \ No newline at end of file +} diff --git a/functions/functions_generals.php b/functions/functions_generals.php index e91db71..69565df 100644 --- a/functions/functions_generals.php +++ b/functions/functions_generals.php @@ -36,7 +36,7 @@ function getRequestAndSessionSave($requestName, $sessionName, $smartyName=false, } function convertValTo($val, $type) { - switch(type) { + switch($type) { case "int": $val = intval($val); break; case "float": $val = floatval($val); break; case "bool": $val = ($val || (int)$val==1); break; @@ -141,4 +141,4 @@ function getListOrder($session_order_var, $session_sens_var, $allowOrder, $defau $GLOBALS['smarty'] -> assign('sens',$sens); return array("order" => $order, "sens" => $sens); -} \ No newline at end of file +} diff --git a/functions/functions_legumes.php b/functions/functions_legumes.php index 89025da..3d5bcc5 100644 --- a/functions/functions_legumes.php +++ b/functions/functions_legumes.php @@ -13,7 +13,7 @@ $allowLegumesListOrder = array( function getNbLegumesInList($search=false) { $sql = getCountLegumesListSelectBaseSQL()." WHERE ".LEGUMES_TABLE.".`del`=0"; - $sql = buildSqlSearch($sql, $search, buildLegumesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildLegumesListSearchSQL"); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); else { @@ -33,7 +33,7 @@ function getLegumesList($order='nom',$sens='ASC', $search=false, $limits=false) $sql = getLegumesTableSelectBaseSQL()." WHERE ".LEGUMES_TABLE.".`del`=0"; // SEARCH - $sql = buildSqlSearch($sql, $search, buildLegumesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildLegumesListSearchSQL"); // ORDRE $sql.=" ORDER BY "; diff --git a/functions/functions_lieux.php b/functions/functions_lieux.php index 7e7f6a9..cefbb5c 100644 --- a/functions/functions_lieux.php +++ b/functions/functions_lieux.php @@ -13,7 +13,7 @@ $allowLieuxListOrder = array( function getNbLieuxInList($search=false) { $sql = getCountLieuxListSelectBaseSQL()." WHERE ".LIEUX_TABLE.".`del`=0"; - $sql = buildSqlSearch($sql, $search, buildLieuxSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildLieuxSearchSQL"); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); else { @@ -28,7 +28,7 @@ function getLieuxList($order='id',$sens='ASC', $search=false, $limits=false) { $sql = getLieuxTableSelectBaseSQL()." WHERE ".LIEUX_TABLE.".`del`=0"; // SEARCH - $sql = buildSqlSearch($sql, $search, buildLieuxSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildLieuxSearchSQL"); // ORDRE $sql.=" ORDER BY "; @@ -117,4 +117,4 @@ function eraseLieu($id) { $id, // ID "du lieu de dépôt" // ERROR STRING ); -} \ No newline at end of file +} diff --git a/functions/functions_paniers_groupes.php b/functions/functions_paniers_groupes.php index 7380c97..249997f 100644 --- a/functions/functions_paniers_groupes.php +++ b/functions/functions_paniers_groupes.php @@ -13,7 +13,7 @@ $allowPaniersGroupesListOrder = array( function getNbPaniersGroupesInList($search=false) { $sql = getCountPaniersGroupesListSelectBaseSQL()." WHERE ".PANIERS_GROUPES_TABLE.".`del`=0"; - $sql = buildSqlSearch($sql, $search, buildPaniersGroupesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildPaniersGroupesListSearchSQL"); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); else { @@ -28,7 +28,7 @@ function getPaniersGroupesList($order='nom',$sens='ASC', $search=false, $limits= $sql = getPaniersGroupesSelectBaseSQL()." WHERE ".PANIERS_GROUPES_TABLE.".`del`=0"; // SEARCH - $sql = buildSqlSearch($sql, $search, buildPaniersGroupesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildPaniersGroupesListSearchSQL"); // ORDRE $sql.=" ORDER BY "; @@ -119,4 +119,4 @@ function erasePaniersGroupe($id) { $id, // ID "du groupe de panier" // ERROR STRING ); -} \ No newline at end of file +} diff --git a/functions/functions_paniers_types.php b/functions/functions_paniers_types.php index 07382bc..39ce60b 100644 --- a/functions/functions_paniers_types.php +++ b/functions/functions_paniers_types.php @@ -15,7 +15,7 @@ $allowPaniersTypesListOrder = array( function getNbPaniersInList($search=false, $groupe=0) { $sql = getCountPaniersTypesListSelectBaseSQL()." WHERE ".PANIERS_TYPES_TABLE.".`del`=0"; - $sql = buildSqlSearch($sql, $search, buildPaniersTypesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildPaniersTypesListSearchSQL"); if($groupe>0) $sql .= " AND ".PANIERS_TYPES_TABLE.".`groupe`=".intval($groupe); $r = $GLOBALS['db_admin']['man']->select($sql, 1); if(!$r['erreur']) return intval($r['datas']['nb']); @@ -31,7 +31,7 @@ function getPaniersTypesList($order='nom',$sens='ASC', $search=false, $groupe=0, $sql = getPaniersTypesSelectBaseSQL()." WHERE ".PANIERS_TYPES_TABLE.".`del`=0"; // SEARCH - $sql = buildSqlSearch($sql, $search, buildPaniersTypesListSearchSQL); + $sql = buildSqlSearch($sql, $search, "buildPaniersTypesListSearchSQL"); // GROUPE if($groupe>0) $sql .= " AND ".PANIERS_TYPES_TABLE.".`groupe`=".intval($groupe); @@ -127,4 +127,4 @@ function erasePaniersType($id) { $id, // ID "du type de panier" // ERROR STRING ); -} \ No newline at end of file +}