fixed merge conflicts

diff --combined encode.php
index 123fcc9,1cbac74..bad7b4b
--- 1/encode.php
--- 2/encode.php
+++ b/encode.php
@@@ -50,11 -50,14 +50,11 @@@ function enc_html($str) 
        return $str;
  }
  
- # Encode for output in html. converts \n to <br />
 -
 -# Encode for output in html. Converts newlines to <br />
++# Encode for output in html. Convert newlines to <br />
  #
  # Example: <p>~foo.html~</p>
  function enc_htmlbr($str) {
 -      $str = str_replace('&', '&amp;', $str);
 -      $str = str_replace('<', '&lt;', $str);
 -      $str = str_replace('>', '&gt;', $str);
 +      $str = enc_html($str);
        $str = str_replace("\n", "<br />\n", $str);
        return $str;
  }
@@@ -76,14 -79,6 +76,14 @@@ function enc_url_val($str) 
        return rawurlencode($str);
  }
  
 +# FIXME
 +function enc_url_path($str) {
 +      $str = rawurlencode($str);
 +      $str = str_replace('%2F', '/', $str);
 +      return $str;
 +}
 +
 +
  # This is a hack to work around html's stupid syntax for checkboxes.
  #
  # Place the template marker just before a " somewhere.
@@@ -116,10 -111,6 +116,10 @@@ function enc_upper($str) 
        return strtoupper($str);
  }
  
 +function enc_ddmmyyyyhhmm($seconds) {
 +      return date('m/d/Y g:ia', (int)$seconds);
 +}
 +
  
  # display <option>s
  function enc_states($str) {
@@@ -129,6 -120,17 +129,17 @@@
        return encode_options($str, $states_assoc, $use_keys = true);
  }
  
+ # display <option>s
+ function enc_provinces($str) {
+       $provinces_assoc = array("AB" => "Alberta", "BC" => "British Columbia", "MB" => "Manitoba", "NF" => "Newfoundland", "NB" => "New Brunswick", "NS" => "Nova Scotia", "NT" => "Northwest Territories", "NU" => "Nunavut", "ON" => "Ontario", "PE" => "Prince Edward Island", "QC" => "Quebec", "SK" => "Saskatchewan", "YT" => "Yukon Territory");
+       $ret = '';
+ 
+       return encode_options($str, $provinces_assoc, $use_keys = true);
+ }
+ 
+ 
+ 
+ 
  
  define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
  
@@@ -211,7 -213,7 +222,7 @@@ function encode_options($selected, $opt
        foreach($options as $value => $display) {
                $out .= '<option';
  
-               if(in_array($value, $selected, $strict = true)) {
+               if(in_array($value, $selected)) {
                        $out .= ' selected="selected"';
                }