From 7d797ec7dcc026c69224850906145263f5e8c29e Mon Sep 17 00:00:00 2001
From: jlb <jlb>
Date: Fri, 10 Jan 2003 15:18:06 +0000
Subject: [PATCH] rajout de \n a la fibn de chaque print (pour clarifier la
 lecture du code html et deplacement des confirmations en haut de page, plutot
 qu'en bas de page (moins visible en bas de page .. je le voyais aps au debut)

---
 htdocs/adherents/fiche.php | 275 +++++++++++++++++++------------------
 1 file changed, 139 insertions(+), 136 deletions(-)

diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 7723341dfa4..8ff7d5a9a2f 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -113,47 +113,47 @@ if ($action == 'create') {
     }
   }
   print_titre("Nouvel adhérent");
-  print "<form action=\"$PHP_SELF\" method=\"post\">";
-  print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
+  print "<form action=\"$PHP_SELF\" method=\"post\">\n";
+  print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
   
-  print '<input type="hidden" name="action" value="add">';
+  print '<input type="hidden" name="action" value="add">\n';
 
   $htmls = new Form($db);
   $adht = new AdherentType($db);
 
   print '<tr><td width="15%">Type</td><td width="35%">';
   $htmls->select_array("type",  $adht->liste_array());
-  print "</td>";
+  print "</td>\n";
 
-  print '<td width="50%" valign="top">Commentaires :</td></tr>';
+  print '<td width="50%" valign="top">Commentaires :</td></tr>\n';
 
   $morphys["phy"] = "Physique";
   $morphys["mor"] = "Morale";
 
-  print "<tr><td>Personne</td><td>";
+  print "<tr><td>Personne</td><td>\n";
   $htmls->select_array("morphy",  $morphys);
-  print "</td>";
+  print "</td>\n";
   
-  print '<td valign="top" rowspan="11"><textarea name="comment" wrap="soft" cols="40" rows="25"></textarea></td></tr>';
+  print '<td valign="top" rowspan="11"><textarea name="comment" wrap="soft" cols="40" rows="25"></textarea></td></tr>\n';
 
-  print '<tr><td>Prénom</td><td><input type="text" name="prenom" size="40"></td></tr>';  
+  print '<tr><td>Prénom</td><td><input type="text" name="prenom" size="40"></td></tr>\n';  
   
 
 
 
 
-  print '<tr><td>Nom</td><td><input type="text" name="nom" size="40"></td></tr>';
-  print '<tr><td>Societe</td><td><input type="text" name="societe" size="40"></td></tr>';
-  print '<tr><td>Adresse</td><td>';
-  print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>';
-  print '<tr><td>CP Ville</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>';
-  print '<tr><td>Pays</td><td><input type="text" name="pays" size="40"></td></tr>';
+  print '<tr><td>Nom</td><td><input type="text" name="nom" size="40"></td></tr>\n';
+  print '<tr><td>Societe</td><td><input type="text" name="societe" size="40"></td></tr>\n';
+  print '<tr><td>Adresse</td><td>\n';
+  print '<textarea name="adresse" wrap="soft" cols="40" rows="3"></textarea></td></tr>\n';
+  print '<tr><td>CP Ville</td><td><input type="text" name="cp" size="8"> <input type="text" name="ville" size="40"></td></tr>\n';
+  print '<tr><td>Pays</td><td><input type="text" name="pays" size="40"></td></tr>\n';
   print '<tr><td>Email</td><td><input type="text" name="email" size="40"></td></tr>';
 
 
-  print "<tr><td>Date de cotisation</td><td>";
+  print "<tr><td>Date de cotisation</td><td>\n";
   print_date_select();
-  print "</td></tr>";
+  print "</td></tr>\n";
   print "<tr><td>Mode de paiement</td><td>\n";
   
   $paiement = new Paiement($db);
@@ -162,9 +162,9 @@ if ($action == 'create') {
 
   print "</td></tr>\n";
 
-  print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>';
+  print '<tr><td>Cotisation</td><td><input type="text" name="cotisation" size="6"> euros</td></tr>\n';
 
-  print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"></td></tr>';
+  print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"></td></tr>\n';
   print "</form>\n";
   print "</table>\n";
   
@@ -183,27 +183,106 @@ if ($rowid > 0)
   $adh->fetch($rowid);
 
   print_titre("Edition de la fiche adhérent");
-  print "<form action=\"$PHP_SELF\" method=\"post\">";
-  print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
 
-  print "<tr><td>Type</td><td class=\"valeur\">$adh->type</td>";
-  print '<td valign="top" width="50%">Commentaires</tr>';
+  /*
+   * Confirmation de la suppression de l'adhérent
+   *
+   */
 
-  print '<tr><td>Personne</td><td class="valeur">'.$adh->morphy.'&nbsp;</td>';
+  if ($action == 'delete')
+    {
 
-  print '<td rowspan="11" valign="top" width="50%">';
-  print nl2br($adh->commentaire).'&nbsp;</td></tr>';
+      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">\n';
+      print '<input type="hidden" name="action" value="confirm_delete">\n';
+      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
+      
+      print '<tr><td colspan="3">Supprimer un adhérent</td></tr>\n';
+      print "<tr><td colspan=\"3\">La suppression d'un adhérent entraine la suppression de toutes ses cotisations !!!</td></tr>\n";
+      
+      print '<tr><td class="delete">Etes-vous sur de vouloir supprimer cet adhérent ?</td><td class="delete">';
+      $htmls = new Form($db);
+      
+      $htmls->selectyesno("confirm","no");
+      
+      print "</td>\n";
+      print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>\n';
+      print '</table>\n';
+      print "</form>\n";  
+    }
 
-  print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>';
 
-  print '<tr><td>Nom</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>';
+  /*
+   * Confirmation de la validation
+   *
+   */
+
+  if ($action == 'valid')
+    {
+
+      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">\n';
+      print '<input type="hidden" name="action" value="confirm_valid">\n';
+      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
+      
+      print '<tr><td colspan="3">Valider un adhérent</td></tr>\n';
+      
+      print '<tr><td class="valid">Etes-vous sur de vouloir valider cet adhérent ?</td><td class="valid">';
+      $htmls = new Form($db);
+      
+      $htmls->selectyesno("confirm","no");
+      
+      print "</td>\n";
+      print '<td class="valid" align="center"><input type="submit" value="Confirmer"</td></tr>\n';
+      print '</table>\n';
+      print "</form>\n";  
+    }
+
+  /*
+   * Confirmation de la Résiliation
+   *
+   */
+
+  if ($action == 'resign')
+    {
+
+      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">\n';
+      print '<input type="hidden" name="action" value="confirm_resign">\n';
+      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
+      
+      print '<tr><td colspan="3">Résilier une adhésion</td></tr>\n';
+      
+      print '<tr><td class="delete">Etes-vous sur de vouloir résilier cette adhésion ?</td><td class="delete">';
+      $htmls = new Form($db);
+      
+      $htmls->selectyesno("confirm","no");
+      
+      print "</td>\n";
+      print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>\n';
+      print '</table>\n';
+      print "</form>\n";  
+    }
+
+
+  print "<form action=\"$PHP_SELF\" method=\"post\">\n";
+  print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
+
+  print "<tr><td>Type</td><td class=\"valeur\">$adh->type</td>\n";
+  print '<td valign="top" width="50%">Commentaires</tr>\n';
+
+  print '<tr><td>Personne</td><td class="valeur">'.$adh->morphy.'&nbsp;</td>\n';
+
+  print '<td rowspan="11" valign="top" width="50%">\n';
+  print nl2br($adh->commentaire).'&nbsp;</td></tr>\n';
+
+  print '<tr><td width="15%">Prénom</td><td class="valeur" width="35%">'.$adh->prenom.'&nbsp;</td></tr>\n';
+
+  print '<tr><td>Nom</td><td class="valeur">'.$adh->nom.'&nbsp;</td></tr>\n';
   
 
-  print '<tr><td>Société</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>';
-  print '<tr><td>Adresse</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>';
-  print '<tr><td>CP Ville</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'&nbsp;</td></tr>';
-  print '<tr><td>Pays</td><td class="valeur">'.$adh->pays.'&nbsp;</td></tr>';
-  print '<tr><td>Email</td><td class="valeur">'.$adh->email.'&nbsp;</td></tr>';
+  print '<tr><td>Société</td><td class="valeur">'.$adh->societe.'&nbsp;</td></tr>\n';
+  print '<tr><td>Adresse</td><td class="valeur">'.nl2br($adh->adresse).'&nbsp;</td></tr>\n';
+  print '<tr><td>CP Ville</td><td class="valeur">'.$adh->cp.' '.$adh->ville.'&nbsp;</td></tr>\n';
+  print '<tr><td>Pays</td><td class="valeur">'.$adh->pays.'&nbsp;</td></tr>\n';
+  print '<tr><td>Email</td><td class="valeur">'.$adh->email.'&nbsp;</td></tr>\n';
 
   print "</table>\n";
 
@@ -211,13 +290,13 @@ if ($rowid > 0)
   if ($user->admin)
     {
   
-      print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>";
+      print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr>\n";
       
       /*
        * Case 1
        */
       
-      print '<td align="center" width="25%">[<a href="edit.php?rowid='.$adh->id.'">Editer</a>]</td>';
+      print '<td align="center" width="25%">[<a href="edit.php?rowid='.$adh->id.'">Editer</a>]</td>\n';
       
       /*
        * Case 2
@@ -225,32 +304,32 @@ if ($rowid > 0)
       
       if ($adh->statut < 1) 
 	{
-	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=valid\">Valider l'adhésion</a>]</td>";
+	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=valid\">Valider l'adhésion</a>]</td>\n";
 	}
       else
 	{
-	  print "<td align=\"center\" width=\"25%\">-</td>";
+	  print "<td align=\"center\" width=\"25%\">-</td>\n";
 	}
       /*
        * Case 3
        */
       if ($adh->statut == 1) 
 	{
-	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=resign\">Résilier l'adhésion</a>]</td>";
+	  print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$rowid&action=resign\">Résilier l'adhésion</a>]</td>\n";
 	}
       else
 	{
-	  print "<td align=\"center\" width=\"25%\">-</td>";
+	  print "<td align=\"center\" width=\"25%\">-</td>\n";
 	}
       
       /*
        * Case 4
        */
 
-      print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=delete\">Supprimer</a>]</td>";
+      print "<td align=\"center\" width=\"25%\">[<a href=\"$PHP_SELF?rowid=$adh->id&action=delete\">Supprimer</a>]</td>\n";
 
 
-      print "</tr></table></form><p>";
+      print "</tr></table></form><p>\n";
     }
 
   /*
@@ -268,12 +347,12 @@ if ($rowid > 0)
       $num = $db->num_rows();
       $i = 0;
   
-      print "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"4\">";
+      print "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"4\">\n";
 
-      print '<TR class="liste_titre">';
-      print "<td>Cotisations</td>";
-      print "<td>Date</td>";
-      print "<td align=\"right\">Montant</TD>";
+      print '<TR class="liste_titre">\n';
+      print "<td>Cotisations</td>\n";
+      print "<td>Date</td>\n";
+      print "<td align=\"right\">Montant</TD>\n";
       print "</TR>\n";
       
       $var=True;
@@ -302,17 +381,17 @@ if ($rowid > 0)
    */
   if ($user->admin)
     {
-      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'&action=edit">';
-      print '<input type="hidden" name="action" value="cotisation">';
-      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
+      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'&action=edit">\n';
+      print '<input type="hidden" name="action" value="cotisation">\n';
+      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">\n';
 
-      print '<tr>';
+      print '<tr>\n';
 
       print '<td rowspan="6">';
 
-      print '</td>';
+      print '</td>\n';
 
-      print '<td width="15%">Fin adhésion</td>';
+      print '<td width="15%">Fin adhésion</td>\n';
       if ($adh->datefin < time())
 	{
 	  print '<td width="35%" class="delete">';
@@ -321,13 +400,13 @@ if ($rowid > 0)
 	{
 	  print '<td width="35%" class="valeur">';
 	}
-      print strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>';
+      print strftime("%d %B %Y",$adh->datefin).'&nbsp;</td>\n';
 
-      print '<td valign="top" width="50%">&nbsp;</td></tr>';
+      print '<td valign="top" width="50%">&nbsp;</td></tr>\n';
       
-      print '<tr><td colspan="3">Nouvelle adhésion</td></tr>';
+      print '<tr><td colspan="3">Nouvelle adhésion</td></tr>\n';
       
-      print "<tr><td>Date de cotisation</td><td>";
+      print "<tr><td>Date de cotisation</td><td>\n";
       if ($adh->datefin > 0)
 	{
 	  print_date_select($adh->datefin + (3600*24));
@@ -344,88 +423,12 @@ if ($rowid > 0)
       $paiement->select("modepaiement","crédit");
       
       print "</td><td>&nbsp;</td></tr>\n";
-      print '<tr><td>Cotisation</td><td colspan="2"><input type="text" name="cotisation" size="6"> euros</td></tr>';
-      print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"</td></tr>';
-      print '</table>';
-      print "</form>";  
+      print '<tr><td>Cotisation</td><td colspan="2"><input type="text" name="cotisation" size="6"> euros</td></tr>\n';
+      print '<tr><td colspan="2" align="center"><input type="submit" value="Enregistrer"</td></tr>\n';
+      print '</table>\n';
+      print "</form>\n";  
     }
 
-  /*
-   * Confirmation de la suppression de l'adhérent
-   *
-   */
-
-  if ($action == 'delete')
-    {
-
-      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
-      print '<input type="hidden" name="action" value="confirm_delete">';
-      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
-      
-      print '<tr><td colspan="3">Supprimer un adhérent</td></tr>';
-      print "<tr><td colspan=\"3\">La suppression d'un adhérent entraine la suppression de toutes ses cotisations !!!</td></tr>";
-      
-      print '<tr><td class="delete">Etes-vous sur de vouloir supprimer cet adhérent ?</td><td class="delete">';
-      $htmls = new Form($db);
-      
-      $htmls->selectyesno("confirm","no");
-      
-      print "</td>";
-      print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
-      print '</table>';
-      print "</form>";  
-    }
-
-
-  /*
-   * Confirmation de la validation
-   *
-   */
-
-  if ($action == 'valid')
-    {
-
-      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
-      print '<input type="hidden" name="action" value="confirm_valid">';
-      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
-      
-      print '<tr><td colspan="3">Valider un adhérent</td></tr>';
-      
-      print '<tr><td class="valid">Etes-vous sur de vouloir valider cet adhérent ?</td><td class="valid">';
-      $htmls = new Form($db);
-      
-      $htmls->selectyesno("confirm","no");
-      
-      print "</td>";
-      print '<td class="valid" align="center"><input type="submit" value="Confirmer"</td></tr>';
-      print '</table>';
-      print "</form>";  
-    }
-
-  /*
-   * Confirmation de la Résiliation
-   *
-   */
-
-  if ($action == 'resign')
-    {
-
-      print '<form method="post" action="'.$PHP_SELF.'?rowid='.$rowid.'">';
-      print '<input type="hidden" name="action" value="confirm_resign">';
-      print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
-      
-      print '<tr><td colspan="3">Résilier une adhésion</td></tr>';
-      
-      print '<tr><td class="delete">Etes-vous sur de vouloir résilier cette adhésion ?</td><td class="delete">';
-      $htmls = new Form($db);
-      
-      $htmls->selectyesno("confirm","no");
-      
-      print "</td>";
-      print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
-      print '</table>';
-      print "</form>";  
-    }
 
 }