From a23f0aaf9570886bf5803459f0018dd68e835328 Mon Sep 17 00:00:00 2001 From: jamiesensei Date: Tue, 19 Dec 2006 07:03:08 +0000 Subject: [PATCH] * Added setAdvanced functionality see http://docs.moodle.org/en/Development:lib/formslib.php_setAdvanced * Added MoodleQuickForm method closeHeaderBefore($elementName); http://docs.moodle.org/en/Development:lib/formslib.php_Form_Definition#Use_Fieldsets_to_group_Form_Elements * Added moodleform method add_action_buttons(); see http://docs.moodle.org/en/Development:lib/formslib.php_Form_Definition#add_action_buttons.28.24cancel_.3D_true.2C_.24revert_.3D_true.2C_.24submitlabel.3Dnull.29.3B * is_cancelled method added to moodleform http://docs.moodle.org/en/Development:lib/formslib.php_Usage#Basic_Usage_in_A_Normal_Page * added hidden labels to elements within groups such as the date_selector select boxes and other elements in 'groups' * quiz/mod.html migrated to formslib * glossary/edit.html migrated to formslib * extended registerNoSubmitButton() functionality to automatically add js to onclick to bypass client side js input validation. * added no_submit_button_pressed() function that can be used in a similar way to is_cancelled() as a test in the main script to see if some button in the page has been pressed that is a submit button that is used for some dynamic functionality within the form and not to submit the data for the whole form. * added new condition for disabledIf which allows to disable another form element if no options are selected from within a select element. * added default 'action' for moodleform - strip_querystring(qualified_me()) http://docs.moodle.org/en/Development:lib/formslib.php_Usage#Basic_Usage_in_A_Normal_Page --- course/edit.php | 9 +- course/edit_form.php | 7 +- course/request.php | 16 +- course/request_form.php | 2 +- enrol/authorize/enrol_form.php | 4 +- lang/en_utf8/form.php | 4 + lang/en_utf8/glossary.php | 6 +- lib/form/adv.gif | Bin 0 -> 234 bytes lib/form/adv.png | Bin 0 -> 29186 bytes lib/form/cancel.php | 6 +- lib/form/checkbox.php | 37 ++ lib/form/format.php | 10 +- lib/form/header.php | 64 ++ lib/form/select.php | 12 + lib/form/submit.php | 45 ++ lib/formslib.php | 199 ++++-- lib/javascript-static.js | 22 +- login/change_password_form.php | 10 +- login/forgot_password_form.php | 8 +- login/signup_form.php | 7 +- .../type/online/assignment.class.php | 7 +- .../type/upload/assignment.class.php | 7 +- mod/chat/mod_form.php | 7 +- mod/choice/mod_form.php | 8 +- mod/data/comment_form.php | 7 +- mod/data/mod_form.php | 9 +- mod/exercise/mod_form.php | 9 +- mod/forum/mod_form.php | 9 +- mod/forum/post_form.php | 5 +- mod/glossary/comment_form.php | 8 +- mod/glossary/edit.html | 196 ------ mod/glossary/edit.php | 353 ++++------- mod/glossary/edit_form.php | 141 +++++ mod/glossary/mod_form.php | 10 +- mod/journal/mod_form.php | 8 +- mod/label/mod_form.php | 10 +- mod/lesson/mod_form.php | 9 +- mod/quiz/lib.php | 49 +- mod/quiz/mod.html | 570 ------------------ mod/quiz/mod_form.php | 334 ++++++++++ mod/survey/details.php | 4 +- theme/standard/styles_layout.css | 5 +- 42 files changed, 1007 insertions(+), 1226 deletions(-) create mode 100644 lib/form/adv.gif create mode 100644 lib/form/adv.png create mode 100644 lib/form/header.php create mode 100644 lib/form/submit.php delete mode 100644 mod/glossary/edit.html create mode 100644 mod/glossary/edit_form.php delete mode 100644 mod/quiz/mod.html create mode 100644 mod/quiz/mod_form.php diff --git a/course/edit.php b/course/edit.php index 80d4bb7fb2..886b1a8e0e 100644 --- a/course/edit.php +++ b/course/edit.php @@ -60,10 +60,15 @@ if (!empty($course)) { /// first create the form $editform = new course_edit_form('edit.php', compact('course', 'category')); + if ($editform->is_cancelled()){ + if (empty($course)) { + redirect($CFG->wwwroot); + } else { + redirect($CFG->wwwroot.'/course/view.php?id='.$course->id); + } - + } elseif ($data = $editform->data_submitted()) { /// process data if submitted - if ($data = $editform->data_submitted()) { //preprocess data if ($data->enrolstartdisabled){ diff --git a/course/edit_form.php b/course/edit_form.php index 7660bf9529..cfcb3324a9 100644 --- a/course/edit_form.php +++ b/course/edit_form.php @@ -8,7 +8,6 @@ class course_edit_form extends moodleform { global $USER, $CFG; $mform =& $this->_form; - $renderer =& $mform->defaultRenderer(); $course = $this->_customdata['course']; $category = $this->_customdata['category']; @@ -92,7 +91,7 @@ class course_edit_form extends moodleform { $formcourseformats["$courseformat"] = get_string("format$courseformat","format_$courseformat"); if($formcourseformats["$courseformat"]=="[[format$courseformat]]") { $formcourseformats["$courseformat"] = get_string("format$courseformat"); - } + } } $mform->addElement('select', 'format', get_string('format'), $formcourseformats); $mform->setHelpButton('format', array('courseformats', get_string('courseformats')), true); @@ -356,7 +355,7 @@ class course_edit_form extends moodleform { $mform->setType('restrictmodules', PARAM_INT); //-------------------------------------------------------------------------------- - $mform->addElement('submit', 'submitbutton', get_string('savechanges')); + $this->add_action_buttons(); //-------------------------------------------------------------------------------- $mform->addElement('hidden', 'id', null); $mform->setType('id', PARAM_INT); @@ -368,8 +367,6 @@ class course_edit_form extends moodleform { $mform->addElement('hidden', 'students', get_string('defaultcoursestudents')); -//-------------------------------------------------------------------------------- - $renderer->addStopFieldsetElements('submitbutton'); // now override defaults if course already exists diff --git a/course/request.php b/course/request.php index 4cf58e957c..02589c295d 100644 --- a/course/request.php +++ b/course/request.php @@ -25,8 +25,11 @@ print_simple_box_end(); - if (($data = $requestform->data_submitted())) { + if ($requestform->is_cancelled()){ + redirect($CFG->wwwroot); + + }elseif ($data = $requestform->data_submitted()) { $data->requester = $USER->id; if (insert_record('course_request', $data)) { @@ -34,17 +37,12 @@ } else { notice(get_string('courserequestfailed')); } - print_footer(); - exit; - - } + } else { - $requestform->display(); + $requestform->display(); + } print_footer(); - exit; - - ?> \ No newline at end of file diff --git a/course/request_form.php b/course/request_form.php index 3f183bad8a..8d09ce139e 100644 --- a/course/request_form.php +++ b/course/request_form.php @@ -26,7 +26,7 @@ class course_request_form extends moodleform { $mform->setType('password', PARAM_RAW); - $mform->addElement('submit', '', get_string('savechanges')); + $this->add_action_buttons(); } function validation($data) { diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php index 3d8b6c3bff..63a4453259 100755 --- a/enrol/authorize/enrol_form.php +++ b/enrol/authorize/enrol_form.php @@ -16,7 +16,6 @@ class authorize_enrol_form extends moodleform } $mform =& $this->_form; - $renderer =& $mform->defaultRenderer(); $mform->addElement('header', '', '  ' . get_string('paymentrequired'), ''); if ($othermethodstr = other_method($paymentmethod)) { @@ -173,8 +172,7 @@ class authorize_enrol_form extends moodleform $mform->addRule('cczip', get_string('missingzip', 'enrol_authorize'), 'required', null, 'client'); $mform->addRule('cczip', get_string('missingzip', 'enrol_authorize'), 'numeric', null, 'client'); - $mform->addElement('submit', 'submit', get_string('sendpaymentbutton', 'enrol_authorize')); - $renderer->addStopFieldsetElements('submit'); + $this->add_action_buttons(false, true, get_string('sendpaymentbutton', 'enrol_authorize')); } function validation($data) diff --git a/lang/en_utf8/form.php b/lang/en_utf8/form.php index c1ee2eea58..b230ebbb4f 100644 --- a/lang/en_utf8/form.php +++ b/lang/en_utf8/form.php @@ -27,4 +27,8 @@ $string['minute']='Minute'; $string['advancedelement']='Advanced Element'; $string['hideadvanced']='Hide Advanced'; $string['showadvanced']='Show Advanced'; + +$string['timing'] = 'Timing'; +$string['security'] = 'Security'; +$string['display'] = 'Display'; ?> \ No newline at end of file diff --git a/lang/en_utf8/glossary.php b/lang/en_utf8/glossary.php index 70e50311da..bc7f66cfd7 100644 --- a/lang/en_utf8/glossary.php +++ b/lang/en_utf8/glossary.php @@ -1,4 +1,4 @@ -#sNdEu-AE=3Vp!k!8k)1(+K?kG-WG4e_x`IkyN+cU|;;c>vhQnS$ ztO*L;Hv3L7noMYMO4X8J;Ba7iRKc3U;=m|$lu>3ii-I|WjbJPD;Ug9%qK-G5b{26; s+;wAI$h{}wmQ3=gA{%K2_67zkC3ihm7b`A(rdDN6X8-;vQxzGk0kQBy$^ZZW literal 0 HcmV?d00001 diff --git a/lib/form/adv.png b/lib/form/adv.png new file mode 100644 index 0000000000000000000000000000000000000000..e0694e8452d9125c6a670362a047a40afefea72d GIT binary patch literal 29186 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 literal 0 HcmV?d00001 diff --git a/lib/form/cancel.php b/lib/form/cancel.php index 88ca84e3ab..ed263ec4f8 100644 --- a/lib/form/cancel.php +++ b/lib/form/cancel.php @@ -7,7 +7,7 @@ require_once('HTML/QuickForm/submit.php'); * @author Jamie Pratt * @access public */ -class MoodleQuickForm_cancel extends HTML_QuickForm_submit +class MoodleQuickForm_cancel extends MoodleQuickForm_submit { // {{{ constructor @@ -26,7 +26,7 @@ class MoodleQuickForm_cancel extends HTML_QuickForm_submit if ($value==null){ $value=get_string('cancel'); } - HTML_QuickForm_submit::HTML_QuickForm_submit($elementName, $value, $attributes); + MoodleQuickForm_submit::MoodleQuickForm_submit($elementName, $value, $attributes); $this->updateAttributes(array('onclick'=>'skipClientValidation = true; return true;')); } //end constructor function onQuickFormEvent($event, $arg, &$caller) @@ -43,5 +43,5 @@ class MoodleQuickForm_cancel extends HTML_QuickForm_submit } // end func onQuickFormEvent // }}} -} //end class HTML_QuickForm_submit +} //end class MoodleQuickForm_cancel ?> \ No newline at end of file diff --git a/lib/form/checkbox.php b/lib/form/checkbox.php index 9c13dcaafd..f1eaaa4bd8 100644 --- a/lib/form/checkbox.php +++ b/lib/form/checkbox.php @@ -60,5 +60,42 @@ class MoodleQuickForm_checkbox extends HTML_QuickForm_checkbox{ $this->updateAttributes(array('id' => substr(md5(microtime() . $idx++), 0, 6))); } } // end func _generateId + /** + * Called by HTML_QuickForm whenever form event is made on this element + * + * @param string $event Name of event + * @param mixed $arg event arguments + * @param object $caller calling object + * @since 1.0 + * @access public + * @return void + */ + function onQuickFormEvent($event, $arg, &$caller) + { + //fixes bug in quickforms which lets previous set value override submitted value if checkbox is not checked + // and no value is submitted + switch ($event) { + case 'updateValue': + // constant values override both default and submitted ones + // default values are overriden by submitted + $value = $this->_findValue($caller->_constantValues); + if (null === $value) { + // if no boxes were checked, then there is no value in the array + // yet we don't want to display default value in this case + if ($caller->isSubmitted()) { + $value = $this->_findValue($caller->_submitValues); + } else { + + $value = $this->_findValue($caller->_defaultValues); + } + } + //fix here. setChecked should not be conditional + $this->setChecked($value); + break; + default: + parent::onQuickFormEvent($event, $arg, $caller); + } + return true; + } // end func onQuickFormEvent } ?> \ No newline at end of file diff --git a/lib/form/format.php b/lib/form/format.php index 3d12adbff7..6d8e315863 100644 --- a/lib/form/format.php +++ b/lib/form/format.php @@ -29,9 +29,16 @@ class MoodleQuickForm_format extends MoodleQuickForm_select{ */ function MoodleQuickForm_format($elementName=null, $elementLabel=null, $attributes=null, $useHtmlEditor=null) { + if ($elementName == null){ + $elementName = 'format'; + } + if ($elementLabel == null){ + $elementLabel = get_string('format'); + } HTML_QuickForm_element::HTML_QuickForm_element($elementName, $elementLabel, $attributes); $this->_persistantFreeze = true; $this->_type = 'format'; + $this->_useHtmlEditor=$useHtmlEditor; if ($this->_useHtmlEditor==null){ $this->_useHtmlEditor=can_use_html_editor(); @@ -39,9 +46,6 @@ class MoodleQuickForm_format extends MoodleQuickForm_select{ if ($this->_useHtmlEditor){ $this->freeze(); } - - - } //end constructor /** diff --git a/lib/form/header.php b/lib/form/header.php new file mode 100644 index 0000000000..d7ef023bc6 --- /dev/null +++ b/lib/form/header.php @@ -0,0 +1,64 @@ +_text .= $this->getHelpButton(); + $renderer->renderHeader($this); + } // end func accept + + // }}} + /** + * set html for help button + * + * @access public + * @param array $help array of arguments to make a help button + * @param string $function function name to call to get html + */ + function setHelpButton($helpbuttonargs, $function='helpbutton'){ + if (!is_array($helpbuttonargs)){ + $helpbuttonargs=array($helpbuttonargs); + }else{ + $helpbuttonargs=$helpbuttonargs; + } + //we do this to to return html instead of printing it + //without having to specify it in every call to make a button. + $defaultargs=array('', '', 'moodle', true, false, '', true); + $helpbuttonargs=$helpbuttonargs + $defaultargs ; + $this->_helpbutton=call_user_func_array($function, $helpbuttonargs); + } + /** + * get html for help button + * + * @access public + * @return string html for help button + */ + function getHelpButton(){ + return $this->_helpbutton; + } +} //end class MoodleQuickForm_header +?> diff --git a/lib/form/select.php b/lib/form/select.php index 63df3f919b..245fa338a2 100644 --- a/lib/form/select.php +++ b/lib/form/select.php @@ -94,6 +94,18 @@ class MoodleQuickForm_select extends HTML_QuickForm_select{ } } } // end func removeOption + /** + * Removes all OPTIONs from the SELECT + * + * @param string $value Value for the OPTION to remove + * @since 1.0 + * @access public + * @return void + */ + function removeOptions() + { + $this->_options = array(); + } // end func removeOption } ?> \ No newline at end of file diff --git a/lib/form/submit.php b/lib/form/submit.php new file mode 100644 index 0000000000..09a5bccac9 --- /dev/null +++ b/lib/form/submit.php @@ -0,0 +1,45 @@ + + * @author Bertrand Mansion + * @version 1.0 + * @since PHP4.04pl1 + * @access public + */ +class MoodleQuickForm_submit extends HTML_QuickForm_submit { + /** + * Called by HTML_QuickForm whenever form event is made on this element + * + * @param string $event Name of event + * @param mixed $arg event arguments + * @param object $caller calling object + * @since 1.0 + * @access public + * @return void + */ + function onQuickFormEvent($event, $arg, &$caller) + { + switch ($event) { + case 'createElement': + parent::onQuickFormEvent($event, $arg, $caller); + if ($caller->isNoSubmitButton($arg[0])){ + //need this to bypass client validation + //for buttons that submit but do not process the + //whole form. + $onClick = $this->getAttribute('onclick'); + $skip = 'skipClientValidation = true;'; + $onClick = ($onClick !== null)?$skip.' '.$onClick:$skip; + $this->updateAttributes(array('onclick'=>$onClick)); + } + return true; + break; + } + return parent::onQuickFormEvent($event, $arg, $caller); + + } // end func onQuickFormEvent +} +?> \ No newline at end of file diff --git a/lib/formslib.php b/lib/formslib.php index 354262dad9..f37f70ca6d 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -34,8 +34,19 @@ require_once $CFG->libdir.'/uploadlib.php'; define('FORM_ADVANCEDIMAGEURL', $CFG->wwwroot.'/lib/form/adv.gif'); define('FORM_REQIMAGEURL', $CFG->wwwroot.'/lib/form/req.gif'); +/** + * Callback called when PEAR throws an error + * + * @param PEAR_Error $error + */ +function pear_handle_error($error){ + echo ''.$error->GetMessage().' '.$error->getUserInfo(); + echo '
Backtrace :'; + print_object($error->backtrace); +} + if ($CFG->debug >= DEBUG_ALL){ - PEAR::setErrorHandling(PEAR_ERROR_PRINT); + PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'pear_handle_error'); } /** @@ -79,7 +90,8 @@ class moodleform { * the name you gave the class extending moodleform. You should call your class something * like * - * @param string $action the action attribute for the form. + * @param string $action the action attribute for the form. If empty defaults to auto detect the + * current url. * @param array $customdata if your form defintion method needs access to data such as $course * $cm, etc. to construct the form definition then pass it in this array. You can * use globals for somethings. @@ -91,7 +103,10 @@ class moodleform { * @param mixed $attributes you can pass a string of html attributes here or an array. * @return moodleform */ - function moodleform($action, $customdata=null, $method='post', $target='', $attributes=null) { + function moodleform($action=null, $customdata=null, $method='post', $target='', $attributes=null) { + if (empty($action)){ + $action = strip_querystring(qualified_me()); + } //strip '_form' from the end of class name to make form 'id' attribute. $this->_formname = preg_replace('/_form$/', '', get_class($this), 1); $this->_customdata = $customdata; @@ -257,6 +272,23 @@ class moodleform { return $this->_form->isSubmitted(); } + function no_submit_button_pressed(){ + static $nosubmit = null; // one check is enough + if (!is_null($nosubmit)){ + return $nosubmit; + } + $mform =& $this->_form; + $nosubmit = false; + foreach ($mform->_noSubmitButtons as $nosubmitbutton){ + if (optional_param($nosubmitbutton, 0, PARAM_RAW)){ + $nosubmit = true; + break; + } + } + return $nosubmit; + } + + /** * Check that form data is valid. * @@ -265,21 +297,21 @@ class moodleform { function is_validated() { static $validated = null; // one validation is enough $mform =& $this->_form; - foreach ($mform->_noSubmitButtons as $nosubmitbutton){ - if (optional_param($nosubmitbutton, 0, PARAM_RAW)){ - return false; - } + if ($this->no_submit_button_pressed()){ + return false; } if ($validated === null) { $internal_val = $mform->validate(); $moodle_val = $this->validation($mform->exportValues(null, true)); if ($moodle_val !== true) { - if (!empty($moodle_val)) { + if ((is_array($moodle_val) && count($moodle_val)!==0)) { foreach ($moodle_val as $element=>$msg) { $mform->setElementError($element, $msg); } + $moodle_val = false; + } else { + $moodle_val = true; } - $moodle_val = false; } $file_val = $this->_validate_files(); if ($file_val !== true) { @@ -302,9 +334,11 @@ class moodleform { */ function is_cancelled(){ $mform =& $this->_form; - foreach ($mform->_cancelButtons as $cancelbutton){ - if (optional_param($cancelbutton, 0, PARAM_RAW)){ - return true; + if ($mform->isSubmitted()){ + foreach ($mform->_cancelButtons as $cancelbutton){ + if (optional_param($cancelbutton, 0, PARAM_RAW)){ + return true; + } } } return false; @@ -390,6 +424,7 @@ class moodleform { + /** * Method to add a repeating group of elements to a form. * @@ -408,6 +443,7 @@ class moodleform { * @param int $addfieldsno how many fields to add at a time * @param array $addstring array of params for get_string for name of button, $a is no of fields that * will be added. + * @return int no of repeats of element in this page */ function repeat_elements($elementobjs, $repeats, $options, $repeathiddenname, $addfieldsname, $addfieldsno=5, $addstring=array('addfields', 'form')){ $repeats = optional_param($repeathiddenname, $repeats, PARAM_INT); @@ -416,7 +452,7 @@ class moodleform { $repeats += $addfieldsno; } $mform =& $this->_form; - $mform->_registerNoSubmitButton($addfieldsname); + $mform->registerNoSubmitButton($addfieldsname); $mform->addElement('hidden', $repeathiddenname, $repeats); //value not to be overridden by submitted value $mform->setConstants(array($repeathiddenname=>$repeats)); @@ -462,13 +498,45 @@ class moodleform { } } } - $mform->addElement('submit', $addfieldsname, get_string('addfields', 'form', $addfieldsno), - array('onclick'=>'skipClientValidation = true; return true;'));//need this to bypass client validation + $mform->addElement('submit', $addfieldsname, get_string('addfields', 'form', $addfieldsno)); + + $mform->closeHeaderBefore($addfieldsname); - $renderer =& $mform->defaultRenderer(); - $renderer->addStopFieldsetElements($addfieldsname); return $repeats; } + /** + * Use this method to add the standard buttons to the end of your form. Pass a param of false + * if you don't want a cancel button in your form. If you have a cancel button make sure you + * check for it being pressed using is_cancelled() and redirecting if it is true before trying to + * get data with data_submitted(). + * + * @param boolean $cancel whether to show cancel button, default true + * @param boolean $revert whether to show revert button, default true + * @param string $submitlabel label for submit button, defaults to get_string('savechanges') + */ + function add_action_buttons($cancel = true, $revert = true, $submitlabel=null){ + if (is_null($submitlabel)){ + $submitlabel = get_string('savechanges'); + } + $mform =& $this->_form; + if ($revert || $cancel){ + //when two or more elements we need a group + $buttonarray=array(); + $buttonarray[] = &$mform->createElement('submit', 'submitbutton', $submitlabel); + if ($revert){ + $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); + } + if ($cancel){ + $buttonarray[] = &$mform->createElement('cancel'); + } + $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $mform->closeHeaderBefore('buttonar'); + } else { + //no group needed + $mform->addElement('submit', 'submitbutton', $submitlabel); + $mform->closeHeaderBefore('submitbutton'); + } + } } /** @@ -542,8 +610,62 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { FORM_REQIMAGEURL.'" />'))); } - function setShowAdvanced($showadvancedNow){ - $this->_showAdvanced=$showadvancedNow; + /** + * Use this method to indicate an element in a form is an advanced field. If items in a form + * are marked as advanced then 'Hide/Show Advanced' buttons will automatically be displayed in the + * form so the user can decide whether to display advanced form controls. + * + * If you set a header element to advanced then all elements it contains will also be set as advanced. + * + * @param string $elementName group or element name (not the element name of something inside a group). + * @param boolean $advanced default true sets the element to advanced. False removes advanced mark. + */ + function setAdvanced($elementName, $advanced=true){ + if ($advanced){ + $this->_advancedElements[$elementName]=''; + } elseif (isset($this->_advancedElements[$elementName])) { + unset($this->_advancedElements[$elementName]); + } + if ($advanced && $this->getElementType('mform_showadvanced_last')===false){ + $this->setShowAdvanced(); + $this->registerNoSubmitButton('mform_showadvanced'); + + $this->addElement('hidden', 'mform_showadvanced_last'); + } + } + /** + * Set whether to show advanced elements in the form on first displaying form. Default is not to + * display advanced elements in the form until 'Show Advanced' is pressed. + * + * You can get the last state of the form and possibly save it for this user by using + * value 'mform_showadvanced_last' in submitted data. + * + * @param boolean $showadvancedNow + */ + function setShowAdvanced($showadvancedNow = null){ + if ($showadvancedNow === null){ + if ($this->_showAdvanced !== null){ + return; + } else { //if setShowAdvanced is called without any preference + //make the default to not show advanced elements. + $showadvancedNow = 0; + } + + } + //value of hidden element + $hiddenLast = optional_param('mform_showadvanced_last', -1, PARAM_INT); + //value of button + $buttonPressed = optional_param('mform_showadvanced', 0, PARAM_RAW); + //toggle if button pressed or else stay the same + if ($hiddenLast == -1) { + $next = $showadvancedNow; + } elseif ($buttonPressed) { //toggle on button press + $next = !$hiddenLast; + } else { + $next = $hiddenLast; + } + $this->_showAdvanced = $next; + $this->setConstants(array('mform_showadvanced_last'=>$next)); } function getShowAdvanced(){ return $this->_showAdvanced; @@ -616,34 +738,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless { parent::accept($renderer); } - function setAdvanced($elementName, $advanced=true){ - if ($advanced){ - $this->_advancedElements[$elementName]=''; - } elseif (isset($this->_advancedElements[$elementName])) { - unset($this->_advancedElements[$elementName]); - } - if ($advanced && $this->getShowAdvanced()===null){ - //hidden element - $showadvanced_last = optional_param('mform_showadvanced_last', 0, PARAM_INT); - //button - $showadvanced = optional_param('mform_showadvanced', 0, PARAM_RAW); - //toggle if button pressed or else stay the same - if ($showadvanced && $showadvanced_last){ - $showadvanced_now = 0; - } elseif ($showadvanced && !$showadvanced_last) { - $showadvanced_now = 1; - } else { - $showadvanced_now = $showadvanced_last; - } - - $this->setConstants(array('mform_showadvanced_last'=>$showadvanced_now)); - //below tells form whether to display elements or not - $this->setShowAdvanced($showadvanced_now); - $this->_registerNoSubmitButton('mform_showadvanced'); - $this->addElement('hidden', 'mform_showadvanced_last'); - } - } function closeHeaderBefore($elementName){ $renderer =& $this->defaultRenderer(); @@ -1040,8 +1135,11 @@ function validate_' . $this->_attributes['id'] . '(frm) { $this->_dependencies[$dependentOn][] = array('dependent'=>$elementName, 'condition'=>$condition, 'value'=>$value); } - function _registerNoSubmitButton($addfieldsname){ - $this->_noSubmitButtons[]=$addfieldsname; + function registerNoSubmitButton($buttonname){ + $this->_noSubmitButtons[]=$buttonname; + } + function isNoSubmitButton($buttonname){ + return (array_search($buttonname, $this->_noSubmitButtons)!==FALSE); } function _registerCancelButton($addfieldsname){ $this->_cancelButtons[]=$addfieldsname; @@ -1079,7 +1177,7 @@ class MoodleQuickForm_Renderer extends HTML_QuickForm_Renderer_Tableless{ * @access private */ var $_headerTemplate = - "\n\t\t{header}{advancedimg}{button}\n\t\t"; + "\n\t\t{header}\n\t\t
{advancedimg}{button}
\n\t\t"; /** * Template used when closing a fieldset @@ -1311,6 +1409,7 @@ MoodleQuickForm::registerElementType('modgrade', "$CFG->libdir/form/modgrade.php MoodleQuickForm::registerElementType('cancel', "$CFG->libdir/form/cancel.php", 'MoodleQuickForm_cancel'); MoodleQuickForm::registerElementType('button', "$CFG->libdir/form/button.php", 'MoodleQuickForm_button'); MoodleQuickForm::registerElementType('choosecoursefile', "$CFG->libdir/form/choosecoursefile.php", 'MoodleQuickForm_choosecoursefile'); -//MoodleQuickForm::registerElementType('header', "$CFG->libdir/form/header.php", 'MoodleQuickForm_header'); // where is it? +MoodleQuickForm::registerElementType('header', "$CFG->libdir/form/header.php", 'MoodleQuickForm_header'); +MoodleQuickForm::registerElementType('submit', "$CFG->libdir/form/submit.php", 'MoodleQuickForm_submit'); ?> diff --git a/lib/javascript-static.js b/lib/javascript-static.js index 2a26f354b2..eb0b8e8e8b 100644 --- a/lib/javascript-static.js +++ b/lib/javascript-static.js @@ -69,6 +69,8 @@ function lockoptionsall(formid) { thislock=!form.elements[master].checked; } else if (items[master].condition=='checked'){ thislock=form.elements[master].checked; + } else if (items[master].condition=='noitemselected'){ + thislock=(form.elements[master].selectedIndex==-1); } else if (items[master].condition=='eq'){ thislock=(form.elements[master].value==items[master].value); } else { @@ -200,21 +202,33 @@ function findParentNode(el, elName, elClass, elId) { Travels down the DOM hierarchy to find all child elements with the specified tag name, class, and id. All conditions must be met, but any can be ommitted. + Doesn't examine children of matches. */ function findChildNodes(start, tagName, elementClass, elementID, elementName) { var children = new Array(); for (var childIndex in start.childNodes) { + var classfound = false; var child = start.childNodes[childIndex]; - if( - (child.nodeType == 1) &&//element node type + if((child.nodeType == 1) &&//element node type + (elementClass && (typeof(child.className)=='string'))){ + var childClasses = child.className.split(/\s+/); + for (var childClassIndex in childClasses){ + if (childClasses[childClassIndex]==elementClass){ + classfound = true; + break; + } + } + } + if( (child.nodeType == 1) &&//element node type (!tagName || child.nodeName == tagName) && - (!elementClass || child.className.indexOf(elementClass) != -1) && + (!elementClass || classfound)&& (!elementID || child.id == elementID) && (!elementName || child.name == elementName)) { children = children.concat(child); + } else { + children = children.concat(findChildNodes(child, tagName, elementClass, elementID, elementName)); } - children = children.concat(findChildNodes(child, tagName, elementClass, elementID, elementName)); } return children; } diff --git a/login/change_password_form.php b/login/change_password_form.php index a6f9b94662..1a3438dda9 100644 --- a/login/change_password_form.php +++ b/login/change_password_form.php @@ -8,7 +8,6 @@ class change_password_form extends moodleform { global $USER; $mform =& $this->_form; - $renderer =& $mform->defaultRenderer(); $mform->addElement('header', '', get_string('changepassword'), ''); $sitecontext = get_context_instance(CONTEXT_SYSTEM, SITEID); @@ -47,14 +46,9 @@ class change_password_form extends moodleform { // buttons if (empty($USER->preference['auth_forcepasswordchange'])) { - $buttonarray = array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $renderer->addStopFieldsetElements('buttonar'); + $this->add_action_buttons(true, false); } else { - $mform->addElement('submit', 'submitbutton', get_string('savechanges')); - $renderer->addStopFieldsetElements('submitbutton'); + $this->add_action_buttons(false, false); } } diff --git a/login/forgot_password_form.php b/login/forgot_password_form.php index bc64b74d57..bf2b386e60 100644 --- a/login/forgot_password_form.php +++ b/login/forgot_password_form.php @@ -20,13 +20,7 @@ class forgot_password_form extends moodleform { $mform->addElement('hidden', 'action', 'find'); $mform->setType('action', PARAM_ALPHA); - // buttons - $buttonarray = array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('ok')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - - $renderer->addStopFieldsetElements('buttonar'); + $this->add_action_buttons(true, false, get_string('ok')); } } diff --git a/login/signup_form.php b/login/signup_form.php index d3979bbe36..1d559fffe4 100644 --- a/login/signup_form.php +++ b/login/signup_form.php @@ -7,7 +7,6 @@ class login_signup_form extends moodleform { global $USER, $CFG; $mform =& $this->_form; - $renderer =& $mform->defaultRenderer(); $mform->addElement('header', '', get_string('createuserandpass'), ''); @@ -50,12 +49,8 @@ class login_signup_form extends moodleform { $mform->setDefault('country', ''); // buttons - $buttonarray = array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('createaccount')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $this->add_action_buttons(true, false, get_string('createaccount')); - $renderer->addStopFieldsetElements('buttonar'); } function definition_after_data(){ diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 95988a90f8..592cc73799 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -256,12 +256,7 @@ class assignment_online_edit_form extends moodleform { $mform->setType('id', PARAM_INT); // buttons - $buttonarray = array(); - $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] =& $mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] =& $mform->createElement('cancel'); - - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $this->add_action_buttons(); } } diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index 4e7814ecb8..274f2ce568 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -929,12 +929,7 @@ class assignment_upload_notes_form extends moodleform { $mform->setType('id', PARAM_ALPHA); // buttons - $buttonarray = array(); - $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] =& $mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] =& $mform->createElement('cancel'); - - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $this->add_action_buttons(); } } diff --git a/mod/chat/mod_form.php b/mod/chat/mod_form.php index a6916be04f..047913bf9b 100644 --- a/mod/chat/mod_form.php +++ b/mod/chat/mod_form.php @@ -48,12 +48,7 @@ class chat_mod_form extends moodleform_mod { $this->standard_coursemodule_elements(); - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); + $this->add_action_buttons(); } diff --git a/mod/choice/mod_form.php b/mod/choice/mod_form.php index 38256ee899..810adc912e 100644 --- a/mod/choice/mod_form.php +++ b/mod/choice/mod_form.php @@ -83,13 +83,7 @@ class choice_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(); //------------------------------------------------------------------------------- - - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); + $this->add_action_buttons(); } function defaults_preprocessing(&$default_values){ diff --git a/mod/data/comment_form.php b/mod/data/comment_form.php index b6a5754e43..dafebf00ce 100644 --- a/mod/data/comment_form.php +++ b/mod/data/comment_form.php @@ -27,13 +27,10 @@ class data_comment_form extends moodleform { $mform->addElement('hidden', 'commentid', 0); $mform->setType('commentid', PARAM_INT); +//------------------------------------------------------------------------------- // buttons - $buttonarray = array(); - $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert')); - $buttonarray[] =& $mform->createElement('cancel'); + $this->add_action_buttons(); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); } } ?> \ No newline at end of file diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php index 358cdb1a94..695bc78321 100644 --- a/mod/data/mod_form.php +++ b/mod/data/mod_form.php @@ -57,12 +57,9 @@ class data_mod_form extends moodleform_mod { $this->standard_coursemodule_elements(); - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); +//------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); } diff --git a/mod/exercise/mod_form.php b/mod/exercise/mod_form.php index 58121214a3..a8d0f736fa 100644 --- a/mod/exercise/mod_form.php +++ b/mod/exercise/mod_form.php @@ -100,13 +100,8 @@ class exercise_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(); //------------------------------------------------------------------------------- - - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); + // buttons + $this->add_action_buttons(); } diff --git a/mod/forum/mod_form.php b/mod/forum/mod_form.php index cc4fe0c1c6..58576ecc63 100644 --- a/mod/forum/mod_form.php +++ b/mod/forum/mod_form.php @@ -124,13 +124,10 @@ class forum_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(); +//------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); } function definition_after_data(){ diff --git a/mod/forum/post_form.php b/mod/forum/post_form.php index 3a6ba948e4..a578aefa04 100644 --- a/mod/forum/post_form.php +++ b/mod/forum/post_form.php @@ -79,13 +79,14 @@ class forum_post_form extends moodleform { $mform->setType('timeend', PARAM_INT); $mform->setConstants(array('timestart'=> 0, 'timeend'=>0)); } +//------------------------------------------------------------------------------- + // buttons if (isset($post->edit)) { $submit_string = get_string('savechanges'); } else { $submit_string = get_string('posttoforum', 'forum'); } - $mform->addElement('submit', 'submitbutton', $submit_string); - $mform->closeHeaderBefore('submitbutton'); + $this->add_action_buttons(false, true, $submit_string); $mform->addElement('hidden', 'course'); $mform->setType('course', PARAM_INT); diff --git a/mod/glossary/comment_form.php b/mod/glossary/comment_form.php index dec379e3ef..b1667d6e24 100644 --- a/mod/glossary/comment_form.php +++ b/mod/glossary/comment_form.php @@ -24,13 +24,9 @@ class glossary_comment_form extends moodleform { $mform->addElement('hidden', 'action', ''); $mform->setType('action', PARAM_ACTION); +//------------------------------------------------------------------------------- // buttons - $buttonarray = array(); - $buttonarray[] =& $mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] =& $mform->createElement('reset', 'reset', get_string('revert')); - $buttonarray[] =& $mform->createElement('cancel'); - - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); + $this->add_action_buttons(false); } } ?> \ No newline at end of file diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html deleted file mode 100644 index 921696296c..0000000000 --- a/mod/glossary/edit.html +++ /dev/null @@ -1,196 +0,0 @@ -format)) { - $newentry->format = $defaultformat; - } - - trusttext_prepare_edit($newentry->definition, $newentry->format, $usehtmleditor, $context); - -?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- - - - - -
- - - - - - - - -
:" />
: - id,'name ASC'); - echo "\n"; - ?> -
- - - - - - - -
- '; - helpbutton("aliases2", strip_tags(get_string("aliases", "glossary")), "glossary"); - ?> - - -
-usedynalink ) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - - if (!empty($newentry->usedynalink)) { - $selected = "checked=\"checked\""; - } else { - $selected = ""; - } - echo ' '; - print_string("entryusedynalink","glossary"); - echo helpbutton("usedynalinkentry", strip_tags(get_string("usedynalink", "glossary")), "glossary"); - echo '
'; - - if (!empty($newentry->casesensitive)) { - $selected = "checked"; - } else { - $selected = ""; - } - echo ' '; - print_string("casesensitive","glossary"); - echo helpbutton("casesensitive", strip_tags(get_string("casesensitive", "glossary")), "glossary"); - echo '
'; - - - if (!empty($newentry->fullmatch)) { - $selected = "checked"; - } else { - $selected = ""; - } - echo ' '; - print_string("fullmatch","glossary"); - echo helpbutton("fullmatch", strip_tags(get_string("fullmatch", "glossary")), "glossary"); - echo '
'; - } -?> -
-
- : - - definition); ?> -
- - "; - if ($usehtmleditor) { - helpbutton("richtext", get_string("helprichtext"), "moodle", true, true); - } else { - emoticonhelpbutton("form", "text"); - } - echo "
"; - ?> - -
: - '; - } else { - choose_from_menu(format_text_menu(), "format", $newentry->format, ""); - } - helpbutton("textformat", get_string("helpformatting")); - ?> -
:
- maxbytes, $course->maxbytes))); - echo ')
'; - print_string("optional"); - echo ' '; - helpbutton("attachment", get_string("attachment", "glossary"), "glossary"); - ?> - 		- dirroot.'/lib/uploadlib.php'); - upload_print_form_fragment(1,array('attachment'),null,false,null,$course->maxbytes,0,false); - ?> -
-

- id)) { - echo "id\" />"; - } - ?> - - - - - - - - - - - " /> - " /> -

-
-
diff --git a/mod/glossary/edit.php b/mod/glossary/edit.php index 45e84a91e2..05b7c05653 100644 --- a/mod/glossary/edit.php +++ b/mod/glossary/edit.php @@ -2,6 +2,7 @@ require_once('../../config.php'); require_once('lib.php'); +require_once('edit_form.php'); global $CFG, $USER; @@ -32,322 +33,196 @@ if (! $glossary = get_record("glossary", "id", $cm->instance)) { error("Course module is incorrect"); } -if ($e) { // if entry is sepcified +if ($e) { // if entry is specified require_capability('mod/glossary:manageentries', $context); } else { // new entry require_capability('mod/glossary:write', $context); } -if ( $confirm ) { - $form = data_submitted(); - trusttext_after_edit($form->text, $context); +$mform =& new glossary_entry_form(null, compact('cm', 'glossary', 'hook', 'mode', 'e', 'context')); +if ($mform->is_cancelled()){ + if ($e){ + redirect("view.php?id=$cm->id&mode=entry&hook=$e"); + } else { + redirect("view.php?id=$cm->id"); + } + +} elseif ($fromform = $mform->data_submitted()) { + trusttext_after_edit($fromform->definition, $context); - if ( !isset($form->usedynalink) ) { - $form->usedynalink = 0; + if ( !isset($fromform->usedynalink) ) { + $fromform->usedynalink = 0; } - if ( !isset($form->casesensitive) ) { - $form->casesensitive = 0; + if ( !isset($fromform->casesensitive) ) { + $fromform->casesensitive = 0; } - if ( !isset($form->fullmatch) ) { - $form->fullmatch = 0; + if ( !isset($fromform->fullmatch) ) { + $fromform->fullmatch = 0; } $timenow = time(); - //$form->text = clean_text($form->text, $form->format); - - $newentry->course = $glossary->course; - $newentry->glossaryid = $glossary->id; - - $newentry->concept = clean_text(trim($form->concept)); - $newentry->definition = $form->text; - $newentry->format = $form->format; - $newentry->usedynalink = $form->usedynalink; - $newentry->casesensitive = $form->casesensitive; - $newentry->fullmatch = $form->fullmatch; - $newentry->timemodified = $timenow; - $newentry->approved = 0; - $newentry->aliases = ""; - if ( $glossary->defaultapproval or has_capability('mod/glossary:approve', $context) ) { - $newentry->approved = 1; - } - - $strglossary = get_string("modulename", "glossary"); - $strglossaries = get_string("modulenameplural", "glossary"); - $stredit = get_string("edit"); - - if ($form->concept == '' or trim($form->text) == '' ) { - $errors = get_string('fillfields','glossary'); - if ($usehtmleditor = can_use_richtext_editor()) { - $defaultformat = FORMAT_HTML; - } else { - $defaultformat = FORMAT_MOODLE; - } - - print_header_simple(format_string($glossary->name), "", - "id\">$strglossaries -> - id\">".format_string($glossary->name,true)." -> $stredit", "form.text", - "", true, "", navmenu($course, $cm)); - - print_heading(format_string($glossary->name)); - - /// Info box - if ( $glossary->intro ) { - print_simple_box(format_text($glossary->intro), 'center', '70%', '', 5, 'generalbox', 'intro'); - } - echo '
'; - $tab = GLOSSARY_ADDENTRY_VIEW; - include("tabs.html"); - - include("edit.html"); - - echo ''; - - glossary_print_tabbed_table_end(); - - // Lets give IE more time to load the whole page - // before trying to load the editor. - if ($usehtmleditor) { - use_html_editor("text"); - } - - print_footer($course); - die; + $todb = new object(); + $todb->course = $glossary->course; + $todb->glossaryid = $glossary->id; + + $todb->concept = trim($fromform->concept); + $todb->definition = $fromform->definition; + $todb->format = $fromform->format; + $todb->usedynalink = $fromform->usedynalink; + $todb->casesensitive = $fromform->casesensitive; + $todb->fullmatch = $fromform->fullmatch; + $todb->timemodified = $timenow; + $todb->approved = 0; + $todb->aliases = ""; + if ( $glossary->defaultapproval or has_capability('mod/glossary:approve', $context) ) { + $todb->approved = 1; } if ($e) { - //We are updating an entry, so we compare current session user with - //existing entry user to avoid some potential problems if secureforms=off - //Perhaps too much security? Anyway thanks to skodak (Bug 1823) - $old = get_record('glossary_entries', 'id', $e); - $ineditperiod = ((time() - $old->timecreated < $CFG->maxeditingtime) || $glossary->editalways); - if ( (!$ineditperiod || $USER->id != $old->userid) and !has_capability('mod/glossary:manageentries', $context) and $e) { - if ( $USER->id != $old->userid ) { - error("You can't edit other people's entries!"); - } elseif (!$ineditperiod) { - error("You can't edit this. Time expired!"); - } - die; + /* TODO process file uploads + $todb->attachment = $_FILES["attachment"]; + if ($newfilename = glossary_add_attachment($todb, 'attachment')) { + $todb->attachment = $newfilename; + } else { + unset($todb->attachment); + }*/ + $todb->id = $e; + print_object($todb); + if (update_record('glossary_entries', $todb)) { + add_to_log($course->id, "glossary", "update entry", + "view.php?id=$cm->id&mode=entry&hook=$todb->id", + $todb->id, $cm->id); + } else { + error("Could not update your glossary"); } + } else { - $newentry->id = $e; - - $permissiongranted = 1; - if ( !$glossary->allowduplicatedentries ) { - if ($dupentries = get_records("glossary_entries","lower(concept)", moodle_strtolower($newentry->concept))) { - foreach ($dupentries as $curentry) { - if ( $glossary->id == $curentry->glossaryid ) { - if ( $curentry->id != $e ) { - $permissiongranted = 0; - break; - } - } - } - } - } + $todb->userid = $USER->id; + $todb->timecreated = $timenow; + $todb->sourceglossaryid = 0; + $todb->teacherentry = has_capability('mod/glossary:manageentries', $context); - if ( $permissiongranted ) { - $newentry->attachment = $_FILES["attachment"]; - if ($newfilename = glossary_add_attachment($newentry, 'attachment')) { - $newentry->attachment = $newfilename; - } else { - unset($newentry->attachment); - } - if (update_record("glossary_entries", $newentry)) { - add_to_log($course->id, "glossary", "update entry", - "view.php?id=$cm->id&mode=entry&hook=$newentry->id", - $newentry->id, $cm->id); - $redirectmessage = get_string('entryupdated','glossary'); + if ($todb->id = insert_record("glossary_entries", $todb)) { + $e = $todb->id; + /* TODO process file uploads + $todb->attachment = $_FILES["attachment"]; + if ($newfilename = glossary_add_attachment($todb, 'attachment')) { + $todb->attachment = $newfilename; } else { - error("Could not update your glossary"); + unset($todb->attachment); } + set_field("glossary_entries", "attachment", $newfilename, "id", $todb->id);*/ + add_to_log($course->id, "glossary", "add entry", + "view.php?id=$cm->id&mode=entry&hook=$todb->id", $todb->id,$cm->id); } else { - error("Could not update this glossary entry because this concept already exist."); - } - } else { - - $newentry->userid = $USER->id; - $newentry->timecreated = $timenow; - $newentry->sourceglossaryid = 0; - $newentry->teacherentry = has_capability('mod/glossary:manageentries', $context); - - $permissiongranted = 1; - if ( !$glossary->allowduplicatedentries ) { - if ($dupentries = get_record("glossary_entries","lower(concept)", moodle_strtolower($newentry->concept), "glossaryid", $glossary->id)) { - $permissiongranted = 0; - } - } - if ( $permissiongranted ) { - if ($newentry->id = insert_record("glossary_entries", $newentry)) { - $e = $newentry->id; - $newentry->attachment = $_FILES["attachment"]; - if ($newfilename = glossary_add_attachment($newentry, 'attachment')) { - $newentry->attachment = $newfilename; - } else { - unset($newentry->attachment); - } - set_field("glossary_entries", "attachment", $newfilename, "id", $newentry->id); - add_to_log($course->id, "glossary", "add entry", - "view.php?id=$cm->id&mode=entry&hook=$newentry->id", $newentry->id,$cm->id); - $redirectmessage = get_string('entrysaved','glossary'); - } else { - error("Could not insert this new entry"); - } - } else { - error("Could not insert this glossary entry because this concept already exist."); + error("Could not insert this new entry"); } + } - delete_records("glossary_entries_categories","entryid",$e); - delete_records("glossary_alias","entryid",$e); + delete_records("glossary_entries_categories", "entryid", $e); + delete_records("glossary_alias", "entryid", $e); - if ( isset($form->categories) ) { + if (empty($fromform->notcategorised) && isset($fromform->categories)) { $newcategory->entryid = $e; - foreach ($form->categories as $category) { + foreach ($fromform->categories as $category) { if ( $category > 0 ) { $newcategory->categoryid = $category; - insert_record("glossary_entries_categories",$newcategory, false); + insert_record("glossary_entries_categories", $newcategory, false); } else { break; } } } - if ( isset($form->aliases) ) { - if ( $aliases = explode("\n",clean_text($form->aliases)) ) { + if ( isset($fromform->aliases) ) { + if ( $aliases = explode("\n", $fromform->aliases) ) { foreach ($aliases as $alias) { $alias = trim($alias); if ($alias) { unset($newalias); $newalias->entryid = $e; $newalias->alias = $alias; - insert_record("glossary_alias",$newalias, false); + insert_record("glossary_alias", $newalias, false); } } } } - redirect("view.php?id=$cm->id&mode=entry&hook=$newentry->id", $redirectmessage); + redirect("view.php?id=$cm->id&mode=entry&hook=$todb->id"); } else { if ($e) { - $form = get_record("glossary_entries", "id", $e); - - $newentry->id = $form->id; - $newentry->concept = $form->concept; - $newentry->definition = $form->definition; - $newentry->format = $form->format; - $newentry->timemodified = time(); - $newentry->approved = $glossary->defaultapproval or has_capability('mod/glossary:approve', $context); - $newentry->usedynalink = $form->usedynalink; - $newentry->casesensitive = $form->casesensitive; - $newentry->fullmatch = $form->fullmatch; - $newentry->aliases = ""; - $newentry->userid = $form->userid; - $newentry->timecreated = $form->timecreated; - - - if ( $aliases = get_records("glossary_alias","entryid",$e) ) { - foreach ($aliases as $alias) { - $newentry->aliases .= $alias->alias . "\n"; + $fromdb = get_record("glossary_entries", "id", $e); + + $toform = new object(); + + if ($categoriesarr = get_records_menu("glossary_entries_categories", "entryid", $e, '', 'id, categoryid')){ + $toform->categories = array_values($categoriesarr); + } else { + $toform->categories = array(0); + } + $toform->concept = $fromdb->concept; + $toform->definition = $fromdb->definition; + $toform->format = $fromdb->format; + trusttext_prepare_edit($toform->definition, $toform->format, can_use_html_editor(), $context); + $toform->approved = $glossary->defaultapproval or has_capability('mod/glossary:approve', $context); + $toform->usedynalink = $fromdb->usedynalink; + $toform->casesensitive = $fromdb->casesensitive; + $toform->fullmatch = $fromdb->fullmatch; + $toform->aliases = ''; + $ineditperiod = ((time() - $fromdb->timecreated < $CFG->maxeditingtime) || $glossary->editalways); + if ((!$ineditperiod || $USER->id != $fromdb->userid) and !has_capability('mod/glossary:manageentries', $context)) { + if ( $USER->id != $fromdb->userid ) { + error(get_string('errcannoteditothers', 'glossary')); + } elseif (!$ineditperiod) { + error(get_string('erredittimeexpired', 'glossary')); } + die; } - } -} - -//Fill and print the form. -//We check every field has a default values here!! -if (!isset($newentry->concept)) { - $newentry->concept = ""; -} -if (!isset($newentry->aliases)) { - $newentry->aliases = ""; -} -if (!isset($newentry->usedynalink)) { - if (isset($CFG->glossary_linkentries)) { - $newentry->usedynalink = $CFG->glossary_linkentries; - } else { - $newentry->usedynalink = 0; - } -} -if (!isset($newentry->casesensitive)) { - if (isset($CFG->glossary_casesensitive)) { - $newentry->casesensitive = $CFG->glossary_casesensitive; - } else { - $newentry->casesensitive = 0; - } -} -if (!isset($newentry->fullmatch)) { - if (isset($CFG->glossary_fullmatch)) { - $newentry->fullmatch = $CFG->glossary_fullmatch; - } else { - $newentry->fullmatch = 0; + if ( $aliases = get_records_menu("glossary_alias", "entryid", $e, '', 'id, alias') ) { + $toform->aliases = implode("\n", $aliases) . "\n"; + } + $mform->set_defaults($toform); } } -if (!isset($newentry->definition)) { - $newentry->definition = ""; -} -if (!isset($newentry->timecreated)) { - $newentry->timecreated = 0; -} -if (!isset($newentry->userid)) { - $newentry->userid = $USER->id; -} + $strglossary = get_string("modulename", "glossary"); $strglossaries = get_string("modulenameplural", "glossary"); $stredit = get_string("edit"); -if ($usehtmleditor = can_use_richtext_editor()) { - $defaultformat = FORMAT_HTML; -} else { - $defaultformat = FORMAT_MOODLE; -} print_header_simple(format_string($glossary->name), "", "id\">$strglossaries -> id\">".format_string($glossary->name,true)." -> $stredit", "", "", true, "", navmenu($course, $cm)); -$ineditperiod = ((time() - $newentry->timecreated < $CFG->maxeditingtime) || $glossary->editalways); -if ( (!$ineditperiod || $USER->id != $newentry->userid) and !has_capability('mod/glossary:manageentries', $context) and $e) { - if ( $USER->id != $newentry->userid ) { - error("You can't edit other people's entries!"); - } elseif (!$ineditperiod) { - error("You can't edit this. Time expired!"); - } - die; -} - print_heading(format_string($glossary->name)); + +print_heading(format_string($glossary->name)); /// Info box - if ( $glossary->intro ) { - print_simple_box(format_text($glossary->intro), 'center', '70%', '', 5, 'generalbox', 'intro'); - } +if ( $glossary->intro ) { + print_simple_box(format_text($glossary->intro), 'center', '70%', '', 5, 'generalbox', 'intro'); +} - echo '
'; +echo '
'; /// Tabbed browsing sections $tab = GLOSSARY_ADDENTRY_VIEW; include("tabs.html"); if (!$e) { - require_capability('mod/glossary:write', $context); + require_capability('mod/glossary:write', $context); } -include("edit.html"); - -echo ''; +$mform->display(); +echo ''; //TODO remove center tag from here and tabs.html glossary_print_tabbed_table_end(); - // Lets give IE more time to load the whole page - // before trying to load the editor. - if ($usehtmleditor) { - use_html_editor("text"); - } - print_footer($course); -?> +?> \ No newline at end of file diff --git a/mod/glossary/edit_form.php b/mod/glossary/edit_form.php new file mode 100644 index 0000000000..d803c3d485 --- /dev/null +++ b/mod/glossary/edit_form.php @@ -0,0 +1,141 @@ +dirroot.'/lib/formslib.php'); + +class glossary_entry_form extends moodleform { + + function definition() { + + global $CFG, $COURSE; + $mform =& $this->_form; + + $glossary =& $this->_customdata['glossary']; + $mode =& $this->_customdata['mode']; + $cm =& $this->_customdata['cm']; + $hook =& $this->_customdata['hook']; + $e =& $this->_customdata['e']; + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'general', get_string('general', 'form')); + + $mform->addElement('text', 'concept', get_string('concept', 'glossary')); + $mform->setType('concept', PARAM_TEXT); + $mform->addRule('concept', null, 'required', null, 'client'); + + $mform->addElement('htmleditor', 'definition', get_string('definition', 'glossary'), array('rows'=>20)); + $mform->setType('definition', PARAM_RAW); + $mform->addRule('definition', null, 'required', null, 'client'); + + $mform->addElement('format'); + + $categories = array(); + if ($categories = get_records_menu('glossary_categories', 'glossaryid', $glossary->id, 'name ASC', 'id, name')){ + $categories = array(0 => get_string('notcategorised', 'glossary')) + $categories; + } else { + $categories = array(0 => get_string('notcategorised', 'glossary')); + } + + $categoriesEl = $mform->addElement('select', 'categories', get_string('categories', 'glossary'), $categories); + $categoriesEl->setMultiple(true); + $categoriesEl->setSize(5); + + $mform->addElement('textarea', 'aliases', get_string('aliases', 'glossary'), 'rows="2" cols="40"'); + $mform->setType('aliases', PARAM_TEXT); + $mform->setHelpButton('aliases', array('aliases2', strip_tags(get_string('aliases', 'glossary')), 'glossary')); + + $this->set_max_file_size(); + $this->_upload_manager = new upload_manager('attachment', true, false, $COURSE, false, 0, true, true); + $mform->addElement('file', 'attachment', get_string('attachment', 'forum')); + $mform->setHelpButton('attachment', array('attachment', get_string('attachment', 'glossary'), 'glossary')); + + if (isset($CFG->glossary_linkentries)) { + $usedynalink = $CFG->glossary_linkentries; + } else { + $usedynalink = 0; + } + if (isset($CFG->glossary_casesensitive)) { + $casesensitive = $CFG->glossary_casesensitive; + } else { + $casesensitive = 0; + } + if (isset($CFG->glossary_fullmatch)) { + $fullmatch = $CFG->glossary_fullmatch; + } else { + $fullmatch = 0; + } + if ( !$glossary->usedynalink ) { + $mform->addElement('hidden', 'usedynalink', $usedynalink); + $mform->addElement('hidden', 'casesensitive', $casesensitive); + $mform->addElement('hidden', 'fullmatch', $fullmatch); + } else { +//------------------------------------------------------------------------------- + $mform->addElement('header', 'linkinghdr', get_string('linking', 'glossary')); + + $mform->addElement('checkbox', 'usedynalink', get_string('entryusedynalink', 'glossary')); + $mform->setHelpButton('usedynalink', array('usedynalinkentry', strip_tags(get_string('usedynalink', 'glossary')), 'glossary')); + $mform->setDefault('usedynalink', $usedynalink); + + $mform->addElement('checkbox', 'casesensitive', get_string('casesensitive', 'glossary')); + $mform->setHelpButton('casesensitive', array('casesensitive', strip_tags(get_string('casesensitive', 'glossary')), 'glossary')); + $mform->disabledIf('casesensitive', 'usedynalink'); + $mform->setDefault('casesensitive', $casesensitive); + + $mform->addElement('checkbox', 'fullmatch', get_string('fullmatch', 'glossary')); + $mform->setHelpButton('fullmatch', array('fullmatch', strip_tags(get_string('fullmatch', 'glossary')), 'glossary')); + $mform->disabledIf('fullmatch', 'usedynalink'); + $mform->setDefault('fullmatch', $fullmatch); + } + + $mform->addElement('hidden', 'e', $e); + $mform->addElement('hidden', 'id', $cm->id); + $mform->addElement('hidden', 'mode', $mode); + $mform->addElement('hidden', 'hook', $hook); + +//------------------------------------------------------------------------------- + $this->add_action_buttons(); + } + + function validation($data){ + global $CFG, $USER; + $errors = array(); + $e = $this->_customdata['e']; + $glossary = $this->_customdata['glossary']; + $context = $this->_customdata['context']; + $data['concept'] = trim($data['concept']); + if ($e) { + //We are updating an entry, so we compare current session user with + //existing entry user to avoid some potential problems if secureforms=off + //Perhaps too much security? Anyway thanks to skodak (Bug 1823) + $old = get_record('glossary_entries', 'id', $e); + $ineditperiod = ((time() - $old->timecreated < $CFG->maxeditingtime) || $glossary->editalways); + if ( (!$ineditperiod || $USER->id != $old->userid) and !has_capability('mod/glossary:manageentries', $context)) { + if ( $USER->id != $old->userid ) { + $errors['concept'] = get_string('errcannoteditothers', 'glossary'); + } elseif (!$ineditperiod) { + $errors['concept'] = get_string('erredittimeexpired', 'glossary'); + } + } + if ( !$glossary->allowduplicatedentries ) { + if ($dupentries = get_records('glossary_entries', 'lower(concept)', moodle_strtolower($data['concept']))) { + foreach ($dupentries as $curentry) { + if ( $glossary->id == $curentry->glossaryid ) { + if ( $curentry->id != $e ) { + $errors['concept'] = get_string('errconceptalreadyexists', 'glossary'); + break; + } + } + } + } + } + + } else { + if ( !$glossary->allowduplicatedentries ) { + if ($dupentries = get_record('glossary_entries', 'lower(concept)', moodle_strtolower($data['concept']), 'glossaryid', $glossary->id)) { + $errors['concept'] = get_string('errconceptalreadyexists', 'glossary'); + } + } + } + return $errors; + } + +} +?> \ No newline at end of file diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php index ccd523f996..ce99e581ce 100644 --- a/mod/glossary/mod_form.php +++ b/mod/glossary/mod_form.php @@ -34,7 +34,7 @@ class glossary_mod_form extends moodleform_mod { $options = array(1=>get_string('mainglossary', 'glossary'), 0=>get_string('secondaryglossary', 'glossary')); $mform->addElement('select', 'mainglossary', get_string('glossarytype', 'glossary'), $options); - $mform->setHelpButton('mainglossary', array('mainglossary', get_string('mainglossary', 'glossary'), 'glossary'));$mform->setDefault('allowduplicatedentries', $CFG->glossary_dupentries); + $mform->setHelpButton('mainglossary', array('mainglossary', get_string('mainglossary', 'glossary'), 'glossary')); $mform->setDefault('mainglossary', 0); $mform->addElement('selectyesno', 'allowduplicatedentries', get_string('allowduplicatedentries', 'glossary'), $options); @@ -145,12 +145,8 @@ class glossary_mod_form extends moodleform_mod { $this->standard_coursemodule_elements(); //------------------------------------------------------------------------------- - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); + // buttons + $this->add_action_buttons(); } function definition_after_data(){ diff --git a/mod/journal/mod_form.php b/mod/journal/mod_form.php index 137f2d1208..d8ab781c36 100644 --- a/mod/journal/mod_form.php +++ b/mod/journal/mod_form.php @@ -44,13 +44,9 @@ class journal_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(); //------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); } diff --git a/mod/label/mod_form.php b/mod/label/mod_form.php index 48069acd81..350d180114 100644 --- a/mod/label/mod_form.php +++ b/mod/label/mod_form.php @@ -15,12 +15,10 @@ class label_mod_form extends moodleform_mod { $mform->addElement('modvisible', 'visible', get_string('visible')); - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); +//------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); + } } diff --git a/mod/lesson/mod_form.php b/mod/lesson/mod_form.php index 3f340e159b..f2c9807072 100644 --- a/mod/lesson/mod_form.php +++ b/mod/lesson/mod_form.php @@ -273,13 +273,8 @@ class lesson_mod_form extends moodleform_mod { //------------------------------------------------------------------------------- $this->standard_coursemodule_elements(false); //------------------------------------------------------------------------------- - - $buttonarray=array(); - $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('savechanges')); - $buttonarray[] = &$mform->createElement('reset', 'resetbutton', get_string('revert')); - $buttonarray[] = &$mform->createElement('cancel'); - $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false); - $mform->closeHeaderBefore('buttonar'); + // buttons + $this->add_action_buttons(); } diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php index 9a4366288b..f5f3c27da8 100644 --- a/mod/quiz/lib.php +++ b/mod/quiz/lib.php @@ -56,7 +56,7 @@ define("QUIZ_MAX_EVENT_LENGTH", "432000"); // 5 days maximum * (defined by the form in mod.html) this function * will create a new instance and return the id number * of the new instance. - * + * * @param object $quiz the data that came from the form. * @return mixed the id of the new instance on success, * false or a string error message on failure. @@ -78,7 +78,7 @@ function quiz_add_instance($quiz) { // Do the processing required after an add or an update. quiz_after_add_or_update($quiz); - + return $quiz->id; } @@ -86,7 +86,7 @@ function quiz_add_instance($quiz) { * Given an object containing all the necessary data, * (defined by the form in mod.html) this function * will update an existing instance with new data. - * + * * @param object $quiz the data that came from the form. * @return mixed true on success, false or a string error message on failure. */ @@ -175,7 +175,7 @@ function quiz_user_outline($course, $user, $mod, $quiz) { /// $return->time = the time they did it /// $return->info = a short text description if ($grade = get_record('quiz_grades', 'userid', $user->id, 'quiz', $quiz->id)) { - + $result = new stdClass; if ((float)$grade->grade) { $result->info = get_string('grade').': '.round($grade->grade, $quiz->decimalpoints); @@ -464,25 +464,8 @@ function quiz_process_options(&$quiz) { $quiz->timemodified = time(); // Quiz open time. - if (empty($quiz->availableenable)) { - $quiz->timeopen = 0; + if (empty($quiz->timeopen)) { $quiz->preventlate = 0; - } else { - $quiz->timeopen = make_timestamp($quiz->availableyear, $quiz->availablemonth, - $quiz->availableday, $quiz->availablehour, $quiz->availableminute); - } - - // Quiz close time. - if (empty($quiz->dueenable)) { - $quiz->timeclose = 0; - } else { - $quiz->timeclose = make_timestamp($quiz->dueyear, $quiz->duemonth, - $quiz->dueday, $quiz->duehour, $quiz->dueminute); - } - - // Check open and close times are consistent. - if ($quiz->timeopen != 0 && $quiz->timeclose != 0 && $quiz->timeclose < $quiz->timeopen) { - return get_string('closebeforeopen', 'quiz'); } // Quiz name. (Make up a default if one was not given.) @@ -494,15 +477,15 @@ function quiz_process_options(&$quiz) { } } $quiz->name = trim($quiz->name); - + // Time limit. (Get rid of it if the checkbox was not ticked.) - if (empty($quiz->timelimitenable) or empty($quiz->timelimit) or $quiz->timelimit < 0) { + if (empty($quiz->timelimitenable)) { $quiz->timelimit = 0; } $quiz->timelimit = round($quiz->timelimit); - + // Quiz feedback - + // Clean up the boundary text. for ($i = 0; $i < count($quiz->feedbacktext); $i += 1) { if (empty($quiz->feedbacktext[$i])) { @@ -511,7 +494,7 @@ function quiz_process_options(&$quiz) { $quiz->feedbacktext[$i] = trim($quiz->feedbacktext[$i]); } } - + // Check the boundary value is a number or a percentage, and in range. $i = 0; while (!empty($quiz->feedbackboundaries[$i])) { @@ -536,7 +519,7 @@ function quiz_process_options(&$quiz) { $i += 1; } $numboundaries = $i; - + // Check there is nothing in the remaining unused fields. for ($i = $numboundaries; $i < count($quiz->feedbackboundaries); $i += 1) { if (!empty($quiz->feedbackboundaries[$i]) && trim($quiz->feedbackboundaries[$i]) != '') { @@ -551,7 +534,7 @@ function quiz_process_options(&$quiz) { $quiz->feedbackboundaries[-1] = $quiz->grade + 1; // Needs to be bigger than $quiz->grade because of '<' test in quiz_feedback_for_grade(). $quiz->feedbackboundaries[$numboundaries] = 0; $quiz->feedbackboundarycount = $numboundaries; - + // Settings that get combined to go into the optionflags column. $quiz->optionflags = 0; if (!empty($quiz->adaptive)) { @@ -644,14 +627,14 @@ function quiz_process_options(&$quiz) { /** * This function is called at the end of quiz_add_instance * and quiz_update_instance, to do the common processing. - * + * * @param object $quiz the quiz object. */ function quiz_after_add_or_update($quiz) { // Save the feedback delete_records('quiz_feedback', 'quizid', $quiz->id); - + for ($i = 0; $i <= $quiz->feedbackboundarycount; $i += 1) { $feedback = new stdClass; $feedback->quizid = $quiz->id; @@ -664,9 +647,7 @@ function quiz_after_add_or_update($quiz) { } // Remember whether this user likes the advanced settings visible or hidden. - if (isset($quiz->optionsettingspref)) { - set_user_preference('quiz_optionsettingspref', $quiz->optionsettingspref); - } + set_user_preference('quiz_optionsettingspref', $quiz->mform_showadvanced_last); // Update the events relating to this quiz. // This is slightly inefficient, deleting the old events and creating new ones. However, diff --git a/mod/quiz/mod.html b/mod/quiz/mod.html deleted file mode 100644 index eceb7f6f4f..0000000000 --- a/mod/quiz/mod.html +++ /dev/null @@ -1,570 +0,0 @@ - -// It is used from /course/mod.php. The whole instance is available as $form. --> - - require_once("$CFG->dirroot/mod/quiz/locallib.php"); - - // Set any form variables that have not been initialized to their default value. - if (!isset($form->name)) { - $form->name = ""; - } - if (!isset($form->intro)) { - $form->intro = ""; - } - if (!isset($form->timeopen)) { - $form->timeopen = ""; - } - if (!isset($form->timeclose)) { - $form->timeclose = ""; - } - if (!isset($form->attempts)) { - $form->attempts = $CFG->quiz_attempts; - } - if (!isset($form->attemptonlast)) { - $form->attemptonlast = $CFG->quiz_attemptonlast; - } - if (!isset($form->grademethod)) { - $form->grademethod = $CFG->quiz_grademethod; - } - if (!isset($form->decimalpoints)) { - $form->decimalpoints = $CFG->quiz_decimalpoints; - } - if (!isset($form->review)) { - $form->review = $CFG->quiz_review; - } - if (!isset($form->questionsperpage)) { - $form->questionsperpage = $CFG->quiz_questionsperpage; - } - if (!isset($form->shufflequestions)) { - $form->shufflequestions = $CFG->quiz_shufflequestions; - } - if (!isset($form->shuffleanswers)) { - $form->shuffleanswers = $CFG->quiz_shuffleanswers; - } - if (!isset($form->grade)) { - $form->grade = $CFG->quiz_maximumgrade; - } - if (!isset($form->questions)) { - $form->questions = ""; - } - if (!isset($form->password)) { - $form->password = $CFG->quiz_password; - } - if (!isset($form->subnet)) { - $form->subnet = $CFG->quiz_subnet; - } - if (!isset($form->timelimit)) { - $form->timelimit = $CFG->quiz_timelimit; - } - if (!isset($form->popup)) { - $form->popup = $CFG->quiz_popup; - } - if (!isset($form->optionflags)) { - $form->optionflags = $CFG->quiz_optionflags; - } - if (!isset($form->penaltyscheme)) { - $form->penaltyscheme = $CFG->quiz_penaltyscheme; - } - if (empty($form->timedue)) { - $form->timedue = ""; - } - //enforced time delay between quiz attempts - //delay1: time delay between first and second attempt - //delay2: time delay between second and additional quiz attempt - if (!isset($form->delay1)) { - $form->delay1 = $CFG->quiz_delay1; - } - if (!isset($form->delay2)) { - $form->delay2 = $CFG->quiz_delay2; - } - - // Get any existing feedback text out of the database. - if (!empty($form->id)) { - $feedbacks = get_records('quiz_feedback', 'quizid', $form->id, 'mingrade DESC'); - } else { - $feedbacks = array(); - } - $form->feedbacktext = array(); - $form->feedbackboundaries = array(); - foreach ($feedbacks as $feedback) { - $form->feedbacktext[] = $feedback->feedbacktext; - if ($feedback->mingrade > 0) { - $form->feedbackboundaries[] = (100.0 * $feedback->mingrade / $form->grade) . '%'; - } - } - - // Make sure there are at least 5 feedbacktexts, or a bit more than the current nubmer. - $numfeedbacks = max( - count($form->feedbacktext) * 1.5, - count($form->feedbackboundaries) * 1.5, - 5 - ); - - for ($i = 0; $i < $numfeedbacks; $i += 1) { - if (!array_key_exists($i, $form->feedbacktext)) { - $form->feedbacktext[$i] = ''; - } - if (!array_key_exists($i, $form->feedbackboundaries)) { - $form->feedbackboundaries[$i] = ''; - } - } - - // The following are used for drop-down menus - $yesnooptions = array(get_string("no"), get_string("yes")); - - $attemptoptions = array(); - $attemptoptions[0] = get_string("attemptsunlimited", "quiz"); - $attemptoptions[1] = "1 ".moodle_strtolower(get_string("attempt", "quiz")); - for ($i=2;$i<=6;$i++) { - $attemptoptions[$i] = "$i ".moodle_strtolower(get_string("attempts", "quiz")); - } - - //enforced time delay between quiz attempts add-on - $timedelayoptions = array(); - $timedelayoptions[0] = get_string('none'); - $timedelayoptions[1800] = get_string('numminutes', '', 30); - $timedelayoptions[3600] = get_string('numminutes', '', 60); - for($i=2; $i<=23; $i++) { - $seconds = $i*3600; - $timedelayoptions[$seconds] = get_string('numhours', '', $i); - } - $timedelayoptions[86400] = get_string('numhours', '', 24); - for($i=2; $i<=7; $i++) { - $seconds = $i*86400; - $timedelayoptions[$seconds] = get_string('numdays', '', $i); - } - -?> - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -feedbacktext); $i = $i + 1) { ?> - - - - - - -feedbacktext) - 1) { ?> - - - - - - - - - - - - - - - - - - - - - - -
: - -
:

- '; - emoticonhelpbutton("form", "description"); - echo '
'; - } - ?> - 		- intro); - ?> -
: - " onclick="return lockoptions('form', 'availableenable', availableitems)" timeopen) echo 'checked="checked"' ?> /> - timeopen); - echo " - "; - print_time_selector("availablehour", "availableminute", $form->timeopen); - helpbutton('timeopen', get_string('quizopens', 'quiz'), 'quiz'); - ?> - - - - - -
: - " onclick="return lockoptions('form', 'dueenable', dueitems)" timeclose) echo 'checked="checked"' ?> /> - timeclose); - echo " - "; - print_time_selector("duehour", "dueminute", $form->timeclose); - helpbutton('timeopen', get_string('quizcloses', 'quiz'), 'quiz'); - ?> - - - - - -
- -
:100%
: - -
: - -
:0%
: - - - - - -
-
-
- - - -
- -
-
- - - - - - - - - - - - -instance) { ?> -wwwroot/mod/quiz/edit.php?quizid=$form->instance") ?>" /> -" /> - -" /> - -" /> -
-
- - - - - -quiz_fix_timelimit == $showfixed) { ?> - - : - - timelimit) echo 'checked="checked"' ?> /> - - - - - - - -quiz_fix_questionsperpage == $showfixed) { ?> - - : - - questionsperpage, ''); - helpbutton('questionsperpage', get_string('questionsperpage', 'quiz'), 'quiz'); - ?> - - - - -quiz_fix_shufflequestions == $showfixed) { ?> - - : - - shufflequestions", ""); - helpbutton("shufflequestions", get_string("shufflequestions","quiz"), "quiz"); - ?> - - - - -quiz_fix_shuffleanswers == $showfixed) { ?> - - : - - shuffleanswers", ""); - helpbutton("shufflewithin", get_string("shufflewithin","quiz"), "quiz"); - ?> - - - - -quiz_fix_attempts == $showfixed) { ?> - - : - - attempts", ""); - helpbutton("attempts", get_string("attemptsallowed","quiz"), "quiz"); - ?> - - - - -quiz_fix_attemptonlast == $showfixed) { ?> - - : - - attemptonlast", ""); - helpbutton("repeatattempts", - get_string("eachattemptbuildsonthelast", "quiz"), - "quiz"); - ?> - - - - -quiz_fix_grademethod == $showfixed) { ?> - - : - - grademethod", ""); - helpbutton("grademethod", get_string("grademethod","quiz"), "quiz"); - ?> - - - - -quiz_fix_adaptive == $showfixed) { ?> - - : - - optionflags & QUESTION_ADAPTIVE) ? 1 : 0, ""); - helpbutton("adaptive", get_string("adaptive","quiz"), "quiz"); - ?> - - - - -quiz_fix_penaltyscheme == $showfixed) { ?> - - : - - penaltyscheme", ""); - helpbutton("penaltyscheme", get_string("penaltyscheme","quiz"), "quiz"); - ?> - - - - -quiz_fix_decimalpoints == $showfixed) { ?> - - : - - '0', - 1 => '1', - 2 => '2', - 3 => '3' - ); - choose_from_menu($options, "decimalpoints", "$form->decimalpoints", ""); - helpbutton("decimalpoints", get_string("decimaldigits","quiz"), "quiz"); - ?> - - - - -quiz_fix_review == $showfixed) { - echo ''; - include($CFG->dirroot . '/mod/quiz/reviewoptions.html'); - echo ''; - $output = true; -} ?> - -quiz_fix_delay1 == $showfixed) { ?> - - : - - delay1", ""); - helpbutton("timedelay1", get_string("delay1","quiz"), "quiz"); - ?> - - - - -quiz_fix_delay2 == $showfixed) { ?> - - : - - delay2", ""); - helpbutton("timedelay2", get_string("delay2","quiz"), "quiz"); - ?> - - - - -quiz_fix_popup == $showfixed) { ?> - - : - - popup", ""); - helpbutton("popup", get_string("popup","quiz"), "quiz"); - ?> - - - - -quiz_fix_password == $showfixed) { ?> - - : - - - - - - - -quiz_fix_subnet == $showfixed) { ?> - - : - - - - - - - \ No newline at end of file diff --git a/mod/quiz/mod_form.php b/mod/quiz/mod_form.php new file mode 100644 index 0000000000..d083a9c67f --- /dev/null +++ b/mod/quiz/mod_form.php @@ -0,0 +1,334 @@ +dirroot/mod/quiz/locallib.php"); + +class quiz_mod_form extends moodleform_mod { + var $_feedbacks; + + function definition() { + + global $COURSE, $CFG, $QUIZ_GRADE_METHOD; + $mform =& $this->_form; + + $mform->setShowAdvanced(get_user_preferences('quiz_optionsettingspref', 0)); +//------------------------------------------------------------------------------- + $mform->addElement('header', 'general', get_string('general', 'form')); + + $mform->addElement('text', 'name', get_string('name')); + $mform->setType('name', PARAM_TEXT); + + $mform->addElement('htmleditor', 'intro', get_string("introduction", "quiz")); + $mform->setType('intro', PARAM_RAW); + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'timinghdr', get_string('timing', 'form')); + $mform->addElement('date_selector', 'timeopen', get_string("quizopen", "quiz"), array('optional'=>true)); + $mform->setHelpButton('timeopen', array('timeopen', get_string('quizopens', 'quiz'), 'quiz')); + + $mform->addElement('date_selector', 'timeclose', get_string("quizcloses", "quiz"), array('optional'=>true)); + $mform->setHelpButton('timeclose', array('timeopen', get_string('quizcloses', 'quiz'), 'quiz')); + + + $timelimitgrp=array(); + $timelimitgrp[] = &$mform->createElement('text', 'timelimit'); + $timelimitgrp[] = &$mform->createElement('checkbox', 'timelimitenable', '', get_string('enable')); + $mform->addGroup($timelimitgrp, 'timelimitgrp', get_string("timelimit", "quiz"), array(' '), false); + $mform->setType('timelimit', PARAM_TEXT); + $timelimitgrprules = array(); + $timelimitgrprules['timelimit'][] = array(null, 'numeric', null, 'client'); + $mform->addGroupRule('timelimitgrp', $timelimitgrprules); + $mform->disabledIf('timelimitgrp', 'timelimitenable'); + $mform->setAdvanced('timelimitgrp', $CFG->quiz_fix_timelimit); + $mform->setHelpButton('timelimitgrp', array("timelimit", get_string("quiztimer","quiz"), "quiz")); + $mform->setDefault('timelimit', $CFG->quiz_timelimit); + + + //enforced time delay between quiz attempts add-on + $timedelayoptions = array(); + $timedelayoptions[0] = get_string('none'); + $timedelayoptions[1800] = get_string('numminutes', '', 30); + $timedelayoptions[3600] = get_string('numminutes', '', 60); + for($i=2; $i<=23; $i++) { + $seconds = $i*3600; + $timedelayoptions[$seconds] = get_string('numhours', '', $i); + } + $timedelayoptions[86400] = get_string('numhours', '', 24); + for($i=2; $i<=7; $i++) { + $seconds = $i*86400; + $timedelayoptions[$seconds] = get_string('numdays', '', $i); + } + $mform->addElement('select', 'delay1', get_string("delay1", "quiz"), $timedelayoptions); + $mform->setHelpButton('delay1', array("timedelay1", get_string("delay1", "quiz"), "quiz")); + $mform->setAdvanced('delay1', $CFG->quiz_fix_delay1); + $mform->setDefault('delay1', $CFG->quiz_delay1); + + $mform->addElement('select', 'delay2', get_string("delay2", "quiz"), $timedelayoptions); + $mform->setHelpButton('delay2', array("timedelay2", get_string("delay2", "quiz"), "quiz")); + $mform->setAdvanced('delay2', $CFG->quiz_fix_delay2); + $mform->setDefault('delay2', $CFG->quiz_delay2); + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'displayhdr', get_string('display', 'form')); + $perpage = array(); + for ($i = 0; $i <= 50; ++$i) { + $perpage[$i] = $i; + } + $perpage[0] = get_string('allinone', 'quiz'); + $mform->addElement('select', 'questionsperpage', get_string('questionsperpage', 'quiz'), $perpage); + $mform->setHelpButton('questionsperpage', array('questionsperpage', get_string('questionsperpage', 'quiz'), 'quiz')); + $mform->setAdvanced('questionsperpage', $CFG->quiz_fix_questionsperpage); + $mform->setDefault('questionsperpage', $CFG->quiz_questionsperpage); + + $mform->addElement('selectyesno', 'shufflequestions', get_string("shufflequestions", "quiz")); + $mform->setHelpButton('shufflequestions', array("shufflequestions", get_string("shufflequestions","quiz"), "quiz")); + $mform->setAdvanced('shufflequestions', $CFG->quiz_fix_shufflequestions); + $mform->setDefault('shufflequestions', $CFG->quiz_shufflequestions); + + $mform->addElement('selectyesno', 'shuffleanswers', get_string("shufflewithin", "quiz")); + $mform->setHelpButton('shuffleanswers', array("shufflewithin", get_string("shufflewithin","quiz"), "quiz")); + $mform->setAdvanced('shuffleanswers', $CFG->quiz_fix_shuffleanswers); + $mform->setDefault('shuffleanswers', $CFG->quiz_shuffleanswers); + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'attemptshdr', get_string('attempts', 'quiz')); + $attemptoptions = array(); + $attemptoptions[0] = get_string("attemptsunlimited", "quiz"); + $attemptoptions[1] = "1 ".moodle_strtolower(get_string("attempt", "quiz")); + for ($i=2;$i<=6;$i++) { + $attemptoptions[$i] = "$i ".moodle_strtolower(get_string("attempts", "quiz")); + } + $mform->addElement('select', 'attempts', get_string("attemptsallowed", "quiz"), $attemptoptions); + $mform->setHelpButton('attempts', array("attempts", get_string("attemptsallowed","quiz"), "quiz")); + $mform->setAdvanced('attempts', $CFG->quiz_fix_attempts); + $mform->setDefault('attempts', $CFG->quiz_attempts); + + $mform->addElement('selectyesno', 'attemptonlast', get_string("eachattemptbuildsonthelast", "quiz")); + $mform->setHelpButton('attemptonlast', array("repeatattempts", get_string("eachattemptbuildsonthelast", "quiz"), "quiz")); + $mform->setAdvanced('attemptonlast', $CFG->quiz_fix_attemptonlast); + $mform->setDefault('attemptonlast', $CFG->quiz_attemptonlast); + + $mform->addElement('selectyesno', 'adaptive', get_string("adaptive", "quiz")); + $mform->setHelpButton('adaptive', array("adaptive", get_string("adaptive","quiz"), "quiz")); + $mform->setAdvanced('adaptive', $CFG->quiz_fix_adaptive); + $mform->setDefault('adaptive', $CFG->quiz_optionflags & QUESTION_ADAPTIVE); + + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'gradeshdr', get_string('grades', 'grades')); + $mform->addElement('select', 'grademethod', get_string("grademethod", "quiz"), $QUIZ_GRADE_METHOD); + $mform->setHelpButton('grademethod', array("grademethod", get_string("grademethod","quiz"), "quiz")); + $mform->setAdvanced('grademethod', $CFG->quiz_fix_grademethod); + $mform->setDefault('grademethod', $CFG->quiz_grademethod); + + $mform->addElement('selectyesno', 'penaltyscheme', get_string("penaltyscheme", "quiz")); + $mform->setHelpButton('penaltyscheme', array("penaltyscheme", get_string("penaltyscheme","quiz"), "quiz")); + $mform->setAdvanced('penaltyscheme', $CFG->quiz_fix_penaltyscheme); + $mform->setDefault('penaltyscheme', $CFG->quiz_penaltyscheme); + + $options = array( + 0 => '0', + 1 => '1', + 2 => '2', + 3 => '3'); + $mform->addElement('select', 'decimalpoints', get_string("decimaldigits", "quiz"), $options); + $mform->setHelpButton('decimalpoints', array("decimalpoints", get_string("decimaldigits","quiz"), "quiz")); + $mform->setAdvanced('decimalpoints', $CFG->quiz_fix_decimalpoints); + + $mform->addElement('hidden', 'grade', $CFG->quiz_maximumgrade); + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'reviewoptionshdr', get_string("reviewoptions", "quiz")); + $mform->setHelpButton('reviewoptionshdr', array("review2", get_string("allowreview","quiz"), "quiz")); + $mform->setAdvanced('reviewoptionshdr', $CFG->quiz_fix_review); + + $immediatelyoptionsgrp=array(); + $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'responsesimmediately', '', get_string('responses', 'quiz')); + $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'scoreimmediately', '', get_string('scores', 'quiz')); + $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackimmediately', '', get_string('feedback', 'quiz')); + $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'answersimmediately', '', get_string('answers', 'quiz')); + $immediatelyoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackimmediately', '', get_string('generalfeedback', 'quiz')); + $mform->addGroup($immediatelyoptionsgrp, 'immediatelyoptionsgrp', get_string("reviewimmediately", "quiz"), null, false); + $mform->setDefault('responsesimmediately', $CFG->quiz_review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_IMMEDIATELY); + $mform->setDefault('scoreimmediately', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_IMMEDIATELY); + $mform->setDefault('feedbackimmediately', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_IMMEDIATELY); + $mform->setDefault('answersimmediately', $CFG->quiz_review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_IMMEDIATELY); + $mform->setDefault('generalfeedbackimmediately', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY); + + $openoptionsgrp=array(); + $openoptionsgrp[] = &$mform->createElement('checkbox', 'responsesopen', '', get_string('responses', 'quiz')); + $openoptionsgrp[] = &$mform->createElement('checkbox', 'scoreopen', '', get_string('scores', 'quiz')); + $openoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackopen', '', get_string('feedback', 'quiz')); + $openoptionsgrp[] = &$mform->createElement('checkbox', 'answersopen', '', get_string('answers', 'quiz')); + $openoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackopen', '', get_string('generalfeedback', 'quiz')); + $mform->addGroup($openoptionsgrp, 'openoptionsgrp', get_string("reviewopen", "quiz"), array(' '), false); + $mform->setDefault('responsesopen', $CFG->quiz_review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_OPEN); + $mform->setDefault('scoreopen', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_OPEN); + $mform->setDefault('feedbackopen', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_OPEN); + $mform->setDefault('answersopen', $CFG->quiz_review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_OPEN); + $mform->setDefault('generalfeedbackopen', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_OPEN); + + + $closedoptionsgrp=array(); + $closedoptionsgrp[] = &$mform->createElement('checkbox', 'responsesclosed', '', get_string('responses', 'quiz')); + $closedoptionsgrp[] = &$mform->createElement('checkbox', 'scoreclosed', '', get_string('scores', 'quiz')); + $closedoptionsgrp[] = &$mform->createElement('checkbox', 'feedbackclosed', '', get_string('feedback', 'quiz')); + $closedoptionsgrp[] = &$mform->createElement('checkbox', 'answersclosed', '', get_string('answers', 'quiz')); + $closedoptionsgrp[] = &$mform->createElement('checkbox', 'generalfeedbackclosed', '', get_string('generalfeedback', 'quiz')); + $mform->addGroup($closedoptionsgrp, 'closedoptionsgrp', get_string("reviewclosed", "quiz"), array(' '), false); + $mform->setDefault('responsesclosed', $CFG->quiz_review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_CLOSED); + $mform->setDefault('scoreclosed', $CFG->quiz_review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_CLOSED); + $mform->setDefault('feedbackclosed', $CFG->quiz_review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_CLOSED); + $mform->setDefault('answersclosed', $CFG->quiz_review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_CLOSED); + $mform->setDefault('generalfeedbackclosed', $CFG->quiz_review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_CLOSED); + +//------------------------------------------------------------------------------- + $mform->addElement('header', 'security', get_string('security', 'form')); + + $mform->addElement('selectyesno', 'popup', get_string("popup", "quiz")); + $mform->setHelpButton('popup', array("popup", get_string("popup", "quiz"), "quiz")); + $mform->setAdvanced('popup', $CFG->quiz_fix_popup); + $mform->setDefault('popup', $CFG->quiz_popup); + + $mform->addElement('text', 'password', get_string("requirepassword", "quiz")); + $mform->setType('password', PARAM_TEXT); + $mform->setHelpButton('password', array("requirepassword", get_string("requirepassword", "quiz"), "quiz")); + $mform->setAdvanced('password', $CFG->quiz_fix_password); + $mform->setDefault('password', $CFG->quiz_password); + + $mform->addElement('text', 'subnet', get_string("requiresubnet", "quiz")); + $mform->setType('subnet', PARAM_TEXT); + $mform->setHelpButton('subnet', array("requiresubnet", get_string("requiresubnet", "quiz"), "quiz")); + $mform->setAdvanced('subnet', $CFG->quiz_fix_subnet); + $mform->setDefault('subnet', $CFG->quiz_subnet); + +//------------------------------------------------------------------------------- + $this->standard_coursemodule_elements(); +//------------------------------------------------------------------------------- + $mform->addElement('header', 'overallfeedbackhdr', get_string('overallfeedback', 'quiz')); + $mform->setHelpButton('overallfeedbackhdr', array('overallfeedback', get_string('overallfeedback', 'quiz'), 'quiz')); + + $mform->addElement('static', 'gradeboundarystatic1', get_string('gradeboundary', 'quiz'), '100%'); + + $repeatarray=array(); + $repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbacktext', get_string('feedback', 'quiz')); + $repeatarray[] = &MoodleQuickForm::createElement('text', 'feedbackboundaries', get_string('gradeboundary', 'quiz')); + + if (!empty($this->_instance)) { + $this->_feedbacks = get_records('quiz_feedback', 'quizid', $this->_instance, 'mingrade DESC'); + } else { + $this->_feedbacks = array(); + } + $numfeedbacks = max(count($this->_feedbacks) * 1.5, 5); + $nextel=$this->repeat_elements($repeatarray, $numfeedbacks-1, + array('feedbacktext'=> array('type'=>PARAM_TEXT), + 'feedbackboundaries' => array('type'=>PARAM_TEXT)), + 'boundary_repeats', 'boundary_add_fields', 3); + + //put some extra elements in before the button + $insertEl = &MoodleQuickForm::createElement('text', "feedbacktext[$nextel]", get_string('feedback', 'quiz')); + $mform->insertElementBefore($insertEl, 'boundary_add_fields'); + $mform->setType("feedbacktext[$nextel]", PARAM_TEXT); + $mform->setHelpButton("feedbacktext[$nextel]", array('options', get_string('modulenameplural', 'choice'), 'choice')); + + $insertEl = &MoodleQuickForm::createElement('static', 'gradeboundarystatic2', get_string('gradeboundary', 'quiz'), '0%'); + $mform->insertElementBefore($insertEl, 'boundary_add_fields'); + +//------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(); + } + + function defaults_preprocessing(&$default_values){ + if (count($this->_feedbacks)) { + $key = 0; + foreach ($this->_feedbacks as $feedback){ + $default_values['feedbacktext['.$key.']'] = $feedback->feedbacktext; + if ($feedback->mingrade > 0) { + $default_values['feedbackboundaries['.$key.']'] = (100.0 * $feedback->mingrade / $default_values['grade']) . '%'; + } + $key++; + } + + } + if (empty($default_values['timelimit'])) { + $default_values['timelimitenable'] = 0; + } else { + $default_values['timelimitenable'] = 1; + } + + if (isset($default_values['review'])){ + $review = (int)$default_values['review']; + unset($default_values['review']); + + $default_values['responsesimmediately'] = $review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_IMMEDIATELY; + $default_values['scoreimmediately'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_IMMEDIATELY; + $default_values['feedbackimmediately'] = $review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_IMMEDIATELY; + $default_values['answersimmediately'] = $review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_IMMEDIATELY; + $default_values['generalfeedbackimmediately'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_IMMEDIATELY; + + $default_values['responsesopen'] = $review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_OPEN; + $default_values['scoreopen'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_OPEN; + $default_values['feedbackopen'] = $review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_OPEN; + $default_values['answersopen'] = $review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_OPEN; + $default_values['generalfeedbackopen'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_OPEN; + + $default_values['responsesclosed'] = $review & QUIZ_REVIEW_RESPONSES & QUIZ_REVIEW_CLOSED; + $default_values['scoreclosed'] = $review & QUIZ_REVIEW_SCORES & QUIZ_REVIEW_CLOSED; + $default_values['feedbackclosed'] = $review & QUIZ_REVIEW_FEEDBACK & QUIZ_REVIEW_CLOSED; + $default_values['answersclosed'] = $review & QUIZ_REVIEW_ANSWERS & QUIZ_REVIEW_CLOSED; + $default_values['generalfeedbackclosed'] = $review & QUIZ_REVIEW_GENERALFEEDBACK & QUIZ_REVIEW_CLOSED; + } + + if (isset($default_values['optionflags'])){ + $default_values['adaptive'] = $default_values['optionflags'] & QUESTION_ADAPTIVE; + unset($default_values['optionflags']); + } + } + + function validation($data){ + $errors = array(); + // Check open and close times are consistent. + if ($data['timeopen'] != 0 && $data['timeclose'] != 0 && $data['timeclose'] < $data['timeopen']) { + $errors['timeclose'] = get_string('closebeforeopen', 'quiz'); + } + + // Check the boundary value is a number or a percentage, and in range. + $i = 0; + while (!empty($data['feedbackboundaries'][$i] )) { + $boundary = trim($data['feedbackboundaries'][$i]); + if (strlen($boundary) > 0 && $boundary[strlen($boundary) - 1] == '%') { + $boundary = trim(substr($boundary, 0, -1)); + if (is_numeric($boundary)) { + $boundary = $boundary * $data['grade'] / 100.0; + } else { + $errors["feedbackboundaries[$i]"] = get_string('feedbackerrorboundaryformat', 'quiz', $i + 1); + } + } + if (is_numeric($boundary) && $boundary <= 0 || $boundary >= $data['grade'] ) { + $errors["feedbackboundaries[$i]"] = get_string('feedbackerrorboundaryoutofrange', 'quiz', $i + 1); + } + if (is_numeric($boundary) && $i > 0 && $boundary >= $data['feedbackboundaries'][$i - 1]) { + $errors["feedbackboundaries[$i]"] = get_string('feedbackerrororder', 'quiz', $i + 1); + } + $data['feedbackboundaries'][$i] = $boundary; + $i += 1; + } + $numboundaries = $i; + + // Check there is nothing in the remaining unused fields. + for ($i = $numboundaries; $i < count($data['feedbackboundaries'] ); $i += 1) { + if (!empty($data['feedbackboundaries'][$i] ) && trim($data['feedbackboundaries'][$i] ) != '') { + $errors["feedbackboundaries[$i]"] = get_string('feedbackerrorjunkinboundary', 'quiz', $i + 1); + } + } + for ($i = $numboundaries + 1; $i < count($data['feedbacktext'] ); $i += 1) { + if (!empty($data['feedbacktext'][$i] ) && trim($data['feedbacktext'][$i] ) != '') { + $errors["feedbacktext[$i]"] = get_string('feedbackerrorjunkinfeedback', 'quiz', $i + 1); + } + } + return $errors; + } + +} +?> \ No newline at end of file diff --git a/mod/survey/details.php b/mod/survey/details.php index 379e5c1b82..4e4630d755 100644 --- a/mod/survey/details.php +++ b/mod/survey/details.php @@ -31,7 +31,9 @@ $mform->addElement('hidden', 'mode', $lastform->mode); $mform->addElement('hidden', 'visible', $lastform->visible); $mform->addElement('hidden', 'groupmode', $lastform->groupmode); - $mform->addElement('submit', 'submitbutton', get_string("savechanges")); +//------------------------------------------------------------------------------- + // buttons + $this->add_action_buttons(false); } } diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css index 7c0dc5b191..0ead3c3b16 100644 --- a/theme/standard/styles_layout.css +++ b/theme/standard/styles_layout.css @@ -319,7 +319,10 @@ form.mform fieldset legend { font-weight: bold; margin-left: 0.5em; } - +form.mform fieldset .advancedbutton{ + width:100%; + text-align:right; +} form.mform div.fitem { clear: both; width: 100%; -- 2.39.5