Merge pull request openwebwork#31 from mgage/ww2.5.1.1

Ww2.5.1.1
aubreyja · Aug 30, 2012 · 14d6a17 · 14d6a17
2 parents a7ca071 + dfab1ac
commit 14d6a17
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/README b/README
@@ -1,11 +1,11 @@
+
                                         WeBWorK                                    
                          Online Homework Delivery System                        
-                                   Version 2.5.1
-                        Branch: openwebwork/webwork2 ww2.5.1
+                                   Version 2.5.*
+                        Branch:  github.com/openwebwork 
 
-	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.1
-                    Copyright 2000-2011, The WeBWorK Project
+	          http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.0
+                    Copyright 2000-2012, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.                              
 
-
diff --git a/bin/OPL-update b/bin/OPL-update
@@ -56,12 +56,12 @@ my %NPLtables = (
  path => 'NPL-path',
  pgfile => 'NPL-pgfile',
  keyword => 'NPL-keyword',
- pgfile-keyword => 'NPL-pgfile-keyword',
+ pgfile_keyword => 'NPL-pgfile-keyword',
  textbook => 'NPL-textbook',
  chapter => 'NPL-chapter',
  section => 'NPL-section',
  problem => 'NPL-problem',
- pgfile-problem => 'NPL-pgfile-problem',
+ pgfile_problem => 'NPL-pgfile-problem',
 );
 
 
@@ -97,19 +97,20 @@ sub dbug {
 
 ##Figure out which set of tables to use
 
+my %tables;
 if( -e "$libraryRoot/VERSION") {
   include("$libraryRoot/VERSION");
   if($OPL_VERSION eq '2.5.0') {
-	my %tables = %OPLtables;
+	%tables = %OPLtables;
 	my $lib = 'OPL';
 	print "Got OPLtables!\n";
   } else {
-	my %tables = %NPLtables;
+	%tables = %NPLtables;
 	my $lib = 'NPL';
 	print "Got NPLtables! (1)\n";
   }
-else {
-	my %tables = %NPLtables;
+} else {
+	%tables = %NPLtables;
 	my $lib = 'NPL';
 	print "Got NPLtables! (2)\n";
 }

diff --git a/bin/check_modules.pl b/bin/check_modules.pl
@@ -61,9 +61,11 @@
 	Getopt::Std
 	HTML::Entities
 	HTML::Tagset
+	HTML::Template
 	IO::File
 	Iterator
 	Iterator::Util
+	JSON
 	Locale::Maketext::Lexicon
 	Locale::Maketext::Simple
 	Mail::Sender

diff --git a/conf/database.conf.dist b/conf/database.conf.dist
@@ -288,15 +288,6 @@ $dbLayouts{sql_single} = {
 			tableOverride => "${courseName}_achievement"
 		},
 	},
-	past_answer => {
-		record => "WeBWorK::DB::Record::PastAnswer",
-		schema => "WeBWorK::DB::Schema::NewSQL::Std",
-		driver => "WeBWorK::DB::Driver::SQL",
-		source => $database_dsn,
-		params => { %sqlParams,
-			non_native => 1,
-	 	},
-    },
 
 	achievement_user => {
 		record => "WeBWorK::DB::Record::UserAchievement",

diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist
@@ -253,10 +253,9 @@ $problemDefaults{max_attempts} = -1;
 	pgproblemeditor1   => 1,
 # 	pgproblemeditor2   => 1,
 # 	pgproblemeditor3   => 1,
-
-
 );
 
+
 ################################################################################
 # Directory for temporary files
 ################################################################################ 

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
@@ -171,6 +171,7 @@ sub checkForAchievements {
 	    #build the cheevo message. New level messages are slightly different
 	    my $imgSrc;
 	    if ($achievement->{icon}) {
+
 			$imgSrc = $ce->{server_root_url}.$ce->{courseURLs}->{achievements}."/".$achievement->{icon};
 	    } else {           
 			$imgSrc = $ce->{server_root_url}.$ce->{webworkURLs}->{htdocs}."/images/defaulticon.png";

diff --git a/lib/WeBWorK/Authen.pm b/lib/WeBWorK/Authen.pm
@@ -232,8 +232,10 @@ sub verify {
 		if (defined $log_error) {
 			$self->write_log_entry("LOGIN FAILED $log_error");
 		}
+
 		if (defined($error) and $error=~/\S/) { # if error message has a least one non-space character. 
 
+
 			if (defined($r->param("user")) or defined($r->param("user_id"))) {
 				$error = $r->maketext("Your authentication failed.  Please try again."
 					. "  Please speak with your instructor if you need help.")