fixed merge conflicts

diff --git a/email.php b/email.php
index 8140ded..b3d4925 100644 (file)
--- a/email.php
+++ b/email.php
@@ -44,7 +44,7 @@ function email($from, $to, $subject, $message, $cc = '', $bcc = '') {
        if($to   == '') { return 2; }
 
        #FIXME should allow many more characters here
-       $subject = ereg_replace("[^a-zA-Z _'.-]", '_', $subject);
+       $subject = ereg_replace("[^a-zA-Z _'.:-]", '_', $subject);
 
        $headers = "From: $from";
        if($cc) {

diff --git a/encode.php b/encode.php
index 1cbac74..bad7b4b 100644 (file)
--- a/encode.php
+++ b/encode.php
@@ -50,14 +50,11 @@ function enc_html($str) {
        return $str;
 }
 
-
-# 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;
 }
@@ -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.
@@ -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) {