openwebwork · drgrice1 · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024 · Sep 27, 2024
diff --git a/.github/workflows/check-formats.yml b/.github/workflows/check-formats.yml
@@ -13,14 +13,14 @@ on:
 jobs:
   perltidy:
     name: Check Perl file formatting with perltidy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: perl:5.34
+      image: perl:5.38
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Install dependencies
-        run: cpanm -n Perl::Tidy@20220613
+        run: cpanm -n Perl::Tidy@20240903
       - name: Run perltidy
         shell: bash
         run: |
@@ -30,7 +30,7 @@ jobs:
 
   prettier:
     name: Check JavaScript, style, and HTML file formatting with prettier
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.perltidyrc b/.perltidyrc
@@ -20,4 +20,3 @@
 -nlop   # No logical padding (this causes mixed tabs and spaces)
 -wn     # Weld nested containers
 -xci    # Extended continuation indentation
--vxl='q' # No vertical alignment of qw quotes
diff --git a/Dockerfile b/Dockerfile
@@ -33,7 +33,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 FROM ubuntu:24.04
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost::8080 \
+	WEBWORK_ROOT_URL=http://localhost:8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	[email protected] \
 	WEBWORK_TIMEZONE=America/New_York \
@@ -106,9 +106,6 @@ RUN apt-get update \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
@@ -190,6 +187,7 @@ RUN cpanm install -n \
 	DBD::MariaDB \
 	Perl::Tidy@20220613 \
 	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================

diff --git a/DockerfileStage1 b/DockerfileStage1
@@ -68,9 +68,6 @@ RUN apt-get update \
 	libhttp-async-perl \
 	libiterator-perl \
 	libiterator-util-perl \
-	libjson-maybexs-perl \
-	libjson-perl \
-	libjson-xs-perl \
 	liblocale-maketext-lexicon-perl \
 	libmariadb-dev \
 	libmath-random-secure-perl \
@@ -152,6 +149,7 @@ RUN cpanm install -n \
 	DBD::MariaDB \
 	Perl::Tidy@20220613 \
 	Archive::Zip::SimpleZip \
+	Net::SAML2 \
 	&& rm -fr ./cpanm /root/.cpanm /tmp/*
 
 # ==================================================================
diff --git a/DockerfileStage2 b/DockerfileStage2
@@ -36,7 +36,7 @@ RUN echo Cloning branch $PG_BRANCH branch from $PG_GIT_URL \
 FROM webwork-base:forWW219
 
 ENV WEBWORK_URL=/webwork2 \
-	WEBWORK_ROOT_URL=http://localhost::8080 \
+	WEBWORK_ROOT_URL=http://localhost:8080 \
 	WEBWORK_SMTP_SERVER=localhost \
 	[email protected] \
 	WEBWORK_TIMEZONE=America/New_York \

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-$WW_VERSION = '2.19';
+$WW_VERSION = '2.19+develop';
 $WW_COPYRIGHT_YEARS = '1996-2024';
 
 1;
diff --git a/assets/pg/PGMLLab/PGML-lab.pg b/assets/pg/PGMLLab/PGML-lab.pg
@@ -507,7 +507,7 @@ TEXT(tag(
 								>]{ [ style => 'border: 1px solid black; padding: 1rem;' ] }
 
 								One useful application is when using the parserMultiAnswer.pl macro with
-								singleResult answers. Wrap the answers in in a div tag with the
+								singleResult answers. Wrap the answers in a div tag with the
 								"ww-feedback-container" class to tell PG where to place the feedback
 								button. The feedback button will be placed at the end of the containing div
 								tag.

diff --git a/assets/pg/Student_Orientation/setStudent_Orientation.def b/assets/pg/Student_Orientation/setStudent_Orientation.def
@@ -1,8 +1,8 @@
 assignmentType          = default
 openDate                = 01/01/2024 at 12:00am
-reducedScoringDate      = 12/31/2124 at 11:59pm
-dueDate                 = 12/31/2124 at 11:59pm
-answerDate              = 12/31/2124 at 11:59pm
+reducedScoringDate      = 12/31/2045 at 11:59pm
+dueDate                 = 12/31/2045 at 11:59pm
+answerDate              = 12/31/2045 at 11:59pm
 enableReducedScoring    = N
 paperHeaderFile         = defaultHeader
 screenHeaderFile        = defaultHeader

diff --git a/bin/OPL-update-legacy b/bin/OPL-update-legacy
@@ -539,8 +539,6 @@ if($canopenfile) {
 }
 #### End of taxonomy/taxonomy2
 
-use JSON;
-
 #### Save the official taxonomy in json format
 my $webwork_htdocs = $ce->{webworkDirs}{htdocs};
 my $file = "$webwork_htdocs/DATA/tagging-taxonomy.json";

diff --git a/bin/OPLUtils.pm b/bin/OPLUtils.pm
@@ -17,7 +17,7 @@ use warnings;
 use File::Find::Rule;
 use File::Basename;
 use open qw/:std :utf8/;
-use JSON;
+use Mojo::JSON qw(encode_json);
 
 our @EXPORT = ();
 our @EXPORT_OK =
@@ -373,7 +373,7 @@ sub build_library_textbook_tree {
 sub writeJSONtoFile {
 	my ($data, $filename) = @_;
 
-	my $json = JSON->new->utf8->encode($data);
+	my $json = encode_json($data);
 	open my $fh, ">", $filename or die "Cannot open $filename";
 	print $fh $json;
 	close $fh;

diff --git a/bin/check_modules.pl b/bin/check_modules.pl
@@ -107,8 +107,6 @@ =head1 DESCRIPTION
 	IO::Socket::SSL
 	Iterator
 	Iterator::Util
-	JSON
-	JSON::MaybeXS
 	Locale::Maketext::Lexicon
 	Locale::Maketext::Simple
 	LWP::Protocol::https
@@ -165,7 +163,6 @@ =head1 DESCRIPTION
 	'LWP::Protocol::https' => 6.06,
 	'Mojolicious'          => 9.34,
 	'Net::SSLeay'          => 1.46,
-	'Perl::Tidy'           => 20220613,
 	'SQL::Abstract'        => 2.000000
 );
 

diff --git a/bin/crypt_passwords_in_classlist.pl b/bin/crypt_passwords_in_classlist.pl
@@ -13,7 +13,7 @@ BEGIN
 
 use lib "$ENV{WEBWORK_ROOT}/lib";
 
-use WeBWorK::Utils qw(cryptPassword);
+use WeBWorK::Utils           qw(cryptPassword);
 use WeBWorK::File::Classlist qw(parse_classlist write_classlist);
 
 unless (@ARGV == 1) {

diff --git a/bin/dev_scripts/PODtoHTML.pm b/bin/dev_scripts/PODtoHTML.pm
@@ -23,19 +23,29 @@ use Pod::Simple::Search;
 use Mojo::Template;
 use Mojo::DOM;
 use Mojo::Collection qw(c);
-use File::Path qw(make_path);
-use File::Basename qw(dirname);
+use File::Path       qw(make_path);
+use File::Basename   qw(dirname);
 use IO::File;
 use POSIX qw(strftime);
 
 use WeBWorK::Utils::PODParser;
 
 our @sections = (
-	bin    => 'Scripts',
-	conf   => 'Config Files',
 	doc    => 'Documentation',
+	bin    => 'Scripts',
+	macros => 'Macros',
 	lib    => 'Libraries',
-	macros => 'Macros'
+);
+our %macro_names = (
+	answers    => 'Answers',
+	contexts   => 'Contexts',
+	core       => 'Core',
+	deprecated => 'Deprecated',
+	graph      => 'Graph',
+	math       => 'Math',
+	misc       => 'Miscellaneous',
+	parsers    => 'Parsers',
+	ui         => 'User Interface'
 );
 
 sub new {
@@ -52,6 +62,7 @@ sub new {
 		idx           => {},
 		section_hash  => $section_hash,
 		section_order => $section_order,
+		macros_hash   => {},
 	};
 	return bless $self, $class;
 }
@@ -131,7 +142,14 @@ sub update_index {
 	$subdir =~ s|/.*$||;
 	my $idx      = $self->{idx};
 	my $sections = $self->{section_hash};
-	if (exists $sections->{$subdir}) {
+	if ($subdir eq 'macros') {
+		$idx->{macros} = [];
+		if ($pod_name =~ m!^(.+)/(.+)$!) {
+			push @{ $self->{macros_hash}{$1} }, [ $html_rel_path, $2 ];
+		} else {
+			push @{ $idx->{doc} }, [ $html_rel_path, $pod_name ];
+		}
+	} elsif (exists $sections->{$subdir}) {
 		push @{ $idx->{$subdir} }, [ $html_rel_path, $pod_name ];
 	} else {
 		warn "no section for subdir '$subdir'\n";
@@ -152,6 +170,9 @@ sub write_index {
 			pod_index     => $self->{idx},
 			sections      => $self->{section_hash},
 			section_order => $self->{section_order},
+			macros        => $self->{macros_hash},
+			macros_order  => [ sort keys %{ $self->{macros_hash} } ],
+			macro_names   => \%macro_names,
 			date          => strftime('%a %b %e %H:%M:%S %Z %Y', localtime)
 		}
 	);

diff --git a/bin/dev_scripts/generate-ww-pg-pod.pl b/bin/dev_scripts/generate-ww-pg-pod.pl
@@ -65,9 +65,9 @@ =head1 DESCRIPTION
 use Mojo::Template;
 use IO::File;
 use File::Copy;
-use File::Path qw(make_path remove_tree);
+use File::Path     qw(make_path remove_tree);
 use File::Basename qw(dirname);
-use Cwd qw(abs_path);
+use Cwd            qw(abs_path);
 
 use lib dirname(dirname(dirname(__FILE__))) . '/lib';
 use lib dirname(__FILE__);

diff --git a/bin/dev_scripts/pod-templates/category-index.mt b/bin/dev_scripts/pod-templates/category-index.mt
@@ -23,18 +23,44 @@
 		</div>
 	</div>
 	%
-	% my ($index, $content) = ('', '');
+	% my ($index, $macro_index, $content, $macro_content) = ('', '', '', '');
+	% for my $macro (@$macros_order) {
+		% my $new_index = begin
+			<a href="#macro-<%= $macro %>" class="nav-link"><%= $macro_names->{$macro} // $macro %></a>
+		% end
+		% $macro_index .= $new_index->();
+		% my $new_content = begin
+			<h3><a href="#_podtop_" id="macro-<%= $macro %>"><%= $macro_names->{$macro} // $macro %></a></h3>
+			<div class="list-group mb-2">
+				% for my $file (sort { $a->[1] cmp $b->[1] } @{ $macros->{$macro} }) {
+					<a href="<%= $file->[0] %>" class="list-group-item list-group-item-action"><%= $file->[1] %></a>
+				% }
+			</div>
+		% end
+		% $macro_content .= $new_content->();
+	% }
 	% for my $section (@$section_order) {
 		% next unless defined $pod_index->{$section};
 		% my $new_index = begin
 			<a href="#<%= $section %>" class="nav-link"><%= $sections->{$section} %></a>
+			% if ($section eq 'macros') {
+				<div class="nav flex-column ms-3">
+					<%= $macro_index %>
+				</div>
+			% }
 		% end
 		% $index .= $new_index->();
 		% my $new_content = begin
 			<h2><a href="#_podtop_" id="<%= $section %>"><%= $sections->{$section} %></a></h2>
 			<div class="list-group mb-2">
-				% for my $file (sort { $a->[1] cmp $b->[1] } @{ $pod_index->{$section} }) {
-					<a href="<%= $file->[0] %>" class="list-group-item list-group-item-action"><%= $file->[1] %></a>
+				% if ($section eq 'macros') {
+					<%= $macro_content =%>
+				% } else {
+					% for my $file (sort { $a->[1] cmp $b->[1] } @{ $pod_index->{$section} }) {
+						<a href="<%= $file->[0] %>" class="list-group-item list-group-item-action">
+							<%= $file->[1] %>
+						</a>
+					% }
 				% }
 			</div>
 		% end

diff --git a/bin/dev_scripts/run-perltidy.pl b/bin/dev_scripts/run-perltidy.pl
@@ -28,7 +28,7 @@ =head1 DESCRIPTION
 
 =head1 OPTIONS
 
-For this script to work the the .perltidyrc file in the webwork2 root directory
+For this script to work the .perltidyrc file in the webwork2 root directory
 must be readable.  Note that the webwork2 root directory is automatically
 detected.
 
@@ -63,9 +63,8 @@ =head1 OPTIONS
 
 my $webwork_root = curfile->dirname->dirname->dirname;
 
-die "Version 20220613 or newer of perltidy is required for this script.\n"
-	. "The installed version is $Perl::Tidy::VERSION.\n"
-	unless $Perl::Tidy::VERSION >= 20220613;
+die "Version 20240903 of perltidy is required for this script.\nThe installed version is $Perl::Tidy::VERSION.\n"
+	unless $Perl::Tidy::VERSION == 20240903;
 die "The .perltidyrc file in the webwork root directory is not readable.\n"
 	unless -r "$webwork_root/.perltidyrc";
 

diff --git a/bin/download-OPL-metadata-release.pl b/bin/download-OPL-metadata-release.pl
@@ -11,11 +11,11 @@
 use File::Path;
 use Archive::Tar;
 use Mojo::File;
-use JSON;
+use Mojo::JSON qw(decode_json);
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
@@ -36,7 +36,7 @@ BEGIN
 	File::Fetch->new(uri => 'https://api.github.com/repos/openwebwork/webwork-open-problem-library/releases/latest');
 my $file        = $releaseDataFF->fetch(to => $ce->{webworkDirs}{tmp}) or die $releaseDataFF->error;
 my $path        = Mojo::File->new($file);
-my $releaseData = JSON->new->utf8->decode($path->slurp);
+my $releaseData = decode_json($path->slurp);
 $path->remove;
 
 my $releaseTag = $releaseData->{tag_name};

diff --git a/bin/dump-OPL-tables.pl b/bin/dump-OPL-tables.pl
@@ -22,7 +22,7 @@
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }

diff --git a/bin/dump-past-answers.pl b/bin/dump-past-answers.pl
@@ -98,7 +98,7 @@ =head1 DESCRIPTION
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
 

diff --git a/bin/generate-OPL-set-def-lists.pl b/bin/generate-OPL-set-def-lists.pl
@@ -26,7 +26,7 @@ =head1 DESCRIPTION
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }

diff --git a/bin/importClassList.pl b/bin/importClassList.pl
@@ -19,7 +19,7 @@
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }
@@ -31,7 +31,7 @@ BEGIN
 
 use WeBWorK::DB qw(check_user_id);
 use WeBWorK::File::Classlist;
-use WeBWorK::Utils qw(cryptPassword);
+use WeBWorK::Utils           qw(cryptPassword);
 use WeBWorK::File::Classlist qw(parse_classlist);
 
 if ((scalar(@ARGV) != 2)) {

diff --git a/bin/load-OPL-global-statistics.pl b/bin/load-OPL-global-statistics.pl
@@ -21,7 +21,7 @@
 
 BEGIN {
 	use Mojo::File qw(curfile);
-	use Env qw(WEBWORK_ROOT);
+	use Env        qw(WEBWORK_ROOT);
 
 	$WEBWORK_ROOT = curfile->dirname->dirname;
 }