Menu
▾
▴
[WWcvs] webwork2: Moved trim_spaces utility from AddUsers.pm to Utils.pm (data munger section) CourseAdmin page now calls trim_spaces to
|
From: Mike G. v. a. <we...@ma...> - 2008-05-23 15:10:51
|
Log Message:
-----------
Moved trim_spaces utility from AddUsers.pm to Utils.pm (data munger section)
CourseAdmin page now calls trim_spaces to clean up data entered when creating
a new course (spaces at beginning and end of entry are trimmed). This addresses
bug #1442
Modified Files:
--------------
webwork2/lib/WeBWorK:
Utils.pm
webwork2/lib/WeBWorK/ContentGenerator:
CourseAdmin.pm
webwork2/lib/WeBWorK/ContentGenerator/Instructor:
AddUsers.pm
Revision Data
-------------
Index: Utils.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Utils.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -Llib/WeBWorK/Utils.pm -Llib/WeBWorK/Utils.pm -u -r1.80 -r1.81
--- lib/WeBWorK/Utils.pm
+++ lib/WeBWorK/Utils.pm
@@ -52,37 +52,38 @@
our @EXPORT = ();
our @EXPORT_OK = qw(
- runtime_use
- readFile
- readDirectory
- listFilesRecursive
- surePathToFile
- makeTempDirectory
- removeTempDirectory
- path_is_subdir
- formatDateTime
- parseDateTime
- textDateTime
- intDateTime
- timeToSec
- before
after
+ before
between
- writeLog
- writeCourseLog
- writeTimingLogEntry
- list2hash
- ref2string
+ constituency_hash
+ cryptPassword
decodeAnswers
+ dequote
encodeAnswers
+ fisher_yates_shuffle
+ formatDateTime
+ intDateTime
+ list2hash
+ listFilesRecursive
+ makeTempDirectory
max
+ parseDateTime
+ path_is_subdir
pretty_print_rh
- cryptPassword
- dequote
- undefstr
- fisher_yates_shuffle
- constituency_hash
+ readDirectory
+ readFile
+ ref2string
+ removeTempDirectory
+ runtime_use
sortByName
+ surePathToFile
+ textDateTime
+ timeToSec
+ trim_spaces
+ undefstr
+ writeCourseLog
+ writeLog
+ writeTimingLogEntry
);
=head1 FUNCTIONS
@@ -736,7 +737,12 @@
################################################################################
# Data munging
################################################################################
-
+## Utility function to trim whitespace off the start and end of its input
+sub trim_spaces {
+ my $in = shift;
+ $in =~ s/^\s*(.*?)\s*$/$1/;
+ return($in);
+}
sub list2hash(@) {
map {$_ => "0"} @_;
}
Index: CourseAdmin.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/CourseAdmin.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -Llib/WeBWorK/ContentGenerator/CourseAdmin.pm -u -r1.73 -r1.74
--- lib/WeBWorK/ContentGenerator/CourseAdmin.pm
+++ lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -33,7 +33,7 @@
use IO::File;
use URI::Escape;
use WeBWorK::Debug;
-use WeBWorK::Utils qw(cryptPassword writeLog listFilesRecursive);
+use WeBWorK::Utils qw(cryptPassword writeLog listFilesRecursive trim_spaces);
use WeBWorK::Utils::CourseManagement qw(addCourse renameCourse deleteCourse listCourses archiveCourse
listArchivedCourses unarchiveCourse);
use WeBWorK::Utils::DBImportExport qw(dbExport dbImport);
@@ -312,10 +312,10 @@
" | ",
CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"delete_course"})}, "Delete Course"),
" | ",
- CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"export_database"})}, "Export Database"),
- " | ",
- CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"import_database"})}, "Import Database"),
- " | ",
+ # CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"export_database"})}, "Export Database"),
+ # " | ",
+ # CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"import_database"})}, "Import Database"),
+ # " | ",
CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"archive_course"})}, "Archive Course"),
"|",
CGI::a({href=>$self->systemLink($urlpath, params=>{subDisplay=>"unarchive_course"})}, "Unarchive Course"),
@@ -390,23 +390,26 @@
#my $authz = $r->authz;
#my $urlpath = $r->urlpath;
- my $add_courseID = $r->param("add_courseID") || "";
- my $add_courseTitle = $r->param("add_courseTitle") || "";
- my $add_courseInstitution = $r->param("add_courseInstitution") || "";
-
- my $add_admin_users = $r->param("add_admin_users") || "";
-
- my $add_initial_userID = $r->param("add_initial_userID") || "";
- my $add_initial_password = $r->param("add_initial_password") || "";
- my $add_initial_confirmPassword = $r->param("add_initial_confirmPassword") || "";
- my $add_initial_firstName = $r->param("add_initial_firstName") || "";
- my $add_initial_lastName = $r->param("add_initial_lastName") || "";
- my $add_initial_email = $r->param("add_initial_email") || "";
+ my $add_courseID = trim_spaces( $r->param("add_courseID") ) || "";
+ my $add_courseTitle = trim_spaces( $r->param("add_courseTitle") ) || "";
+ my $add_courseInstitution = trim_spaces( $r->param("add_courseInstitution") ) || "";
+
+ my $add_admin_users = trim_spaces( $r->param("add_admin_users") ) || "";
+
+ my $add_initial_userID = trim_spaces( $r->param("add_initial_userID") ) || "";
+ my $add_initial_password = trim_spaces( $r->param("add_initial_password") ) || "";
+ my $add_initial_confirmPassword = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+ my $add_initial_firstName = trim_spaces( $r->param("add_initial_firstName") ) || "";
+ my $add_initial_lastName = trim_spaces( $r->param("add_initial_lastName") ) || "";
+ my $add_initial_email = trim_spaces( $r->param("add_initial_email") ) || "";
- my $add_templates_course = $r->param("add_templates_course") || "";
+ my $add_templates_course = trim_spaces( $r->param("add_templates_course") ) || "";
- my $add_dbLayout = $r->param("add_dbLayout") || "";
+ my $add_dbLayout = trim_spaces( $r->param("add_dbLayout") ) || "";
+
+
+
my @dbLayouts = do {
my @ordered_layouts;
foreach my $layout (@{$ce->{dbLayout_order}}) {
@@ -551,22 +554,28 @@
#my $authz = $r->authz;
#my $urlpath = $r->urlpath;
- my $add_courseID = $r->param("add_courseID") || "";
- my $add_courseTitle = $r->param("add_courseTitle") || "";
- my $add_courseInstitution = $r->param("add_courseInstitution") || "";
-
- my $add_admin_users = $r->param("add_admin_users") || "";
-
- my $add_initial_userID = $r->param("add_initial_userID") || "";
- my $add_initial_password = $r->param("add_initial_password") || "";
- my $add_initial_confirmPassword = $r->param("add_initial_confirmPassword") || "";
- my $add_initial_firstName = $r->param("add_initial_firstName") || "";
- my $add_initial_lastName = $r->param("add_initial_lastName") || "";
- my $add_initial_email = $r->param("add_initial_email") || "";
+
+ my $add_courseID = trim_spaces( $r->param("add_courseID") ) || "";
+ my $add_courseTitle = trim_spaces( $r->param("add_courseTitle") ) || "";
+ my $add_courseInstitution = trim_spaces( $r->param("add_courseInstitution") ) || "";
+
+ my $add_admin_users = trim_spaces( $r->param("add_admin_users") ) || "";
+
+ my $add_initial_userID = trim_spaces( $r->param("add_initial_userID") ) || "";
+ my $add_initial_password = trim_spaces( $r->param("add_initial_password") ) || "";
+ my $add_initial_confirmPassword = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+ my $add_initial_firstName = trim_spaces( $r->param("add_initial_firstName") ) || "";
+ my $add_initial_lastName = trim_spaces( $r->param("add_initial_lastName") ) || "";
+ my $add_initial_email = trim_spaces( $r->param("add_initial_email") ) || "";
+
+ my $add_templates_course = trim_spaces( $r->param("add_templates_course") ) || "";
- my $add_templates_course = $r->param("add_templates_course") || "";
+ my $add_dbLayout = trim_spaces( $r->param("add_dbLayout") ) || "";
- my $add_dbLayout = $r->param("add_dbLayout") || "";
+
+
+
+ ######################
my @errors;
@@ -629,23 +638,23 @@
my $authz = $r->authz;
my $urlpath = $r->urlpath;
- my $add_courseID = $r->param("add_courseID") || "";
- my $add_courseTitle = $r->param("add_courseTitle") || "";
- my $add_courseInstitution = $r->param("add_courseInstitution") || "";
-
- my $add_admin_users = $r->param("add_admin_users") || "";
-
- my $add_initial_userID = $r->param("add_initial_userID") || "";
- my $add_initial_password = $r->param("add_initial_password") || "";
- my $add_initial_confirmPassword = $r->param("add_initial_confirmPassword") || "";
- my $add_initial_firstName = $r->param("add_initial_firstName") || "";
- my $add_initial_lastName = $r->param("add_initial_lastName") || "";
- my $add_initial_email = $r->param("add_initial_email") || "";
+ my $add_courseID = trim_spaces( $r->param("add_courseID") ) || "";
+ my $add_courseTitle = trim_spaces( $r->param("add_courseTitle") ) || "";
+ my $add_courseInstitution = trim_spaces( $r->param("add_courseInstitution") ) || "";
+
+ my $add_admin_users = trim_spaces( $r->param("add_admin_users") ) || "";
+
+ my $add_initial_userID = trim_spaces( $r->param("add_initial_userID") ) || "";
+ my $add_initial_password = trim_spaces( $r->param("add_initial_password") ) || "";
+ my $add_initial_confirmPassword = trim_spaces( $r->param("add_initial_confirmPassword") ) || "";
+ my $add_initial_firstName = trim_spaces( $r->param("add_initial_firstName") ) || "";
+ my $add_initial_lastName = trim_spaces( $r->param("add_initial_lastName") ) || "";
+ my $add_initial_email = trim_spaces( $r->param("add_initial_email") ) || "";
- my $add_templates_course = $r->param("add_templates_course") || "";
+ my $add_templates_course = trim_spaces( $r->param("add_templates_course") ) || "";
+
+ my $add_dbLayout = trim_spaces( $r->param("add_dbLayout") ) || "";
- my $add_dbLayout = $r->param("add_dbLayout") || "";
-
my $ce2 = new WeBWorK::CourseEnvironment({
%WeBWorK::SeedCE,
courseName => $add_courseID,
@@ -2503,11 +2512,7 @@
print CGI::end_form();
}
-sub registration_validate {
-print "\nregistration validate form";
-
-}
sub do_registration {
my $self = shift;
@@ -2515,13 +2520,14 @@
my $registered_file_path = $ce->{courseDirs}->{root}."/$registered_file_name";
# warn qq!`echo "info" >$registered_file_path`!;
`echo "info" >$registered_file_path`;
-print "\n",CGI::p({style=>"text-align: center; width:60%"},q{Registration action completed. Thank you very much!"});
+
+print "\n<center>",CGI::p({style=>"text-align: left; width:60%"},q{Registration action completed. Thank you very much for registering WeBWorK!"});
print CGI::start_form(-method=>"POST", -action=>$self->r->uri);
print $self->hidden_authen_fields;
-#print $self->hidden_fields("subDisplay");
print CGI::p({style=>"text-align: center"}, CGI::submit(-name=>"registration_completed", -label=>"Continue"));
print CGI::end_form();
+print "</center>";
}
################################################################################
Index: AddUsers.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm,v
retrieving revision 1.24
retrieving revision 1.25
diff -Llib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm -Llib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm -u -r1.24 -r1.25
--- lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/AddUsers.pm
@@ -28,7 +28,7 @@
use warnings;
#use CGI qw(-nosticky );
use WeBWorK::CGI;
-use WeBWorK::Utils qw/cryptPassword/;
+use WeBWorK::Utils qw/cryptPassword trim_spaces/;
sub initialize {
my ($self) = @_;
@@ -208,12 +208,7 @@
}
-## Utility function to trim whitespace off the start and end of its input
-sub trim_spaces {
- my $in = shift;
- $in =~ s/^\s*(.*?)\s*$/$1/;
- return($in);
-}
+
1;
|
