* @link http://status.net/
*/
-if (!defined('GNUSOCIAL')) { exit(1); }
+if (!defined('GNUSOCIAL')) {
+ exit(1);
+}
require_once INSTALLDIR.'/plugins/OpenID/openid.php';
*
* @return string Page title
*/
- function title()
+ public function title()
{
// TRANS: Title of OpenID settings page for a user.
- return _m('TITLE','OpenID settings');
+ return _m('TITLE', 'OpenID settings');
}
/**
*
* @return string Instructions for use
*/
- function getInstructions()
+ public function getInstructions()
{
// TRANS: Form instructions for OpenID settings.
// TRANS: This message contains Markdown links in the form [description](link).
return _m('[OpenID](%%doc.openid%%) lets you log into many sites ' .
- 'with the same user account. '.
- 'Manage your associated OpenIDs from here.');
+ 'with the same user account. '.
+ 'Manage your associated OpenIDs from here.');
}
- function showScripts()
+ public function showScripts()
{
parent::showScripts();
$this->autofocus('openid_url');
*
* @return void
*/
- function showContent()
+ public function showContent()
{
if (!common_config('openid', 'trusted_provider')) {
- $this->elementStart('form', array('method' => 'post',
- 'id' => 'form_settings_openid_add',
- 'class' => 'form_settings',
- 'action' =>
- common_local_url('openidsettings')));
- $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
+ $this->elementStart('form', ['method' => 'post',
+ 'id' => 'form_settings_openid_add',
+ 'class' => 'form_settings',
+ 'action' =>
+ common_local_url('openidsettings')]);
+ $this->elementStart('fieldset', ['id' => 'settings_openid_add']);
// TRANS: Fieldset legend.
- $this->element('legend', null, _m('LEGEND','Add OpenID'));
+ $this->element('legend', null, _m('LEGEND', 'Add OpenID'));
$this->hidden('token', common_session_token());
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
// TRANS: Field label.
$this->input('openid_url', _m('OpenID URL'), null,
- // TRANS: Form guide.
- _m('An OpenID URL which identifies you.'), null, true,
- array('placeholder'=>'https://example.com/you'));
+ // TRANS: Form guide.
+ _m('An OpenID URL which identifies you.'),
+ null, true,
+ ['placeholder'=>'https://example.com/you']);
+ $this->elementEnd('li');
+ $this->elementStart('li');
+ // TRANS: Field label.
+ $this->checkbox('openid-synch', _m('Synchronize Account'), false,
+ // TRANS: Form guide.
+ _m('Synchronize GNU social profile with this OpenID identity.'));
$this->elementEnd('li');
$this->elementEnd('ul');
// TRANS: Button text for adding an OpenID URL.
- $this->submit('settings_openid_add_action-submit', _m('BUTTON','Add'), 'submit', 'add');
+ $this->submit('settings_openid_add_action-submit', _m('BUTTON', 'Add'), 'submit', 'add');
$this->elementEnd('fieldset');
$this->elementEnd('form');
}
if ($cnt > 0) {
// TRANS: Header on OpenID settings page.
- $this->element('h2', null, _m('HEADER','Remove OpenID'));
-
+ $this->element('h2', null, _m('HEADER', 'OpenID Actions'));
+
if ($cnt == 1 && !$this->scoped->hasPassword()) {
-
$this->element('p', 'form_guide',
// TRANS: Form guide.
- _m('Removing your only OpenID '.
- 'would make it impossible to log in! ' .
- 'If you need to remove it, '.
- 'add another OpenID first.'));
+ _m('You can\'t remove your main OpenID account ' .
+ 'without either adding a password to your ' .
+ 'GNU social account or another OpenID account. ' .
+ 'You can synchronize your profile with your ' .
+ 'OpenID by clicking the button labeled "Synchronize".'));
if ($oid->fetch()) {
- $this->elementStart('p');
- $this->element('a', array('href' => $oid->canonical),
- $oid->display);
- $this->elementEnd('p');
+ $this->elementStart('form', ['method' => 'POST',
+ 'id' => 'form_settings_openid_actions' . $idx,
+ 'class' => 'form_settings',
+ 'action' => common_local_url('openidsettings')]);
+ $this->elementStart('fieldset');
+ $this->hidden('token', common_session_token());
+ $this->element('a', ['href' => $oid->canonical], $oid->display);
+ $this->hidden("openid_url", $oid->canonical);
+ // TRANS: Button text to synchronize OpenID with the GS profile.
+ $this->submit("synch", _m('BUTTON', 'Synchronize'), 'submit synch');
+ $this->elementEnd('fieldset');
+ $this->elementEnd('form');
}
-
} else {
-
$this->element('p', 'form_guide',
// TRANS: Form guide.
- _m('You can remove an OpenID from your account '.
- 'by clicking the button marked "Remove".'));
+ _m('You can remove an OpenID from your account ' .
+ 'by clicking the button labeled "Remove". ' .
+ 'You can synchronize your profile with an OpenID ' .
+ 'by clicking the button labeled "Synchronize".'));
$idx = 0;
while ($oid->fetch()) {
- $this->elementStart('form',
- array('method' => 'POST',
- 'id' => 'form_settings_openid_delete' . $idx,
- 'class' => 'form_settings',
- 'action' =>
- common_local_url('openidsettings')));
+ $this->elementStart('form', ['method' => 'POST',
+ 'id' => 'form_settings_openid_actions' . $idx,
+ 'class' => 'form_settings',
+ 'action' => common_local_url('openidsettings')]);
$this->elementStart('fieldset');
$this->hidden('token', common_session_token());
- $this->element('a', array('href' => $oid->canonical),
- $oid->display);
+ $this->element('a', ['href' => $oid->canonical], $oid->display);
$this->hidden("openid_url{$idx}", $oid->canonical, 'openid_url');
+ $this->elementStart('span', ['class' => 'element_actions']);
+ // TRANS: Button text to sync an OpenID with the GS profile.
+ $this->submit("synch{$idx}", _m('BUTTON', 'Synchronize'), 'submit', 'synch');
// TRANS: Button text to remove an OpenID.
- $this->submit("remove{$idx}", _m('BUTTON','Remove'), 'submit remove', 'remove');
+ $this->submit("remove{$idx}", _m('BUTTON', 'Remove'), 'submit', 'remove');
+ $this->elementEnd('span');
$this->elementEnd('fieldset');
$this->elementEnd('form');
$idx++;
}
}
- $this->elementStart('form', array('method' => 'post',
- 'id' => 'form_settings_openid_trustroots',
- 'class' => 'form_settings',
- 'action' =>
- common_local_url('openidsettings')));
- $this->elementStart('fieldset', array('id' => 'settings_openid_trustroots'));
+ $this->elementStart('form', ['method' => 'post',
+ 'id' => 'form_settings_openid_trustroots',
+ 'class' => 'form_settings',
+ 'action' =>
+ common_local_url('openidsettings')]);
+ $this->elementStart('fieldset', ['id' => 'settings_openid_trustroots']);
// TRANS: Fieldset legend.
$this->element('legend', null, _m('OpenID Trusted Sites'));
$this->hidden('token', common_session_token());
$this->element('p', 'form_guide',
// TRANS: Form guide.
_m('The following sites are allowed to access your ' .
- 'identity and log you in. You can remove a site from ' .
- 'this list to deny it access to your OpenID.'));
+ 'identity and log you in. You can remove a site from ' .
+ 'this list to deny it access to your OpenID.'));
$this->elementStart('ul', 'form_data');
$user_openid_trustroot = new User_openid_trustroot();
$user_openid_trustroot->user_id = $this->scoped->getID();
- if($user_openid_trustroot->find()) {
- while($user_openid_trustroot->fetch()) {
+ if ($user_openid_trustroot->find()) {
+ while ($user_openid_trustroot->fetch()) {
$this->elementStart('li');
- $this->element('input', array('name' => 'openid_trustroot[]',
- 'type' => 'checkbox',
- 'class' => 'checkbox',
- 'value' => $user_openid_trustroot->trustroot,
- 'id' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot)));
- $this->element('label', array('class'=>'checkbox', 'for' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot)),
+ $this->element('input', ['name' => 'openid_trustroot[]',
+ 'type' => 'checkbox',
+ 'class' => 'checkbox',
+ 'value' => $user_openid_trustroot->trustroot,
+ 'id' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot)]);
+ $this->element('label',
+ ['class'=>'checkbox',
+ 'for' => 'openid_trustroot_' . crc32($user_openid_trustroot->trustroot)],
$user_openid_trustroot->trustroot);
$this->elementEnd('li');
}
}
$this->elementEnd('ul');
// TRANS: Button text to remove an OpenID trustroot.
- $this->submit('settings_openid_trustroots_action-submit', _m('BUTTON','Remove'), 'submit', 'remove_trustroots');
+ $this->submit('settings_openid_trustroots_action-submit', _m('BUTTON', 'Remove'), 'submit', 'remove_trustroots');
$this->elementEnd('fieldset');
$prefs = User_openid_prefs::getKV('user_id', $this->scoped->getID());
$this->elementStart('fieldset');
- $this->element('legend', null, _m('LEGEND','Preferences'));
+ $this->element('legend', null, _m('LEGEND', 'Preferences'));
$this->elementStart('ul', 'form_data');
$this->checkbox('hide_profile_link', "Hide OpenID links from my profile", !empty($prefs) && $prefs->hide_profile_link);
// TRANS: Button text to save OpenID prefs
- $this->submit('settings_openid_prefs_save', _m('BUTTON','Save'), 'submit', 'save_prefs');
+ $this->submit('settings_openid_prefs_save', _m('BUTTON', 'Save'), 'submit', 'save_prefs');
$this->elementEnd('ul');
$this->elementEnd('fieldset');
// TRANS: Form validation error if no OpenID providers can be added.
throw new ServerException(_m('Cannot add new providers.'));
} else {
+ common_ensure_session();
+ $_SESSION['openid_synch'] = $this->boolean('openid-synch');
+
$result = oid_authenticate($this->trimmed('openid_url'), 'finishaddopenid');
if (is_string($result)) { // error message
+ unset($_SESSION['openid-synch']);
throw new ServerException($result);
}
return _('Added new provider.');
}
- } else if ($this->arg('remove')) {
+ } elseif ($this->arg('remove')) {
return $this->removeOpenid();
- } else if($this->arg('remove_trustroots')) {
+ } elseif ($this->arg('synch')) {
+ return $this->synchOpenid();
+ } elseif ($this->arg('remove_trustroots')) {
return $this->removeTrustroots();
- } else if($this->arg('save_prefs')) {
+ } elseif ($this->arg('save_prefs')) {
return $this->savePrefs();
}
*
* @return void
*/
- function removeTrustroots()
+ public function removeTrustroots()
{
- $trustroots = $this->arg('openid_trustroot', array());
- foreach($trustroots as $trustroot) {
+ $trustroots = $this->arg('openid_trustroot', []);
+ foreach ($trustroots as $trustroot) {
$user_openid_trustroot = User_openid_trustroot::pkeyGet(
- array('user_id'=>$this->scoped->getID(), 'trustroot'=>$trustroot));
- if($user_openid_trustroot) {
+ ['user_id'=>$this->scoped->getID(), 'trustroot'=>$trustroot]
+ );
+ if ($user_openid_trustroot) {
$user_openid_trustroot->delete();
} else {
// TRANS: Form validation error when trying to remove a non-existing trustroot.
*
* @return void
*/
- function removeOpenid()
+ public function removeOpenid()
{
$oid = User_openid::getKV('canonical', $this->trimmed('openid_url'));
// TRANS: Form validation error for a non-existing OpenID.
throw new ClientException(_m('No such OpenID.'));
}
- if ($this->scoped->getID() !== $oid->getID()) {
+ if ($this->scoped->getID() != $oid->user_id) {
// TRANS: Form validation error if OpenID is connected to another user.
throw new ClientException(_m('That OpenID does not belong to you.'));
}
return _m('OpenID removed.');
}
+ /**
+ * Handles a request to synch an OpenID to the user's profile
+ *
+ * @return void
+ */
+ public function synchOpenid()
+ {
+ $oid = User_openid::getKV('canonical', $this->trimmed('openid_url'));
+
+ if (!$oid instanceof User_openid) {
+ throw new ClientException(_m('No such OpenID.'));
+ }
+
+ $result = oid_authenticate($this->trimmed('openid_url'), 'finishsynchopenid');
+ if (is_string($result)) { // error message
+ throw new ServerException($result);
+ }
+ return _m('Synchronized OpenID.');
+ }
+
/**
* Handles a request to save preferences
*
*
* @return void
*/
- function savePrefs()
+ public function savePrefs()
{
$orig = null;
$prefs = User_openid_prefs::getKV('user_id', $this->scoped->getID());
projects / quix0rs-gnu-social.git / blobdiff