fixed file_run to use _main postfix, added enc_url_path(), enc_ddmmyyyhhmm(), allowed...

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 3f4119c..123fcc9 100644 (file)
--- a/encode.php
+++ b/encode.php
@@ -50,6 +50,15 @@ function enc_html($str) {
        return $str;
 }
 
+# Encode for output in html. converts \n to <br />
+#
+# Example: <p>~foo.html~</p>
+function enc_htmlbr($str) {
+       $str = enc_html($str);
+       $str = str_replace("\n", "<br />\n", $str);
+       return $str;
+}
+
 
 # HTML attribute.
 #
@@ -67,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.
@@ -99,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) {

diff --git a/file_run.php b/file_run.php
index 409cb4b..fd1d20f 100644 (file)
--- a/file_run.php
+++ b/file_run.php
@@ -32,14 +32,14 @@
 #
 # the file db_password.php would be like so:
 #
-#     function db_password() {
+#     function db_password_main() {
 #           return array('me', 'secret');
 #     }
 
 function file_run($filename) {
     require_once($filename);
     ereg_replace('.*/', '', $filename);
-    $func = basename($filename, '.php');
+    $func = basename($filename, '.php') . '_main';
     return $func();
 }