X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Femail.php;h=15d1e31e2b270c6c31e91f90e9c9cea765f4f916;hb=911075226546c6b058eca1e0b889097f79fa6232;hp=57dd50de4adc49a7a8f677d01b9bf86f4747d390;hpb=4b79fe1c1096e933feb5fdba75cb8a99a6046fdb;p=platal.git diff --git a/modules/email.php b/modules/email.php index 57dd50d..15d1e31 100644 --- 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) @@ -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) {