[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.348,1.349

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

Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv26470/bin

Modified Files:
	sandweb.cgi 
Log Message:
committing my new images, and merging the patch from 
Claus Henrikson <lin...@ya...> that adds ViewCVS integration.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.348
retrieving revision 1.349
diff -U2 -r1.348 -r1.349
--- sandweb.cgi	22 Apr 2003 17:11:59 -0000	1.348
+++ sandweb.cgi	22 Apr 2003 17:40:20 -0000	1.349
@@ -74,4 +74,7 @@
 my $config_dir = '../etc';
 
+# for viewcvs support in browser
+my $viewcvs='http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/sandweb/';
+
 # internal global vars
 my $message = '';
@@ -237,6 +240,4 @@
 		my $previous_url = $cgi->param('previous_url') || '';
 		my $main_window_url = $cgi->param('main_window_url') || '';
-		# whether or not this is a submenu
-		my $submenu = $cgi->param('submenu') || '';
 
 		$log->debug("action: $action - submit: $submit");
@@ -325,5 +326,5 @@
 					my $create_tag = $cgi->param('create_tag') || '';
 					my $remove_tag = $cgi->param('remove_tag') || '';
-					if ($submenu) {
+					if ($submit) {
 						tag_commit(
 							ck_auth => $ck_auth,
@@ -872,4 +873,5 @@
 		'bindir' => $bindir,
 		'log_obj' => $log,
+    'sandbox' => "$users_dir/$username/$repo_name/$module_name",
 	);
 
@@ -951,4 +953,8 @@
 		LOCATION_LOOP => \@loop_data,
 	);
+  
+  $log->debug("current_location: ".$current_location{'location'});
+  my %localstatus = $repository->status(file => ".", recurse => "false" );
+  my @localstatusoutput=$localstatus{output};
 
 	my %browser = $browse->get_browser(
@@ -958,4 +964,6 @@
 		'repo_name' => $repo_name,
 		'sort' => $sort,
+    'viewcvs' => $viewcvs,
+    'localstatus' => \@localstatusoutput,
 	);
 
@@ -1887,14 +1895,13 @@
 	my %args = @_;
 
-	my $ck_auth = $args{'ck_auth'} || '';
-	my $location = $args{'location'} || '';
-	my $module_name = $args{'module_name'} || '';
-	my $repo_name = $args{'repo_name'} || '';
-	my $repo_password = $args{'repo_password'} || '';
-	my $vcs_command = $args{'vcs_command'} || '';
-	my $vcs_message = $args{'message'} || '';
-	my $params = $args{'params'} || '';
+	my $ck_auth = $args{'ck_auth'};
+	my $location = $args{'location'};
+	my $module_name = $args{'module_name'};
+	my $repo_name = $args{'repo_name'};
+	my $repo_password = $args{'repo_password'};
+	my $vcs_command = $args{'vcs_command'};
+	my $vcs_message = $args{'message'};
+	my $params = $args{'params'};
 	my $main_window_url = $args{'main_window_url'} || '';
-	my $submenu = $args{'submenu'} || '';
 	my @filename_loop = ();
 	my $count = 0;
@@ -1977,5 +1984,4 @@
 		MAIN_WINDOW_URL => $main_window_url,
 		IMAGE_DIR => $image_dir,
-		SUBMENU => $submenu,
 	);
 	print $cgi->header( -cookie => $ck_auth );
@@ -2521,5 +2527,5 @@
 # vcs_commit
 #
-# all VCS actions are caught by this subroutine, and dealt
+# all browse VCS actions are caught by this subroutine, and dealt
 # with by calling the appropriate Repository method.
 #
@@ -3220,5 +3226,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 	if ($tag_switch) {
@@ -3239,5 +3244,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 	if ($trunk_sync) {
@@ -3257,5 +3261,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 	if ($trunk_switch) {
@@ -3276,5 +3279,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 
@@ -3295,5 +3297,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 	if ($remove_tag) {
@@ -3314,5 +3315,4 @@
 			main_window_url => $main_window_url,
 		);
-		exit;
 	}
 
@@ -3637,5 +3637,5 @@
 		$log->debug("ERROR: $msg");
 		$log->error("$msg");
-		set_message("Unable to write config file for $username.");
+		set_message("Unable to write config file for $username in directory named ".$config->{'paths'}->{'users_dir'} . "/$username". $msg);
 		return 0;
 	}