X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=d0909da2f1a5764cd9565fb9a3061fe45d7717fb;hp=eeb104be09924a43a85c44e9c2f58639b610125d;hb=c23c7da69d6fabcd20481ca42cfe551626bfbcc5;hpb=e1e02809bf973873ac6c2d77bc169c4b5b0b0a17

diff --git a/perlmail-accept b/perlmail-accept
index eeb104b..d0909da 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -10,7 +10,7 @@ use warnings;
 
 INIT {
 	require Sys::Syslog;
-	Sys::Syslog::openlog("lacemail","pid","mail");
+	Sys::Syslog::openlog("perlmail","pid","mail");
 	my @syslogging_stack;
 	sub syslogging_on_save
 	{
@@ -27,6 +27,8 @@ INIT {
 	}
 
 
+use PerlMail::Config;
+
 use Mail::Audit qw(MAPS);
 require IO::Handle;
 use Carp qw(cluck confess);
@@ -49,16 +51,6 @@ use URI::Escape 'uri_escape';
 require WWW::SMS;
 
 
-my $HOME="/home/lace";
-my $Mail="$HOME/Mail";
-my @ValidUsers=qw(root lace short kratochvil _local);
-my $IdleMax=10;
-my $MaxBodySMS=0x1000;	# max bytes to pass to Lingua::EN::Squeeze
-my $SMSmailError='short+err@ucw.cz';
-my @SMSwebRcpt=qw(420 602 431329);
-my $SMSwebRcpt_username="lace2";
-my $SMScontact='<short@ucw.cz>';
-
 our($Message,$Audit,@AuditStored,$store_ignore,$store_ignorenewmail,$store_profile,$DoBell);
 our(%audit_profile,@sms_squeezes,@alternates_host,@dnsbl_whitelist);	# imported
 my %alternates_host;	# from @alternates_host
@@ -100,7 +92,7 @@ sub stdin
 	exit 0;
 }
 
-# FIXME: separate 'lacemail'-transfer together with lacemail-submit away
+# FIXME: separate 'perlmail'-transfer together with perlmail-submit away
 sub inetd
 {
 	die "Excessive arguments" if @ARGV;
@@ -255,7 +247,7 @@ my($ignorenewmail,$smscount,%args)=@_;
 	return map({
 			my $l=160;
 			if (!$ignorenewmail) {	# send by mail
-				$l-=length("Z emailu $SMSmailError: ");
+				$l-=length("Z emailu FIXME SMSmailError: ");
 				$l-=length(smsbuild($_,$smscount));
 				}
 			else {	# send by web
@@ -458,7 +450,7 @@ my($message)=@_;
 	local $Audit=Mail::Audit->new(
 			"emergency"=>"$Mail/emergency",
 			"data"=>[map("$_\n",split("\n",$message))],
-			"log"=>"$HOME/.lacemail.log",
+			"log"=>"$HOME/.perlmail.log",
 			"loglevel"=>99,
 			);
 	local @AuditStored=();
@@ -481,7 +473,7 @@ sub razor2
 	open CHILD,'|'
 					.'('.'(razor-check 2>&1;echo >&3 $?)'
 							.'|sed "s/^/razor-check: /"'
-							.'|logger -t "lacemail['.$$.']" -p mail.crit'
+							.'|logger -t "perlmail['.$$.']" -p mail.crit'
 							.') 3>&1'
 					.'|exit `cat`'
 			or return 0;
@@ -624,7 +616,7 @@ sub muttrc_aliases
 }
 
 # FIXME: Unify
-# BEGIN lacemail-sendmail
+# BEGIN perlmail-sendmail
 # return: Mail::Address instance or undef()
 sub parseone
 {
@@ -635,7 +627,7 @@ my($line)=@_;
 	warn "Got ".scalar(@r)." addresses while wanting just one; when parsing: $line" if 1!=@r;
 	return $r[0];
 }
-# END lacemail-sendmail
+# END perlmail-sendmail
 
 # FIXME: host may get multiple recipients and thus not showing "for <...>"
 # FIXME: muttrc_get("from") is too strict
@@ -729,7 +721,7 @@ my($header,$map)=@_;
 		$text=~s/\b\Q$from\E\b/$to/gsi;
 		}
 	return if $text eq $orig;
-	$Audit->put_header("X-LaceMail-header_remap-$header",$orig);
+	$Audit->put_header("X-PerlMail-header_remap-$header",$orig);
 	$Audit->replace_header($header,$text);
 }