eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'apiaccountregister_event_branch' into 'nightly'

Browse Source 
APIStartRegistrationTry event



See merge request !77
This commit is contained in:
mmn 2016-01-11 21:08:09 +00:00
commit e4a1dff98d
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
actions/apiaccountregister.php
View File

@ -154,25 +154,27 @@ class ApiAccountRegisterAction extends ApiAction
// annoy spammers // annoy spammers
sleep(7); sleep(7);
if (Event::handle('APIStartRegistrationTry', array($this))) {
try {
$user = User::register(array('nickname' => $nickname,
'password' => $password,
'email' => $email,
'fullname' => $fullname,
'homepage' => $homepage,
'bio' => $bio,
'location' => $location,
'code' => $this->code));
Event::handle('EndRegistrationTry', array($this));
try { $this->initDocument('json');
$user = User::register(array('nickname' => $nickname, $this->showJsonObjects($this->twitterUserArray($user->getProfile()));
'password' => $password, $this->endDocument('json');
'email' => $email,
'fullname' => $fullname,
'homepage' => $homepage,
'bio' => $bio,
'location' => $location,
'code' => $this->code));
Event::handle('EndRegistrationTry', array($this));
$this->initDocument('json'); } catch (Exception $e) {
$this->showJsonObjects($this->twitterUserArray($user->getProfile())); $this->clientError($e->getMessage(), 400);
$this->endDocument('json'); }
}
} catch (Exception $e) {
$this->clientError($e->getMessage(), 400);
}
} }
} }
@ -195,4 +197,4 @@ class ApiAccountRegisterAction extends ApiAction
return is_object($user); return is_object($user);
} }
} }