extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 22:08:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

only add html5 required attribute if validation is NOT ignored, like eg. in editor

Browse Source
This commit is contained in:
Ralf Becker 2013-11-02 17:30:07 +00:00
parent 392548fdc3
commit 4dbb522887
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etemplate/inc/class.etemplate_old.inc.php
View File

@ -373,11 +373,7 @@ class etemplate_old extends boetemplate
foreach(self::$validation_errors as $name => $error)
{
if ($cname) $name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2',$name);
// treat $ignoare_validation only as regular expression, if it starts with a slash
if ($ignore_validation[0] == '/' && !preg_match($ignore_validation,$name) ||
$ignore_validation[0] != '/' && $ignore_validation != $name)
if (!self::ignore_validation_match($name, $ignore_validation))
{
//echo "<p>uiself::validation_errors('$ignore_validation','$cname') name='$name' ($error) not ignored!!!</p>\n";
return true;
@ -387,6 +383,24 @@ class etemplate_old extends boetemplate
return false;
}
/**
* Check if given form-name matches ai ignore-validation rule
*
* @param string $ignore_validation='' if not empty regular expression for validation-errors to ignore
* @param string $cname=null name-prefix, which need to be ignored, default self::$name_vars
* @param string $cname
* @return boolean
*/
static function ignore_validation_match($form_name, $ignore_validation, $cname=null)
{
if (is_null($cname)) $cname = self::$name_vars;
if ($cname) $form_name = preg_replace('/^'.$cname.'\[([^\]]+)\](.*)$/','\\1\\2', $form_name);
return empty($ignore_validation) ||
$ignore_validation[0] == '/' && preg_match($ignore_validation, $form_name) ||
$ignore_validation[0] != '/' && $ignore_validation == $form_name;
}
/**
* Makes the necessary adjustments to _POST before it calls the app's method
*
@ -1309,9 +1323,14 @@ class etemplate_old extends boetemplate
$cell_opts[0] = abs($cell_opts[0]);
$options .= ' readonly="readonly"';
}
// only add html5 required attribute, if validation is NOT ignored
if ($cell['needed'] && self::ignore_validation_match($form_name, self::$request->ignore_validation, $cname))
{
$required = ' required';
}
$html .= html::input($form_name,$value,$type == 'passwd' ? 'password' : ($type == 'hidden' ? 'hidden' : $cell_opts[3]),
$options.html::formatOptions($cell_opts,'SIZE,MAXLENGTH').
($cell['needed']?' required="required"':'').($type == 'passwd'?' autocomplete="off"':''));
$required.($type == 'passwd'?' autocomplete="off"':''));
if (!$readonly)
{