From 027984f5d401bc3c5b90054ab5813f66ebb402d2 Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Thu, 18 Oct 2001 18:20:51 +0000
Subject: [PATCH] Fix up a couple of eregs.

---
 www/newimageid.php3 | 6 +++---
 www/newosid.php3    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/newimageid.php3 b/www/newimageid.php3
index 3ab6df155..4650fbb8d 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 b0dbb82e0..cd6de627f 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);
     }
 }
-- 
GitLab