From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 26 Aug 2013 13:51:54 +0000 (+0200)
Subject: Add missing checks for 3rdParty login data
X-Git-Tag: 2.0.0_Beta_8~44^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7acd1b8f67351d6c583fd8d7974501942fb08da4;p=GitHub%2FWoltLab%2FWCF.git

Add missing checks for 3rdParty login data

see:  http://beta.woltlab.com/index.php/Thread/3315-Facebook-Register-Fehler/
---

diff --git a/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php b/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
index aae1f7956e..33bab4601c 100644
--- a/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php
@@ -108,7 +108,7 @@ class FacebookAuthAction extends AbstractAction {
 				// save data and redirect to registration
 				else {
 					WCF::getSession()->register('__username', $userData['name']);
-					WCF::getSession()->register('__email', $userData['email']);
+					if (isset($userData['email'])) WCF::getSession()->register('__email', $userData['email']);
 					WCF::getSession()->register('__facebookData', $userData);
 					
 					// we assume that bots won't register on facebook first
diff --git a/wcfsetup/install/files/lib/form/RegisterForm.class.php b/wcfsetup/install/files/lib/form/RegisterForm.class.php
index c4cb444f9f..84e85ba9fb 100644
--- a/wcfsetup/install/files/lib/form/RegisterForm.class.php
+++ b/wcfsetup/install/files/lib/form/RegisterForm.class.php
@@ -333,11 +333,11 @@ class RegisterForm extends UserAddForm {
 						
 						WCF::getSession()->unregister('__facebookData');
 						
-						if ($facebookData['email'] == $this->email) {
+						if (isset($facebookData['email']) && $facebookData['email'] == $this->email) {
 							$registerVia3rdParty = true;
 						}
 						
-						$saveOptions[User::getUserOptionID('gender')] = ($facebookData['gender'] == 'male' ? UserProfile::GENDER_MALE : UserProfile::GENDER_FEMALE);
+						if (isset($facebookData['gender'])) $saveOptions[User::getUserOptionID('gender')] = ($facebookData['gender'] == 'male' ? UserProfile::GENDER_MALE : UserProfile::GENDER_FEMALE);
 						
 						if (isset($facebookData['birthday'])) {
 							list($month, $day, $year) = explode('/', $facebookData['birthday']);