Uses user's visibility limitations to display vcards (Closes #1478).

[platal.git] / modules / email.php

diff --git a/modules/email.php b/modules/email.php
index df211d6..15d1e31 100644 (file)
--- a/modules/email.php
+++ b/modules/email.php
@@ -307,7 +307,7 @@ class EmailModule extends PLModule
         $page->assign('googleapps', GoogleAppsAccount::account_status($user->id()));
 
         require_once 'emails.combobox.inc.php';
-        fill_email_combobox($page);
+        fill_email_combobox($page, array('job', 'stripped_directory'));
     }
 
     function handler_antispam($page, $filter_status = null, $redirection = null)
@@ -740,7 +740,7 @@ class EmailModule extends PLModule
                                   FROM  email_watch            AS w
                             INNER JOIN  email_redirect_account AS r ON (w.email = r.redirect)
                             INNER JOIN  email_source_account   AS s ON (s.uid = r.uid AND s.type = \'forlife\')
-                            INNER JOIN  accounts               AS a ON (r.uid = a.uid)
+                             LEFT JOIN  accounts               AS a ON (w.uid = a.uid)
                                  WHERE  w.email = {?}
                               ORDER BY  s.email',
                                $email);
@@ -872,10 +872,11 @@ class EmailModule extends PLModule
 
                 $csv = fopen('php://output', 'w');
                 fputcsv($csv, array('nom', 'promo', 'bounces', 'nbmails', 'url', 'corps', 'job', 'networking'), ';');
+                $corpsList = DirEnum::getOptions(DirEnum::CURRENTCORPS);
                 foreach ($broken_user_list as $uid => $mails) {
                     $profile = Profile::get($uid);
                     $corps = $profile->getCorps();
-                    $current_corps = ($corps && $corps->current) ? $corps->current : '';
+                    $current_corps = ($corps && $corps->current) ? $corpsList[$corps->current] : '';
                     $jobs = $profile->getJobs();
                     $companies = array();
                     foreach ($jobs as $job) {