From 43ef1d67a04c351e4432515b53c04fd70f8dc760 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 10 Feb 2009 16:58:14 +0000 Subject: [PATCH] Some more butifications --- inc/libs/register_functions.php | 2 +- inc/modules/guest/what-register.php | 22 +++++++++---------- inc/modules/member/what-order.php | 6 ++--- surfbar.php | 1 - .../de/html/surfbar/surfbar_start_banner.tpl | 4 +++- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 8ccfcc3f07..1c266eec81 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -94,7 +94,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array) // Empty entry found $array[$name] = ""; $OUT = constant('REGISTER_'.strtoupper($name).'_REQUIRED'); - OUTPUT_HTML("".$OUT."

"); + OUTPUT_HTML("
".$OUT."
"); } } diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index e7318bdfd3..0d6e3f65e9 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -365,45 +365,45 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF LOAD_TEMPLATE("admin_settings_saved", false, REGISTRATION_DONE); } else { if ($_POST['agree'] == "!") { - OUTPUT_HTML("".HAVE_TO_AGREE."

"); + OUTPUT_HTML("
".HAVE_TO_AGREE."
"); } // END - if if ($_POST['addy'] == "!") { - OUTPUT_HTML("".ENTER_EMAIL."

"); + OUTPUT_HTML("
".ENTER_EMAIL."
"); $_POST['addy'] = ""; } elseif ($_POST['addy'] == "?") { - OUTPUT_HTML("".EMAIL_ALREADY_DB."

"); + OUTPUT_HTML("
".EMAIL_ALREADY_DB."
"); $_POST['addy'] = ""; } if ($_POST['surname'] == "!") { - OUTPUT_HTML("".ENTER_SURNAME."

"); + OUTPUT_HTML("
".ENTER_SURNAME."
"); $_POST['surname'] = ""; } // END - if if ($_POST['family_name'] == "!") { - OUTPUT_HTML("".ENTER_FAMILY."

"); + OUTPUT_HTML("
".ENTER_FAMILY."
"); $_POST['family_name'] = ""; } // END - if if (($_POST['pass1'] == "!") && ($_POST['pass2'] == "!")) { - OUTPUT_HTML("".ENTER_BOTH_PASSWORDS."

"); + OUTPUT_HTML("
".ENTER_BOTH_PASSWORDS."
"); } elseif ($_POST['pass1'] == "!") { - OUTPUT_HTML("".ENTER_PASS1."

"); + OUTPUT_HTML("
".ENTER_PASS1."
"); } elseif ($_POST['pass2'] == "!") { - OUTPUT_HTML("".ENTER_PASS2."

"); + OUTPUT_HTML("
".ENTER_PASS2."
"); } if ($SHORT_PASS) { - OUTPUT_HTML("".SHORT_PASS.": ".getConfig('pass_len')."

"); + OUTPUT_HTML("
".SHORT_PASS.": ".getConfig('pass_len')."
"); } // END - if if ($IP_TIMEOUT) { - OUTPUT_HTML("".REMOTE_ADDR_TIMEOUT."

"); + OUTPUT_HTML("
".REMOTE_ADDR_TIMEOUT."
"); } // END - if if ((!empty($cats)) && ($cats < getConfig('least_cats'))) { - OUTPUT_HTML("".CATS_LEAST.": ".getConfig('least_cats')."

"); + OUTPUT_HTML("
".CATS_LEAST.": ".getConfig('least_cats')."
"); } // END - if // Generate birthday selection diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index 4f6bf12932..44865bb679 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -700,15 +700,15 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); } } else { // No mail types defined - OUTPUT_HTML("".MEMBER_NO_PAYMENTS.""); + LOAD_TEMPLATE("admin_settings_saved", false, "".MEMBER_NO_PAYMENTS.""); } } else { // No points left! - OUTPUT_HTML("".MEMBER_NO_POINTS.""); + LOAD_TEMPLATE("admin_settings_saved", false, "".MEMBER_NO_POINTS.""); } } else { // No cateogries are defined yet - OUTPUT_HTML("".MEMBER_NO_CATS.""); + LOAD_TEMPLATE("admin_settings_saved", false, "".MEMBER_NO_CATS.""); } } elseif ($mmails == "0") { // Please set more than 0 mails per day! diff --git a/surfbar.php b/surfbar.php index 02d12ccf14..a640ea603a 100644 --- a/surfbar.php +++ b/surfbar.php @@ -75,7 +75,6 @@ if (isBooleanConstantAndTrue('mxchange_installed')) { LOAD_TEMPLATE("surfbar_frame_start"); // Load banner - OUTPUT_HTML("
"); LOAD_TEMPLATE("surfbar_start_banner"); // This makes the footer appear again diff --git a/templates/de/html/surfbar/surfbar_start_banner.tpl b/templates/de/html/surfbar/surfbar_start_banner.tpl index e622e831d7..f713e52b6b 100644 --- a/templates/de/html/surfbar/surfbar_start_banner.tpl +++ b/templates/de/html/surfbar/surfbar_start_banner.tpl @@ -1 +1,3 @@ - + -- 2.30.2