From f40982038349588ab2eaf829b902c2b6f923f4b9 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sat, 22 Sep 2012 15:07:24 +0200
Subject: [PATCH] Fixes ldap_username overlap

---
 includes/Ldap_defines.php | 6 +++---
 inside/User.php           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/Ldap_defines.php b/includes/Ldap_defines.php
index edbcd5d..3df635d 100644
--- a/includes/Ldap_defines.php
+++ b/includes/Ldap_defines.php
@@ -1,5 +1,8 @@
 <?php
 
+define("LDAP_ENABLED", true);
+define("LDAP_SERVER", "pacman.neuf.no");
+
 define("KSUFFIX", "cn=krbcontainer");
 define("ASUFFIX", "ou=Automount");
 define("USUFFIX", "ou=People");
@@ -39,9 +42,6 @@ define("RADIUS_MYSQL_HOST", "snes.neuf.no");
 define("RADIUS_MYSQL_USER", apache_getenv("RADIUS_MYSQL_USER"));
 define("RADIUS_MYSQL_PASS", apache_getenv("RADIUS_MYSQL_PASS"));
 
-define("LDAP_ENABLED", true);
-define("LDAP_SERVER", "pacman.neuf.no");
-
 $api_keys = array();
 $api_keys[] = apache_getenv("API_KEY1");
 
diff --git a/inside/User.php b/inside/User.php
index 2b21045..84d688a 100644
--- a/inside/User.php
+++ b/inside/User.php
@@ -176,7 +176,7 @@ class User {
       $sql = sprintf("INSERT INTO din_user " .
       "  (id, username, password, firstname, " .
       "   lastname, addresstype, email, birthdate, " .
-      "   placeOfStudy, division_id_request) " . "VALUES " . "  (%s, %s, PASSWORD(%s), %s, %s, %s, %s, " . "   %s, %s, %s)", $this->conn->quoteSmart($this->id), $this->conn->quoteSmart($this->username), $this->conn->quoteSmart($this->password), $this->conn->quoteSmart($this->firstname), $this->conn->quoteSmart($this->lastname), $this->conn->quoteSmart($this->addresstype), $this->conn->quoteSmart($this->email), $this->conn->quoteSmart($this->birthdate), $this->conn->quoteSmart($this->placeOfStudy), $this->conn->quoteSmart(($this->division_id_request == NULL) ? NULL : $this->division_id_request));
+      "   placeOfStudy, division_id_request, ldap_username) " . "VALUES " . "  (%s, %s, PASSWORD(%s), %s, %s, %s, %s, " . "   %s, %s, %s, %s)", $this->conn->quoteSmart($this->id), $this->conn->quoteSmart($this->username), $this->conn->quoteSmart($this->password), $this->conn->quoteSmart($this->firstname), $this->conn->quoteSmart($this->lastname), $this->conn->quoteSmart($this->addresstype), $this->conn->quoteSmart($this->email), $this->conn->quoteSmart($this->birthdate), $this->conn->quoteSmart($this->placeOfStudy), $this->conn->quoteSmart(($this->division_id_request == NULL) ? NULL : $this->division_id_request), $this->conn->quoteSmart($this->username));
       $result = $this->conn->query($sql);
       if (DB :: isError($result) == true) {
         if ($result->getCode() == -5) {