MDL-87870 admin: tighten up validation of colour picker values.
This commit is contained in:
committed by
Huong Nguyen
parent
d287297369
commit
79d05d08de
@@ -10612,13 +10612,13 @@ class admin_setting_configcolourpicker extends admin_setting {
|
||||
return $data;
|
||||
} else if (in_array(strtolower($data), $colornames)) {
|
||||
return $data;
|
||||
} else if (preg_match('/rgb\(\d{0,3}%?\, ?\d{0,3}%?, ?\d{0,3}%?\)/i', $data)) {
|
||||
} else if (preg_match('/^rgb\(\d{0,3}%?\, ?\d{0,3}%?, ?\d{0,3}%?\)$/i', $data)) {
|
||||
return $data;
|
||||
} else if (preg_match('/rgba\(\d{0,3}%?\, ?\d{0,3}%?, ?\d{0,3}%?\, ?\d(\.\d)?\)/i', $data)) {
|
||||
} else if (preg_match('/^rgba\(\d{0,3}%?\, ?\d{0,3}%?, ?\d{0,3}%?\, ?\d(\.\d)?\)$/i', $data)) {
|
||||
return $data;
|
||||
} else if (preg_match('/hsl\(\d{0,3}\, ?\d{0,3}%, ?\d{0,3}%\)/i', $data)) {
|
||||
} else if (preg_match('/^hsl\(\d{0,3}\, ?\d{0,3}%, ?\d{0,3}%\)$/i', $data)) {
|
||||
return $data;
|
||||
} else if (preg_match('/hsla\(\d{0,3}\, ?\d{0,3}%,\d{0,3}%\, ?\d(\.\d)?\)/i', $data)) {
|
||||
} else if (preg_match('/^hsla\(\d{0,3}\, ?\d{0,3}%, ?\d{0,3}%\, ?\d(\.\d)?\)$/i', $data)) {
|
||||
return $data;
|
||||
} else if (($data == 'transparent') || ($data == 'currentColor') || ($data == 'inherit')) {
|
||||
return $data;
|
||||
|
||||
Reference in New Issue
Block a user