edb/inside
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes ldap_username overlap

Browse Source
This commit is contained in:
nikolark committed 2012-09-22 15:07:24 +02:00
1 parent 3d5a14e6e5
commit f409820383
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

includes/Ldap_defines.php
+3 -3
View File
@@ -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");
inside/User.php
+1 -1
View File
@@ -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) {