From c7657ca7ff7ccfceb62e6e460a2bc041a282ff75 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:24:52 +0200 Subject: [PATCH 1/3] user_wakeup: Cleanup, use template --- includes/pages/user_wakeup.php | 44 +++++++++++++++------------------- templates/user_wakeup.html | 19 +++++++++++++++ 2 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 templates/user_wakeup.html diff --git a/includes/pages/user_wakeup.php b/includes/pages/user_wakeup.php index b6955669..fe2ecc7a 100644 --- a/includes/pages/user_wakeup.php +++ b/includes/pages/user_wakeup.php @@ -10,11 +10,12 @@ function user_wakeup() { $date = DateTime::createFromFormat("Y-m-d H:i", $_REQUEST['Date']); if ($date != null) { $date = $date->getTimestamp(); - $bemerkung = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}\n]{1,})/ui", '', strip_tags($_REQUEST['Bemerkung'])); - $ort = preg_replace("/([^\p{L}\p{P}\p{Z}\p{N}]{1,})/ui", '', strip_tags($_REQUEST['Ort'])); - $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " . - "VALUES ('" . $user['UID'] . "', '" . $date . "', '" . $ort . "', " . - "'" . $bemerkung . "')"; + $bemerkung = strip_request_item_nl('Bemerkung'); + $ort = strip_request_item('Ort'); + $SQL = "INSERT INTO `Wecken` (`UID`, `Date`, `Ort`, `Bemerkung`) " + . "VALUES ('" . sql_escape($user['UID']) . "', '" + . sql_escape($date) . "', '" . sql_escape($ort) . "', " . "'" + . sql_escape($bemerkung) . "')"; sql_query($SQL); $html .= success(Get_Text(4)); } else @@ -37,7 +38,8 @@ function user_wakeup() { } } - $html .= "

" . Get_Text("Hello") . $user['Nick'] . ",
" . Get_Text("pub_wake_beschreibung") . "

\n\n"; + $html .= "

" . Get_Text("Hello") . $user['Nick'] . ",
" + . Get_Text("pub_wake_beschreibung") . "

\n\n"; $html .= Get_Text("pub_wake_beschreibung2"); $html .= ' @@ -68,25 +70,17 @@ function user_wakeup() { $html .= ''; } - $html .= '
' . Get_Text("pub_wake_Text2") . ' -
- - - - - - - - - - - - - -
' . Get_Text("pub_wake_Datum") . ':
' . Get_Text("pub_wake_Ort") . '
' . Get_Text("pub_wake_Bemerkung") . '
- -
'; + $html .= '
' . Get_Text("pub_wake_Text2"); + $html .= template_render('../templates/user_wakeup.html', array ( + 'wakeup_link' => page_link_to("user_wakeup"), + 'date_text' => Get_Text("pub_wake_Datum"), + 'date_value' => date("Y-m-d H:i"), + 'place_text' => Get_Text("pub_wake_Ort"), + 'comment_text' => Get_Text("pub_wake_Ort"), + 'comment_value' => "Knock knock Leo, follow the white rabbit to the blue tent", + 'submit_text' => Get_Text("pub_wake_button") + )); return $html; } -?> \ No newline at end of file +?> diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html new file mode 100644 index 00000000..8384fe85 --- /dev/null +++ b/templates/user_wakeup.html @@ -0,0 +1,19 @@ +
+ + + + + + + + + + + + + +
%date_text%:
%place_text%
%comment_text%
+ +
From 3a041d4ef3060a9a8bdca282d1a5d8431eea01c2 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:26:48 +0200 Subject: [PATCH 2/3] user_wakeup: Whoops. Fixes. --- includes/pages/user_wakeup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/pages/user_wakeup.php b/includes/pages/user_wakeup.php index fe2ecc7a..2c6940e7 100644 --- a/includes/pages/user_wakeup.php +++ b/includes/pages/user_wakeup.php @@ -77,9 +77,9 @@ function user_wakeup() { 'date_text' => Get_Text("pub_wake_Datum"), 'date_value' => date("Y-m-d H:i"), 'place_text' => Get_Text("pub_wake_Ort"), - 'comment_text' => Get_Text("pub_wake_Ort"), + 'comment_text' => Get_Text("pub_wake_Bemerkung"), 'comment_value' => "Knock knock Leo, follow the white rabbit to the blue tent", - 'submit_text' => Get_Text("pub_wake_button") + 'submit_text' => Get_Text("pub_wake_bouton") )); return $html; } From 14820a5741e5aca9fc1e99cd388988ed9b9b3160 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 3 Jun 2011 17:29:20 +0200 Subject: [PATCH 3/3] user_wakeup template: no tab/newline fuckup --- templates/user_wakeup.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/user_wakeup.html b/templates/user_wakeup.html index 8384fe85..d02ff5e8 100644 --- a/templates/user_wakeup.html +++ b/templates/user_wakeup.html @@ -11,8 +11,7 @@ %comment_text% +%comment_value%