Fix hruid update script.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/upgrade/0.10.0/connect.db.inc.php b/upgrade/0.10.0/connect.db.inc.php
deleted file mode 100644 (file)
index 2e668953bef251cce3d1fb900191a78d9045d452..0000000000000000000000000000000000000000
--- a/upgrade/0.10.0/connect.db.inc.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
- *  http://opensource.polytechnique.org/                                   *
- *                                                                         *
- *  This program is free software; you can redistribute it and/or modify   *
- *  it under the terms of the GNU General Public License as published by   *
- *  the Free Software Foundation; either version 2 of the License, or      *
- *  (at your option) any later version.                                    *
- *                                                                         *
- *  This program is distributed in the hope that it will be useful,        *
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *  GNU General Public License for more details.                           *
- *                                                                         *
- *  You should have received a copy of the GNU General Public License      *
- *  along with this program; if not, write to the Free Software            *
- *  Foundation, Inc.,                                                      *
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
- ***************************************************************************/
-
-ini_set('include_path', dirname(__FILE__).'/../../include:' . dirname(__FILE__).'/../../classes:/usr/share/php');
-
-require_once 'xorg.inc.php';
-require_once 'xdb.php';
-
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
-?>

diff --git a/upgrade/0.10.0/connect.db.inc.php b/upgrade/0.10.0/connect.db.inc.php
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..442fab7cb7e2919b0a67d0e63fe5ed4f33c7be29
--- /dev/null
+++ b/upgrade/0.10.0/connect.db.inc.php
@@ -0,0 +1 @@
+../../bin/connect.db.inc.php
\ No newline at end of file

diff --git a/upgrade/0.10.0/hruid.update.php b/upgrade/0.10.0/hruid.update.php
index 8edb887..8e38ca0 100755 (executable)
--- a/upgrade/0.10.0/hruid.update.php
+++ b/upgrade/0.10.0/hruid.update.php
@@ -2,7 +2,6 @@
 <?php
 
 require_once 'connect.db.inc.php';
-require_once 'xorg.misc.inc.php';
 
 // Fetches the list of unregistered users.
 $users = XDB::iterRow(
@@ -13,8 +12,11 @@ $users = XDB::iterRow(
 // Creates missing human readable uids.
 while (list($user_id, $prenom, $nom, $promo) = $users->next()) {
     $forlife = make_forlife($prenom, $nom, $promo);
-    if (!XDB::execute("UPDATE auth_user_md5 SET hruid = {?} WHERE user_id = {?}", $forlife, $user_id)) {
+    $hruid = XDB::query('SELECT * FROM auth_user_md5 WHERE hruid = {?} AND user_id != {?}', $forlife, $user_id);
+    if ($hruid->numRows() > 0) {
         echo "WARNING: Duplicate forlife for user $user_id and forlife '$forlife'. Please check manually the entry.\n";
+    } else {
+        XDB::execute('UPDATE auth_user_md5 SET hruid = {?} WHERE user_id = {?}', $forlife, $user_id);
     }
 }
 ?>