Changeset 14070

Timestamp:

07/23/08 23:30:03 (5 years ago)

Author:

janine

Message:

LJSUP-2512

Allow individual entries to be suspended/unsuspended without suspending/unsuspending an entire account.
* The entry poster can still view the entry, and can edit it to request an unsuspension.

Location:

trunk

Files:

• bin/upgrading/en.dat (modified) (3 diffs)
• bin/upgrading/proplists.dat (modified) (2 diffs)
• cgi-bin/Apache/LiveJournal.pm (modified) (1 diff)
• cgi-bin/LJ/Comment.pm (modified) (1 diff)
• cgi-bin/LJ/Console/Command/Suspend.pm (modified) (4 diffs)
• cgi-bin/LJ/Console/Command/Unsuspend.pm (modified) (3 diffs)
• cgi-bin/LJ/Entry.pm (modified) (3 diffs)
• cgi-bin/LJ/S2/DayPage.pm (modified) (3 diffs)
• cgi-bin/LJ/S2/EntryPage.pm (modified) (2 diffs)
• cgi-bin/LJ/S2/FriendsPage.pm (modified) (3 diffs)
• cgi-bin/LJ/S2/MonthPage.pm (modified) (2 diffs)
• cgi-bin/LJ/S2/RecentPage.pm (modified) (3 diffs)
• cgi-bin/LJ/S2/ReplyPage.pm (modified) (2 diffs)
• cgi-bin/LJ/User.pm (modified) (1 diff)
• cgi-bin/LJ/Vertical.pm (modified) (1 diff)
• cgi-bin/cleanhtml.pl (modified) (4 diffs)
• cgi-bin/ljfeed.pl (modified) (2 diffs)
• cgi-bin/ljviews.pl (modified) (7 diffs)
• cgi-bin/supportlib.pl (modified) (2 diffs)
• cgi-bin/weblib.pl (modified) (1 diff)
• htdocs/editjournal.bml (modified) (5 diffs)
• htdocs/editjournal.bml.text (modified) (1 diff)
• htdocs/talkpost.bml (modified) (3 diffs)
• htdocs/talkpost.bml.text (modified) (1 diff)
• htdocs/talkpost_do.bml (modified) (1 diff)
• htdocs/talkread.bml (modified) (3 diffs)
• htdocs/view/index.bml (modified) (1 diff)

trunk/bin/upgrading/en.dat

@@ -46 +46 @@
 
 btn.search=Search
+
+cleanhtml.suspend_msg=This is a suspended entry.
+
+cleanhtml.suspend_msg_with_supportid=This is a suspended entry. <a [[aopts]]>An unsuspension request</a> has been opened, and your entry will be reviewed soon.
 
 contentflag.viewingconcepts=You are about to view content that may not be appropriate for minors.
@@ -1482 +1486 @@
 entryform.save=Save Entry
 
+entryform.saveandrequestunsuspend=Save Entry & Request Unsuspension
+
 entryform.security=Security:
 
@@ -2173 +2179 @@
 talk.error.suspended.title=Suspended
 
+talk.error.suspendedentry=This entry is suspended. You can visit the journal <a [[aopts]]>here</a>.
+
+talk.error.suspendedentryreply=This entry is suspended. You cannot reply to it. You can visit the journal <a [[aopts]]>here</a>.
+
 talk.frozen=Replies frozen
 

trunk/bin/upgrading/proplists.dat

@@ -1302 +1302 @@
   sortorder: 99
 
+logproplist.statusvis:
+  datatype: char
+  des: 'V' or undef for visible, 'S' for suspended
+  prettyname: Visibility Status of an Entry
+  sortorder: 99
+
 logproplist.syn_id:
   datatype: char
@@ -1326 +1332 @@
   sortorder: 99
 
+logproplist.unsuspend_supportid:
+  datatype: num
+  des: The support request ID of the unsuspension request submitted by a user whose entry was suspended. Undef or 0 if no request is currently open.
+  prettyname: Support Request ID for Unsuspension Request
+  sortorder: 99
+
 logproplist.used_rte:
   datatype: bool

trunk/cgi-bin/Apache/LiveJournal.pm

@@ -1387 +1387 @@
 
         $generate_iejunk = 1;
+
+    } elsif ($opts->{'suspendedentry'}) {
+        $status = "403 Entry suspended";
+        $html = "<h1>Suspended Entry</h1>" .
+                "<p>The entry at this URL is suspended.  You cannot reply to it.</p>";
+
+        $generate_iejunk = 1;
     }
 

trunk/cgi-bin/LJ/Comment.pm

@@ -903 +903 @@
     return 0 if $u->underage;
     return 0 unless $u->get_cap("edit_comments");
+
+    # entry cannot be suspended
+    return 0 if $self->entry->is_suspended;
 
     # user must be the poster of the comment

trunk/cgi-bin/LJ/Console/Command/Suspend.pm

@@ -7 +7 @@
 sub cmd { "suspend" }
 
-sub desc { "Suspend an account." }
+sub desc { "Suspend an account or entry." }
 
 sub args_desc { [
-                 'username or email address' => "The username of the account to suspend, or an email address to suspend all accounts at that address.",
-                 'reason' => "Why you're suspending the account.",
+                 'username or email address or entry url' => "The username of the account to suspend, or an email address to suspend all accounts at that address, or an entry URL to suspend a single entry within an account",
+                 'reason' => "Why you're suspending the account or entry.",
                  ] }
 
-sub usage { '<username or email address> <reason>' }
+sub usage { '<username or email address or entry url> <reason>' }
 
 sub can_execute {
@@ -26 +26 @@
     return $self->error("This command takes two arguments. Consult the reference.")
         unless $user && $reason && scalar(@args) == 0;
+
+    my $remote = LJ::get_remote();
+    my $entry = LJ::Entry->new_from_url($user);
+    if ($entry) {
+        my $poster = $entry->poster;
+        my $journal = $entry->journal;
+
+        return $self->error("Invalid entry.")
+            unless $entry->valid;
+
+        return $self->error("Journal and/or poster is purged; cannot suspend entry.")
+            if $poster->is_expunged || $journal->is_expunged;
+
+        return $self->error("Entry is already suspended.")
+            if $entry->is_suspended;
+
+        $entry->set_prop( statusvis => "S" );
+
+        $reason = "entry: " . $entry->url . "; reason: $reason";
+        LJ::statushistory_add($journal, $remote, "suspend", $reason);
+        LJ::statushistory_add($poster, $remote, "suspend", $reason)
+            unless $journal->equals($poster);
+
+        return $self->print("Entry " . $entry->url . " suspended.");
+    }
 
     my @users;
@@ -76 +101 @@
         $u->{statusvis} = 'S';
 
-        my $remote = LJ::get_remote();
         LJ::statushistory_add($u, $remote, "suspend", $reason);
 
@@ -89 +113 @@
         }
 
-        $self->info("User '$username' suspended.");
+        $self->print("User '$username' suspended.");
     }
 

trunk/cgi-bin/LJ/Console/Command/Unsuspend.pm

@@ -7 +7 @@
 sub cmd { "unsuspend" }
 
-sub desc { "Unsuspend an account." }
+sub desc { "Unsuspend an account or entry." }
 
 sub args_desc { [
-                 'username or email address' => "The username of the account to unsuspend, or an email address to unsuspend all accounts at that address.",
-                 'reason' => "Why you're unsuspending the account.",
+                 'username or email address or entry url' => "The username of the account to unsuspend, or an email address to unsuspend all accounts at that address, or an entry URL to unsuspend a single entry within an account",
+                 'reason' => "Why you're unsuspending the account or entry",
                  ] }
 
-sub usage { '<username or email address> <reason>' }
+sub usage { '<username or email address or entry url> <reason>' }
 
 sub can_execute {
@@ -26 +26 @@
     return $self->error("This command takes two arguments. Consult the reference.")
         unless $user && $reason && scalar(@args) == 0;
+
+    my $remote = LJ::get_remote();
+    my $entry = LJ::Entry->new_from_url($user);
+    if ($entry) {
+        my $poster = $entry->poster;
+        my $journal = $entry->journal;
+
+        return $self->error("Invalid entry.")
+            unless $entry->valid;
+
+        return $self->error("Journal and/or poster is purged; cannot unsuspend entry.")
+            if $poster->is_expunged || $journal->is_expunged;
+
+        return $self->error("Entry is not currently suspended.")
+            if $entry->is_visible;
+
+        $entry->set_prop( statusvis => "V" );
+        $entry->set_prop( unsuspend_supportid => 0 )
+            if $entry->prop("unsuspend_supportid");
+
+        $reason = "entry: " . $entry->url . "; reason: $reason";
+        LJ::statushistory_add($journal, $remote, "unsuspend", $reason);
+        LJ::statushistory_add($poster, $remote, "unsuspend", $reason)
+            unless $journal->equals($poster);
+
+        return $self->print("Entry " . $entry->url . " unsuspended.");
+    }
 
     my @users;
@@ -72 +99 @@
         $u->{statusvis} = 'V';
 
-        my $remote = LJ::get_remote();
         LJ::statushistory_add($u, $remote, "unsuspend", $reason);
         eval { $u->fb_push };
         warn "Error running fb_push: $@\n" if $@ && $LJ::IS_DEV_SERVER;
 
-        $self->info("User '$username' unsuspended.");
+        $self->print("User '$username' unsuspended.");
     }
 

trunk/cgi-bin/LJ/Entry.pm

@@ -769 +769 @@
     }
 
+    my $remote = LJ::get_remote();
+    my $suspend_msg = $self->should_show_suspend_msg_to($remote) ? 1 : 0;
+    $opts->{suspend_msg} = $suspend_msg;
+    $opts->{unsuspend_supportid} = $suspend_msg ? $self->prop("unsuspend_supportid") : 0;
+
     $self->_load_text unless $self->{_loaded_text};
     my $event = $self->{event};
@@ -843 +848 @@
         # can't see anything by suspended users
         return 0 if $self->poster->{statusvis} eq 'S';
+
+        # can't see suspended entries
+        return 0 if $self->is_suspended_for($remote);
     }
 
@@ -1162 +1170 @@
 
     return "";
+}
+
+sub statusvis {
+    my $self = shift;
+
+    return $self->prop("statusvis") eq "S" ? "S" : "V";
+}
+
+sub is_visible {
+    my $self = shift;
+
+    return $self->statusvis eq "V" ? 1 : 0;
+}
+
+sub is_suspended {
+    my $self = shift;
+
+    return $self->statusvis eq "S" ? 1 : 0;
+}
+
+# same as is_suspended, except that it returns 0 if the given user can see the suspended entry
+sub is_suspended_for {
+    my $self = shift;
+    my $u = shift;
+
+    return 0 unless $self->is_suspended;
+    return 0 if LJ::check_priv($u, 'canview', 'suspended');
+    return 0 if LJ::isu($u) && $u->equals($self->poster);
+    return 1;
+}
+
+sub should_show_suspend_msg_to {
+    my $self = shift;
+    my $u = shift;
+
+    return $self->is_suspended && !$self->is_suspended_for($u) ? 1 : 0;
 }
 

trunk/cgi-bin/LJ/S2/DayPage.pm

@@ -116 +116 @@
             map { $item->{$_} } qw(posterid itemid security allowmask alldatepart anum);
 
+        my $ditemid = $itemid*256 + $anum;
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
+
         my $replycount = $logprops{$itemid}->{'replycount'};
         my $subject = $logtext->{$itemid}->[0];
@@ -125 +128 @@
         }
 
-        # don't show posts from suspended users
+        # don't show posts from suspended users or suspended posts
         next ENTRY if $apu{$posterid} && $apu{$posterid}->{'statusvis'} eq 'S' && ! $viewsome;
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         if ($LJ::UNICODE && $logprops{$itemid}->{'unknown8bit'}) {
@@ -134 +138 @@
         LJ::CleanHTML::clean_subject(\$subject) if $subject;
 
-        my $ditemid = $itemid*256 + $anum;
-
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$text, { 'preformatted' => $logprops{$itemid}->{'opt_preformatted'},
                                              'cuturl' => LJ::item_link($u, $itemid, $anum),
-                                             'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'}, });
+                                             'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'},
+                                             'suspend_msg' => $suspend_msg,
+                                             'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($u, $ditemid, $remote, \$text);
 
-        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
         $text = LJ::ContentFlag->transform_post(post => $text, journal => $u,
                                                 remote => $remote, entry => $entry_obj);

trunk/cgi-bin/LJ/S2/EntryPage.pm

@@ -29 +29 @@
     my ($entry, $s2entry) = EntryPage_entry($u, $remote, $opts);
     return if $opts->{'suspendeduser'};
+    return if $opts->{'suspendedentry'};
     return if $opts->{'handler_return'};
     return if $opts->{'redir'};
@@ -414 +415 @@
     }
 
+    if ($entry && $entry->is_suspended_for($remote)) {
+        $opts->{'suspendedentry'} = 1;
+        return;
+    }
+
     my $replycount = $entry->prop("replycount");
     my $nc = "";

trunk/cgi-bin/LJ/S2/FriendsPage.pm

@@ -210 +210 @@
 
         my $ditemid = $itemid * 256 + $item->{'anum'};
+        my $entry_obj = LJ::Entry->new($friends{$friendid}, ditemid => $ditemid);
 
         my $stylemine = "";
@@ -215 +216 @@
                                       $remote->{'userid'} != $friendid;
 
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$text, { 'preformatted' => $logprops{$datakey}->{'opt_preformatted'},
                                              'cuturl' => LJ::item_link($friends{$friendid}, $itemid, $item->{'anum'}, $stylemine),
                                              'maximgwidth' => $maximgwidth,
                                              'maximgheight' => $maximgheight,
-                                             'ljcut_disable' => $remote->{'opt_ljcut_disable_friends'}, });
+                                             'ljcut_disable' => $remote->{'opt_ljcut_disable_friends'},
+                                             'suspend_msg' => $suspend_msg,
+                                             'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($friends{$friendid}, $ditemid, $remote, \$text);
 
-        my $entry_obj = LJ::Entry->new($friends{$friendid}, ditemid => $ditemid);
         $text = LJ::ContentFlag->transform_post(post => $text, journal => $friends{$friendid},
                                                 remote => $remote, entry => $entry_obj);
@@ -232 +235 @@
         my $po = $posters{$posterid} || $friends{$posterid};
 
-        # don't allow posts from suspended users
-        if ($po->{'statusvis'} eq 'S') {
+        # don't allow posts from suspended users or suspended posts
+        if ($po->{'statusvis'} eq 'S' || ($entry_obj && $entry_obj->is_suspended_for($remote))) {
             $hiddenentries++; # Remember how many we've skipped for later
             next ENTRY;

trunk/cgi-bin/LJ/S2/MonthPage.pm

@@ -105 +105 @@
         my $day = $item->{'day'};
 
-        # don't show posts from suspended users
+        my $ditemid = $itemid*256 + $anum;
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
+
+        # don't show posts from suspended users or suspended posts
         next unless $pu{$posterid};
         next ENTRY if $pu{$posterid}->{'statusvis'} eq 'S' && !$viewsome;
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         if ($LJ::UNICODE && $logprops{$itemid}->{'unknown8bit'}) {
@@ -120 +124 @@
         }
 
-        my $ditemid = $itemid*256 + $anum;
         my $nc = "";
         $nc .= "nc=$replycount" if $replycount && $remote && $remote->{'opt_nctalklinks'};

trunk/cgi-bin/LJ/S2/RecentPage.pm

@@ -137 +137 @@
             map { $item->{$_} } qw(posterid itemid security allowmask alldatepart);
 
+        my $ditemid = $itemid * 256 + $item->{'anum'};
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
+
         my $replycount = $logprops{$itemid}->{'replycount'};
         my $subject = $logtext->{$itemid}->[0];
@@ -148 +151 @@
         $itemnum++;
 
-        # don't show posts from suspended users unless the user doing the viewing says to (and is allowed)
+        # don't show posts from suspended users or suspended posts unless the user doing the viewing says to (and is allowed)
         next ENTRY if $apu{$posterid} && $apu{$posterid}->{'statusvis'} eq 'S' && !$viewsome;
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         if ($LJ::UNICODE && $logprops{$itemid}->{'unknown8bit'}) {
@@ -165 +169 @@
         LJ::CleanHTML::clean_subject(\$subject) if $subject;
 
-        my $ditemid = $itemid * 256 + $item->{'anum'};
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$text, { 'preformatted' => $logprops{$itemid}->{'opt_preformatted'},
                                               'cuturl' => LJ::item_link($u, $itemid, $item->{'anum'}),
-                                              'ljcut_disable' => $remote->{"opt_ljcut_disable_lastn"}, });
+                                              'ljcut_disable' => $remote->{"opt_ljcut_disable_lastn"},
+                                              'suspend_msg' => $suspend_msg,
+                                              'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($u, $ditemid, $remote, \$text);
 
-        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
         $text = LJ::ContentFlag->transform_post(post => $text, journal => $u,
                                                 remote => $remote, entry => $entry_obj);

trunk/cgi-bin/LJ/S2/ReplyPage.pm

@@ -21 +21 @@
     my ($entry, $s2entry) = EntryPage_entry($u, $remote, $opts);
     return if $opts->{'suspendeduser'};
+
+    # reply page of suspended entry cannot be accessed by anyone, even entry poster
+    if ($entry && $entry->is_suspended) {
+        $opts->{suspendedentry} = 1;
+        return;
+    }
+
     return if $opts->{'handler_return'};
     return if $opts->{'redir'};
@@ -111 +118 @@
             $opts->{status} = "403 Forbidden";
             return "<p>This thread has been frozen; no more replies are allowed.</p>";
+        }
+        if ($entry->is_suspended) {
+            $opts->{status} = "403 Forbidden";
+            return "<p>This entry has been suspended; you cannot reply to it.</p>";
         }
 

trunk/cgi-bin/LJ/User.pm

@@ -7935 +7935 @@
         return $error->("Journal has been deleted.  If you are <b>$user</b>, you have a period of 30 days to decide to undelete your journal.", "404 Not Found") if ($u->is_deleted);
         return $error->("This journal has been suspended.", "403 Forbidden") if ($u->is_suspended);
+
+        my $entry = $opts->{ljentry};
+        return $error->("This entry has been suspended. You can visit the journal <a href='" . $u->journal_base . "/'>here</a>.", "403 Forbidden")
+            if $entry && $entry->is_suspended_for($remote);
     }
     return $error->("This journal has been deleted and purged.", "410 Gone") if ($u->is_expunged);

trunk/cgi-bin/LJ/Vertical.pm

@@ -104 +104 @@
     return 0 unless $entry->security eq "public";
 
-    # poster and journal must be visible
+    # poster, journal, and entry must be visible
     return 0 unless $poster->is_visible;
     return 0 unless $journal->is_visible;
+    return 0 unless $entry->is_visible;
 
     my $hook_rv = LJ::run_hook("entry_should_be_in_verticals", $entry);

trunk/cgi-bin/cleanhtml.pl

@@ -135 +135 @@
         (exists $opts->{'blocked_link_substitute'}) ? $opts->{'blocked_link_substitute'} :
         ($LJ::BLOCKED_LINK_SUBSTITUTE) ? $LJ::BLOCKED_LINK_SUBSTITUTE : '#';
-        
+    my $suspend_msg = $opts->{'suspend_msg'} || 0;
+    my $unsuspend_supportid = $opts->{'unsuspend_supportid'} || 0;
+
     my @canonical_urls; # extracted links
     my %action = ();
@@ -1012 +1014 @@
     $$data = $newdata;
     $$data .= $extra_text if $extra_text; # invalid markup error
+
+    if ($suspend_msg) {
+        my $msg = qq{<div style="color: #000; font: 12px Verdana, Arial, Sans-Serif; background-color: #ffeeee; background-repeat: repeat-x; border: 1px solid #ff9999; padding: 8px; margin: 5px auto; width: auto; text-align: left; background-image: url('$LJ::IMGPREFIX/message-error.gif');">};
+
+        if ($unsuspend_supportid) {
+            $msg .= LJ::Lang::ml('cleanhtml.suspend_msg_with_supportid', { aopts => "href='$LJ::SITEROOT/support/see_request.bml?id=$unsuspend_supportid'" });
+        } else {
+            $msg .= LJ::Lang::ml('cleanhtml.suspend_msg', { aopts => "href='$LJ::SITEROOT/abuse/report.bml'" });
+        }
+
+        $msg .= "</div>";
+
+        $$data = $msg . $$data;
+    }
 
     return 0;
@@ -1258 +1274 @@
     my $wordlength = defined $opts->{'wordlength'} ? $opts->{'wordlength'} : 40;
 
-    # fast path:  no markup or URLs to linkify
-    if ($$ref !~ /\<|\>|http/ && ! $opts->{preformatted}) {
+    # fast path:  no markup or URLs to linkify, and no suspend message needed
+    if ($$ref !~ /\<|\>|http/ && ! $opts->{preformatted} && !$opts->{suspend_msg}) {
         $$ref =~ s/\S{$wordlength,}/break_word($&,$wordlength)/eg if $wordlength;
         $$ref =~ s/\r?\n/<br \/>/g;
@@ -1290 +1306 @@
         'transform_embed_nocheck' => $opts->{'transform_embed_nocheck'} ? 1 : 0,
         'transform_embed_wmode' => $opts->{'transform_embed_wmode'},
+        'suspend_msg' => $opts->{'suspend_msg'} ? 1 : 0,
+        'unsuspend_supportid' => $opts->{'unsuspend_supportid'},
     });
 }

trunk/cgi-bin/ljfeed.pl

@@ -172 +172 @@
         my $itemid  = $it->{'itemid'};
         my $ditemid = $itemid*256 + $it->{'anum'};
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
 
         next ENTRY if $posteru{$it->{'posterid'}} && $posteru{$it->{'posterid'}}->{'statusvis'} eq 'S';
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         if ($LJ::UNICODE && $logprops{$itemid}->{'unknown8bit'}) {
@@ -262 +264 @@
         };
         push @cleanitems, $cleanitem;
-        push @entries,    LJ::Entry->new($u, ditemid => $ditemid);
+        push @entries,    $entry_obj;
     }
 

trunk/cgi-bin/ljviews.pl

@@ -1262 +1262 @@
             map { $item->{$_} } qw(posterid itemid security alldatepart);
 
+        my $ditemid = $itemid * 256 + $item->{'anum'};
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
+
         my $pu = $posteru{$posterid};
         next ENTRY if $pu && $pu->{'statusvis'} eq 'S' && !$viewsome;
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         my $replycount = $logprops{$itemid}->{'replycount'};
@@ -1311 +1315 @@
         }
 
-        my $ditemid = $itemid * 256 + $item->{'anum'};
         my $itemargs = "journal=$user&itemid=$ditemid";
         $lastn_event{'itemargs'} = $itemargs;
 
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $logprops{$itemid}->{'opt_preformatted'},
                                                'cuturl' => LJ::item_link($u, $itemid, $item->{'anum'}),
-                                               'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'}, });
+                                               'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'},
+                                               'suspend_msg' => $suspend_msg,
+                                               'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($u, $ditemid, $remote, \$event);
 
-        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
         $event = LJ::ContentFlag->transform_post(post => $event, journal => $u,
                                                  remote => $remote, entry => $entry_obj);
@@ -1723 +1728 @@
             map { $item->{$_} } qw(ownerid posterid itemid security alldatepart);
 
+        my $ditemid = $itemid * 256 + $item->{'anum'};
+        my $entry_obj = LJ::Entry->new($friends{$friendid}, ditemid => $ditemid);
+
         my $pu = $friends{$posterid} || $aposter{$posterid};
         next ENTRY if $pu && $pu->{'statusvis'} eq 'S';
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         # counting excludes skipped entries
@@ -1781 +1790 @@
         }
 
-        my $ditemid = $itemid * 256 + $item->{'anum'};
         my $itemargs = "journal=$friend&itemid=$ditemid";
         $friends_event{'itemargs'} = $itemargs;
@@ -1789 +1797 @@
                                       $remote->{'userid'} != $friendid;
 
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $logprops{$datakey}->{'opt_preformatted'},
                                               'cuturl' => LJ::item_link($friends{$friendid}, $itemid, $item->{'anum'}, $stylemine),
                                               'maximgwidth' => $maximgwidth,
                                               'maximgheight' => $maximgheight,
-                                              'ljcut_disable' => $remote->{'opt_ljcut_disable_friends'}, });
+                                              'ljcut_disable' => $remote->{'opt_ljcut_disable_friends'},
+                                              'suspend_msg' => $suspend_msg,
+                                              'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($friends{$friendid}, $ditemid, $remote, \$event);
 
-        my $entry_obj = LJ::Entry->new($friends{$friendid}, ditemid => $ditemid);
         $event = LJ::ContentFlag->transform_post(post => $event, journal => $friends{$friendid},
                                                  remote => $remote, entry => $entry_obj);
@@ -2469 +2479 @@
             map { $item->{$_} } qw(itemid posterid security alldatepart anum);
 
+        my $ditemid = $itemid*256 + $anum;
+        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
+
         next ENTRY if $posteru{$posterid} && $posteru{$posterid}->{'statusvis'} eq 'S' && !$viewsome;
+        next ENTRY if $entry_obj && $entry_obj->is_suspended_for($remote);
 
         my $replycount = $logprops{$itemid}->{'replycount'};
@@ -2497 +2511 @@
         }
 
-        my $ditemid = $itemid*256 + $anum;
         my $itemargs = "journal=$user&itemid=$ditemid";
         $day_event{'itemargs'} = $itemargs;
 
+        my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
         LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $logprops{$itemid}->{'opt_preformatted'},
                                               'cuturl' => LJ::item_link($u, $itemid, $anum),
-                                              'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'}, });
+                                              'ljcut_disable' => $remote->{'opt_ljcut_disable_lastn'},
+                                              'suspend_msg' => $suspend_msg,
+                                              'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0, });
         LJ::expand_embedded($u, $ditemid, $remote, \$event);
 
-        my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
         $event = LJ::ContentFlag->transform_post(post => $event, journal => $u,
                                                  remote => $remote, entry => $entry_obj);

trunk/cgi-bin/supportlib.pl

@@ -534 +534 @@
 
     $dbh->do("LOCK TABLES support WRITE, duplock WRITE");
-    $sth = $dbh->prepare("SELECT dupid FROM duplock WHERE realm='support' AND reid=0 AND userid=$qrequserid AND digest='$md5'");
-    $sth->execute;
-    ($dup_id) = $sth->fetchrow_array;
-    if ($dup_id) {
-        $dbh->do("UNLOCK TABLES");
-        return $dup_id;
+
+    unless ($o->{ignore_dup_check}) {
+        $sth = $dbh->prepare("SELECT dupid FROM duplock WHERE realm='support' AND reid=0 AND userid=$qrequserid AND digest='$md5'");
+        $sth->execute;
+        ($dup_id) = $sth->fetchrow_array;
+        if ($dup_id) {
+            $dbh->do("UNLOCK TABLES");
+            return $dup_id;
+        }
     }
 
@@ -556 +559 @@
     $spid = $dbh->{'mysql_insertid'};
 
-    $dbh->do("INSERT INTO duplock (realm, reid, userid, digest, dupid, instime) VALUES ('support', 0, $qrequserid, '$md5', $spid, NOW())");
+    $dbh->do("INSERT INTO duplock (realm, reid, userid, digest, dupid, instime) VALUES ('support', 0, $qrequserid, '$md5', $spid, NOW())")
+        unless $o->{ignore_dup_check};
     $dbh->do("UNLOCK TABLES");
 

trunk/cgi-bin/weblib.pl

@@ -1641 +1641 @@
                                     { 'onclick' => $onclick, 'disabled' => $opts->{'disabled_save'},
                                       'tabindex' => $tabindex->() }) . " \n";
+
+            if ($opts->{suspended} && !$opts->{unsuspend_supportid}) {
+                $out .= LJ::html_submit('action:saveunsuspend', BML::ml('entryform.saveandrequestunsuspend'),
+                                        { 'onclick' => $onclick, 'disabled' => $opts->{'disabled_save'},
+                                          'tabindex' => $tabindex->() }) . " \n";
+            }
+
             $out .= LJ::html_submit('action:delete', BML::ml('entryform.delete'), {
                 'disabled' => $opts->{'disabled_delete'},

trunk/htdocs/editjournal.bml

@@ -133 +133 @@
             my $anum = $ditemid % 256;
             my $itemid = $ditemid >> 8;
+            my $entry_obj = LJ::Entry->new($u, ditemid => $ditemid);
 
             # do getevents request
@@ -182 +183 @@
 
             # they clicked the save or delete button
-            if (!$spellcheck_html && ($POST{'action:save'} || $POST{'action:delete'} || $POST{'action:deletespam'})) {
+            if (!$spellcheck_html && ($POST{'action:save'} || $POST{'action:saveunsuspend'} || $POST{'action:delete'} || $POST{'action:deletespam'})) {
                 return LJ::bad_input($ML{'error.invalidform'}) unless LJ::check_form_auth();
 
@@ -233 +234 @@
                 } else {
                     $result .= "<?p $ML{'.success.edited'} p?>";
+
+                    # open a request about the unsuspension if one doesn't already exist
+                    if ($POST{'action:saveunsuspend'} && !$entry_obj->prop("unsuspend_supportid") && $LJ::UNSUSPENSION_REQUEST_SPCATID) {
+                        my %req;
+                        $req{reqtype} = "user";
+                        $req{requserid} = $remote->id;
+                        $req{uniq} = LJ::UniqCookie->current_uniq;
+                        $req{spcatid} = $LJ::UNSUSPENSION_REQUEST_SPCATID;
+                        $req{ignore_dup_check} = 1; # can't have dup checking in case a particular entry gets re-suspended after unsuspension
+                        $req{subject} = "Unsuspension Request from " . $remote->user;
+                        $req{body} = "The suspended entry at " . $entry_obj->url . " has been edited and the poster requests unsuspension.";
+
+                        my @errors;
+                        my $spid = LJ::Support::file_request(\@errors, \%req);
+
+                        if ($spid) {
+                            $entry_obj->set_prop( unsuspend_supportid => $spid );
+                            my $url = "$LJ::SITEROOT/support/see_request.bml?id=$spid";
+                            $result .= "<?p " . BML::ml('.success.editedunsuspend', { url => "<a href='$url'>$url</a>" }) . " p?>";
+                        }
+                    }
                 }
 
@@ -297 +319 @@
             $event = LJ::eurl($event);
 
+            my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to($remote) ? 1 : 0;
             my $entry = {
                 'mode' => "edit",
@@ -314 +337 @@
                 'disabled_delete' => $disabled_delete,
                 'disabled_spamdelete' => $disabled_spamdelete,
+                'suspended' => $suspend_msg,
+                'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0,
             };
             for (my $i = 1; $i <= $res{'prop_count'}; $i++) {

trunk/htdocs/editjournal.bml.text

@@ -20 +20 @@
 .success.edited=Journal entry was edited.
 
+.success.editedunsuspend=Additionally, an unsuspension request has been opened at [[url]], and your entry will be reviewed soon.
+
 .success.fromhere=From here you can:
 

trunk/htdocs/talkpost.bml

@@ -152 +152 @@
     }
 
-    # check suspended
+    # check suspended user
     return "<?h1 $ML{'talk.error.suspended.title'} h1?><?p $ML{'talk.error.suspended'} p?>"
         if $u->is_suspended || $up->is_suspended ||
@@ -160 +160 @@
     return "<?h1 $ML{'talk.error.deleted.title'} h1?><?p $ML{'talk.error.deleted'} p?>"
         if ($u->is_deleted);
+
+    # check suspended entry
+    # reply page of suspended entry cannot be accessed by anyone, even entry poster
+    return "<?h1 $ML{'talk.error.suspended.title'} h1?><?p " . BML::ml('talk.error.suspendedentryreply', { aopts => "href='" . $u->journal_base . "/'" }) . " p?>"
+        if $entry && $entry->is_suspended;
 
     # checked screened post
@@ -184 +189 @@
     my $preformatted = $FORM{'replyto'} eq "" ? $props->{'opt_preformatted'} : $parpost->{'opt_preformatted'};
 
-    LJ::CleanHTML::clean_event(\$event, $preformatted);
+    my $suspend_msg = $entry && $entry->should_show_suspend_msg_to($remote) ? 1 : 0;
+    LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $preformatted,
+                                          'suspend_msg' => $suspend_msg,
+                                          'unsuspend_supportid' => $suspend_msg ? $entry->prop("unsuspend_supportid") : 0, });
     LJ::expand_embedded($u, $ditemid, $remote, \$event);
     BML::ebml(\$event);

trunk/htdocs/talkpost.bml.text

@@ -17 +17 @@
 
 .error.noreply_screened=This comment is screened and you have no permissions to see it or reply to it.
+
+.error.noreply_suspended=This entry is suspended.  You cannot reply to it.
 
 .label.picturetouse2=<a [[aopts]]>Picture</a> to use:

trunk/htdocs/talkpost_do.bml

@@ -193 +193 @@
         if $parent->{state} eq 'F';
 
+    # no replying to suspended entries, even by entry poster
+    my $entry = LJ::Entry->new($journalu, jitemid => $item->{jitemid});
+    return LJ::bad_input($ML{'/talkpost.bml.error.noreply_suspended'})
+        if $entry && $entry->is_suspended;
+
     ## insertion or editing
     my $wasscreened = ($parent->{state} eq 'S');

trunk/htdocs/talkread.bml

@@ -150 +150 @@
  # check for deleted/suspended/security
  unless ($viewsome) {
-     # check suspended
+     # check suspended user
      return "<?h1 $ML{'talk.error.suspended.title'} h1?><?p $ML{'talk.error.suspended'} p?>"
          if ($u->is_suspended || $up->is_suspended);
@@ -157 +157 @@
      return "<?h1 $ML{'talk.error.deleted.title'} h1?><?p $ML{'talk.error.deleted'} p?>"
          if ($u->is_deleted);
+
+     # check suspended entry
+     return "<?h1 $ML{'talk.error.suspended.title'} h1?><?p " . BML::ml('talk.error.suspendedentry', { aopts => "href='" . $u->journal_base . "/'" }) . " p?>"
+         if $entry && $entry->is_suspended_for($remote);
  }
 
@@ -211 +215 @@
  my $event = $item->{'event'};
 
- LJ::CleanHTML::clean_event(\$event, $props->{'opt_preformatted'});
+ my $suspend_msg = $entry && $entry->should_show_suspend_msg_to($remote) ? 1 : 0;
+ LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $props->{'opt_preformatted'},
+                                       'suspend_msg' => $suspend_msg,
+                                       'unsuspend_supportid' => $suspend_msg ? $entry->prop("unsuspend_supportid") : 0, });
  LJ::expand_embedded($u, $ditemid, $remote, \$event);
  BML::ebml(\$event);

trunk/htdocs/view/index.bml

@@ -172 +172 @@
  {
      my ($itemid, $anum, $day, $eventtime, $posterid, $replycount, $security, $allowmask) = @$it;
+
+     my $entry = LJ::Entry->new($u, jitemid => $itemid);
      next if $u{$posterid}->is_suspended && !$viewsome;
+     next if $entry && $entry->is_suspended_for($remote);
 
      my $subject = $lt->{$itemid}->[0];