clean up my urls

[wfpl.git] / format.php

diff --git a/format.php b/format.php
index 13d79ce..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
@@ -72,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;
 }
@@ -162,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) {
@@ -293,13 +302,13 @@ function format_dollars($str) {
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
        if($str == '') return '';
-       require_once('code/wfpl/time.php');
+       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);
 }