MDL-19668 renaming textbox and select elements

diff --git a/lib/adminlib.php b/lib/adminlib.php
index c66528f18011402d9353d77a1b38266613f97e7e..c3237d139ce74094035b22730694b7fe4ac0a5d0 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -3310,7 +3310,7 @@ class admin_setting_special_editorhidebuttons extends admin_setting {
  */
 class admin_setting_langlist extends admin_setting_configtext {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         parent::__construct('langlist', get_string('langlist', 'admin'), get_string('configlanglist', 'admin'), '', PARAM_NOTAGS);
@@ -3336,7 +3336,7 @@ class admin_setting_langlist extends admin_setting_configtext {
  */
 class admin_settings_coursecat_select extends admin_setting_configselect {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct($name, $visiblename, $description, $defaultsetting) {
         parent::__construct($name, $visiblename, $description, $defaultsetting, NULL);
@@ -3365,7 +3365,7 @@ class admin_settings_coursecat_select extends admin_setting_configselect {
  */
 class admin_setting_special_backupdays extends admin_setting_configmulticheckbox2 {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         parent::__construct('backup_sche_weekdays', get_string('schedule'), get_string('backupschedulehelp'), array(), NULL);
@@ -3396,7 +3396,7 @@ class admin_setting_special_backupdays extends admin_setting_configmulticheckbox
  */
 class admin_setting_special_debug extends admin_setting_configselect {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         parent::__construct('debug', get_string('debug', 'admin'), get_string('configdebug', 'admin'), DEBUG_NONE, NULL);
@@ -3427,7 +3427,7 @@ class admin_setting_special_debug extends admin_setting_configselect {
  */
 class admin_setting_special_calendar_weekend extends admin_setting {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         $name = 'calendar_weekend';
@@ -3576,9 +3576,9 @@ class admin_setting_pickroles extends admin_setting_configmulticheckbox {
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class admin_setting_text_with_advanced extends admin_setting_configtext {
+class admin_setting_configtext_with_advanced extends admin_setting_configtext {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct($name, $visiblename, $description, $defaultsetting, $paramtype) {
         parent::__construct($name, $visiblename, $description,
@@ -3663,9 +3663,9 @@ class admin_setting_text_with_advanced extends admin_setting_configtext {
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class admin_setting_combo_with_advanced extends admin_setting_configselect {
+class admin_setting_configselect_with_advanced extends admin_setting_configselect {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct($name, $visiblename, $description, $defaultsetting, $choices) {
         parent::__construct($name, $visiblename, $description, $defaultsetting, $choices);
@@ -3750,13 +3750,13 @@ class admin_setting_combo_with_advanced extends admin_setting_configselect {
 }
 
 /**
- * Specialisation of admin_setting_combo_with_advanced for easy yes/no choices.
+ * Specialisation of admin_setting_configselect_with_advanced for easy yes/no choices.
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class admin_setting_yesno_with_advanced extends admin_setting_combo_with_advanced {
+class admin_setting_yesno_with_advanced extends admin_setting_configselect_with_advanced {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct($name, $visiblename, $description, $defaultsetting) {
         parent::__construct($name, $visiblename, $description,
@@ -3771,7 +3771,7 @@ class admin_setting_yesno_with_advanced extends admin_setting_combo_with_advance
  */
 class admin_setting_special_gradebookroles extends admin_setting_pickroles {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         parent::__construct('gradebookroles', get_string('gradebookroles', 'admin'),
@@ -3814,7 +3814,7 @@ class admin_setting_regradingcheckbox extends admin_setting_configcheckbox {
  */
 class admin_setting_special_coursemanager extends admin_setting_pickroles {
     /**
-     * Calls parent::__consturct with specific arguments
+     * Calls parent::__construct with specific arguments
      */
     public function __construct() {
         parent::__construct('coursemanager', get_string('coursemanager', 'admin'),

diff --git a/mod/quiz/settingstree.php b/mod/quiz/settingstree.php
index 351e6666a9e240af0d3a9d691779421c11d27300..ed815ac147ecbd066ce901e0fde7938598c37a1f 100644 (file)
--- a/mod/quiz/settingstree.php
+++ b/mod/quiz/settingstree.php
@@ -40,7 +40,7 @@ $quizsettings = new admin_settingpage('modsettingquiz', $pagetitle, 'moodle/site
 $quizsettings->add(new admin_setting_heading('quizintro', '', get_string('configintro', 'quiz')));
 
 // Time limit
-$quizsettings->add(new admin_setting_text_with_advanced('quiz/timelimit',
+$quizsettings->add(new admin_setting_configtext_with_advanced('quiz/timelimit',
         get_string('timelimitsec', 'quiz'), get_string('configtimelimitsec', 'quiz'),
         array('value' => '0', 'fix' => false), PARAM_INT));
 
@@ -49,12 +49,12 @@ $options = array(get_string('unlimited'));
 for ($i = 1; $i <= QUIZ_MAX_ATTEMPT_OPTION; $i++) {
     $options[$i] = $i;
 }
-$quizsettings->add(new admin_setting_combo_with_advanced('quiz/attempts',
+$quizsettings->add(new admin_setting_configselect_with_advanced('quiz/attempts',
         get_string('attemptsallowed', 'quiz'), get_string('configattemptsallowed', 'quiz'),
         array('value' => 0, 'fix' => false), $options));
 
 // Grading method.
-$quizsettings->add(new admin_setting_combo_with_advanced('quiz/grademethod',
+$quizsettings->add(new admin_setting_configselect_with_advanced('quiz/grademethod',
         get_string('grademethod', 'quiz'), get_string('configgrademethod', 'quiz'),
         array('value' => QUIZ_GRADEHIGHEST, 'fix' => false), quiz_get_grading_options()));
 
@@ -74,7 +74,7 @@ $perpage[1] = get_string('aftereachquestion', 'quiz');
 for ($i = 2; $i <= QUIZ_MAX_QPP_OPTION; ++$i) {
     $perpage[$i] = get_string('afternquestions', 'quiz', $i);
 }
-$quizsettings->add(new admin_setting_combo_with_advanced('quiz/questionsperpage',
+$quizsettings->add(new admin_setting_configselect_with_advanced('quiz/questionsperpage',
         get_string('newpageevery', 'quiz'), get_string('confignewpageevery', 'quiz'),
         array('value' => 1, 'fix' => false), $perpage));
 
@@ -113,7 +113,7 @@ $options = array();
 for ($i = 0; $i <= QUIZ_MAX_DECIMAL_OPTION; $i++) {
     $options[$i] = $i;
 }
-$quizsettings->add(new admin_setting_combo_with_advanced('quiz/decimalpoints',
+$quizsettings->add(new admin_setting_configselect_with_advanced('quiz/decimalpoints',
         get_string('decimalplaces', 'quiz'), get_string('configdecimalplaces', 'quiz'),
         array('value' => 2, 'fix' => false), $options));
 
@@ -122,25 +122,25 @@ $options = array(-1 => get_string('sameasoverall', 'quiz'));
 for ($i = 0; $i <= QUIZ_MAX_Q_DECIMAL_OPTION; $i++) {
     $options[$i] = $i;
 }
-$quizsettings->add(new admin_setting_combo_with_advanced('quiz/questiondecimalpoints',
+$quizsettings->add(new admin_setting_configselect_with_advanced('quiz/questiondecimalpoints',
         get_string('decimalplacesquestion', 'quiz'), get_string('configdecimalplacesquestion', 'quiz'),
         array('value' => -1, 'fix' => true), $options));
 
 // Password.
-$quizsettings->add(new admin_setting_text_with_advanced('quiz/password',
+$quizsettings->add(new admin_setting_configtext_with_advanced('quiz/password',
         get_string('requirepassword', 'quiz'), get_string('configrequirepassword', 'quiz'),
         array('value' => '', 'fix' => true), PARAM_TEXT));
 
 // IP restrictions.
-$quizsettings->add(new admin_setting_text_with_advanced('quiz/subnet',
+$quizsettings->add(new admin_setting_configtext_with_advanced('quiz/subnet',
         get_string('requiresubnet', 'quiz'), get_string('configrequiresubnet', 'quiz'),
         array('value' => '', 'fix' => true), PARAM_TEXT));
 
 // Enforced delay between attempts.
-$quizsettings->add(new admin_setting_text_with_advanced('quiz/delay1',
+$quizsettings->add(new admin_setting_configtext_with_advanced('quiz/delay1',
         get_string('delay1st2nd', 'quiz'), get_string('configdelay1st2nd', 'quiz'),
         array('value' => 0, 'fix' => true), PARAM_INTEGER));
-$quizsettings->add(new admin_setting_text_with_advanced('quiz/delay2',
+$quizsettings->add(new admin_setting_configtext_with_advanced('quiz/delay2',
         get_string('delaylater', 'quiz'), get_string('configdelaylater', 'quiz'),
         array('value' => 0, 'fix' => true), PARAM_INTEGER));