Changeset 1823 for branches/release-34/lib/MT/App/Comments.pm

Timestamp:

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

Author:

takayama

Message:

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

Files:

• branches/release-34/lib/MT/App/Comments.pm (modified) (15 diffs)

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

@@ -234 +234 @@
     my $name    = $q->param('username');
     my $blog_id = $q->param('blog_id');
-    my $blog    = MT::Blog->load($blog_id);
+    my $blog    = MT::Blog->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $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 $blog = $app->model('blog')->load( $param->{blog_id} );
+    my $blog = $app->model('blog')->load( $param->{blog_id} )
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $param->{blog_id}));
     my $cfg  = $app->config;
     if ( my $registration = $cfg->CommenterRegistration ) {
@@ -353 +355 @@
     my $user = $app->create_user_pending($param);
     unless ($user) {
-        my $blog = $app->model('blog')->load( $param->{blog_id} );
+        my $blog = $app->model('blog')->load( $param->{blog_id} )
+            or return $app->error($app->translate('Can\'t load blog #[_1].', $param->{blog_id}));
         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 $blog   = MT::Blog->load($blog_id);
+    my $blog   = MT::Blog->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     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);
 
-    my $blog = $app->model('blog')->load($blog_id);
+    my $blog = $app->model('blog')->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     ## Token expiration check
     require MT::Session;
@@ -493 +498 @@
         $commenter = MT::Author->load( $sess->name );
         if ( $sess->start() < ( time - 60 * 60 * 24 ) ) {
-            $commenter->remove;
+            $commenter->remove if $commenter;
             $sess->remove;
             $sess = $commenter = undef;
@@ -570 +575 @@
     my ( $user, $entry_id, $blog_id, $ids ) = @_;
 
-    my $blog    = MT::Blog->load($blog_id);
+    my $blog    = MT::Blog->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     my $subject = $app->translate( "[_1] registered to the blog '[_2]'",
         $user->name, $blog->name );
@@ -610 +616 @@
         return undef;
     }
-    my $blog = $app->model('blog')->load($blog_id);
+    my $blog = $app->model('blog')->load($blog_id)
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
     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;
 
-        my $blog = MT::Blog->load( $entry->blog_id );
+        my $blog = MT::Blog->load( $entry->blog_id )
+            or return $app->error($app->translate('Can\'t load blog #[_1].', $entry->blog_id));
         if ( $author && $author->email ) {
             my %head = (
@@ -806 +814 @@
     }
 
-    my $blog = $app->model('blog')->load( $entry->blog_id );
+    my $blog = $app->model('blog')->load( $entry->blog_id )
+        or return $app->error($app->translate('Can\'t load blog #[_1].', $entry->blog_id));
 
     my $text = $q->param('text') || '';
@@ -990 +999 @@
         unless ($tmpl) {
             require MT::DefaultTemplates;
-            $tmpl = MT::DefaultTemplates->load({ type => 'comment_response' });
+            $tmpl = MT::DefaultTemplates->load({ type => 'comment_response' })
+                or return $app->error($app->translate("Can\'t load template"));
             $tmpl->text( $app->translate_templatized( $tmpl->text ) );
         }
@@ -1154 +1164 @@
         # for this blog only.
         if ( my $registration = $app->config->CommenterRegistration ) {
-            my $blog = MT::Blog->load($blog_id);
+            my $blog = MT::Blog->load($blog_id)
+                or return $app->error($app->translate('Can\'t load blog #[_1].', $blog_id));
             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;
-            my $entry = MT::Entry->load( $q->param('entry_id') );
+            my $entry = MT::Entry->load( $q->param('entry_id') )
+                or return $app->error($app->translate('Can\'t load entry #[_1].', $q->param('entry_id')));
             $target = $entry->archive_url;
             my $blog = MT::Blog->load( $entry->blog_id );
@@ -1601 +1613 @@
         unless ($tmpl) {
             require MT::DefaultTemplates;
-            $tmpl = MT::DefaultTemplates->load({ type => 'comment_response' });
+            $tmpl = MT::DefaultTemplates->load({ type => 'comment_response' })
+                or return $app->error($app->translate("Can\'t load template"));
             $tmpl->text( $app->translate_templatized( $tmpl->text ) );
         }
@@ -1625 +1638 @@
         unless ($tmpl) {
             require MT::DefaultTemplates;
-            $tmpl = MT::DefaultTemplates->load({ type => 'comment_preview' });
+            $tmpl = MT::DefaultTemplates->load({ type => 'comment_preview' })
+                or return $app->error($app->translate("Can\'t load template"));
             $tmpl->text( $app->translate_templatized( $tmpl->text ) );
         }