[guadec-web] registration: Make sure we don't try to output html until we need to
- From: Rui Matos <rtcm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [guadec-web] registration: Make sure we don't try to output html until we need to
- Date: Thu, 4 Jul 2013 15:18:10 +0000 (UTC)
commit 6cb57a3c21a69ee324af643db203052165b372ff
Author: Rui Matos <tiagomatos gmail com>
Date: Thu Jul 4 17:17:04 2013 +0200
registration: Make sure we don't try to output html until we need to
wordcamp-base/template-registration.php | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
---
diff --git a/wordcamp-base/template-registration.php b/wordcamp-base/template-registration.php
index 1e8fa84..87ca55f 100644
--- a/wordcamp-base/template-registration.php
+++ b/wordcamp-base/template-registration.php
@@ -84,16 +84,19 @@ function put_registration_form($reg, $info)
echo "</form>";
}
+function put_header()
+{
+ $structure = wcb_get('structure');
+ $structure->full_width_content();
-$structure = wcb_get('structure');
-$structure->full_width_content();
+ get_header();
-get_header();
+ echo "<div id='container'>";
+ echo "<div id='content' role='main'>";
+ echo "<div class='page type-page status-publish hentry'>";
+ echo "<div id='entry-content'>";
+}
-echo "<div id='container'>";
-echo "<div id='content' role='main'>";
-echo "<div class='page type-page status-publish hentry'>";
-echo "<div id='entry-content'>";
if (is_user_logged_in()) {
global $wpdb;
@@ -114,6 +117,7 @@ if (is_user_logged_in()) {
$pending_registration = ($wpdb->num_rows > 0 && !$completed);
if ($completed) {
+ put_header();
$reg = get_registration_data_for_user_id($current_user->ID);
echo get_registration_confirmation($reg, $current_user);
} else if (!$pending_registration) {
@@ -123,12 +127,14 @@ if (is_user_logged_in()) {
if (is_post() && $info->valid && !empty($_POST['finish'])) {
do_payment($reg);
} else {
+ put_header();
put_registration_form($reg, $info);
}
} else if ($pending_registration) {
$reg = get_registration_data_for_user_id($current_user->ID);
if (is_post() || !check_gopay_params()) {
+ put_header();
echo "<p>Your payment is still pending.</p>";
echo get_registration_data_string($reg);
} else {
@@ -136,6 +142,7 @@ if (is_user_logged_in()) {
}
}
} else {
+ put_header();
wp_login_form();
wp_register("Don't have a GUADEC account yet? ", "");
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]