[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.59,1.60

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

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

Modified Files:
	sandweb.cgi 
Log Message:

browse now gets it's repo_type and vcs_commands via sandweb.cgi, which
instantiates a Repository object using userprefs.



Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.59
retrieving revision 1.60
diff -U2 -r1.59 -r1.60
--- sandweb.cgi	2001/10/07 14:17:31	1.59
+++ sandweb.cgi	2001/10/17 04:27:29	1.60
@@ -90,14 +90,14 @@
 			}
 			else {
-				# User is logged in; get username
+				# User is logged in; load prefs
+				load_prefs(1);
 				my $username = $auth->get_userinfo('username');
 
-                		my $repository = $config->{'repository'}->{'name'};
-                		my $vcs_type = $config->{'repository'}->{'VCS'};
-                		my $root = $config->{'repository'}->{'root'};
-               			my $server = $config->{'repository'}->{'server'};
-                		my $sandbox = $config->{'paths'}->{'users_dir'} . "/$username";
+                		my $repo = $userprefs->{'repository'}->{'name'};
+                		my $repo_type = $userprefs->{'repository'}->{'VCS'};
+                		my $root = $userprefs->{'repository'}->{'root'};
+               			my $server = $userprefs->{'repository'}->{'server'};
+                		my $sandbox = $userprefs->{'paths'}->{'users_dir'} . "/$username";
 
-				# XXX - What does this mean? I dont get it.. -nkj
 				# instantiate all "action" objects
 				my $return = SandWeb::->actions( 
@@ -105,5 +105,5 @@
 					template_dir => $config->{'paths'}->{'template_dir'},
 					users_dir => $config->{'paths'}->{'users_dir'},
-					vcs_type => $vcs_type,
+					repo_type => $repo_type,
 					root => $root,
 					sandbox => $sandbox,
@@ -247,10 +247,12 @@
 
 	my $username = $auth->get_userinfo('username');
+	my @vcs_commands = $repository->get_vcs_commands();
+        my $repo_type = $repository->get_repo_type();
 
 	my $path = url_param('path') || '';
 
-	# create Browse object and show user's sandbox
+	# use the browse object to show user's sandbox
 
-	my $content = $browse->browse("$path", "$progname");
+	my $content = $browse->browse("$path", "$progname", "@vcs_commands", $repo_type);
 
 	print header( -cookie => $cookie );
@@ -406,9 +408,4 @@
         	login_menu();
     	}
-}
-
-# XXX - Why not just remove it? :) -nkj
-sub vcsaction {
-    exit 0;
 }