Changeset 3017 for trunk/lib/MT/App.pm

Timestamp:

09/03/08 03:57:13 (15 months ago)

Author:

fumiakiy

Message:

Added the new "charset" registry parameter for application methods. Existence of the parameter forces MT to see the input is encoded in the specified character set. BugId:81158

Files:

• trunk/lib/MT/App.pm (modified) (5 diffs)

trunk/lib/MT/App.pm

@@ -805 +805 @@
     sub validate_request_params {
         my $app = shift;
+        my ( $options ) = @_;
 
         $has_encode = eval { require Encode; 1 } ? 1 : 0
@@ -814 +815 @@
         # validate all parameter data matches the expected character set.
         my @p       = $q->param();
-        my $charset = $app->charset;
+        # use specific charset if the application method forces it
+        my $charset = $options->{charset} || $app->charset;
         require Encode;
         require MT::I18N::default;
@@ -2478 +2480 @@
 
     my ($body);
+    # Declare these variables here for Perl 5.6.x
+    # BugId:79755
+    my ( $mode, $code, $requires_login,
+         $get_method_info, $meth_info, @handlers );
     eval {
 
         # line __LINE__ __FILE__
 
-        $app->validate_request_params() or die;
+        $mode = $app->mode || 'default';
+
+        $requires_login = $app->{requires_login};
+
+        $get_method_info = sub {
+            $code = $app->handlers_for_mode($mode);
+
+            @handlers = ref($code) eq 'ARRAY' ? @$code : ($code)
+                if defined $code;
+
+            $meth_info = {};
+            foreach my $code (@handlers) {
+                if ( ref $code eq 'HASH' ) {
+                    $meth_info = $code;
+                    $requires_login
+                        = $requires_login & $meth_info->{requires_login}
+                        if exists $meth_info->{requires_login};
+                }
+            }
+        };
+        $get_method_info->();
+
+        $app->validate_request_params($meth_info) or die;
 
         require MT::Auth;
@@ -2505 +2533 @@
         }
 
-        my $mode = $app->mode || 'default';
-
     REQUEST:
         {
-
-            # for Perl 5.6.x BugId:79755
-            $mode = $app->{forward} unless $mode;
-
-            my $requires_login = $app->{requires_login};
-
-            my $code = $app->handlers_for_mode($mode);
-
-            my @handlers = ref($code) eq 'ARRAY' ? @$code : ($code)
-                if defined $code;
-
-            foreach my $code (@handlers) {
-                if ( ref $code eq 'HASH' ) {
-                    my $meth_info = $code;
-                    $requires_login
-                        = $requires_login & $meth_info->{requires_login}
-                        if exists $meth_info->{requires_login};
-                }
-            }
 
             if ($requires_login) {
@@ -2621 +2628 @@
             if ( my $new_mode = $app->{forward} ) {
                 $mode = $new_mode;
+                $get_method_info->();
                 goto REQUEST;
             }