[Sandweb-commit] CVS: sandweb/bin sandweb.cgi,1.296,1.297

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/bin
In directory usw-pr-cvs1:/tmp/cvs-serv28216/bin

Modified Files:
	sandweb.cgi 
Log Message:
changed "prefs" to "config"


Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.296
retrieving revision 1.297
diff -U2 -r1.296 -r1.297
--- sandweb.cgi	5 Jun 2002 00:51:49 -0000	1.296
+++ sandweb.cgi	5 Jun 2002 06:19:21 -0000	1.297
@@ -174,13 +174,13 @@
 				);
 			}
-			elsif ( $action eq 'preferences' ) {
+			elsif ( $action eq 'configuration' ) {
 				if (! $cgi->param('Submit')) {
-					# call preferences menu
-					preferences_menu( 
+					# call configuration menu
+					configuration_menu( 
 						ck_auth => $ck_auth,
 					);
 				} else {
 					# commit menu data
-					preferences_commit( 
+					configuration_commit( 
 						ck_auth => $ck_auth,
 					);
@@ -671,5 +671,5 @@
 	if (! load_config()) { 
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -819,5 +819,5 @@
 
 ###############################################################################
-# preferences menu
+# configuration menu
 #
 # user prefs, this is the menu for configuring the users prefs.cfg
@@ -826,5 +826,5 @@
 # 	ck_auth		- the sessions cookie
 ###############################################################################
-sub preferences_menu {
+sub configuration_menu {
 	my %args = @_;
 	my $ck_auth = $args{'ck_auth'};
@@ -833,18 +833,16 @@
 	my $username = $auth->get_username();
 	my $full_name = $user->get_full_name();
-	my $work_dir = $user->get_work_dir();
 
 	my $content = $ui->get_menu( 
-		MENU => 'preferences',
+		MENU => 'configuration',
 		PROGNAME => $progname,
 		FULL_NAME => $full_name,
-		WORK_DIR => $work_dir,
 	);
 
 	print $cgi->header( -cookie => $ck_auth );
 	$ui->print_screen(
-		TITLE=> 'SandWeb : preferences',
+		TITLE=> 'SandWeb : configuration',
 		MENU_TITLE => 'SandWeb',
-		SUBMENU_TITLE => 'preferences',
+		SUBMENU_TITLE => 'configuration',
 		FOOTER => '',
 		CONTENT => $content,
@@ -1056,5 +1054,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1210,5 +1208,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1288,5 +1286,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1593,5 +1591,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 
@@ -1980,5 +1978,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2367,5 +2365,5 @@
 
 ###############################################################################
-# preferences commit
+# configuration commit
 #
 # Writes user preference data to user's config file.
@@ -2374,5 +2372,5 @@
 # 	ck_auth		- the sessions cookie
 ###############################################################################
-sub preferences_commit {
+sub configuration_commit {
 	my %args = @_;
 	my $ck_auth = $args{'ck_auth'};
@@ -2381,5 +2379,4 @@
 	my @personal_params = ( 
 		'full_name', 
-		'work_dir',
 	);
 
@@ -2393,5 +2390,5 @@
     if (! $return) {
         # uh oh, problem occured
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	# when finished go to sandbox menu. (this should be dynamic probably, 
@@ -2530,5 +2527,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2708,5 +2705,5 @@
 	if (! load_config()) {
 		# no existing user config, forward to prefs menu
-		preferences_menu( ck_auth => $ck_auth );
+		configuration_menu( ck_auth => $ck_auth );
 	}
 	
@@ -2873,5 +2870,5 @@
 #
 # check user prefs config file, if it doesn't exist, 
-# call the preferences menu to fill in required info.
+# call the configuration menu to fill in required info.
 # if it does exist, load it.
 #
@@ -2883,6 +2880,6 @@
 	my $username = $auth->get_username();
 	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
+		# user doesn't have a configuration file!
+		# load user configuration from default config in config dir
 		my $return = SandWeb::Config::->new(
 			'config_dir' => $config_dir,
@@ -2895,10 +2892,10 @@
 		# if $no_error is true, ignore this error msgs
 		if (! $no_error) {
-			set_message("No config file cound for '$username', enter preferences.");
+			set_message("No config file cound for '$username', enter configuration.");
 		}
 		return 0;
 	}
 
-	# load users preferences from users dir
+	# load users configuration from users dir
 	$return = SandWeb::Config::->new( 
 		'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
@@ -2928,5 +2925,5 @@
 	my $username = $auth->get_username();
 	# write config data into the .$user_cfg file in the users directory
-	my ($return, $msg) = $user->write_preferences_config(
+	my ($return, $msg) = $user->write_configuration_config(
 		'config_dir' => $config->{'paths'}->{'users_dir'} . "/$username",
 		'config_file' => ".$user_cfg",
@@ -2972,5 +2969,5 @@
 		if (! load_config()) { 
 			# no existing user config, forward to prefs menu
-			preferences_menu( ck_auth => $ck_auth );
+			configuration_menu( ck_auth => $ck_auth );
 		}
 		sandbox_menu( ck_auth => $ck_auth );