Merge pull request #784 from openwebwork/WeBWorK-2.13

WeBWorK-2.13

Author: mgage

LICENSE

@@ -2,7 +2,7 @@
                          Online Homework Delivery System                        
                                    Version 2.*                                 
 
-                    Copyright 2000-2016, The WeBWorK Project                    
+                    Copyright 2000-2017, The WeBWorK Project                    
                               All rights reserved.                              
 
     This program is free software; you can redistribute it and/or modify

README

@@ -3,8 +3,8 @@
                                    Version 2.*
                         Branch:  github.com/openwebwork 
 
-	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.11
-                    Copyright 2000-2016, The WeBWorK Project
+	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.13
+                    Copyright 2000-2017, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.                              
 

VERSION

@@ -1,4 +1,4 @@
-$WW_VERSION = '2.12';
-$WW_COPYRIGHT_YEARS = '1996-2016';
+$WW_VERSION = 'WeBWorK-2.13';
+$WW_COPYRIGHT_YEARS = '1996-2017';
 
 1;

bin/OPL-update

@@ -159,7 +159,7 @@ if($libraryVersion eq '2.5') {
 	lastname varchar (255) NOT NULL,
 	firstname varchar (255) NOT NULL,
 	email varchar (255),
-	KEY author (lastname, firstname),
+	KEY author (lastname(100), firstname(100)),
 	PRIMARY KEY (author_id)
 '],
 [$tables{path}, '
@@ -186,7 +186,7 @@ if($libraryVersion eq '2.5') {
 '],
 [$tables{keyword}, '
 	keyword_id int(15) NOT NULL auto_increment,
-	keyword varchar(255) NOT NULL,
+	keyword varchar(256) NOT NULL,
 	KEY (keyword),
 	PRIMARY KEY (keyword_id)
 '],

bin/check_modules.pl

@@ -24,7 +24,7 @@
 
 my @apache1ModulesList = qw(
 	Apache
-	Apache::Constants 
+	Apache::Constants
 	Apache::Cookie
 	Apache::Log
 	Apache::Request
@@ -46,8 +46,9 @@
         Crypt::SSLeay
 	Dancer
 	Dancer::Plugin::Database
+	Data::Dump
 	Data::Dumper
-	Data::UUID 
+	Data::UUID
 	Date::Format
 	Date::Parse
 	DateTime
@@ -56,6 +57,9 @@
 	Digest::MD5
         Digest::SHA
 	Email::Address
+  Email::Simple;
+  Email::Sender::Simple
+  Email::Sender::Transport::SMTP
 	Errno
 	Exception::Class
 	File::Copy
@@ -73,18 +77,20 @@
 	HTML::Tagset
 	HTML::Template
 	IO::File
+	IO::Socket::SSL
 	Iterator
 	Iterator::Util
 	JSON
 	Locale::Maketext::Lexicon
 	Locale::Maketext::Simple
-        LWP::Protocol::https
+    LWP::Protocol::https
 	Mail::Sender
 	MIME::Base64
 	Net::IP
 	Net::LDAPS
 	Net::OAuth
 	Net::SMTP
+	Net::SSLeay
 	Opcode
 	PadWalker
 	Path::Class
@@ -93,9 +99,10 @@
 	Pod::WSDL
 	Safe
 	Scalar::Util
-	SOAP::Lite 
+	SOAP::Lite
 	Socket
 	SQL::Abstract
+	Statistics::R::IO
 	String::ShellQuote
 	Template
 	Text::CSV
@@ -113,7 +120,9 @@
 );
 
 my %moduleVersion = (
-    'LWP::Protocol::https' => 6.06
+    'LWP::Protocol::https' => 6.06,
+    'Net::SSLeay' => 1.46,
+    'IO::Socket::SSL' => 2.007
 );
 
 # modules used by disabled code
@@ -146,7 +155,7 @@ sub check_apps {
 #	print "\$PATH=", shift @PATH, "\n";    # this throws away the first item -- usually /bin
         print "\$PATH=";
 	print join ("\n", map("      $_", @PATH)), "\n\n";
-	
+
 	foreach my $app (@applicationsList)  {
 		my $found = which($app);
 		if ($found) {
@@ -166,14 +175,14 @@ sub which {
 
 sub check_modules {
 	my @modulesList = @_;
-	
+
 	print "\nChecking your \@INC for modules required by WeBWorK...\n";
 	my @inc = @INC;
 	print "\@INC=";
 	print join ("\n", map("     $_", @inc)), "\n\n";
-	
+
 	no strict 'refs';
-	
+
 	foreach my $module (@modulesList)  {
 		eval "use $module";
 		if ($@) {
@@ -186,9 +195,9 @@ sub check_modules {
 				print "** $module found, but failed to load: $@";
 			}
 		} elsif (defined($moduleVersion{$module}) &&
-			 version->parse(${$module.'::VERSION'}) < 
+			 version->parse(${$module.'::VERSION'}) <
 			 version->parse($moduleVersion{$module})) {
-		    print "** $module found, but not version $moduleVersion{$module} or better\n";		    
+		    print "** $module found, but not version $moduleVersion{$module} or better\n";
 		} else {
 			print "   $module found and loaded\n";
 		}

bin/update-OPL-statistics

@@ -186,9 +186,11 @@ my $global_sql_file = $ce->{problemLibrary}{root}.'/OPL_global_statistics.sql';
 
 if (-e $global_sql_file) {
 
-  my ($dbi,$dbtype,$db,$host) = split(':',$ce->{database_dsn});
+  my ($dbi,$dbtype,$db,$host,$port) = split(':',$ce->{database_dsn});
 
   $host = 'localhost' unless $host;
+
+  $port = 3306 unless $port;
 
   my $dbuser = $ce->{database_username};
   my $dbpass = $ce->{database_password};
@@ -204,8 +206,8 @@ EOS
   $db = shell_quote($db);
 
   my $mysql_command = $ce->{externalPrograms}->{mysql};  
-  
-  `$mysql_command -h $host -u $dbuser -p$dbpass $db < $global_sql_file`;
+
+  `$mysql_command --host=$host --port=$port --user=$dbuser --password=$dbpass $db < $global_sql_file`;
 
 }
 

bin/update_localization_files

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -z "$WEBWORK_ROOT" ] || [ -z "$PG_ROOT" ]; then
+    echo >&2 "You need to set both the WEBWORK_ROOT and PG_ROOT environment variables.  Aborting."
+    exit 1
+fi
+
+command -v xgettext.pl >/dev/null 2>&1 || {
+    echo >&2 "xgettext.pl needs to be installed.  It is inlcuded in the perl package Locale::Maketext::Extract. Aborting.";
+    exit 1;
+}
+
+LOCDIR=$WEBWORK_ROOT/lib/WeBWorK/Localize
+
+cd $LOCDIR
+
+echo "Updating $WEBWORK_ROOT/webwork2.pot"
+
+xgettext.pl -o webwork2.pot -D $WEBWORK_ROOT/lib -D $PG_ROOT/lib -D $PG_ROOT/macros
+
+find $LOCDIR -name '*.po' -exec bash -c "echo \"Updating {}\"; msgmerge -qU {} webwork2.pot" \;

bin/upload-OPL-statistics

@@ -30,10 +30,12 @@ use String::ShellQuote;
 my $ce = new WeBWorK::CourseEnvironment({
 					 webwork_dir => $ENV{WEBWORK_ROOT},});
 
-my ($dbi,$dbtype,$db,$host) = split(':',$ce->{database_dsn});
+my ($dbi,$dbtype,$db,$host,$port) = split(':',$ce->{database_dsn});
 
 $host = 'localhost' unless $host;
 
+$port = 3306 unless $port;
+
 my $dbuser = $ce->{database_username};
 my $dbpass = $ce->{database_password};
 
@@ -49,7 +51,7 @@ $db = shell_quote($db);
 
 my $mysqldump_command = $ce->{externalPrograms}->{mysqldump};  
 
-`$mysqldump_command --host=$host --user=$dbuser --password=$dbpass $db OPL_local_statistics > $output_file`;
+`$mysqldump_command --host=$host --port=$port --user=$dbuser --password=$dbpass $db OPL_local_statistics > $output_file`;
 
 print "Database File Created\n";
 

conf/defaults.config

@@ -295,6 +295,14 @@ $webworkURLs{docs}          = "http://webwork.maa.org";
 # URL of WeBWorK Bugzilla database.
 $webworkURLs{bugReporter}   = "http://bugs.webwork.maa.org/enter_bug.cgi";
 
+#URL for help buttons on the PGProblemEditor pages:
+$webworkURLs{problemTechniquesHelpURL}='http://webwork.maa.org/wiki/Category:Problem_Techniques';
+$webworkURLs{MathObjectsHelpURL}      ='http://webwork.maa.org/wiki/Category:MathObjects';
+$webworkURLs{PODHelpURL}              ='http://webwork.maa.org/pod/pg_TRUNK/';
+$webworkURLs{PGLabHelpURL}            ='https://hosted2.webwork.rochester.edu/webwork2/wikiExamples/MathObjectsLabs2/2/?login_practice_user=true';  
+$webworkURLs{PGMLHelpURL}             ='https://courses1.webwork.maa.org/webwork2/cervone_course/PGML/1/?login_practice_user=true';
+$webworkURLs{AuthorHelpURL}           ='http://webwork.maa.org/wiki/Category:Authors';
+  
 # Location of CSS
 # $webworkURLs{stylesheet}    = "$webworkURLs{htdocs}/css/${defaultTheme}.css";
 # this is never used -- changing the theme from the config panel
@@ -918,6 +926,17 @@ $options{useOPLdefFiles} = 0;
 # gap betweens cores in score dropdown - e.g. 5 gives 5, 10, 15, 20
 $options{problemGraderScoreDelta} = 5;
 
+##########################################################################################
+#### Default settings for the problem editor pages
+##########################################################################################
+
+# This sets if the PG editor should use a js based "codemirror" editor or
+# just a textarea
+$options{PGCodeMirror} = 1;
+
+# This sets if mathview is available on the PG editor for use as a minimal latex equation editor
+$options{PGMathView} = 0;
+
 ###########################################################################################
 #### Default settings for the PG translator
 #### This section controls the display of equations, HINTS, answers, SOLUTIONS, 
@@ -938,8 +957,6 @@ $pg{options}{showOldAnswers}     = 1;
 $pg{options}{useMathView}        = 1;
 # This is the operations file to use for mathview,  each contains a different locale.  
 $pg{options}{mathViewLocale}     = "mv_locale_us.js";
-# This sets if mathview is available on the PG editor for use as a minimal latex equation editor
-$options{PGMathView} = 0;
 
 # Show correct answers (when allowed) by default?
 $pg{options}{showCorrectAnswers} = 0;  # this is a backup value use when nothing else has been set. I can think of no case where it should anything but zero.
@@ -1065,6 +1082,7 @@ $pg{directories}{macrosPath} = [
    "$courseDirs{templates}/Library/macros/Wiley",
    "$courseDirs{templates}/Library/macros/UBC",
    "$courseDirs{templates}/Library/macros/Hope",
+   "$courseDirs{templates}/Library/macros/MC",
 ];
 
 # The applet search path. If a full URL is given, it is used unmodified. If an
@@ -1210,6 +1228,7 @@ ${pg}{modules} = [
 	[qw(Locale::Maketext)],
 	[qw(WeBWorK::Localize)],
 	[qw(JSON)],
+        [qw(Rserve Class::Tiny IO::Handle)],
 ];
 
 ##### Problem creation defaults
@@ -1371,6 +1390,12 @@ $pg{options}{enableProgressBar} = 1;
 #  'checkboxlist' for variables which really hold a list of values which
 #      can be independently picked yes/no as checkboxes
 
+# Localization Info:  The doc strings in this portion are reproduced in
+# lib/WeBWorK/Localize.pm soley so that xgettext.pl will
+# include them when creating .pot files.  
+# If you change these strings you should make the corresponding changes in
+# Localize.pm 
+
 $ConfigValues = [
     ['General',
 		{ var => 'courseFiles{course_info}',
@@ -1632,14 +1657,6 @@ $ConfigValues = [
 		  type => 'boolean'
 		  },
 
-	 # Matrix manipulation in problems has been replaced by MathObjects
-	 # and this is specific to PG matrix macros
-#		{ var => 'pg{ansEvalDefaults}{defaultDisplayMatrixStyle}',
-#		  doc => 'Control string for displaying matrices',
-#		  doc2 => 'String of three characters for defining the defaults for displaying matrices.  The first and last characters give the left and right delimiters of the matrix, so usually one of "(" or "open brackets" or "|" for a left delimiter, and one of ")" or "close brackets" or "|" for the right delimiter.  It is also legal to specify "." for no delimiter. <p> The middle character indicates how to display vertical lines in a matrix (e.g., for an augmented matrix).  This can be s for solid lines and d for dashed lines.  While you can specify the defaults, individual problems may override these values.',
-#		  type => 'text'
-#		},
-
 		{ var => 'pg{ansEvalDefaults}{numRelPercentTolDefault}',
 		  doc => 'Allowed error, as a percentage, for numerical comparisons',
 		  doc2 => "When numerical answers are checked, most test if the student's answer is close enough to the programmed answer be computing the error as a percentage of the correct answer.  This value controls the default for how close the student answer has to be in order to be marked correct.<p>A value such as 0.1 means 0.1 percent error is allowed.",
@@ -1685,7 +1702,6 @@ $ConfigValues = [
 		},
 
 	],
-	
 #  PGSimple is not used for now GG
 #	['Editor',
 #		{ var => 'editor{author}',
@@ -1717,7 +1733,7 @@ $ConfigValues = [
 #		  doc2 => 'In the PGSimpleEditor, this will automatically fill the text author field',
 #		  width => 45,
 #		  type => 'text'
-#		}]		
+#		}]	
 ];