Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv2127/bin
Modified Files:
sandweb.cgi
Log Message:
moved create_file into create_file_menu and create_file_commit subs
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.210
retrieving revision 1.211
diff -U2 -r1.210 -r1.211
--- sandweb.cgi 24 Feb 2002 05:46:05 -0000 1.210
+++ sandweb.cgi 24 Feb 2002 06:00:03 -0000 1.211
@@ -274,4 +274,24 @@
);
}
+ elsif ( $action eq 'create_file' ) {
+ # called file creator
+ if ($submit) {
+ create_file_commit(
+ ck_auth => $ck_auth,
+ filename => CGI::param('filename'),
+ module_name => $module_name,
+ repo_name => $repo_name,
+ location => CGI::param('location'),
+ )
+ } else {
+ create_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 'repository' ) {
if ($submit) {
@@ -1004,4 +1024,30 @@
}
+sub create_file_menu {
+ my %args = @_;
+
+ my $ck_auth = $args{'ck_auth'};
+ my $location = $args{'location'};
+ my $module_name = $args{'module_name'};
+ my $repo_name = $args{'repo_name'};
+
+ my $content = $ui->get_menu(
+ MENU => 'create_file',
+ PROGNAME => $progname,
+ LOCATION => $location,
+ MODULE_NAME => $module_name,
+ REPO_NAME => $repo_name,
+ );
+
+ print CGI::header( -cookie => $ck_auth );
+ $ui->print_screen(
+ TITLE=> 'SandWeb : create file',
+ MENU_TITLE => 'SandWeb',
+ SUBMENU_TITLE => 'create file',
+ FOOTER => '',
+ CONTENT => $content,
+ ERROR => $error,
+ );
+}
@@ -1056,8 +1102,8 @@
my $repo_server = $user->get_repo_server(repo => $repo_name);
- my $repo_username = $user->get_repo_username(repo => $repo_name);
- my $repo_type = $user->get_repo_type(repo => $repo_name);
- my $repo_connection = $user->get_repo_connection(repo => $repo_name);
- my $repo_root = $user->get_repo_root(repo => $repo_name);
+ my $repo_username = $user->get_repo_username(repo => $repo_name);
+ my $repo_type = $user->get_repo_type(repo => $repo_name);
+ my $repo_connection = $user->get_repo_connection(repo => $repo_name);
+ my $repo_root = $user->get_repo_root(repo => $repo_name);
my $vcsroot;
@@ -1090,35 +1136,5 @@
}
- if ( $file_command eq 'create_file' ) {
- if ($file) {
- $file->create_file();
- browse_module_menu(
- ck_auth => $ck_auth,
- location => $location,
- module_name => $module_name,
- repo_name => $repo_name,
- );
- exit 0;
- }
- my $content = $ui->get_menu(
- MENU => 'create_file',
- PROGNAME => $progname,
- LOCATION => $location,
- MODULE_NAME => $module_name,
- REPO_NAME => $repo_name,
- );
-
- print CGI::header( -cookie => $ck_auth );
- $ui->print_screen(
- TITLE=> 'SandWeb : create file',
- MENU_TITLE => 'SandWeb',
- SUBMENU_TITLE => 'create file',
- FOOTER => '',
- CONTENT => $content,
- ERROR => $error,
- );
- exit 0;
- }
- elsif ( $file_command eq 'create_folder' ) {
+ if ( $file_command eq 'create_folder' ) {
if ($file) {
$file->create_folder();
@@ -1148,5 +1164,4 @@
ERROR => $error,
);
- exit 0;
}
elsif ( $file_command eq 'upload' ) {
@@ -1190,5 +1205,4 @@
ERROR => $error,
);
- exit 0;
}
elsif ( $file_command eq 'download' ) {
@@ -1273,9 +1287,4 @@
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 $message = CGI::param('message');
@@ -1336,4 +1345,33 @@
}
+ browse_module_menu(
+ ck_auth => $ck_auth,
+ location => $location,
+ module_name => $module_name,
+ repo_name => $repo_name,
+ );
+}
+
+sub create_file_commit {
+ my %args = @_;
+
+ my $ck_auth = $args{'ck_auth'};
+ my $location = $args{'location'};
+ my $message = CGI::param('message');
+ 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("creating File object");
+ my $file = SandWeb::File->new(
+ 'log_obj' => $log,
+ 'filename' => $filename,
+ 'location' => "$users_dir/$username/$module_name$location",
+ );
+
+ $file->create_file();
browse_module_menu(
ck_auth => $ck_auth,
|
