Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv15874
Modified Files:
sandweb.cgi
Log Message:
checking nick's version over mine. merging by hand.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.152
retrieving revision 1.153
diff -U2 -r1.152 -r1.153
--- sandweb.cgi 2002/02/05 06:20:46 1.152
+++ sandweb.cgi 2002/02/05 06:43:04 1.153
@@ -479,10 +479,10 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $config->{'paths'}->{'users_dir'};
- my $server = $repository_settings->{'$module'}->{'server'};
- my $vcs_username = $repository_settings->{'$module'}->{'username'};
- my $repo_type = $repository_settings->{'$module'}->{'repo_type'};
- my $connection = $repository_settings->{'$module'}->{'connection'};
- my $root = $repository_settings->{'$module'}->{'root'};
- my $sandbox = $config->{'paths'}->{'users_dir'};
+ my $server = $userprefs->{'repository'}->{'server'};
+ my $vcs_username = $userprefs->{'repository'}->{'username'};
+ my $repo_type = $userprefs->{'repository'}->{'repo_type'};
+ my $connection = $userprefs->{'repository'}->{'connection'};
+ my $root = $userprefs->{'repository'}->{'root'};
+ my $sandbox = $userprefs->{'paths'}->{'users_dir'};
my $vcsroot;
@@ -591,17 +591,17 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $config->{'paths'}->{'users_dir'};
- my $server = $repository_settings->{'$module'}->{'server'};
- my $vcs_username = $repository_settings->{'$module'}->{'username'};
- my $repo_type = $repository_settings->{'$module'}->{'repo_type'};
- my $connection = $repository_settings->{'$module'}->{'connection'};
- my $root = $repository_settings->{'$module'}->{'root'};
- my $sandbox = $config->{'paths'}->{'users_dir'};
+ my $server = $userprefs->{'repository'}->{'server'};
+ my $vcs_username = $userprefs->{'repository'}->{'username'};
+ my $repo_type = $userprefs->{'repository'}->{'repo_type'};
+ my $connection = $userprefs->{'repository'}->{'connection'};
+ my $root = $userprefs->{'repository'}->{'root'};
+ my $sandbox = $userprefs->{'paths'}->{'users_dir'};
my $vcsroot;
# Remove a file
- if ( $file_command eq 'delete' ) {
+ if ( $file_command eq 'remove' ) {
unless (@filename) {
$log->debug("no files selected for removal");
- set_error("Please select file(s) or folder(s) to delete.");
+ set_error("Please select file(s) or folder(s) to remove.");
browse_module_menu(
ck_auth => $ck_auth,
@@ -619,13 +619,13 @@
);
- $log->debug("deleting file");
+ $log->debug("removing file");
if ($file) {
if ( $file->get_file_type() eq 'Directory' ) {
- $file->delete_folder();
+ $file->remove_folder();
} else {
- if ( $file->delete_file() ) {
- set_error("$filename deleted.");
+ if ( $file->remove_file() ) {
+ set_error("$filename removed.");
} else {
- set_error("Cannot delete $filename.");
+ set_error("Cannot remove $filename.");
}
}
@@ -915,10 +915,10 @@
my $users_dir = $config->{'paths'}->{'users_dir'};
my %return;
- my $server = $repository_settings->{'$module'}->{'server'};
- my $vcs_username = $repository_settings->{'$module'}->{'username'};
- my $repo_type = $repository_settings->{'$module'}->{'repo_type'};
- my $connection = $repository_settings->{'$module'}->{'connection'};
- my $root = $repository_settings->{'$module'}->{'root'};
- my $sandbox = $config->{'paths'}->{'users_dir'};
+ my $server = $userprefs->{'repository'}->{'server'};
+ my $vcs_username = $userprefs->{'repository'}->{'username'};
+ my $repo_type = $userprefs->{'repository'}->{'repo_type'};
+ my $connection = $userprefs->{'repository'}->{'connection'};
+ my $root = $userprefs->{'repository'}->{'root'};
+ my $sandbox = $userprefs->{'paths'}->{'users_dir'};
my @vcs_output = ();
my @vcs_error = ();
@@ -1262,11 +1262,11 @@
load_settings(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
- my $name = $repository_settings->{'$module'}->{'name'};
- my $server = $repository_settings->{'$module'}->{'server'};
- my $vcs_username = $repository_settings->{'$module'}->{'username'};
- my $root = $repository_settings->{'$module'}->{'root'};
+ my $name = $userprefs->{'repository'}->{'name'};
+ my $server = $userprefs->{'repository'}->{'server'};
+ my $vcs_username = $userprefs->{'repository'}->{'username'};
+ my $root = $userprefs->{'repository'}->{'root'};
my $users_dir = $config->{'paths'}->{'users_dir'};
- my $repo_type = $repository_settings->{'$module'}->{'repo_type'};
- my $connection = $repository_settings->{'$module'}->{'connection'};
+ my $repo_type = $userprefs->{'repository'}->{'repo_type'};
+ my $connection = $userprefs->{'repository'}->{'connection'};
my $vcsroot;
@@ -1370,10 +1370,4 @@
}
- foreach my $param (@repository_params) {
- if ( CGI::param("$param") ) {
- $repository_settings->{'$module'}->{"$param"} = param("$param");
- }
- }
-
my $username = $auth->get_userinfo('username');
# write config data into the .$prefs_config file in the users directory
@@ -1518,11 +1512,11 @@
$log->debug("verifying repository data structure");
# make sure data structure containing repositories is consistent
- if ( ($repository_settings->{'$module'}->{'repo_type'}) &&
- (ref(\$repository_settings->{'$module'}->{'repo_type'}) eq 'SCALAR')) {
- my %temp = %{$repository_settings->{'$module'}};
- %{$repository_settings->{'$module'}} = ();
- %{$repository_settings->{'$module'}->{$temp{'name'}}} = %temp;
+ if ( ($repository_settings->{'repo_type'}) &&
+ (ref(\$repository_settings->{'repo_type'}) eq 'SCALAR')) {
+
+ my %temp = %{$repository_settings};
+ %{$repository_settings} = ();
+ %{$repository_settings}->{$temp{'name'}} = %temp;
}
- $repository_settings = $repository_settings->{'$module'};
$log->debug("<pre>" . Dumper($repository_settings) . "</pre>");
|
