openwebwork · mgage · Jun 20, 2016 · Jun 20, 2016 · Jun 20, 2016 · Jun 21, 2016
diff --git a/Dockerfile b/Dockerfile
@@ -85,7 +85,7 @@ RUN mkdir -p $APP_ROOT/courses $APP_ROOT/libraries $APP_ROOT/webwork2
 
 # Block to include webwork2 in the container, when needed, instead of  getting it from a bind mount.
 #    Uncomment when needed, and set the correct branch name on the following line.
-#ENV WEBWORK_BRANCH=master   # need a valid branch name from https://github.com/openwebwork/webwork2
+#ENV WEBWORK_BRANCH=develop   # need a valid branch name from https://github.com/openwebwork/webwork2
 #RUN curl -fSL https://github.com/openwebwork/webwork2/archive/${WEBWORK_BRANCH}.tar.gz -o /tmp/${WEBWORK_BRANCH}.tar.gz \
 #    && cd /tmp \
 #    && tar xzf /tmp/${WEBWORK_BRANCH}.tar.gz \

diff --git a/PG_VERSION b/PG_VERSION
@@ -1,4 +1,4 @@
-$PG_VERSION  ='PG-2.14';
+$PG_VERSION  ='develop';
 $PG_COPYRIGHT_YEARS = '1996-2019';
 
 1;
diff --git a/README b/README
@@ -3,8 +3,8 @@
                                    Version 2.*
                         Branch:  github.com/openwebwork 
 
-	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.13
-                    Copyright 2000-2017, The WeBWorK Project
+	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.14
+                    Copyright 2000-2019, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.                              
 
diff --git a/VERSION b/VERSION
@@ -1,5 +1,5 @@
 
-$WW_VERSION = 'WeBWorK-2.14';
+$WW_VERSION = 'develop';
 $WW_COPYRIGHT_YEARS = '1996-2019';
 
 1;
diff --git a/bin/OPL-update b/bin/OPL-update
@@ -21,7 +21,6 @@ use File::Basename;
 use Cwd;
 use DBI;
 
-
  #(maximum varchar length is 255 for mysql version < 5.0.3.  
  #You can increase path length to  4096 for mysql > 5.0.3)
 
@@ -93,9 +92,12 @@ my $dbh = DBI->connect(
         {
                 PrintError => 0,
                 RaiseError => 1,
+		mysql_enable_utf8 => 1,
         },
 );
 
+$dbh->prepare("SET NAMES 'utf8'")->execute();
+
 my $libraryRoot = $ce->{problemLibrary}->{root};
 $libraryRoot =~ s|/+$||;
 my $libraryVersion = $ce->{problemLibrary}->{version};
@@ -346,7 +348,7 @@ my ($name,$pgfile,$pgpath);
 
 #### First read in textbook information
 
-if(open(IN, "$libraryRoot/Textbooks")) {
+if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Textbooks")) {
 	print "Reading in textbook data from Textbooks in the library $libraryRoot.\n";
 	my %textinfo = ( TitleText => '', EditionText =>'', AuthorText=>'');
 	my $bookid = undef;
@@ -445,10 +447,10 @@ my $tagtaxo = [];
 my ($chaplist, $seclist) = ([],[]);
 
 my $canopenfile = 0;
-if(open(IN, "$libraryRoot/Taxonomy2")) {
+if(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy2")) {
 	print "Reading in OPL taxonomy from Taxonomy2 in the library $libraryRoot.\n";
 	$canopenfile = 1;
-} elsif(open(IN, "$libraryRoot/Taxonomy")) {
+} elsif(open(IN, '<:encoding(UTF-8)', "$libraryRoot/Taxonomy")) {
 	print "Reading in OPL taxonomy from Taxonomy in the library $libraryRoot.\n";
 	$canopenfile = 1;
 } else {
@@ -516,6 +518,7 @@ if($canopenfile) {
 my $webwork_htdocs = $ce->{webwork_dir}."/htdocs";
 my $file = "$webwork_htdocs/DATA/tagging-taxonomy.json";
 open(OUTF, ">$file") or die "Cannot open $file";
+binmode(OUTF,':encoding(UTF-8)'); 
 print OUTF to_json($tagtaxo,{pretty=>1}) or die "Cannot write to $file";
 close(OUTF);
 print "Saved taxonomy to $file.\n";

diff --git a/bin/addcourse b/bin/addcourse
@@ -1,8 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
-# $CVSHeader: webwork2/bin/addcourse,v 1.20 2006/12/09 03:29:56 sh002i Exp $
+# Copyright &copy; 2000-2018 The WeBWorK Project, https://github.com/openwebwork
 # 
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of either: (a) the GNU General Public License as published by the

diff --git a/bin/check_latex.tex b/bin/check_latex.tex
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WeBWorK Online Homework Delivery System
-% Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+% Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
 % $CVSHeader: webwork2/bin/check_latex.tex,v 1.2 2004/10/06 21:09:33 gage Exp $
 % 
 % This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/delcourse b/bin/delcourse
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/delcourse,v 1.4 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/dump_past_answers b/bin/dump_past_answers
@@ -2,7 +2,7 @@
 
 ##############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i Exp $
 #
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/fix_copyright.sh b/bin/fix_copyright.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+sed -i .bak '/Copyright/c\
+# Copyright &copy; 2000-2019. The WeBWorK Project. https://github.com/openwebwork/webwork2\
+' $1
+
+
+
+#obtained by trial and error after much toil -- mostly error.
+# this version works on a mac
+# the space after -i might need to be removed for linux.
+# produces $1.bak file
+
+# use with the find command: 
+# find . -name course.conf -exec /opt/webwork/webwork2/bin/fix_copyright.sh {} ';'
diff --git a/bin/integrity_check.pl b/bin/integrity_check.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb_upgrade,v 1.17 2007/08/13 22:59:50 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/newpassword b/bin/newpassword
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/newpassword,v 1.3 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/old_scripts/timing b/bin/old_scripts/timing
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/timing,v 1.5 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/old_scripts/wwaddindexing b/bin/old_scripts/wwaddindexing
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwaddindexing,v 1.3 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/old_scripts/wwdb_addgw b/bin/old_scripts/wwdb_addgw
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb_addgw,v 1.3 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/old_scripts/wwdb_check b/bin/old_scripts/wwdb_check
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb_check,v 1.7 2006/08/14 17:23:56 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/old_scripts/wwdb_upgrade b/bin/old_scripts/wwdb_upgrade
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb_upgrade,v 1.16 2007/07/22 05:24:20 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/pg-append-textbook-tags b/bin/pg-append-textbook-tags
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/pg-append-textbook-tags,v 1.1 2007/10/17 16:56:16 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/pg-find-tags b/bin/pg-find-tags
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/pg-find-tags,v 1.1 2007/10/17 16:56:16 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/pg-pull b/bin/pg-pull
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/pg-pull,v 1.3 2007/10/22 20:32:38 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/remove_stale_images b/bin/remove_stale_images
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/remove_stale_images,v 1.7 2008/06/24 22:54:03 gage Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/setfilepermissions b/bin/setfilepermissions
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/newpassword,v 1.3 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/update-OPL-statistics b/bin/update-OPL-statistics
@@ -2,7 +2,7 @@
 
 ##############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i Exp $
 #
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/upgrade_admin_db.pl b/bin/upgrade_admin_db.pl
@@ -2,7 +2,7 @@
 
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/upload-OPL-statistics b/bin/upload-OPL-statistics
@@ -2,7 +2,7 @@
 
 ##############################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright © 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i Exp $
 #
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/wwapache2ctl.dist b/bin/wwapache2ctl.dist
@@ -1,7 +1,7 @@
 #!/bin/sh
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwapache2ctl.dist,v 1.3 2007/08/13 22:59:50 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/wwapachectl.dist b/bin/wwapachectl.dist
@@ -1,7 +1,7 @@
 #!/bin/sh
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwapachectl.dist,v 1.17 2006/05/31 18:25:18 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/wwdb b/bin/wwdb
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwdb,v 1.13 2006/01/25 23:13:45 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/bin/wwsh b/bin/wwsh
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/bin/wwsh,v 1.10 2006/05/31 01:07:25 gage Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under

diff --git a/clients/sendXMLRPC.pl b/clients/sendXMLRPC.pl
@@ -269,6 +269,7 @@ BEGIN
 }
 $ENV{MOD_PERL_API_VERSION} = 2;
 use lib "$main::dirname";
+print "home directory ".$main::dirname;
 #use lib "."; # is this needed?
 
 # some files such as FormatRenderedProblem.pm may need to be in the same directory
@@ -290,7 +291,7 @@ BEGIN
 	}
 
 }
-
+use lib "$WeBWorK::Constants::WEBWORK_DIRECTORY/lib";
 
 
 use Carp;

diff --git a/conf/database.conf.dist b/conf/database.conf.dist
@@ -1,7 +1,7 @@
 #!perl
 ################################################################################
 # WeBWorK Online Homework Delivery System
-# Copyright � 2000-2007 The WeBWorK Project, http://openwebwork.sf.net/
+# Copyright &copy; 2000-2018 The WeBWorK Project, http://openwebwork.sf.net/
 # $CVSHeader: webwork2/conf/database.conf.dist,v 1.38 2007/08/13 22:59:51 sh002i Exp $
 # 
 # This program is free software; you can redistribute it and/or modify it under