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-03-07 08:07:42
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv17724/templates Modified Files: tool_bar.html Log Message: ok, rename_file is now rename. funny, i didn't notice, but I did name the method "rename" not "rename_file" in the File class, but called it "rename_file" every where else .. odd :) Index: tool_bar.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/tool_bar.html,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- tool_bar.html 1 Mar 2002 07:11:59 -0000 1.5 +++ tool_bar.html 7 Mar 2002 08:07:39 -0000 1.6 @@ -11,5 +11,5 @@ <input type="submit" name="action" value="create_folder" accesskey="o" /> <input type="submit" name="action" value="delete_file" accesskey="d" /> - <input type="submit" name="action" value="rename_file" accesskey="r" /> + <input type="submit" name="action" value="rename" accesskey="r" /> <input type="submit" name="action" value="upload_file" accesskey="u" /> </td> |
From: Rob H. <for...@us...> - 2002-03-07 05:16:46
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv29235 Modified Files: browse_module_header.html Log Message: * nick _definitely_ has a point about scrollbars and resizeable on the popups, I still think the width needs to be 640 to accomodate CVS commands without having to resize all the time. Index: browse_module_header.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/browse_module_header.html,v retrieving revision 1.6 retrieving revision 1.7 diff -U2 -r1.6 -r1.7 --- browse_module_header.html 5 Mar 2002 23:29:05 -0000 1.6 +++ browse_module_header.html 7 Mar 2002 05:16:43 -0000 1.7 @@ -2,5 +2,5 @@ window.name = "mainWindow"; function myOpenWindow() { - window.open('about:blank','popUp','width=640,height=400'); + window.open('about:blank','popUp','width=640,height=400,scrollbars=yes,resizable=yes'); } </script> |
From: Rob H. <for...@us...> - 2002-03-07 05:13:16
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv28496 Modified Files: commit.html tag.html upload_file.html Log Message: * all the menu's that have commits have this hidden "Submit" variable now. Index: commit.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/commit.html,v retrieving revision 1.12 retrieving revision 1.13 diff -U2 -r1.12 -r1.13 --- commit.html 28 Feb 2002 04:33:29 -0000 1.12 +++ commit.html 7 Mar 2002 05:13:13 -0000 1.13 @@ -9,4 +9,5 @@ <input type="hidden" name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" /> <input type="hidden" name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" /> + <input name="Submit" value="1" type="hidden" /> <input type="text" name="message" /> <input type="submit" name="commit" value="Done" /> Index: tag.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/tag.html,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- tag.html 28 Feb 2002 04:33:29 -0000 1.5 +++ tag.html 7 Mar 2002 05:13:13 -0000 1.6 @@ -7,4 +7,5 @@ <input type="hidden" name="filename" value="<TMPL_VAR NAME=FILENAME>" /> <input type="hidden" name="location" value="<TMPL_VAR NAME=LOCATION>" /> + <input name="Submit" value="1" type="hidden" /> <input type="text" name="name" /> <input type="submit" name="commit" value="Done" /> Index: upload_file.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/upload_file.html,v retrieving revision 1.16 retrieving revision 1.17 diff -U2 -r1.16 -r1.17 --- upload_file.html 1 Mar 2002 08:10:12 -0000 1.16 +++ upload_file.html 7 Mar 2002 05:13:13 -0000 1.17 @@ -8,4 +8,5 @@ <input name="location" value="<TMPL_VAR NAME=LOCATION>" type="hidden" /> <input name="filename" value="<TMPL_VAR NAME=FILENAME>" type="hidden" /> +<input name="Submit" value="1" type="hidden" /> Enter a file to upload:<br /> <input name="filehandle" type="file" /><br /> |
From: Rob H. <for...@us...> - 2002-03-07 05:11:19
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv27116/templates Modified Files: create_file.html create_folder.html Log Message: * ok, resolved that bug where pressing the submit button submitted, while pressing enter would pull up the *_menu in the mainWindow. What I did was, put a hidden variable for "Submit" into these menus, so any submission of that page causes the corresponding commit menu to be called. NOTE: this makes a "Cancel" button really hard to implement, since we use popups the user can just close the window so this shouldn't be a problem usability-wise. Interestingly, this is the opposite of the traditional Macintosh popup, where closing accepts, and it has a "Cancel" button. I always thought they got that backwards, here's a chance to prove it :) Index: create_file.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/create_file.html,v retrieving revision 1.16 retrieving revision 1.17 diff -U2 -r1.16 -r1.17 --- create_file.html 1 Mar 2002 08:10:12 -0000 1.16 +++ create_file.html 7 Mar 2002 05:11:15 -0000 1.17 @@ -7,4 +7,5 @@ <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" /> <input name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" type="hidden" /> +<input name="Submit" value="1" type="hidden" /> Enter filename : <br /> Index: create_folder.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/create_folder.html,v retrieving revision 1.14 retrieving revision 1.15 diff -U2 -r1.14 -r1.15 --- create_folder.html 1 Mar 2002 08:10:12 -0000 1.14 +++ create_folder.html 7 Mar 2002 05:11:15 -0000 1.15 @@ -8,4 +8,5 @@ <input name="module_name" value="<TMPL_VAR NAME=MODULE_NAME>" type="hidden" /> <input name="repo_name" value="<TMPL_VAR NAME=REPO_NAME>" type="hidden" /> +<input name="Submit" value="1" type="hidden" /> Enter foldername:<br /> <input name="filename" type="text" /><br /> |
From: Rob H. <for...@us...> - 2002-03-07 05:06:08
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv26467/bin Modified Files: sandweb.cgi Log Message: * rename_file implemented ( name's a little misleading, as it should work for dirs too. haven't tested though ). Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.250 retrieving revision 1.251 diff -U2 -r1.250 -r1.251 --- sandweb.cgi 5 Mar 2002 07:52:08 -0000 1.250 +++ sandweb.cgi 7 Mar 2002 05:06:03 -0000 1.251 @@ -245,4 +245,25 @@ ); } + elsif ( $action eq 'rename_file' ) { + # called file renamer + if ($submit) { + rename_file_commit( + ck_auth => $ck_auth, + filename => CGI::param('filename'), + tofile => CGI::param('tofile'), + module_name => $module_name, + repo_name => $repo_name, + location => CGI::param('location'), + ); + } else { + rename_file_menu( + ck_auth => $ck_auth, + filename => CGI::param('filename'), + module_name => $module_name, + repo_name => $repo_name, + location => CGI::param('location'), + ); + } + } elsif ( $action eq 'create_file' ) { # called file creator @@ -1078,4 +1099,70 @@ ############################################################################### +# rename file menu +# +# rename a file +# +# A File object is created and used. +# +# args: +# ck_auth - the sessions cookie +# filename - name of the file(s) that the File object should +# be invoked with. +# location - system path to the file(s) specified by filename +# repo_name - name of the current repository. +# module_name - name of the current module. +# template_dir - location of templates. +# users_dir - location of user sandbox directories. +############################################################################### +sub rename_file_menu { + my %args = @_; + + my $ck_auth = $args{'ck_auth'}; + if (! load_config()) { + # no existing user config, forward to prefs menu + preferences_menu( ck_auth => $ck_auth ); + } + + my $location = $args{'location'}; + my $username = $auth->get_username(); + my $template_dir = $config->{'paths'}->{'template_dir'}; + my $users_dir = $config->{'paths'}->{'users_dir'}; + my $repo_name = $args{'repo_name'}; + my $module_name = $args{'module_name'}; + my $filename = $args{'filename'}; + + $log->debug("viewing file : $filename"); + + $log->debug("creating File object: $filename"); + my $file = SandWeb::File->new( + 'config_obj' => $config, + 'log_obj' => $log, + 'filename' => $filename, + 'location' => "$users_dir/$username/$repo_name/$module_name$location", + ); + + my $content = $ui->get_menu( + MENU => 'rename_file', + PROGNAME => $progname, + MODULE_NAME => $module_name, + REPO_NAME => $repo_name, + LOCATION => $location, + FILENAME => $filename, + ); + + print CGI::header( -cookie => $ck_auth ); + $ui->print_popup( + TITLE=> 'SandWeb : rename file', + MENU_TITLE => 'SandWeb', + SUBMENU_TITLE => 'rename file', + FILENAME => $filename, + LOCATION => $location, + FOOTER => '', + CONTENT => $content, + MESSAGE => $message, + ); +} + +############################################################################### # create file menu # @@ -1379,4 +1466,53 @@ FOOTER => '', CONTENT => $content, + ); +} + +############################################################################### +# rename_file_commit is called by rename_file_menu to rename a file +# +# A File object is created and used. +# +# args: +# ck_auth - the sessions cookie +# filename - name of the file(s) that the File object should +# be invoked with. +# tofile - name we are changing this file to +# location - system path to the file(s) specified by filename +# repo_name - name of the current repository. +# module_name - name of the current module. +# template_dir - location of templates. +# users_dir - location of user sandbox directories. +############################################################################### +sub rename_file_commit { + my %args = @_; + + my $ck_auth = $args{'ck_auth'}; + my $location = $args{'location'}; + my $username = $auth->get_username(); + my $template_dir = $config->{'paths'}->{'template_dir'}; + my $users_dir = $config->{'paths'}->{'users_dir'}; + my $repo_name = $args{'repo_name'}; + my $module_name = $args{'module_name'}; + my $filename = $args{'filename'}; + my $tofile = $args{'tofile'}; + + my $file = SandWeb::File->new( + 'config_obj' => $config, + 'log_obj' => $log, + 'filename' => $filename, + 'location' => "$users_dir/$username/$repo_name/$module_name$location", + ); + + my $error = $file->rename( tofile => $tofile ); + unless ($error) { + set_message("Could not rename $filename to $tofile"); + } + + browse_module_menu( + ck_auth => $ck_auth, + location => $location, + module_name => $module_name, + repo_name => $repo_name, ); } |
From: Rob H. <for...@us...> - 2002-03-07 05:06:08
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv26467/lib/SandWeb Modified Files: File.pm Log Message: * rename_file implemented ( name's a little misleading, as it should work for dirs too. haven't tested though ). Index: File.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v retrieving revision 1.48 retrieving revision 1.49 diff -U2 -r1.48 -r1.49 --- File.pm 4 Mar 2002 06:44:46 -0000 1.48 +++ File.pm 7 Mar 2002 05:06:03 -0000 1.49 @@ -301,7 +301,10 @@ my $tofile = $args{'tofile'}; - $log->debug("renaming file : $location/$filename to $tofile"); + $log->debug("renaming file : $location/$filename to $location/$tofile"); - my $return = rename( "$location/$filename", "$tofile" ); + my $return = rename( "$location/$filename", "$location/$tofile" ); + unless ($return) { + $log->debug("renaming failed : $!"); + } return $return; |
From: Rob H. <for...@us...> - 2002-03-05 23:29:08
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv8609 Modified Files: browse_module_header.html Log Message: made the popup wider Index: browse_module_header.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/browse_module_header.html,v retrieving revision 1.5 retrieving revision 1.6 diff -U2 -r1.5 -r1.6 --- browse_module_header.html 2 Mar 2002 05:06:58 -0000 1.5 +++ browse_module_header.html 5 Mar 2002 23:29:05 -0000 1.6 @@ -2,5 +2,5 @@ window.name = "mainWindow"; function myOpenWindow() { - window.open('about:blank','popUp','width=400,height=480'); + window.open('about:blank','popUp','width=640,height=400'); } </script> |
From: Rob H. <for...@us...> - 2002-03-05 07:52:12
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv5990 Modified Files: sandweb.cgi Log Message: delete_file updates mainWindow for you now Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.249 retrieving revision 1.250 diff -U2 -r1.249 -r1.250 --- sandweb.cgi 5 Mar 2002 07:41:32 -0000 1.249 +++ sandweb.cgi 5 Mar 2002 07:52:08 -0000 1.250 @@ -1294,4 +1294,5 @@ my $repo_name = $args{'repo_name'}; my $module_name = $args{'module_name'}; + my $prev_url = "$ENV{'HTTP_REFERER'}"; my @filename = (); my $count = 0; @@ -1375,4 +1376,5 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => "delete file", + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, |
From: Rob H. <for...@us...> - 2002-03-05 07:41:35
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv3644 Modified Files: sandweb.cgi Log Message: *delete produces sane output via popup *deletes folders by recurse *will NOT delete . recursively, this is the repository_menu's job Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.248 retrieving revision 1.249 diff -U2 -r1.248 -r1.249 --- sandweb.cgi 5 Mar 2002 07:07:57 -0000 1.248 +++ sandweb.cgi 5 Mar 2002 07:41:32 -0000 1.249 @@ -1312,15 +1312,27 @@ ); - unless (@filename) { + unless ( @filename || @filename eq '.' ) { $log->debug("no files selected for removal"); - set_message("Please select file(s) or folder(s) to delete."); - browse_module_menu( - ck_auth => $ck_auth, - location => $location, - module_name => $module_name, - repo_name => $repo_name, + my $content = $ui->get_menu( + MENU => 'output', + LOCATION => $location, + FILENAME => '', + PROGNAME => $progname, + OUTPUT => "Please select files or folders to delete", + ERROR => "No files selected", + ); + + print CGI::header( -cookie => $ck_auth ); + $ui->print_popup( + TITLE=> "SandWeb : delete file", + MENU_TITLE => 'SandWeb', + SUBMENU_TITLE => "delete file", + FOOTER => '', + CONTENT => $content, + MESSAGE => $message, ); } + my $error; foreach my $entry (@filename) { $log->debug("creating File object"); @@ -1331,13 +1343,17 @@ ); - $log->debug("removing file"); + $log->debug("attempting to delete @filename"); if ($file) { if ( $file->get_file_type() eq 'Directory' ) { - $file->delete_folder(); + if ( $file->delete_folder(recurse => "yes")) { + $error = "$filename deleted"; + } else { + $error = "Cannot delete $filename"; + } } else { if ( $file->delete_file() ) { - set_message("$filename deleted."); + $error = "$filename deleted."; } else { - set_message("Cannot delete $filename."); + $error = "Cannot delete $filename."; } } @@ -1345,9 +1361,20 @@ } - browse_module_menu( - ck_auth => $ck_auth, - location => $location, - module_name => $module_name, - repo_name => $repo_name, + my $content = $ui->get_menu( + MENU => 'output', + LOCATION => $location, + FILENAME => "@filename", + PROGNAME => $progname, + OUTPUT => "Deleting file : @filename", + ERROR => "$error", + ); + + print CGI::header( -cookie => $ck_auth ); + $ui->print_popup( + TITLE=> "SandWeb : delete file", + MENU_TITLE => 'SandWeb', + SUBMENU_TITLE => "delete file", + FOOTER => '', + CONTENT => $content, ); } @@ -1658,5 +1685,4 @@ MESSAGE => $message, ); - exit 0; } my $content = $ui->get_menu( |
From: Rob H. <for...@us...> - 2002-03-05 07:09:00
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv29989 Added Files: output.html Log Message: generic output template --- NEW FILE --- <tr> <td width="100%"> Current filename : <TMPL_VAR NAME=FILENAME> <br /> <form> <input name="<TMPL_VAR NAME=LOCATION>" type="hidden" /> <input name="<TMPL_VAR NAME=FULLPATH>" type="hidden" /> <input name="<TMPL_VAR NAME=PROGNAME>" type="hidden" /> </form> <font color="#FF0000"><TMPL_VAR NAME=ERROR></font> <pre><TMPL_VAR NAME=OUTPUT></pre> </td> </tr> |
From: Rob H. <for...@us...> - 2002-03-05 07:08:05
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv29683 Modified Files: sandweb.cgi Log Message: fixed edit/unedit output Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.247 retrieving revision 1.248 diff -U2 -r1.247 -r1.248 --- sandweb.cgi 4 Mar 2002 18:43:07 -0000 1.247 +++ sandweb.cgi 5 Mar 2002 07:07:57 -0000 1.248 @@ -1716,10 +1716,23 @@ ); } else { - set_message("VCS $vcs_command on @filename"); - browse_module_menu( - ck_auth => $ck_auth, - location => $location, - module_name => $module_name, - repo_name => $repo_name, + my $message = "vcs $vcs_command on @filename"; + my $content = $ui->get_menu( + MENU => 'vcs_output', + LOCATION => $location, + FILENAME => @filename, + PROGNAME => $progname, + VCS_OUTPUT => join('', @vcs_output), + VCS_ERROR => join('', @vcs_error), + ); + + print CGI::header( -cookie => $ck_auth ); + $ui->print_popup( + TITLE=> "SandWeb : VCS $vcs_command", + MENU_TITLE => 'SandWeb', + SUBMENU_TITLE => "VCS $vcs_command", + PREVIOUS_URL => $prev_url, + FOOTER => '', + CONTENT => $content, + MESSAGE => $message, ); } |
From: Rob H. <for...@us...> - 2002-03-04 18:43:14
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv29078 Modified Files: sandweb.cgi Log Message: repo_root and vcsroot are the same thing with different names. removed vcsroot in favor of repo_root. Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.246 retrieving revision 1.247 diff -U2 -r1.246 -r1.247 --- sandweb.cgi 4 Mar 2002 05:05:25 -0000 1.246 +++ sandweb.cgi 4 Mar 2002 18:43:07 -0000 1.247 @@ -539,25 +539,23 @@ my $repo_root = $user->get_repo_root(repo => $repo_name); - my $vcsroot; - if ( $repo_type eq 'CVS' ) { $log->debug("repo_type is CVS"); if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } } - if ( $vcsroot ) { - $log->debug("setting up vcsroot $vcsroot"); + if ( $repo_root ) { + $log->debug("setting up repo_root $repo_root"); } else { - $log->debug("no vcsroot set!"); + $log->debug("no repo_root set!"); } $log->debug("creating Repository object"); my $repository = SandWeb::Repository->new( - 'root' => "$vcsroot", + 'root' => "$repo_root", 'repo_type' => $repo_type, ); @@ -792,5 +790,4 @@ # selected repository data - my $vcsroot; my $repository = SandWeb::Repository->new( @@ -1610,11 +1607,10 @@ my @vcs_output = (); my @vcs_error = (); - my $vcsroot; if ( $repo_type eq 'CVS' ) { if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } } @@ -1827,5 +1823,4 @@ # - my $vcsroot; my @vcs_output = (); my @vcs_error = (); @@ -1833,7 +1828,7 @@ if ( $repo_type eq 'CVS' ) { if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } @@ -1841,5 +1836,5 @@ my $repository = SandWeb::Repository->new( - root => $vcsroot, + root => $repo_root, repo_type => $repo_type, sandbox => "$users_dir/$username/$repo_name", |
From: Nick J. <nje...@us...> - 2002-03-04 09:15:45
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv17563/templates Modified Files: framework.html sandbox.html Log Message: * Fixed some HTML formatting to get rid of wasted space between the main sandweb menu's and the content. Some table mangling etc. Index: framework.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/framework.html,v retrieving revision 1.17 retrieving revision 1.18 diff -U2 -r1.17 -r1.18 --- framework.html 28 Feb 2002 04:31:08 -0000 1.17 +++ framework.html 4 Mar 2002 09:15:40 -0000 1.18 @@ -16,9 +16,9 @@ <body bgcolor="#EEEEEE" link="#3344AA" vlink="#3344AA"> - <table border="0" align="center" width="100%" cellpadding="4" cellspacing="0"> + <table border="0" align="center" width="100%" cellpadding="3" cellspacing="0" valign="top"> <tr> <td width="100%" align="center" colspan="3"> - <table width="100%" border="0"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td width="25%"> @@ -41,5 +41,5 @@ <td width="50%" valign="center" align="center" bgcolor="#000000" colspan="2"> - <table border="0" width="100%" align="center"> + <table border="0" width="100%" align="center" valign="top" cellspacing="2" cellpadding="2"> <tr> <td width="100%" align="center" bgcolor="#CCDDCC"> @@ -59,7 +59,7 @@ </tr> <tr> - <td width="100%" align="center" colspan="3"> + <td width="100%" align="center" colspan="3" valign="top"> - <table width="100%" border="0" align="center" valign="top"> + <table width="100%" border="0" align="center" valign="top" cellspacing="0" cellpadding="0"> <tr> <td width="100%" align="center" valign="center"> @@ -69,9 +69,7 @@ <tr> <td width="100%" align="left" valign="top"> - - <table width="100%" align="left" valign="top"> - <TMPL_VAR NAME=CONTENT><br /> + <table width="100%" border="0" align="left" valign="top" cellspacing="0" cellpadding="0"> + <TMPL_VAR NAME=CONTENT> </table> - </td> </tr> Index: sandbox.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v retrieving revision 1.15 retrieving revision 1.16 diff -U2 -r1.15 -r1.16 --- sandbox.html 2 Mar 2002 08:13:32 -0000 1.15 +++ sandbox.html 4 Mar 2002 09:15:40 -0000 1.16 @@ -8,5 +8,4 @@ </script> <tr> - <tr> <td width="100%" align="left" colspan="2"> <table width="100%" align="left" border="1"> |
From: Rob H. <for...@us...> - 2002-03-04 06:44:50
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv4653/lib/SandWeb Modified Files: File.pm Log Message: disabled logging in _delete_tree method until i can figure out what's wrong. Index: File.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v retrieving revision 1.47 retrieving revision 1.48 diff -U2 -r1.47 -r1.48 --- File.pm 2 Mar 2002 07:20:14 -0000 1.47 +++ File.pm 4 Mar 2002 06:44:46 -0000 1.48 @@ -257,5 +257,5 @@ 'filename' => "$filename", 'contents' => "$contents", - 'log_obj' => $log, + 'log_obj' => "$log", ); } else { @@ -441,10 +441,14 @@ $return = rmdir("$location/$filename/$file"); unless ($return) { - $log->debug("error deleting dir $location/$filename/$file: $!"); +# +# XXX - log not working here +# $log->debug("error deleting dir $location/$filename/$file: $!"); } } else { $return = unlink("$location/$filename/$file"); unless ($return) { - $log->debug("error deleting file $location/$filename/$file: $!"); +# +# XXX - log not working here +# $log->debug("error deleting file $location/$filename/$file: $!"); } } @@ -452,5 +456,7 @@ $return = rmdir("$location/$filename"); unless ($return) { - $log->debug("error deleting dir $location/$filename/$file: $!"); +# +# XXX - log not working here +# $log->debug("error deleting dir $location/$filename/$file: $!"); } } |
From: Nick J. <nje...@us...> - 2002-03-04 05:05:28
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv17737/bin Modified Files: sandweb.cgi Log Message: * added deletion of module directory to go along with data struct. same with repository deletion. However, the recursive delete_folder() method in file does not work for me. Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.245 retrieving revision 1.246 diff -U2 -r1.245 -r1.246 --- sandweb.cgi 2 Mar 2002 22:53:51 -0000 1.245 +++ sandweb.cgi 4 Mar 2002 05:05:25 -0000 1.246 @@ -1817,4 +1817,8 @@ ); } + + my $username = $auth->get_username(); + my $template_dir = $config->{'paths'}->{'template_dir'}; + my $users_dir = $config->{'paths'}->{'users_dir'}; if ($do_vcs_action) { @@ -1822,7 +1826,4 @@ # DO VCS ACTION (Update or Checkout) # - my $username = $auth->get_username(); - my $template_dir = $config->{'paths'}->{'template_dir'}; - my $users_dir = $config->{'paths'}->{'users_dir'}; my $vcsroot; @@ -1899,13 +1900,20 @@ # if ($user->module_exists(repo => $repo_name, module => $module_name)) { - $user->delete_module(repo => $repo_name, module => $module_name); - # XXX # DELETE MODULE DIRECTORY - # XXX - Ask rob how currently we are doing this? + $user->delete_module(repo => $repo_name, module => $module_name); + my $file = SandWeb::File->new( + 'log_obj' => $log, + 'filename' => $module_name, + 'location' => "$users_dir/$username/$repo_name", + ); + if ($file->delete_folder(recurse => 1)) { + my $return = write_config(); + } else { + set_message("failed removing '$module_name' from system : $!"); + } } else { set_message("module '$module_name' does not exist."); $log->debug("module list for repo '$repo_name': " . join('-', $user->get_module_list(repo => $repo_name))); } - my $return = write_config(); sandbox_menu( ck_auth => $ck_auth ); exit(0); @@ -2021,5 +2029,14 @@ # delete repository entry $log->debug("deleting $repository_selected"); - if ((!$repository_selected) || ($repository_selected eq $new_string)) { + my $file = SandWeb::File->new( + 'log_obj' => $log, + 'filename' => $repo_name, + 'location' => $config->{'paths'}->{'users_dir'}. "/" . $auth->get_username(), + ); + if (!$file->delete_folder(recurse => 1)) { + set_message("unable to remove repository '$repo_name' from system."); + repository_menu(ck_auth => $ck_auth); + exit(0); + } elsif ((!$repository_selected) || ($repository_selected eq $new_string)) { # cannot commit without repository name $log->error("cannot delete without repository name!\n"); @@ -2028,4 +2045,5 @@ exit(0); } + $user->delete_repo( name => $repository_selected ); # XXX - delete repository directory RECURSIVE |
From: Rob H. <for...@us...> - 2002-03-02 22:53:54
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv17896/bin Modified Files: sandweb.cgi Log Message: enabled onload reload of parent for all vcs commands Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.244 retrieving revision 1.245 diff -U2 -r1.244 -r1.245 --- sandweb.cgi 2 Mar 2002 08:15:27 -0000 1.244 +++ sandweb.cgi 2 Mar 2002 22:53:51 -0000 1.245 @@ -1592,4 +1592,6 @@ my $users_dir = $config->{'paths'}->{'users_dir'}; my $repo_name = $args{'repo_name'}; + my $prev_url = "$ENV{'HTTP_REFERER'}"; + $log->debug("prev_url $prev_url"); my %return; @@ -1655,4 +1657,5 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => "VCS $vcs_command", + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, @@ -1674,4 +1677,5 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => 'commit file(s)', + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, @@ -1710,4 +1714,5 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => "VCS $vcs_command", + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, @@ -1751,4 +1756,5 @@ MENU_TITLE => 'SandWeb', SUBMENU_TITLE => "VCS $vcs_command", + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, |
From: Nick J. <nje...@us...> - 2002-03-02 08:20:06
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv16082/templates Modified Files: repository.html Log Message: * updated javascript dialog warning Index: repository.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/repository.html,v retrieving revision 1.11 retrieving revision 1.12 diff -U2 -r1.11 -r1.12 --- repository.html 28 Feb 2002 04:57:13 -0000 1.11 +++ repository.html 2 Mar 2002 08:20:03 -0000 1.12 @@ -30,5 +30,5 @@ function checkForm(clicked) { if (clicked == 'Delete') { - if (confirm("Are you sure you wish to delete this repository?")) { + if (confirm("Deleting this repository will also delete all modules checked out from this repository. Are you sure you wish to do this?")) { return true; } |
From: Nick J. <nje...@us...> - 2002-03-02 08:15:30
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv15491/bin Modified Files: sandweb.cgi Log Message: * modified menu popup title a bit * added HTTP_REFERER setting to print_popup() Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.243 retrieving revision 1.244 diff -U2 -r1.243 -r1.244 --- sandweb.cgi 1 Mar 2002 08:33:38 -0000 1.243 +++ sandweb.cgi 2 Mar 2002 08:15:27 -0000 1.244 @@ -1874,9 +1874,13 @@ ); + $log->debug("HTTP_REFERER: $ENV{'HTTP_REFERER'}"); + my $prev_url = "$ENV{'HTTP_REFERER'}"; + $log->debug("prev_url $prev_url"); print CGI::header( -cookie => $ck_auth ); $ui->print_popup( - TITLE=> "SandWeb : sandbox", + TITLE=> "SandWeb : vcs output", MENU_TITLE => 'SandWeb', - SUBMENU_TITLE => "sandbox", + SUBMENU_TITLE => "vcs output", + PREVIOUS_URL => $prev_url, FOOTER => '', CONTENT => $content, |
From: Nick J. <nje...@us...> - 2002-03-02 08:14:44
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv15437/lib/SandWeb Modified Files: UI.pm Log Message: * added PREVIOUS_URL to UI.pm -> print_popup() Index: UI.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/UI.pm,v retrieving revision 1.30 retrieving revision 1.31 diff -U2 -r1.30 -r1.31 --- UI.pm 2 Mar 2002 05:00:00 -0000 1.30 +++ UI.pm 2 Mar 2002 08:14:41 -0000 1.31 @@ -88,4 +88,5 @@ MENU_TITLE => $args{'MENU_TITLE'}, CONTENT => $args{'CONTENT'}, + PREVIOUS_URL => $args{'PREVIOUS_URL'}, DEBUG => \@debug_msgs, MESSAGE => $message, |
From: Nick J. <nje...@us...> - 2002-03-02 08:14:13
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv15359/templates Modified Files: popup.html Log Message: * now the popup will reload the parent when the popup page is finished loading Index: popup.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/popup.html,v retrieving revision 1.1 retrieving revision 1.2 diff -U2 -r1.1 -r1.2 --- popup.html 2 Mar 2002 05:12:16 -0000 1.1 +++ popup.html 2 Mar 2002 08:14:10 -0000 1.2 @@ -14,5 +14,5 @@ --> </style> - <body bgcolor="#EEEEEE" link="#3344AA" vlink="#3344AA"> + <body bgcolor="#EEEEEE" link="#3344AA" vlink="#3344AA" onLoad="window.open('<TMPL_VAR NAME=PREVIOUS_URL>', 'mainWindow')"> <table border="0" align="center" width="100%" cellpadding="4" cellspacing="0"> |
From: Nick J. <nje...@us...> - 2002-03-02 08:13:35
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv15300/templates Modified Files: sandbox.html Log Message: * modified vcs output popup window. Index: sandbox.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/sandbox.html,v retrieving revision 1.14 retrieving revision 1.15 diff -U2 -r1.14 -r1.15 --- sandbox.html 28 Feb 2002 07:46:20 -0000 1.14 +++ sandbox.html 2 Mar 2002 08:13:32 -0000 1.15 @@ -1,2 +1,10 @@ +<script language="JavaScript"> +<!-- + window.name = "mainWindow"; + function myOpenWindow() { + window.open('about:blank','popUp','width=400,height=300,scrollbars=yes,resizable=yes'); + } +--> +</script> <tr> <tr> @@ -20,5 +28,5 @@ - <form name="module" submit="<TMPL_VAR NAME=PROGNAME>"> + <form name="module" submit="<TMPL_VAR NAME=PROGNAME>" onsubmit="myOpenWindow()" target="popUp"> <input type="hidden" name="action" value="sandbox" /> <tr> |
From: Nick J. <nje...@us...> - 2002-03-02 08:12:48
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv15200/templates Modified Files: vcs_output.html Log Message: * took out un-used href/javascript link to reload parent Index: vcs_output.html =================================================================== RCS file: /cvsroot/sandweb/sandweb/templates/vcs_output.html,v retrieving revision 1.16 retrieving revision 1.17 diff -U2 -r1.16 -r1.17 --- vcs_output.html 2 Mar 2002 00:12:02 -0000 1.16 +++ vcs_output.html 2 Mar 2002 08:12:45 -0000 1.17 @@ -1,3 +1,2 @@ -<a href="javascript:location.reload();" target="mainWindow">reload parent</a> <tr> <td width="100%"> |
From: Rob H. <for...@us...> - 2002-03-02 07:24:28
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv8741/lib/SandWeb Modified Files: Repository.pm Log Message: CVS should be called with directory => 1, and prune => 1 by default. This is the equivalent to -dP to the CVS command, which causes directories to be checked out, but not if they are empty. Index: Repository.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository.pm,v retrieving revision 1.24 retrieving revision 1.25 diff -U2 -r1.24 -r1.25 --- Repository.pm 25 Feb 2002 23:52:24 -0000 1.24 +++ Repository.pm 2 Mar 2002 07:24:26 -0000 1.25 @@ -527,4 +527,11 @@ ); + unless ($prune) { + $prune = 1; + } + unless ($directories) { + $directories = 1; + } + if ($repo_type eq 'CVS') { %return = $vcs->update( |
From: Rob H. <for...@us...> - 2002-03-02 07:20:17
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb In directory usw-pr-cvs1:/tmp/cvs-serv8178/lib/SandWeb Modified Files: File.pm Log Message: implemented recurse param in delete_folder Index: File.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/File.pm,v retrieving revision 1.46 retrieving revision 1.47 diff -U2 -r1.46 -r1.47 --- File.pm 1 Mar 2002 01:09:38 -0000 1.46 +++ File.pm 2 Mar 2002 07:20:14 -0000 1.47 @@ -172,5 +172,5 @@ } - print "Content-Type:$mime_type\n\n"; + print "content-type: text/html\n\n"; if (open FILE,"< $location/$filename") { @@ -247,10 +247,19 @@ my $filename = $self->{'filename'}; my $log = $self->{'log_obj'}; - my $force = $args{'force'}; my $recurse = $args{'recurse'}; + my $return; $log->debug("removing folder : $location/$filename"); - my $return = rmdir("$location/$filename" ); + if ($recurse) { + $return = _delete_tree( + 'location' => "$location", + 'filename' => "$filename", + 'contents' => "$contents", + 'log_obj' => $log, + ); + } else { + $return = rmdir("$location/$filename"); + } return $return; @@ -407,4 +416,44 @@ return join('', @contents); +} + +sub _delete_tree { + my %args = @_; + my $location = $args{'location'}; + my $filename = $args{'filename'}; + my $log = $args{'log_obj'}; + my $return; + + if ( -d "$location/$filename" ) { + opendir(DIR, "$location/$filename"); + my @files = readdir(DIR); + closedir(DIR); + foreach my $file (@files) { + next if ($file eq "."); + next if ($file eq ".."); + if ( -d "$location/$filename/$file" ) { + $return = _delete_tree( + 'location' => "$location/$filename", + 'filename' => "$file", + 'contents' => "$contents", + 'log_obj' => "$log", + ); + $return = rmdir("$location/$filename/$file"); + unless ($return) { + $log->debug("error deleting dir $location/$filename/$file: $!"); + } + } else { + $return = unlink("$location/$filename/$file"); + unless ($return) { + $log->debug("error deleting file $location/$filename/$file: $!"); + } + } + } + $return = rmdir("$location/$filename"); + unless ($return) { + $log->debug("error deleting dir $location/$filename/$file: $!"); + } + } + return $return; } |
From: Rob H. <for...@us...> - 2002-03-02 05:12:19
|
Update of /cvsroot/sandweb/sandweb/templates In directory usw-pr-cvs1:/tmp/cvs-serv19531/templates Added Files: popup.html Log Message: adding popup template --- NEW FILE --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title><TMPL_VAR NAME=TITLE></title> </head> <style> <!-- A:hover{color:#DD6644;} A:link{text-decoration: none} A:visited{text-decoration:none} --> </style> <body bgcolor="#EEEEEE" link="#3344AA" vlink="#3344AA"> <table border="0" align="center" width="100%" cellpadding="4" cellspacing="0"> <tr> <td width="100%" align="center" colspan="3"> <table width="100%" border="0"> <tr> <td width="25%">   <br /> </td> <td width="25%" align="right"> <font size="4"><b><TMPL_VAR NAME=MENU_TITLE></b></font> </td> <td width="25%" align="left"> : <TMPL_VAR NAME=SUBMENU_TITLE><br /> </td> <td width="25%">   <br /> </td> </tr> <tr> <td width="25%" align="center">   <br /> </td> <td width="25%">   <br/> </td> </tr> </table> </td> </tr> <tr> <td width="100%" align="center" colspan="3"> <table width="100%" border="0" align="center" valign="top"> <tr> <td width="100%" align="center" valign="center"> <font color="#EE6666"><TMPL_VAR NAME=MESSAGE></font><br /> </td> </tr> <tr> <td width="100%" align="left" valign="top"> <table width="100%" align="left" valign="top"> <TMPL_VAR NAME=CONTENT><br /> </table> </td> </tr> </table> </td> </tr> <tr> <td width="25%"> <br /> </td> <td width="25%"> <br /> </td> </tr> <tr> </table> <font color="#336633"> <TMPL_LOOP NAME="DEBUG"> <b><TMPL_VAR NAME=DEBUG_MSG></b><br /> </TMPL_LOOP> </font> </body> </html> |