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

diff --git a/encode.php b/encode.php
index e8d3d35..fd282b7 100644
--- a/encode.php
+++ b/encode.php
@@ -74,7 +74,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 +379,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 +437,19 @@ function enc_evenodd($values, $name) {
 	}
 }
 
-function enc_image_src($str) {
-	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
-	return $src;
+function wfpl_nth_word($str, $n) {
+	$a = explode(' ', $str);
+	return isset($a[$n]) ? $a[$n] : null;
 }
 
-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 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_width($str) { return wfpl_nth_word($str, 1); }
+function enc_image_height($str) { return wfpl_nth_word($str, 2); }
+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) {