Fixes entreprises edition (Closes #1123).

[platal.git] / modules / xnetgrp.php

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 28d1dd3..a3accb6 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -358,9 +358,6 @@ class XnetGrpModule extends PLModule
             $filename = $globals->asso('diminutif') . '.csv';
         }
         $users = $globals->asso()->getMembersFilter(null, new UFO_Name('directory_name'))->getUsers();
-        header('Content-Type: text/x-csv; charset=utf-8;');
-        header('Pragma: ');
-        header('Cache-Control: ');
         pl_content_headers("text/x-csv");
         $page->changeTpl('xnetgrp/annuaire-csv.tpl', NO_SKIN);
         $page->assign('users', $users);
@@ -477,16 +474,13 @@ class XnetGrpModule extends PLModule
             XDB::execute("INSERT INTO  group_member_sub_requests (asso_id, uid, ts, reason)
                                VALUES  ({?}, {?}, NOW(), {?})",
                          $globals->asso('id'), S::i('uid'), Post::v('message'));
-            $res = XDB::query('SELECT  IF(m.email IS NULL,
-                                          CONCAT(al.alias,"@polytechnique.org"),
-                                           m.email)
-                                 FROM  group_members AS m
-                           INNER JOIN  aliases   AS al ON (al.type = "a_vie"
-                                                                 AND al.uid = m.uid)
-                                WHERE  perms="admin" AND m.asso_id = {?}',
-                             $globals->asso('id'));
-            $emails = $res->fetchColumn();
-            $to     = implode(',', $emails);
+            $uf = New UserFilter(New UFC_Group($globals->asso('id'), true));
+            $admins = $uf->iterUsers();
+            $admin = $admins->next();
+            $to = $admin->bestalias;
+            while ($admin = $admins->next()) {
+                $to .= ', ' . $admin->bestalias;
+            }
 
             $append = "\n"
                     . "-- \n"
@@ -1032,6 +1026,7 @@ class XnetGrpModule extends PLModule
             $art['prenom']     = S::v('prenom');
             $art['promo']      = S::v('promo');
             $art['hruid']      = S::user()->login();
+            $art['uid']        = S::user()->id();
             $art['expiration'] = Post::v('expiration');
             $art['public']     = Post::has('public');
             $art['xorg']       = Post::has('xorg');