[interchange-cvs] interchange - heins modified 4 files

[interchange-core@icdevgroup.org]

User:      heins
Date:      2003-04-02 18:59:47 GMT
Modified:  code/UI_Tag assume_identity.tag file_navigator.coretag
Modified:           unlink_file.coretag write_relative_file.coretag
Log:
* Various changes to account for Vend::File

Revision  Changes    Path
1.2       +1 -1      interchange/code/UI_Tag/assume_identity.tag


rev 1.2, prev_rev 1.1
Index: assume_identity.tag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/assume_identity.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- assume_identity.tag	14 Jan 2003 00:06:32 -0000	1.1
+++ assume_identity.tag	2 Apr 2003 18:59:47 -0000	1.2
@@ -16,7 +16,7 @@
 	$Global::Variable->{MV_PAGE} = $pn;
 	$locale = 1 unless defined $locale;
 	return Vend::Interpolate::interpolate_html(
-		Vend::Util::readfile($file, $Global::NoAbsolute, $locale)
+		Vend::Util::readfile($file, undef, $locale)
 	);
 }
 EOR



1.10      +2 -7      interchange/code/UI_Tag/file_navigator.coretag


rev 1.10, prev_rev 1.9
Index: file_navigator.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/file_navigator.coretag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- file_navigator.coretag	20 Feb 2003 10:12:52 -0000	1.9
+++ file_navigator.coretag	2 Apr 2003 18:59:47 -0000	1.10
@@ -43,12 +43,7 @@
 
 	if($action eq 'chdir') {
 		my $newdir = $CGI::values{dir} || '.';
-		if(
-			Vend::Util::file_name_is_absolute($newdir)
-				or
-			$newdir =~ m{^\.\.|\.\./}
-			)
-		{
+		unless( Vend::File::allowed_file($newdir) ) {
 			$Scratch->{ui_error} = ::errmsg('Security violation');
 			return interpolate_html("[bounce page='$base_admin/error']");
 		}
@@ -302,7 +297,7 @@
 		  or $nd = $opt->{top_of_tree};
 		my $msg = errmsg(
 					"<large><b>..</b></large> &#91;%s&#93",
-					$opt->{parent_directory_message} || 'parent directory',
+					$opt->{parent_directory_nessage} || 'parent directory',
 					);
 		unshift @dir, [ $nd, $msg, $dtmpl ];
 	}



1.2       +1 -2      interchange/code/UI_Tag/unlink_file.coretag


rev 1.2, prev_rev 1.1
Index: unlink_file.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/unlink_file.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unlink_file.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ unlink_file.coretag	2 Apr 2003 18:59:47 -0000	1.2
@@ -5,8 +5,7 @@
 	my ($file, $prefix) = @_;
 #::logDebug("got to unlink: file=$file prefix=$prefix");
 	$prefix = 'tmp/' unless $prefix;
-	return if Vend::Util::file_name_is_absolute($file);
-	return if $file =~ /\.\./;
+	return if Vend::File::absolute_or_relative($file);
 	return unless $file =~ /^$prefix/;
 #::logDebug("got to unlink: $file qualifies");
 	unlink $file;



1.3       +1 -2      interchange/code/UI_Tag/write_relative_file.coretag


rev 1.3, prev_rev 1.2
Index: write_relative_file.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/write_relative_file.coretag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- write_relative_file.coretag	30 Oct 2002 20:43:05 -0000	1.2
+++ write_relative_file.coretag	2 Apr 2003 18:59:47 -0000	1.3
@@ -18,8 +18,7 @@
 	my ($file, $data) = @_;
 #::logDebug("writing $file");
 	$file =~ m:(.*)/:;
-	return undef if Vend::Util::file_name_is_absolute($file);
-	return undef if $file =~ /\.\./;
+	return undef if Vend::File::absolute_or_relative($file);
 	my $dir = $1;
 	use File::Path;
 	if($dir and ! -d $dir) {