diff --git a/www/newimageid.php3 b/www/newimageid.php3 index 3ab6df155b50608c8290ece635b8ee042a5e4691..4650fbb8d5c82233ce83f4b6ea60f692c7fb1582 100644 --- a/www/newimageid.php3 +++ b/www/newimageid.php3 @@ -56,16 +56,16 @@ if (isset($loadaddr) && # # Check ID and others for sillyness. # -if (! ereg("^[\.-_a-zA-Z0-9]+$", $imageid)) { +if (! ereg("^[-_a-zA-Z0-9\.]+$", $imageid)) { USERERROR("The ImageID must consist of alphanumeric characters and ". "dash, dot, or underscore!", 1); } -if (! ereg("^[\.-_a-zA-Z0-9\/]+$", $path)) { +if (! ereg("^[-_a-zA-Z0-9\/\.]+$", $path)) { USERERROR("The path contains invalid characters!", 1); } if (isset($loadaddr) && - !ereg("^[\.0-9]+$", $loadaddr)) { + !ereg("^[0-9\.]+$", $loadaddr)) { USERERROR("The load address contains invalid characters!", 1); } diff --git a/www/newosid.php3 b/www/newosid.php3 index b0dbb82e05b5ee314b3aff0d4025c111e8e679a6..cd6de627f9a7074e58d4480e9c6cec8cee137c44 100644 --- a/www/newosid.php3 +++ b/www/newosid.php3 @@ -48,7 +48,7 @@ if (isset($os_version) && # # Check osid for sillyness. # -if (! ereg("^[\.-_a-zA-Z0-9]+$", $osid)) { +if (! ereg("^[-_a-zA-Z0-9\.]+$", $osid)) { USERERROR("The OSID must consist of alphanumeric characters and ". "dash, dot, or underscore!", 1); } @@ -58,7 +58,7 @@ if (isset($os_path)) { unset($os_path); } else { - if (! ereg("^[\.-_a-zA-Z0-9\/]+$", $os_path)) { + if (! ereg("^[-_a-zA-Z0-9\/\.]+$", $os_path)) { USERERROR("The path contains invalid characters!", 1); } } @@ -66,7 +66,7 @@ if (isset($os_path)) { if (isset($os_version)) { if (strcmp($os_version, "") && - ! ereg("^[\.-_a-zA-Z0-9]+$", $os_version)) { + ! ereg("^[-_a-zA-Z0-9\.]+$", $os_version)) { USERERROR("The version string contains invalid characters!", 1); } }