Index: /trunk/mixiComment/plugins/mixiComment/mixiComment.pl
===================================================================
--- /trunk/mixiComment/plugins/mixiComment/mixiComment.pl (revision 971)
+++ /trunk/mixiComment/plugins/mixiComment/mixiComment.pl (revision 971)
@@ -0,0 +1,101 @@
+package MT::Plugin::mixiComment;
+
+use strict;
+use warnings;
+
+use MT;
+use base qw(MT::Plugin);
+
+my $plugin = MT::Plugin::mixiComment->new({
+    id => 'mixicomment',
+    name => 'mixiComment',
+    author_name => 'Six Apart K.K.',
+    author_url => 'http://www.movabletype.jp/',
+    description => '<MT_TRANS phrase="Allows commenters to sign in to Movable Type 4 using their own mixi username and password via OpenID.">',
+    version => '1.0',
+    settings => new MT::PluginSettings([
+        ['mixi_id', { Scope => 'blog' }],
+    ]),
+    l10n_class => 'mixiComment::L10N',
+	blog_config_template => 'config.tmpl',
+});
+MT->add_plugin($plugin);
+
+sub load_config {
+    my $plugin = shift;
+    my ($args, $scope) = @_;
+
+    $plugin->SUPER::load_config(@_);
+
+    if ( $scope =~ /blog:(\d+)/ ) {
+        my $blog_id = $1;
+        $args->{blog_id} = $blog_id;
+    }
+}
+
+sub init_registry {
+    my $plugin = shift;
+    $plugin->registry({
+        applications => {
+            cms => {
+                methods => {
+                    mixicomment_login_blog_owner => '$mixicomment::mixiComment::App::login_blog_owner',
+                    mixicomment_verify_blog_owner => '$mixicomment::mixiComment::App::verify_blog_owner',
+                }
+            }
+        },
+        commenter_authenticators => {
+            'mixicomment' => {
+                label => 'mixi',
+                class => 'mixiComment::Auth::mixi',
+                login_form => <<EOT,
+<__trans_section component="mixicomment">
+<form method="post" action="<mt:var name="script_url">">
+<input type="hidden" name="__mode" value="login_external" />
+<input type="hidden" name="openid_url" value="<mt:var name="url">" />
+<input type="hidden" name="blog_id" value="<mt:var name="blog_id">" />
+<input type="hidden" name="entry_id" value="<mt:var name="entry_id">" />
+<input type="hidden" name="static" value="<mt:var name="static" escape="html">" />
+<input type="hidden" name="key" value="mixicomment" />
+<fieldset>
+<mtapp:setting
+    id="mixiComment_display"
+    hint="<__trans phrase="Sign in using your mixi ID">">
+    <input type="image" src="<mt:var name="static_uri">plugins/mixiComment/images/mixi_button.gif" width="150" height="30" />
+    <p><__trans phrase="Click the button to sign in using your mixi ID"></p>
+</mtapp:setting>
+</fieldset>
+</form>
+</__trans_section>
+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;
+                },
+                logo => 'plugins/mixiComment/images/signin_mixi.png',
+                logo_small => 'plugins/mixiComment/images/signin_mixi_small.gif'
+            },
+        },
+    });
+}
+
+sub instance { $plugin }
+
+1;
+__END__
Index: /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm
===================================================================
--- /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm (revision 971)
+++ /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm (revision 971)
@@ -0,0 +1,93 @@
+package mixiComment::Auth::mixi;
+
+use strict;
+use base qw( MT::Auth::OpenID );
+
+sub check_url_params {
+    my $class = shift;
+    my ( $app, $blog ) = @_;
+    my $q = $app->{query};
+
+    if ( $q->param('verify_blog_owner') ) {
+        my $path = MT->config->AdminCGIPath || MT->config->CGIPath;
+        $path = _adjust_path( $path, $blog );
+        $path .= MT->config->AdminScript;
+        my $return_to = $path . '?__mode=mixicomment_verify_blog_owner'
+            . '&blog_id='  . $blog->id;
+        return ( trust_root => $path, return_to => $return_to );
+    }
+    else {
+        return $class->SUPER::check_url_params(@_);
+    }
+}
+
+sub _adjust_path {
+    my ( $path, $blog ) = @_;
+    if ($path =~ m!^/!) {
+        # relative path, prepend blog domain
+        my ($blog_domain) = $blog->archive_url =~ m|(.+://[^/]+)|;
+        $path = $blog_domain . $path;
+    }
+    $path .= '/' unless $path =~ m|/$|;
+    $path;
+}
+
+# TODO: remove these once core code supports SREG - BugID:71011
+sub NS_OPENID_SREG { "http://openid.net/extensions/sreg/1.1" }
+
+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(), {
+        optional => join(",", qw/email nickname fullname/)
+    });
+
+    my $check_url = $claimed_identity->check_url(
+        ( %params, delayed_return => 1 )
+    );
+
+    return $app->redirect($check_url);
+}
+
+sub get_nickname {
+    my $class = shift;
+    my ($vident) = @_;
+
+    # Try SREG extension first
+    my $fields = $vident->extension_fields(NS_OPENID_SREG);
+    return $fields->{nickname} if exists $fields->{nickname};
+    return $fields->{fullname} if exists $fields->{fullname};
+    $class->SUPER::get_nickname(@_);
+}
+
+1;
+__END__
Index: /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N.pm
===================================================================
--- /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N.pm (revision 971)
+++ /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N.pm (revision 971)
@@ -0,0 +1,5 @@
+package mixiComment::L10N;
+use strict;
+use base 'MT::Plugin::L10N';
+
+1;
Index: /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/en_us.pm
===================================================================
--- /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/en_us.pm (revision 971)
+++ /trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/en_us.pm (revision 971)
@@ -0,0 +1,9 @@
+package mixiComment::L10N::en_us;
+
+use strict;
+
+use base 'mixiComment::L10N';
+use vars qw( %Lexicon );
+%Lexicon = ();
+
+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 971)
@@ -0,0 +1,16 @@
+package mixiComment::L10N::ja;
+
+use strict;
+use base 'mixiComment::L10N::en_us';
+use vars qw( %Lexicon );
+
+%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, <a href="[_1]">click here</a> 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を倉えたい堎合は、<a href="[_1]">ここをクリックしおmixiにログむン</a>しおください。マむミクだけでなくすべおのmixiナヌザヌからのコメントを受け付けたいずきは、初期化ボタンをクリックしお蚭定を消去しおください。',
+    'If you want to restrict comments only from your my mixi users, <a href="[_1]">click here</a> to sign in using your mixi account.' => 'マむミクからのみコメントを受け付ける蚭定にするには、<a href="[_1]">ここをクリックしおたずmixiにログむン</a>しおください。',
+    'Click the button to sign in using your mixi ID' => 'ボタンをクリックしおmixiにログむンしおください。',
+    'Sign in using your mixi ID' => 'mixiのIDでログむンする',
+);
+
+1;
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 971)
@@ -0,0 +1,55 @@
+package mixiComment::App;
+
+use strict;
+use mixiComment::Auth::mixi;
+
+sub login_blog_owner {
+    my $app = shift;
+
+    $app->param('verify_blog_owner', 1);
+    mixiComment::Auth::mixi->login($app);
+}
+
+sub verify_blog_owner {
+    my $app = shift;
+    my $q   = $app->param;
+
+    my $plugin = $app->component('mixicomment');
+    return $app->errtrans('Invalid request') unless $plugin;
+
+    my $blog_id = $q->param('blog_id');
+    my $blog    = $app->model('blog')->load($blog_id);
+    return $app->errtrans('Invalid blog') unless $blog;
+
+    my %param = $app->param_hash;
+    my $csr   = MT::Auth::OpenID::_get_csr(\%param, $blog)
+        or return $app->errtrans('Invalid request');
+
+    if ( my $setup_url = $csr->user_setup_url( post_grant => 'return' ) ) {
+        return $app->redirect($setup_url);
+    }
+    elsif ( my $vident = $csr->verified_identity ) {
+        my $url = $vident->url;
+        my ($mixi_id) = $url =~ m|^https?://id.mixi.jp/(\d+)$|;
+        return $app->error( $plugin->translate('mixi reported that you failed to login.  Try again.') )
+            unless $mixi_id;
+
+        $plugin->save_config(
+            { mixi_id => $mixi_id },
+            'blog:' . $blog->id
+        );
+
+        return $app->redirect(
+            $app->uri(
+                mode => 'cfg_plugins',
+                args => { blog_id => $blog->id }
+            )
+        );
+    }
+
+    # login failed
+    return $app->error( $plugin->translate('mixi reported that you failed to login.  Try again.') );
+}
+
+1;
+__END__
Index: /trunk/mixiComment/README.ja
===================================================================
--- /trunk/mixiComment/README.ja (revision 971)
+++ /trunk/mixiComment/README.ja (revision 971)
@@ -0,0 +1,31 @@
+mixiCommentプラグむンの䜿い方
+
+1. å¿
+芁環境
+
+Movable Typeが動䜜しおいるサヌバヌに、Crypt::SSLeayモゞュヌルがむンストヌルされおいるå¿
+芁がありたす。むンストヌルされおいないず、mixiにOpenIDでログむンしようずした際に、「OpenIDを怜蚌できたせんでした: å
+¥åŠ›ã•ã‚ŒãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã¯OpenIDではありたせん。」ずいう゚ラヌになりたす。
+
+2. セットアップ
+
+mixiCommentプラグむンに含たれるpluginsディレクトリの䞭身を、お䜿いのMovable Type 4のpluginsディレクトリにコピヌしおください。同じく、mixiCommentプラグむンに含たれるmt-staticディレクトリの䞭身を、お䜿いのMovable Type 4のmt-staticディレクトリにコピヌしおください。
+
+次に、Movable Type 4のメニュヌから「蚭定」「登録/認蚌」画面に進みたす。「認蚌方匏」の䞀芧にmixiが衚瀺されるので、チェックしお有効にしお、蚭定を保存したす。
+
+これでセットアップは完了です。ブログ蚘事にコメントする際に、認蚌サヌビスの䞀芧にmixiが远加されたす。
+
+3. マむミク認蚌
+
+セットアップした状æ
+‹ã§ã¯ã€mixiのナヌザヌであればだれでもサむンむンしおコメントするこずができたす。ブログの管理è€
+ずマむミクになっおいるナヌザヌだけにコメントを制限したい堎合には、以䞋の远加操䜜を行いたす。
+
+ブログの管理è€
+暩限を持぀ナヌザヌでMovable Typeにサむンむンし、プラグむンの蚭定画面に移動しおください。mixiCommentプラグむンが䞀芧に衚瀺されるので、名前の郚分をクリックしたす。詳现画面が開いたら、「蚭定」タブをクリックしたす。「ここをクリックしおたずmixiにログむン」のリンクをクリックしお、mixiにログむンしたす。ログむンするず、mixiのIDがMovable Type 4のデヌタベヌスに保存されたす。このずきmixiにログむンしたナヌザヌずマむミクになっおいるmixiナヌザヌだけがコメントできるようになりたす。
+
+4. コメント
+
+ブログ蚘事にコメントする際に、サむンむンしようずするず、サむンむン画面でmixiを遞択できたす。遞択しお、衚瀺されたボタンをクリックしたす。mixiのログむン画面に移動するので、自分のナヌザヌ名ずパスワヌドでログむンしたす。mixiからの䜿甚条件が衚瀺されるので、同意すれば、Movable Type 4にサむンむンするこずができたす。
+
+ステップ2のマむミク認蚌の蚭定を行っおいる堎合には、サむンむンできるのはマむミクになっおいるナヌザヌだけです。この堎合は、たずえmixiに正しくログむンしおも、マむミクでなければ、ログむンに倱敗したずみなされたす。