Changeset 2877

Timestamp:

08/01/08 01:43:09 (4 months ago)

Author:

bchoate

Message:

Tidying (-pbp).

Files:

• branches/release-42/lib/MT/App.pm (modified) (178 diffs)
• branches/release-42/lib/MT/App/ActivityFeeds.pm (modified) (26 diffs)
• branches/release-42/lib/MT/App/CMS.pm (modified) (107 diffs)
• branches/release-42/lib/MT/App/Comments.pm (modified) (91 diffs)
• branches/release-42/lib/MT/App/NotifyList.pm (modified) (11 diffs)
• branches/release-42/lib/MT/App/Search.pm (modified) (55 diffs)
• branches/release-42/lib/MT/App/Trackback.pm (modified) (25 diffs)
• branches/release-42/lib/MT/App/Upgrader.pm (modified) (37 diffs)
• branches/release-42/lib/MT/App/Viewer.pm (modified) (7 diffs)
• branches/release-42/lib/MT/App/Wizard.pm (modified) (35 diffs)

branches/release-42/lib/MT/App.pm

@@ -3 +3 @@
-# GNU General Public License, version 2.
-#
-
+: App.pm 2846 2008-07-28 02:46:54Z fumiakiy 
-
-package MT::App;
@@ -17 +17 @@
-
-my $COOKIE_NAME = 'mt_user';
- "mt_commenter" 
+"mt_commenter"
-use vars qw( %Global_actions );
-
@@ -37 +37 @@
-
-sub core_list_filters {
-
+;
-}
-
-sub core_widgets {
-
+;
-}
-
-sub core_blog_stats_tabs {
-
+;
-}
-
-sub core_search_apis {
-
+;
-}
-
-sub __massage_page_action {
-$app, $action, $type
+ $app, $action, $type 
-    return if exists $action->{__massaged};
-
@@ -59 +59 @@
-    my $plugin = $action->{plugin};
-
-my $link = $action->{link}
+ my $link = $action->{link} 
-        my $envelope = $plugin->envelope;
-        $link .= '?' unless $link =~ m.\?.;
@@ -66 +66 @@
-        $page .= $envelope . '/' if $envelope;
-        $page .= $link;
-$page =~ m/\?/
-$page !~ m!(&|;|\?)$!
-
+ $page =~ m/\?/ 
+ $page !~ m!(&|;|\?)$! 
+           
-        $action->{page_has_params} = $has_params;
-
+
+
-        if ( $app->user->is_superuser ) {
-            $action->{allowed} = 1;
@@ -80 +81 @@
-                foreach my $p (@p) {
-                    my $perm = 'can_' . $p;
-
+
+
-                }
-            }
@@ -92 +94 @@
-        elsif ( $action->{dialog} ) {
-            if ( $action->{args} ) {
-
+
+
-                $action->{dialog_args} .= join '&', @args;
-            }
-        }
-
-
+
+
+
+
+
+
-        $action->{page_has_params} = 1;
-    }
-    $action->{core} = $plugin->isa('MT::Plugin') ? 0 : 1;
-$action->{order} || 0
+ $action->{order} || 0 
-    $action->{label} = $action->{link_text} if exists $action->{link_text};
-$plugin && !ref($action->{label})
+ $plugin && !ref( $action->{label} ) 
-        my $label = $action->{label};
-        if ($plugin) {
-            $action->{label} = sub { $plugin->translate($label) };
-
+
+
-            $action->{label} = sub { $app->translate($label) };
-        }
@@ -116 +124 @@
-
-sub filter_conditional_list {
-$app, $list, @param
+ $app, $list, @param 
-
-    # $list may either be an array of things or a hashref of things
-
-    my $perms = $app->permissions;
-
-$user && $user->is_superuser()
-$perms && $perms->blog_id && $perms->has('administer_blog')
+ 
+ $user && $user->is_superuser() 
+ $perms && $perms->blog_id && $perms->has('administer_blog') 
-    my $system_perms = $user->permissions(0) unless $perms && $perms->blog_id;
-
@@ -129 +137 @@
-        my ($item) = @_;
-        if ( $system_perms
-
+
+
-            my $allowed = 0;
-            my @sp = split /,/, $sp;
@@ -135 +144 @@
-                my $perm = 'can_' . $sp;
-                $allowed = 1, last
-
+
+
+
+
-            }
-            return 0 unless $allowed;
-        }
-my $p = $item->{permission}
+ my $p = $item->{permission} 
-            my $allowed = 0;
-            my @p = split /,/, $p;
@@ -145 +157 @@
-                my $perm = 'can_' . $p;
-                $allowed = 1, last
-
+
+
+
+
-            }
-            return 0 unless $allowed;
-        }
-my $cond = $item->{condition}
-!ref($cond)
+ my $cond = $item->{condition} 
+ !ref($cond) 
-                $cond = $item->{condition} = $app->handler_to_coderef($cond);
-            }
@@ -158 +173 @@
-    };
-
-ref $list eq 'ARRAY'
+ ref $list eq 'ARRAY' 
-        my @list;
-        if (@$list) {
+
-            # translate the link text here...
-            foreach my $item (@$list) {
@@ -167 +183 @@
-        }
-        return \@list;
-
+
+
-        my %list;
-        if (%$list) {
+
-            # translate the link text here...
-keys %$list
+ keys %$list 
-                $list{$item} = $list->{$item}
-$list->{$item}
+ $list->{$item} 
-            }
-        }
@@ -183 +201 @@
-sub page_actions {
-    my $app = shift;
-$type, @param
-"page_actions", $type
-keys %$actions
+ $type, @param 
+ "page_actions", $type 
+ keys %$actions 
-        $actions->{$a}{key} = $a;
-$app, $actions->{$a}, $type
+ $app, $actions->{$a}, $type 
-    }
-    my @actions = values %$actions;
-\@actions, @param
+ \@actions, @param 
-    no warnings;
-    @$actions = sort { $a->{order} <=> $b->{order} } @$actions;
@@ -198 +216 @@
-sub list_actions {
-    my $app = shift;
-$type, @param
-
-"list_actions", $type
+ $type, @param 
+
+ "list_actions", $type 
-    my @actions;
-keys %$actions
-
+ keys %$actions 
+ 
-        $actions->{$a}{core} = 1
-$actions->{$a}{plugin}, 'MT::Plugin'
+ $actions->{$a}{plugin}, 'MT::Plugin' 
-        if ( exists $actions->{$a}{continue_prompt_handler} ) {
-
+
+
-            $actions->{$a}{continue_prompt} = $code->()
-                if 'CODE' eq ref($code);
@@ -213 +232 @@
-        push @actions, $actions->{$a};
-    }
-\@actions, @param
+ \@actions, @param 
-    no warnings;
-    @$actions = sort { $a->{order} <=> $b->{order} } @$actions;
@@ -221 +240 @@
-sub list_filters {
-    my $app = shift;
-$type, @param
-
-"list_filters", $type
+ $type, @param 
+
+ "list_filters", $type 
-    my @filters;
-keys %$filters
+ keys %$filters 
-        $filters->{$a}{key} = $a;
-
+   
-        push @filters, $filters->{$a};
-    }
-\@filters, @param
+ \@filters, @param 
-    no warnings;
-    @$filters = sort { $a->{order} <=> $b->{order} } @$filters;
@@ -238 +257 @@
-sub search_apis {
-    my $app = shift;
-$view, @param
+ $view, @param 
-
-    my $apis = $app->registry("search_apis") or return;
-    my @apis;
-keys %$apis
+ keys %$apis 
-        next if $apis->{$a}->{view} && $apis->{$a}->{view} ne $view;
-
+ 
-        $apis->{$a}{core} = 1
-$apis->{$a}{plugin}, 'MT::Plugin'
+ $apis->{$a}{plugin}, 'MT::Plugin' 
-        push @apis, $apis->{$a};
-    }
-\@apis, @param
+ \@apis, @param 
-    no warnings;
-    @$apis = sort { $a->{order} <=> $b->{order} } @$apis;
@@ -260 +279 @@
-
-    my $type = $opt->{type} || $opt->{Type} || $app->param('_type');
-
-
-
+
+
+
+
-    my $iter_method = $opt->{iterator} || $opt->{Iterator} || 'load_iter';
-    my $param       = $opt->{params}   || $opt->{Params}   || {};
-    $param->{listing_screen} = 1;
-    my $add_pseudo_new_user = delete $param->{pseudo_new_user}
-
-= $opt->{code}
-= $opt->{terms}
-= $opt->{args}
-= $opt->{no_html}
+  
+ = $opt->{code} 
+ = $opt->{terms} 
+ = $opt->{args} 
+ = $opt->{no_html} 
-    my $no_limit = $opt->{no_limit} || 0;
-= $opt->{json}
-$opt->{pre_build}
+ = $opt->{json} 
+ $opt->{pre_build} 
-    $param->{json} = 1 if $json;
-
@@ -289 +309 @@
-    if ( my $search = $app->param('search') ) {
-        $app->param( 'do_search', 1 );
-$app->can('do_search_replace')
+ $app->can('do_search_replace') 
-            my $search_param = $app->do_search_replace();
-            if ($hasher) {
@@ -306 +326 @@
-    }
-    else {
+
-        # handle filter options
-        my $filter_key = $app->param('filter_key');
@@ -311 +332 @@
-            $filter_key = 'default';
-        }
- $filter_key 
+$filter_key
-
-            # set filter based on type
@@ -318 +339 @@
-                if ( my $code = $filter->{code} || $filter->{handler} ) {
-                    if ( ref($code) ne 'CODE' ) {
- =
-
+
+  = 
-                    }
-                    if ( ref($code) eq 'CODE' ) {
@@ -333 +354 @@
-            && ( my $val = $app->param('filter_val') ) )
-        {
-
-
-
+
-                    || ( $filter_col eq 'exacttag' )
-                )
-                && ( $class->isa('MT::Taggable') )
-
+  
-            {
-                my $normalize   = ( $filter_col eq 'normalizedtag' );
@@ -349 +368 @@
-                if ($normalize) {
-                    push @filter_tags, MT::Tag->normalize($_)
-
+  
-                }
-
-
+
+
+
+
-                my @tag_ids;
-                foreach (@tags) {
@@ -365 +386 @@
-                $args->{'join'} = $ot_class->join_on(
-                    'object_id',
-
-
+
-                        object_datasource => $class->datasource
-                    },
@@ -373 +393 @@
-            }
-            elsif ( !exists( $terms->{$filter_col} ) ) {
-$class->has_column($filter_col)
+ $class->has_column($filter_col) 
-                    $terms->{$filter_col} = $val;
-                }
@@ -396 +416 @@
-
-        $args->{sort} = 'id'
-
-
-.
-                 
-
- =
-
-
-
-
+  
+
+ . 
+
+
+
+  = 
+  
+  
+  
-        my @data;
-        while ( my $obj = $iter->() ) {
-            my $row = $obj->column_values();
-            $hasher->( $obj, $row ) if $hasher;
+
-            #$app->run_callbacks( 'app_listing_'.$app->mode,
-            #                     $app, $obj, $row );
-            push @data, $row;
-scalar @data == $limit) && (!$no_limit
+ scalar @data == $limit ) && ( !$no_limit 
-        }
-
@@ -432 +453 @@
-        $param->{pager_json} = $json ? $pager : JSON::objToJson($pager);
-
-  
-  
-  
-  
+
+
+
+
-    }
-
@@ -470 +491 @@
-            return $param;
-        }
-ref $tmpl
- $param 
+ ref $tmpl 
+$param
-            return $tmpl;
-
+
+
-            return $app->load_tmpl( $tmpl, $param );
-        }
@@ -485 +507 @@
-    $app->{no_print_body} = 1;
-    require JSON;
-JSON::objToJson( { error => undef, result => $result })
+ JSON::objToJson( { error => undef, result => $result } ) 
-    return undef;
-}
@@ -495 +517 @@
-    $app->{no_print_body} = 1;
-    require JSON;
-JSON::objToJson( { error => $error } )
+ JSON::objToJson( { error => $error } ) 
-    return undef;
-}
@@ -525 +547 @@
-sub send_http_header {
-    my $app = shift;
-
+ 
-    $type ||= $app->{response_content_type} || 'text/html';
-my $charset = $app->charset
+ my $charset = $app->charset 
-        $type .= "; charset=$charset"
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        $app->{apache}->send_http_header($type);
-
-
-
+
+
+
+
+
+
-                . "\n";
-            print "Content-Type: $type\n\n";
-        }
-
-
-
+
+
+
+
+
+
-        $app->{cgi_headers}{-type} = $type;
-$app->{query}->header(%{ $app->{cgi_headers} })
+ $app->{query}->header( %{ $app->{cgi_headers} } ) 
-    }
-}
@@ -555 +590 @@
-sub print {
-    my $app = shift;
-$ENV{MOD_PERL}
+ $ENV{MOD_PERL} 
-        $app->{apache}->print(@_);
-
+
+
-        CORE::print(@_);
-    }
-$MT::DebugMode & 128
+ $MT::DebugMode & 128 
-        CORE::print STDERR @_;
-    }
@@ -567 +603 @@
-sub handler ($$) {
-    my $class = shift;
-
+ 
-    require Apache::Constants;
-lc($r->dir_config('Filter') || '') eq 'on'
+ lc( $r->dir_config('Filter') || '' ) eq 'on' 
-        $r = $r->filter_register;
-    }
-    my $config_file = $r->dir_config('MTConfig');
-
-
-
-
+
+
+
+
+
+
+
-        or die $class->errstr;
-
@@ -583 +622 @@
-
-    my $cfg = $app->config;
-my @extra = $r->dir_config('MTSetVar')
+ my @extra = $r->dir_config('MTSetVar') 
-        for my $d (@extra) {
-($var, $val
-$var, $val
+ ( $var, $val 
+ $var, $val 
-        }
-    }
@@ -602 +641 @@
-
-sub init {
-
+  
-    my %param = @_;
-    $app->{apache} = $param{ApacheObject} if exists $param{ApacheObject};
-    $app->SUPER::init(%param) or return;
-= { 
-
-= 'cms';
-
+                = {
+            
+        = 'cms';         
+          
-    $app->{plugin_template_path} = 'tmpl';
-
-
+
+
+
+
-        # SQL profiling
-        my $dbh = MT::Object->driver->r_handle;
@@ -618 +659 @@
-        $dbh->{Profile} = DBI::Profile->new();
-    }
-$MT::DebugMode & 128
-'pre_run', 1, $app, sub { $app->pre_run_debug }
-'takedown', 1, $app, sub { $app->post_run_debug }
+ $MT::DebugMode & 128 
+ 'pre_run',  1, $app, sub { $app->pre_run_debug } 
+ 'takedown', 1, $app, sub { $app->post_run_debug } 
-    }
-    $app->{vtbl} = $app->registry("methods");
@@ -629 +670 @@
-sub pre_run_debug {
-    my $app = shift;
-$MT::DebugMode & 128
+ $MT::DebugMode & 128 
-        print STDERR "=====START: $$===========================\n";
-        print STDERR "Package: " . ref($app) . "\n";
@@ -639 +680 @@
-            foreach my $key (@param) {
-                my @val = $app->param($key);
-
-
+
-            }
-        }
@@ -648 +688 @@
-
-sub post_run_debug {
-$MT::DebugMode & 128
+ $MT::DebugMode & 128 
-        print STDERR "\n=====END: $$=============================\n";
-    }
@@ -655 +695 @@
-sub run_callbacks {
-    my $app = shift;
-$meth, @param
-ref($app)||$app
-$meth, @param
+ $meth, @param 
+ ref($app) || $app 
+ $meth, @param 
-}
-
@@ -663 +703 @@
-    my $app = shift;
-    $app->SUPER::init_callbacks(@_);
-
-
-
-
+
+
+
+
+
-}
-
-sub init_request {
-
+  
-    my %param = @_;
-
@@ -676 +717 @@
-
-    if ($MT::DebugMode) {
-$MT::DebugMode & 4) {
+ $MT::DebugMode & 4 ) {  
-            my $h = MT::Object->driver->r_handle;
-my $Profile = $h->{Profile}
-
+ my $Profile = $h->{Profile} 
+          
-            }
-        }
@@ -686 +727 @@
-    }
-
-$app->{request_read_config}
-\%param
+ $app->{request_read_config} 
+ \%param 
-        $app->{request_read_config} = 0;
-    }
@@ -699 +740 @@
-    delete $app->{$_} foreach @req_vars;
-    $app->user(undef);
-$ENV{MOD_PERL}
+ $ENV{MOD_PERL} 
-        require Apache::Request;
-        $app->{apache} = $param{ApacheObject} || Apache->request;
-
-
-
-
+
+
+
+
+
-            $app->{query} = $param{CGIObject};
-            require CGI;
-            $CGI::POST_MAX = $app->config->CGIMaxUpload;
-
-
-
+
+
+
+
+
-                    # some CGI environments (notably 'sbox') leaves PATH_INFO
-                    # defined which interferes with CGI.pm determining the
@@ -730 +774 @@
-    ## Initialize the MT::Request singleton for this particular request.
-    $app->request->reset();
-'App-Class', ref $app
-
-ref($app) . '::init_request', $app, @_
+ 'App-Class', ref $app 
+
+ ref($app) . '::init_request', $app, @_ 
-
-    $app->{init_request} = 1;
@@ -739 +783 @@
-sub init_query {
-    my $app = shift;
-
+
+
-    # CGI.pm has this terrible flaw in that if a POST is in effect,
-    # it totally ignores any query parameters.
-$app->request_method eq 'POST'
-! $ENV{MOD_PERL}
+ $app->request_method eq 'POST' 
+ !$ENV{MOD_PERL} 
-            my $query_string = $ENV{'QUERY_STRING'}
-                if defined $ENV{'QUERY_STRING'};
-            $query_string ||= $ENV{'REDIRECT_QUERY_STRING'}
-                if defined $ENV{'REDIRECT_QUERY_STRING'};
-defined($query_string) and $query_string ne ''
+ defined($query_string) and $query_string ne '' 
-                $q->parse_params($query_string);
-            }
@@ -755 +800 @@
-}
-
+{
+    my $has_encode;
+
+    sub validate_request_params {
+        my $app = shift;
+
+        $has_encode = eval { require Encode; 1 } ? 1 : 0
+            unless defined $has_encode;
+        return 1 unless $has_encode;
+
+        my $q = $app->param;
+
+        # validate all parameter data matches the expected character set.
+        my @p       = $q->param();
+        my $charset = $app->charset;
+        require Encode;
+        $charset = 'UTF-8' if $charset =~ m/utf-?8/i;
+        foreach my $p (@p) {
+            if ( $p =~ m/[^\x20-\x7E]/ ) {
+
+                # non-ASCII parameter name
+                return $app->errtrans("Invalid request");
+            }
+
+            my @d = $q->param($p);
+            foreach my $d (@d) {
+                next
+                    if ( !defined $d )
+                    || ( $d eq '' )
+                    || ( $d !~ m/[^\x20-\x7E]/ );
+                eval { Encode::decode( $charset, $d, 1 ); };
+                return $app->errtrans(
+                    "Invalid request: corrupt character data for character set [_1]",
+                    $charset
+                ) if $@;
+            }
+        }
+
+        return 1;
+    }
+}
+
-sub registry {
-    my $app = shift;
-= $app->SUPER::registry("applications", $app->id, @_
-
+ = $app->SUPER::registry( "applications", $app->id, @_ 
+ 
-    if ($ar) {
-$ar, $gr
+ $ar, $gr 
-        return $ar;
-    }
@@ -767 +854 @@
-
-sub _cb_unmark_blog {
-$eh, $obj
+ $eh, $obj 
-    my $mt_req = MT->instance->request;
-my $blogs_touched = $mt_req->stash('blogs_touched')
-$obj->id
-'blogs_touched', $blogs_touched
+ my $blogs_touched = $mt_req->stash('blogs_touched') 
+ $obj->id 
+ 'blogs_touched', $blogs_touched 
-    }
-}
-
-sub _cb_mark_blog {
-$eh, $obj
+ $eh, $obj 
-    my $obj_type = ref $obj;
-
-$obj_type eq 'MT::Author'
+ $obj_type eq 'MT::Author' 
-        require MT::Touch;
-0, 'author'
+ 0, 'author' 
-        return;
-    }
-
-
-
-
+
+
+
+
+
-    my $mt_req = MT->instance->request;
-    my $blogs_touched = $mt_req->stash('blogs_touched') || {};
@@ -793 +882 @@
-    # Issue MT::Touch touches for specific types we track
-    my $type = $obj->datasource;
-$obj->properties->{class_column}
+ $obj->properties->{class_column} 
-        $type = $obj->class_type;
-    }
-
+
+
+
+
-        undef $type;
-    }
-
-
-
-
-
-
+
+
+
+
+
+
-            $th->{$type} = 1 if $type;
-        }
-    }
-'blogs_touched', $blogs_touched
+ 'blogs_touched', $blogs_touched 
-}
-
-sub _cb_user_provisioning {
-$cb, $user
+ $cb, $user 
-
-    # Supply user with what they need...
@@ -820 +913 @@
-    my $new_blog;
-    my $blog_name = $user->nickname || MT->translate("First Weblog");
-my $blog_id = MT->config('NewUserTemplateBlogId')
+ my $blog_id = MT->config('NewUserTemplateBlogId') 
-        my $blog = MT::Blog->load($blog_id);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            return;
-        }
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+