[interchange-cvs] interchange - heins modified 3 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Thu Aug 1 23:43:00 2002


User:      heins
Date:      2002-08-02 03:42:24 GMT
Modified:  code/UI_Tag backup_file.coretag
Modified:  code/UserTag get_url.tag history_scan.tag
Log:
* Prevent File::Copy runtime include of File::Basename from causing safe
  problems.

* Prevent get_url runtime include of LWP, so can use in $Tag.

* Add var_exclude option to history_scan, so that certain variables
  can be expunged from the form values. Used to rewrite toggle/collapse/exp=
and
  parameters for trees.

Revision  Changes    Path
1.2       +3 -2      interchange/code/UI_Tag/backup_file.coretag


rev 1.2, prev_rev 1.1
Index: backup_file.coretag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/code/UI_Tag/backup_file.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- backup_file.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ backup_file.coretag	2 Aug 2002 03:42:24 -0000	1.2
@@ -1,10 +1,11 @@
 UserTag backup-file Order file
 UserTag backup-file AddAttr
 UserTag backup-file Routine <<EOR
+require File::Copy;
+require File::Path;
+require File::Basename;
 sub {
 	my ($file, $opt) =3D @_;
-	require File::Copy;
-	require File::Path;
 	my $bu_file =3D "backup/$file";
 	$bu_file =3D~ s://+:/:g ;
 	$bu_file =3D~ m:(.*)/: ;



1.2       +1 -7      interchange/code/UserTag/get_url.tag


rev 1.2, prev_rev 1.1
Index: get_url.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/code/UserTag/get_url.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get_url.tag	29 Jan 2002 05:52:42 -0000	1.1
+++ get_url.tag	2 Aug 2002 03:42:24 -0000	1.2
@@ -11,15 +11,9 @@
 EOD
=20
 UserTag get-url Routine <<EOR
+require LWP::Simple;
 sub {
 	my ($url, $opt) =3D @_;
-	eval {
-		require LWP::Simple;
-	};
-	if($@) {
-		::logError("Cannot use get-url tag, no LWP modules installed.");
-		return undef;
-	}
 	my $html =3D LWP::Simple::get($url);
 	if($opt->{strip}) {
 		$html =3D~ s/.*<body[^>]*>//si;



1.5       +5 -0      interchange/code/UserTag/history_scan.tag


rev 1.5, prev_rev 1.4
Index: history_scan.tag
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/code/UserTag/history_scan.tag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- history_scan.tag	15 Jul 2002 19:08:06 -0000	1.4
+++ history_scan.tag	2 Aug 2002 03:42:24 -0000	1.5
@@ -26,6 +26,11 @@
 	}
 	return $Tag->area($default) if ! $href;
 	my $form =3D '';
+	if($opt->{var_exclude}) {
+		for(split /[\s,\0]+/, $opt->{var_exclude}) {
+			$var_exclude{$_} =3D 1;
+		}
+	}
 	for(grep !$var_exclude{$_}, keys %$cgi) {
 		$form .=3D "\n$_=3D";
 		$form .=3D join("\n$_=3D", split /\0/, $cgi->{$_});