From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sat, 21 Jun 2014 14:39:22 +0000 (+0200)
Subject: Fix adding AX IDs via admin/add_accounts when using hruid instead of name+promo
X-Git-Tag: xorg/1.1.13~2
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=bb10e4dd824c00762deb2b6c0ae9a203b8acd2ce

Fix adding AX IDs via admin/add_accounts when using hruid instead of name+promo
---

diff --git a/modules/admin.php b/modules/admin.php
index 9cf1e7e..381df4e 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -981,12 +981,18 @@ class AdminModule extends PLModule
                         // Get human readable ID with first name and last name
                         $hrid = User::makeHrid($infos[1], $infos[0], $promotion);
                         $user = User::getSilent($hrid);
+                        $axid = $infos[2];
                     } else {
                         // The first column is the hrid, possibly without the promotion
                         $user = User::getSilent($infos[0] . '.' . $promotion);
                         if (is_null($user)) {
                             $user = User::getSilent($infos[0]);
                         }
+                        $axid = $infos[1];
+                    }
+                    if (!$axid) {
+                        $page->trigError("La ligne $line n'a pas été ajoutée : matricule AX vide.");
+                        continue;
                     }
                     if (is_null($user)) {
                         $page->trigError("La ligne $line n'a pas été ajoutée : aucun compte trouvé.");
@@ -1000,7 +1006,7 @@ class AdminModule extends PLModule
                     XDB::execute('UPDATE  profiles
                                      SET  ax_id = {?}
                                    WHERE  pid = {?}',
-                                 $infos[2], $profile->id());
+                                 $axid, $profile->id());
 
                 }
             }