projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a dissuasive message in the "send a mail to a group" page
[platal.git]
/
modules
/
xnetevents.php
diff --git
a/modules/xnetevents.php
b/modules/xnetevents.php
index
a7eadd0
..
a9d4d1c
100644
(file)
--- a/
modules/xnetevents.php
+++ b/
modules/xnetevents.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
3
Polytechnique.org *
+ * Copyright (C) 2003-201
4
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-204,9
+204,10
@@
class XnetEventsModule extends PLModule
S::i('uid'), $e['eid']);
$e['topay'] = 0;
S::i('uid'), $e['eid']);
$e['topay'] = 0;
- $e['paid'] =
$e['moments'][0]['paid']
;
+ $e['paid'] =
0
;
foreach ($e['moments'] as $m) {
$e['topay'] += $m['nb'] * $m['montant'];
foreach ($e['moments'] as $m) {
$e['topay'] += $m['nb'] * $m['montant'];
+ $e['paid'] += $m['paid'];
}
$montant = XDB::fetchOneCell(
}
$montant = XDB::fetchOneCell(
@@
-370,7
+371,7
@@
class XnetEventsModule extends PLModule
$all = !Env::v('item_id', false);
$participants = get_event_participants($evt, $item_id, $tri);
$all = !Env::v('item_id', false);
$participants = get_event_participants($evt, $item_id, $tri);
- $title = 'Nom;Prénom;Promotion';
+ $title = 'Nom;Prénom;Promotion
;Email
';
if ($admin) {
$title .=';Société;Poste';
}
if ($admin) {
$title .=';Société;Poste';
}
@@
-393,7
+394,7
@@
class XnetEventsModule extends PLModule
if ($participants) {
foreach ($participants as $participant) {
$user = $participant['user'];
if ($participants) {
foreach ($participants as $participant) {
$user = $participant['user'];
- $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo();
+ $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo()
. ';' . $user->bestEmail()
;
if ($admin && $user->hasProfile()) {
$line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description;
} else {
if ($admin && $user->hasProfile()) {
$line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description;
} else {
@@
-777,5
+778,5
@@
class XnetEventsModule extends PLModule
}
}
}
}
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker
f
enc=utf-8:
?>
?>