From: Rob H. <for...@us...> - 2002-02-20 04:46:58
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv19565/bin Modified Files: sandweb.cgi Log Message: file commands behaving more sanely now; took out "current location" from everywhere but browse_module_menu, it's broken now and also the implemention was a hack. Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.191 retrieving revision 1.192 diff -U2 -r1.191 -r1.192 --- sandweb.cgi 19 Feb 2002 09:35:29 -0000 1.191 +++ sandweb.cgi 20 Feb 2002 04:46:55 -0000 1.192 @@ -826,4 +826,5 @@ ck_auth => $ck_auth, location => $location, + module_name => $module_name, ); } @@ -835,5 +836,5 @@ 'log_obj' => $log, 'filename' => $entry, - 'location' => "$users_dir/$username$location$module_name", + 'location' => "$users_dir/$username/$module_name$location", ); @@ -883,5 +884,5 @@ 'log_obj' => $log, 'filename' => $filename, - 'location' => "$users_dir/$username$location$module_name", + 'location' => "$users_dir/$username/$module_name$location", ); } @@ -941,5 +942,5 @@ $log->debug("saving edited file : $filename"); - $log->debug("editing $users_dir/$username$location/$filename"); + $log->debug("editing $users_dir/$username/$module_name$location/$filename"); $file->file_write( 'location' => "$location", @@ -967,9 +968,9 @@ ); } - $log->debug("reading $users_dir/$username/$location/$filename"); + $log->debug("reading $users_dir/$username/$module_name$location/$filename"); my $content = $file->file_read(); - $log->debug("closing $users_dir/$username/$location/$filename"); + $log->debug("closing $users_dir/$username/$module_name$location/$filename"); $content = $ui->get_menu( MENU => 'edit_file', @@ -999,13 +1000,14 @@ browse_module_menu( ck_auth => $ck_auth, - location => "$location$module_name", - ); + location => $location, + module_name => $module_name, + ); exit 0; } my $content = $ui->get_menu( MENU => 'create_file', - MODULE_NAME => $module_name, PROGNAME => $progname, LOCATION => $location, + MODULE_NAME => $module_name, ); @@ -1024,10 +1026,11 @@ if ($file) { $file->create_folder(); - browse_module_menu( - ck_auth => $ck_auth, - location => $location, - ); exit 0; } + browse_module_menu( + ck_auth => $ck_auth, + location => $location, + module_name => $module_name, + ); my $content = $ui->get_menu( @@ -1058,5 +1061,5 @@ 'log_obj' => $log, 'filename' => $filename, - 'location' => "$users_dir/$username$location$module_name", + 'location' => "$users_dir/$username/$module_name$location", ); $file->upload( @@ -1064,7 +1067,8 @@ ); - browse_module_menu( + browse_module_menu( ck_auth => $ck_auth, location => $location, + module_name => $module_name, ); } @@ -1095,4 +1099,5 @@ ck_auth => $ck_auth, location => $location, + module_name => $module_name, ); } |