thh/huhu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix indenting.

Browse source 
Signed-off-by: Thomas Hochstein <thh@thh.name>
This commit is contained in:
Thomas Hochstein 2026-02-01 00:40:30 +01:00
parent 4ce8017756
commit dd034b71b4
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MOD/DBIUtils.pm
View file

@ -101,7 +101,7 @@ sub enter_table($$$$)
{ {
if ($values[$i]) if ($values[$i])
{ {
$msg .= "\n*** " . $columns[$i] . "***\n" . $values[$i]; $msg .= "\n*** " . $columns[$i] . "***\n" . $values[$i];
} }
} }
$self->increase_errorlevel($article_id, $msg); $self->increase_errorlevel($article_id, $msg);

37
bin/poster.pl
View file

@ -129,7 +129,7 @@ while (my $ref = $dataref->fetchrow_arrayref)
my ($id,$posting) = @{$ref}; my ($id,$posting) = @{$ref};
next unless($dbi->set_status($id, 'sending', [ 'moderated' ])); next unless($dbi->set_status($id, 'sending', [ 'moderated' ]));
# Posting einlesen. # Posting einlesen.
my $article = News::Article->new(\$posting); my $article = News::Article->new(\$posting);
next if (!defined($article->header('Newsgroups'))); next if (!defined($article->header('Newsgroups')));
@ -189,23 +189,24 @@ while (my $ref = $dataref->fetchrow_arrayref)
'X-Zedat-Hint', # FU Berlin (moderators.dana.de) 'X-Zedat-Hint', # FU Berlin (moderators.dana.de)
); );
#albasani-workaround fuer @invalid # albasani-workaround fuer @invalid
if ($article->header('From') =~ /\@invalid[> ]/i) { if ($article->header('From') =~ /\@invalid[> ]/i) {
my $newfrom = $article->header('From'); my $newfrom = $article->header('From');
$newfrom =~ s/\@invalid/\@invalid.invalid/i; $newfrom =~ s/\@invalid/\@invalid.invalid/i;
$article->set_headers('From',$newfrom); $article->set_headers('From',$newfrom);
} }
# albasani-workaround fuer leere User-Agent headerzeilen # albasani-workaround fuer leere User-Agent headerzeilen
if (defined $article->header('User-Agent') and $article->header('User-Agent') !~ /\w/) { if (defined $article->header('User-Agent') and $article->header('User-Agent') !~ /\w/) {
$article->drop_headers(('User-Agent')); $article->drop_headers(('User-Agent'));
} }
#Neue Message-ID und Approved-Header erzeugen
my $mid = defined($article->header('Message-ID')) ? $article->header('Message-ID') :
'<' . substr (rand() . '-' . time(), 2) . '@' . $config{'mid_fqdn'} . '>';
$article->set_headers('Message-ID', $mid, 'Approved', $approve_string);
#signieren #Neue Message-ID und Approved-Header erzeugen
my $mid = defined($article->header('Message-ID')) ? $article->header('Message-ID') :
'<' . substr (rand() . '-' . time(), 2) . '@' . $config{'mid_fqdn'} . '>';
$article->set_headers('Message-ID', $mid, 'Approved', $approve_string);
#signieren
if ($sign_pgpmoose) if ($sign_pgpmoose)
{ {
my @msg = $article->sign_pgpmoose($moderated_group, $pgp_passphrase, $pgp_keyid); my @msg = $article->sign_pgpmoose($moderated_group, $pgp_passphrase, $pgp_keyid);
@ -217,16 +218,16 @@ while (my $ref = $dataref->fetchrow_arrayref)
my @articleheaders = $article->header('References'); my @articleheaders = $article->header('References');
eval { eval {
# Workaround fuer Buggy Software, die kaputte References erzeugt # Workaround fuer Buggy Software, die kaputte References erzeugt
my @references = $article->header('References'); my @references = $article->header('References');
if (@references > 1) { if (@references > 1) {
$article->set_headers('References', join "\n ", @references); $article->set_headers('References', join "\n ", @references);
} }
#posten #posten
$article->post($nntp) or die $!; $article->post($nntp) or die $!;
#posted-Bit setzen, aktuelle MID in DB eintragen (wird in Zukunft vielleicht mal von einer Zusatzfunktion benoetigt) #posted-Bit setzen, aktuelle MID in DB eintragen (wird in Zukunft vielleicht mal von einer Zusatzfunktion benoetigt)
$dbi->set_posted_status($id,$mid); $dbi->set_posted_status($id,$mid);
}; };
# Fehler in Datenbank festhalten, sofern einer aufgetreten ist # Fehler in Datenbank festhalten, sofern einer aufgetreten ist
if ($@) { if ($@) {
$dbi->increase_errorlevel($id, $@); $dbi->increase_errorlevel($id, $@);