Changeset 1635 for branches/release-32/default_templates/javascript.mtml

Timestamp:

03/29/08 06:39:13 (20 months ago)

Author:

fumiakiy

Message:

Merged enzo@r1555 to release-32. BugId:70191

• r1555 was to fix "malformed header" failiure due to large size of cookie values.

Files:

• branches/release-32/default_templates/javascript.mtml (modified) (5 diffs)

branches/release-32/default_templates/javascript.mtml

@@ -28 +28 @@
 </MTIfNonEmpty>
 
+var AUTHOR = 1;
+var COMMENTER = 2;
 var commenter_name;
-var commenter_blog_ids;
+var commenter_status;
+var commenter_id;
+var commenter_url
 var is_preview;
 var mtcmtmail;
@@ -47 +51 @@
 <MTIfRegistrationAllowed>
     <MTIfRegistrationRequired>
-    if ( commenter_name &&
-         ( !commenter_id
-        || commenter_blog_ids.indexOf("'<$MTBlogID$>'") > -1))
+    if ( commenter_status == COMMENTER )
     {
         hideDocumentElement('comment-form-name');
@@ -62 +64 @@
     <MTElse>
     // comments are allowed but registration not required
-    if ( commenter_name &&
-         ( !commenter_id
-        || commenter_blog_ids.indexOf("'<$MTBlogID$>'") > -1))
+    if ( commenter_status == COMMENTER )
     {
         hideDocumentElement('comment-form-name');
@@ -101 +101 @@
 function writeCommenterGreeting(commenter_name, entry_id, blog_id, commenter_id, commenter_url) {
 <MTIfRegistrationAllowed>
-    if ( commenter_name &&
-         ( !commenter_id
-        || commenter_blog_ids.indexOf("'" + blog_id + "'") > -1))
-    {
-        var url;
-        if (commenter_id) {
-            url = '<$MTCGIPath$><$MTCommentScript$>?__mode=edit_profile&commenter=' + commenter_id + '&blog_id=' + blog_id;
-            if (entry_id) {
-                url += '&entry_id=' + entry_id;
+    if ( commenter_status > 0 ) {
+        var commenter_link;
+        if ( commenter_status == COMMENTER ) {
+            if (commenter_url) {
+                commenter_link = '<a href="' + commenter_url + '">' + commenter_name + '</a>';
             } else {
-                url += '&static=1';
+                commenter_link = commenter_name;
             }
-        } else if (commenter_url) {
-            url = commenter_url;
-        } else {
-            url = null;
+        } else if ( commenter_status == AUTHOR ) {
+            if (commenter_id) {
+                commenter_link = '<a href="<$MTCGIPath$><$MTCommentScript$>?__mode=edit_profile&commenter=' + commenter_id + '&blog_id=' + blog_id;
+                if (entry_id) {
+                    commenter_link += '&entry_id=' + entry_id;
+                } else {
+                    commenter_link += '&static=1';
+                }
+                commenter_link += '">' + commenter_name + '</a>';
+            }
+
         }
-        var content = '<__trans phrase="Thanks for signing in," escape="js"> ';
-        if (url) {
-            content += '<a href="' + url + '">' + commenter_name + '</a>';
-        } else {
-            content += commenter_name;
-        }
-        content += '<__trans phrase=". Now you can comment." escape="js"> (<a href="<$MTRemoteSignOutLink static="1"$>&entry_id=' + entry_id + '"><__trans phrase="sign out" escape="js"></a>)';
-        document.write(content);
+        document.write(
+            '<__trans phrase="Thanks for signing in, [_1]. Now you can comment. ([_2]sign out[_3])" params="' + commenter_link + '%%<a href="<$MTRemoteSignOutLink static="1"$>&entry_id=' + entry_id + '">%%</a>">'
+        );
     } 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>
@@ -139 +138 @@
 
 <MTIfRegistrationAllowed>
-<MTsetvarblock name="cgi_host"><$MTCGIHost exclude_port="1"></MTsetvarblock>
-<MTIf tag="MTBlogHost" exclude_port="1" eq="cgi_host">
+<$MTCGIHost exclude_port="1" setvar="cgi_host"$><$MTBlogHost exclude_port="1" setvar="blog_host"$>
+<MTIf name="cgi_host" eq="$blog_host">
 commenter_name = getCookie('commenter_name');
+commenter_url = getCookie('commenter_url');
 ids = getCookie('commenter_id').split(':');
 commenter_id = ids[0];
-commenter_blog_ids = ids[1];
-commenter_url = getCookie('commenter_url');
-<MTelse>
+if ( ids[1] == 'S' ) {
+    commenter_status = AUTHOR;
+}
+else if ( ids[1] == 'N' ) {
+    document.write('<script src="<$MTCGIPath$><$MTCommentScript$>?__mode=cmtr_status_js&blog_id=<$MTBlogID$>"></script>');
+}
+else if ( commenter_name && !commenter_id ) {
+    commenter_status = COMMENTER;
+}
+else if ( commenter_name 
+  && commenter_id
+  && ( ids[1].indexOf("'<$MTBlogID$>'") > -1 ) ) {
+    commenter_status = AUTHOR;
+}
+else {
+    commenter_status = 0;
+}
+<MTElse>
 document.write('<script src="<$MTCGIPath$><$MTCommentScript$>?__mode=cmtr_name_js&blog_id=<$MTBlogID$>"></script>');
 </MTIf>