Fix payment page

Fix active email checking in contact list

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@788 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/carnet.php b/modules/carnet.php
index 0aa52b3..7608121 100644 (file)
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -270,7 +270,8 @@ class CarnetModule extends PLModule
                             ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                             ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                             adr.city, gp.a2, gp.pays AS countrytxt, gr.name AS region,
-                            IF(a.nom_usage<>'',a.nom_usage,a.nom) AS sortkey
+                            IF(a.nom_usage<>'',a.nom_usage,a.nom) AS sortkey,
+                            COUNT(em.email) > 0 AS actif
                       FROM  contacts       AS c
                 INNER JOIN  auth_user_md5  AS a   ON (a.user_id = c.contact)
                 INNER JOIN  aliases        AS l   ON (a.user_id = l.id AND l.type='a_vie')
@@ -286,7 +287,9 @@ class CarnetModule extends PLModule
                                                       AND FIND_IN_SET('active', adr.statut))
                  LEFT JOIN  geoloc_pays    AS gp  ON (adr.country = gp.a2)
                  LEFT JOIN  geoloc_region  AS gr  ON (adr.country = gr.a2 AND adr.region = gr.region)
+                 LEFT JOIN  emails         AS em  ON (em.uid = a.user_id AND em.flags = 'active')
                      WHERE  c.uid = $uid
+                  GROUP BY  a.user_id
                   ORDER BY  ".$order;
 
             $page->assign_by_ref('citer', XDB::iterator($sql));

diff --git a/modules/payment/money.inc.php b/modules/payment/money.inc.php
index 8d3875c..862232a 100644 (file)
--- a/modules/payment/money.inc.php
+++ b/modules/payment/money.inc.php
@@ -19,7 +19,7 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once dirname(__FILE__).'/../classes/Flagset.php';
+require_once dirname(__FILE__).'/../../classes/Flagset.php';
 
 class Payment
 {