Changeset 993

Timestamp:

12/28/06 19:26:19 (2 years ago)

Author:

bchoate

Message:

Changed ; delimiter to & for plugin action link parameters. BugId: 32375. Also adding DebugMode bit 128 for logging app request/response information.

Files:

• branches/wheeljack/lib/MT.pm.pre (modified) (1 diff)
• branches/wheeljack/lib/MT/App.pm (modified) (8 diffs)
• branches/wheeljack/tmpl/cms/edit_category.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_comment.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_commenter.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/edit_entry.tmpl (modified) (3 diffs)
• branches/wheeljack/tmpl/cms/edit_ping.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_blog.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_comment.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_commenters.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_entry.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_ping.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/list_template.tmpl (modified) (1 diff)
• branches/wheeljack/tmpl/cms/menu.tmpl (modified) (1 diff)

branches/wheeljack/lib/MT.pm.pre

@@ -1800 +1800 @@
-    4 - Lists queries issued by MT::ObjectDriver
-    8 - Reports on MT templates that take more than 1/4 second to build*
+    128 - Outputs app-level request/response information to STDERR.
-
-These can be combined, so if you want to display queries and debug messages,

branches/wheeljack/lib/MT/App.pm

@@ -48 +48 @@
-    $page .= $plugin_envelope . '/' if $plugin_envelope;
-    $page .= $action_link;
+    my $has_params = ($page =~ m/\?/)
+        && ($page !~ m!(&|;|\?)$!);
-    my $param = { page => $page,
+        page_has_params => $has_params,
-        link_text => $link_text,
-        orig_link_text => $link_text,
@@ -115 +118 @@
-        }
-        $app->{apache}->send_http_header($type);
+        if ($MT::DebugMode & 128) {
+            print "Status: " . ($app->response_code || 200)
+                . ($app->{response_message} ? $app->{response_message} : '')
+                . "\n";
+            print "Content-Type: $type\n\n";
+        }
-    } else {
-        $app->{cgi_headers}{-status} = ($app->response_code || 200) . " "
-                                     . ($app->{response_message} || "");
-        $app->{cgi_headers}{-type} = $type;
-print $app->{query}->header(%{ $app->{cgi_headers} }
+$app->print($app->{query}->header(%{ $app->{cgi_headers} })
-    }
-}
@@ -129 +138 @@
-    } else {
-        CORE::print(@_);
+    }
+    if ($MT::DebugMode & 128) {
+        CORE::print STDERR @_;
-    }
-}
@@ -714 +726 @@
-                }
-            }
+            if ($MT::DebugMode & 128) {
+                print STDERR "=====START: $$===========================\n";
+                print STDERR "Package: " . ref($app) . "\n";
+                print STDERR "Session: " . $app->session->id . "\n"
+                    if $app->session;
+                print STDERR "Request: " . $app->param->request_method . "\n";
+                my @param = $app->param;
+                if (@param) {
+                    foreach my $key (@param) {
+                        my @val = $app->param($key);
+                        print STDERR "\t" . $key . ": " . $_ . "\n"
+                            for @val;
+                    }
+                }
+                print STDERR "-----Response:\n";
+            }
-            if ($code) {
-                $body = $code->($app) if $code;
@@ -749 +777 @@
-                $app->send_http_header;
-            } else {
-print $q->redirect(-uri => $url, %{ $app->{cgi_headers} }
+$app->print($q->redirect(-uri => $url, %{ $app->{cgi_headers} })
-            }
-        }
@@ -755 +783 @@
-        unless ($app->{no_print_body}) {
-            $app->send_http_header;
-) {
+ && !($MT::DebugMode & 128)) { # no need to emit twice
-                if ($body =~ m!</body>!i) {
-                    if ($app->{trace} &&
@@ -775 +803 @@
-            $app->print($body);
-        }
+    }
+    if ($MT::DebugMode & 128) {
+        print STDERR "\n=====END: $$=============================\n";
-    }
-    $app->takedown();
@@ -1339 +1370 @@
-        push @{$app->{trace}}, Carp::longmess("Stack trace:");
-    }
+    if ($MT::DebugMode & 128) {
+        my @caller = caller(1);
+        my $place = $caller[0] . '::' . $caller[3] . ' in ' . $caller[1] . ', line ' . $caller[2];
+        print STDERR "(warn from $place) @_\n";
+        if ($MT::DebugMode & 2) {
+            local $Carp::CarpLevel = 1;
+            print STDERR Carp::longmess("Stack trace:");
+        }
+    }
-}
-

branches/wheeljack/tmpl/cms/edit_category.tmpl

@@ -213 +213 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=edit_category;id=<TMPL_VAR NAME=ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=edit_category&amp;id=<TMPL_VAR NAME=ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/edit_comment.tmpl

@@ -225 +225 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=edit_comment;id=<TMPL_VAR NAME=ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=edit_comment&amp;id=<TMPL_VAR NAME=ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/edit_commenter.tmpl

@@ -122 +122 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=edit_commenter;id=<TMPL_VAR NAME=ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=edit_commenter&amp;id=<TMPL_VAR NAME=ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/edit_entry.tmpl

@@ -552 +552 @@
-        write('<img title="<MT_TRANS phrase="Quote" escape="singlequotes">" onclick="return formatStr(document.entry_form.text, \'blockquote\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/quote.gif" alt="<MT_TRANS phrase="Quote" escape="singlequotes">" width="26" height="19" />');
-        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />');
-&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>
-&amp;filter=class&amp;filter_val=file&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>
+
+
-    }
-}
@@ -597 +597 @@
-        write('<img title="<MT_TRANS phrase="Quote">" onclick="return formatStr(document.entry_form.text_more, \'blockquote\')" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/quote.gif" alt="<MT_TRANS phrase="Quote">" width="26" height="19" />');
-        write('<img title="|" src="<TMPL_VAR NAME=STATIC_URI>images/formatting-icons/separator.gif" alt="|" width="7" height="19" />');
-&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>
-&amp;filter=class&amp;filter_val=file&amp;return_args=<TMPL_VAR NAME=RETURN_ARGS ESCAPE=URL>
+
+
-    }
-}
@@ -932 +932 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=edit_entry;id=<TMPL_VAR NAME=ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=edit_entry&amp;id=<TMPL_VAR NAME=ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/edit_ping.tmpl

@@ -171 +171 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=edit_ping;id=<TMPL_VAR NAME=ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=edit_ping&amp;id=<TMPL_VAR NAME=ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_blog.tmpl

@@ -248 +248 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_comment.tmpl

@@ -211 +211 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=list_comments<TMPL_IF NAME=BLOG_ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=list_comments<TMPL_IF NAME=BLOG_ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_commenters.tmpl

@@ -178 +178 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=list_commenters
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=list_commenters&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_entry.tmpl

@@ -226 +226 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=list_entries<TMPL_IF NAME=BLOG_ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=list_entries<TMPL_IF NAME=BLOG_ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_ping.tmpl

@@ -196 +196 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=list_pings<TMPL_IF NAME=BLOG_ID>
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=list_pings<TMPL_IF NAME=BLOG_ID>&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/list_template.tmpl

@@ -336 +336 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=list_templates
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=list_templates&amp
-</TMPL_LOOP>
-</ul>

branches/wheeljack/tmpl/cms/menu.tmpl

@@ -71 +71 @@
-<ul>
-<TMPL_LOOP NAME=PLUGIN_ACTION_LOOP>
->;from=blog_home
+ ESCAPE=HTML><TMPL_IF NAME=PAGE_HAS_PARAMS>&amp;</TMPL_IF>from=blog_home&amp
-</TMPL_LOOP>
-</ul>