Menu
▾
▴
sandweb-commit — CVS activity
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(28) |
Nov
(58) |
Dec
(85) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(125) |
Feb
(222) |
Mar
(274) |
Apr
(51) |
May
(22) |
Jun
(50) |
Jul
(15) |
Aug
(33) |
Sep
(11) |
Oct
(29) |
Nov
(17) |
Dec
(1) |
| 2003 |
Jan
(100) |
Feb
(21) |
Mar
(7) |
Apr
(45) |
May
|
Jun
(43) |
Jul
(27) |
Aug
(24) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2004 |
Jan
(1) |
Feb
|
Mar
(13) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: Rob H. <for...@us...> - 2002-02-10 20:53:13
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv5933/lib/SandWeb
Modified Files:
File.pm
Log Message:
formatting fixes
Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -U2 -r1.40 -r1.41
--- File.pm 5 Feb 2002 05:46:45 -0000 1.40
+++ File.pm 10 Feb 2002 20:53:07 -0000 1.41
@@ -131,12 +131,12 @@
my $filehandle = $args{'filehandle'};
-open UPLOADFILE, "> $location/$filename";
+ open UPLOADFILE, "> $location/$filename";
-while ( <$filehandle> )
-{
- print UPLOADFILE;
-}
+ while ( <$filehandle> )
+ {
+ print UPLOADFILE;
+ }
-close UPLOADFILE;
+ close UPLOADFILE;
}
|
|
From: Rob H. <for...@us...> - 2002-02-10 20:50:27
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv5006 Modified Files: edit_file.html Log Message: typo prevented "current location" from working in edit_file Index: edit_file.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/edit_file.html,v retrieving revision 1.19 retrieving revision 1.20 diff -U2 -r1.19 -r1.20 --- edit_file.html 2 Feb 2002 09:04:34 -0000 1.19 +++ edit_file.html 10 Feb 2002 20:50:25 -0000 1.20 @@ -1,5 +1,5 @@ <tr> <td width="100%"> - Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_menu_menu&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a> + Current location : <a href="<TMPL_VAR NAME=PROGNAME>?action=browse_module_menu&location=<TMPL_VAR NAME=LOCATION>"><TMPL_VAR NAME=LOCATION></a> <br /> Current filename : <TMPL_VAR NAME=FILENAME> |
|
From: Rob H. <for...@us...> - 2002-02-10 20:46:13
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv3383
Modified Files:
view_file.html
Log Message:
created a new <td> for download/edit commands, so they are not
on the same line as current location
Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -U2 -r1.28 -r1.29
--- view_file.html 3 Feb 2002 03:45:05 -0000 1.28
+++ view_file.html 10 Feb 2002 20:46:09 -0000 1.29
@@ -7,5 +7,7 @@
<br />
</td>
- <td width="50%">
+ </tr>
+ <tr>
+ <td width="100%" align="right">
<input type="hidden" name="action" value="file" />
<a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=file&file_command=download&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">download</a>
|
|
From: Rob H. <for...@us...> - 2002-02-10 09:46:50
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv5117
Modified Files:
sandweb.cgi
Log Message:
renamed "remove" to "delete"
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.155
retrieving revision 1.156
diff -U2 -r1.155 -r1.156
--- sandweb.cgi 5 Feb 2002 07:54:44 -0000 1.155
+++ sandweb.cgi 10 Feb 2002 09:46:47 -0000 1.156
@@ -597,8 +597,8 @@
# Remove a file
- if ( $file_command eq 'remove' ) {
+ if ( $file_command eq 'delete' ) {
unless (@filename) {
$log->debug("no files selected for removal");
- set_error("Please select file(s) or folder(s) to remove.");
+ set_error("Please select file(s) or folder(s) to delete.");
browse_module_menu(
ck_auth => $ck_auth,
@@ -619,10 +619,10 @@
if ($file) {
if ( $file->get_file_type() eq 'Directory' ) {
- $file->remove_folder();
+ $file->delete_folder();
} else {
- if ( $file->remove_file() ) {
- set_error("$filename removed.");
+ if ( $file->delete_file() ) {
+ set_error("$filename deleted.");
} else {
- set_error("Cannot remove $filename.");
+ set_error("Cannot delete $filename.");
}
}
|
|
From: Rob H. <for...@us...> - 2002-02-10 09:09:24
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv30651/lib/SandWeb
Modified Files:
Browse.pm
Log Message:
current location now splits on / not space
Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -U2 -r1.43 -r1.44
--- Browse.pm 5 Feb 2002 06:20:47 -0000 1.43
+++ Browse.pm 10 Feb 2002 09:09:22 -0000 1.44
@@ -86,5 +86,5 @@
$row_data{LOCATION_LINK} = "[$link]";
}
- my $data = join(" ", @location_full);
+ my $data = join("/", @location_full);
if ($location_link[$count]) {
|
|
From: Nick J. <nje...@us...> - 2002-02-05 08:08:05
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv26076
Modified Files:
Config.pm
Log Message:
* updated config file writing structure
Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- Config.pm 2002/02/05 06:16:10 1.12
+++ Config.pm 2002/02/05 07:59:03 1.13
@@ -23,5 +23,4 @@
}
-
sub _read_config {
my $config_file = shift;
@@ -55,5 +54,6 @@
my %data = ();
$data{'personal'} = ( %$self->{'personal'} );
- #$data{'repository'} = ( %$self->{'repository'} );
+ $data{'repo'} = ( %$self->{'repo'} );
+ $data{'module'} = ( %$self->{'module'} );
open(F, ">$config_dir/$config_file") or
@@ -63,35 +63,4 @@
return 1;
-}
-
-# write config file for repository settings
-sub write_repository_settings {
- my $self = shift;
- my %args = @_;
- my $config_dir = $args{'config_dir'} || $self->{'config_dir'};
- my $config_file = $args{'config_file'} || $self->{'config_file'};
-
- my $log = $self->{'log_obj'};
-
- my %data = ();
- $data{'repository'} = ( %$self->{'repository'} );
-
- open(F, ">$config_dir/$config_file") or
- $log->debug("Unable to write to file '$config_dir/$config_file': $!\n");
- print F XMLout(\%data, rootname => 'repository' );
- close F;
-
- return 1;
-}
-
-# XXX - currently not used -nkj
-sub _report_error {
- my $self = shift;
- my $msg = shift;
- my $log = $self->{'log_obj'};
-
- $log->error("$msg");
- return 0; # return 0 to report the error was logged (it's value being
- # returned to the function who called this function).
}
|
|
From: Nick J. <nje...@us...> - 2002-02-05 07:54:47
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv25240
Modified Files:
sandweb.cgi
Log Message:
* fixed formatting and data input<->output handling. Still not 100% there
but data seems to read/write "ok"
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.154
retrieving revision 1.155
diff -U2 -r1.154 -r1.155
--- sandweb.cgi 2002/02/05 07:23:40 1.154
+++ sandweb.cgi 2002/02/05 07:54:44 1.155
@@ -471,4 +471,5 @@
preferences_menu( ck_auth => $ck_auth );
}
+ #XXX - not accessing $user->{'repo'}->{$repo_name}*
my $username = $auth->get_userinfo('username');
my $template_dir = $config->{'paths'}->{'template_dir'};
@@ -586,4 +587,5 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $config->{'paths'}->{'users_dir'};
+ #XXX - not accessing $user->{'repo'}->{$repo_name}*
my $server = $user->{'repository'}->{'server'};
my $vcs_username = $user->{'repository'}->{'username'};
@@ -910,4 +912,5 @@
my $users_dir = $config->{'paths'}->{'users_dir'};
my %return;
+ #XXX - not accessing $user->{'repo'}->{$repo_name}*
my $server = $user->{'repository'}->{'server'};
my $vcs_username = $user->{'repository'}->{'username'};
@@ -1257,11 +1260,11 @@
load_config(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
- my $name = $user->{'repository'}->{'name'};
- my $server = $user->{'repository'}->{'server'};
- my $vcs_username = $user->{'repository'}->{'username'};
- my $root = $user->{'repository'}->{'root'};
+ my $name = $user->{'repo'}->{'name'};
+ my $server = $user->{'repo'}->{'server'};
+ my $vcs_username = $user->{'repo'}->{'username'};
+ my $root = $user->{'repo'}->{'root'};
my $users_dir = $config->{'paths'}->{'users_dir'};
- my $repo_type = $user->{'repository'}->{'repo_type'};
- my $connection = $user->{'repository'}->{'connection'};
+ my $repo_type = $user->{'repo'}->{'repo_type'};
+ my $connection = $user->{'repo'}->{'connection'};
my $vcsroot;
@@ -1356,13 +1359,4 @@
);
- my @repository_params = (
- 'name',
- 'server',
- 'username',
- 'repo_type',
- 'connection',
- 'root',
- );
-
foreach my $param (@personal_params) {
if ( CGI::param("$param") ) {
@@ -1371,10 +1365,4 @@
}
- foreach my $param (@repository_params) {
- if ( CGI::param("$param") ) {
- $user->{'repository'}->{"$param"} = param("$param");
- }
- }
-
my $username = $auth->get_userinfo('username');
# write config data into the .$user_cfg file in the users directory
@@ -1401,9 +1389,9 @@
my $repository_selected = $args{'repository_selected'};
my $repo_name = $args{'repo_name'};
- my $repo_server = $args{'server'};
- my $repo_username = $args{'usr_name'};
+ my $repo_server = $args{'repo_server'};
+ my $repo_username = $args{'repo_username'};
my $repo_type = $args{'repo_type'};
- my $repo_connection = $args{'connection'};
- my $repo_root = $args{'root'};
+ my $repo_connection = $args{'repo_connection'};
+ my $repo_root = $args{'repo_root'};
my $new_repository = $args{'new_repository'} ? 1 : 0;
unless ($ck_auth) {
@@ -1423,4 +1411,5 @@
exit(0);
}
+
# commit data to file
$user->{'repo'}->{$repo_name}->{'name'} = $repo_name;
@@ -1433,4 +1422,5 @@
my $username = $auth->get_userinfo('username');
# write config data into the .$user_cfg file in the users directory
+ $log->debug("pre-write\n");
$log->debug('dump', $user->{'repo'});
my ($return, $msg) = $user->write_preferences_config(
@@ -1498,6 +1488,6 @@
$log->debug("verifying repository data structure");
# make sure data structure containing repositories is consistent
- if ( ($user->{'repo'}->{'repo_type'}) &&
- (ref(\$user->{'repo'}->{'repo_type'}) eq 'SCALAR')) {
+ if ( ($user->{'repo'}->{'type'}) &&
+ (ref(\$user->{'repo'}->{'type'}) eq 'SCALAR')) {
my %temp = %{$user->{'repo'}};
@@ -1505,4 +1495,5 @@
%{$user->{'repo'}->{$temp{'name'}}} = %temp;
}
+ $log->debug('dump', $user->{'repo'});
$log->debug("verifying modules data structure");
|
|
From: Nick J. <nje...@us...> - 2002-02-05 07:28:26
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv20591
Modified Files:
Log.pm
Log Message:
added <pre> to dump log option
Index: Log.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Log.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- Log.pm 2002/01/31 23:32:33 1.7
+++ Log.pm 2002/02/05 07:28:22 1.8
@@ -33,5 +33,5 @@
if ($msg eq 'dump') {
use Data::Dumper;
- $msg = Dumper($_[2]);
+ $msg = "<pre> " . Dumper($_[2]) . "</pre>";
}
|
|
From: Nick J. <nje...@us...> - 2002-02-05 07:23:44
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv20162
Modified Files:
sandweb.cgi
Log Message:
* reverted back to old copy, going with a unified $user->* data struct.
instead of seperatating them all out. (user prefs, module, repository).
General waste of 3 hours :)
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.153
retrieving revision 1.154
diff -U2 -r1.153 -r1.154
--- sandweb.cgi 2002/02/05 06:43:04 1.153
+++ sandweb.cgi 2002/02/05 07:23:40 1.154
@@ -48,13 +48,9 @@
# these variables are declared here, they will be
# instantiated below ( if needed )
-my $userprefs; # user data loaded from users prefs config file
-my $repository_settings; # repository data loaded from users prefs config file
-my $module_settings; # module data loaded from users prefs config file
+my $user; # user data loaded from users config file
# internal variable configs for development ease
#
-my $prefs_config = 'prefs.cfg';
-my $repository_config = 'repository.cfg';
-my $module_config = 'module.cfg';
+my $user_cfg = 'user.cfg';
###############################################################################
@@ -100,14 +96,15 @@
}
# has valid auth cookie
- my $repository_selected = CGI::param('repository_selected');
- my $repo_name = CGI::param('repo_name');
- my $repo_server = CGI::param('repo_server');
- my $repo_username = CGI::param('repo_username');
- my $repo_type = CGI::param('repo_type');
- my $repo_connection = CGI::param('repo_connection');
- my $repo_root = CGI::param('repo_root');
- my $new_repository = CGI::param('new_repository');
- my $submit = CGI::param('Submit');
+ my $repository_selected = CGI::param('repository_selected');
+ my $repo_name = CGI::param('repo_name');
+ my $repo_server = CGI::param('repo_server');
+ my $repo_username = CGI::param('repo_username');
+ my $repo_type = CGI::param('repo_type');
+ my $repo_connection = CGI::param('repo_connection');
+ my $repo_root = CGI::param('repo_root');
+ my $new_repository = CGI::param('new_repository');
+ my $submit = CGI::param('Submit');
+
#######################################################
# Process Action parameter to specified menu
@@ -120,5 +117,5 @@
else {
# User is logged in; load prefs
- load_settings(1);
+ load_config(1);
$log->debug("loading prefs");
@@ -229,29 +226,29 @@
}
elsif ( $action eq 'repository_menu' ) {
- if ($submit) {
- repository_commit(
- ck_auth => $ck_auth,
- repository_selected => $repository_selected,
- repo_name => $repo_name,
- repo_server => $repo_server,
- repo_username => $repo_username,
- repo_type => $repo_type,
- repo_connection => $repo_connection,
- repo_root => $repo_root,
- new_repository => $new_repository,
- );
- } else {
- repository_menu(
- ck_auth => $ck_auth,
- repository_selected => $repository_selected,
- repo_name => $repo_name,
- repo_server => $repo_server,
- repo_username => $repo_username,
- repo_type => $repo_type,
- repo_connection => $repo_connection,
- repo_root => $repo_root,
- new_repository => $new_repository,
- );
- }
+ if ($submit) {
+ repository_commit(
+ ck_auth => $ck_auth,
+ repository_selected => $repository_selected,
+ repo_name => $repo_name,
+ repo_server => $repo_server,
+ repo_username => $repo_username,
+ repo_type => $repo_type,
+ repo_connection => $repo_connection,
+ repo_root => $repo_root,
+ new_repository => $new_repository,
+ );
+ } else {
+ repository_menu(
+ ck_auth => $ck_auth,
+ repository_selected => $repository_selected,
+ repo_name => $repo_name,
+ repo_server => $repo_server,
+ repo_username => $repo_username,
+ repo_type => $repo_type,
+ repo_connection => $repo_connection,
+ repo_root => $repo_root,
+ new_repository => $new_repository,
+ );
+ }
}
else {
@@ -279,10 +276,7 @@
###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Menus
-###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
-###############################################################################
+##
###############################################################################
@@ -375,7 +369,7 @@
exit 0;
}
- load_settings(1);
+ load_config(1);
- my $content = Dumper($config, $auth, $ui, $log, $userprefs);
+ my $content = Dumper($config, $auth, $ui, $log, $user);
$content = "Data Dump<br /><pre>" . $content . "</pre>";
@@ -411,11 +405,12 @@
$log->debug("entering sandbox_menu()");
+ $log->debug('dump', $user);
unless ($ck_auth) {
&login_menu();
exit 0;
}
- load_settings(1);
+ load_config(1);
- my @modules = sort keys %{$module_settings};
+ my @modules = sort keys %{$user->{'module'}};
if ($#modules < 0) {
$no_modules = 1;
@@ -425,6 +420,6 @@
my %entry;
$entry{'MODULE_NAME'} = $module;
- $entry{'MODULE_DESC'} = $module_settings->{$module}->{'description'};
- $entry{'REPOSITORY'} = $module_settings->{$module}->{'repository'};
+ $entry{'MODULE_DESC'} = $user->{'module'}->{$module}->{'description'} || '';
+ $entry{'REPOSITORY'} = $user->{'module'}->{$module}->{'repository'} || '';
push @module_loop, \%entry;
}
@@ -472,5 +467,5 @@
exit 0;
}
- if (! load_settings()) {
+ if (! load_config()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -479,10 +474,10 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $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 $server = $user->{'repository'}->{'server'};
+ my $vcs_username = $user->{'repository'}->{'username'};
+ my $repo_type = $user->{'repository'}->{'repo_type'};
+ my $connection = $user->{'repository'}->{'connection'};
+ my $root = $user->{'repository'}->{'root'};
+ my $sandbox = $user->{'paths'}->{'users_dir'};
my $vcsroot;
@@ -569,5 +564,5 @@
exit 0;
}
- if (! load_settings()) {
+ if (! load_config()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -591,10 +586,10 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $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 $server = $user->{'repository'}->{'server'};
+ my $vcs_username = $user->{'repository'}->{'username'};
+ my $repo_type = $user->{'repository'}->{'repo_type'};
+ my $connection = $user->{'repository'}->{'connection'};
+ my $root = $user->{'repository'}->{'root'};
+ my $sandbox = $user->{'paths'}->{'users_dir'};
my $vcsroot;
@@ -897,5 +892,5 @@
exit 0;
}
- if (! load_settings()) {
+ if (! load_config()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -915,10 +910,10 @@
my $users_dir = $config->{'paths'}->{'users_dir'};
my %return;
- 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 $server = $user->{'repository'}->{'server'};
+ my $vcs_username = $user->{'repository'}->{'username'};
+ my $repo_type = $user->{'repository'}->{'repo_type'};
+ my $connection = $user->{'repository'}->{'connection'};
+ my $root = $user->{'repository'}->{'root'};
+ my $sandbox = $user->{'paths'}->{'users_dir'};
my @vcs_output = ();
my @vcs_error = ();
@@ -1052,8 +1047,8 @@
}
- load_settings(1); # load prefs and do not log error msg
+ load_config(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
- my $full_name = $userprefs->{'personal'}->{'full_name'};
- my $work_dir = $userprefs->{'personal'}->{'work_dir'};
+ my $full_name = $user->{'personal'}->{'full_name'};
+ my $work_dir = $user->{'personal'}->{'work_dir'};
my $content = $ui->get_menu(
@@ -1094,151 +1089,151 @@
###############################################################################
sub repository_menu {
- my %args = @_;
- my $ck_auth = $args{'ck_auth'};
- my $repository_selected = $args{'repository_selected'};
- my $repo_name = $args{'repo_name'};
- my $repo_server = $args{'repo_server'};
- my $repo_username = $args{'repo_username'};
- my $repo_type = $args{'repo_type'};
- my $repo_connection = $args{'repo_connection'};
- my $repo_root = $args{'repo_root'};
- my $new_repository = $args{'new_repository'} ? 1 : 0;
- my $submit = $args{'submit'} ? 1 : 0;
-
- $log->debug("entering repository_menu\n");
-
- $log->debug("<pre>" . Dumper(\%args) . "</pre>");
- # check cookie
- unless ($ck_auth) {
- $log->debug("bad cookie '$ck_auth'\n");
- &login_menu();
- exit 0;
- }
-
- my $new_string = 'Add a new repository';
- my $username = $auth->get_userinfo('username');
- my $users_dir = $config->{'paths'}->{'users_dir'};
- my @repos = sort keys %{$repository_settings}; # get list of repositories
- $log->debug("<pre>" . Dumper(\%{$repository_settings}) . "</pre>");
-
- if (($repository_selected) && ($repository_selected != $new_string)) {
- my $valid = 0;
- # verify repository name
- foreach my $repo (@repos) {
- if ($repository_selected eq $repo) {
- $repo_name = $repo;
- $valid = 1;
- }
- }
- if (!$valid) {
- # bad repository name
- set_error("Invalid repository name: $repository_selected\n");
- $repository_selected = $new_string;
- $repo_name = '';
- }
- }
-
- if (($repository_selected eq $new_string) && (!$new_repository)) {
- # repository selected was 'add new repository'
- # new repository display
- } elsif ($repository_selected) {
- # display existing repository
- $repo_server =
- $repository_settings->{$repository_selected}->{'repo_server'};
- $repo_username =
- $repository_settings->{$repository_selected}->{'repo_username'};
- $repo_connection =
- $repository_settings->{$repository_selected}->{'repo_connection'};
- $repo_type =
- $repository_settings->{$repository_selected}->{'repo_type'};
- $repo_root =
- $repository_settings->{$repository_selected}->{'repo_root'};
- }
-
- # selected repository data
- my $vcsroot;
-
- my $repository = SandWeb::Repository->new(
- root => "",
- repo_type => "",
- sandbox => "$users_dir/$username",
- );
-
- my @connections = $repository->get_connections();
- my @repo_types = $repository->get_repo_types();
- $repository_selected = ($repository_selected) ? $repository_selected : $repos[0]; # default for pulldown
-
- # loop data
- my @loop_repo_connection = ();
- my @loop_repository_select = ();
- my @loop_repo_type = ();
-
- foreach my $repo (@repos) {
- my %entries;
- if (($repository_selected eq $repo) && ($repository_selected != $new_string)) {
- $entries{REPOSITORY_ENTRY} = "<option selected>$repo</option>";
- } else {
- $entries{REPOSITORY_ENTRY} = "<option>$repo</option>";
- }
- push (@loop_repository_select, \%entries);
- }
- # add new repo
- my %tmp;
- if ($repository_selected eq $new_string) {
- $tmp{REPOSITORY_ENTRY} = "<option selected>$new_string</option>";
-
- } else {
- $tmp{REPOSITORY_ENTRY} = "<option>$new_string</option>";
-
- }
- push (@loop_repository_select, \%tmp);
-
-
- foreach my $type (@connections) {
- my %row_data;
- if ($type eq $repo_connection) {
- $row_data{REPO_CONNECTION} = "<option selected>$type</option>";
- }
- else {
- $row_data{REPO_CONNECTION} = "<option>$type</option>";
- }
- push (@loop_repo_connection, \%row_data);
- }
-
- foreach my $type (@repo_types) {
- my %row_data;
- if ($type eq $repo_type) {
- $row_data{REPO_TYPE} = "<option selected>$type</option>";
- }
- else {
- $row_data{REPO_TYPE} = "<option>$type</option>";
- }
- push (@loop_repo_type, \%row_data);
- }
-
-
- my $content = $ui->get_menu(
- MENU => 'repository',
- PROGNAME => $progname,
- LOOP_REPO_CONNECTION => \@loop_repo_connection,
- LOOP_REPO_TYPE => \@loop_repo_type,
- LOOP_REPOSITORY_SELECT => \@loop_repository_select,
- REPOSITORY_SELECTED => $repository_selected,
- REPO_ROOT => $repo_root,
- REPO_NAME => $repo_name,
- REPO_SERVER => $repo_server,
- REPO_USERNAME => $repo_username,
- );
-
- print CGI::header( -cookie => $ck_auth );
- $ui->print_screen(
- TITLE=> 'SandWeb : repository',
- MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => 'repository',
- FOOTER => '',
- CONTENT => $content,
- ERROR => $error,
- );
- exit 0;
+ my %args = @_;
+ my $ck_auth = $args{'ck_auth'};
+ my $repository_selected = $args{'repository_selected'};
+ my $repo_name = $args{'repo_name'};
+ my $repo_server = $args{'repo_server'};
+ my $repo_username = $args{'repo_username'};
+ my $repo_type = $args{'repo_type'};
+ my $repo_connection = $args{'repo_connection'};
+ my $repo_root = $args{'repo_root'};
+ my $new_repository = $args{'new_repository'} ? 1 : 0;
+ my $submit = $args{'submit'} ? 1 : 0;
+
+ $log->debug("entering repository_menu\n");
+
+ $log->debug("<pre>" . Dumper(\%args) . "</pre>");
+ # check cookie
+ unless ($ck_auth) {
+ $log->debug("bad cookie '$ck_auth'\n");
+ &login_menu();
+ exit 0;
+ }
+
+ my $new_string = 'Add a new repository';
+ my $username = $auth->get_userinfo('username');
+ my $users_dir = $config->{'paths'}->{'users_dir'};
+ my @repos = sort keys %{$user->{'repo'}}; # get list of repositories
+ $log->debug("<pre>" . Dumper(\%{$user->{'repo'}}) . "</pre>");
+
+ if (($repository_selected) && ($repository_selected != $new_string)) {
+ my $valid = 0;
+ # verify repository name
+ foreach my $repo (@repos) {
+ if ($repository_selected eq $repo) {
+ $repo_name = $repo;
+ $valid = 1;
+ }
+ }
+ if (!$valid) {
+ # bad repository name
+ set_error("Invalid repository name: $repository_selected\n");
+ $repository_selected = $new_string;
+ $repo_name = '';
+ }
+ }
+
+ if (($repository_selected eq $new_string) && (!$new_repository)) {
+ # repository selected was 'add new repository'
+ # new repository display
+ } elsif ($repository_selected) {
+ # display existing repository
+ $repo_server =
+ $user->{'repo'}->{$repository_selected}->{'repo_server'};
+ $repo_username =
+ $user->{'repo'}->{$repository_selected}->{'repo_username'};
+ $repo_connection =
+ $user->{'repo'}->{$repository_selected}->{'repo_connection'};
+ $repo_type =
+ $user->{'repo'}->{$repository_selected}->{'repo_type'};
+ $repo_root =
+ $user->{'repo'}->{$repository_selected}->{'repo_root'};
+ }
+
+ # selected repository data
+ my $vcsroot;
+
+ my $repository = SandWeb::Repository->new(
+ root => "",
+ repo_type => "",
+ sandbox => "$users_dir/$username",
+ );
+
+ my @connections = $repository->get_connections();
+ my @repo_types = $repository->get_repo_types();
+ $repository_selected = ($repository_selected) ? $repository_selected : $repos[0]; # default for pulldown
+
+ # loop data
+ my @loop_repo_connection = ();
+ my @loop_repository_select = ();
+ my @loop_repo_type = ();
+
+ foreach my $repo (@repos) {
+ my %entries;
+ if (($repository_selected eq $repo) && ($repository_selected != $new_string)) {
+ $entries{REPOSITORY_ENTRY} = "<option selected>$repo</option>";
+ } else {
+ $entries{REPOSITORY_ENTRY} = "<option>$repo</option>";
+ }
+ push (@loop_repository_select, \%entries);
+ }
+ # add new repo
+ my %tmp;
+ if ($repository_selected eq $new_string) {
+ $tmp{REPOSITORY_ENTRY} = "<option selected>$new_string</option>";
+
+ } else {
+ $tmp{REPOSITORY_ENTRY} = "<option>$new_string</option>";
+
+ }
+ push (@loop_repository_select, \%tmp);
+
+
+ foreach my $type (@connections) {
+ my %row_data;
+ if ($type eq $repo_connection) {
+ $row_data{REPO_CONNECTION} = "<option selected>$type</option>";
+ }
+ else {
+ $row_data{REPO_CONNECTION} = "<option>$type</option>";
+ }
+ push (@loop_repo_connection, \%row_data);
+ }
+
+ foreach my $type (@repo_types) {
+ my %row_data;
+ if ($type eq $repo_type) {
+ $row_data{REPO_TYPE} = "<option selected>$type</option>";
+ }
+ else {
+ $row_data{REPO_TYPE} = "<option>$type</option>";
+ }
+ push (@loop_repo_type, \%row_data);
+ }
+
+
+ my $content = $ui->get_menu(
+ MENU => 'repository',
+ PROGNAME => $progname,
+ LOOP_REPO_CONNECTION => \@loop_repo_connection,
+ LOOP_REPO_TYPE => \@loop_repo_type,
+ LOOP_REPOSITORY_SELECT => \@loop_repository_select,
+ REPOSITORY_SELECTED => $repository_selected,
+ REPO_ROOT => $repo_root,
+ REPO_NAME => $repo_name,
+ REPO_SERVER => $repo_server,
+ REPO_USERNAME => $repo_username,
+ );
+
+ print CGI::header( -cookie => $ck_auth );
+ $ui->print_screen(
+ TITLE=> 'SandWeb : repository',
+ MENU_TITLE => 'SandWeb',
+ SUBMENU_TITLE => 'repository',
+ FOOTER => '',
+ CONTENT => $content,
+ ERROR => $error,
+ );
+ exit 0;
}
@@ -1260,13 +1255,13 @@
}
- load_settings(1); # load prefs and do not log error msg
+ load_config(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
- my $name = $userprefs->{'repository'}->{'name'};
- my $server = $userprefs->{'repository'}->{'server'};
- my $vcs_username = $userprefs->{'repository'}->{'username'};
- my $root = $userprefs->{'repository'}->{'root'};
+ my $name = $user->{'repository'}->{'name'};
+ my $server = $user->{'repository'}->{'server'};
+ my $vcs_username = $user->{'repository'}->{'username'};
+ my $root = $user->{'repository'}->{'root'};
my $users_dir = $config->{'paths'}->{'users_dir'};
- my $repo_type = $userprefs->{'repository'}->{'repo_type'};
- my $connection = $userprefs->{'repository'}->{'connection'};
+ my $repo_type = $user->{'repository'}->{'repo_type'};
+ my $connection = $user->{'repository'}->{'connection'};
my $vcsroot;
@@ -1335,10 +1330,7 @@
###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Commit Menu Data
-###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
-###############################################################################
+##
###############################################################################
@@ -1358,5 +1350,5 @@
}
- load_settings(1); # load prefs and do not log error msg
+ load_config(1); # load prefs and do not log error msg
my @personal_params = (
'full_name',
@@ -1364,16 +1356,31 @@
);
+ my @repository_params = (
+ 'name',
+ 'server',
+ 'username',
+ 'repo_type',
+ 'connection',
+ 'root',
+ );
+
foreach my $param (@personal_params) {
if ( CGI::param("$param") ) {
- $userprefs->{'personal'}->{"$param"} = param("$param");
+ $user->{'personal'}->{"$param"} = param("$param");
}
}
+ foreach my $param (@repository_params) {
+ if ( CGI::param("$param") ) {
+ $user->{'repository'}->{"$param"} = param("$param");
+ }
+ }
+
my $username = $auth->get_userinfo('username');
- # write config data into the .$prefs_config file in the users directory
- $log->debug('dump', $userprefs);
- my ($return, $msg) = $userprefs->write_preferences_config(
+ # write config data into the .$user_cfg file in the users directory
+ $log->debug('dump', $user);
+ my ($return, $msg) = $user->write_preferences_config(
'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$prefs_config",
+ 'config_file' => ".$user_cfg",
);
@@ -1390,75 +1397,66 @@
sub repository_commit {
- my %args = @_;
- my $ck_auth = $args{'ck_auth'};
- my $repository_selected = $args{'repository_selected'};
- my $repo_name = $args{'repo_name'};
- my $repo_server = $args{'server'};
- my $repo_username = $args{'usr_name'};
- my $repo_type = $args{'repo_type'};
- my $repo_connection = $args{'connection'};
- my $repo_root = $args{'root'};
- my $new_repository = $args{'new_repository'} ? 1 : 0;
- unless ($ck_auth) {
- &login_menu();
- exit 0;
- }
- my $new_string = 'Add a new repository';
-
- load_settings(1); # load prefs and do not log error msg
- $log->debug("<pre>" . Dumper(\%args) . "</pre>");
-
- if (! $repo_name) {
- # cannot commit without repository name
- $log->error("cannot commit without repository name!\n");
- set_error("cannot commit without repository name!\n");
- repository_menu( ck_auth => $ck_auth );
- exit(0);
- }
- # commit data to file
- $repository_settings->{$repo_name}->{'name'} = $repo_name;
- $repository_settings->{$repo_name}->{'server'} = $repo_server;
- $repository_settings->{$repo_name}->{'username'} = $repo_username;
- $repository_settings->{$repo_name}->{'connection'} = $repo_connection;
- $repository_settings->{$repo_name}->{'type'} = $repo_type;
- $repository_settings->{$repo_name}->{'root'} = $repo_root;
-
- my $username = $auth->get_userinfo('username');
- # write config data into the .$prefs_config file in the users directory
- $log->debug('dump', $userprefs);
- my ($return, $msg) = $userprefs->write_preferences_config(
- 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$prefs_config",
- );
-
-
- if (! $return) {
- # uh oh, problem occured
- $log->error("$msg");
- set_error("$msg");
- repository_menu( ck_auth => $ck_auth );
- }
- # when finished go to repository menu. (this should be dynamic probably,
- # so it returns to whichever menu they wanted to go to in the first
- # place).
- repository_menu( ck_auth => $ck_auth, repository_selected => $repo_name );
+ my %args = @_;
+ my $ck_auth = $args{'ck_auth'};
+ my $repository_selected = $args{'repository_selected'};
+ my $repo_name = $args{'repo_name'};
+ my $repo_server = $args{'server'};
+ my $repo_username = $args{'usr_name'};
+ my $repo_type = $args{'repo_type'};
+ my $repo_connection = $args{'connection'};
+ my $repo_root = $args{'root'};
+ my $new_repository = $args{'new_repository'} ? 1 : 0;
+ unless ($ck_auth) {
+ &login_menu();
+ exit 0;
+ }
+ my $new_string = 'Add a new repository';
+
+ load_config(1); # load prefs and do not log error msg
+ $log->debug("<pre>" . Dumper(\%args) . "</pre>");
+
+ if (! $repo_name) {
+ # cannot commit without repository name
+ $log->error("cannot commit without repository name!\n");
+ set_error("cannot commit without repository name!\n");
+ repository_menu( ck_auth => $ck_auth );
+ exit(0);
+ }
+ # commit data to file
+ $user->{'repo'}->{$repo_name}->{'name'} = $repo_name;
+ $user->{'repo'}->{$repo_name}->{'server'} = $repo_server;
+ $user->{'repo'}->{$repo_name}->{'username'} = $repo_username;
+ $user->{'repo'}->{$repo_name}->{'connection'} = $repo_connection;
+ $user->{'repo'}->{$repo_name}->{'type'} = $repo_type;
+ $user->{'repo'}->{$repo_name}->{'root'} = $repo_root;
+
+ my $username = $auth->get_userinfo('username');
+ # write config data into the .$user_cfg file in the users directory
+ $log->debug('dump', $user->{'repo'});
+ my ($return, $msg) = $user->write_preferences_config(
+ 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
+ 'config_file' => ".$user_cfg",
+ );
+
+ if (! $return) {
+ # uh oh, problem occured
+ $log->error("$msg");
+ set_error("$msg");
+ repository_menu( ck_auth => $ck_auth );
+ }
+ # when finished go to repository menu. (this should be dynamic probably,
+ # so it returns to whichever menu they wanted to go to in the first
+ # place).
+ repository_menu( ck_auth => $ck_auth, repository_selected => $repo_name );
}
+
###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Functions
-###############################################################################
-#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
-###############################################################################
-sub load_settings {
- my $no_error = shift;
- load_user_config($no_error);
- load_repository_config($no_error);
- load_module_config($no_error);
-}
+##
###############################################################################
-# load user settings
+# load prefs
#
# check user prefs config file, if it doesn't exist,
@@ -1469,19 +1467,22 @@
#
###############################################################################
-sub load_user_config {
+sub load_config {
my $no_error = shift;
my $username = $auth->get_userinfo('username');
- if (! -f "$config->{'paths'}->{'users_dir'}/$username/.$prefs_config") {
+ if (! -f "$config->{'paths'}->{'users_dir'}/$username/.$user_cfg") {
# user doesn't have a preferences file!
# load user preferences from default config in config dir
- $userprefs = SandWeb::Config::->new(
+ $user = SandWeb::Config::->new(
'config_dir' => $config_dir,
- 'config_file' => "$prefs_config",
+ 'config_file' => "$user_cfg",
'log_obj' => $log,
);
+ $user->{'repo'} = {};
+ $user->{'module'} = {};
+
# if $no_error is true, ignore this error msgs
if (! $no_error) {
- set_error("No config file found for '$username', enter preferences.");
+ set_error("No config file cound for '$username', enter preferences.");
}
return 0;
@@ -1489,66 +1490,33 @@
# load users preferences from users dir
- $userprefs = SandWeb::Config::->new(
+ $user = SandWeb::Config::->new(
'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$prefs_config",
+ 'config_file' => ".$user_cfg",
'log_obj' => $log,
);
- return 1;
-}
-
-sub load_repository_config {
- my $no_error = shift;
- my $username = $auth->get_userinfo('username');
- if ( -f "$config->{'paths'}->{'users_dir'}/$username/.$repository_config") {
- # load users preferences from users dir
- $repository_settings = SandWeb::Config::->new(
- 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$repository_config",
- 'log_obj' => $log,
- );
- }
-
$log->debug("verifying repository data structure");
# make sure data structure containing repositories is consistent
- if ( ($repository_settings->{'repo_type'}) &&
- (ref(\$repository_settings->{'repo_type'}) eq 'SCALAR')) {
+ if ( ($user->{'repo'}->{'repo_type'}) &&
+ (ref(\$user->{'repo'}->{'repo_type'}) eq 'SCALAR')) {
- my %temp = %{$repository_settings};
- %{$repository_settings} = ();
- %{$repository_settings}->{$temp{'name'}} = %temp;
+ my %temp = %{$user->{'repo'}};
+ %{$user->{'repo'}} = ();
+ %{$user->{'repo'}->{$temp{'name'}}} = %temp;
}
- $log->debug("<pre>" . Dumper($repository_settings) . "</pre>");
-
- return 1;
-}
-
-sub load_module_config {
- my $no_error = shift;
- my $username = $auth->get_userinfo('username');
- if (-f "$config->{'paths'}->{'users_dir'}/$username/.$module_config") {
- # load users preferences from users dir
- $module_settings = SandWeb::Config::->new(
- 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
- 'config_file' => ".$module_config",
- 'log_obj' => $log,
- );
- }
-
$log->debug("verifying modules data structure");
# make sure data structure containing repositories is consistent
- if ( ($module_settings->{'name'}) &&
- (ref(\$module_settings->{'name'}) eq 'SCALAR')) {
+ if ( ($user->{'module'}->{'name'}) &&
+ (ref(\$user->{'module'}->{'name'}) eq 'SCALAR')) {
- my %temp = %{$module_settings};
- %{$module_settings} = ();
- %{$module_settings}->{$temp{'name'}} = %temp;
+ my %temp = %{$user->{'module'}};
+ %{$user->{'module'}} = ();
+ %{$user->{'module'}->{$temp{'name'}}} = %temp;
}
- $log->debug("<pre>" . Dumper($module_settings) . "</pre>");
+
return 1;
}
-
###############################################################################
# login
@@ -1579,5 +1547,5 @@
login_menu();
}
- if (! load_settings()) {
+ if (! load_config()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
|
|
From: Rob H. <for...@us...> - 2002-02-05 06:43:07
|
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>");
|
|
From: Rob H. <for...@us...> - 2002-02-05 06:20:49
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv12800/bin
Modified Files:
sandweb.cgi
Log Message:
merging changes
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.151
retrieving revision 1.152
diff -U2 -r1.151 -r1.152
--- sandweb.cgi 2002/02/05 06:17:19 1.151
+++ sandweb.cgi 2002/02/05 06:20:46 1.152
@@ -479,10 +479,10 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $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 $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 $vcsroot;
@@ -591,17 +591,17 @@
my $template_dir = $config->{'paths'}->{'template_dir'};
my $users_dir = $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 $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 $vcsroot;
# Remove a file
- if ( $file_command eq 'remove' ) {
+ if ( $file_command eq 'delete' ) {
unless (@filename) {
$log->debug("no files selected for removal");
- set_error("Please select file(s) or folder(s) to remove.");
+ set_error("Please select file(s) or folder(s) to delete.");
browse_module_menu(
ck_auth => $ck_auth,
@@ -619,13 +619,13 @@
);
- $log->debug("removing file");
+ $log->debug("deleting file");
if ($file) {
if ( $file->get_file_type() eq 'Directory' ) {
- $file->remove_folder();
+ $file->delete_folder();
} else {
- if ( $file->remove_file() ) {
- set_error("$filename removed.");
+ if ( $file->delete_file() ) {
+ set_error("$filename deleted.");
} else {
- set_error("Cannot remove $filename.");
+ set_error("Cannot delete $filename.");
}
}
@@ -915,10 +915,10 @@
my $users_dir = $config->{'paths'}->{'users_dir'};
my %return;
- 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 $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 @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 = $userprefs->{'repository'}->{'name'};
- my $server = $userprefs->{'repository'}->{'server'};
- my $vcs_username = $userprefs->{'repository'}->{'username'};
- my $root = $userprefs->{'repository'}->{'root'};
+ 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 $users_dir = $config->{'paths'}->{'users_dir'};
- my $repo_type = $userprefs->{'repository'}->{'repo_type'};
- my $connection = $userprefs->{'repository'}->{'connection'};
+ my $repo_type = $repository_settings->{'$module'}->{'repo_type'};
+ my $connection = $repository_settings->{'$module'}->{'connection'};
my $vcsroot;
@@ -1370,4 +1370,10 @@
}
+ 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
@@ -1512,11 +1518,11 @@
$log->debug("verifying repository data structure");
# make sure data structure containing repositories is consistent
- if ( ($repository_settings->{'repo_type'}) &&
- (ref(\$repository_settings->{'repo_type'}) eq 'SCALAR')) {
-
- my %temp = %{$repository_settings};
- %{$repository_settings} = ();
- %{$repository_settings}->{$temp{'name'}} = %temp;
+ 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;
}
+ $repository_settings = $repository_settings->{'$module'};
$log->debug("<pre>" . Dumper($repository_settings) . "</pre>");
|
|
From: Rob H. <for...@us...> - 2002-02-05 06:20:49
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv12800/lib/SandWeb
Modified Files:
Browse.pm
Log Message:
merging changes
Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.42
retrieving revision 1.43
diff -U2 -r1.42 -r1.43
--- Browse.pm 2002/02/05 05:25:14 1.42
+++ Browse.pm 2002/02/05 06:20:47 1.43
@@ -79,14 +79,13 @@
$count++;
}
+
foreach my $link (@location_link) {
my %row_data;
if ( $link ) {
- $link =~ s/$\ /$1/;
$row_data{LOCATION_LINK} = "[$link]";
}
my $data = join(" ", @location_full);
- $data =~ s/$\ /$1/;
if ($location_link[$count]) {
push (@location_full, "/$location_link[$count]");
|
|
From: Nick J. <nje...@us...> - 2002-02-05 06:18:52
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv12436
Modified Files:
repository.html
Log Message:
* updated repository template to provide unified params
Index: repository.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/repository.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- repository.html 2002/02/02 01:41:09 1.6
+++ repository.html 2002/02/05 06:18:50 1.7
@@ -28,5 +28,5 @@
</td>
<td width="90%" align="left">
- <input type="text" name="repo_name" value="<TMPL_VAR NAME=NAME>" />
+ <input type="text" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" />
</td>
</tr>
@@ -36,5 +36,5 @@
</td>
<td width="90%" align="left">
- <input type="text" name="server" value="<TMPL_VAR NAME=SERVER>" />
+ <input type="text" name="repo_server" value="<TMPL_VAR NAME=REPO_SERVER>" />
</td>
</tr>
@@ -44,5 +44,5 @@
</td>
<td width="90%" align="left">
- <input type="text" name="usr_name" value="<TMPL_VAR NAME=USERNAME>" />
+ <input type="text" name="repo_username" value="<TMPL_VAR NAME=REPO_USERNAME>" />
</td>
</tr>
@@ -63,7 +63,7 @@
</td>
<td width="90%" align="left">
- <select name="connection">
- <TMPL_LOOP NAME=LOOP_CONNECTION>
- <TMPL_VAR NAME=CONNECTION>
+ <select name="repo_connection">
+ <TMPL_LOOP NAME=LOOP_REPO_CONNECTION>
+ <TMPL_VAR NAME=REPO_CONNECTION>
</TMPL_LOOP>
</select>
@@ -75,5 +75,5 @@
</td>
<td width="90%" align="left">
- <input type="text" name="root" value="<TMPL_VAR NAME=ROOT>" />
+ <input type="text" name="repo_root" value="<TMPL_VAR NAME=REPO_ROOT>" />
</td>
</tr>
|
|
From: Nick J. <nje...@us...> - 2002-02-05 06:17:22
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv11983
Modified Files:
sandweb.cgi
Log Message:
* heavily modified the load_*_settings whole dealy. Revamping whole
data management process. Not quite working state and/or untested
really.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.150
retrieving revision 1.151
diff -U2 -r1.150 -r1.151
--- sandweb.cgi 2002/02/03 03:54:52 1.150
+++ sandweb.cgi 2002/02/05 06:17:19 1.151
@@ -55,4 +55,6 @@
#
my $prefs_config = 'prefs.cfg';
+my $repository_config = 'repository.cfg';
+my $module_config = 'module.cfg';
###############################################################################
@@ -98,6 +100,14 @@
}
# has valid auth cookie
+ my $repository_selected = CGI::param('repository_selected');
+ my $repo_name = CGI::param('repo_name');
+ my $repo_server = CGI::param('repo_server');
+ my $repo_username = CGI::param('repo_username');
+ my $repo_type = CGI::param('repo_type');
+ my $repo_connection = CGI::param('repo_connection');
+ my $repo_root = CGI::param('repo_root');
+ my $new_repository = CGI::param('new_repository');
+ my $submit = CGI::param('Submit');
-
#######################################################
# Process Action parameter to specified menu
@@ -110,5 +120,5 @@
else {
# User is logged in; load prefs
- load_prefs(1);
+ load_settings(1);
$log->debug("loading prefs");
@@ -219,25 +229,29 @@
}
elsif ( $action eq 'repository_menu' ) {
- my $rs = CGI::param('repository_selected');
- my $rn = CGI::param('repo_name');
- my $s = CGI::param('server');
- my $un = CGI::param('usr_name');
- my $rt = CGI::param('repo_type');
- my $c = CGI::param('connection');
- my $r = CGI::param('root');
- my $nr = CGI::param('new_repository');
- my $s2 = CGI::param('Submit');
- repository_menu(
- ck_auth => $ck_auth,
- repository_selected => $rs,
- repo_name => $rn,
- server => $s,
- usr_name => $un,
- repo_type => $rt,
- connection => $c,
- root => $r,
- new_repository => $nr,
- submit => $s2,
- );
+ if ($submit) {
+ repository_commit(
+ ck_auth => $ck_auth,
+ repository_selected => $repository_selected,
+ repo_name => $repo_name,
+ repo_server => $repo_server,
+ repo_username => $repo_username,
+ repo_type => $repo_type,
+ repo_connection => $repo_connection,
+ repo_root => $repo_root,
+ new_repository => $new_repository,
+ );
+ } else {
+ repository_menu(
+ ck_auth => $ck_auth,
+ repository_selected => $repository_selected,
+ repo_name => $repo_name,
+ repo_server => $repo_server,
+ repo_username => $repo_username,
+ repo_type => $repo_type,
+ repo_connection => $repo_connection,
+ repo_root => $repo_root,
+ new_repository => $new_repository,
+ );
+ }
}
else {
@@ -265,7 +279,10 @@
###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Menus
-##
+###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
+###############################################################################
###############################################################################
@@ -358,5 +375,5 @@
exit 0;
}
- load_prefs(1);
+ load_settings(1);
my $content = Dumper($config, $auth, $ui, $log, $userprefs);
@@ -398,5 +415,5 @@
exit 0;
}
- load_prefs(1);
+ load_settings(1);
my @modules = sort keys %{$module_settings};
@@ -455,5 +472,5 @@
exit 0;
}
- if (! load_prefs()) {
+ if (! load_settings()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -552,5 +569,5 @@
exit 0;
}
- if (! load_prefs()) {
+ if (! load_settings()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -880,5 +897,5 @@
exit 0;
}
- if (! load_prefs()) {
+ if (! load_settings()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
@@ -1035,5 +1052,5 @@
}
- load_prefs(1); # load prefs and do not log error msg
+ load_settings(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
my $full_name = $userprefs->{'personal'}->{'full_name'};
@@ -1081,9 +1098,9 @@
my $repository_selected = $args{'repository_selected'};
my $repo_name = $args{'repo_name'};
- my $server = $args{'server'};
- my $usr_name = $args{'usr_name'};
+ my $repo_server = $args{'repo_server'};
+ my $repo_username = $args{'repo_username'};
my $repo_type = $args{'repo_type'};
- my $connection = $args{'connection'};
- my $root = $args{'root'};
+ my $repo_connection = $args{'repo_connection'};
+ my $repo_root = $args{'repo_root'};
my $new_repository = $args{'new_repository'} ? 1 : 0;
my $submit = $args{'submit'} ? 1 : 0;
@@ -1091,5 +1108,4 @@
$log->debug("entering repository_menu\n");
- use Data::Dumper;
$log->debug("<pre>" . Dumper(\%args) . "</pre>");
# check cookie
@@ -1123,22 +1139,21 @@
}
- if ((($repository_selected eq $repo_name) && ($submit)) || (($new_repository) && ($submit))) {
- # modified existing repository and commited or
- # added new repository and commited
- # commit data to file
-
- } elsif (($repository_selected eq $new_string) && (!$new_repository)) {
+ if (($repository_selected eq $new_string) && (!$new_repository)) {
# repository selected was 'add new repository'
# new repository display
} elsif ($repository_selected) {
# display existing repository
- $server = $repository_settings->{$repository_selected}->{'server'};
- $usr_name = $repository_settings->{$repository_selected}->{'usr_name'};
- $connection = $repository_settings->{$repository_selected}->{'connection'};
- $repo_type = $repository_settings->{$repository_selected}->{'repo_type'};
- $root = $repository_settings->{$repository_selected}->{'root'};
+ $repo_server =
+ $repository_settings->{$repository_selected}->{'repo_server'};
+ $repo_username =
+ $repository_settings->{$repository_selected}->{'repo_username'};
+ $repo_connection =
+ $repository_settings->{$repository_selected}->{'repo_connection'};
+ $repo_type =
+ $repository_settings->{$repository_selected}->{'repo_type'};
+ $repo_root =
+ $repository_settings->{$repository_selected}->{'repo_root'};
}
-
# selected repository data
my $vcsroot;
@@ -1155,5 +1170,5 @@
# loop data
- my @loop_connection = ();
+ my @loop_repo_connection = ();
my @loop_repository_select = ();
my @loop_repo_type = ();
@@ -1182,11 +1197,11 @@
foreach my $type (@connections) {
my %row_data;
- if ($type eq $connection) {
- $row_data{CONNECTION} = "<option selected>$type</option>";
+ if ($type eq $repo_connection) {
+ $row_data{REPO_CONNECTION} = "<option selected>$type</option>";
}
else {
- $row_data{CONNECTION} = "<option>$type</option>";
+ $row_data{REPO_CONNECTION} = "<option>$type</option>";
}
- push (@loop_connection, \%row_data);
+ push (@loop_repo_connection, \%row_data);
}
@@ -1206,8 +1221,12 @@
MENU => 'repository',
PROGNAME => $progname,
- LOOP_CONNECTION => \@loop_connection,
+ LOOP_REPO_CONNECTION => \@loop_repo_connection,
LOOP_REPO_TYPE => \@loop_repo_type,
LOOP_REPOSITORY_SELECT => \@loop_repository_select,
REPOSITORY_SELECTED => $repository_selected,
+ REPO_ROOT => $repo_root,
+ REPO_NAME => $repo_name,
+ REPO_SERVER => $repo_server,
+ REPO_USERNAME => $repo_username,
);
@@ -1241,5 +1260,5 @@
}
- load_prefs(1); # load prefs and do not log error msg
+ load_settings(1); # load prefs and do not log error msg
my $username = $auth->get_userinfo('username');
my $name = $userprefs->{'repository'}->{'name'};
@@ -1316,7 +1335,10 @@
###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Commit Menu Data
-##
+###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
+###############################################################################
###############################################################################
@@ -1336,5 +1358,5 @@
}
- load_prefs(1); # load prefs and do not log error msg
+ load_settings(1); # load prefs and do not log error msg
my @personal_params = (
'full_name',
@@ -1342,13 +1364,4 @@
);
- my @repository_params = (
- 'name',
- 'server',
- 'username',
- 'repo_type',
- 'connection',
- 'root',
- );
-
foreach my $param (@personal_params) {
if ( CGI::param("$param") ) {
@@ -1357,10 +1370,4 @@
}
- foreach my $param (@repository_params) {
- if ( CGI::param("$param") ) {
- $userprefs->{'repository'}->{"$param"} = param("$param");
- }
- }
-
my $username = $auth->get_userinfo('username');
# write config data into the .$prefs_config file in the users directory
@@ -1382,11 +1389,76 @@
}
+sub repository_commit {
+ my %args = @_;
+ my $ck_auth = $args{'ck_auth'};
+ my $repository_selected = $args{'repository_selected'};
+ my $repo_name = $args{'repo_name'};
+ my $repo_server = $args{'server'};
+ my $repo_username = $args{'usr_name'};
+ my $repo_type = $args{'repo_type'};
+ my $repo_connection = $args{'connection'};
+ my $repo_root = $args{'root'};
+ my $new_repository = $args{'new_repository'} ? 1 : 0;
+ unless ($ck_auth) {
+ &login_menu();
+ exit 0;
+ }
+ my $new_string = 'Add a new repository';
+
+ load_settings(1); # load prefs and do not log error msg
+ $log->debug("<pre>" . Dumper(\%args) . "</pre>");
+
+ if (! $repo_name) {
+ # cannot commit without repository name
+ $log->error("cannot commit without repository name!\n");
+ set_error("cannot commit without repository name!\n");
+ repository_menu( ck_auth => $ck_auth );
+ exit(0);
+ }
+ # commit data to file
+ $repository_settings->{$repo_name}->{'name'} = $repo_name;
+ $repository_settings->{$repo_name}->{'server'} = $repo_server;
+ $repository_settings->{$repo_name}->{'username'} = $repo_username;
+ $repository_settings->{$repo_name}->{'connection'} = $repo_connection;
+ $repository_settings->{$repo_name}->{'type'} = $repo_type;
+ $repository_settings->{$repo_name}->{'root'} = $repo_root;
+
+ my $username = $auth->get_userinfo('username');
+ # write config data into the .$prefs_config file in the users directory
+ $log->debug('dump', $userprefs);
+ my ($return, $msg) = $userprefs->write_preferences_config(
+ 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
+ 'config_file' => ".$prefs_config",
+ );
+
+
+ if (! $return) {
+ # uh oh, problem occured
+ $log->error("$msg");
+ set_error("$msg");
+ repository_menu( ck_auth => $ck_auth );
+ }
+ # when finished go to repository menu. (this should be dynamic probably,
+ # so it returns to whichever menu they wanted to go to in the first
+ # place).
+ repository_menu( ck_auth => $ck_auth, repository_selected => $repo_name );
+}
+
###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
###############################################################################
## Functions
-##
+###############################################################################
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++#
+###############################################################################
+sub load_settings {
+ my $no_error = shift;
+ load_user_config($no_error);
+ load_repository_config($no_error);
+ load_module_config($no_error);
+}
###############################################################################
-# load prefs
+# load user settings
#
# check user prefs config file, if it doesn't exist,
@@ -1397,5 +1469,5 @@
#
###############################################################################
-sub load_prefs {
+sub load_user_config {
my $no_error = shift;
my $username = $auth->get_userinfo('username');
@@ -1411,5 +1483,5 @@
# if $no_error is true, ignore this error msgs
if (! $no_error) {
- set_error("No config file cound for '$username', enter preferences.");
+ set_error("No config file found for '$username', enter preferences.");
}
return 0;
@@ -1423,29 +1495,60 @@
);
+ return 1;
+}
+
+sub load_repository_config {
+ my $no_error = shift;
+ my $username = $auth->get_userinfo('username');
+ if ( -f "$config->{'paths'}->{'users_dir'}/$username/.$repository_config") {
+ # load users preferences from users dir
+ $repository_settings = SandWeb::Config::->new(
+ 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
+ 'config_file' => ".$repository_config",
+ 'log_obj' => $log,
+ );
+ }
+
$log->debug("verifying repository data structure");
# make sure data structure containing repositories is consistent
- if ( ($userprefs->{'repository'}->{'repo_type'}) &&
- (ref(\$userprefs->{'repository'}->{'repo_type'}) eq 'SCALAR')) {
+ if ( ($repository_settings->{'repo_type'}) &&
+ (ref(\$repository_settings->{'repo_type'}) eq 'SCALAR')) {
- my %temp = %{$userprefs->{'repository'}};
- %{$userprefs->{'repository'}} = ();
- %{$userprefs->{'repository'}->{$temp{'name'}}} = %temp;
+ my %temp = %{$repository_settings};
+ %{$repository_settings} = ();
+ %{$repository_settings}->{$temp{'name'}} = %temp;
}
- $repository_settings = $userprefs->{'repository'};
+ $log->debug("<pre>" . Dumper($repository_settings) . "</pre>");
+
+ return 1;
+}
+
+sub load_module_config {
+ my $no_error = shift;
+ my $username = $auth->get_userinfo('username');
+ if (-f "$config->{'paths'}->{'users_dir'}/$username/.$module_config") {
+ # load users preferences from users dir
+ $module_settings = SandWeb::Config::->new(
+ 'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
+ 'config_file' => ".$module_config",
+ 'log_obj' => $log,
+ );
+ }
+
$log->debug("verifying modules data structure");
# make sure data structure containing repositories is consistent
- if ( ($userprefs->{'module'}->{'name'}) &&
- (ref(\$userprefs->{'module'}->{'name'}) eq 'SCALAR')) {
+ if ( ($module_settings->{'name'}) &&
+ (ref(\$module_settings->{'name'}) eq 'SCALAR')) {
- my %temp = %{$userprefs->{'module'}};
- %{$userprefs->{'module'}} = ();
- %{$userprefs->{'module'}->{$temp{'name'}}} = %temp;
+ my %temp = %{$module_settings};
+ %{$module_settings} = ();
+ %{$module_settings}->{$temp{'name'}} = %temp;
}
- $module_settings = $userprefs->{'module'};
-
+ $log->debug("<pre>" . Dumper($module_settings) . "</pre>");
return 1;
}
+
###############################################################################
# login
@@ -1476,5 +1579,5 @@
login_menu();
}
- if (! load_prefs()) {
+ if (! load_settings()) {
# no existing user config, forward to prefs menu
preferences_menu( ck_auth => $ck_auth );
|
|
From: Nick J. <nje...@us...> - 2002-02-05 06:16:13
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv11855
Modified Files:
Config.pm
Log Message:
* added write_repository_config
Index: Config.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Config.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- Config.pm 2001/10/06 08:17:12 1.11
+++ Config.pm 2002/02/05 06:16:10 1.12
@@ -55,9 +55,29 @@
my %data = ();
$data{'personal'} = ( %$self->{'personal'} );
- $data{'repository'} = ( %$self->{'repository'} );
+ #$data{'repository'} = ( %$self->{'repository'} );
open(F, ">$config_dir/$config_file") or
$log->debug("Unable to write to file '$config_dir/$config_file': $!\n");
print F XMLout(\%data, rootname => 'preferences' );
+ close F;
+
+ return 1;
+}
+
+# write config file for repository settings
+sub write_repository_settings {
+ my $self = shift;
+ my %args = @_;
+ my $config_dir = $args{'config_dir'} || $self->{'config_dir'};
+ my $config_file = $args{'config_file'} || $self->{'config_file'};
+
+ my $log = $self->{'log_obj'};
+
+ my %data = ();
+ $data{'repository'} = ( %$self->{'repository'} );
+
+ open(F, ">$config_dir/$config_file") or
+ $log->debug("Unable to write to file '$config_dir/$config_file': $!\n");
+ print F XMLout(\%data, rootname => 'repository' );
close F;
|
|
From: Nick J. <nje...@us...> - 2002-02-05 05:58:12
|
Update of /cvsroot/sandweb/sandweb/etc
In directory usw-pr-cvs1:/tmp/cvs-serv8554
Modified Files:
prefs.cfg sandweb.cfg
Added Files:
repository.cfg
Log Message:
* added new cfg files for repositories and modules
--- NEW FILE ---
<repository>
<!-- repository tags define individual repositories -->
<repository name=""
VCS=""
root=""
username=""
password=""
server=""
/>
</repository>
Index: prefs.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/prefs.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- prefs.cfg 2001/09/21 00:35:39 1.3
+++ prefs.cfg 2002/02/05 05:58:09 1.4
@@ -1,11 +1,3 @@
<preferences>
- <!-- repository tags define individual repositories -->
- <repository name=""
- VCS=""
- root=""
- username=""
- password=""
- server=""
- />
<!-- the personal tag defines user's real name, and the
path to the sandbox on the user's workstation -->
Index: sandweb.cfg
===================================================================
RCS file: /cvsroot/sandweb/sandweb/etc/sandweb.cfg,v
retrieving revision 1.15
retrieving revision 1.16
diff -U2 -r1.15 -r1.16
--- sandweb.cfg 2002/01/29 01:32:27 1.15
+++ sandweb.cfg 2002/02/05 05:58:09 1.16
@@ -16,5 +16,5 @@
<!-- config for cgi related information -->
- <cgi-bin cgi_path="/cgi-bin/sandweb/bin"
+ <cgi-bin cgi_path="/sandweb/bin"
cgi_domain=""
/>
|
|
From: Rob H. <for...@us...> - 2002-02-05 05:46:49
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv6490/lib/SandWeb
Modified Files:
File.pm
Log Message:
changed "remove" to "delete", added access keys for browse_module_menu :
alt-i : create_file
alt-o : create_folder
alt-d : delete
alt-r : rename
alt-u : upload
Index: File.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -U2 -r1.39 -r1.40
--- File.pm 2002/02/02 09:04:34 1.39
+++ File.pm 2002/02/05 05:46:45 1.40
@@ -218,5 +218,5 @@
}
-sub remove_file {
+sub delete_file {
my $self = shift;
my $location = $self->{'location'};
@@ -230,5 +230,5 @@
$return = 1;
} else {
- $log->debug("could not remove $location/$filename : $!");
+ $log->debug("could not delete $location/$filename : $!");
$return = 0;
}
@@ -237,5 +237,5 @@
}
-sub remove_folder {
+sub delete_folder {
my $self = shift;
my $location = $self->{'location'};
@@ -330,5 +330,5 @@
'create_file',
'create_folder',
- 'remove',
+ 'delete',
'rename',
'upload',
|
|
From: Rob H. <for...@us...> - 2002-02-05 05:46:48
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv6490/templates Modified Files: browse_module.html Log Message: changed "remove" to "delete", added access keys for browse_module_menu : alt-i : create_file alt-o : create_folder alt-d : delete alt-r : rename alt-u : upload Index: browse_module.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/browse_module.html,v retrieving revision 1.10 retrieving revision 1.11 diff -U2 -r1.10 -r1.11 --- browse_module.html 2002/02/03 03:56:26 1.10 +++ browse_module.html 2002/02/05 05:46:45 1.11 @@ -18,9 +18,9 @@ <table border="0" width="100%" cellspacing="2" cellpadding="2"> <tr> - <input type="submit" name="action_file" value="create_file" /> - <input type="submit" name="action_file" value="create_folder" /> - <input type="submit" name="action_file" value="remove" /> - <input type="submit" name="action_file" value="rename" /> - <input type="submit" name="action_file" value="upload" /> + <input type="submit" name="action_file" value="create_file" accesskey="i" /> + <input type="submit" name="action_file" value="create_folder" accesskey="o" /> + <input type="submit" name="action_file" value="delete" accesskey="d" /> + <input type="submit" name="action_file" value="rename" accesskey="r" /> + <input type="submit" name="action_file" value="upload" accesskey="u" /> </tr> <tr> |
|
From: Rob H. <for...@us...> - 2002-02-05 05:25:17
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv2492/lib/SandWeb
Modified Files:
Browse.pm
Log Message:
"current location" bug - getting spaces at the end of data
in odd circumstances ( three dirs deep, click on a dir w/ spaces )..
spaces are not allowed at the end of filenames, so stripped them out
Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.41
retrieving revision 1.42
diff -U2 -r1.41 -r1.42
--- Browse.pm 2002/02/03 03:54:52 1.41
+++ Browse.pm 2002/02/05 05:25:14 1.42
@@ -81,9 +81,12 @@
foreach my $link (@location_link) {
my %row_data;
+
if ( $link ) {
+ $link =~ s/$\ /$1/;
$row_data{LOCATION_LINK} = "[$link]";
}
my $data = join(" ", @location_full);
+ $data =~ s/$\ /$1/;
if ($location_link[$count]) {
push (@location_full, "/$location_link[$count]");
|
|
From: Nick J. <nje...@us...> - 2002-02-05 04:26:02
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv24088
Modified Files:
framework.html
Log Message:
* updated the top menu to not wrap under 640x480
Index: framework.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/framework.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- framework.html 2002/02/01 03:45:40 1.13
+++ framework.html 2002/02/05 04:25:58 1.14
@@ -22,22 +22,22 @@
<table width="100%" border="0">
<tr>
- <td width="30%">
+ <td width="25%">
  <br />
</td>
- <td width="20%" align="right">
+ <td width="25%" align="right">
<font size="4"><b><TMPL_VAR NAME=MENU_TITLE></b></font>
</td>
- <td width="20%" align="left">
+ <td width="25%" align="left">
: <TMPL_VAR NAME=SUBMENU_TITLE><br />
</td>
- <td width="30%">
+ <td width="25%">
  <br />
</td>
</tr>
<tr>
- <td width="30%" align="center">
+ <td width="25%" align="center">
  <br />
</td>
- <td width="40%" valign="center" align="center" bgcolor="#000000" colspan="2">
+ <td width="50%" valign="center" align="center" bgcolor="#000000" colspan="2">
<table border="0" width="100%" align="center">
@@ -50,5 +50,5 @@
</td>
- <td width="30%">
+ <td width="25%">
  <br/>
</td>
|
|
From: Rob H. <for...@us...> - 2002-02-03 03:56:29
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv24143/templates Modified Files: browse_module.html Log Message: purple for first entry, white for second ( etc ). looks better to me Index: browse_module.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/browse_module.html,v retrieving revision 1.9 retrieving revision 1.10 diff -U2 -r1.9 -r1.10 --- browse_module.html 2002/02/03 03:54:52 1.9 +++ browse_module.html 2002/02/03 03:56:26 1.10 @@ -84,7 +84,7 @@ <TMPL_LOOP NAME="ENTRY_LOOP"> <TMPL_IF NAME=COLOR> - <tr bgcolor="#CCCCEE"> - <TMPL_ELSE> <tr bgcolor="#FFFFFF"> + <TMPL_ELSE> + <tr bgcolor="#CCCCEE"> </TMPL_IF> <td> |
|
From: Rob H. <for...@us...> - 2002-02-03 03:54:55
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv23801/templates Modified Files: browse_module.html Log Message: moved hard-coded color info in Browse.pm out into browse_module.html thanks to <TMPL_IF> and <TMPL_ELSE> statements. The logic is exactly the same inside Browse.pm, just had to change "$color0" to 0 and "$color1" to 1. Rad ;) Index: browse_module.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/browse_module.html,v retrieving revision 1.8 retrieving revision 1.9 diff -U2 -r1.8 -r1.9 --- browse_module.html 2002/02/02 09:30:50 1.8 +++ browse_module.html 2002/02/03 03:54:52 1.9 @@ -83,5 +83,9 @@ </tr> <TMPL_LOOP NAME="ENTRY_LOOP"> - <tr bgcolor="<TMPL_VAR NAME=COLOR>"> + <TMPL_IF NAME=COLOR> + <tr bgcolor="#CCCCEE"> + <TMPL_ELSE> + <tr bgcolor="#FFFFFF"> + </TMPL_IF> <td> <input type="checkbox" name="filename" value="<TMPL_VAR NAME=ENTRY>" /> |
|
From: Rob H. <for...@us...> - 2002-02-03 03:54:55
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv23801/lib/SandWeb
Modified Files:
Browse.pm
Log Message:
moved hard-coded color info in Browse.pm out into browse_module.html thanks
to <TMPL_IF> and <TMPL_ELSE> statements.
The logic is exactly the same inside Browse.pm, just had to change
"$color0" to 0 and "$color1" to 1. Rad ;)
Index: Browse.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Browse.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -U2 -r1.40 -r1.41
--- Browse.pm 2002/02/02 09:35:31 1.40
+++ Browse.pm 2002/02/03 03:54:52 1.41
@@ -103,8 +103,5 @@
my @return = ();
@loop_data = ();
- my $color0 = "#ccccee";
- my $color1 = "#ffffff";
-
if ( opendir(SANDBOX, "$sandbox/$location") ) {
$log->debug("Opened folder : $sandbox/$location");
@@ -141,7 +138,7 @@
$row_data{LINK} = "action=browse_module_menu&location=$location/$filename";
if ($counter eq "0") {
- $row_data{COLOR} = "$color0";
+ $row_data{COLOR} = 0;
} else {
- $row_data{COLOR} = "$color1";
+ $row_data{COLOR} = 1;
}
}
@@ -150,7 +147,7 @@
$row_data{LINK} = "action=file&filename=$filename";
if ($counter eq "0") {
- $row_data{COLOR} = "$color0";
+ $row_data{COLOR} = 0;
} else {
- $row_data{COLOR} = "$color1";
+ $row_data{COLOR} = 1;
}
}
@@ -159,7 +156,7 @@
$row_data{LINK} = "action=file&filename=$filename";
if ($counter eq "0") {
- $row_data{COLOR} = "$color0";
+ $row_data{COLOR} = 0;
} else {
- $row_data{COLOR} = "$color1";
+ $row_data{COLOR} = 1;
}
}
@@ -168,7 +165,7 @@
$row_data{LINK} = "action=file&filename=$filename";
if ($counter eq "0") {
- $row_data{COLOR} = "$color0";
+ $row_data{COLOR} = 0;
} else {
- $row_data{COLOR} = "$color1";
+ $row_data{COLOR} = 1;
}
}
|
|
From: Rob H. <for...@us...> - 2002-02-03 03:54:55
|
Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv23801/bin
Modified Files:
sandweb.cgi
Log Message:
moved hard-coded color info in Browse.pm out into browse_module.html thanks
to <TMPL_IF> and <TMPL_ELSE> statements.
The logic is exactly the same inside Browse.pm, just had to change
"$color0" to 0 and "$color1" to 1. Rad ;)
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.149
retrieving revision 1.150
diff -U2 -r1.149 -r1.150
--- sandweb.cgi 2002/02/03 03:45:05 1.149
+++ sandweb.cgi 2002/02/03 03:54:52 1.150
@@ -227,5 +227,5 @@
my $r = CGI::param('root');
my $nr = CGI::param('new_repository');
- my $s = CGI::param('Submit');
+ my $s2 = CGI::param('Submit');
repository_menu(
ck_auth => $ck_auth,
@@ -238,5 +238,5 @@
root => $r,
new_repository => $nr,
- submit => $s,
+ submit => $s2,
);
}
@@ -1152,5 +1152,5 @@
my @connections = $repository->get_connections();
my @repo_types = $repository->get_repo_types();
- my $repository_selected = ($repository_selected) ? $repository_selected : $repos[0]; # default for pulldown
+ $repository_selected = ($repository_selected) ? $repository_selected : $repos[0]; # default for pulldown
# loop data
|
|
From: Rob H. <for...@us...> - 2002-02-03 03:45:08
|
Update of /cvsroot/sandweb/sandweb/templates
In directory usw-pr-cvs1:/tmp/cvs-serv22094/templates
Modified Files:
view_file.html
Log Message:
edit is now implemented as a <TMPL_IF> instead of hard-coded
HTML in the CGI.
Also removed "FULLPATH" variable from CGI, that's old
stuff from before the File object existed.
Index: view_file.html
===================================================================
RCS file: /cvsroot/sandweb/sandweb/templates/view_file.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- view_file.html 2002/01/31 23:31:58 1.27
+++ view_file.html 2002/02/03 03:45:05 1.28
@@ -10,5 +10,7 @@
<input type="hidden" name="action" value="file" />
<a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=file&file_command=download&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">download</a>
- <TMPL_VAR NAME=EDIT>
+ <TMPL_IF NAME=EDIT>
+ <a href="<TMPL_VAR NAME=PROGNAME>/<TMPL_VAR NAME=FILENAME>?action=file&file_command=edit&location=<TMPL_VAR NAME=LOCATION>&filename=<TMPL_VAR NAME=FILENAME>">edit</a>
+ </TMPL_IF>
<TMPL_VAR NAME=ERROR>
<br />
|
3 messages has been excluded from this view by a project administrator.
