From de04c29a5464e6ed6dc0e11a6556ad1c19efd7c4 Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss_git@polytechnique.org>
Date: Sun, 1 Jun 2014 21:44:19 +0200
Subject: [PATCH] Don't set a default account type when creating an ext account

In the form to add a new "external account", the type "Personnel de
l'AX" is selected by default, which may lead to incorrect account hruid
when an admin forgets to change this type.  To prevent this issue, a new
empty type is added in the HTML form.
---
 modules/admin.php            | 8 +++++---
 templates/admin/accounts.tpl | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/admin.php b/modules/admin.php
index d4f1390..a220bcc 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -1515,12 +1515,14 @@ class AdminModule extends PLModule
             $sex = Post::s('sex');
             $email = Post::t('email');
             $type = Post::s('type');
-            $login = PlUser::makeHrid($firstname, $lastname, $type);
-            if (!isvalid_email($email)) {
+            if (!$type) {
+                $page->trigError("Empty account type");
+            } elseif (!isvalid_email($email)) {
                 $page->trigError("Invalid email address: $email");
-            } else if (strlen(Post::s('pwhash')) != 40) {
+            } elseif (strlen(Post::s('pwhash')) != 40) {
                 $page->trigError("Invalid password hash");
             } else {
+                $login = PlUser::makeHrid($firstname, $lastname, $type);
                 $full_name = $firstname . ' ' . $lastname;
                 $directory_name = $lastname . ' ' . $firstname;
                 XDB::execute("INSERT INTO  accounts (hruid, type, state, password,
diff --git a/templates/admin/accounts.tpl b/templates/admin/accounts.tpl
index a4a91b9..6d1a619 100644
--- a/templates/admin/accounts.tpl
+++ b/templates/admin/accounts.tpl
@@ -75,6 +75,7 @@ function add_user_to_url(f) {
         <td class="titre">Type de compte</td>
         <td>
           <select name="type">
+            <option value="" disabled selected>-</option>
             <option value="ax">Personnel de l'AX</option>
             <option value="fx">Personnel de la FX</option>
             <option value="school">Personnel de l'Ecole</option>
-- 
2.1.4