[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.113,1.114

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv14908

Modified Files:
	sandweb.cgi 
Log Message:
prefixed param/upload statements with CGI::, so we can tell CGI subroutines
from sandweb.cgi subroutines.


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.113
retrieving revision 1.114
diff -U2 -r1.113 -r1.114
--- sandweb.cgi	2002/01/18 19:25:08	1.113
+++ sandweb.cgi	2002/01/18 19:39:39	1.114
@@ -55,8 +55,8 @@
 
 sub main {
-	if (param('action') eq 'login') {
+	if (CGI::param('action') eq 'login') {
 		# attempting login
-		my $username = param('username');
-		my $password = param('password');
+		my $username = CGI::param('username');
+		my $password = CGI::param('password');
 		login(
 			username => $username,
@@ -86,5 +86,5 @@
 			#############################
 			#
-			unless (param('action')) {
+			unless (CGI::param('action')) {
 				# with cookie, default is main_menu
 				main_menu( cookie => $cookie );
@@ -103,14 +103,14 @@
 
 	        
-				if ( param('action') eq 'main_menu' ) {
+				if ( CGI::param('action') eq 'main_menu' ) {
 					# called main menu
 					main_menu( cookie => $cookie );
 				}
-				elsif ( param('action') eq 'debug_menu' ) {
+				elsif ( CGI::param('action') eq 'debug_menu' ) {
 					# called test menu
 					debug_menu( cookie => $cookie );
 				}
-				elsif ( param('action') eq 'preferences_menu' ) {
-					if (! param('Submit')) {
+				elsif ( CGI::param('action') eq 'preferences_menu' ) {
+					if (! CGI::param('Submit')) {
 						# call preferences menu
 						preferences_menu( cookie => $cookie );
@@ -121,31 +121,31 @@
 					}
 				}
-				elsif ( param('action') eq 'logout' ) {
+				elsif ( CGI::param('action') eq 'logout' ) {
 					# called logout
 			        	logout();
 				}
-				elsif ( param('action') eq 'browse_menu' ) {
+				elsif ( CGI::param('action') eq 'browse_menu' ) {
 					# called sandbox viewer
                     			browse_menu( 
 						cookie => $cookie,
-						path => param('path'),
+						path => CGI::param('path'),
 					);
 				}
-				elsif ( param('action') eq 'file' ) {
+				elsif ( CGI::param('action') eq 'file' ) {
 					# called file manipulator
 					my @filename = ();
-					@filename = param('filename'),
+					@filename = CGI::param('filename'),
                     			file( 
 						cookie => $cookie,
-						file_command => param('file_command'),
+						file_command => CGI::param('file_command'),
 						filename => \@filename,
-						location => param('location'),
+						location => CGI::param('location'),
 					);
 				}
-				elsif ( param('action') eq 'vcsaction' ) {
+				elsif ( CGI::param('action') eq 'vcsaction' ) {
 					# called VCS action
 					my @filename = ();
-					if ( param('filename') ) {
-						@filename = param('filename'),
+					if ( CGI::param('filename') ) {
+						@filename = CGI::param('filename'),
 					} 
 					else {
@@ -155,21 +155,21 @@
 					vcsaction(
 						cookie => $cookie,
-						vcs_command => param('vcs_command'),
-						location => param('location'),
+						vcs_command => CGI::param('vcs_command'),
+						location => CGI::param('location'),
 						filename => \@filename,
 					);
 				}
-				elsif ( param('action') eq 'vcs_prefs_menu' ) {
+				elsif ( CGI::param('action') eq 'vcs_prefs_menu' ) {
 					# called VCS preferences
 					vcs_prefs_menu(
 						cookie => $cookie,
-						filename => param('filename'),
-						command => param('command'),
-						location => param('location'),
+						filename => CGI::param('filename'),
+						command => CGI::param('command'),
+						location => CGI::param('location'),
 					);
 				}
 				else {
 					# called an invalid page
-					my $page = param('action');
+					my $page = CGI::param('action');
 					my $msg = "Invalid page - $page!";
                 			$log->error("$msg");
@@ -391,5 +391,5 @@
 	my $filename = "@filename";
 	$log->debug("filename(s) : $filename");
-	my $save = param('save');
+	my $save = CGI::param('save');
 	my $username = $auth->get_userinfo('username');
         my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -499,5 +499,5 @@
 		$log->debug("editing file : $filename");
 		if ($save) {
-	        	my $data = param('data'),
+	        	my $data = CGI::param('data'),
 			my $filename = $file->get_filename();
 			$log->debug("saving edited file : $filename");
@@ -611,5 +611,5 @@
 	}
 	elsif ( $file_command eq 'upload' ) {
-		my $filehandle = upload('filehandle');
+		my $filehandle = CGI::upload('filehandle');
 		if ( $filehandle) {
 			$filename =~ s/.*[\/\\](.*)/$1/;
@@ -697,5 +697,5 @@
 	}
 	my $location = $args{'location'};
-	my $message = param('message');
+	my $message = CGI::param('message');
 	my $username = $auth->get_userinfo('username');
         my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -953,5 +953,5 @@
 
 	foreach my $param (@personal_params) {
-		if ( param("$param") ) {
+		if ( CGI::param("$param") ) {
 			$userprefs->{'personal'}->{"$param"} = param("$param");
 		}
@@ -959,5 +959,5 @@
 
 	foreach my $param (@repository_params) {
-		if ( param("$param") ) {
+		if ( CGI::param("$param") ) {
 			$userprefs->{'repository'}->{"$param"} = param("$param");
 		}