[interchange-cvs] interchange - racke modified lib/Vend/Order.pm

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Fri May 23 10:00:01 2003


User:      racke
Date:      2003-05-23 13:59:29 GMT
Modified:  lib/Vend Order.pm
Log:
use log_file_violation

Revision  Changes    Path
2.56      +4 -17     interchange/lib/Vend/Order.pm


rev 2.56, prev_rev 2.55
Index: Order.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Order.pm,v
retrieving revision 2.55
retrieving revision 2.56
diff -u -r2.55 -r2.56
--- Order.pm	23 Apr 2003 16:01:02 -0000	2.55
+++ Order.pm	23 May 2003 13:59:29 -0000	2.56
@@ -1,6 +1,6 @@
 # Vend::Order - Interchange order routing routines
 #
-# $Id: Order.pm,v 2.55 2003/04/23 16:01:02 mheins Exp $
+# $Id: Order.pm,v 2.56 2003/05/23 13:59:29 racke Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -28,7 +28,7 @@
 package Vend::Order;
 require Exporter;
 
-$VERSION = substr(q$Revision: 2.55 $, 10);
+$VERSION = substr(q$Revision: 2.56 $, 10);
 
 @ISA = qw(Exporter);
 
@@ -798,14 +798,7 @@
 # LEGACY
 	if ($::Values->{mv_order_report}) {
 		unless( allowed_file($::Values->{mv_order_report}) ) {
-			my $msg = $Vend::File::errstr
-					|| errmsg(
-							"%s: Can't use file '%s' with NoAbsolute set",
-							'mail_order',
-							 $::Values->{mv_order_report},
-						);
-			::logError($msg);
-			::logGlobal({ level => 'auth'}, $msg);
+			log_file_violation ($::Values->{mv_order_report}, 'mail_order');
 			return undef;
 		}
 		$body = readin($::Values->{mv_order_report})
@@ -825,13 +818,7 @@
 				$::Values->{mv_order_report},
 			);
 		unless( allowed_file($Vend::Cfg->{OrderReport}) ) {
-			my $msg = errmsg(
-							"%s: Can't use file '%s' with NoAbsolute set",
-							'mail_order',
-							$Vend::Cfg->{OrderReport},
-						);
-			::logError($msg);
-			::logGlobal({ level => 'auth'}, $msg);
+			log_file_violation($Vend::Cfg->{OrderReport}, 'mail_order');
 			return undef;
 		}
 		$body = readin($Vend::Cfg->{OrderReport});