[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.364,1.365

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

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

Modified Files:
	sandweb.cgi 
Log Message:
ViewCVS URLs can now be specified per-repository


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.364
retrieving revision 1.365
diff -U2 -r1.364 -r1.365
--- sandweb.cgi	19 Aug 2003 22:48:55 -0000	1.364
+++ sandweb.cgi	21 Aug 2003 02:19:58 -0000	1.365
@@ -74,7 +74,4 @@
 my $config_dir = '../etc';
 
-# FIXME needs to be implemented per-repo in repository_menu
-my $viewcvs='http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/sandweb/';
-
 # internal global vars
 my $message = '';
@@ -213,4 +210,8 @@
 			characters => "$unsafe_remember_repo_password",
 		);
+		my $unsafe_viewcvs_url = $cgi->param('viewcvs_url') || '';
+		my $viewcvs_url = $secure->shell(
+			characters => "$unsafe_viewcvs_url",
+		);
 		my $unsafe_repo_type = $cgi->param('repo_type') || '';
 		my $repo_type = $secure->shell(
@@ -623,4 +624,5 @@
 						repo_password => $repo_password,
 						remember_repo_password => $remember_repo_password,
+						viewcvs_url => $viewcvs_url,
 						repo_type => $repo_type,
 						repo_connection => $repo_connection,
@@ -637,4 +639,5 @@
 						repo_username => $repo_username,
 						remember_repo_password => $remember_repo_password,
+						viewcvs_url => $viewcvs_url,
 						repo_type => $repo_type,
 						repo_connection => $repo_connection,
@@ -904,4 +907,5 @@
 	my $repo_type = $user->get_repo_type(repo => $repo_name);
 	my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+	my $viewcvs_url = $user->get_viewcvs_url(repo => $repo_name);
 	my $repo_root = $user->get_repo_root(repo => $repo_name);
 	my $system_timeout = $config->{'system'}->{'timeout'};
@@ -910,4 +914,6 @@
 	my $bindir = $config->{'system'}->{'bindir'};
 
+	$log->debug("viewcvs url: ".$viewcvs_url);
+
 	$log->debug("creating Repository object");
 	my $repository = SandWeb::Repository->new( 
@@ -971,5 +977,5 @@
 	
 	# must be in a group to get the toolbar
-	my $group = $auth->get_group();
+	$group = $auth->get_group();
 	if ($group){
 
@@ -1029,5 +1035,5 @@
 		'repo_name' => $repo_name,
 		'sort' => $sort,
-    		'viewcvs' => $viewcvs,
+    		'viewcvs' => $viewcvs_url,
     		'localstatus' => \@localstatusoutput,
 	);
@@ -1148,4 +1154,5 @@
 	my $repo_username = $args{'repo_username'};
 	my $repo_password = $args{'repo_password'};
+	my $viewcvs_url = $args{'viewcvs_url'};
 	my $repo_type = $args{'repo_type'};
 	my $repo_connection = $args{'repo_connection'};
@@ -1196,4 +1203,5 @@
 		$repo_server = '';
 		$repo_username = '';
+		$viewcvs_url = '';
 		$repo_password = '';
 		$remember_repo_password = '';
@@ -1209,4 +1217,6 @@
 		$repo_username =
 			$user->get_repo_username(repo => $repo_name);
+		$viewcvs_url =
+			$user->get_viewcvs_url(repo => $repo_name);
 		my $repo_password = 
 			$user->get_repo_password(repo => $repo_name);
@@ -1299,4 +1309,5 @@
 		REPO_SERVER => $repo_server,
 		REPO_USERNAME => $repo_username,
+		VIEWCVS_URL => $viewcvs_url,
 		REMEMBER_REPO_PASSWORD => $remember_repo_password,
 		IMAGE_DIR => $image_dir,
@@ -1429,5 +1440,5 @@
 	my $count = 0;
 	# must be in a group to get the toolbar
-	my $group = $auth->get_group();
+	$group = $auth->get_group();
 	if ($group){
 		my %toolbar = $browse->get_tool_bar(
@@ -1452,5 +1463,5 @@
 	}
 
-	my $image_dir = $config->{'webserver'}->{'image_dir'};
+	$image_dir = $config->{'webserver'}->{'image_dir'};
 
 	# javascript for pop-ups
@@ -3290,4 +3301,5 @@
 	my $repo_password = $args{'repo_password'};
 	my $remember_repo_password = $args{'remember_repo_password'};
+	my $viewcvs_url = $args{'viewcvs_url'};
 	my $repo_type = $args{'repo_type'};
 	my $repo_connection = $args{'repo_connection'};
@@ -3333,4 +3345,5 @@
 					password => $repo_password,
 					remember_repo_password => $remember_repo_password,
+					viewcvs_url => $viewcvs_url,
 					connection => $repo_connection,
 					type => $repo_type,
@@ -3345,4 +3358,5 @@
 					password => $repo_password,
 					remember_repo_password => $remember_repo_password,
+					viewcvs_url => $viewcvs_url,
 					connection => $repo_connection,
 					type => $repo_type,