X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=encode.php;h=a395a10ef3e8558dc23b7a11214e811741b7d89d;hp=e8d3d357efae4b2a5b0da1ed07cc9e0a3f325cde;hb=HEAD;hpb=22989a9ee35a199c5ef75ace19244761ea8c5af6

diff --git a/encode.php b/encode.php
index e8d3d35..a395a10 100644
--- a/encode.php
+++ b/encode.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2005 Jason Woofenden
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This file contains basic encodings. These are used by the encoder. You can
@@ -42,6 +32,10 @@ function enc_jsdq($str) {
 	return $str;
 }
 
+function enc_json($str) {
+	return json_encode($str);
+}
+
 # encode for putting within double-quotes in SQL
 function enc_sql($str) {
 	$str = str_replace("\\", "\\\\", $str);
@@ -74,7 +68,7 @@ function enc_htmlbr($str) {
 # Example: <p>~foo htmlbrtab~</p>
 function enc_htmlbrtab($str) {
 	$str = enc_htmlbr($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("&nbsp;", $count);');
+	$whitespace_to_nbsp = create_function('$matches', '$count = 0; $chars = str_split($matches[0]); foreach ($chars as $c) { if ($c == " ") { $count += 1; } else if ($c == "\t") { $count += 8; } } return str_repeat("&nbsp;", $count);');
 	$str = preg_replace_callback("|^[ \t]+|m", $whitespace_to_nbsp, $str);
 	return $str;
 }
@@ -379,10 +373,10 @@ function encode_options($selected, $options) {
 
 	$out = '';
 	foreach($options as $option) {
-		list($value, $display, $arg3) = $option;
+		list($value, $display) = $option;
 		$out .= '<option';
 
-		if($arg3 == 'disabled') {
+		if(isset($option[2]) && $option[2] == 'disabled') {
 			$out .= ' disabled';
 		} elseif(in_array($value, $selected)) {
 			$out .= ' selected';
@@ -437,34 +431,42 @@ function enc_evenodd($values, $name) {
 	}
 }
 
-function enc_image_src($str) {
-	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
-	return $src;
-}
-
-function enc_image_width($str) {
-	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
-	return $width;
-}
-
-function enc_image_height($str) {
-	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
-	return $height;
+function wfpl_nth_word($str, $n) {
+	$a = explode(' ', $str);
+	return isset($a[$n]) ? $a[$n] : null;
 }
 
-function enc_thumb_src($str) {
-	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
-	return $src;
-}
-
-function enc_thumb_width($str) {
-	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
-	return $width;
-}
-function enc_thumb_height($str) {
-	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
-	return $height;
+# encoding is a space separated list of:
+# image_filename width height thumb_filename thumb_width thumb_height
+function enc_image_src($str) { return wfpl_nth_word($str, 0); }
+function _enc_image_src_at_width($str, $width) {
+	$src = enc_image_src($str);
+	if ($src) {
+		return
+			substr($src, 0, -4)
+			. 'w'
+			. $width
+			. substr($src, -4);
+	}
+	return '';
+}
+# define these width constants in your config.php
+function enc_image_src_full($str) { return _enc_image_src_at_width($str, WFPL_IMAGE_WIDTH_FULL); }
+function enc_image_src_small($str) { return _enc_image_src_at_width($str, WFPL_IMAGE_WIDTH_SMALL); }
+function enc_image_src_thumb($str) { return _enc_image_src_at_width($str, WFPL_IMAGE_WIDTH_THUMB); }
+function enc_image_width($str) { return wfpl_nth_word($str, 1); }
+function enc_image_height($str) { return wfpl_nth_word($str, 2); }
+function enc_image_aspect($str) {
+	$a = explode(' ', $str);
+	if (count($a) < 3) {
+		return '';
+	}
+	return ''.(round(100000 * ((int)$a[2]) / ((int)$a[1]) / 1000)).'%';
 }
+# obsolete:
+function enc_thumb_src($str) { return wfpl_nth_word($str, 3); }
+function enc_thumb_width($str) { return wfpl_nth_word($str, 4); }
+function enc_thumb_height($str) { return wfpl_nth_word($str, 5); }
 
 # example template: Length: ~length html~ day~length s~
 function enc_s($str) {