Merge branch 'xorg/maint'

diff --git a/bin/cron/bestmail.check.php b/bin/cron/bestmail.check.php
index 6074e73..770b154 100755 (executable)
--- a/bin/cron/bestmail.check.php
+++ b/bin/cron/bestmail.check.php
@@ -83,7 +83,5 @@ while ($row = $pids->next()) {
     echo "\n";
 }
 
-print "Done.\n";
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>

diff --git a/configs/mails.conf b/configs/mails.conf
index 61e9b51..a9714b2 100644 (file)
--- a/configs/mails.conf
+++ b/configs/mails.conf
@@ -41,7 +41,7 @@ from=webmaster@polytechnique.org
 to=non-geoloc@staff.polytechnique.org
 
 [mails_comletter]
-from="Lettre de la communauté" <reponses-lettre@polytechnique.org>
+from="Lettre de la communauté" <reponses-lettre@debats.polytechnique.org>
 replyto=reponses-lettre@debats.polytechnique.org
 retpath=info_nldebats@polytechnique.org
 

diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php
index dade470..ace99d9 100644 (file)
--- a/modules/xnetevents/xnetevents.inc.php
+++ b/modules/xnetevents/xnetevents.inc.php
@@ -57,8 +57,15 @@ function get_events($asso_id, $order, $archive)
 /* get event details
  * @param $eid: event's id
  */
-function get_event($eid)
+function get_event(&$eid)
 {
+    if (!is_numeric($eid)) {
+        $id = XDB::fetchOneCell("SELECT eid
+                                   FROM group_events
+                                  WHERE short_name = {?}",
+                                        $eid);
+        $eid = $id;
+    }
     $evt = XDB::fetchOneAssoc('SELECT ge.uid, ge.intitule, ge.descriptif, ge.debut, ge.fin, ge.deadline_inscription, ge.accept_nonmembre, ge.paiement_id
                                          FROM group_events as ge
                                         WHERE eid = {?}',