Merge 2 tests. Remove checkstyle errors.

htdocs/main.inc.php

@@ -86,8 +86,7 @@ function test_sql_and_script_inject($val, $type)
         $sql_inj += preg_match('/insert\s+into/i', 	 $val);
         $sql_inj += preg_match('/select.+from/i', 	 $val);
         $sql_inj += preg_match('/union.+select/i', 	 $val);
-        $sql_inj += preg_match('/into\s+outfile/i'	, $val);
-        $sql_inj += preg_match('/into\s+dumpfile/i'	, $val);
+        $sql_inj += preg_match('/into\s+(outfile|dumpfile)/i',  $val);
         $sql_inj += preg_match('/(\.\.%2f)+/i',		 $val);
     }
     // For XSS Injection done by adding javascript with script