From 7fae5ea800403bec1f108ebe2934b60175bbbfb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 20 Dec 2020 18:21:34 +0100
Subject: [PATCH] Code clean

---
 htdocs/contrat/list.php                  | 36 ++++++++++++++++++------
 htdocs/core/class/commonobject.class.php |  3 +-
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index bd5b39f717b..ca8ccb9bd7d 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -208,7 +208,7 @@ $contracttmp = new Contrat($db);
 
 $sql = 'SELECT';
 $sql .= " c.rowid, c.ref, c.datec as date_creation, c.tms as date_update, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias, s.email, s.town, s.zip, s.fk_pays as country_id, s.client, s.code_client, s.status as company_status, s.logo as company_logo,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") as lower_planned_end_date,";
@@ -263,7 +263,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY c.rowid, c.ref, c.datec, c.tms, c.date_contrat, c.statut, c.ref_customer, c.ref_supplier, c.note_private, c.note_public,";
-$sql .= ' s.rowid, s.nom, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid, s.nom, s.name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.status, s.logo,';
 $sql .= " typent.code,";
 $sql .= " state.code_departement, state.nom";
 // Add fields from extrafields
@@ -341,7 +341,7 @@ if ($socid > 0)
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 if ($sall != '')                $param .= '&sall='.urlencode($sall);
 if ($search_contract != '')     $param .= '&search_contract='.urlencode($search_contract);
 if ($search_name != '')         $param .= '&search_name='.urlencode($search_name);
@@ -596,6 +596,10 @@ if (!empty($arrayfields['status']['checked'])) {
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
+$totalarray = array();
+$typenArray = array();
+$cacheCountryIDCode = array();
+
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
@@ -608,6 +612,24 @@ while ($i < min($num, $limit))
 	if ($obj->socid > 0) {
 		$result = $socstatic->fetch($obj->socid);
 	}
+	/*$socstatic->id = $obj->socid;
+	$socstatic->name = $obj->name;
+	$socstatic->name_alias = $obj->name_alias;
+	$socstatic->email = $obj->email;
+	$socstatic->status = $obj->company_status;
+	$socstatic->logo = $obj->logo;
+	$socstatic->country_id = $obj->country_id;
+	$socstatic->country_code = '';
+	$socstatic->country_label = '';*/
+	if ($obj->country_id > 0) {
+		if (!isset($cacheCountryIDCode[$obj->country_id]['code'])) {
+			$tmparray = getCountry($obj->country_id, 'all');
+			$cacheCountryIDCode[$obj->country_id] = array('code'=> empty($tmparray['code']) ? '' : $tmparray['code'], 'label' => empty($tmparray['label']) ? '' : $tmparray['label']);
+		}
+		$socstatic->country_code = $cacheCountryIDCode[$obj->country_id]['code'];
+		$socstatic->country_label = $cacheCountryIDCode[$obj->country_id]['label'];
+	}
+
 
 	print '<tr class="oddeven">';
 
@@ -643,9 +665,8 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['s.nom']['checked']))
 	{
 		print '<td>';
-		//print '<a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a>';
-		if ($obj->socid > 0)
-		{
+		if ($obj->socid > 0) {
+			// TODO Use a cache for this string
 			print $socstatic->getNomUrl(1, '');
 		}
 		print '</td>';
@@ -680,8 +701,7 @@ while ($i < min($num, $limit))
 	if (!empty($arrayfields['country.code_iso']['checked']))
 	{
 		print '<td class="center">';
-		$tmparray = getCountry($obj->fk_pays, 'all');
-		print $tmparray['label'];
+		print $socstatic->country_label;
 		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 760b9632cb6..bfdea016ea6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3292,7 +3292,7 @@ abstract class CommonObject
 
 	/**
 	 *	Fetch array of objects linked to current object (object of enabled modules only). Links are loaded into
-	 *		this->linkedObjectsIds array and
+	 *		this->linkedObjectsIds array +
 	 *		this->linkedObjects array if $loadalsoobjects = 1
 	 *  Possible usage for parameters:
 	 *  - all parameters empty -> we look all link to current object (current object can be source or target)
@@ -3405,6 +3405,7 @@ abstract class CommonObject
 				{
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
+					$regs = array();
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
 						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
 					{