# It can be redistributed and/or modified under the same terms under
# which Perl itself is published.
-my $Version = "0.6";
+my $Version = "0.6.2";
my $NNTPServer = "localhost";
my $NNTPUser = "";
use strict;
use Net::NNTP;
+use Net::Domain qw(hostfqdn);
use Date::Calc qw(Add_Delta_YM Add_Delta_Days Delta_Days Today);
use Fcntl ':flock'; # import LOCK_* constants
use Getopt::Std;
my ($TDY, $TDM, $TDD) = Today(); #TD: Today's date
my %Options;
-getopts('hvpdt:f:', \%Options);
+getopts('Vhvpdt:f:', \%Options);
+if ($Options{'V'}) {
+ print "$0 v $Version\nCopyright (c) 2003 Marc Brockschmidt <marc\@marcbrockschmidt.de>\nCopyright (c) 2010 Thomas Hochstein <thh\@inter.net>\n";
+ print "This program is free software; you may redistribute it and/or modify it under the same terms as Perl itself.\n";
+ exit(0);
+}
if ($Options{'h'}) {
- print "$0 v $Version\nUsage: $0 [-hvpd] [-t <newsgroups>] [-f <faq>]\n";
+ exec ('perldoc', $0);
exit(0);
};
my ($Faq) = $Options{'f'} if ($Options{'f'});
my ($File, $Config, $Faq) = @_;
my ($LastEntry, $Error, $i) = ('','',0);
- if($Options{'v'}) {
- print "Reading configuration.\n";
- }
+ print "Reading configuration.\n" if($Options{'v'});
open FH, "<$$File" or die "$0: E: Can't open $$File: $!";
while (<FH>) {
#Check saved values:
for $i (0..$i){
next if (defined($$Faq) && defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} ne $$Faq );
- unless($$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) {
- $Error .= "E: The From-header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n"
+ unless(defined($$Config[$i]{'name'}) && $$Config[$i]{'name'} =~ /^\S+$/) {
+ $Error .= "E: The name of your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n"
+ }
+ unless(defined($$Config[$i]{'file'}) && -f $$Config[$i]{'file'}) {
+ $Error .= "E: The file to post for your project \"$$Config[$i]{'name'}\" is not defined or does not exist.\n"
+ }
+ unless(defined($$Config[$i]{'from'}) && $$Config[$i]{'from'} =~ /\S+\@(\S+\.)?\S{2,}\.\S{2,}/) {
+ $Error .= "E: The From header for your project \"$$Config[$i]{'name'}\" seems to be incorrect.\n"
}
- unless($$Config[$i]{'ngs'} =~ /^\S+$/) {
- $Error .= "E: The Newsgroups-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n"
+ unless(defined($$Config[$i]{'ngs'}) && $$Config[$i]{'ngs'} =~ /^\S+$/) {
+ $Error .= "E: The Newsgroups header for your project \"$$Config[$i]{'name'}\" is not defined or contains whitespaces.\n"
+ }
+ unless(defined($$Config[$i]{'subject'})) {
+ $Error .= "E: The Subject header for your project \"$$Config[$i]{'name'}\" is not defined.\n"
}
unless(!$$Config[$i]{'fup2'} || $$Config[$i]{'fup2'} =~ /^\S+$/) {
- $Error .= "E: The Followup-To-header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n"
+ $Error .= "E: The Followup-To header for your project \"$$Config[$i]{'name'}\" contains whitespaces.\n"
}
- unless($$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) {
+ unless(defined($$Config[$i]{'posting-frequency'}) && $$Config[$i]{'posting-frequency'} =~ /^\s*\d+\s*[dwmy]\s*$/) {
$Error .= "E: The Posting-frequency for your project \"$$Config[$i]{'name'}\" is invalid.\n"
}
- unless($$Config[$i]{'expires'} =~ /^\s*\d+\s*[dwmy]\s*$/) {
- $$Config[$i]{'expires'} = '3m'; # set default: 3 month
+ unless(!$$Config[$i]{'expires'} || $$Config[$i]{'expires'} =~ /^\s*\d+\s*[dwmy]\s*$/) {
warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" is invalid - set to 3 month.\n";
}
- $Error .= "-" x 25 . "\n" if $Error;
+ unless(defined($$Config[$i]{'mid-format'}) && $$Config[$i]{'mid-format'} =~ /^<\S+\@\S{2,}\.\S{2,}>$/) {
+ warn "$0: W: The Expires for your project \"$$Config[$i]{'name'}\" seems to be invalid - set to default.\n";
+ }
}
+ $Error .= "-" x 25 . 'program terminated' . "-" x 25 . "\n" if $Error;
die $Error if $Error;
}
my ($ActName,$File,$From,$Subject,$NG,$Fup2,$MIDF,$ExtraHeaders,$Sender,$TDY,$TDM,$TDD,$ReplyTo,$Supersedes,$Expire) = @_;
my (@Header,@Body,$MID,$InRealBody,$LastModified);
- if($Options{'v'}) {
- print "$$ActName: Preparing to post.\n";
- }
+ print "$$ActName: Preparing to post.\n" if($Options{'v'});
#Prepare MID:
$$TDM = ($$TDM < 10 && $$TDM !~ /^0/) ? "0" . $$TDM : $$TDM;
$$TDD = ($$TDD < 10 && $$TDD !~ /^0/) ? "0" . $$TDD : $$TDD;
$MID = $$MIDF;
+ $MID = '<%n-%d.%m.%y@'.hostfqdn.'>' if !defined($MID);
$MID =~ s/\%n/$$ActName/g;
$MID =~ s/\%d/$$TDD/g;
$MID =~ s/\%m/$$TDM/g;
my $wday = ("Sun","Mon","Tue","Wed","Thu","Fri","Sat")[$time[6]];
my $year = (1900 + $time[5]);
my $tz = $time[8] ? " +0200" : " +0100";
-
+
+ $$Expire = '3m' if !$$Expire; # set default if unset: 3 month
+
my ($expY,$expM,$expD) = calcdelta ($year,$month,$day,$$Expire);
my $expmonthN = ("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec")[$expM-1];
my @Article = ($UsePGP)?@{signpgp(\@Header, \@Body)}:(@Header, "\n", @Body);
- if($Options{'v'}) {
- print "$$ActName: Posting article ...\n";
- }
+ print "$$ActName: Posting article ...\n" if($Options{'v'});
post(\@Article);
- if($Options{'v'}) {
- print "$$ActName: Save status information.\n";
- }
+ # Test mode?
+ return if($Options{'t'});
+
+ print "$$ActName: Save status information.\n" if($Options{'v'});
open (FH, ">$$File.cfg") or die "$0: E: Can't open $$File.cfg: $!";
print FH "##;; Lastpost: $day.$month.$year\n";
my $NewsConnection = Net::NNTP->new($NNTPServer, Reader => 1)
or die "$0: E: Can't connect to news server '$NNTPServer'!\n";
- $NewsConnection->authinfo ($NNTPUser, $NNTPPass);
+ $NewsConnection->authinfo ($NNTPUser, $NNTPPass) if (defined($NNTPUser));
$NewsConnection->post();
$NewsConnection->datasend (@$ArticleR);
$NewsConnection->dataend();
=over 3
+=item B<-V> (version)
+
+Print out version and copyright information on B<yapfaq> and exit.
+
=item B<-h> (help)
-Print out version and usage information on B<yapfaq> and exit.
+Print this man page and exit.
=item B<-v> (verbose)
projects / usenet / yapfaq.git / blobdiff