From e0d90c54c040fc8d7e42a39aadf644f5fae93c36 Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Thu, 21 Jun 2012 19:24:58 +1200
Subject: [PATCH] MDL-33938 SCORM use consistant naming for maxattempt setting
 - match setting name with db field name to help when matching default
 settings

---
 mod/scorm/db/upgrade.php | 13 +++++++++++++
 mod/scorm/mod_form.php   |  4 ++--
 mod/scorm/settings.php   |  2 +-
 mod/scorm/version.php    |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index a7bcbd77e6b..5500a19376b 100644
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -60,6 +60,19 @@ function xmldb_scorm_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2012032101, 'scorm');
     }
 
+    //rename config var from maxattempts to maxattempt
+    if ($oldversion < 2012061701) {
+        $maxattempts = get_config('scorm', 'maxattempts');
+        $maxattempts_adv = get_config('scorm', 'maxattempts_adv');
+        set_config('maxattempt', $maxattempts, 'scorm');
+        set_config('maxattempt_adv', $maxattempts_adv, 'scorm');
+
+        unset_config('maxattempts', 'scorm'); //remove old setting.
+        unset_config('maxattempts_adv', 'scorm'); //remove old setting.
+        upgrade_mod_savepoint(true, 2012061701, 'scorm');
+    }
+
+
     return true;
 }
 
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index f936c31bcf7..d558c6b2b89 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -177,8 +177,8 @@ class mod_scorm_mod_form extends moodleform_mod {
         // Max Attempts
         $mform->addElement('select', 'maxattempt', get_string('maximumattempts', 'scorm'), scorm_get_attempts_array());
         $mform->addHelpButton('maxattempt', 'maximumattempts', 'scorm');
-        $mform->setDefault('maxattempt', $cfg_scorm->maxattempts);
-        $mform->setAdvanced('maxattempt', $cfg_scorm->maxattempts_adv);
+        $mform->setDefault('maxattempt', $cfg_scorm->maxattempt);
+        $mform->setAdvanced('maxattempt', $cfg_scorm->maxattempt_adv);
 
         // What Grade
         $mform->addElement('select', 'whatgrade', get_string('whatgrade', 'scorm'),  scorm_get_what_grade_array());
diff --git a/mod/scorm/settings.php b/mod/scorm/settings.php
index e45d0ce7888..eaaf8a7586f 100644
--- a/mod/scorm/settings.php
+++ b/mod/scorm/settings.php
@@ -82,7 +82,7 @@ if ($ADMIN->fulltree) {
     $settings->add(new admin_setting_heading('scorm/othersettings', get_string('defaultothersettings', 'scorm'), ''));
 
     //default attempts settings.
-    $settings->add(new admin_setting_configselect_with_advanced('scorm/maxattempts',
+    $settings->add(new admin_setting_configselect_with_advanced('scorm/maxattempt',
         get_string('maximumattempts', 'scorm'), '',
         array('value' => '0', 'adv' => false), scorm_get_attempts_array()));
 
diff --git a/mod/scorm/version.php b/mod/scorm/version.php
index 6033d4af141..89e1bd2df50 100644
--- a/mod/scorm/version.php
+++ b/mod/scorm/version.php
@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$module->version   = 2012061700;       // The current module version (Date: YYYYMMDDXX)
+$module->version   = 2012061701;       // The current module version (Date: YYYYMMDDXX)
 $module->requires  = 2012061700;    // Requires this Moodle version
 $module->component = 'mod_scorm'; // Full name of the plugin (used for diagnostics)
 $module->cron      = 300;