forked from GNUsocial/gnu-social
		
	don't allow new users if the site is closed or invite only in OpenID
darcs-hash:20081203185022-5ed1f-a618527f069301c34b3fd6a75ae5676f45e64d39.gz
This commit is contained in:
		| @@ -167,6 +167,13 @@ class FinishopenidloginAction extends Action { | |||||||
|  |  | ||||||
| 	function create_new_user() { | 	function create_new_user() { | ||||||
|  |  | ||||||
|  |         # FIXME: save invite code before redirect, and check here | ||||||
|  |  | ||||||
|  | 		if (common_config('site', 'closed') || common_config('site', 'inviteonly')) { | ||||||
|  | 			common_user_error(_('Registration not allowed.')); | ||||||
|  |             return; | ||||||
|  |         } | ||||||
|  |  | ||||||
| 		$nickname = $this->trimmed('newname'); | 		$nickname = $this->trimmed('newname'); | ||||||
|  |  | ||||||
| 		if (!Validate::string($nickname, array('min_length' => 1, | 		if (!Validate::string($nickname, array('min_length' => 1, | ||||||
| @@ -231,7 +238,7 @@ class FinishopenidloginAction extends Action { | |||||||
| 		$result = oid_link_user($user->id, $canonical, $display); | 		$result = oid_link_user($user->id, $canonical, $display); | ||||||
| 		 | 		 | ||||||
| 		oid_set_last($display);							    | 		oid_set_last($display);							    | ||||||
| 		common_set_user($user); | 		common_set_user($user->nickname); | ||||||
| 		common_real_login(true); | 		common_real_login(true); | ||||||
|         if (isset($_SESSION['openid_rememberme']) && $_SESSION['openid_rememberme']) { |         if (isset($_SESSION['openid_rememberme']) && $_SESSION['openid_rememberme']) { | ||||||
| 			common_rememberme($user); | 			common_rememberme($user); | ||||||
| @@ -296,6 +303,7 @@ class FinishopenidloginAction extends Action { | |||||||
|  |  | ||||||
| 		# Try the passed-in nickname | 		# Try the passed-in nickname | ||||||
|  |  | ||||||
|  |  | ||||||
| 		if ($sreg['nickname']) { | 		if ($sreg['nickname']) { | ||||||
| 			$nickname = $this->nicknamize($sreg['nickname']); | 			$nickname = $this->nicknamize($sreg['nickname']); | ||||||
| 			if ($this->is_new_nickname($nickname)) { | 			if ($this->is_new_nickname($nickname)) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user