diff options
Diffstat (limited to 'plugins/OpenID')
-rw-r--r-- | plugins/OpenID/OpenIDPlugin.php | 133 | ||||
-rw-r--r-- | plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po | 9 | ||||
-rw-r--r-- | plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po | 12 | ||||
-rw-r--r-- | plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po | 13 | ||||
-rw-r--r-- | plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po | 13 | ||||
-rw-r--r-- | plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po | 11 | ||||
-rw-r--r-- | plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po | 13 |
7 files changed, 140 insertions, 64 deletions
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index a033a5010..cdaabbbf7 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -46,7 +46,6 @@ if (!defined('STATUSNET')) { * @link http://status.net/ * @link http://openid.net/ */ - class OpenIDPlugin extends Plugin { // Plugin parameter: set true to disallow non-OpenID logins @@ -60,7 +59,6 @@ class OpenIDPlugin extends Plugin global $config; $config['site']['openidonly'] = (bool)$this->openidOnly; } - } /** @@ -72,7 +70,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onStartInitializeRouter($m) { $m->connect('main/openid', array('action' => 'openidlogin')); @@ -98,7 +95,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onStartConnectPath(&$path, &$defaults, &$rules, &$result) { if (common_config('site', 'openidonly')) { @@ -127,7 +123,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onArgsInitialize($args) { if (common_config('site', 'openidonly')) { @@ -158,7 +153,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onEndPublicXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', @@ -189,7 +183,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onEndUserXRDS($action, &$xrdsOutputter) { $xrdsOutputter->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)', @@ -218,7 +211,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onStartPrimaryNav($action) { if (common_config('site', 'openidonly') && !common_logged_in()) { @@ -260,7 +252,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onStartLoginGroupNav(&$action) { if (common_config('site', 'openidonly')) { @@ -281,7 +272,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onEndLoginGroupNav(&$action) { $this->showOpenIDLoginTab($action); @@ -296,7 +286,6 @@ class OpenIDPlugin extends Plugin * * @return void */ - function showOpenIDLoginTab($action) { $action_name = $action->trimmed('action'); @@ -319,7 +308,6 @@ class OpenIDPlugin extends Plugin * * @return void */ - function onStartAccountSettingsPasswordMenuItem($menu, &$unused) { if (common_config('site', 'openidonly')) { return false; @@ -334,7 +322,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onEndAccountSettingsNav(&$action) { $action_name = $action->trimmed('action'); @@ -358,7 +345,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onAutoload($cls) { switch ($cls) @@ -400,7 +386,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onSensitiveAction($action, &$ssl) { switch ($action) @@ -424,7 +409,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook return */ - function onLoginAction($action, &$login) { switch ($action) @@ -447,7 +431,6 @@ class OpenIDPlugin extends Plugin * * @return void */ - function onEndShowHeadElements($action) { if ($action instanceof ShowstreamAction) { @@ -471,7 +454,6 @@ class OpenIDPlugin extends Plugin * * @return boolean whether to continue */ - function onRedirectToLogin($action, $user) { if (common_config('site', 'openid_only') || (!empty($user) && User_openid::hasOpenID($user->id))) { @@ -488,7 +470,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onEndShowPageNotice($action) { $name = $action->trimmed('action'); @@ -527,7 +508,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onStartLoadDoc(&$title, &$output) { if ($title == 'openid') { @@ -549,7 +529,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onEndLoadDoc($title, &$output) { if ($title == 'help') { @@ -568,7 +547,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onCheckSchema() { $schema = Schema::get(); @@ -601,7 +579,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onUserDeleteRelated($user, &$tables) { $tables[] = 'User_openid'; @@ -616,7 +593,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onEndAdminPanelNav($nav) { if (AdminPanelAction::canAdmin('openid')) { @@ -625,7 +601,9 @@ class OpenIDPlugin extends Plugin $nav->out->menuItem( common_local_url('openidadminpanel'), - _m('OpenID'), + // TRANS: OpenID configuration menu item. + _m('MENU','OpenID'), + // TRANS: Tooltip for OpenID configuration menu item. _m('OpenID configuration'), $action_name == 'openidadminpanel', 'nav_openid_admin_panel' @@ -642,7 +620,6 @@ class OpenIDPlugin extends Plugin * * @return boolean hook value */ - function onPluginVersion(&$versions) { $versions[] = array('name' => 'OpenID', @@ -654,4 +631,108 @@ class OpenIDPlugin extends Plugin _m('Use <a href="http://openid.net/">OpenID</a> to login to the site.')); return true; } + + function onStartOAuthLoginForm($action, &$button) + { + if (common_config('site', 'openidonly')) { + // Cancel the regular password login form, we won't need it. + $this->showOAuthLoginForm($action); + // TRANS: button label for OAuth authorization page when needing OpenID authentication first. + $button = _m('BUTTON', 'Continue'); + return false; + } else { + // Leave the regular password login form in place. + // We'll add an OpenID link at bottom...? + return true; + } + } + + /** + * @fixme merge with common code for main OpenID login form + * @param HTMLOutputter $action + */ + protected function showOAuthLoginForm($action) + { + $action->elementStart('fieldset'); + // TRANS: OpenID plugin logon form legend. + $action->element('legend', null, _m('OpenID login')); + + $action->elementStart('ul', 'form_data'); + $action->elementStart('li'); + $provider = common_config('openid', 'trusted_provider'); + $appendUsername = common_config('openid', 'append_username'); + if ($provider) { + // TRANS: Field label. + $action->element('label', array(), _m('OpenID provider')); + $action->element('span', array(), $provider); + if ($appendUsername) { + $action->element('input', array('id' => 'openid_username', + 'name' => 'openid_username', + 'style' => 'float: none')); + } + $action->element('p', 'form_guide', + // TRANS: Form guide. + ($appendUsername ? _m('Enter your username.') . ' ' : '') . + // TRANS: Form guide. + _m('You will be sent to the provider\'s site for authentication.')); + $action->hidden('openid_url', $provider); + } else { + // TRANS: OpenID plugin logon form field label. + $action->input('openid_url', _m('OpenID URL'), + '', + // TRANS: OpenID plugin logon form field instructions. + _m('Your OpenID URL')); + } + $action->elementEnd('li'); + $action->elementEnd('ul'); + + $action->elementEnd('fieldset'); + } + + /** + * Handle a POST user credential check in apioauthauthorization. + * If given an OpenID URL, we'll pass us over to the regular things + * and then redirect back here on completion. + * + * @fixme merge with common code for main OpenID login form + * @param HTMLOutputter $action + */ + function onStartOAuthLoginCheck($action, &$user) + { + $provider = common_config('openid', 'trusted_provider'); + if ($provider) { + $openid_url = $provider; + if (common_config('openid', 'append_username')) { + $openid_url .= $action->trimmed('openid_username'); + } + } else { + $openid_url = $action->trimmed('openid_url'); + } + + if ($openid_url) { + require_once dirname(__FILE__) . '/openid.php'; + oid_assert_allowed($openid_url); + + $returnto = common_local_url( + 'ApiOauthAuthorize', + array(), + array( + 'oauth_token' => $action->arg('oauth_token'), + 'mode' => $action->arg('mode') + ) + ); + common_set_returnto($returnto); + + // This will redirect if functional... + $result = oid_authenticate($openid_url, + 'finishopenidlogin'); + if (is_string($result)) { # error message + throw new ServerException($result); + } else { + exit(0); + } + } + + return true; + } } diff --git a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po index 37f5d44c0..9184c1c91 100644 --- a/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/de/LC_MESSAGES/OpenID.po @@ -10,13 +10,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:29+0000\n" +"POT-Creation-Date: 2010-10-20 00:18+0000\n" +"PO-Revision-Date: 2010-10-20 00:21:25+0000\n" "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-19 23:49:57+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: de\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -196,7 +196,6 @@ msgid "Enable OpenID-only mode" msgstr "Nur-OpenID-Modus aktivieren" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" diff --git a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po index 4d144d1bd..0f1914e51 100644 --- a/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/fr/LC_MESSAGES/OpenID.po @@ -1,6 +1,7 @@ # Translation of StatusNet - OpenID to French (Français) # Expored from translatewiki.net # +# Author: Peter17 # Author: Verdy p # -- # This file is distributed under the same license as the StatusNet package. @@ -9,13 +10,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:30+0000\n" +"POT-Creation-Date: 2010-10-20 17:39+0000\n" +"PO-Revision-Date: 2010-10-20 17:42:23+0000\n" "Language-Team: French <http://translatewiki.net/wiki/Portal:fr>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-20 01:18:31+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75070); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: fr\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -203,12 +204,11 @@ msgid "Enable OpenID-only mode" msgstr "Activer le mode OpenID seul" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" msgstr "" -"Exiger que tous les utilisateurs se connectent via OpenID. AVERTISSEMENT : " +"Exiger que tous les utilisateurs se connectent via OpenID. Avertissement : " "cela désactive l’authentification par mot de passe pour tous les " "utilisateurs !" diff --git a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po index b57c7f7ad..b7d4ce5c8 100644 --- a/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/ia/LC_MESSAGES/OpenID.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:30+0000\n" +"POT-Creation-Date: 2010-10-19 23:00+0000\n" +"PO-Revision-Date: 2010-10-19 23:03:57+0000\n" "Language-Team: Interlingua <http://translatewiki.net/wiki/Portal:ia>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-18 20:33:11+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: ia\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -195,13 +195,12 @@ msgid "Enable OpenID-only mode" msgstr "Activar modo OpenID sol" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" msgstr "" -"Requirer que tote le usatores aperi session via OpenID. ATTENTION: isto " -"disactiva le authentication per contrasigno pro tote le usatores!" +"Requirer que tote le usatores aperi session via OpenID. Aviso: disactiva le " +"authentication per contrasigno pro tote le usatores!" #: openidadminpanel.php:278 msgid "Save OpenID settings" diff --git a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po index 6f014c9eb..0569240ed 100644 --- a/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/mk/LC_MESSAGES/OpenID.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:30+0000\n" +"POT-Creation-Date: 2010-10-19 23:00+0000\n" +"PO-Revision-Date: 2010-10-19 23:03:57+0000\n" "Language-Team: Macedonian <http://translatewiki.net/wiki/Portal:mk>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-18 20:33:11+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: mk\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -193,13 +193,12 @@ msgid "Enable OpenID-only mode" msgstr "Вклучи режим „само OpenID“" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" msgstr "" -"Барај од сите корисници да се најават преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова ја " -"оневозможува потврдата на лозинка за сите корисници!" +"Барај од сите корисници да се најавуваат преку OpenID. ПРЕДУПРЕДУВАЊЕ: ова " +"ја оневозможува потврдата на лозинка за сите корисници!" #: openidadminpanel.php:278 msgid "Save OpenID settings" diff --git a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po index 651cbc6f9..48d977517 100644 --- a/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/nl/LC_MESSAGES/OpenID.po @@ -10,16 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:30+0000\n" +"POT-Creation-Date: 2010-10-19 23:00+0000\n" +"PO-Revision-Date: 2010-10-19 23:03:58+0000\n" "Last-Translator: Siebrand Mazeland <s.mazeland@xs4all.nl>\n" "Language-Team: Dutch <http://translatewiki.net/wiki/Portal:nl>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-18 20:33:11+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: nl\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -198,14 +198,13 @@ msgid "Enable OpenID-only mode" msgstr "Alleen OpenID inschakelen" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" msgstr "" "Alle gebruikers verplichten aan te melden via OpenID. Waarschuwing: als deze " "instelling wordt gebruikt, kan geen enkele gebruiker met een wachtwoord " -"aanmelden." +"aanmelden!" #: openidadminpanel.php:278 msgid "Save OpenID settings" diff --git a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po index 2ef082dad..ecff68b80 100644 --- a/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po +++ b/plugins/OpenID/locale/uk/LC_MESSAGES/OpenID.po @@ -9,13 +9,13 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet - OpenID\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-18 18:35+0000\n" -"PO-Revision-Date: 2010-10-18 18:43:31+0000\n" +"POT-Creation-Date: 2010-10-20 00:18+0000\n" +"PO-Revision-Date: 2010-10-20 00:21:26+0000\n" "Language-Team: Ukrainian <http://translatewiki.net/wiki/Portal:uk>\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2010-10-09 14:36:35+0000\n" -"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n" +"X-POT-Import-Date: 2010-10-19 23:49:57+0000\n" +"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: uk\n" "X-Message-Group: #out-statusnet-plugin-openid\n" @@ -198,13 +198,12 @@ msgid "Enable OpenID-only mode" msgstr "Увімкнути режим входу лише за OpenID" #: openidadminpanel.php:260 -#, fuzzy msgid "" "Require all users to login via OpenID. Warning: disables password " "authentication for all users!" msgstr "" -"Вимагає, щоб всі користувачі входили лише за наявності OpenID. УВАГА: ця " -"опція вимикає автентифікацію за паролем для всіх користувачів." +"Вимагає, щоб всі користувачі входили лише за допомогою OpenID. Увага: ця " +"опція вимикає автентифікацію за паролем для всіх користувачів!" #: openidadminpanel.php:278 msgid "Save OpenID settings" |