maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix unwanted NULL value when logging a cleaned string, thx to an error-reporter

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-01-16 18:46:34 +01:00
parent 7d8da2c399
commit 52536e0e45
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/functions/validate/function.validate.php
View File

@@ -31,12 +31,11 @@
* *
*/ */
function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array()) function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = array()) {
{
global $log, $theme; global $log, $theme;
if(!is_array($emptydefault)) if (!is_array($emptydefault)) {
{
$emptydefault_array = array( $emptydefault_array = array(
$emptydefault $emptydefault
); );
@@ -46,37 +45,32 @@ function validate($str, $fieldname, $pattern = '', $lng = '', $emptydefault = ar
} }
// Check if the $str is one of the values which represent the default for an 'empty' value // Check if the $str is one of the values which represent the default for an 'empty' value
if (is_array($emptydefault)
if(is_array($emptydefault)
&& !empty($emptydefault) && !empty($emptydefault)
&& in_array($str, $emptydefault) && in_array($str, $emptydefault)
&& isset($emptydefault[0])) && isset($emptydefault[0])
{ ) {
return $emptydefault[0]; return $emptydefault[0];
} }
if($pattern == '') if ($pattern == '') {
{
$pattern = '/^[^\r\n\t\f\0]*$/D'; $pattern = '/^[^\r\n\t\f\0]*$/D';
if(!preg_match($pattern, $str)) if (!preg_match($pattern, $str)) {
{
// Allows letters a-z, digits, space (\\040), hyphen (\\-), underscore (\\_) and backslash (\\\\), // Allows letters a-z, digits, space (\\040), hyphen (\\-), underscore (\\_) and backslash (\\\\),
// everything else is removed from the string. // everything else is removed from the string.
$allowed = "/[^a-z0-9\\040\\.\\-\\_\\\\]/i"; $allowed = "/[^a-z0-9\\040\\.\\-\\_\\\\]/i";
preg_replace($allowed, "", $str); preg_replace($allowed, "", $str);
$log->logAction(null, LOG_WARNING, "cleaned bad formatted string (" . $str . ")"); $log->logAction(USR_ACTION, LOG_WARNING, "cleaned bad formatted string (" . $str . ")");
} }
} }
if(preg_match($pattern, $str)) if (preg_match($pattern, $str)) {
{
return $str; return $str;
} }
if($lng == '') if ($lng == '') {
{
$lng = 'stringformaterror'; $lng = 'stringformaterror';
} }