X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=format.php;h=99283e17e20d895ea9a1fae5b85781438da564f6;hp=c913864d87c73c7c4c43086ce3eca6370ce12f2e;hb=9a3136a5bee66e1055ffb566373952b6054dd7bf;hpb=e057305351d93155bf9f0d2c664b6eb859d83bf4

diff --git a/format.php b/format.php
index c913864..99283e1 100644
--- a/format.php
+++ b/format.php
@@ -42,21 +42,21 @@ function format_options($str, $name) {
 }
 
 function format_int($str) {
-	$str = ereg_replace('[^0-9]', '', $str);
-	return ereg_replace('^0*([0-9])', '\1', $str);
+	$str = preg_replace('|[^0-9]|', '', $str);
+	return preg_replace('|^0*([0-9])|', '\1', $str);
 }
 
 # format the digits after the decimal point
 function format_decimals($str) {
-	$str = ereg_replace('[^0-9]', '', $str);
+	$str = preg_replace('|[^0-9]|', '', $str);
 	if(strlen($str)) {
-		$str = substr($str, 0, 1) . ereg_replace('0*$', '', substr($str, 1));
+		$str = substr($str, 0, 1) . preg_replace('|0*$|', '', substr($str, 1));
 	}
 	return $str;
 }
 
 function _format_positive_decimal($str) {
-	$str = ereg_replace('[^0-9.]', '', $str);
+	$str = preg_replace('|[^0-9.]|', '', $str);
 	$pos = strpos($str, '.');
 	if($pos !== false) {
 		$str = str_replace('.', '', $str);
@@ -80,7 +80,7 @@ function format_positive_decimal($str) {
 }
 
 function format_decimal($str) {
-	$str = ereg_replace('[^0-9.-]', '', $str);
+	$str = preg_replace('|[^0-9.-]|', '', $str);
 	if(substr($str, 0, 1) == '-') {
 		$str = format_positive_decimal(substr($str, 1));
 		if($str !== '' && $str !== '0') {
@@ -103,7 +103,7 @@ function format_int_0($str) {
 
 # USA zip codes
 function format_zip($str) {
-	$str = ereg_replace('[^0-9]', '', $str);
+	$str = preg_replace('|[^0-9]|', '', $str);
 	if(strlen($str) > 5) {
 		return substr($str, 0, 5) . '-' . substr($str, 5);
 	}
@@ -114,20 +114,20 @@ function format_filename($str, $allow_uppercase = false) {
 	if(!$allow_uppercase) {
 		$str = strtolower($str);
 	}
-	$str = ereg_replace('[^a-zA-Z0-9_.-]', '_', $str);
-	return ereg_replace('^[.-]', '_', $str);
+	$str = preg_replace('|[^a-z0-9_.-]|i', '_', $str);
+	return preg_replace('|^[.-]|', '_', $str);
 }
 
 function format_path($str, $allow_uppercase = false) {
 	if(!$allow_uppercase) {
 		$str = strtolower($str);
 	}
-	$str = ereg_replace('[^a-zA-Z0-9_./-]', '_', $str);
-	return ereg_replace('^[.-]', '_', $str);
+	$str = preg_replace('|[^a-z0-9_./-]|i', '_', $str);
+	return preg_replace('|^[.-]|', '_', $str);
 }
 
 function client_path_to_filename($path) {
-	$filename = ereg_replace(".*[:/\\]", '', $path);
+	$filename = preg_replace("|.*[:/\\\\]|", '', $path);
 	return format_filename($filename, true);
 }
 
@@ -173,6 +173,7 @@ function format_slug($str) {
 function format_varname($str) {
 	$str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
 	$str = strtolower($str);
+	$str = preg_replace("/['‘’]/", '', $str);
 	$str = preg_replace('/[^a-z0-9_]+/', '_', $str);
 	return preg_replace('/^([^a-z_])/', "_\\1", $str);
 }
@@ -351,11 +352,11 @@ function format_hours($str) {
 # takes eg 12:23am
 # returns decimal number of hours since midnight
 function format_12hr_to_hours($str) {
-	if(eregi('noon', $str)) {
+	if(preg_match('|noon|i', $str) === 1) {
 		return 12;
 	}
 	$hours = format_hours($str);
-	if($hours < 12 && eregi('p', $str)) {
+	if($hours < 12 && preg_match('|p|i', $str) === 1) {
 		$hours += 12;
 	}
 	return $hours;
@@ -363,8 +364,8 @@ function format_12hr_to_hours($str) {
 
 
 function format_phone($str) {
-	$str = ereg_replace('[^0-9]', '', $str);
-	$str = ereg_replace('^1*', '', $str);
+	$str = preg_replace('|[^0-9]|', '', $str);
+	$str = preg_replace('|^1*|', '', $str);
 	$len = strlen($str);
 	$output = '';