![[site community profile]](https://www.dreamwidth.org/img/comm_staff.png){kind=small}
[dw-free] Pass sitename to various translation strings
[commit: http://hg.dwscoalition.org/dw-free/rev/a9afa68cf9e4]
http://bugs.dwscoalition.org/show_bug.cgi?id=777
Whitespace cleanup.
Patch by![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
kareila.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=777
Whitespace cleanup.
Patch by
kareila.Files modified:
- cgi-bin/LJ/Talk.pm
- htdocs/accountstatus.bml
- htdocs/talkpost.bml.text
--------------------------------------------------------------------------------
diff -r 814226d457d2 -r a9afa68cf9e4 cgi-bin/LJ/Talk.pm
--- a/cgi-bin/LJ/Talk.pm Mon Aug 22 17:57:37 2011 +0800
+++ b/cgi-bin/LJ/Talk.pm Mon Aug 22 18:02:14 2011 +0800
@@ -941,7 +941,7 @@
sub load_comments
{
my ($u, $remote, $nodetype, $nodeid, $opts) = @_;
-
+
my $n = $u->{'clusterid'};
my $viewall = $opts->{viewall};
@@ -1082,7 +1082,7 @@
# and deeper until we've hit the page size. if too many loaded,
# just mark that we'll load the subjects;
my @check_for_children = @posts_to_load;
-
+
## expand first reply to top-level comments
## %expand_children - list of comments, children of which are to expand
my %expand_children = map { $_ => 1 } @top_replies;
@@ -1094,7 +1094,7 @@
if (@posts_to_load < $page_size || $expand_children{$cfc} || $opts->{expand_all}) {
push @posts_to_load, $child;
## expand only the first child, then clear the flag
- delete $expand_children{$cfc};
+ delete $expand_children{$cfc};
}
elsif (@posts_to_load < $page_size) {
push @posts_to_load, $child;
@@ -1541,7 +1541,7 @@
}
$ret .= "</td></tr>\n";
}
-
+
# URL: [ ] Verify? [ ]
my $url_def = defined $oid_identity ? $form->{'oidurl'} || $oid_identity : "";
@@ -2642,12 +2642,12 @@
$paru->is_visible &&
$is_diff_user &&
$paru->{'status'} eq "A" &&
- !$paru->gets_notified(journal => $journalu, arg1 => $ditemid, arg2 => $comment->{talkid})
+ !$paru->gets_notified(journal => $journalu, arg1 => $ditemid, arg2 => $comment->{talkid})
# it is possible to register a hook which will intercept this entire conditional block
# and do its own logic... if that's the case and the hook returns true, then we'll
# skip creating the email notification
- && ! LJ::Hooks::run_hook("talklib_email_parent_comment_poster",
+ && ! LJ::Hooks::run_hook("talklib_email_parent_comment_poster",
user => $paru, journal => $journalu, talkid => $comment->{talkid}
)
)
@@ -3226,7 +3226,7 @@
my $cookie_auth;
# either we are posting from the comment email notification form
# or we are posting from talkpost, as currently logged-in user
- if ( ( $form->{usertype} eq "user" && exists $form->{ecphash} ) ||
+ if ( ( $form->{usertype} eq "user" && exists $form->{ecphash} ) ||
($form->{'usertype'} eq "cookieuser")) {
my $userpost = $form->{'userpost'} || $form->{'cookieuser'};
$mlerr->("$SC.error.lostcookie")
@@ -3455,7 +3455,7 @@
}
if (($form->{'usertype'} ne "user" && $form->{'usertype'} ne 'openid' && $form->{'usertype'} ne 'openid_cookie')
- && $journalu->{'opt_whocanreply'} ne "all")
+ && $journalu->{'opt_whocanreply'} ne "all")
{
$mlerr->("$SC.error.noanon");
}
@@ -3603,9 +3603,9 @@
## anonymous commenter user =
## not logged-in user, or OpenID without validated e-mail
- my $anon_commenter = !LJ::isu($commenter) ||
+ my $anon_commenter = !LJ::isu($commenter) ||
($commenter->identity && !$commenter->is_validated);
-
+
##
## 1. Check rate by remote user and by IP (for anonymous user)
##
@@ -3648,7 +3648,7 @@
## all
return 1;
}
-
+
##
## 4. Global (site) settings
## See if they have any tags or URLs in the comment's body
@@ -3987,7 +3987,7 @@
return 0 if $remote && ( $remote->is_suspended || $remote->is_deleted );
# allow some users to be very aggressive commenters and authors. i.e. our bots.
- return 1 if $remote
+ return 1 if $remote
and grep { $remote->username eq $_ } @LJ::NO_RATE_CHECK_USERS;
diff -r 814226d457d2 -r a9afa68cf9e4 htdocs/accountstatus.bml
--- a/htdocs/accountstatus.bml Mon Aug 22 17:57:37 2011 +0800
+++ b/htdocs/accountstatus.bml Mon Aug 22 18:02:14 2011 +0800
@@ -78,14 +78,14 @@
my $date = sprintf("%02d:%02d %02d/%02d/%04d", @date[2,1], $date[3], $date[4]+1, $date[5]+1900);
if ( $statusvis eq 'D' ) {
-
+
$res = $u->set_deleted;
$u->set_prop( delete_reason => $POST{'reason'} ? $POST{'reason'} : "" );
-
+
if($res) {
# sending ESN status was changed
- LJ::Event::SecurityAttributeChanged->new($u, {
+ LJ::Event::SecurityAttributeChanged->new($u, {
action => 'account_deleted',
ip => BML::get_remote_ip(),
datetime => $date,
@@ -104,13 +104,13 @@
R => 'set_renamed',
}->{$new_status};
return $dberr->("Can't set status '$new_status'") unless $method;
-
+
$res = $u->$method;
$u->set_prop( delete_reason => "" );
-
+
if($res) {
- LJ::Event::SecurityAttributeChanged->new($u , {
+ LJ::Event::SecurityAttributeChanged->new($u , {
action => 'account_activated',
ip => BML::get_remote_ip(),
datetime => $date,
@@ -194,10 +194,10 @@
map { $_, $statusvis{$_} }
reverse sort keys %statusvis) . "<br /><br />\n";
- $ret .= "$ML{'.reason.head'} " . LJ::html_text({
- name => 'reason',
- id => 'reason',
- class => 'text',
+ $ret .= "$ML{'.reason.head'} " . LJ::html_text({
+ name => 'reason',
+ id => 'reason',
+ class => 'text',
value => $u->prop( 'delete_reason' ),
size => 50,
maxlength => 255,
diff -r 814226d457d2 -r a9afa68cf9e4 htdocs/talkpost.bml.text
--- a/htdocs/talkpost.bml.text Mon Aug 22 17:57:37 2011 +0800
+++ b/htdocs/talkpost.bml.text Mon Aug 22 18:02:14 2011 +0800
@@ -63,7 +63,7 @@
.opt.noanonpost.nonpublic=You can't comment anonymously on a protected entry.
-.opt.noautoformat=Don't auto-format:
+.opt.noautoformat=Don't auto-format:
.opt.noimage=No Image
--------------------------------------------------------------------------------