bug 270, pub pour les adresses

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-419

diff --git a/include/profil/get_adresses.inc.php b/include/profil/get_adresses.inc.php
index 0d47580..e5bb326 100644 (file)
--- a/include/profil/get_adresses.inc.php
+++ b/include/profil/get_adresses.inc.php
@@ -67,9 +67,7 @@ $res = $globals->xdb->iterRow(
        FIND_IN_SET('res-secondaire', statut), FIND_IN_SET('courrier', statut),
        FIND_IN_SET('active', statut), FIND_IN_SET('temporaire', statut),
        adr1, adr2, adr3, cp, ville,
-        pays, region, tel, fax,
-       FIND_IN_SET('adr_public', visibilite), FIND_IN_SET('adr_ax', visibilite),
-       FIND_IN_SET('tel_public', visibilite), FIND_IN_SET('tel_ax', visibilite)
+        pays, region, tel, fax, pub, tel_pub
        FROM adresses
        WHERE uid = {?} AND NOT FIND_IN_SET('pro',statut) ".$sql_order
 , Session::getInt('uid', -1)
@@ -85,8 +83,8 @@ for ($i = 0; $i < $nb_adr; $i++) {
        $adresses[$adrid]['active'], $adresses[$adrid]['temporaire'],
        $adresses[$adrid]['adr1'], $adresses[$adrid]['adr2'], $adresses[$adrid]['adr3'], $adresses[$adrid]['cp'], $adresses[$adrid]['ville'],
        $adresses[$adrid]['pays'], $adresses[$adrid]['region'], $adresses[$adrid]['tel'], $adresses[$adrid]['fax'],
-       $adresses[$adrid]['adr_public'], $adresses[$adrid]['adr_ax'],
-       $adresses[$adrid]['tel_public'], $adresses[$adrid]['tel_ax']) = $res->next();
+       $adresses[$adrid]['pub'],
+       $adresses[$adrid]['tel_pub'],) = $res->next();
   $adresses[$adrid]['nouvelle'] = 'modif';
   $adresses[$adrid]['numero_formulaire'] = -1;
 }

diff --git a/include/profil/update_adresses.inc.php b/include/profil/update_adresses.inc.php
index 95809af..45b9b41 100644 (file)
--- a/include/profil/update_adresses.inc.php
+++ b/include/profil/update_adresses.inc.php
@@ -27,13 +27,6 @@ foreach($adresses as $adrid => $adr){
   if($adr['nouvelle'] != 'new'){ // test si on vient de creer cette adresse dans verif_adresse.inc.php
   
     //construction des bits
-    $visibilite = "";
-    if ($adr['adr_public']) $visibilite .= 'adr_public,';
-    if ($adr['adr_ax'])     $visibilite .= 'adr_ax,';
-    if ($adr['tel_public']) $visibilite .= 'tel_public,';
-    if ($adr['tel_ax'])     $visibilite .= 'tel_ax,';
-    if (! empty($visibilite)) $visibilite = substr($visibilite, 0, -1);
-
     $statut = "";
     if ($adr["secondaire"])    $statut .= 'res-secondaire,';
     if ($adr["courrier"])      $statut .= 'courrier,';
@@ -54,7 +47,8 @@ foreach($adresses as $adrid => $adr){
                         region = {?},
                         tel = {?},
                         fax = {?},
-                        visibilite = {?},
+                        pub = {?},
+                        tel_pub = {?},
                         datemaj = NOW(),
                         statut = {?},
                         uid = {?}, adrid = {?}",
@@ -67,7 +61,8 @@ foreach($adresses as $adrid => $adr){
                         $adr['region'],
                         $adr['tel'],
                         $adr['fax'],
-                        $visibilite,
+                        $adr['pub'],
+                        $adr['tel_pub'],
                         $statut,
                         Session::getInt('uid', -1), $adrid);
     }
@@ -85,7 +80,8 @@ foreach($adresses as $adrid => $adr){
                                 region = {?},
                                 tel = {?},
                                 fax = {?},
-                                visibilite = {?},
+                                pub = {?},
+                                tel_pub = {?},
                                 datemaj = NOW(),
                                 statut = {?}
                                 WHERE uid = {?} AND adrid = {?}",
@@ -98,7 +94,8 @@ foreach($adresses as $adrid => $adr){
                                 $adr['region'],
                                 $adr['tel'],
                                 $adr['fax'],
-                                $visibilite,
+                                $adr['pub'],
+                                $adr['tel_pub'],
                                 $statut,
                                 Session::getInt('uid', -1), $adrid
                    );

diff --git a/include/profil/verif_adresses.inc.php b/include/profil/verif_adresses.inc.php
index eea8b37..0801a7a 100644 (file)
--- a/include/profil/verif_adresses.inc.php
+++ b/include/profil/verif_adresses.inc.php
@@ -81,10 +81,8 @@ function replace_address($i){
   replace_ifset_adr('region', $i);
   replace_ifset_adr('tel', $i);
   replace_ifset_adr('fax', $i);
-  set_flag_adr('adr_public', $i);
-  set_flag_adr('adr_ax', $i);
-  set_flag_adr('tel_public', $i);
-  set_flag_adr('tel_ax', $i);
+  replace_ifset_adr('pub', $i);
+  replace_ifset_adr('tel_pub', $i);
   $tab = Env::getMixed('numero_formulaire', Array());
   if($tab[$i])
     $GLOBALS['adresses'][$i]['numero_formulaire'] = $tab[$i];
@@ -173,10 +171,8 @@ if (!isset($adresses) || (count($adresses) < $nb_adr_max)){
   $adr['courrier'] = 0;
   $adr['active'] = 0;
   $adr['temporaire'] = 1;
-  $adr['adr_public'] = 0;
-  $adr['adr_ax'] = 0;
-  $adr['tel_public'] = 0;
-  $adr['tel_ax'] = 0;
+  $adr['pub'] = 'private';
+  $adr['tel_pub'] = 'private';
   $adr['nouvelle'] = 'new'; //n'est pas issue d'un formulaire (sert dans update_adresses...)
 }
 

diff --git a/include/synchro_ax.inc.php b/include/synchro_ax.inc.php
index 5f71eea..cd56e75 100644 (file)
--- a/include/synchro_ax.inc.php
+++ b/include/synchro_ax.inc.php
@@ -196,7 +196,8 @@ function import_from_ax($userax, $epouse=false, $mobile=false, $del_address=null
                          pays = {?},
                          tel = {?}, fax = {?},
                          datemaj = NOW(),
-                         visibilite = 'adr_ax,tel_ax'",
+                         pub = 'ax',
+                         tel_pub = 'ax'",
                 $userax['uid'], $new_adrid,
                 $adr['adr1'], $adr['adr2'], $adr['adr3'],
                 $adr['cp'], $adr['ville'],

diff --git a/templates/profil/adresses.tpl b/templates/profil/adresses.tpl
index cc92e9a..a7373aa 100644 (file)
--- a/templates/profil/adresses.tpl
+++ b/templates/profil/adresses.tpl
@@ -62,17 +62,23 @@
         <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
           <tr>
             <td class="vert">
-              <input type="checkbox" name="adr_public[{$adrid}]" value="1" {if $adr.adr_public}checked="checked"{/if} />
+              <input type="radio" name="pub[{$adrid}]" value="public" {if $adr.pub eq 'public'}checked="checked"{/if} />
             </td>
             <td class="texte">
               site public
             </td>
             <td class="orange">
-              <input type="checkbox" name="adr_ax[{$adrid}]" value="1" {if $adr.adr_ax}checked="checked"{/if} />
+              <input type="radio" name="pub[{$adrid}]" value="ax" {if $adr.pub eq 'ax'}checked="checked"{/if} />
             </td>
             <td class="texte">
               transmis à l'AX
             </td>
+            <td class="rouge">
+              <input type="radio" name="pub[{$adrid}]" value="private" {if $adr.pub eq 'private'}checked="checked"{/if} />
+            </td>
+            <td class="texte">
+              privé
+            </td>
             <td class="texte">
               <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>
@@ -170,17 +176,23 @@
         <table class="flags" summary="Flags" cellpadding="0" cellspacing="0">
           <tr>
             <td class="vert">
-              <input type="checkbox" name="tel_public[{$adrid}]" value="1" {if $adr.tel_public}checked="checked"{/if} />
+              <input type="radio" name="tel_pub[{$adrid}]" value="public" {if $adr.tel_pub eq 'public'}checked="checked"{/if} />
             </td>
             <td class="texte">
               site public
             </td>
             <td class="orange">
-              <input type="checkbox" name="tel_ax[{$adrid}]" value="1" {if $adr.tel_ax}checked="checked"{/if} />
+              <input type="radio" name="tel_pub[{$adrid}]" value="ax" {if $adr.tel_pub eq 'ax'}checked="checked"{/if} />
             </td>
             <td class="texte">
               transmis à l'AX
             </td>
+            <td class="rouge">
+              <input type="radio" name="tel_pub[{$adrid}]" value="private" {if $adr.tel_pub eq 'private'}checked="checked"{/if} />
+            </td>
+            <td class="texte">
+              privé
+            </td>
             <td class="texte">
               <a href="{"docs/faq.php"|url}#flags" class="popup_800x240">Quelle couleur ??</a>
             </td>