/**
* Server side validation.
*/
- function validation($data) {
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$columns =& $this->_customdata;
$optype = $data['uutype'];
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
?>
/// perform some extra moodle validation
- function validation($data){
- $errors= array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if ($foundcourses = get_records('course', 'shortname', $data['shortname'])) {
if (!empty($data['id'])) {
unset($foundcourses[$data['id']]);
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
?>
}
- function validation($data) {
- return true;
+ function validation($data, $files) {
+ return parent::validation($data, $files);
}
}
}
- function validation($data) {
+ function validation($data, $files) {
return true;
}
}
}
- if ($mform->elementExists('groupmode')) {
- if ($COURSE->groupmodeforce) {
+ if ($COURSE->groupmodeforce) {
+ if ($mform->elementExists('groupmode')) {
$mform->hardFreeze('groupmode'); // groupmode can not be changed if forced from course settings
}
}
}
// form verification
- function validation($data) {
+ function validation($data, $files) {
global $COURSE;
+ $errors = parent::validation($data, $files);
$mform =& $this->_form;
}
}
- if (count($errors) == 0) {
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
/**
}
$mform->addElement('header', 'modstandardelshdr', get_string('modstandardels', 'form'));
- if ($features->groups){
- $mform->addElement('modgroupmode', 'groupmode', get_string('groupmode'));
+ if ($features->groups) {
+ $options = array(NOGROUPS => get_string('groupsnone'),
+ SEPARATEGROUPS => get_string('groupsseparate'),
+ VISIBLEGROUPS => get_string('groupsvisible'));
+ $mform->addElement('select', 'groupmode', get_string('groupmode'), $options, NOGROUPS);
+ $mform->setHelpButton('groupmode', array('groupmode', get_string('groupmode')));
}
if (!empty($CFG->enablegroupings)) {
$this->add_action_buttons();
}
- function validation($data) {
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$foundcourses = null;
$foundreqcourses = null;
}
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
$this->add_action_buttons(false, get_string('sendpaymentbutton', 'enrol_authorize'));
}
- function validation($data)
+ function validation($data, $files)
{
global $CFG;
-
- $errors = array();
+ $errors = parent::validation($data, $files);
if (AN_METHOD_CC == $data['paymentmethod'])
{
}
}
- return (empty($errors) ? true : $errors);
+ return $errors;
}
private function other_method_available($currentmethod)
}
/// perform extra validation before submission
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if ($data['scaleid'] < 1) {
$errors['scaleid'] = get_string('required');
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
/// perform extra validation before submission
- function validation($data){
+ function validation($data, $files) {
global $CFG, $COURSE;
- $errors = array();
+ $errors = parent::validation($data, $files);
// we can not allow 2 scales with the same exact scale as this creates
// problems for backup/restore
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
}
/// perform extra validation before submission
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$mform =& $this->_form;
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
/// perform extra validation before submission
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if (array_key_exists('idnumber', $data)) {
if ($data['id']) {
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
/// perform extra validation before submission
- function validation($data){
- $errors= array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if (array_key_exists('idnumber', $data)) {
if ($data['id']) {
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
}
function validation($data, $files) {
- $err = array();
+ $err = parent::validation($data, $files);
if (empty($data['url']) and empty($files['userfile'])) {
if (array_key_exists('url', $data)) {
$err['url'] = get_string('required');
$err['url'] = get_string('error');
}
- if (count($err) == 0){
- return true;
- } else {
- return $err;
- }
+ return $err;
}
}
?>
}
/// perform some extra moodle validation
- function validation($data){
- $errors= array();
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ function validation($data, $files) {
+ return parent::validation($data, $files);
}
}
?>
function validation($data, $files) {
global $CFG, $COURSE;
- $errors = array();
+ $errors = parent::validation($data, $files);
if ($data['allocateby'] != 'no') {
if (!$users = groups_get_potential_members($data['courseid'], $data['roleid'])) {
$this->add_action_buttons();
}
- function validation($data) {
+ function validation($data, $files) {
global $COURSE;
- $errors = array();
+ $errors = parent::validation($data, $files);
$name = trim(stripslashes($data['name']));
if ($data['id'] and $group = get_record('groups', 'id', $data['id'])) {
$errors['name'] = get_string('groupnameexists', 'group', $name);
}
- if (count($errors) > 0) {
- return $errors;
- } else {
- return true;
- }
+ return $errors;
}
function get_um() {
$this->add_action_buttons();
}
- function validation($data) {
+ function validation($data, $files) {
global $COURSE;
- $errors = array();
+ $errors = parent::validation($data, $files);
$name = trim(stripslashes($data['name']));
if ($data['id'] and $grouping = get_record('groupings', 'id', $data['id'])) {
$errors['name'] = get_string('groupingnameexists', 'group', $name);
}
- if (count($errors) > 0) {
- return $errors;
- } else {
- return true;
- }
+ return $errors;
}
}
$data = $mform->exportValues(null, true);
$moodle_val = $this->validation($data, $files);
- if ($moodle_val !== true) {
- 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;
+ if ((is_array($moodle_val) && count($moodle_val)!==0)) {
+ // non-empty array means errors
+ foreach ($moodle_val as $element=>$msg) {
+ $mform->setElementError($element, $msg);
}
+ $moodle_val = false;
+
+ } else {
+ // anything else means validation ok
+ $moodle_val = true;
}
$validated = ($internal_val and $moodle_val and $file_val);
*
* @param array $data array of ("fieldname"=>value) of submitted data
* @param array $files array of uploaded files "element_name"=>tmp_file_path
- * @return mixed an array of "element_name"=>"error_description" if there are errors.
- * true or an empty array if everything is OK.
+ * @return array of "element_name"=>"error_description" if there are errors,
+ * or an empty array if everything is OK (true allowed for backwards compatibility too).
*/
function validation($data, $files) {
return array();
}
/// perform extra password change validation
- function validation($data){
+ function validation($data, $files) {
global $USER;
- $errors = array();
+ $errors = parent::validation($data, $files);
update_login_count();
return $errors;
}
- return true;
+ return $errors;
}
}
?>
$this->add_action_buttons(true, get_string('ok'));
}
- function validation($data) {
+ function validation($data, $files) {
global $CFG;
- $errors = array();
+ $errors = parent::validation($data, $files);
if ((!empty($data['username']) and !empty($data['email'])) or (empty($data['username']) and empty($data['email']))) {
$errors['username'] = get_string('usernameoremail');
}
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
$mform->applyFilter('username', 'trim');
}
- function validation($data) {
+ function validation($data, $files) {
global $CFG;
- $errors = array();
+ $errors = parent::validation($data, $files);
$authplugin = get_auth_plugin($CFG->registerauth);
}
+ $errmsg = '';
if (!check_password_policy($data['password'], $errmsg)) {
$errors['password'] = $errmsg;
}
- if (0 == count($errors)){
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
- function validation($data){
- $errors = parent::validation($data);
- if ($errors === true) {
- $errors = array();
- }
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$choices = 0;
foreach ($data['option'] as $option){
$errors['option[1]'] = get_string('fillinatleastoneoption', 'choice');
}
- if (count($errors) == 0) {
- return true;
- } else {
- return $errors;
- }
-
+ return $errors;
}
}
}
- function validation($data) {
- $error = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if (($data['timeend']!=0) && ($data['timestart']!=0)
&& $data['timeend'] <= $data['timestart']) {
- $error['timeend'] = get_string('timestartenderror', 'forum');
+ $errors['timeend'] = get_string('timestartenderror', 'forum');
}
- return (count($error)==0) ? true : $error;
+ return $errors;
}
}
$this->add_action_buttons();
}
- function validation($data){
+ function validation($data, $files) {
global $CFG, $USER;
- $errors = array();
+ $errors = parent::validation($data, $files);
$e = $this->_customdata['e'];
$glossary = $this->_customdata['glossary'];
$context = $this->_customdata['context'];
* @param object $data Post data to validate
* @return array
**/
- function validation($data) {
- $errors = parent::validation($data);
- if ($errors === true) {
- $errors = array();
- }
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if (empty($data['maxtime']) and !empty($data['timed'])) {
$errors['timedgrp'] = get_string('err_numeric', 'form');
}
- if (count($errors) == 0) {
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
?>
}
}
- function validation($data){
- $errors = parent::validation($data);
- if ($errors === true) {
- $errors = array();
- }
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
// Check open and close times are consistent.
if ($data['timeopen'] != 0 && $data['timeclose'] != 0 && $data['timeclose'] < $data['timeopen']) {
}
}
- function validation($data) {
- $errors = parent::validation($data);
- if ($errors === true) {
- $errors = array();
- }
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$validate = scorm_validate($data);
$errors = $errors + $validate->errors;
}
- if (count($errors) == 0) {
- return true;
- } else {
- return $errors;
- }
+ return $errors;
}
}
}
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$tocoursefilesid = $this->_customdata['tocoursefilesid'];
$fromcoursefilesid = $this->_customdata['fromcoursefilesid'];
if (isset($data['urls']) && (count($data['urls']))){
$this->add_action_buttons(true, get_string('moveq', 'question'));
}
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$tocoursefilesid = $this->_customdata['tocoursefilesid'];
$fromcoursefilesid = $this->_customdata['fromcoursefilesid'];
if (isset($data['urls']) && (count($data['urls']))){
return 'calculated';
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
//verifying for errors in {=...} in question text;
$qtext = "";
$mform->addElement('hidden', 'wizard', 'datasetitems');
$mform->setType('wizard', PARAM_ALPHA);
}
- function validation($data){
- $errors = array();
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
$datasets = $data['dataset'];
$countvalid = 0 ;
foreach ($datasets as $key => $dataset){
parent::set_data((object)($formdata + (array)$question));
}
- function validation($data){
+ function validation($data, $files) {
$errors = array();
if (isset($data['backtoquiz']) && ($this->noofitems==0)){
$errors['warning'] = get_string('warning', 'mnet');
return 'match';
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
$answers = $data['subanswers'];
$questions = $data['subquestions'];
return 'missingtype';
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
$answers = $data['answer'];
$answercount = 0;
parent::set_data($question);
}
- function validation($data, $files){
-
- $errors =array();
- $parenterrors = parent::validation($data, $files);
- if (is_array($parenterrors) && count($parenterrors)) {
- if (is_array($errors)) {
- $errors = array_merge($errors,$parenterrors);
- } else {
- $errors =$parenterrors ;
- }
- }
+ function validation($data, $files) {
+ $errors = parent::validation($data, $files);
if (isset($this->questiondisplay->options->questions)) {
return 'multichoice';
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
$answers = $data['answer'];
$answercount = 0;
}
parent::set_data($question);
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
// Check the answers.
return 'randomsamatch';
}
- function validation($data, $files){
+ function validation($data, $files) {
global $QTYPES;
$errors = parent::validation($data, $files);
$saquestions = $QTYPES['randomsamatch']->get_sa_candidates($data['category']);
}
parent::set_data($question);
}
- function validation($data, $files){
+ function validation($data, $files) {
$errors = parent::validation($data, $files);
$answers = $data['answer'];
$answercount = 0;
}
- function validation ($usernew) {
+ function validation($usernew, $files) {
global $CFG;
+ $errors = parent::validation($usernew, $files);
+
$usernew = (object)$usernew;
$user = get_record('user', 'id', $usernew->id);
- $err = array();
// validate email
if (!validate_email($usernew->email)) {
- $err['email'] = get_string('invalidemail');
+ $errors['email'] = get_string('invalidemail');
} else if (($usernew->email !== $user->email) and record_exists('user', 'email', $usernew->email, 'mnethostid', $CFG->mnet_localhost_id)) {
- $err['email'] = get_string('emailexists');
+ $errors['email'] = get_string('emailexists');
}
if ($usernew->email === $user->email and over_bounce_threshold($user)) {
- $err['email'] = get_string('toomanybounces');
+ $errors['email'] = get_string('toomanybounces');
}
/// Next the customisable profile fields
- $err += profile_validation($usernew);
+ $errors += profile_validation($usernew, $files);
- if (count($err) == 0){
- return true;
- } else {
- return $err;
- }
+ return $errors;
}
function get_um() {
* @param object data from the add/edit profile field form
* @return array associative array of error messages
*/
- function define_validate($data) {
+ function define_validate($data, $files) {
$data = (object)$data;
$err = array();
- $err += $this->define_validate_common($data);
- $err += $this->define_validate_specific($data);
+ $err += $this->define_validate_common($data, $files);
+ $err += $this->define_validate_specific($data, $files);
- if (count($err) == 0){
- return true;
- } else {
- return $err;
- }
+ return $err;
}
/**
* @param object data from the add/edit profile field form
* @return array associative array of error messages
*/
- function define_validate_common($data) {
+ function define_validate_common($data, $files) {
global $USER;
$err = array();
}
/// No further checks necessary as the form class will take care of it
-
return $err;
}
* @param object data from the add/edit profile field form
* @return array associative array of error messages
*/
- function define_validate_specific($data) {
+ function define_validate_specific($data, $files) {
/// do nothing - overwrite if necessary
return array();
}
$form->setType('defaultdata', PARAM_MULTILANG);
}
- function define_validate_specific($data) {
+ function define_validate_specific($data, $files) {
$err = array();
$data->param1 = str_replace("\r", '', $data->param1);
} /// End of function
/// perform some moodle validation
- function validation ($data) {
+ function validation($data, $files) {
global $CFG;
+ $errors = parent::validation($data, $files);
$data = (object)$data;
- $err = array();
$category = get_record('user_info_category', 'id', $data->id);
/// Check the name is unique
if ($category and ($category->name !== $data->name) and (record_exists('user_info_category', 'name', $data->name))) {
- $err['name'] = get_string('profilecategorynamenotunique', 'admin');
+ $errors['name'] = get_string('profilecategorynamenotunique', 'admin');
}
- if (count($err) == 0){
- return true;
- } else {
- return $err;
- }
+ return $errors;
}
}
/// perform some moodle validation
- function validation ($data) {
+ function validation($data, $files) {
return $this->field->define_validate($data);
}
}
}*/
}
-function profile_validation($usernew) {
+function profile_validation($usernew, $files) {
global $CFG;
$err = array();
require_once($CFG->dirroot.'/user/profile/field/'.$field->datatype.'/field.class.php');
$newfield = 'profile_field_'.$field->datatype;
$formfield = new $newfield($field->id, $usernew->id);
- $err += $formfield->edit_validate_field($usernew);
+ $err += $formfield->edit_validate_field($usernew, $files);
}
}
return $err;
projects / moodle.git / commitdiff