From 32a79cfd8d9681d201566f0cb3fb667159a1476f Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Sun, 14 Mar 2021 15:51:00 +0100
Subject: [PATCH] Standardize var $AdherentsXXX in $MembersXXX

---
 htdocs/adherents/index.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 7ec39b7eda8..4a4724593e4 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -79,10 +79,10 @@ $subscriptionstatic = new Subscription($db);
 
 print load_fiche_titre($langs->trans("MembersArea"), $resultboxes['selectboxlist'], 'members');
 
-$Adherents = array();
-$AdherentsAValider = array();
-$MemberUpToDate = array();
-$AdherentsResilies = array();
+$MembersValidated = array();
+$MembersToValidate = array();
+$MembersUpToDate = array();
+$MembersResiliated = array();
 
 $AdherentType = array();
 
@@ -111,7 +111,7 @@ if ($result) {
 		$AdherentType[$objp->rowid] = $adhtype;
 
 		if ($objp->statut == -1) {
-			$MemberToValidate[$objp->rowid] = $objp->somme;
+			$MembersToValidate[$objp->rowid] = $objp->somme;
 		}
 		if ($objp->statut == 1) {
 			$MembersValidated[$objp->rowid] = $objp->somme;
@@ -144,7 +144,7 @@ if ($result) {
 	$i = 0;
 	while ($i < $num) {
 		$objp = $db->fetch_object($result);
-		$MemberUpToDate[$objp->fk_adherent_type] = $objp->somme;
+		$MembersUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
 	}
 	$db->free();
@@ -202,13 +202,13 @@ if ($conf->use_javascript_ajax) {
 	$dataval = array();
 	$i = 0;
 	foreach ($AdherentType as $key => $adhtype) {
-		$dataval['draft'][] = array($i, isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0);
-		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0);
-		$dataval['uptodate'][] = array($i, isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0);
+		$dataval['draft'][] = array($i, isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0);
+		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : 0);
+		$dataval['uptodate'][] = array($i, isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0);
 		$dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
-		$SommeA += isset($MemberToValidate[$key]) ? $MemberToValidate[$key] : 0;
-		$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : 0;
-		$SommeC += isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0;
+		$SommeA += isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0;
+		$SommeB += isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : 0;
+		$SommeC += isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0;
 		$SommeD += isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0;
 		$i++;
 	}
@@ -476,9 +476,9 @@ print "</tr>\n";
 foreach ($AdherentType as $key => $adhtype) {
 	print '<tr class="oddeven">';
 	print '<td>'.$adhtype->getNomUrl(1, dol_size(32)).'</td>';
-	print '<td class="right">'.(isset($MemberToValidate[$key]) && $MemberToValidate[$key] > 0 ? $MemberToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
-	print '<td class="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MemberUpToDate[$key]) ? $MemberUpToDate[$key] : 0) : '').' '.$staticmember->LibStatut(1, $adhtype->subscription, 0, 3).'</td>';
-	print '<td class="right">'.(isset($MemberUpToDate[$key]) && $MemberUpToDate[$key] > 0 ? $MemberUpToDate[$key] : '').' '.$staticmember->LibStatut(1, $adhtype->subscription, $now, 3).'</td>';
+	print '<td class="right">'.(isset($MembersToValidate[$key]) && $MembersToValidate[$key] > 0 ? $MembersToValidate[$key] : '').' '.$staticmember->LibStatut(-1, $adhtype->subscription, 0, 3).'</td>';
+	print '<td class="right">'.(isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : '').' '.$staticmember->LibStatut(1, $adhtype->subscription, 0, 3).'</td>';
+	print '<td class="right">'.(isset($MembersUpToDate[$key]) && $MembersUpToDate[$key] > 0 ? $MembersUpToDate[$key] : '').' '.$staticmember->LibStatut(1, $adhtype->subscription, $now, 3).'</td>';
 	print '<td class="right">'.(isset($MembersResiliated[$key]) && $MembersResiliated[$key] > 0 ? $MembersResiliated[$key] : '').' '.$staticmember->LibStatut(0, $adhtype->subscription, 0, 3).'</td>';
 	print "</tr>\n";
 }