private $fbuser = null; // Facebook user object (JSON)
private $accessToken = null; // Access token provided by Facebook JS API
- function prepare($args) {
+ function prepare(array $args=array()) {
parent::prepare($args);
// Check cookie for a valid access_token
if (empty($this->accessToken)) {
$this->clientError(_m("Unable to authenticate you with Facebook."));
- return false;
}
$graphUrl = 'https://graph.facebook.com/me?access_token=' . urlencode($this->accessToken);
$this->fbuser = json_decode(file_get_contents($graphUrl));
- if (!empty($this->fbuser)) {
- $this->fbuid = $this->fbuser->id;
- // OKAY, all is well... proceed to register
- return true;
- } else {
-
+ if (empty($this->fbuser)) {
// log badness
list($proxy, $ip) = common_client_ip();
);
}
- return false;
+ $this->fbuid = $this->fbuser->id;
+ // OKAY, all is well... proceed to register
+ return true;
}
- function handle($args)
+ function handle(array $args=array())
{
parent::handle($args);
// TRANS: in the same StatusNet site.
_m('There is already a local account linked with that Facebook account.')
);
-
- return;
}
$cur = common_current_user();
// TRANS: in the same StatusNet site.
_m('There is already a local account linked with that Facebook account.')
);
-
- return;
}
}
if (common_config('site', 'closed')) {
// TRANS: Client error trying to register with registrations not allowed.
$this->clientError(_m('Registration not allowed.'));
- return;
}
$invite = null;
if (empty($code)) {
// TRANS: Client error trying to register with registrations 'invite only'.
$this->clientError(_m('Registration not allowed.'));
- return;
}
- $invite = Invitation::staticGet($code);
+ $invite = Invitation::getKV($code);
if (empty($invite)) {
// TRANS: Client error trying to register with an invalid invitation code.
$this->clientError(_m('Not a valid invitation code.'));
- return;
}
}
try {
- $nickname = Nickname::normalize($this->trimmed('newname'));
+ $nickname = Nickname::normalize($this->trimmed('newname'), true);
} catch (NicknameException $e) {
$this->showForm($e->getMessage());
return;
}
- if (!User::allowed_nickname($nickname)) {
- // TRANS: Form validation error displayed when picking a nickname that is not allowed.
- $this->showForm(_m('Nickname not allowed.'));
- return;
- }
-
- if (User::staticGet('nickname', $nickname)) {
- // TRANS: Form validation error displayed when picking a nickname that is already in use.
- $this->showForm(_m('Nickname already in use. Try another one.'));
- return;
- }
-
$args = array(
'nickname' => $nickname,
'fullname' => $this->fbuser->name,
if (!$result) {
// TRANS: Server error displayed when connecting to Facebook fails.
$this->serverError(_m('Error connecting user to Facebook.'));
- return;
}
// Add a Foreign_user record
if ($response->isOk()) {
// seems to always be jpeg, but not sure
- $tmpname = "facebook-avatar-tmp-" . common_good_rand(4);
+ $tmpname = "facebook-avatar-tmp-" . common_random_hexstr(4);
$ok = file_put_contents(
Avatar::path($tmpname),
} else {
// save it as an avatar
- $file = new ImageFile($user->id, Avatar::path($tmpname));
- $filename = $file->resize(180); // size of the biggest img we get from Facebook
+ $imagefile = new ImageFile(null, Avatar::path($tmpname));
+ $filename = Avatar::filename($user->id, image_type_to_extension($imagefile->preferredType()),
+ 180, common_timestamp());
+ // Previous docs said 180 is the "biggest img we get from Facebook"
+ $imagefile->resizeTo(Avatar::path($filename, array('width'=>180, 'height'=>180)));
+
+ // No need to keep the temporary file around...
+ @unlink(Avatar::path($tmpname));
$profile = $user->getProfile();
);
// clean up tmp file
- @unlink(Avatar::path($tmpname));
}
}
return;
}
- $user = User::staticGet('nickname', $nickname);
+ $user = User::getKV('nickname', $nickname);
$this->tryLinkUser($user);
if (empty($result)) {
// TRANS: Server error displayed when connecting to Facebook fails.
$this->serverError(_m('Error connecting user to Facebook.'));
- return;
}
}
function tryLogin()
{
- $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
-
- if (!empty($flink)) {
+ try {
+ $flink = Foreign_link::getByForeignID($this->fbuid, FACEBOOK_SERVICE);
$user = $flink->getUser();
- if (!empty($user)) {
-
- common_log(
- LOG_INFO,
- sprintf(
- 'Logged in Facebook user %s as user %d (%s)',
- $this->fbuid,
- $user->nickname,
- $user->id
- ),
- __FILE__
- );
+ common_log(
+ LOG_INFO,
+ sprintf(
+ 'Logged in Facebook user %s as user %d (%s)',
+ $this->fbuid,
+ $user->nickname,
+ $user->id
+ ),
+ __FILE__
+ );
- common_set_user($user);
- common_real_login(true);
+ common_set_user($user);
+ common_real_login(true);
- // clear out the stupid cookie
- setcookie('fb_access_token', '', time() - 3600); // one hour ago
+ // clear out the stupid cookie
+ setcookie('fb_access_token', '', time() - 3600); // one hour ago
- $this->goHome($user->nickname);
- }
+ $this->goHome($user->nickname);
- } else {
+ } catch (NoResultException $e) {
$this->showForm(null, $this->bestNewNickname());
}
}
function bestNewNickname()
{
- if (!empty($this->fbuser->username)) {
- $nickname = $this->nicknamize($this->fbuser->username);
- if ($this->isNewNickname($nickname)) {
- return $nickname;
- }
+ try {
+ $nickname = Nickname::normalize($this->fbuser->username, true);
+ return $nickname;
+ } catch (NicknameException $e) {
+ // Failed to normalize nickname, but let's try the full name
}
- // Try the full name
-
- $fullname = $this->fbuser->name;
-
- if (!empty($fullname)) {
- $fullname = $this->nicknamize($fullname);
- if ($this->isNewNickname($fullname)) {
- return $fullname;
- }
+ try {
+ $nickname = Nickname::normalize($this->fbuser->name, true);
+ return $nickname;
+ } catch (NicknameException $e) {
+ // Any more ideas? Nope.
}
return null;
}
- /**
- * Given a string, try to make it work as a nickname
- */
- function nicknamize($str)
- {
- $str = preg_replace('/\W/', '', $str);
- return strtolower($str);
- }
-
- /*
- * Is the desired nickname already taken?
- *
- * @return boolean result
- */
- function isNewNickname($str)
- {
- if (!Nickname::isValid($str)) {
- return false;
- }
-
- if (!User::allowed_nickname($str)) {
- return false;
- }
-
- if (User::staticGet('nickname', $str)) {
- return false;
- }
-
- return true;
- }
-
/*
* Do we already have a user record with this email?
* (emails have to be unique but they can change)
function isNewEmail($email)
{
// we shouldn't have to validate the format
- $result = User::staticGet('email', $email);
+ $result = User::getKV('email', $email);
if (empty($result)) {
return true;
projects / quix0rs-gnu-social.git / blobdiff