@ -42,16 +42,16 @@
* *
* @see HTML_QuickForm::errorMessage() * @see HTML_QuickForm::errorMessage()
*/ */
define('QUICKFORM_OK', 1); define('QUICKFORM_OK', 1);
define('QUICKFORM_ERROR', -1); define('QUICKFORM_ERROR', -1);
define('QUICKFORM_INVALID_RULE', -2); define('QUICKFORM_INVALID_RULE', -2);
define('QUICKFORM_NONEXIST_ELEMENT', -3); define('QUICKFORM_NONEXIST_ELEMENT', -3);
define('QUICKFORM_INVALID_FILTER', -4); define('QUICKFORM_INVALID_FILTER', -4);
define('QUICKFORM_UNREGISTERED_ELEMENT', -5); define('QUICKFORM_UNREGISTERED_ELEMENT', -5);
define('QUICKFORM_INVALID_ELEMENT_NAME', -6); define('QUICKFORM_INVALID_ELEMENT_NAME', -6);
define('QUICKFORM_INVALID_PROCESS', -7); define('QUICKFORM_INVALID_PROCESS', -7);
define('QUICKFORM_DEPRECATED', -8); define('QUICKFORM_DEPRECATED', -8);
define('QUICKFORM_INVALID_DATASOURCE', -9); define('QUICKFORM_INVALID_DATASOURCE', -9);
/**#@-*/ /**#@-*/
// }}} // }}}
@ -216,9 +216,6 @@ class HTML_QuickForm extends HTML_Common
*/ */
public $_flagSubmitted = false; public $_flagSubmitted = false;
// }}}
// {{{ constructor
/** /**
* Class constructor * Class constructor
* @param string $formName Form's name. * @param string $formName Form's name.
@ -229,8 +226,14 @@ class HTML_QuickForm extends HTML_Common
* @param bool $trackSubmit (optional)Whether to track if the form was submitted by adding a special hidden field * @param bool $trackSubmit (optional)Whether to track if the form was submitted by adding a special hidden field
* @access public * @access public
*/ */
public function __construct($formName='', $method='post', $action='', $target='', $attributes=null, $trackSubmit = false) public function __construct(
{ $formName = '',
$method = 'post',
$action = '',
$target = '',
$attributes = null,
$trackSubmit = false
) {
parent::__construct($attributes); parent::__construct($attributes);
$method = (strtoupper($method) == 'GET') ? 'get' : 'post'; $method = (strtoupper($method) == 'GET') ? 'get' : 'post';
$action = ($action == '') ? api_get_self() : $action; $action = ($action == '') ? api_get_self() : $action;
@ -247,21 +250,8 @@ class HTML_QuickForm extends HTML_Common
) + $target; ) + $target;
$this->updateAttributes($attributes); $this->updateAttributes($attributes);
if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) { if (!$trackSubmit || isset($_REQUEST['_qf__' . $formName])) {
if (1 == get_magic_quotes_gpc()) { $this->_submitValues = 'get' == $method ? $_GET : $_POST;
$this->_submitValues = $this->_recursiveFilter('stripslashes', 'get' == $method? $_GET: $_POST); $this->_submitFiles = $_FILES;
foreach ($_FILES as $keyFirst => $valFirst) {
foreach ($valFirst as $keySecond => $valSecond) {
if ('name' == $keySecond) {
$this->_submitFiles[$keyFirst][$keySecond] = $this->_recursiveFilter('stripslashes', $valSecond);
} else {
$this->_submitFiles[$keyFirst][$keySecond] = $valSecond;
}
}
}
} else {
$this->_submitValues = 'get' == $method? $_GET: $_POST;
$this->_submitFiles = $_FILES;
}
$this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0; $this->_flagSubmitted = count($this->_submitValues) > 0 || count($this->_submitFiles) > 0;
} }
if ($trackSubmit) { if ($trackSubmit) {
@ -294,10 +284,7 @@ class HTML_QuickForm extends HTML_Common
// $this->_maxFileSize = intval($free_course_quota); // $this->_maxFileSize = intval($free_course_quota);
// } // }
// } // }
} // end constructor }
// }}}
// {{{ apiVersion()
/** /**
* Returns the current API version * Returns the current API version
@ -309,10 +296,7 @@ class HTML_QuickForm extends HTML_Common
function apiVersion() function apiVersion()
{ {
return 3.2; return 3.2;
} // end func apiVersion }
// }}}
// {{{ registerElementType()
/** /**
* Registers a new element type * Registers a new element type
@ -327,10 +311,7 @@ class HTML_QuickForm extends HTML_Common
function registerElementType($typeName, $include, $className) function registerElementType($typeName, $include, $className)
{ {
$GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][strtolower($typeName)] = array($include, $className); $GLOBALS['HTML_QUICKFORM_ELEMENT_TYPES'][strtolower($typeName)] = array($include, $className);
} // end func registerElementType }
// }}}
// {{{ registerRule()
/** /**
* Registers a new validation rule * Registers a new validation rule
@ -347,10 +328,7 @@ class HTML_QuickForm extends HTML_Common
{ {
$registry =& HTML_QuickForm_RuleRegistry::singleton(); $registry =& HTML_QuickForm_RuleRegistry::singleton();
$registry->registerRule($ruleName, $type, $data1, $data2); $registry->registerRule($ruleName, $type, $data1, $data2);
} // end func registerRule }
// }}}
// {{{ elementExists()
/** /**
* Returns true if element is in the form * Returns true if element is in the form
@ -365,10 +343,6 @@ class HTML_QuickForm extends HTML_Common
return isset($this->_elementIndex[$element]); return isset($this->_elementIndex[$element]);
} }
// }}}
// {{{ setDefaults()
/** /**
* Initializes default form values * Initializes default form values
* *
@ -403,10 +377,7 @@ class HTML_QuickForm extends HTML_Common
$this->_elements[$key]->onQuickFormEvent('updateValue', null, $this); $this->_elements[$key]->onQuickFormEvent('updateValue', null, $this);
} }
} }
} // end func setDefaults }
// }}}
// {{{ setConstants()
/** /**
* Initializes constant form values. * Initializes constant form values.
@ -442,10 +413,7 @@ class HTML_QuickForm extends HTML_Common
$this->_elements[$key]->onQuickFormEvent('updateValue', null, $this); $this->_elements[$key]->onQuickFormEvent('updateValue', null, $this);
} }
} }
} // end func setConstants }
// }}}
// {{{ setMaxFileSize()
/** /**
* Sets the value of MAX_FILE_SIZE hidden element * Sets the value of MAX_FILE_SIZE hidden element
@ -466,10 +434,7 @@ class HTML_QuickForm extends HTML_Common
$el =& $this->getElement('MAX_FILE_SIZE'); $el =& $this->getElement('MAX_FILE_SIZE');
$el->updateAttributes(array('value' => $this->_maxFileSize)); $el->updateAttributes(array('value' => $this->_maxFileSize));
} }
} // end func setMaxFileSize }
// }}}
// {{{ getMaxFileSize()
/** /**
* Returns the value of MAX_FILE_SIZE hidden element * Returns the value of MAX_FILE_SIZE hidden element
@ -481,10 +446,7 @@ class HTML_QuickForm extends HTML_Common
public function getMaxFileSize() public function getMaxFileSize()
{ {
return $this->_maxFileSize; return $this->_maxFileSize;
} // end func getMaxFileSize }
// }}}
// {{{ & createElement()
/** /**
* Creates a new form element of the given type. * Creates a new form element of the given type.
@ -501,12 +463,13 @@ class HTML_QuickForm extends HTML_Common
public function & createElement($elementType) public function & createElement($elementType)
{ {
$args = func_get_args(); $args = func_get_args();
$element = HTML_QuickForm::_loadElement('createElement', $elementType, array_slice($args, 1)); $element = HTML_QuickForm::_loadElement(
'createElement',
$elementType,
array_slice($args, 1)
);
return $element; return $element;
} // end func createElement }
// }}}
// {{{ _loadElement()
/** /**
* Returns a form element of the given type * Returns a form element of the given type
@ -578,9 +541,6 @@ class HTML_QuickForm extends HTML_Common
return $element; return $element;
} }
// }}}
// {{{ addElement()
/** /**
* Adds an element into the form * Adds an element into the form
* *
@ -701,9 +661,6 @@ class HTML_QuickForm extends HTML_Common
return $element; return $element;
} }
// }}}
// {{{ addGroup()
/** /**
* Adds an element group * Adds an element group
* @param array $elements array of elements composing the group * @param array $elements array of elements composing the group
@ -727,10 +684,7 @@ class HTML_QuickForm extends HTML_Common
} }
$group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName); $group = & $this->addElement('group', $name, $groupLabel, $elements, $separator, $appendName);
return $group; return $group;
} // end func addGroup }
// }}}
// {{{ & getElement()
/** /**
* Returns a reference to the element * Returns a reference to the element
@ -791,7 +745,7 @@ class HTML_QuickForm extends HTML_Common
* @access public * @access public
* @return mixed submitted element value or null if not set * @return mixed submitted element value or null if not set
*/ */
function getSubmitValue($elementName) public function getSubmitValue($elementName)
{ {
$value = null; $value = null;
if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) { if (isset($this->_submitValues[$elementName]) || isset($this->_submitFiles[$elementName])) {
@ -804,19 +758,20 @@ class HTML_QuickForm extends HTML_Common
); );
} }
} }
} elseif ('file' == $this->getElementType($elementName)) { } elseif ('file' == $this->getElementType($elementName)) {
return $this->getElementValue($elementName); return $this->getElementValue($elementName);
} elseif (false !== ($pos = strpos($elementName, '['))) { } elseif (false !== ($pos = strpos($elementName, '['))) {
$base = str_replace( $base = str_replace(
array('\\', '\''), array('\\\\', '\\\''), array('\\', '\''),
substr($elementName, 0, $pos) array('\\\\', '\\\''),
); substr($elementName, 0, $pos)
$idx = "['" . str_replace( );
array('\\', '\'', ']', '['), array('\\\\', '\\\'', '', "']['"), $idx = "['".str_replace(
substr($elementName, $pos + 1, -1) array('\\', '\'', ']', '['),
) . "']"; array('\\\\', '\\\'', '', "']['"),
substr($elementName, $pos + 1, -1)
)."']";
if (isset($this->_submitValues[$base])) { if (isset($this->_submitValues[$base])) {
$value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;"); $value = eval("return (isset(\$this->_submitValues['{$base}']{$idx})) ? \$this->_submitValues['{$base}']{$idx} : null;");
} }
@ -852,20 +807,9 @@ class HTML_QuickForm extends HTML_Common
} }
} }
if ($this->getElementType($elementName) == 'date_range_picker') { $element = $this->getElement($elementName);
/** @var DateRangePicker $element */ if (method_exists($element, 'getSubmitValue')) {
$element = $this->getElement($elementName); $value = $element->getSubmitValue($value, $this->_submitValues, $this->_errors);
$parsedDates = $element->parseDateRange($value);
$validateFormat = $element->getAttribute('validate_format');
if (!$element->validateDates($parsedDates, $validateFormat)) {
$this->_errors[$elementName] = get_lang('CheckDates');
}
$this->_submitValues[$elementName.'_start'] = $parsedDates['start'];
$this->_submitValues[$elementName.'_end'] = $parsedDates['end'];
} }
return $value; return $value;
@ -891,9 +835,6 @@ class HTML_QuickForm extends HTML_Common
} }
} }
// }}}
// {{{ getElementError()
/** /**
* Returns error corresponding to validated element * Returns error corresponding to validated element
* *
@ -978,10 +919,7 @@ class HTML_QuickForm extends HTML_Common
} }
} }
} }
} // end func updateElementAttr }
// }}}
// {{{ removeElement()
/** /**
* Removes an element * Removes an element
@ -1029,13 +967,13 @@ class HTML_QuickForm extends HTML_Common
* To validate grouped elements as separated entities, * To validate grouped elements as separated entities,
* use addGroupRule instead of addRule. * use addGroupRule instead of addRule.
* *
* @param string $element Form element name * @param string $element Form element name
* @param string $message Message to display for invalid data * @param string $message Message to display for invalid data
* @param string $type Rule type, use getRegisteredRules() to get types * @param string $type Rule type, use getRegisteredRules() to get types
* @param string $format (optional)Required for extra rule data * @param string $format (optional)Required for extra rule data
* @param string $validation (optional)Where to perform validation: "server", "client" * @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 $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 * @param boolean $force Force the rule to be applied, even if the target form element does not exist
* @since 1.0 * @since 1.0
* @access public * @access public
*/ */
@ -1046,7 +984,8 @@ class HTML_QuickForm extends HTML_Common
$format = null, $format = null,
$validation = 'server', $validation = 'server',
$reset = false, $reset = false,
$force = false $force = false,
$dependent = null
) { ) {
if (!$force) { if (!$force) {
if (!is_array($element) & & !$this->elementExists($element)) { if (!is_array($element) & & !$this->elementExists($element)) {
@ -1064,12 +1003,12 @@ class HTML_QuickForm extends HTML_Common
} elseif (is_string($newName)) { } elseif (is_string($newName)) {
$type = $newName; $type = $newName;
} }
if (is_array($element)) { if (is_array($element)) {
$dependent = $element; $dependent = $element;
$element = array_shift($dependent); $element = array_shift($dependent);
} else {
$dependent = null;
} }
if ($type == 'required' || $type == 'uploadedfile') { if ($type == 'required' || $type == 'uploadedfile') {
$this->_required[] = $element; $this->_required[] = $element;
} }
@ -1091,7 +1030,6 @@ class HTML_QuickForm extends HTML_Common
); );
} }
/** /**
* Adds a validation rule for the given group of elements * Adds a validation rule for the given group of elements
* *
@ -1356,32 +1294,7 @@ class HTML_QuickForm extends HTML_Common
function isRuleRegistered($name, $autoRegister = false) function isRuleRegistered($name, $autoRegister = false)
{ {
return true; return true;
if (is_scalar($name) & & isset($GLOBALS['_HTML_QuickForm_registered_rules'][$name])) { }
return true;
} elseif (!$autoRegister) {
return false;
}
$ruleName = false;
if (is_object($name) & & is_a($name, 'html_quickform_rule')) {
$ruleName = !empty($name->name)? $name->name: strtolower(get_class($name));
} elseif (is_string($name) & & class_exists($name)) {
$parent = strtolower($name);
do {
if ('html_quickform_rule' == strtolower($parent)) {
$ruleName = strtolower($name);
break;
}
} while ($parent = get_parent_class($parent));
}
if ($ruleName) {
$registry =& HTML_QuickForm_RuleRegistry::singleton();
$registry->registerRule($ruleName, null, $name);
}
return $ruleName;
} // end func isRuleRegistered
// }}}
// {{{ getRegisteredRules()
/** /**
* Returns an array of registered validation rules * Returns an array of registered validation rules
@ -1501,7 +1414,6 @@ class HTML_QuickForm extends HTML_Common
foreach ($this->_rules as $target => $rules) { foreach ($this->_rules as $target => $rules) {
$submitValue = $this->getSubmitValue($target); $submitValue = $this->getSubmitValue($target);
foreach ($rules as $rule) { foreach ($rules as $rule) {
if ((isset($rule['group']) & & isset($this->_errors[$rule['group']])) || if ((isset($rule['group']) & & isset($this->_errors[$rule['group']])) ||
isset($this->_errors[$target])) { isset($this->_errors[$target])) {
@ -1538,6 +1450,7 @@ class HTML_QuickForm extends HTML_Common
} }
} }
} }
if (isset($rule['dependent']) & & is_array($rule['dependent'])) { if (isset($rule['dependent']) & & is_array($rule['dependent'])) {
$values = array($submitValue); $values = array($submitValue);
foreach ($rule['dependent'] as $elName) { foreach ($rule['dependent'] as $elName) {
@ -1806,7 +1719,7 @@ class HTML_QuickForm extends HTML_Common
*/ */
public function getSubmitValues($mergeFiles = false) public function getSubmitValues($mergeFiles = false)
{ {
return $mergeFiles? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues; return $mergeFiles ? HTML_QuickForm::arrayMerge($this->_submitValues, $this->_submitFiles): $this->_submitValues;
} }
/** /**
@ -1842,7 +1755,7 @@ class HTML_QuickForm extends HTML_Common
* @return mixed * @return mixed
* @throws HTML_QuickForm_Error * @throws HTML_QuickForm_Error
*/ */
function exportValue($element) public function exportValue($element)
{ {
if (!isset($this->_elementIndex[$element])) { if (!isset($this->_elementIndex[$element])) {
throw new \Exception("Element '$element' does not exist in HTML_QuickForm::getElementValue()"); throw new \Exception("Element '$element' does not exist in HTML_QuickForm::getElementValue()");
@ -1873,7 +1786,7 @@ class HTML_QuickForm extends HTML_Common
* @return array An assoc array of elements' values * @return array An assoc array of elements' values
* @throws HTML_QuickForm_Error * @throws HTML_QuickForm_Error
*/ */
function exportValues($elementList = null) public function exportValues($elementList = null)
{ {
$values = array(); $values = array();
if (null === $elementList) { if (null === $elementList) {
jmontoyaa
9 years ago