From 03749449736019086cc2089ad19b66d31784164b Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Sat, 23 Oct 2010 20:51:40 -0400 Subject: [PATCH] xhtml -> html5 --- encode.php | 8 ++++---- examples/404.html | 4 ++-- examples/calendar.html | 6 +++--- messages.php | 2 +- metaform/main.html | 26 +++++++++++++------------- metaform/preview.html | 18 +++++++++--------- metaform/template.html | 30 +++++++++++++++--------------- run.php | 2 +- run2.php | 2 +- test/session_test.html | 4 ++-- test/tem_test.php.html | 14 +++++++------- unit_tests/template.html | 7 +++---- upload.php | 8 ++++---- uploader/uploader.html | 9 ++++----- 14 files changed, 69 insertions(+), 71 deletions(-) diff --git a/encode.php b/encode.php index b81a4fc..07bd2f8 100644 --- a/encode.php +++ b/encode.php @@ -51,17 +51,17 @@ function enc_html($str) { return $str; } -# Encode for output in html. Convert newlines to
+# Encode for output in html. Convert newlines to
# # Example:

~foo htmlbr~

function enc_htmlbr($str) { $str = enc_html($str); - $str = str_replace("\n", "
\n", $str); + $str = str_replace("\n", "
\n", $str); return $str; } # Encode for output in html. Preserves newlines and indentation by converting -# newlines to
and spaces at the begining of lines to    +# newlines to
and spaces at the begining of lines to    # # Example:

~foo htmlbrtab~

function enc_htmlbrtab($str) { @@ -71,7 +71,7 @@ function enc_htmlbrtab($str) { return $str; } -# Encode for output in html. Spaces converted to   and \n to
+# Encode for output in html. Spaces converted to   and \n to
# # Example: function enc_htmlbrnbsp($str) { diff --git a/examples/404.html b/examples/404.html index 7cb09e5..2802848 100644 --- a/examples/404.html +++ b/examples/404.html @@ -1,6 +1,6 @@ - + - + 404 File Not Found diff --git a/examples/calendar.html b/examples/calendar.html index 3135b51..8edc126 100644 --- a/examples/calendar.html +++ b/examples/calendar.html @@ -1,9 +1,9 @@ - + - + - + diff --git a/messages.php b/messages.php index 0dc21e2..cf979d7 100644 --- a/messages.php +++ b/messages.php @@ -44,7 +44,7 @@ # #

~data html~

# -#
+#
# # # diff --git a/metaform/main.html b/metaform/main.html index f698d14..f15b49e 100644 --- a/metaform/main.html +++ b/metaform/main.html @@ -1,6 +1,6 @@ - + - + Meta Form @@ -11,29 +11,29 @@

The form name should not contain any capitals or symbols (besides underscore)

-

File name: .html

+

File name: .html

-

DB table:

+

DB table:

-

Printable singular:

+

Printable singular:

-

Printable plural:

+

Printable plural:

Features

-

Send form results vie e-mail.

+

Send form results vie e-mail.

-

Save form results to a database.

+

Save form results to a database.

-

Provide a "Listing" page.

+

Provide a "Listing" page.

-

Provide a "Display" page.

+

Provide a "Display" page.

-

Password protect this form.

+

Password protect this form.

Below, specify the fields you'd like in your form, one field per line. After each field name, put at least one space, then the field type. The following field types are available: , ~type html~.

-

Example:

+	

Example:

 name      textbox
 phone     phone
 comments  textarea
@@ -41,7 +41,7 @@ agree     yesno

Fields:

-

+

diff --git a/metaform/preview.html b/metaform/preview.html index 7137fee..b88d454 100644 --- a/metaform/preview.html +++ b/metaform/preview.html @@ -1,9 +1,9 @@ - + - + Meta Form - + @@ -11,18 +11,18 @@

PREVIEW

~preview~ -

~hiddens~

+

~hiddens~

-

+

-

+

-

+

-

+

-

+

diff --git a/metaform/template.html b/metaform/template.html index a5fb63e..58629d8 100644 --- a/metaform/template.html +++ b/metaform/template.html @@ -1,9 +1,9 @@ - + - + <!--~~title show {~~-->~plural cap~<!--~~}~~--> - +