clean up my urls

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 12615cc..c913864 100644 (file)
--- a/format.php
+++ b/format.php
@@ -19,9 +19,10 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+       $str = preg_replace("/([a-z])([A-Z])/", "\\1 \\2", $str); # split words on camelCase
        $str = str_replace('_', ' ', $str);
        $str = ucwords($str);
-       return str_replace('Email', 'E-mail', $str);
+       return $str;
 }
 
 # This function makes sure that $str is in the list of options, and returns "" otherwise
@@ -37,7 +38,7 @@ function format_options($str, $name) {
                }
        }
 
-       return $str;
+       return '';
 }
 
 function format_int($str) {
@@ -45,6 +46,7 @@ function format_int($str) {
        return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
+# format the digits after the decimal point
 function format_decimals($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        if(strlen($str)) {
@@ -71,8 +73,8 @@ function _format_positive_decimal($str) {
 
 function format_positive_decimal($str) {
        $str = _format_positive_decimal($str);
-       if($str === '0.0') {
-               $str = '0';
+       if(substr($str, -2) === '.0') {
+               $str = substr($str, 0, -2);
        }
        return $str;
 }
@@ -99,6 +101,7 @@ function format_int_0($str) {
        return $str;
 }
 
+# USA zip codes
 function format_zip($str) {
        $str = ereg_replace('[^0-9]', '', $str);
        if(strlen($str) > 5) {
@@ -146,7 +149,6 @@ function format_image_w_h($str) {
 function format_image_w_h_thumb_w_h($str) {
        $fields = explode(' ', $str);
        if(count($fields) != 6) {
-               die('count: ' . count($fields));
                return '';
        }
 
@@ -161,10 +163,18 @@ function format_image_w_h_thumb_w_h($str) {
        return "$filename $width $height $thumb_filename $thumb_width $thumb_height";
 }
 
+function format_slug($str) {
+       $str = strtolower($str);
+       $str = str_replace("'", '', $str);
+       $str = preg_replace('/[^a-z0-9-]+/', '-', $str);
+       return trim($str, '-');
+}
+
 function format_varname($str) {
+       $str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
        $str = strtolower($str);
-       $str = ereg_replace('[^a-z0-9_]', '_', $str);
-       return ereg_replace('^[0-9]*', '', $str);
+       $str = preg_replace('/[^a-z0-9_]+/', '_', $str);
+       return preg_replace('/^([^a-z_])/', "_\\1", $str);
 }
 
 function format_oneline($str) {
@@ -177,7 +187,7 @@ function format_unix($str) {
 }
 
 function format_bool($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 1;
        } else {
                return 0;
@@ -185,7 +195,7 @@ function format_bool($str) {
 }
 
 function format_yesno($str) {
-       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+       if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
                return 'Yes';
        } else {
                return 'No';
@@ -291,13 +301,14 @@ function format_dollars($str) {
 
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
-       require_once('code/wfpl/time.php');
+       if($str == '') return '';
+       require_once(__DIR__.'/'.'time.php');
        return mdy_to_ymd(format_oneline($str));
 }
 
 # date is yyyy-mm-dd
 function format_ymd($str) {
-       require_once('code/wfpl/time.php');
+       require_once(__DIR__.'/'.'time.php');
        list($year, $month, $day) = ymd_clean($str);
        return sprintf('%04u-%02u-%02u', $year, $month, $day);
 }