Changeset 1555

Timestamp:

03/24/08 08:08:33 (8 months ago)

Author:

fumiakiy

Message:

Changed the way to handle many blog ids. Instead of putting everything in a cookie, it special cases if the user is a superuser, or if the user has assigned to more than 20 blogs. BugId:67996

Also added invalidation of commenter_url cookie value when logging out.

Also added a check to see if commenter is a TypeKey user, and redirect appropriately.

Files:

• branches/enzo/default_templates/javascript.mtml (modified) (5 diffs)
• branches/enzo/lib/MT/App.pm (modified) (3 diffs)
• branches/enzo/lib/MT/App/Comments.pm (modified) (5 diffs)

branches/enzo/default_templates/javascript.mtml

@@ -27 +27 @@
-</MTIfNonEmpty>
-
+var AUTHOR = 1;
+var COMMENTER = 2;
-var commenter_name;
-
+
+
+
-var is_preview;
-var mtcmtmail;
@@ -45 +49 @@
-<MTIfRegistrationAllowed>
-    <MTIfRegistrationRequired>
-
-
-
+
-    {
-        hideDocumentElement('comment-form-name');
@@ -60 +62 @@
-    <MTElse>
-    // comments are allowed but registration not required
-
-
-
+
-    {
-        hideDocumentElement('comment-form-name');
@@ -98 +98 @@
-function writeCommenterGreeting(commenter_name, entry_id, blog_id, commenter_id, commenter_url) {
-<MTIfRegistrationAllowed>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-            } else {
-url += '&static=1'
+commenter_link = commenter_name
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
+
+
+
-    } else if (commenter_name) {
-    document.write('<__trans phrase="You do not have permission to comment on this blog." escape="js"> (<a href="<$MTRemoteSignOutLink static="1"$>&entry_id=' + entry_id + '"><__trans phrase="sign out" escape="js"></a>)
+document.write('<__trans phrase="You do not have permission to comment on this blog. ([_1]sign out[_2])" params="<a href="<$MTRemoteSignOutLink static="1"$>&entry_id=' + entry_id + '">%%</a>">
-    } else {
-<MTIfRegistrationRequired>
-document.write('<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1"><__trans phrase="Sign in" escape="js">' + '</a>' + '<__trans phrase=" to comment on this entry." escape="js">')
+var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>">'
-<MTElse>
-document.write('<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1"><__trans phrase="Sign in" escape="js">' + '</a>' + '<__trans phrase=" to comment on this entry," escape="js"> <__trans phrase="or " escape="js"><a href="javascript:void(0);" onclick="showAnonymousForm();"><__trans phrase="comment anonymously." escape="js"></a>')
+var phrase = '<__trans phrase="[_1]Sign in[_2] to comment on this entry, or [_3]comment anonymously[_2]." params="<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=login&entry_id=' + entry_id + '&blog_id=' + blog_id + '&static=1">%%</a>%%<a href="javascript:void(0);" onclick="showAnonymousForm();">">'
-</MTIfRegistrationRequired>
+        document.write(phrase);
-    }
-</MTIfRegistrationAllowed>
@@ -140 +139 @@
-} else {
-    commenter_name = getCookie('commenter_name');
+    commenter_url = getCookie('commenter_url');
-    ids = getCookie('commenter_id').split(':');
-    commenter_id = ids[0];
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-</MTIfRegistrationAllowed>

branches/enzo/lib/MT/App.pm

@@ -1001 +1001 @@
-    $app->bake_cookie(%name_kookee);
-    if (defined $id) {
-@blog
+$blog_id
-        if ($app->user && $app->user->is_superuser) {
-
-
-
+
+
-        }
-        else {
-
+my 
-              {
-                fetchonly => [ 'id' ],
@@ -1020 +1019 @@
-              }
-            );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                        $blog_ids .= ($blog_ids ne '' ? ',' : '')
-                            . "'" . $blog_id . "'";
+                    }
+                }
+            }
+            else {
+                if ($blog_id && ($blog_ids !~ m/(,|^)'$blog_id'(,|$)/)) {
+                    # extra check to see if this user can comment on requested
+                    # blog; this is specific to the Comment application, so
+                    # only do this if we're running the comments app.
+                    if ( $app->isa( 'MT::App::Comments' )) {
+                        if ( $app->_check_commenter_author($app->user, $blog_id) ) {
+                            # is this blog open to commenting from registered users?
+                            # if so, this user really can comment, even though they
+                            # don't have explicit permissions for it
+                            $blog_ids .= ($blog_ids ne '' ? ',' : '')
+                                . "'" . $blog_id . "'";
+                        }
-                    }
-                }
@@ -1104 +1111 @@
-                  -expires => "+${timeout}s");
-    $app->bake_cookie(%kookee);
+    my %url_kookee = (-name => 'commenter_url',
+                       -value => '',
+                       -path => '/',
+                       -expires => "+${timeout}s");
+    $app->bake_cookie(%url_kookee);
-    my %name_kookee = (-name => 'commenter_name',
-                       -value => '',

branches/enzo/lib/MT/App/Comments.pm

@@ -35 +35 @@
-        handle_sign_in   => \&handle_sign_in,
-        cmtr_name_js     => \&commenter_name_js,
+        cmtr_status_js   => \&commenter_status_js,
-        edit_profile     => \&edit_commenter_profile,
-        save_profile     => \&save_commenter_profile,
@@ -1372 +1373 @@
-        my %cookies = $app->cookies();
-        $app->_invalidate_commenter_session( \%cookies );
+        if ( $commenter && ( 'TypeKey' ne $commenter->auth_type ) ) {
+            # Remove logout parameter so MT does not go to TypeKey
+            # when unnecessary.
+            $app->param( 'logout', 0 );
+        }
-        $result = 1;
-    }
@@ -1430 +1436 @@
-}
-
+sub _commenter_status {
+    my $app = shift;
+    my ( $commenter_id ) = @_;
+    my $blog_id          = $app->param('blog_id') || 0;
+    my $commenter_status = '0';
+    my $user = $app->model('author')->load($commenter_id);
+    if ($user && $user->is_superuser) {
+        $commenter_status = 'AUTHOR';
+    }
+    else {
+        # FIXME: this may be incomplete since the user
+        # may in fact be able to comment on other blogs;
+        # they just haven't signed into them yet
+        my $perm = MT::Permission->load(
+              {
+                blog_id     => $blog_id,
+                permissions => { like => "\%'comment'\%" },
+                author_id   => $commenter_id
+              }
+            );
+        if ( $perm ) {
+            if ( $perm->is_restricted('comment')
+              && !$perm->can_administer_blog() ) {
+                $commenter_status = '0';
+            }
+            else {
+                $commenter_status = 'AUTHOR';
+            }
+        }
+        elsif ( MT::Author::COMMENTER() == $user->type ) {
+            $commenter_status = 'COMMENTER';
+        }
+        elsif ( $app->_check_commenter_author($user, $blog_id) ) {
+            $commenter_status = 'AUTHOR';
+        }
+    }
+    $commenter_status;
+}
+
+sub commenter_status_js {
+    local $SIG{__WARN__} = sub { };
+    my $app     = shift;
+    my $ids     = $app->cookie_val('commenter_id') || q();
+
+    my $commenter_id;
+    if ($ids) {
+        my @ids = split ':', $ids;
+        $commenter_id    = $ids[0];
+    }
+
+    my $commenter_status = '0';
+    if ($commenter_id) {
+        $commenter_status = $app->_commenter_status( $commenter_id );
+    }
+    $commenter_status = encode_js( $commenter_status );
+    return <<JS;
+commenter_status = $commenter_status;
+JS
+}
+
-sub commenter_name_js {
-    local $SIG{__WARN__} = sub { };
@@ -1436 +1502 @@
-    my $ids            = $app->cookie_val('commenter_id') || q();
-    my $commenter_url  = $app->cookie_val('commenter_url') || q();
-    my $blog_id        = $app->param('blog_id') || 0;
-
-    my $commenter_id;
@@ -1450 +1515 @@
-    $app->set_header( 'Expires'       => '-1' );
-
-blog_ids = q()
+commenter_status = '0'
-    if ($commenter_id) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return <<JS;
-commenter_name = '$commenter_name';
-commenter_id = '$commenter_id';
-commenter_url = '$commenter_url';
-blog_ids = "$blog_ids"
+status = $commenter_status
-JS
-}