This is an automated email from the ASF dual-hosted git repository.
jfthomps pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/vcl.git
The following commit(s) were added to refs/heads/develop by this push:
new 0035b604 shibauth.php: modified processShibAuth: removed a few lines
that were NCSU specific that should never have been committed, though "if"
conditionals would have likely prevented them from being run anywhere else
0035b604 is described below
commit 0035b604f31792c2ca044471b532b8fcf3e666e4
Author: Josh Thompson <[email protected]>
AuthorDate: Tue Feb 27 15:50:37 2024 -0500
shibauth.php: modified processShibAuth: removed a few lines that were NCSU
specific that should never have been committed, though "if" conditionals would
have likely prevented them from being run anywhere else
---
web/.ht-inc/authmethods/shibauth.php | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/web/.ht-inc/authmethods/shibauth.php
b/web/.ht-inc/authmethods/shibauth.php
index c5e6e64d..e585fca1 100644
--- a/web/.ht-inc/authmethods/shibauth.php
+++ b/web/.ht-inc/authmethods/shibauth.php
@@ -134,19 +134,6 @@ function processShibAuth() {
}
else {
$usernid = getUserlistID($userid, 1);
- # NCSU specific
- if(is_null($userid) && $affil == 'NCSU') {
- $tmp = updateLDAPUser('NCSU LDAP', $username);
- $usernid = $tmp['id'];
- }
- /*if($affil == 'NCSU') {
- if(array_key_exists('SHIB_AFFILIATION', $_SERVER))
- $groups = $_SERVER['SHIB_AFFILIATION'];
- else
- $groups = array('shibaffil' => $shibaffil);
- updateShibGroups($usernid, $groups);
- }*/
- # end NCSU specific
if(is_null($usernid)) {
$tmp = updateShibUser($userid);
$usernid = $tmp['id'];
@@ -157,13 +144,13 @@ function processShibAuth() {
addLoginLog($userid, 'shibboleth', $affilid, 1);
- if($affil == 'UNCG') {
- $gid = getUserGroupID('All UNCG Users', $affilid);
+ /*if($affil == 'EXAMPLE1') {
+ $gid = getUserGroupID('All EXAMPLE1 Users', $affilid);
$query = "INSERT IGNORE INTO usergroupmembers "
. "(userid, usergroupid) "
. "VALUES ($usernid, $gid)";
- doQuery($query, 307);
- }
+ doQuery($query);
+ }*/
if(array_key_exists('SHIB_LOGOUTURL', $_SERVER))
$logouturl = $_SERVER['SHIB_LOGOUTURL'];