X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs.net%2Fgroupe%2Fevt-admin.php;h=5749e61269bcafdb39e3ba783ee788a062e8926f;hb=e8599c21fcbd18beb8551368450174f35774794a;hp=7fc5a6c3ef139ad0161bcc76031ff3a8e957a291;hpb=0337d704b62718d7c77106c0e4c4e26fb02beacf;p=platal.git

diff --git a/htdocs.net/groupe/evt-admin.php b/htdocs.net/groupe/evt-admin.php
index 7fc5a6c..5749e61 100644
--- a/htdocs.net/groupe/evt-admin.php
+++ b/htdocs.net/groupe/evt-admin.php
@@ -8,33 +8,36 @@ require_once('xnet/evenements.php');
 $evt = get_event_detail(Env::get('eid'), Env::get('item_id'));
 
 // the event doesn't exist or doesn't belong to this assoif (!$evt)
-if (!$evt)
-	header("Location: evenements.php");
+if (!$evt) {
+	redirect("evenements.php");
+}
 
-if ($evt['show_participants'])
-	new_group_page('xnet/groupe/evt-admin.tpl');
-else
-	new_groupadmin_page('xnet/groupe/evt-admin.tpl');
+if ($evt['show_participants']) {
+    new_group_page('xnet/groupe/evt-admin.tpl');
+} else {
+    new_groupadmin_page('xnet/groupe/evt-admin.tpl');
+}
 
 $admin = may_update();
 
 // select a member from his mail
 if ($admin && Env::get('adm') && Env::get('mail')) {
-	if (strpos(Env::get('mail'), '@') === false)
-	$res = $globals->xdb->query(
-		"SELECT m.uid
-		   FROM groupex.membres AS m
-	     INNER JOIN aliases AS a ON (a.id = m.uid)
-		  WHERE a.alias = {?}",
-		Env::get('mail'));
-	else
+    if (strpos(Env::get('mail'), '@') === false) {
+        $res = $globals->xdb->query(
+                "SELECT m.uid
+                   FROM groupex.membres AS m
+             INNER JOIN aliases AS a ON (a.id = m.uid)
+                  WHERE a.alias = {?} AND m.asso_id = {?}",
+                Env::get('mail'), $globals->asso('id'));
+    } else {
 	$res = $globals->xdb->query(
 		"SELECT m.uid
 		   FROM groupex.membres AS m
 		  WHERE m.email = {?} AND m.asso_id = {?}",
 		Env::get('mail'), $globals->asso('id'));
-	$member = $res->fetchOneCell();
-	if (!$member) $page->trig("Membre introuvable");
+    }
+    $member = $res->fetchOneCell();
+    if (!$member) $page->trig("Membre introuvable");
 }
 
 // change the price paid by a participant
@@ -69,6 +72,7 @@ if ($admin && Env::get('adm') == 'nbs' && $member) {
 		$u = $res->fetchOneCell();
 		subscribe_lists_event($u, $member, $evt['participant_list'], $evt['absent_list']);
 	}
+	$evt = get_event_detail(Env::get('eid'), Env::get('item_id'));
 }
 
 $page->assign('admin', $admin);
@@ -76,7 +80,7 @@ $page->assign('evt', $evt);
 $page->assign('url_page', Env::get('PHP_SELF')."?eid=".Env::get('eid').(Env::has('item_id')?("&item_id=".Env::getInt('item_id')):''));
 $page->assign('tout', !Env::has('item_id'));
  
-if (count($evt['moments']) > 1) $page->assign('moments', $evt['moments']);
+if (count($evt['moments'])) $page->assign('moments', $evt['moments']);
 $page->assign('money', $evt['money']);
 
 $tri = (Env::get('order') == 'alpha' ? 'promo, nom, prenom' : 'nom, prenom, promo');