Changeset 1823

Timestamp:

04/09/08 10:05:12 (8 months ago)

Author:

takayama

Message:

Fixed BugId:67959
* Added check for result of object loading

Files:

• branches/release-34/lib/MT.pm.pre (modified) (1 diff)
• branches/release-34/lib/MT/App.pm (modified) (2 diffs)
• branches/release-34/lib/MT/App/Comments.pm (modified) (15 diffs)
• branches/release-34/lib/MT/App/Search/Legacy.pm (modified) (3 diffs)
• branches/release-34/lib/MT/App/Trackback.pm (modified) (1 diff)
• branches/release-34/lib/MT/App/Viewer.pm (modified) (2 diffs)
• branches/release-34/lib/MT/Atom.pm (modified) (3 diffs)
• branches/release-34/lib/MT/AtomServer.pm (modified) (3 diffs)
• branches/release-34/lib/MT/Auth/MT.pm (modified) (1 diff)
• branches/release-34/lib/MT/Auth/OpenID.pm (modified) (1 diff)
• branches/release-34/lib/MT/Auth/TypeKey.pm (modified) (2 diffs)
• branches/release-34/lib/MT/Author.pm (modified) (1 diff)
• branches/release-34/lib/MT/BackupRestore.pm (modified) (3 diffs)
• branches/release-34/lib/MT/Blog.pm (modified) (1 diff)
• branches/release-34/lib/MT/CMS/Asset.pm (modified) (5 diffs)
• branches/release-34/lib/MT/CMS/Blog.pm (modified) (8 diffs)
• branches/release-34/lib/MT/CMS/Category.pm (modified) (2 diffs)
• branches/release-34/lib/MT/CMS/Comment.pm (modified) (9 diffs)
• branches/release-34/lib/MT/CMS/Common.pm (modified) (6 diffs)
• branches/release-34/lib/MT/CMS/Entry.pm (modified) (8 diffs)
• branches/release-34/lib/MT/CMS/Import.pm (modified) (1 diff)
• branches/release-34/lib/MT/CMS/Search.pm (modified) (1 diff)
• branches/release-34/lib/MT/CMS/Tag.pm (modified) (4 diffs)
• branches/release-34/lib/MT/CMS/Template.pm (modified) (5 diffs)
• branches/release-34/lib/MT/CMS/Tools.pm (modified) (2 diffs)
• branches/release-34/lib/MT/CMS/TrackBack.pm (modified) (6 diffs)
• branches/release-34/lib/MT/CMS/User.pm (modified) (1 diff)
• branches/release-34/lib/MT/Category.pm (modified) (2 diffs)
• branches/release-34/lib/MT/Entry.pm (modified) (5 diffs)
• branches/release-34/lib/MT/Import.pm (modified) (1 diff)
• branches/release-34/lib/MT/Permission.pm (modified) (1 diff)
• branches/release-34/lib/MT/PublishOption.pm (modified) (1 diff)
• branches/release-34/lib/MT/Template.pm (modified) (2 diffs)
• branches/release-34/lib/MT/Template/ContextHandlers.pm (modified) (9 diffs)
• branches/release-34/lib/MT/TemplateMap.pm (modified) (3 diffs)
• branches/release-34/lib/MT/Util.pm (modified) (1 diff)
• branches/release-34/lib/MT/WeblogPublisher.pm (modified) (3 diffs)
• branches/release-34/lib/MT/XMLRPC.pm (modified) (2 diffs)
• branches/release-34/lib/MT/XMLRPCServer.pm (modified) (5 diffs)

branches/release-34/lib/MT.pm.pre

@@ -2280 +2280 @@
-    require MT::Entry;
-    for my $blog_id (@blogs) {
-
+
+
-        my $earliest_entry = MT::Entry->load(
-            {

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

@@ -1352 +1352 @@
-    my $app = shift;
-    my ($commenter, $commenter_blog_id) = @_;
-
+
+
-    my $url = $app->config('CGIPath') . $app->config('CommentScript');
-    $url .= '?__mode=edit_profile';
@@ -1614 +1615 @@
-    $param->{ 'auth_mode_' . $cfg->AuthenticationModule } = 1;
-
-
+
+
-
-    my ( $password, $hint, $url );

branches/release-34/lib/MT/App/Comments.pm

@@ -234 +234 @@
-    my $name    = $q->param('username');
-    my $blog_id = $q->param('blog_id');
-
+
+
-    my $auths   = $blog->commenter_authenticators;
-    if ( $auths !~ /MovableType/ ) {
@@ -326 +327 @@
-    my $param = {};
-    $param->{$_} = $app->param($_) foreach qw(blog_id entry_id static username);
-
+
+
-    my $cfg  = $app->config;
-    if ( my $registration = $cfg->CommenterRegistration ) {
@@ -353 +355 @@
-    my $user = $app->create_user_pending($param);
-    unless ($user) {
-
+
+
-        if ( my $provider = MT->effective_captcha_provider( $blog->captcha_provider ) ) {
-            $param->{captcha_fields} = $provider->form_fields( $blog->id );
@@ -387 +390 @@
-    my $cfg = $app->config;
-
-
+
+
-    my $entry  = MT::Entry->load($entry_id);
-    my $author = $entry ? $entry->author : q();
@@ -484 +488 @@
-    $param->{$_} = $app->param($_) foreach qw(blog_id entry_id static);
-
-
+
+
-    ## Token expiration check
-    require MT::Session;
@@ -493 +498 @@
-        $commenter = MT::Author->load( $sess->name );
-        if ( $sess->start() < ( time - 60 * 60 * 24 ) ) {
-
+ if $commenter
-            $sess->remove;
-            $sess = $commenter = undef;
@@ -570 +575 @@
-    my ( $user, $entry_id, $blog_id, $ids ) = @_;
-
-
+
+
-    my $subject = $app->translate( "[_1] registered to the blog '[_2]'",
-        $user->name, $blog->name );
@@ -610 +616 @@
-        return undef;
-    }
-
+
+
-    if ( my $provider = MT->effective_captcha_provider( $blog->captcha_provider ) ) {
-        my $image_data = $provider->generate_captcha($app, $blog_id, $token);
@@ -726 +733 @@
-          if $author && $author->preferred_language;
-
-
+
+
-        if ( $author && $author->email ) {
-            my %head = (
@@ -806 +814 @@
-    }
-
-
+
+
-
-    my $text = $q->param('text') || '';
@@ -990 +999 @@
-        unless ($tmpl) {
-            require MT::DefaultTemplates;
-
+
+
-            $tmpl->text( $app->translate_templatized( $tmpl->text ) );
-        }
@@ -1154 +1164 @@
-        # for this blog only.
-        if ( my $registration = $app->config->CommenterRegistration ) {
-
+
+
-            if ( $registration->{Allow} && $blog->allow_commenter_regist ) {
-                my $perm = $commenter->blog_perm($blog_id);
@@ -1406 +1417 @@
-        if ( $q->param('static') eq 1 ) {
-            require MT::Entry;
-
+
+
-            $target = $entry->archive_url;
-            my $blog = MT::Blog->load( $entry->blog_id );
@@ -1601 +1613 @@
-        unless ($tmpl) {
-            require MT::DefaultTemplates;
-
+
+
-            $tmpl->text( $app->translate_templatized( $tmpl->text ) );
-        }
@@ -1625 +1638 @@
-        unless ($tmpl) {
-            require MT::DefaultTemplates;
-
+
+
-            $tmpl->text( $app->translate_templatized( $tmpl->text ) );
-        }

branches/release-34/lib/MT/App/Search/Legacy.pm

@@ -303 +303 @@
-            $blog = MT::Blog->load($app->param('blog_id'));
-        }
-
+ if $blog
-    }
-
@@ -499 +499 @@
-        my $blog_id = $entry->blog_id;
-        if ($hits{$blog_id} && $hits{$blog_id} >= $max) {
-
+
+
-            my @res = @{ $app->{results}{$blog->name} };
-            my $count = $#res;
@@ -507 +508 @@
-        if ($app->_search_hit($entry)) {
-            my $blog = $blogs{$blog_id} || MT::Blog->load($blog_id);
-
+ if $blog
-        }
-    }

branches/release-34/lib/MT/App/Trackback.pm

@@ -272 +272 @@
-    return $app->_response(
-        Error => $app->translate("This TrackBack item is disabled.") )
-
+ || !$blog
-
-    if ( $tb->passphrase && ( !$pass || $pass ne $tb->passphrase ) ) {

branches/release-34/lib/MT/App/Viewer.pm

@@ -157 +157 @@
-    my $map = MT::TemplateMap->load({ archive_type => $at,
-                                      blog_id => $app->{__blog_id},
-
+
+
-    my $tmpl = MT::Template->load($map->template_id)
-        or return $app->error($app->translate("Can't load template [_1]", $map->template_id));
@@ -191 +192 @@
-        my $map = MT::TemplateMap->load({ archive_type => 'Individual',
-                                          blog_id => $app->{__blog_id},
-
+
+
-        $tmpl = MT::Template->load($map->template_id)
-            or return $app->error($app->translate("Can't load template [_1]", $map->template_id));

branches/release-34/lib/MT/Atom.pm

@@ -42 +42 @@
-    }
-
-
+
+
-    my $atom_author = new XML::Atom::Person(%param);
-    $atom_author->name(encode_text($mt_author->nickname, undef, 'utf-8'));
@@ -56 +57 @@
-    }
-
-
+
+
-    my $co = _create_issued($entry->authored_on, $blog);
-    $atom->issued($co);
@@ -82 +84 @@
-    $atom->title($asset->label); 
-    $atom->summary($asset->description);
-
+
+
-    $atom->issued(_create_issued($asset->created_on, $blog)); 
-    $atom->add_link({ rel => 'alternate', type => $asset->mime_type, 

branches/release-34/lib/MT/AtomServer.pm

@@ -409 +409 @@
-    my $app = shift;
-    my($entry, $no_ping) = @_;
-
+
+
-    $app->rebuild_entry( Entry => $entry, Blog => $blog,
-                         BuildDependencies => 1 ) or return;
@@ -447 +448 @@
-        my $blog = $thing->isa('MT::Blog') ? $thing
-            : MT::Blog->load($thing->blog_id);
+        next unless $blog;
-        my $uri = $base . '/blog_id=' . $blog->id;
-
@@ -942 +944 @@
-        my $blog = $thing->isa('MT::Blog') ? $thing
-            : MT::Blog->load($thing->blog_id);
+        next unless $blog;
-        my $uri = $base . '/blog_id=' . $blog->id;
-        my $blogname = encode_text($blog->name . ' #' . $blog->id, undef, 'utf-8');

branches/release-34/lib/MT/Auth/MT.pm

@@ -21 +21 @@
-    } else {
-        if ($q->param('pass') && $id) {
-
+
+
-            if (!$auth->is_valid_password($author, $q->param('old_pass'))) {
-                return $app->translate('Failed to verify current password.');

branches/release-34/lib/MT/Auth/OpenID.pm

@@ -124 +124 @@
-            require MT::Author;
-            my $sess = MT::Session->load({id => $session});
-
-
-
+
+
+
+
+
-        }
-    }

branches/release-34/lib/MT/Auth/TypeKey.pm

@@ -23 +23 @@
-
-    my $entry_id = $q->param('entry_id');
-
-
+
+
+
+
-
-    my $ts = $q->param('ts') || "";
@@ -82 +84 @@
-            require MT::Session;
-            require MT::Author;
-
+
+
-            $cmntr = MT::Author->load({name => $sess->name,
-                                       type => MT::Author::COMMENTER(),
-
+
+
-            if ($blog->require_typekey_emails
-                && !is_valid_email($cmntr->email))

branches/release-34/lib/MT/Author.pm

@@ -259 +259 @@
-        $entry = MT::Entry->load($entry);
-    }
-unless
+if !$entry ||
-    my $perms = $author->permissions($entry->blog_id);
-    die unless $perms->isa('MT::Permission');

branches/release-34/lib/MT/BackupRestore.pm

@@ -614 +614 @@
-    my $fmgr;
-    if (exists $blogs_meta->{$asset->blog_id}) {
+        my $blog = MT->model('blog')->load($asset->blog_id)
+            or return 0;
+
-        my $meta = $blogs_meta->{$asset->blog_id};
-        my $path = $asset->file_path;
@@ -641 +644 @@
-        $callback->(MT->translate("ok") . "\n");
-
-        my $blog = MT->model('blog')->load($asset->blog_id);
-        $fmgr = $blog->file_mgr;
-    }
@@ -859 +861 @@
-
-    if ($obj->parent) {
-
+
+
-        $xml .= $parent->to_xml(@_);
-        $xml .= "\n";

branches/release-34/lib/MT/Blog.pm

@@ -493 +493 @@
-    require MT::Template;
-    foreach my $map (@maps) {  
-
+
+
-        $result++ if !$tmpl->build_dynamic;
-    }

branches/release-34/lib/MT/CMS/Asset.pm

@@ -44 +44 @@
-        my $place_class = $app->model('objectasset');
-        my $place_iter = $place_class->load_iter(
-                                     
+
-                blog_id => $obj->blog_id || 0,
-                asset_id => $obj->parent ? $obj->parent : $obj->id
@@ -51 +51 @@
-        while (my $place = $place_iter->()) {
-            my $entry_class = $app->model($place->object_ds);
-
+
+
-            my %entry_data = (
-                id    => $place->object_id,
@@ -740 +741 @@
-    my $id = $q->param('id');
-    my $obj = $id ? $class->load($id) : $class->new;
+    return unless $obj;
-    my $original = $obj->clone();
-
@@ -780 +782 @@
-        my $blog_id = $app->param('blog_id');
-        require MT::Blog;
-
+
+
-
-        $param->{enable_archive_paths} = $blog->column('archive_path');
@@ -929 +932 @@
-        $param{blog_id} = $blog_id;
-        require MT::Blog;
-
+
+
-        $fmgr = $blog->file_mgr;
-

branches/release-34/lib/MT/CMS/Blog.pm

@@ -419 +419 @@
-    return $app->return_to_dashboard( redirect => 1 ) unless $blog_id;
-
-
+
+
-    my @data;
-    for my $at ( split /\s*,\s*/, $blog->archive_type ) {
@@ -557 +558 @@
-    return $app->errtrans("Invalid request.") unless $blog_id;
-
-
+
+
-    my $order         = $q->param('type');
-    my @order         = split /,/, $order;
@@ -589 +591 @@
-                require MT::Entry;
-                my $entry = MT::Entry->load($obj_id);
-->class
+ ? $entry->class : 'entry'
-            }
-            $app->{goback} =
@@ -803 +805 @@
-        if ( $q->param('entry_id') ) {
-            require MT::Entry;
-
+
+
-            require MT::Blog;
-
+
+
-            require MT::CMS::Entry;
-            MT::CMS::Entry::ping_continuation( $app,
@@ -942 +946 @@
-        my $tmpl_id = $1;
-        require MT::Template;
-
+
+
-        $param{build_type_name} =
-          $app->translate( "index template '[_1]'", $tmpl->name );
@@ -950 +955 @@
-        my $entry_id = $1;
-        require MT::Entry;
-
+
+
-        $param{build_type_name} =
-          $app->translate( "[_1] '[_2]'", $entry->class_label, $entry->title );
@@ -969 +975 @@
-    my $blog_id = $app->param('blog_id');
-    require MT::Blog;
-
+
+
-    my $at = $blog->archive_type || '';
-    my ( @blog_at, @at, @data );
@@ -1007 +1014 @@
-    if ( my $tmpl_id = $app->param('tmpl_id') ) {
-        require MT::Template;
-
+
+
-        $param{index_tmpl_id}   = $tmpl->id;
-        $param{index_tmpl_name} = $tmpl->name;

branches/release-34/lib/MT/CMS/Category.pm

@@ -141 +141 @@
-    my $cat;
-    if ( my $moved_cat_id = $q->param('move_cat_id') ) {
-
+
+
-        move_category($app) or return;
-    }
@@ -440 +441 @@
-    $app->validate_magic() or return;
-
-
+
+
-    my $new_parent = $app->param('move-radio');
-

branches/release-34/lib/MT/CMS/Comment.pm

@@ -1058 +1058 @@
-    foreach my $id (@ids) {
-        next unless $id;
-
+
+
-        unless ($perm_checked) {
-            if ( $obj->isa('MT::TBPing') && $obj->parent->isa('MT::Entry') ) {
@@ -1247 +1248 @@
-    my $blog = $parent->blog
-            || $app->model('blog')->load($q->param('blog_id'));
+    return $app->error($app->translate('Can\'t load blog #[_1].', $q->param('blog_id'))) unless $blog;
-
-    require MT::Sanitize;
@@ -1318 +1320 @@
-    my $blog = $parent->blog
-            || $app->model('blog')->load($app->param('blog_id'));
+    return $app->error($app->translate('Can\'t load blog #[_1].', $app->param('blog_id'))) unless $blog;
-
-    require MT::Sanitize;
@@ -1372 +1375 @@
-        || $perms->can_manage_feedback );
-
-
+
+
-    if ( $perms && $perms->can_create_post && $perms->can_publish_post ) {
-        return $c->entry->author_id == $app->user->id;
@@ -1401 +1405 @@
-    my $perms = $app->permissions;
-    require MT::Entry;
-
+
+
-    if ( !$perms || $perms->blog_id != $entry->blog_id ) {
-        $perms ||= $author->permissions( $entry->blog_id );
@@ -1609 +1614 @@
-    require MT::Entry;
-    foreach my $id (@obj_ids) {
-
+
+
-        my $old_visible = $obj->visible || 0;
-        if ( $old_visible != $new_visible ) {
@@ -1692 +1698 @@
-    for my $id (@$comments) {
-        my $cmt = MT::Comment->load($id);
-
+ && $cmt
-            $commenters{ $cmt->commenter_id . ':' . $cmt->blog_id } =
-              [ $cmt->commenter_id, $cmt->blog_id ];
@@ -1711 +1717 @@
-    my $entry         = $app->model('entry')->load( $parent->entry_id );
-
-unless (
+if ( !$parent ||
-        $app->error(
-            $app->translate("You can't reply to unpublished comment.") );
@@ -1721 +1727 @@
-        return ( undef, $parent, $entry );
-    }
-
-    my $blog = $app->model('blog')->load( $entry->blog_id );
-
-    my $nick = $app->user->nickname || $app->translate('Registered User');

branches/release-34/lib/MT/CMS/Common.pm

@@ -132 +132 @@
-    my ($obj);
-    if ($id) {
-
+
+
-    }
-    else {
@@ -739 +740 @@
-            require MT::Entry;
-            my $tb_center = MT::Trackback->load( $obj->tb_id );
-
+
+
-            if ( my $ts = $obj->created_on ) {
-                $row->{created_on_time_formatted} =
@@ -760 +762 @@
-    }
-    if ( $type eq 'template' ) {
-        my $blog = $blog_class->load( scalar $q->param('blog_id') );
-        $app->add_breadcrumb( $app->translate('Templates') );
-        $param{nav_templates} = 1;
@@ -782 +783 @@
-    # add any breadcrumbs
-    if ( $type eq 'banlist' ) {
-        my $blog = $blog_class->load($blog_id);
-        $app->add_breadcrumb( $app->translate('IP Banning') );
-        $param{nav_config}                       = 1;
@@ -926 +926 @@
-                    foreach (@ot) {
-                        my $obj = $ot_class->load($_);
+                        next unless $obj;
-                        $obj->remove
-                          or return $app->errtrans( 'Removing tag failed: [_1]',
@@ -946 +947 @@
-                require MT::Entry;
-                require MT::Placement;
-
+
+
-                my $at   = $blog->archive_type;
-                if ( $at && $at ne 'None' ) {

branches/release-34/lib/MT/CMS/Entry.pm

@@ -139 +139 @@
-        my $blog_timezone = 0;
-        if ($blog_id) {
-
+
+
-            $blog_timezone = $blog->server_offset();
-            if ( $type eq 'entry' ) {
@@ -836 +837 @@
-        $fullscreen = 1;
-    }
+    return $app->error($app->translate('Can\'t load template.')) unless $tmpl;
-
-    # translates naughty words when PublishCharset is NOT UTF-8
@@ -1079 +1081 @@
-    require MT::Blog;
-    my $blog_id = $app->param('blog_id');
-
-
+
+
+
-    my $archive_type;
-
@@ -1349 +1352 @@
-
-        # blog_id sanity check
-
+!$cat || 
-
-        my $place = MT::Placement->new;
@@ -1462 +1465 @@
-        next unless $p =~ /^category_id_(\d+)/;
-        my $id    = $1;
-
+
+
-        return $app->error( $app->translate("Permission denied.") )
-            unless $perms
@@ -1822 +1826 @@
-    my $entry_id = $app->param('entry_id');
-    require MT::Entry;
-
+
+
-    $param{url_loop} = [ map { { url => $_ } } @{ $entry->pinged_url_list } ];
-    $param{failed_url_loop} =
@@ -2071 +2076 @@
-    my ($type)  = @_;
-    my $blog_id = $app->blog->id;
-
+
+
-    my %args    = ( '_type' => $type, blog_id => $blog_id, qp => 1 );
-    my $uri = $app->base . $app->uri( 'mode' => 'view', args => \%args );
@@ -2286 +2292 @@
-    my $q       = $app->param;
-    my $blog_id = $q->param('blog_id');
-
+
+
-
-    my $can_background =

branches/release-34/lib/MT/CMS/Import.pm

@@ -74 +74 @@
-    if ($blog_id) {
-        $param{blog_id} = $blog_id;
-
+
+
-        $param{text_filters} = $app->load_text_filters( $blog->convert_paras );
-    }

branches/release-34/lib/MT/CMS/Search.pm

@@ -69 +69 @@
-            'perm_check' => sub {
-                my $ping = shift;
-
+
+
-                if ( $tb->entry_id ) {
-                    require MT::Entry;

branches/release-34/lib/MT/CMS/Tag.pm

@@ -227 +227 @@
-        my $entry = MT::Entry->load($id) or next;
-        next
-
+
+
-          || $perms->can_edit_entry( $entry, $user );
-
@@ -259 +260 @@
-        my $entry = MT::Entry->load($id) or next;
-        next
-
+
+
-          || $perms->can_edit_entry( $entry, $user );
-        $entry->remove_tags(@tags);
@@ -290 +292 @@
-        my $asset = MT::Asset->load($id) or next;
-        next
-
+
+
-          || $perms->can_edit_assets;
-
@@ -322 +325 @@
-        my $asset = MT::Asset->load($id) or next;
-        next
-
+
+
-          || $perms->can_edit_assets;
-        $asset->remove_tags(@tags);

branches/release-34/lib/MT/CMS/Template.pm

@@ -895 +895 @@
-      unless $perms->can_edit_templates;
-    $app->validate_magic() or return;
-
+
+
-    require MT::Template;
-    my @tmpl = MT::Template->load( { blog_id => $blog->id } );
@@ -1256 +1257 @@
-            my $at     = $1;
-            my $map_id = $2;