ldapauth.php.patch

--- /run/user/nathaniel/gvfs/sftp:host=vcl.sharcnet.ca,user=root/root/patches/ldapnumericid/ldapauth.php.orig
+++ /run/user/nathaniel/gvfs/sftp:host=vcl.sharcnet.ca,user=root/root/patches/ldapnumericid/ldapauth.php.mod
@@ -41,15 +41,16 @@

    $loweruserid = strtolower($userid);
    $loweruserid = mysql_real_escape_string($loweruserid);
+   $numericid = $authMechs[$authtype]['numericid'];

    # check for existance of an expired user if a numericid exists
-   if(array_key_exists('numericid', $data)) {
+   if(array_key_exists($numericid, $data)) {
        $query = "SELECT id, "
               .        "unityid, "
               .        "affiliationid "
               . "FROM user "
               . "WHERE lastupdated < DATE_SUB(NOW(), INTERVAL 1 YEAR) AND "
-              .       "uid = {$data['numericid']} AND "
+              .       "uid = {$data[$numericid]} AND "
               .       "unityid != '$loweruserid'";
               #.       "affiliationid = {$authMechs[$authtype]['affiliationid']}";
        $qh = doQuery($query, 101);
@@ -75,7 +76,7 @@
    }

    $query = "INSERT INTO user (";
-   if(array_key_exists('numericid', $data))
+   if(array_key_exists($numericid, $data))
        $query .=    "uid, ";
    $query .=       "unityid, "
           .        "affiliationid, "
@@ -85,8 +86,8 @@
           .        "emailnotices, "
           .        "lastupdated) "
           . "VALUES (";
-   if(array_key_exists('numericid', $data))
-       $query .=    "{$data['numericid']}, ";
+   if(array_key_exists($numericid, $data))
+       $query .=    "{$data[$numericid]}, ";
    $query .=       "'$loweruserid', "
           .        "{$authMechs[$authtype]['affiliationid']}, "
           .        "'{$data['first']}', "
@@ -171,6 +172,7 @@
        return NULL;
    $affilid = $authMechs[$authtype]['affiliationid'];
    $now = unixToDatetime(time());
+   $numericid = $authMechs[$authtype]['numericid'];

    // select desired data from db
    $query = "SELECT i.name AS IMtype, "
@@ -195,9 +197,9 @@
           .      "affiliation af "
           . "WHERE u.IMtypeid = i.id AND "
           .       "af.id = $affilid AND ";
-   if(array_key_exists('numericid', $userData) &&
-      is_numeric($userData['numericid']))
-       $query .=   "u.uid = {$userData['numericid']}";
+   if(array_key_exists($numericid, $userData) &&
+      is_numeric($userData[$numericid]))
+       $query .=   "u.uid = {$userData[$numericid]}";
    else {
        $query .=   "u.unityid = '$esc_userid' AND "
               .    "u.affiliationid = $affilid";
@@ -218,9 +220,9 @@
               .     "lastname = '{$userData['last']}', "
               .     "email = '{$userData['email']}', "
               .     "lastupdated = '$now' ";
-       if(array_key_exists('numericid', $userData) &&
-          is_numeric($userData['numericid']))
-           $query .= "WHERE uid = {$userData['numericid']}";
+       if(array_key_exists($numericid, $userData) &&
+          is_numeric($userData[$numericid]))
+           $query .= "WHERE uid = {$userData[$numericid]}";
        else
            $query .= "WHERE unityid = '$esc_userid' AND "
                   .        "affiliationid = $affilid";
@@ -295,8 +297,9 @@
 function getLDAPUserData($authtype, $userid) {
    global $authMechs, $mysql_link_vcl;
    $auth = $authMechs[$authtype];
+   $numericid = $auth['numericid'];
    $donumericid = 0;
-   if(array_key_exists('numericid', $auth))
+   if(array_key_exists($numericid, $auth))
        $donumericid = 1;

    $ds = ldap_connect("ldaps://{$auth['server']}/");
@@ -315,7 +318,7 @@
                        $auth['lastname'],
                        $auth['email']);
    if($donumericid)
-       array_push($ldapsearch, $auth['numericid']);
+       array_push($ldapsearch, $auth[$numericid]);
    # FIXME hack
    array_push($ldapsearch, 'gecos');

@@ -376,8 +379,8 @@
            $return['last'] = mysql_real_escape_string($data[strtolower($auth['lastname'])]);
        else
            $return['last'] = '';
-       if($donumericid && is_numeric($data[strtolower($auth['numericid'])]))
-           $return['numericid'] = $data[strtolower($auth['numericid'])];
+       if($donumericid && is_numeric($data[strtolower($auth[$numericid])]))
+           $return[$numericid] = $data[strtolower($auth[$numericid])];
        $return['email'] = mysql_real_escape_string($data[strtolower($auth['email'])]);

        return $return;
@@ -409,10 +412,13 @@
    if(! $res)
        return 0;

+
    $search = ldap_search($ds,
                          $auth['binddn'],
                          "{$auth['unityid']}={$user['unityid']}",
                          array('memberof'), 0, 10, 15);
+
+
    if(! $search)
        return 0;

@@ -428,5 +434,6 @@
    }
    $newusergroups = array_unique($newusergroups);
    updateGroups($newusergroups, $user["id"]);
+
 }
 ?>