Changeset 1480 for trunk/mixiComment

Timestamp:

03/02/09 08:35:18 (9 months ago)

Author:

auno

Message:

Merged changes from internal. #99460

Location:

trunk/mixiComment/plugins/mixiComment

Files:

• lib/mixiComment/App.pm (modified) (1 diff)
• lib/mixiComment/Auth/mixi.pm (modified) (3 diffs)
• lib/mixiComment/L10N/de.pm (added)
• lib/mixiComment/L10N/es.pm (added)
• lib/mixiComment/L10N/fr.pm (added)
• lib/mixiComment/L10N/ja.pm (modified) (1 diff)
• lib/mixiComment/L10N/nl.pm (added)
• mixiComment.pl (modified) (2 diffs)
• php (added)
• php/init.mixiComment.php (added)

trunk/mixiComment/plugins/mixiComment/lib/mixiComment/App.pm

@@ -52 +52 @@
 }
 
+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__

trunk/mixiComment/plugins/mixiComment/lib/mixiComment/Auth/mixi.pm

@@ -15 +15 @@
         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 +35 @@
 }
 
-# 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 +49 @@
 
     # 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};

trunk/mixiComment/plugins/mixiComment/lib/mixiComment/L10N/ja.pm

@@ -6 +6 @@
 
 %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でログむンする',
+
+## 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, <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>しおください。',
+
 );
 

trunk/mixiComment/plugins/mixiComment/mixiComment.pl

@@ -13 +13 @@
     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',
+    version => '1.1',
     settings => new MT::PluginSettings([
         ['mixi_id', { Scope => 'blog' }],
@@ -69 +69 @@
 </__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;
-                },
+                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'