Index: trunk/mixiComment/plugins/mixiComment/mixiComment.pl =================================================================== --- trunk/mixiComment/plugins/mixiComment/mixiComment.pl (revision 971) +++ trunk/mixiComment/plugins/mixiComment/mixiComment.pl (revision 1480) @@ -13,5 +13,5 @@ author_url => 'http://www.movabletype.jp/', description => '', - version => '1.0', + version => '1.1', settings => new MT::PluginSettings([ ['mixi_id', { Scope => 'blog' }], @@ -69,24 +69,6 @@ EOT - login_form_params => sub { - my ($key, $blog_id, $entry_id, $static) = @_; - - my %param; - $plugin->load_config(\%param, "blog:$blog_id"); - my $url; - if ( my $mixi_id = $param{mixi_id} ) { - $url = "https://id.mixi.jp/$mixi_id/friends"; - } - else { - $url = "http://mixi.jp/"; - } - my $params = { - blog_id => $blog_id, - static => $static, - url => $url, - }; - $params->{entry_id} = $entry_id if defined $entry_id; - return $params; - }, + condition => '$mixicomment::mixiComment::App::openid_commenter_condition', + login_form_params => '$mixicomment::mixiComment::App::commenter_auth_params', logo => 'plugins/mixiComment/images/signin_mixi.png', logo_small => 'plugins/mixiComment/images/signin_mixi_small.gif' Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm (revision 1066) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm (revision 1480) @@ -15,8 +15,10 @@ my $return_to = $path . '?__mode=mixicomment_verify_blog_owner' . '&blog_id=' . $blog->id; - return ( trust_root => $path, return_to => $return_to ); + return ( trust_root => $path, return_to => $return_to, delayed_return => 1 ); } else { - return $class->SUPER::check_url_params(@_); + my %params = $class->SUPER::check_url_params(@_); + $params{delayed_return} = 1; + return %params; } } @@ -33,48 +35,11 @@ } -# TODO: remove these once core code supports SREG - BugID:71011 -sub NS_OPENID_SREG { "http://openid.net/extensions/sreg/1.1" } +sub set_extension_args { + my $class = shift; + my ( $claimed_identity ) = @_; -sub login { - my $class = shift; - my ($app) = @_; - my $q = $app->{query}; - return $app->errtrans("Invalid request.") - unless $q->param('blog_id'); - my $blog = MT::Blog->load(scalar $q->param('blog_id')); - my %param = $app->param_hash; - my $csr = MT::Auth::OpenID::_get_csr(\%param, $blog) or return; - my $identity = $q->param('openid_url'); - if (!$identity && - (my $u = $q->param('openid_userid')) && $class->can('url_for_userid')) { - $identity = $class->url_for_userid($u); - } - my $claimed_identity = $csr->claimed_identity($identity); - if (!$claimed_identity) { - my ($err_code, $err_msg) = ($csr->errcode, $csr->errtext); - if ($err_code eq 'no_head_tag' || $err_code eq 'no_identity_server' || $err_code eq 'url_gone') { - $err_msg = $app->translate('The address entered does not appear to be an OpenID'); - } - elsif ($err_code eq 'empty_url' || $err_code eq 'bogus_url') { - $err_msg = $app->translate('The text entered does not appear to be a web address'); - } - elsif ($err_code eq 'url_fetch_error') { - $err_msg =~ s{ \A Error \s fetching \s URL: \s }{}xms; - $err_msg = $app->translate('Unable to connect to [_1]: [_2]', $identity, $err_msg); - } - return $app->error($app->translate("Could not verify the OpenID provided: [_1]", $err_msg)); - } - - my %params = $class->check_url_params( $app, $blog ); - - $claimed_identity->set_extension_args(NS_OPENID_SREG(), { + $claimed_identity->set_extension_args(MT::Auth::OpenID::NS_OPENID_SREG(), { optional => join(",", qw/email nickname fullname/) }); - - my $check_url = $claimed_identity->check_url( - ( %params, delayed_return => 1 ) - ); - - return $app->redirect($check_url); } @@ -84,5 +49,5 @@ # Try SREG extension first - my $fields = $vident->extension_fields(NS_OPENID_SREG); + my $fields = $vident->extension_fields(MT::Auth::OpenID::NS_OPENID_SREG()); my $nick = $fields->{nickname} if exists $fields->{nickname}; $nick ||= $fields->{fullname} if exists $fields->{fullname}; Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/es.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/es.pm (revision 1480) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/es.pm (revision 1480) @@ -0,0 +1,24 @@ +package mixiComment::L10N::es; + +use strict; +use base 'mixiComment::L10N::en_us'; +use vars qw( %Lexicon ); + +%Lexicon = ( + +## plugins/mixiComment/mixiComment.pl + 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'Permite a los comentaristas identificarse en Movable Type 4 usando su propio usuario y contraseña de mixi vía OpenID.', + 'Sign in using your mixi ID' => 'Identifíquese usando su ID de mixi ID', + 'Click the button to sign in using your mixi ID' => 'Click the button to sign in using your mixi ID', + 'mixi' => 'mixi', + +## plugins/mixiComment/lib/mixiComment/App.pm + 'mixi reported that you failed to login. Try again.' => 'mixi informó que falló la identificación. Inténtelo de nuevo.', + +## plugins/mixiComment/tmpl/config.tmpl + 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'Ya se ha registrado un ID de mixi en este blog. Si desea modificar el ID de mixi del blog, haga clic aquí para identificarse en su cuenta de mixi. Si desea que todos los usuarios de mixi puedan comentar en el blog (no solo sus usuarios de my mixi), haga clic en el botón de reiniciar para eliminar la configuración.', + 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'Si desea restringir los comentarios a sus usuarios de my mixi, haga clic aquí para identificarse en su cuenta de mixi.', + +); + +1; Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/fr.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/fr.pm (revision 1480) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/fr.pm (revision 1480) @@ -0,0 +1,24 @@ +package mixiComment::L10N::fr; + +use strict; +use base 'mixiComment::L10N::en_us'; +use vars qw( %Lexicon ); + +%Lexicon = ( + +## plugins/mixiComment/mixiComment.pl + 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'Permet aux auteurs de commentaires de s\'identifier sur Movable Type en utilisant leur nom d\'utilisateur mixi via OpenID.', # Translate - New + 'Sign in using your mixi ID' => 'S\'identifier en utilisant votre identifiant mixi', # Translate - New + 'Click the button to sign in using your mixi ID' => 'Cliquez sur le bouton pour vous identifier en utilisant votre identifiant mixi.', # Translate - New + 'mixi' => 'mixi', # Translate - New + +## plugins/mixiComment/lib/mixiComment/App.pm + 'mixi reported that you failed to login. Try again.' => 'mixi n\'a pas réussi à vous identifier. Veuillez réessayer.', # Translate - New + +## plugins/mixiComment/tmpl/config.tmpl + 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'Un ID mixi est déjà enregistré sur ce blog. Si vous souhaitez modifier l\'ID mixi, cliquez ici pour vous identifier en utilisant votre compte mixi. Si vous souhaitez permettre à tous les utilisateurs mixi de commenter sur votre blog (et pas uniquement vos utilisateurs mixi), cliquez sur le bouton de réinitialisation pour retirer les paramÚtres.', # Translate - New + 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'Si vous souhaitez restreindre les commentaires à uniquement vos utilisateurs mixi, cliquez ici pour vous identifier en utilisant votre compte mixi.', # Translate - New + +); + +1; Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/de.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/de.pm (revision 1480) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/de.pm (revision 1480) @@ -0,0 +1,24 @@ +package mixiComment::L10N::de; + +use strict; +use base 'mixiComment::L10N::en_us'; +use vars qw( %Lexicon ); + +%Lexicon = ( + +## plugins/mixiComment/mixiComment.pl + 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'Ermöglicht es Kommentarautoren, sich per OpenID mit ihrem mixi-Benutzernamen und -Passwort bei Movable Type 4 anzumelden', + 'Sign in using your mixi ID' => 'Mit Ihrer mixi-ID anmelden', + 'Click the button to sign in using your mixi ID' => 'Klicken Sie den Knopf an, um sich mit Ihrer mixi-ID anzumelden', + 'mixi' => 'mixi', + +## plugins/mixiComment/lib/mixiComment/App.pm + 'mixi reported that you failed to login. Try again.' => 'Ihre Anmeldung ÃŒber mixi ist fehlgeschlagen. Bitte versuchen Sie es erneut.', + +## plugins/mixiComment/tmpl/config.tmpl + 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'Es ist bereits eine mixi-ID fÃŒr Ihr Blog registriert. Klicken Sie hier, um die mixi-ID dieses Blogs zu Àndern. Klicken Sie auf ZurÃŒcksetzen, um alle mixi-Benutzer kommentieren zu lassen. Derzeit können nur Ihre my mixi-Benutzer kommentieren.', + 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'Wenn Sie nur Ihre my mixi-Benutzer kommentieren lassen wollen, klicken Sie hier, um sich mit Ihrer mixi-ID anzumelden.', + +); + +1; Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/nl.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/nl.pm (revision 1480) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/nl.pm (revision 1480) @@ -0,0 +1,24 @@ +package mixiComment::L10N::nl; + +use strict; +use base 'mixiComment::L10N::en_us'; +use vars qw( %Lexicon ); + +%Lexicon = ( + +## plugins/mixiComment/mixiComment.pl + 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'Laat reageerders zich aanmelden op Movable Type met hun eigen mixi gebruikersnaam en wachtwoord via OpenID.', + 'Sign in using your mixi ID' => 'Aanmelden met uw mixi ID', + 'Click the button to sign in using your mixi ID' => 'Klik op de knop om aan te melden met uw mixi ID', + 'mixi' => 'mixi', + +## plugins/mixiComment/lib/mixiComment/App.pm + 'mixi reported that you failed to login. Try again.' => 'mixi meldde dat het aanmelden mislukte. Probeer opnieuw.', + +## plugins/mixiComment/tmpl/config.tmpl + 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'Er werd reeds een mixi ID geregistreerd voor deze blog. Als u de mixi ID voor de blog wenst aan te passen, klik dan hier om u aan te melden met uw mixi account. Als u alle mixi gebruikers toestemming wenst te geven op uw blog te reageren (en niet enkel uw eigen mixi gebruikers), klik dan op de resetknop om deze instelling te verwijderen.', + 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'Als u reacties wenst te beperken tot uw eigen mixi gebruikers, klik dan hier om u aan te melden met uw mixi account.', + +); + +1; Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/ja.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/ja.pm (revision 971) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/ja.pm (revision 1480) @@ -6,10 +6,18 @@ %Lexicon = ( - 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'mixiのアカりントを䜿っおMovable Type 4にコメントするこずができるようにしたす。', - 'mixi reported that you failed to login. Try again.' => 'ログむンに倱敗したした。', - 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'すでにmixiのIDを登録しおありたす。ブログに関連付けるmixiのIDを倉えたい堎合は、ここをクリックしおmixiにログむンしおください。マむミクだけでなくすべおのmixiナヌザヌからのコメントを受け付けたいずきは、初期化ボタンをクリックしお蚭定を消去しおください。', - 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'マむミクからのみコメントを受け付ける蚭定にするには、ここをクリックしおたずmixiにログむンしおください。', - 'Click the button to sign in using your mixi ID' => 'ボタンをクリックしおmixiにログむンしおください。', - 'Sign in using your mixi ID' => 'mixiのIDでログむンする', + +## plugins/mixiComment/mixiComment.pl + 'Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.' => 'mixiのアカりントを䜿っおMovable Type 4にコメントするこずができるようにしたす。', + 'Sign in using your mixi ID' => 'mixiのIDでログむンする', + 'Click the button to sign in using your mixi ID' => 'ボタンをクリックしおmixiにログむンしおください。', + 'mixi' => 'ミクシィ', + +## plugins/mixiComment/lib/mixiComment/App.pm + 'mixi reported that you failed to login. Try again.' => 'ログむンに倱敗したした。', + +## plugins/mixiComment/tmpl/config.tmpl + 'A mixi ID has already been registered in this blog. If you want to change the mixi ID for the blog, click here to sign in using your mixi account. If you want all of the mixi users to comment to your blog (not only your my mixi users), click the reset button to remove the setting.' => 'すでにmixiのIDを登録しおありたす。ブログに関連付けるmixiのIDを倉えたい堎合は、ここをクリックしおmixiにログむンしおください。マむミクだけでなくすべおのmixiナヌザヌからのコメントを受け付けたいずきは、初期化ボタンをクリックしお蚭定を消去しおください。', + 'If you want to restrict comments only from your my mixi users, click here to sign in using your mixi account.' => 'マむミクからのみコメントを受け付ける蚭定にするには、ここをクリックしおたずmixiにログむンしおください。', + ); Index: trunk/mixiComment/plugins/mixiComment/lib/mixiComment/App.pm =================================================================== --- trunk/mixiComment/plugins/mixiComment/lib/mixiComment/App.pm (revision 971) +++ trunk/mixiComment/plugins/mixiComment/lib/mixiComment/App.pm (revision 1480) @@ -52,4 +52,34 @@ } +sub openid_commenter_condition { + eval "require Digest::SHA1;"; + return 0 if $@; + eval "require Crypt::SSLeay;"; + return 0 if $@; + return 1; +} + +sub commenter_auth_params { + my ($key, $blog_id, $entry_id, $static) = @_; + + my %param; + my $plugin = MT->component('mixicomment'); + $plugin->load_config(\%param, "blog:$blog_id"); + my $url; + if ( my $mixi_id = $param{mixi_id} ) { + $url = "https://id.mixi.jp/$mixi_id/friends"; + } + else { + $url = "http://mixi.jp/"; + } + my $params = { + blog_id => $blog_id, + static => $static, + url => $url, + }; + $params->{entry_id} = $entry_id if defined $entry_id; + return $params; +} + 1; __END__ Index: trunk/mixiComment/plugins/mixiComment/php/init.mixiComment.php =================================================================== --- trunk/mixiComment/plugins/mixiComment/php/init.mixiComment.php (revision 1480) +++ trunk/mixiComment/plugins/mixiComment/php/init.mixiComment.php (revision 1480) @@ -0,0 +1,23 @@ +get_key()] = $provider; + +?>