';
print_heading_with_help($pageheading, "mods", $module->name, $icon);
- $mform->set_defaults($form);
$mform->display();
print_footer($course);
}
diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php
index 63a44532592..9edc15dff88 100755
--- a/enrol/authorize/enrol_form.php
+++ b/enrol/authorize/enrol_form.php
@@ -2,7 +2,7 @@
require_once($CFG->libdir.'/formslib.php');
-class authorize_enrol_form extends moodleform
+class enrol_authorize_enrol_form extends moodleform
{
function definition()
{
diff --git a/lang/en_utf8/blog.php b/lang/en_utf8/blog.php
index 3bbe80128e7..db66304422c 100755
--- a/lang/en_utf8/blog.php
+++ b/lang/en_utf8/blog.php
@@ -1,4 +1,4 @@
-firstname,
-A new account has been created for you at \'$a->sitename\'
+A new account has been created for you at \'$a->sitename\'
and you have been issued with a new temporary password.
Your current login information is now:
username: $a->username
password: $a->newpassword
- (you will have to change your password
+ (you will have to change your password
when you login for the first time)
-To start using \'$a->sitename\', login at
+To start using \'$a->sitename\', login at
$a->link
In most mail programs, this should appear as a blue link
@@ -975,7 +975,7 @@ $string['nopotentialcreators'] = 'No potential course creators';
$string['nopotentialstudents'] = 'No potential students';
$string['nopotentialteachers'] = 'No potential teachers';
$string['norecentactivity'] = 'No recent activity';
-$string['noreplybouncemessage'] = 'You have replied to a no-reply email address. If you were attempting to reply to a forum post, please instead reply using the $a forums.
+$string['noreplybouncemessage'] = 'You have replied to a no-reply email address. If you were attempting to reply to a forum post, please instead reply using the $a forums.
Following is the content of your email:';
$string['noreplybouncesubject'] = '$a - bounced email.';
@@ -1325,6 +1325,7 @@ $string['supplyinfo'] = 'Please supply some information about yourself';
$string['switchrolereturn'] = 'Return to my normal role';
$string['switchroleto'] = 'Switch role to...';
$string['tag'] = 'Tag';
+$string['tagalready'] = 'This tag already exists';
$string['tagmanagement'] = 'Add/delete tags ...';
$string['tags'] = 'Tags';
$string['targetrole'] = 'Target role';
diff --git a/lib/formslib.php b/lib/formslib.php
index 88c0f51b9a4..68246a3b536 100644
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -49,6 +49,7 @@ if ($CFG->debug >= DEBUG_ALL){
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'pear_handle_error');
}
+
/**
* Moodle specific wrapper that separates quickforms syntax from moodle code. You won't directly
* use this class you should write a class defintion which extends this class or a more specific
@@ -107,7 +108,8 @@ class moodleform {
if (empty($action)){
$action = strip_querystring(qualified_me());
}
- //strip '_form' from the end of class name to make form 'id' attribute.
+
+ //strip '_form' from the end of class name to make form name attribute.
$this->_formname = preg_replace('/_form$/', '', get_class($this), 1);
$this->_customdata = $customdata;
$this->_form =& new MoodleQuickForm($this->_formname, $method, $action, $target, $attributes);
@@ -279,6 +281,9 @@ class moodleform {
}
$mform =& $this->_form;
$nosubmit = false;
+ if (!$this->is_submitted()){
+ return false;
+ }
foreach ($mform->_noSubmitButtons as $nosubmitbutton){
if (optional_param($nosubmitbutton, 0, PARAM_RAW)){
$nosubmit = true;
@@ -297,9 +302,7 @@ class moodleform {
function is_validated() {
static $validated = null; // one validation is enough
$mform =& $this->_form;
- if ($this->no_submit_button_pressed()){
- return false;
- }
+
if ($validated === null) {
$internal_val = $mform->validate();
$moodle_val = $this->validation($mform->exportValues(null, true));
@@ -324,7 +327,11 @@ class moodleform {
}
$validated = ($internal_val and $moodle_val and $file_val);
}
- return $validated;
+ if ($this->no_submit_button_pressed()){
+ return false;
+ } else {
+ return $validated;
+ }
}
/**
@@ -576,6 +583,15 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
*/
var $_showAdvanced = null;
+ /**
+ * The form name is derrived from the class name of the wrapper minus the trailing form
+ * It is a name with words joined by underscores whereas the id attribute is words joined by
+ * underscores.
+ *
+ * @var unknown_type
+ */
+ var $_formName = '';
+
/**
* Class constructor - same parameters as HTML_QuickForm_DHTMLRulesTableless
* @param string $formName Form's name.
@@ -591,8 +607,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
HTML_Common::HTML_Common($attributes);
$target = empty($target) ? array() : array('target' => $target);
+ $this->_formName = $formName;
//no 'name' atttribute for form in xhtml strict :
- $attributes = array('action'=>$action, 'method'=>$method, 'id'=>$formName) + $target;
+ $attributes = array('action'=>$action, 'method'=>$method, 'id'=>strtr($formName, '_', '-')) + $target;
$this->updateAttributes($attributes);
//this is custom stuff for Moodle :
@@ -648,9 +665,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
return;
} else { //if setShowAdvanced is called without any preference
//make the default to not show advanced elements.
- $showadvancedNow = 0;
+ $showadvancedNow = get_user_preferences(
+ moodle_strtolower($this->_formName.'_showadvanced', 0));
}
-
}
//value of hidden element
$hiddenLast = optional_param('mform_showadvanced_last', -1, PARAM_INT);
@@ -665,6 +682,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
$next = $hiddenLast;
}
$this->_showAdvanced = $next;
+ if ($showadvancedNow != $next){
+ set_user_preference($this->_formName.'_showadvanced', $next);
+ }
$this->setConstants(array('mform_showadvanced_last'=>$next));
}
function getShowAdvanced(){
@@ -858,6 +878,74 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
return $unfiltered;
}
}
+ /**
+ * Adds a validation rule for the given field
+ *
+ * If the element is in fact a group, it will be considered as a whole.
+ * To validate grouped elements as separated entities,
+ * use addGroupRule instead of addRule.
+ *
+ * @param string $element Form element name
+ * @param string $message Message to display for invalid data
+ * @param string $type Rule type, use getRegisteredRules() to get types
+ * @param string $format (optional)Required for extra rule data
+ * @param string $validation (optional)Where to perform validation: "server", "client"
+ * @param boolean $reset Client-side validation: reset the form element to its original value if there is an error?
+ * @param boolean $force Force the rule to be applied, even if the target form element does not exist
+ * @since 1.0
+ * @access public
+ * @throws HTML_QuickForm_Error
+ */
+ function addRule($element, $message, $type, $format=null, $validation='server', $reset = false, $force = false)
+ {
+ parent::addRule($element, $message, $type, $format, $validation, $reset, $force);
+ if ($validation == 'client') {
+ $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_formName . '; } catch(e) { return true; } return myValidator(this);'));
+ }
+
+ } // end func addRule
+ /**
+ * Adds a validation rule for the given group of elements
+ *
+ * Only groups with a name can be assigned a validation rule
+ * Use addGroupRule when you need to validate elements inside the group.
+ * Use addRule if you need to validate the group as a whole. In this case,
+ * the same rule will be applied to all elements in the group.
+ * Use addRule if you need to validate the group against a function.
+ *
+ * @param string $group Form group name
+ * @param mixed $arg1 Array for multiple elements or error message string for one element
+ * @param string $type (optional)Rule type use getRegisteredRules() to get types
+ * @param string $format (optional)Required for extra rule data
+ * @param int $howmany (optional)How many valid elements should be in the group
+ * @param string $validation (optional)Where to perform validation: "server", "client"
+ * @param bool $reset Client-side: whether to reset the element's value to its original state if validation failed.
+ * @since 2.5
+ * @access public
+ * @throws HTML_QuickForm_Error
+ */
+ function addGroupRule($group, $arg1, $type='', $format=null, $howmany=0, $validation = 'server', $reset = false)
+ {
+ parent::addGroupRule($group, $arg1, $type, $format, $howmany, $validation, $reset);
+ if (is_array($arg1)) {
+ foreach ($arg1 as $elementIndex => $rules) {
+ foreach ($rules as $rule) {
+ $validation = (isset($rule[3]) && 'client' == $rule[3])? 'client': 'server';
+
+ if ('client' == $validation) {
+ $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $this->_formName . '; } catch(e) { return true; } return myValidator(this);'));
+ }
+ }
+ }
+ } elseif (is_string($arg1)) {
+
+ if ($validation == 'client') {
+ $this->updateAttributes(array('onsubmit' => 'try { var myValidator = validate_' . $formname . '; } catch(e) { return true; } return myValidator(this);'));
+ }
+ }
+ } // end func addGroupRule
+
+ // }}}
/**
* Returns the client side validation script
*
@@ -986,7 +1074,7 @@ function qf_errorHandler(element, _qfMsg) {
list($jsArr,$element)=$jsandelement;
//end of fix
$js .= '
-function validate_' . $this->_attributes['id'] . '_' . $elementName . '(element) {
+function validate_' . $this->_formName . '_' . $elementName . '(element) {
var value = \'\';
var errFlag = new Array();
var _qfGroups = {};
@@ -1000,12 +1088,12 @@ function validate_' . $this->_attributes['id'] . '_' . $elementName . '(element)
}
';
$validateJS .= '
- ret = validate_' . $this->_attributes['id'] . '_' . $elementName.'(frm.elements[\''.$elementName.'\']) && ret;';
+ ret = validate_' . $this->_formName . '_' . $elementName.'(frm.elements[\''.$elementName.'\']) && ret;';
// Fix for bug displaying errors for elements in a group
//unset($element);
//$element =& $this->getElement($elementName);
//end of fix
- $valFunc = 'validate_' . $this->_attributes['id'] . '_' . $elementName . '(this)';
+ $valFunc = 'validate_' . $this->_formName . '_' . $elementName . '(this)';
$onBlur = $element->getAttribute('onBlur');
$onChange = $element->getAttribute('onChange');
$element->updateAttributes(array('onBlur' => $onBlur . $valFunc,
@@ -1013,7 +1101,7 @@ function validate_' . $this->_attributes['id'] . '_' . $elementName . '(element)
}
// do not rely on frm function parameter, because htmlarea breaks it when overloading the onsubmit method
$js .= '
-function validate_' . $this->_attributes['id'] . '(frm) {
+function validate_' . $this->_formName . '(frm) {
if (skipClientValidation) {
return true;
}
diff --git a/lib/javascript-static.js b/lib/javascript-static.js
index eb0b8e8e8b7..c7e4444dc13 100644
--- a/lib/javascript-static.js
+++ b/lib/javascript-static.js
@@ -58,10 +58,24 @@ function lockoptions(form, master, subitems) {
return(true);
}
+function lockoption(form,item) {
+ eval("document."+form+"."+item+".disabled=true");/* IE thing */
+ if(document.forms[form].elements['h'+item]) {
+ eval("document."+form+".h"+item+".value=1");
+ }
+}
+
+function unlockoption(form,item) {
+ eval("document."+form+"."+item+".disabled=false");/* IE thing */
+ if(document.forms[form].elements['h'+item]) {
+ eval("document."+form+".h"+item+".value=0");
+ }
+}
function lockoptionsall(formid) {
- var lock=new Object();
- var items=eval(formid+'items');
- var form=document.forms[formid];
+ var lock = new Object();
+ var varname = formid.replace(/\-/g, '_');
+ var items = eval(varname+'items');
+ var form = document.forms[formid];
for (var master in items){
var subitems=items[master].dependents;
var thislock;
@@ -94,7 +108,8 @@ function lockoptionsall(formid) {
}
function lockoptionsallsetup(formid) {
- var items=eval(formid+'items');
+ var varname = formid.replace(/\-/g, '_');
+ var items=eval(varname+'items');
var form=document.forms[formid];
for (var i = 0; i < form.elements.length; i++){
var found=false;
@@ -113,26 +128,11 @@ function lockoptionsallsetup(formid) {
}
}
}
- if (found){
- }
}
return lockoptionsall(formid);
}
-function lockoption(form,item) {
- eval("document."+form+"."+item+".disabled=true");/* IE thing */
- if(document.forms[form].elements['h'+item]) {
- eval("document."+form+".h"+item+".value=1");
- }
-}
-
-function unlockoption(form,item) {
- eval("document."+form+"."+item+".disabled=false");/* IE thing */
- if(document.forms[form].elements['h'+item]) {
- eval("document."+form+".h"+item+".value=0");
- }
-}
function submitFormById(id) {
var theform = document.getElementById(id);
@@ -219,15 +219,16 @@ function findChildNodes(start, tagName, elementClass, elementID, elementName) {
}
}
}
- if( (child.nodeType == 1) &&//element node type
- (!tagName || child.nodeName == tagName) &&
- (!elementClass || classfound)&&
- (!elementID || child.id == elementID) &&
- (!elementName || child.name == elementName))
- {
- children = children.concat(child);
- } else {
- children = children.concat(findChildNodes(child, tagName, elementClass, elementID, elementName));
+ if(child.nodeType == 1) { //element node type
+ if ( (!tagName || child.nodeName == tagName) &&
+ (!elementClass || classfound)&&
+ (!elementID || child.id == elementID) &&
+ (!elementName || child.name == elementName))
+ {
+ children = children.concat(child);
+ } else {
+ 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 1a3438dda92..56cf683ec3b 100644
--- a/login/change_password_form.php
+++ b/login/change_password_form.php
@@ -2,7 +2,7 @@
require_once $CFG->libdir.'/formslib.php';
-class change_password_form extends moodleform {
+class login_change_password_form extends moodleform {
function definition() {
global $USER;
diff --git a/login/forgot_password_form.php b/login/forgot_password_form.php
index bf2b386e606..f035df54c6a 100644
--- a/login/forgot_password_form.php
+++ b/login/forgot_password_form.php
@@ -2,7 +2,7 @@
require_once $CFG->libdir.'/formslib.php';
-class forgot_password_form extends moodleform {
+class login_forgot_password_form extends moodleform {
function definition() {
$mform =& $this->_form;
diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php
index 592cc737999..28178ade69e 100644
--- a/mod/assignment/type/online/assignment.class.php
+++ b/mod/assignment/type/online/assignment.class.php
@@ -240,7 +240,7 @@ class assignment_online extends assignment_base {
}
-class assignment_online_edit_form extends moodleform {
+class mod_assignment_online_edit_form extends moodleform {
function definition() {
$mform =& $this->_form;
diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php
index 274f2ce568f..3c741c8ea93 100644
--- a/mod/assignment/type/upload/assignment.class.php
+++ b/mod/assignment/type/upload/assignment.class.php
@@ -914,7 +914,7 @@ class assignment_upload extends assignment_base {
}
-class assignment_upload_notes_form extends moodleform {
+class mod_assignment_upload_notes_form extends moodleform {
function definition() {
$mform =& $this->_form;
diff --git a/mod/chat/mod_form.php b/mod/chat/mod_form.php
index 047913bf9b0..b8f688f3bea 100644
--- a/mod/chat/mod_form.php
+++ b/mod/chat/mod_form.php
@@ -1,7 +1,7 @@
libdir.'/formslib.php';
-class data_comment_form extends moodleform {
+class mod_data_comment_form extends moodleform {
function definition() {
$mform =& $this->_form;
diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php
index 695bc783217..4a5fff23be4 100644
--- a/mod/data/mod_form.php
+++ b/mod/data/mod_form.php
@@ -1,7 +1,7 @@
libdir.'/formslib.php');
-class forum_post_form extends moodleform {
+class mod_forum_post_form extends moodleform {
function definition() {
diff --git a/mod/glossary/comment_form.php b/mod/glossary/comment_form.php
index b1667d6e245..a72674084b4 100644
--- a/mod/glossary/comment_form.php
+++ b/mod/glossary/comment_form.php
@@ -2,7 +2,7 @@
require_once $CFG->libdir.'/formslib.php';
-class glossary_comment_form extends moodleform {
+class mod_glossary_comment_form extends moodleform {
function definition() {
$mform =& $this->_form;
diff --git a/mod/glossary/edit_form.php b/mod/glossary/edit_form.php
index d803c3d4856..a40703090e3 100644
--- a/mod/glossary/edit_form.php
+++ b/mod/glossary/edit_form.php
@@ -1,7 +1,7 @@
dirroot.'/lib/formslib.php');
-class glossary_entry_form extends moodleform {
+class mod_glossary_entry_form extends moodleform {
function definition() {
diff --git a/mod/glossary/mod_form.php b/mod/glossary/mod_form.php
index 32a6f52243b..52ea260a229 100644
--- a/mod/glossary/mod_form.php
+++ b/mod/glossary/mod_form.php
@@ -1,7 +1,7 @@
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_form.php b/mod/quiz/mod_form.php
index fd1374537b8..172c8c7711b 100644
--- a/mod/quiz/mod_form.php
+++ b/mod/quiz/mod_form.php
@@ -3,7 +3,7 @@ require_once ('moodleform_mod.php');
require_once("$CFG->dirroot/mod/quiz/locallib.php");
-class quiz_mod_form extends moodleform_mod {
+class mod_quiz_mod_form extends moodleform_mod {
var $_feedbacks;
function definition() {
@@ -11,7 +11,6 @@ class quiz_mod_form extends moodleform_mod {
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'));
diff --git a/mod/survey/details.php b/mod/survey/details.php
index 4e4630d7554..43289e07656 100644
--- a/mod/survey/details.php
+++ b/mod/survey/details.php
@@ -2,7 +2,7 @@
require_once("../../config.php");
include_once $CFG->libdir.'/formslib.php';
- class survey_details_form extends moodleform {
+ class mod_survey_details_form extends moodleform {
function definition() {
$mform =& $this->_form;