remove people from location_us group if they login from elsewhere or if they are in the d1_nation group. The purdue group will supersede the location_us group through unix ACLs that will allow access to people in the purdue group for things that are restricted to people in the US

Author: Pascal Meunier

core/plugins/user/us/us.php

@@ -29,6 +29,23 @@ public function onUserLogin($user, $options = array())
 	{
 		$ip = $_SERVER['REMOTE_ADDR'];
 
+		$d1 = \Hubzero\User\Group::getInstance('d1_nation');
+
+		if (is_object($d1) && in_array(User::get('id'), $d1->get('members')))
+		{
+			Log::debug('[' . User::get('username') . '] is a member of [d1_nation], removing from group [location_us].');
+
+			$group = \Hubzero\User\Group::getInstance('location_us');
+
+			if (is_object($group))
+			{
+				$group->remove('members', array(User::get('id')));
+				$group->update();
+			}
+
+			return;
+		}
+
 		$gdb = \Hubzero\Geocode\Geocode::getGeoDBO();
 
 		if (!$gdb)
@@ -62,7 +79,15 @@ public function onUserLogin($user, $options = array())
 		}
 		else
 		{
-			Log::debug($ip . ' is not a US address, leaving [' . User::get('username') . '] membership to group [location_us] unchanged.');
+			Log::debug($ip . ' is not a US address, removing [' . User::get('username') . '] from group [location_us].');
+
+			$group = \Hubzero\User\Group::getInstance('location_us');
+
+			if (is_object($group))
+			{
+				$group->remove('members', array(User::get('id')));
+				$group->update();
+			}
 		}
 	}