X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=encode.php;h=f5c1e249e6c6b496fdacfe557ce6a651f8273faf;hb=9c8566f495179ab2b56aeae0c4ee0222dffd0210;hp=cd1e0b49d03bfbca64e6ec92e5e6f06a3824e135;hpb=7f42492ea33a8d43ee12089b97bd8c0693b293e0;p=wfpl.git
diff --git a/encode.php b/encode.php
index cd1e0b4..f5c1e24 100644
--- a/encode.php
+++ b/encode.php
@@ -17,9 +17,9 @@
# This file contains basic encodings. These are used by the encoder. You can
-# specify any template tag to be encoded with this syntax: ~variable.encoding~
+# specify any template tag to be encoded with this syntax: ~variable encoding~
#
-# this example:
~foo.html~
+# this example:
~foo html~
# will encode foo (using enc_html()) before displaying it, so that characters
# such as < will display properly.
@@ -28,10 +28,18 @@ function enc_cap($str) {
return $str;
}
+# quote for placing between single quotes in php
+function enc_phpsq($str) {
+ $str = str_replace("\\", "\\\\", $str);
+ $str = str_replace("'", "\\'", $str);
+ return $str;
+}
+
function enc_jsdq($str) {
$str = enc_sql($str);
$str = str_replace("\n", "\\n", $str);
- return str_replace("\r", "\\r", $str);
+ $str = str_replace("\r", "\\r", $str);
+ return $str;
}
# encode for putting within double-quotes in SQL
@@ -43,7 +51,7 @@ function enc_sql($str) {
# Encode for output in html. does nothing with whitespace
#
-# Example:
~foo.html~
+# Example:
~foo html~
function enc_html($str) {
$str = str_replace('&', '&', $str);
$str = str_replace('<', '<', $str);
@@ -51,29 +59,38 @@ function enc_html($str) {
return $str;
}
-# Encode for output in html. Convert newlines to
+# Encode for output in html. Convert newlines to
#
-# Example:
~foo.htmlbr~
+# Example:
~foo htmlbr~
function enc_htmlbr($str) {
$str = enc_html($str);
- $str = str_replace("\n", " \n", $str);
+ $str = str_replace("\n", " \n", $str);
return $str;
}
# Encode for output in html. Preserves newlines and indentation by converting
-# newlines to and spaces at the begining of lines to
+# newlines to and spaces/tabs at the begining of lines to s
#
-# Example:
~foo.htmlbrtab~
+# Example:
~foo htmlbrtab~
function enc_htmlbrtab($str) {
$str = enc_htmlbr($str);
- $space_to_nbsp = create_function('$matches', 'return str_repeat(\' \', strlen($matches[0]) * 2);');
- $str = preg_replace_callback("|^ *|m", $space_to_nbsp, $str);
+ $whitespace_to_nbsp = create_function('$matches', '$count = 0; $chars = str_split($matches[0]); foreach ($chars as $c) { if ($c == " ") { $count += 2; } else if ($c == "\t") { $count += 8; } } return str_repeat(" ", $count);');
+ $str = preg_replace_callback("|^[ \t]+|m", $whitespace_to_nbsp, $str);
+ return $str;
+}
+
+# Encode for output in html. Spaces converted to and \n to
+#
+# Example:
+function enc_htmlbrnbsp($str) {
+ $str = enc_htmlbr($str);
+ $str = str_replace(' ', ' ', $str);
return $str;
}
# Encode for output in html. Spaces converted to
#
-# Example:
+# Example:
function enc_htmlnbsp($str) {
$str = enc_html($str);
$str = str_replace(' ', ' ', $str);
@@ -83,7 +100,7 @@ function enc_htmlnbsp($str) {
# HTML attribute.
#
-# Example:
+# Example:
function enc_attr($str) {
$str = str_replace('&', '&', $str);
$str = str_replace('"', '"', $str);
@@ -92,7 +109,7 @@ function enc_attr($str) {
# URI agument value.
#
-# Example: http://example.com?foo=~foo.url_val~
+# Example: http://example.com?foo=~foo url_val~
function enc_url_val($str) {
return rawurlencode($str);
}
@@ -109,7 +126,7 @@ function enc_url_path($str) {
#
# Place the template marker just before a " somewhere.
#
-# Example:
+# Example:
function enc_checked($str) {
if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
return '" checked="checked';
@@ -118,9 +135,8 @@ function enc_checked($str) {
}
}
-# checkboxe values are stored in the db and handled in php as 0 or 1. When you
-# want it displayed as "Yes" or "No" use this:
-# Example: (displaying values from a form submission) Over 60?: ~over_60.yesno~
+# normally, checkboxes values from get/post to 0 or 1, and stored in the database this way. enc_yesno() can be used in your templates to display this as "Yes" or "No".
+# Example template: Subscribe to mailing list?: ~subscribe yesno~
function enc_yesno($str) {
if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
return 'Yes';
@@ -130,24 +146,24 @@ function enc_yesno($str) {
}
-# add a tab at the begining of each non-empty line
+# add a tab at the begining of each line
function enc_tab($str) {
- $lines = explode("\n", $str);
- $out = '';
- foreach($lines as $line) {
- if($line) {
- $out .= "\t$line";
- }
- $out .= "\n";
+ if('' . $str === '') {
+ return '';
}
-
- # remove the extra newline added above
- return substr($out, 0, -1);
+ return "\t" . implode("\n\t", explode("\n", $str));
}
-function enc_upper($str) {
+function enc_uppercase($str) {
return strtoupper($str);
}
+function enc_upper($str) { # depricated
+ return enc_uppercase($str);
+}
+
+function enc_lowercase($str) {
+ return strtolower($str);
+}
# pass date in the form 2008-05-23
# ercodes date as 05/23/2008
@@ -166,11 +182,16 @@ function enc_mdy($str) {
return enc_mmddyyyy($str);
}
-function enc_mmddyyyyhhmm($seconds) {
- return date('m/d/Y g:ia', (int)$seconds);
+# pass unix timestamp or "2012-12-20 22:23:34"
+function enc_mmddyyyyhhmm($str) {
+ if(is_numeric($str)) {
+ return date('m/d/Y g:ia', (int)$str);
+ } else {
+ return enc_mmddyyyy(substr($str, 0, 10)) . substr($str, 10, 6);
+ }
}
-# takes decimal
+# takes decimal number of hours
# returns hh:mm
function enc_hhmm($str) {
if(strlen($str) == 0) {
@@ -182,7 +203,7 @@ function enc_hhmm($str) {
return $str;
}
-# takes decimal
+# takes decimal number of hours
# returns hh:mm followed by "am" or "pm" with no space
function enc_12hr($str) {
if(strlen($str) == 0) {
@@ -204,32 +225,8 @@ function enc_12hr($str) {
-
-define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
-
-function pulldown_options_to_2d($options, $keys_from) {
- # convert other types of input to value=>display hash
- switch($keys_from) {
- case PULLDOWN_HASH:
- $new_options = array();
- foreach($options as $value => $display) {
- $new_options[] = array($value, $display);
- }
- return $new_options;
- case PULLDOWN_ARRAY:
- $new_options = array();
- foreach($options as $opt) {
- $new_options[] = array($opt, $opt);
- }
- return $new_options;
- break;
- case PULLDOWN_2D:
- return $options;
- break;
- default:
- die('pulldown_options_to_2d(): unknown value: "' . print_r($keys_from) . '" passed in $keys_from parameter');
- }
-}
+# These are depricated! All but PULLDOWN_HASH still work, but you should update your code.
+define('PULLDOWN_AUTO', 0); define('PULLDOWN_ARRAY', 1); define('PULLDOWN_HASH', 2); define('PULLDOWN_2D', 3);
# call this function before you run() the template so enc_options() knows what
@@ -239,28 +236,39 @@ function pulldown_options_to_2d($options, $keys_from) {
#
# name: the name of the html control
#
-# options: an array of options to display in the pulldown/selectbox
-#
-# keys_from: Set to one of:
-# PULLDOWN_ARRAY: (default) values of $options are displayd and posted
-# PULLDOWN_HASH: values of $options are display, keys are posted
-# PULLDOWN_2D: $options is a 2 dimensional array.
-# $options[0][1] is displayed, $options[0][0] is posted.
-# $options[1][1] is displayed, $options[1][0] is posted.
+# options: an array of options to display in the pulldown/selectbox. Each
+# element can be either a string, or an array with two elements (first the
+# value to post, and second the value to display in the pulldown)
#
# multiple: UNTESTED set to true for multiple-select boxes.
-function pulldown($name, $options, $keys_from = PULLDOWN_ARRAY, $multiple = false) {
- $options = pulldown_options_to_2d($options, $keys_from);
- $GLOBALS[$name . '_options'] = array();
- $GLOBALS[$name . '_options']['options'] = $options;
- $GLOBALS[$name . '_options']['multiple'] = $multiple;
+function pulldown($name, $in_options, $multiple = false) {
+ if($multiple === PULLDOWN_HASH) {
+ die('Webmaster error: PULLDOWN_HASH is depricated. Pass array(a,b) not a=>b');
+ }
+ if($multiple !== true) {
+ # Probably due to API change (removing 3rd argument) but don't bother
+ # emitting a warning, because the above warning handles the only
+ # important case.
+ $multiple = false;
+ }
+ $options = array();
+ foreach($in_options as $option) {
+ if(is_array($option)) {
+ $options[] = $option;
+ } else {
+ $options[] = array($option, $option);
+ }
+ }
+ $GLOBALS[$name . '_options'] = array(
+ 'options' => $options,
+ 'multiple' => $multiple);
}
# output a bunch of