Change eregi to preg_match

Allowed activity codes to be 3-6 digits instead of just 6 Moved version number to app.inc.php
IGBIllinois · Mar 5, 2019 · 97012b8 · 97012b8
1 parent ec45ce2
commit 97012b8
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/admin/editOrder.php b/admin/editOrder.php
@@ -27,11 +27,11 @@
 	$activityCode = strtoupper(trim(rtrim($activityCode)));
 
 	$error = false;
-	if (!eregi('^1-[0-9]{6}-[0-9]{6}-[0-9]{6}$',$cfop)) {
+	if (!preg_match('/^1-[0-9]{6}-[0-9]{6}-[0-9]{6}$/',$cfop)) {
 		$error = true;
 		$cfopMsg = "<br><b class='error'>Invalid CFOP Number</b>";
 	}
-	elseif (!eregi('^[a-zA-Z0-9]{6}',$activityCode) && (strlen($activityCode) > 0)) {
+	elseif (!preg_match('/^[a-zA-Z0-9]{3,6}/',$activityCode) && (strlen($activityCode) > 0)) {
 		$error = true;
 		$activityCodeMsg = 	"<b><b class='error'>Invalid Activity Code</b>";
 	}

diff --git a/admin/includes/main.inc.php b/admin/includes/main.inc.php
@@ -11,6 +11,7 @@
 //
 //////////////////////////////////////////////////////
 
+require_once '../includes/app.inc.php';
 require_once '../includes/settings.inc.php';
 require_once '../vendor/autoload.php';
 set_include_path(get_include_path() . ':../libs');

diff --git a/includes/apps.inc.php b/includes/apps.inc.php
@@ -0,0 +1,9 @@
+<?php
+/*
+Store Application Variables
+*/
+
+define("app_version","1.2.4");
+
+
+?>
diff --git a/includes/poster.inc.js b/includes/poster.inc.js
@@ -92,7 +92,7 @@ function validateCFOP(cfop) {
 }
 
 function validateActivityCode(activityCode) {
-	var activityCodeRegex = /^[a-zA-Z0-9]{6}/;
+	var activityCodeRegex = /^[a-zA-Z0-9]{3,6}/;
 	if ((activityCode != "") && (!activityCode.match(activityCodeRegex))) {
 		document.getElementById('activityCodeWarning').innerHTML = "Please enter a valid activity code.";
 		return false;

diff --git a/includes/settings.inc.php.dist b/includes/settings.inc.php.dist
@@ -12,7 +12,6 @@
 ////////////////////////////////////////////////
 
 define("enable",TRUE);
-define("app_version","1.2.3");
 define("admin_email","");
 define("mysql_host","");
 define("mysql_user","");

diff --git a/index.php b/index.php
@@ -12,6 +12,7 @@
 //////////////////////////////////////////////////////
 
 //include files for the script to run
+require_once 'includes/app.inc.php';
 require_once 'includes/settings.inc.php';
 require_once 'vendor/autoload.php';
 set_include_path(get_include_path() . ':libs');

diff --git a/libs/finishOptions.inc.php b/libs/finishOptions.inc.php
@@ -50,16 +50,16 @@ function addFinishOption($db,$name,$cost,$maxWidth,$maxLength,$default = 0) {
 		$message .= "<br><b class='error'>Pleae enter finish option name</b>";
 		$errors++;
 	}
-	if (($cost == "") || !eregi('^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$',$cost)) {
+	if (($cost == "") || !preg_match('/^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$/',$cost)) {
 		$message .= "<br><b class='error'>Please enter a valid cost</b>";
 		$errors++;
 	}
 
-	if (($maxWidth == "") || ($maxWidth > max_printer_width) || !(eregi("^[0-9]{1,2}$", $maxWidth))) {
+	if (($maxWidth == "") || ($maxWidth > max_printer_width) || !(preg_match("/^[0-9]{1,2}$/", $maxWidth))) {
 		$message .= "<br><b class='error'>Please enter a valid Max Width. Maximum is " . max_printer_width . " inches</b>";
 		$errors++;
 	}
-	if (($maxLength == "") || !(eregi("^[0-9]{1,3}$", $maxLength))) {
+	if (($maxLength == "") || !(preg_match("/^[0-9]{1,3}$/", $maxLength))) {
 		$message .= "<br><b class='error'>Please enter a valid Max Length</b>";
 		$errors++;
 	}

diff --git a/libs/paperTypes.inc.php b/libs/paperTypes.inc.php
@@ -46,12 +46,12 @@ function addPaperType($db,$name,$cost,$width,$default = 0) {
 		$message .= "<br><b class='error'>Please enter finish option name</b>";
 		$errors++;
 	}
-	if (($cost == "") || !eregi('^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$',$cost)) {
+	if (($cost == "") || !preg_match('/^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$/',$cost)) {
 		$message .= "<br><b class='error'>Please enter a valid cost</b>";
 		$errors++;
 	}
 
-	if (($width == "") || ($width > max_printer_width) || !(eregi("^[0-9]{1,2}$", $width))) {
+	if (($width == "") || ($width > max_printer_width) || !(preg_match("/^[0-9]{1,2}$/", $width))) {
 		$message .= "<br><b class='error'>Please enter a valid Width.  Maximum is " . max_printer_width . "</b>";
 		$errors++;
 	}

diff --git a/libs/posterTube.inc.php b/libs/posterTube.inc.php
@@ -32,7 +32,7 @@ function getPosterTubeInfo($db) {
 }
 
 function updatePosterTube($db,$cost) {
-	if (($cost == "") || !eregi('^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$',$cost)) {
+	if (($cost == "") || !preg_match('/^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$/',$cost)) {
 		$message = "<b class='error'>Please enter a valid poster tube cost.</b>";
 		return array('RESULT'=>FALSE,
 					'MESSAGE'=>$message);

diff --git a/libs/rushOrder.inc.php b/libs/rushOrder.inc.php
@@ -32,7 +32,7 @@ function getRushOrderInfo($db) {
 
 function updateRushOrder($db, $cost) {
 
-	if (($cost == "") || !eregi('^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$',$cost)) {
+	if (($cost == "") || !preg_match('/^[0-9]{1}[0-9]*[.]{1}[0-9]{2}$/',$cost)) {
 		$message = "<b class='error'>Please enter a valid rush order cost</b>";
 		return array('RESULT'=>FALSE,
 					'MESSAGE'=>$message);