mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 09:23:09 +02:00
Code Issues Projects Releases Wiki Activity

webservice MDL-21510 added two new DEFINE values: NULL_ALLOWED and NULL_NOT_ALLOWED

Browse Source
This commit is contained in:
jerome mouneyrac 2010-02-08 03:49:52 +00:00
parent 5d6957f349
commit 5a1861ee32
2 changed files with 12 additions and 3 deletions

2
lib/externallib.php

@ -286,7 +286,7 @@ class external_value extends external_description {
* @param mixed $default
* @param bool $allownull
*/
public function __construct($type, $desc='', $required=VALUE_REQUIRED, $default=null, $allownull=true) {
public function __construct($type, $desc='', $required=VALUE_REQUIRED, $default=null, $allownull=NULL_ALLOWED) {
parent::__construct($desc, $required);
$this->type = $type;
$this->default = $default;

13
lib/moodlelib.php

@ -281,6 +281,15 @@ define('VALUE_OPTIONAL', 2);
*/
define('VALUE_DEFAULT', 0);
/**
* NULL_NOT_ALLOWED - the parameter can not be set to null in the database
*/
define('NULL_NOT_ALLOWED', false);
/**
* NULL_ALLOWED - the parameter can be set to null in the database
*/
define('NULL_ALLOWED', true);
/// Page types ///
/**
@ -442,9 +451,9 @@ function optional_param($parname, $default=NULL, $type=PARAM_CLEAN) {
* @param string $debuginfo optional debug information
* @return mixed the $param value converted to PHP type or invalid_parameter_exception
*/
function validate_param($param, $type, $allownull=false, $debuginfo='') {
function validate_param($param, $type, $allownull=NULL_NOT_ALLOWED, $debuginfo='') {
if (is_null($param)) {
if ($allownull) {
if ($allownull == NULL_ALLOWED) {
return null;
} else {
throw new invalid_parameter_exception($debuginfo);