From 5ef6ed7373ae85e5635e39e2a0adf9496a8add05 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 6 Feb 2008 20:38:44 +0000 Subject: [PATCH] A lot more naming conventions applied --- inc/footer.php | 10 +- inc/functions.php | 26 ++--- inc/header.php | 2 +- inc/install-inc.php | 106 ++++++++---------- inc/libs/payout_functions.php | 10 +- inc/libs/register_functions.php | 4 +- inc/libs/user_functions.php | 6 +- inc/modules/admin.php | 8 +- inc/modules/admin/admin-inc.php | 38 +++---- inc/modules/admin/what-add_points.php | 2 +- inc/modules/admin/what-adminedit.php | 4 +- inc/modules/admin/what-admins_add.php | 2 +- inc/modules/admin/what-config_home.php | 2 +- inc/modules/admin/what-config_mods.php | 4 +- inc/modules/admin/what-config_payouts.php | 4 +- .../admin/what-config_rallye_prices.php | 10 +- inc/modules/admin/what-config_register.php | 2 +- inc/modules/admin/what-del_email.php | 4 +- inc/modules/admin/what-del_task.php | 2 +- inc/modules/admin/what-del_user.php | 6 +- inc/modules/admin/what-edit_emails.php | 2 +- inc/modules/admin/what-edit_user.php | 2 +- inc/modules/admin/what-email_archiv.php | 2 +- inc/modules/admin/what-email_details.php | 16 +-- inc/modules/admin/what-email_stats.php | 2 +- inc/modules/admin/what-extensions.php | 6 +- inc/modules/admin/what-guest_add.php | 2 +- inc/modules/admin/what-guestedit.php | 4 +- inc/modules/admin/what-holiday_list.php | 2 +- inc/modules/admin/what-holiday_remove.php | 2 +- inc/modules/admin/what-list_payouts.php | 2 +- inc/modules/admin/what-list_refs.php | 2 +- inc/modules/admin/what-lock_user.php | 4 +- inc/modules/admin/what-logs.php | 6 +- inc/modules/admin/what-mem_add.php | 2 +- inc/modules/admin/what-memedit.php | 4 +- inc/modules/admin/what-overview.php | 2 +- inc/modules/admin/what-send_bonus.php | 6 +- inc/modules/admin/what-sub_points.php | 2 +- inc/modules/admin/what-theme_import.php | 2 +- inc/modules/admin/what-unlock_emails.php | 2 +- inc/modules/admin/what-usage.php | 2 +- inc/modules/admin/what-user_online.php | 2 +- inc/modules/admin/what-usr_online.php | 8 +- inc/modules/chk_login.php | 2 +- inc/modules/frametester.php | 2 +- inc/modules/guest/what-agb.php | 2 +- inc/modules/guest/what-rallyes.php | 4 +- inc/modules/guest/what-register.php | 22 ++-- inc/modules/guest/what-stats.php | 12 +- inc/modules/index.php | 2 +- inc/modules/login.php | 8 +- inc/modules/member/what-beg2.php | 2 +- inc/modules/member/what-bonus.php | 2 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-order.php | 6 +- inc/modules/member/what-rallyes.php | 4 +- inc/modules/member/what-reflinks.php | 8 +- inc/modules/member/what-transfer.php | 18 +-- inc/modules/member/what-welcome.php | 2 +- inc/mysql-manager.php | 22 ++-- inc/stylesheet.php | 10 +- mailid_top.php | 12 +- 63 files changed, 234 insertions(+), 246 deletions(-) diff --git a/inc/footer.php b/inc/footer.php index f502533885..4062ecc36d 100644 --- a/inc/footer.php +++ b/inc/footer.php @@ -47,7 +47,7 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1")) if (((frameset_active) || ($GLOBALS['module'] == "frametester") || ($header < 2)) && (empty($frame))) { // Add some non-frameset stuff - OUTPUT_HTML (" + OUTPUT_HTML("<NOFRAMES> <BODY>"); } @@ -70,16 +70,16 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1")) if (((frameset_active) || ($GLOBALS['module'] == "frametester")) && ($FOOTER == "1")) { // Add the closing NOFRAMES tag - OUTPUT_HTML (""); + OUTPUT_HTML(""); } // And the last closing HTML tag - OUTPUT_HTML (""); + OUTPUT_HTML(""); // Footer has been reached $FOOTER = 1; // Output HTML code - OUTPUT_HTML (""); + OUTPUT_HTML(""); // Close link if ($link) { SQL_CLOSE($link, __FILE__, __LINE__); } else { ADD_FATAL(NO_DB_LINK); } @@ -90,7 +90,7 @@ if (($FOOTER != "1") && ($FOOTER != "2") && ($CSS != "1")) $FOOTER = 1; // Output CSS content - OUTPUT_HTML (""); + OUTPUT_HTML(""); } // ?> diff --git a/inc/functions.php b/inc/functions.php index 6a64288272..5c0d7da89b 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -89,19 +89,19 @@ function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_o "; - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } // Close a table (you may want to add some footer stuff here) function CLOSE_TABLE($ADD="") { - OUTPUT_HTML (" + OUTPUT_HTML(" "); - if (!empty($ADD)) OUTPUT_HTML ($ADD); - OUTPUT_HTML (""); + if (!empty($ADD)) OUTPUT_HTML($ADD); + OUTPUT_HTML(""); } // Output HTML code directly or "render" it. You addionally switch the new-line character off -function OUTPUT_HTML ($HTML, $NEW_LINE = true) { +function OUTPUT_HTML($HTML, $NEW_LINE = true) { // Some global variables global $OUTPUT, $FOOTER, $CSS; @@ -342,7 +342,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") else { // Output direct - OUTPUT_HTML ($ret); + OUTPUT_HTML($ret); } } elseif (DEBUG_MODE) @@ -1005,14 +1005,14 @@ function LOAD_URL($URL, $addUrlData=true) { $URL = htmlentities(strip_tags($URL), ENT_QUOTES); // Output new location link as anchor - OUTPUT_HTML ("".$URL."\n"); + OUTPUT_HTML("".$URL."\n"); } elseif (!headers_sent()) { // Load URL when headers are not sent @header ("Location: ".str_replace("&", "&", $URL)); } else { // Output error message include(PATH."inc/header.php"); - OUTPUT_HTML (LOAD_URL_ERROR_1.$URL.LOAD_URL_ERROR_2); + OUTPUT_HTML(LOAD_URL_ERROR_1.$URL.LOAD_URL_ERROR_2); include(PATH."inc/footer.php"); } exit(); @@ -1132,22 +1132,22 @@ function array_pk_sort(&$array, $a_sort, $primary_key = 0, $order = -1, $nums = $array = $dummy; } // -function ADD_SELECTION($type, $DEFAULT, $PREFIX="", $id="0") +function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") { global $MONTH_DESCR; $OUT = ""; if ($type == "yn") { // This is a yes/no selection only! - if ($id > 0) $PREFIX .= "[".$id."]"; - $OUT .= " \n"; } else { // Begin with regular selection box here - if (!empty($PREFIX)) $PREFIX .= "_"; + if (!empty($prefix)) $prefix .= "_"; $type2 = $type; if ($id > 0) $type2 .= "[".$id."]"; - $OUT .= " \n"; } switch ($type) { diff --git a/inc/header.php b/inc/header.php index e336ea5b6f..015b9e43b3 100644 --- a/inc/header.php +++ b/inc/header.php @@ -106,7 +106,7 @@ if (defined('frameset_active')) { } // Closing HEAD tag - if ($CSS != "1") OUTPUT_HTML ("\n"); + if ($CSS != "1") OUTPUT_HTML("\n"); $header = 1; } diff --git a/inc/install-inc.php b/inc/install-inc.php index f4146a707e..94dfbb38a5 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -43,32 +43,25 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) } // -function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0) +function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0) { - $DONE = false; $SNEAK++; + $done = false; $SNEAK++; if (file_exists($file)) { - $search = "CFG: ".$COMMENT; + $search = "CFG: ".$comment; $tmp = $file.".tmp"; - $fp = @fopen($file, 'r') or OUTPUT_HTML ("READ: ".$file."
"); - if (is_resource($fp)) - { - $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML ("WRITE: ".$tmp."
"); - if (is_resource($fp_tmp)) - { - while (! feof($fp)) - { + $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); + if (is_resource($fp)) { + $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); + if (is_resource($fp_tmp)) { + while (!feof($fp)) { $line = fgets ($fp, 10240); if (strpos($line, $search) > -1) $next = 0; - if ($next > -1) - { - if ($next == $SNEAK) - { + if ($next > -1) { + if ($next == $SNEAK) { $next = -1; - $line = $PREFIX.$DATA.$SUFFIX."\n"; - } - else - { + $line = $prefix.$DATA.$suffix."\n"; + } else { $next++; } } @@ -76,27 +69,22 @@ function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0) } fclose($fp_tmp); // Finished writing tmp file - $DONE = true; + $done = true; } // Close source directory fclose($fp); - if (($DONE) && (is_writeable($file))) - { + if (($done) && (is_writeable($file))) { // Copy back tmp file and delete tmp :-) @copy($tmp, $file); @unlink($tmp); - } - else - { - OUTPUT_HTML ("TMP: UNDONE!"); + } else { + OUTPUT_HTML("TMP: UNDONE!"); } } - } - else - { - OUTPUT_HTML ("404: ".$file."
"); + } else { + OUTPUT_HTML("404: ".$file."
"); } } @@ -146,12 +134,12 @@ if ((!mxchange_installed) || (!admin_registered)) if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_"; if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) { - OUTPUT_HTML (""); + OUTPUT_HTML(""); foreach ($FATAL as $key=>$err) { - OUTPUT_HTML (" · ".FATAL_NO.($key + 1).": ".$err."
\n"); + OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
\n"); } - OUTPUT_HTML ("
"); + OUTPUT_HTML("
"); } define('__MYSQL_HOST' , $mysql['host']); define('__MYSQL_DBASE' , $mysql['dbase']); @@ -173,7 +161,7 @@ if ((!mxchange_installed) || (!admin_registered)) define('__TITLE_VALUE' , $_POST['title']); define('__SLOGAN_VALUE', $_POST['slogan']); define('__EMAIL_VALUE' , $_POST['email']); - OUTPUT_HTML ("
+ OUTPUT_HTML(" @@ -206,11 +194,11 @@ if ((!mxchange_installed) || (!admin_registered)) @@ -220,11 +208,11 @@ if ((!mxchange_installed) || (!admin_registered)) @@ -234,11 +222,11 @@ if ((!mxchange_installed) || (!admin_registered)) @@ -248,11 +236,11 @@ if ((!mxchange_installed) || (!admin_registered)) @@ -261,9 +249,9 @@ if ((!mxchange_installed) || (!admin_registered))
@@ -192,11 +180,11 @@ if ((!mxchange_installed) || (!admin_registered))
"); foreach ($mysql as $key=>$value) { - OUTPUT_HTML (" "); + OUTPUT_HTML(" "); } - OUTPUT_HTML (" + OUTPUT_HTML(" @@ -365,7 +353,7 @@ if ((!mxchange_installed) || (!admin_registered)) define('__BURL_VALUE' , $_POST['burl']); define('__TITLE_VALUE', $_POST['title']); - OUTPUT_HTML (" + OUTPUT_HTML(" @@ -364,7 +364,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false) if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) { $menuDesription = array(); - $MTITLE = array(); $SUB = true; + $menuTitle = array(); $SUB = true; $OUT .= "
@@ -403,7 +391,7 @@ if ((!mxchange_installed) || (!admin_registered)) elseif (mxchange_installed) { // Redirection after writing data... :-) - OUTPUT_HTML ("".INSTALL_FINISHED."
+ OUTPUT_HTML("".INSTALL_FINISHED."

".INSTALL_FIN_SECU."

@@ -421,7 +409,7 @@ if ((!mxchange_installed) || (!admin_registered)) break; default: - OUTPUT_HTML (" ".WRONG_PAGE.""); + OUTPUT_HTML(" ".WRONG_PAGE.""); break; } } diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php index bc6036e6cf..5122ee6140 100644 --- a/inc/libs/payout_functions.php +++ b/inc/libs/payout_functions.php @@ -51,7 +51,7 @@ WHERE %s >= min_points ORDER BY type", array($POINTS), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { - OUTPUT_HTML ("
+ OUTPUT_HTML("
".PAYOUT_NOW.":

"); + OUTPUT_HTML("
"); } else { // No payout types setup so far - OUTPUT_HTML ("

".PAYOUT_NO_PAYOUT_TYPES."

"); + OUTPUT_HTML("

".PAYOUT_NO_PAYOUT_TYPES."

"); } } else { // Points is empty - OUTPUT_HTML ("

".PAYOUT_NO_POINTS_ENTERED."

"); + OUTPUT_HTML("

".PAYOUT_NO_POINTS_ENTERED."

"); } } // diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 6126705456..3c4d42e6f8 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -98,7 +98,7 @@ function REGISTER_OUTPUT_REQUIRE_CHECK(&$array) $array[$name] = ""; $eval = "\$OUT = REGISTER_".strtoupper($name)."_REQUIRED;"; eval($eval); - OUTPUT_HTML ("".$OUT."

"); + OUTPUT_HTML("".$OUT."

"); } } @@ -166,7 +166,7 @@ function REGISTER_ADD_CATEGORY_TABLE ($MODE, $return=false) else { // Output directly (default) - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 8faadd570e..8247227d1a 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -84,7 +84,7 @@ function alpha($sortby, $colspan, $return=false) else { // Output generated code - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // @@ -130,7 +130,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) else { // Output code - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // @@ -195,7 +195,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) else { // Output code - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // Create email link to user's account diff --git a/inc/modules/admin.php b/inc/modules/admin.php index 5719f09af0..55b9a3becd 100644 --- a/inc/modules/admin.php +++ b/inc/modules/admin.php @@ -166,7 +166,7 @@ if (!admin_registered) if (!empty($_GET['register'])) { // Registration of first admin is done - if ($_GET['register'] == "done") OUTPUT_HTML ("".ADMIN_REGISTER_DONE.""); + if ($_GET['register'] == "done") OUTPUT_HTML("".ADMIN_REGISTER_DONE.""); } // Check if the admin has submitted data or not @@ -200,7 +200,7 @@ if (!admin_registered) } else { - OUTPUT_HTML ("".ADMIN_LOGIN_FAILED.""); + OUTPUT_HTML("".ADMIN_LOGIN_FAILED.""); ADD_FATAL(CANNOT_REGISTER_SESS); } break; @@ -315,7 +315,7 @@ if (!admin_registered) else { // Something went wrong here... - OUTPUT_HTML ("".ADMIN_LOGOUT_FAILED.""); + OUTPUT_HTML("".ADMIN_LOGOUT_FAILED.""); // Add fatal message ADD_FATAL(CANNOT_UNREG_SESS); @@ -379,7 +379,7 @@ if (!admin_registered) else { // Login failed (cookies enabled?) - OUTPUT_HTML ("".ADMIN_LOGIN_FAILED.""); + OUTPUT_HTML("".ADMIN_LOGIN_FAILED.""); ADD_FATAL(CANNOT_RE_REGISTER_SESS); } break; diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index be8b8c1eb6..0ee1d5157f 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -162,17 +162,17 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) return $ret; } // -function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0) +function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { - $DONE = false; $SEEK++; $found = false; + $done = false; $seek++; $found = false; if (file_exists($file)) { - $search = "CFG: ".$COMMENT; + $search = "CFG: ".$comment; $tmp = $file.".tmp"; - $fp = fopen($file, 'r') or OUTPUT_HTML ("READ: ".$file."
"); + $fp = fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); if ($fp) { - $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML ("WRITE: ".$tmp."
"); + $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); if ($fp_tmp) { while (! feof($fp)) @@ -181,10 +181,10 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0) if (strpos($line, $search) > -1) { $next = 0; $found = true; } if ($next > -1) { - if ($next == $SEEK) + if ($next == $seek) { $next = -1; - $line = $PREFIX.$DATA.$SUFFIX."\n"; + $line = $prefix . $DATA . $suffix."\n"; } else { @@ -195,10 +195,10 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0) } fclose($fp_tmp); // Finished writing tmp file - $DONE = true; + $done = true; } fclose($fp); - if (($DONE) && ($found)) + if (($done) && ($found)) { // Copy back tmp file and delete tmp :-) @copy($tmp, $file); @@ -207,25 +207,25 @@ function admin_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0) } elseif (!$found) { - OUTPUT_HTML ("CHANGE: 404!"); + OUTPUT_HTML("CHANGE: 404!"); define ('_FATAL', true); } else { - OUTPUT_HTML ("TMP: UNDONE!"); + OUTPUT_HTML("TMP: UNDONE!"); define ('_FATAL', true); } } } else { - OUTPUT_HTML ("404: ".$file."
"); + OUTPUT_HTML("404: ".$file."
"); } } // function ADMIN_DO_ACTION($wht) { - global $menuDesription, $MTITLE, $CONFIG, $EXTENSIONS, $link, $DATA; + global $menuDesription, $menuTitle, $CONFIG, $EXTENSIONS, $link, $DATA; //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; if (EXT_IS_ACTIVE("cache")) { @@ -304,12 +304,12 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); // function ADD_ADMIN_MENU($act, $wht,$return=false) { - global $_GET, $menuDesription, $MTITLE, $link; + global $_GET, $menuDesription, $menuTitle, $link; $SUB = false; // Menu descriptions $menuDesription = array(); - $MTITLE = array(); + $menuTitle = array(); // Build main menu $result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__); @@ -334,7 +334,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false) if (!$SUB) { // Insert compiled menu title and description - $MTITLE[$menu] = $title; + $menuTitle[$menu] = $title; $menuDesription[$menu] = $descr; } $OUT .= "
  @@ -386,7 +386,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false) if ($ACL) { // Insert compiled title and description - $MTITLE[$wht_sub] = $title_what; + $menuTitle[$wht_sub] = $title_what; $menuDesription[$wht_sub] = $desc_what; $OUT .= "
@@ -451,7 +451,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false) if ($return) { return $OUT; } else { - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php index 2a840db9b1..444d18f04a 100644 --- a/inc/modules/admin/what-add_points.php +++ b/inc/modules/admin/what-add_points.php @@ -131,7 +131,7 @@ if ($_GET['u_id'] == "all") else { // User not found! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } else diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php index 803b98bc38..3a039943e7 100644 --- a/inc/modules/admin/what-adminedit.php +++ b/inc/modules/admin/what-adminedit.php @@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']); OPEN_TABLE("100%", "admin_content admin_content_align", ""); // List all menu points and make them editable -OUTPUT_HTML ("

+OUTPUT_HTML("

"); if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) { @@ -302,7 +302,7 @@ WHERE ".$AND." AND id=%d LIMIT 1", LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND); } } -OUTPUT_HTML ("
"); +OUTPUT_HTML(""); CLOSE_TABLE(); // ?> diff --git a/inc/modules/admin/what-admins_add.php b/inc/modules/admin/what-admins_add.php index c3073789f1..bb740c380e 100644 --- a/inc/modules/admin/what-admins_add.php +++ b/inc/modules/admin/what-admins_add.php @@ -58,7 +58,7 @@ if ((isset($_POST['add'])) && (!empty($_POST['login'])) && (!empty($_POST['email array($_POST['login'], generateHash($_POST['pass1']), $_POST['email']), __FILE__, __LINE__); // Admin login saved - LOAD_TEMPLATE ("admin_settings_saved", false, "".ADMIN_ADMINS_ADD_DONE.""); + LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_ADMINS_ADD_DONE.""); // Remove cache file if (EXT_IS_ACTIVE("cache")) diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php index d5806152cf..5a72347a08 100644 --- a/inc/modules/admin/what-config_home.php +++ b/inc/modules/admin/what-config_home.php @@ -54,7 +54,7 @@ case "settings": // Settings related to the index page { // Save settings ADMIN_SAVE_SETTINGS($_POST, "_config", "config='0'"); - OUTPUT_HTML ("".ADMIN_CONTINUE_TO_CONFIG.""); + OUTPUT_HTML("".ADMIN_CONTINUE_TO_CONFIG.""); } else { diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php index cfd12d9b58..22d2bef91e 100644 --- a/inc/modules/admin/what-config_mods.php +++ b/inc/modules/admin/what-config_mods.php @@ -83,7 +83,7 @@ if (isset($_POST['edit'])) { // Nothing selected LOAD_TEMPLATE("admin_settings_saved", false, MODS_NOTHING_SELECTED); - OUTPUT_HTML ("
"); + OUTPUT_HTML("
"); // Remove maybe confusing data unset($_POST['edit']); @@ -111,7 +111,7 @@ if (isset($_POST['edit'])) // Entries updated LOAD_TEMPLATE("admin_settings_saved", false, MODS_CHANGED); - OUTPUT_HTML ("
"); + OUTPUT_HTML("
"); } if ($SEL == 0) diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php index ef2ee324cd..93074ff03e 100644 --- a/inc/modules/admin/what-config_payouts.php +++ b/inc/modules/admin/what-config_payouts.php @@ -235,12 +235,12 @@ if ((SQL_NUMROWS($result_mem) > 0) && ($display)) { // Members has requested payouts SQL_FREERESULT($result_mem); - OUTPUT_HTML ("

".ADMIN_PAYOUT_LIST_REQUESTS."

"); + OUTPUT_HTML("

".ADMIN_PAYOUT_LIST_REQUESTS."

"); } elseif ($display) { // No member requests so far - OUTPUT_HTML ("

".ADMIN_PAYOUT_NO_MEMBER_REQUESTS."

"); + OUTPUT_HTML("

".ADMIN_PAYOUT_NO_MEMBER_REQUESTS."

"); } // Add new paypout type if ($display) LOAD_TEMPLATE("admin_payout_add_new"); diff --git a/inc/modules/admin/what-config_rallye_prices.php b/inc/modules/admin/what-config_rallye_prices.php index 91565cf9e3..02ed535f9a 100644 --- a/inc/modules/admin/what-config_rallye_prices.php +++ b/inc/modules/admin/what-config_rallye_prices.php @@ -62,7 +62,7 @@ VALUES ('%s', '%s', '%s', '%s')", $_POST['points'], $_POST['info'] ), __FILE__, __LINE__); - LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_PRICE_LEVEL_SAVED); + LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_LEVEL_SAVED); } else { @@ -70,7 +70,7 @@ VALUES ('%s', '%s', '%s', '%s')", SQL_FREERESULT($result); // Price level found! - LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_PRICE_ALREADY_FOUND); + LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_PRICE_ALREADY_FOUND); } } } @@ -88,11 +88,11 @@ VALUES ('%s', '%s', '%s', '%s')", } // Output message - LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_DELETED); + LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_DELETED); } else { - LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_NOT_DELETED); + LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_NOT_DELETED); } } elseif (isset($_POST['change'])) @@ -109,7 +109,7 @@ VALUES ('%s', '%s', '%s', '%s')", } // Output message - LOAD_TEMPLATE ("admin_settings_saved", false, RALLYE_ENTRIES_CHANGED); + LOAD_TEMPLATE("admin_settings_saved", false, RALLYE_ENTRIES_CHANGED); } if (isset($_POST['edit'])) diff --git a/inc/modules/admin/what-config_register.php b/inc/modules/admin/what-config_register.php index 3dca07b7c9..55b411fb52 100644 --- a/inc/modules/admin/what-config_register.php +++ b/inc/modules/admin/what-config_register.php @@ -49,7 +49,7 @@ if (isset($_POST['ok'])) $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_must_register SET field_required='%s' WHERE id=%d AND field_required != '%s' LIMIT 1", array($value, bigintval($id), $value),__FILE__, __LINE__); } - LOAD_TEMPLATE ("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED); + LOAD_TEMPLATE("admin_settings_saved", false, REGISTER_ADMIN_CHANGES_SAVED); } // List all register values diff --git a/inc/modules/admin/what-del_email.php b/inc/modules/admin/what-del_email.php index 136b0f947c..60079d8830 100644 --- a/inc/modules/admin/what-del_email.php +++ b/inc/modules/admin/what-del_email.php @@ -92,7 +92,7 @@ ON s.pool_id=%d LIMIT 1", array(bigintval($stats_id)), __FILE__, __LINE__); // Output link for manually removing stats entry - LOAD_TEMPLATE ("admin_settings_saved", false, "".ADMIN_REMOVE_STATS_ENTRY.""); + LOAD_TEMPLATE("admin_settings_saved", false, "".ADMIN_REMOVE_STATS_ENTRY.""); } } else @@ -143,7 +143,7 @@ ON s.pool_id=%d LIMIT 1", else { // No mail orders fond - LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_WRONG_CALL); + LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL); } CLOSE_TABLE(); // diff --git a/inc/modules/admin/what-del_task.php b/inc/modules/admin/what-del_task.php index 652798112d..edef52bfd7 100644 --- a/inc/modules/admin/what-del_task.php +++ b/inc/modules/admin/what-del_task.php @@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) } // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("

"); +OUTPUT_HTML("

"); // ?> diff --git a/inc/modules/admin/what-del_user.php b/inc/modules/admin/what-del_user.php index d3a3d24471..9799da4fb5 100644 --- a/inc/modules/admin/what-del_user.php +++ b/inc/modules/admin/what-del_user.php @@ -56,12 +56,12 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason'] // Delete user account DELETE_USER_ACCOUNT(bigintval($_GET['u_id']), $_POST['reason']); - OUTPUT_HTML ("".ADMIN_DEL_COMPLETED.""); + OUTPUT_HTML("".ADMIN_DEL_COMPLETED.""); } else { // Account does not exists! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } elseif (!empty($_POST['no'])) @@ -97,7 +97,7 @@ if ((isset($_POST['ok'])) || ((isset($_POST['del'])) && (!empty($_POST['reason'] else { // Account does not exists! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } CLOSE_TABLE(); diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php index 8c566cfb1f..bf98dad7c0 100644 --- a/inc/modules/admin/what-edit_emails.php +++ b/inc/modules/admin/what-edit_emails.php @@ -131,7 +131,7 @@ WHERE id=%d LIMIT 1", else { // No mail orders left in pool - OUTPUT_HTML ("".ADMIN_NO_MAILS_IN_POOL.""); + OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL.""); } CLOSE_TABLE(); // diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index 657f1273ba..ea524158c7 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -148,7 +148,7 @@ WHERE userid=%d LIMIT 1", else { // Account does not exists! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } CLOSE_TABLE(); // diff --git a/inc/modules/admin/what-email_archiv.php b/inc/modules/admin/what-email_archiv.php index b267cc45b3..1de43e9441 100644 --- a/inc/modules/admin/what-email_archiv.php +++ b/inc/modules/admin/what-email_archiv.php @@ -132,7 +132,7 @@ if (SQL_NUMROWS($result) > 0) else { // No mail orders fond - OUTPUT_HTML ("".ADMIN_NO_MAILS_IN_POOL.""); + OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL.""); } // ?> diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php index fea0be8d85..0fbd32f90c 100644 --- a/inc/modules/admin/what-email_details.php +++ b/inc/modules/admin/what-email_details.php @@ -125,7 +125,7 @@ $MAIL = false; if (SQL_NUMROWS($result_list) > 0) { // Mail orders are in pool so we can display them - OUTPUT_HTML ("
+ OUTPUT_HTML("
+ OUTPUT_HTML("
@@ -158,7 +158,7 @@ if (SQL_NUMROWS($result_list) > 0) } // List mail - OUTPUT_HTML ("
".EMAIL_SENDER.":
".ADMIN_USER_PROFILE_LINK($pool[1])." @@ -227,13 +227,13 @@ if (SQL_NUMROWS($result_list) > 0) if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3"); // Output footer - OUTPUT_HTML ("
+ OUTPUT_HTML("
"); $MAIL = true; if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) { // Check only if bonus extension is active - if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML ("

"); + if (SQL_NUMROWS($result_bonus) > 0) OUTPUT_HTML("

"); } } @@ -243,7 +243,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) if (SQL_NUMROWS($result_bonus) > 0) { // Mail orders are in pool so we can display them - OUTPUT_HTML ("
+ OUTPUT_HTML("
+ OUTPUT_HTML("
@@ -267,7 +267,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) $unconfirmed = "".$unconfirmed.""; } - OUTPUT_HTML ("
".EMAIL_SUBJECT.":
".$bonus[1]." @@ -333,7 +333,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) if ($PAGES > 1) ADD_EMAIL_NAV($PAGES, $CONFIG['mails_page'], false, "3"); // Output footer - OUTPUT_HTML ("
+ OUTPUT_HTML("
"); $MAIL = true; } @@ -342,7 +342,7 @@ if ((EXT_IS_ACTIVE("bonus")) && ($WHO == _ALL)) if (!$MAIL) { // No mail orders fond - OUTPUT_HTML ("".ADMIN_NO_MAILS_IN_POOL.""); + OUTPUT_HTML("".ADMIN_NO_MAILS_IN_POOL.""); } // ?> diff --git a/inc/modules/admin/what-email_stats.php b/inc/modules/admin/what-email_stats.php index fc5a361926..5612fce7de 100644 --- a/inc/modules/admin/what-email_stats.php +++ b/inc/modules/admin/what-email_stats.php @@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) } // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); OPEN_TABLE("100%", "admin_content admin_content_align", ""); CLOSE_TABLE(); diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 0fd97cf399..ce0ccaaaf5 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -103,9 +103,9 @@ if (!empty($_GET['reg_ext'])) { } // Extensions changed - OUTPUT_HTML ("

"); + OUTPUT_HTML("

"); LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_EXT_CHANGED); - OUTPUT_HTML ("

"); + OUTPUT_HTML("

"); } else { // Edit selected entries $SW = "2"; $OUT = ""; @@ -277,7 +277,7 @@ case "overview": // List all registered extensions LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_EXTENSION_REGISTERED.""); } // Link for checking for new or updated extensions - OUTPUT_HTML ("
".ADMIN_SEARCH_NEW_EXTENSIONS.""); + OUTPUT_HTML("
".ADMIN_SEARCH_NEW_EXTENSIONS.""); break; case "register": // Register new extension diff --git a/inc/modules/admin/what-guest_add.php b/inc/modules/admin/what-guest_add.php index 7e392e0d28..460cbb0e81 100644 --- a/inc/modules/admin/what-guest_add.php +++ b/inc/modules/admin/what-guest_add.php @@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) } // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); OPEN_TABLE("100%", "admin_content admin_content_align", ""); diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php index 1f301e8b0a..5643bc183c 100644 --- a/inc/modules/admin/what-guestedit.php +++ b/inc/modules/admin/what-guestedit.php @@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']); OPEN_TABLE("100%", "admin_content admin_content_align", ""); // List all menu points and make them editable -OUTPUT_HTML ("

+OUTPUT_HTML("

"); if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) { @@ -363,7 +363,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND); } } -OUTPUT_HTML ("
"); +OUTPUT_HTML(""); CLOSE_TABLE(); // ?> diff --git a/inc/modules/admin/what-holiday_list.php b/inc/modules/admin/what-holiday_list.php index 9e02cde35f..6446e9a8ea 100644 --- a/inc/modules/admin/what-holiday_list.php +++ b/inc/modules/admin/what-holiday_list.php @@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) } // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("

"); +OUTPUT_HTML("

"); // ?> diff --git a/inc/modules/admin/what-holiday_remove.php b/inc/modules/admin/what-holiday_remove.php index 8d935e23fc..fe6cddb34a 100644 --- a/inc/modules/admin/what-holiday_remove.php +++ b/inc/modules/admin/what-holiday_remove.php @@ -39,7 +39,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin())) } // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("

"); +OUTPUT_HTML("

"); // ?> diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index f9b7e02e47..84016ea790 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -172,7 +172,7 @@ if (!empty($_GET['pid'])) else { // Cannot load payout id - OUTPUT_HTML ("".PAYOUT_FAILED_OBTAIN_PAYOUT_ID.""); + OUTPUT_HTML("".PAYOUT_FAILED_OBTAIN_PAYOUT_ID.""); } } else diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index cc8c44946e..3ecc0c7e86 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -73,7 +73,7 @@ if (!empty($_GET['u_id'])) $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%d ORDER BY userid", array(bigintval($_GET['u_id'])), __FILE__, __LINE__); - OUTPUT_HTML (ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."

"); + OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."

"); if ($result) { $rows = SQL_NUMROWS($result); diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index d2e1fd48fb..c257d797f6 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -155,7 +155,7 @@ if (!empty($_GET['u_id'])) else { // Account does not exists! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } if (!empty($URL)) @@ -179,7 +179,7 @@ if (!empty($_GET['u_id'])) else { // Account does not exists! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } else diff --git a/inc/modules/admin/what-logs.php b/inc/modules/admin/what-logs.php index 85844bb5c0..efffe465da 100644 --- a/inc/modules/admin/what-logs.php +++ b/inc/modules/admin/what-logs.php @@ -75,17 +75,17 @@ if (!empty($_GET['access'])) { $dir = PATH.LOGS_BASE."/"; if (is_dir($dir)) { // logs directory does exist - OUTPUT_HTML ("
    "); + OUTPUT_HTML("
      "); $handle = @opendir($dir) or mxchange_die("Cannot open directory ".LOGS_BASE."!"); while($file = @readdir($handle)) { // We currenly only like files with "access" as prefix, should be more flexible! if (substr($file, 0, 6) == "access") { // Okay, let us print it out - OUTPUT_HTML ("
    1. ".$file."
      2. "); + OUTPUT_HTML("
    2. ".$file."
      3. "); } } @closedir($handle); - OUTPUT_HTML ("
    "); + OUTPUT_HTML("
"); } else { diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php index ec086086ad..766509afde 100644 --- a/inc/modules/admin/what-mem_add.php +++ b/inc/modules/admin/what-mem_add.php @@ -40,7 +40,7 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) } // Add desciption as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); OPEN_TABLE("100%", "admin_content admin_content_align", ""); diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php index ed7673bb21..b380436a97 100644 --- a/inc/modules/admin/what-memedit.php +++ b/inc/modules/admin/what-memedit.php @@ -55,7 +55,7 @@ if (!empty($_POST['sel'])) $chk = SELECTION_COUNT($_POST['sel']); OPEN_TABLE("100%", "admin_content admin_content_align", ""); // List all menu points and make them editable -OUTPUT_HTML ("

+OUTPUT_HTML("

"); if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) { @@ -325,7 +325,7 @@ if ((isset($_POST['edit'])) && ($chk > 0) && (!IS_DEMO())) LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NO_MENUS_FOUND); } } -OUTPUT_HTML ("
"); +OUTPUT_HTML(""); CLOSE_TABLE(); // ?> diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php index 7c443d6d65..e18bbad546 100644 --- a/inc/modules/admin/what-overview.php +++ b/inc/modules/admin/what-overview.php @@ -69,7 +69,7 @@ if ($JOBS_DONE) { // Prepare content $content = array( - 'title' => $MTITLE[$key], + 'title' => $menuTitle[$key], 'text' => $value ); diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php index ef60bdb2b0..5445bec1fc 100644 --- a/inc/modules/admin/what-send_bonus.php +++ b/inc/modules/admin/what-send_bonus.php @@ -130,12 +130,12 @@ VALUES ('%s', '%s', '%s', '%s', '%s', 'NEW', UNIX_TIMESTAMP(), '%s', '%s', '%s', } // Mail inserted into bonus pool - LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_BONUS_SEND); + LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_SEND); } else { // More entered than can be reached! - LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_MORE_SELECTED); + LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_MORE_SELECTED); } if (!empty($URL)) { @@ -236,7 +236,7 @@ WHERE userid=%d AND status='CONFIRMED' AND receive_mails > 0".$MORE." LIMIT 1", else { // No cateogries are defined yet - OUTPUT_HTML ("".MEMBER_NO_CATS.""); + OUTPUT_HTML("".MEMBER_NO_CATS.""); } } diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php index d08197759d..9c6cc1d8fe 100644 --- a/inc/modules/admin/what-sub_points.php +++ b/inc/modules/admin/what-sub_points.php @@ -131,7 +131,7 @@ if ($_GET['u_id'] == "all") else { // User not found! - OUTPUT_HTML ("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); + OUTPUT_HTML("".ADMIN_MEMBER_404_1.$_GET['u_id'].ADMIN_MEMBER_404_2.""); } } else diff --git a/inc/modules/admin/what-theme_import.php b/inc/modules/admin/what-theme_import.php index aeda0eed62..3bd1ce95bf 100644 --- a/inc/modules/admin/what-theme_import.php +++ b/inc/modules/admin/what-theme_import.php @@ -78,7 +78,7 @@ VALUES ('%s', 'N', '%s')", // Output message LOAD_TEMPLATE("admin_settings_saved", false, $msg); - OUTPUT_HTML ("
"); + OUTPUT_HTML("
"); } // Initialize array diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php index badd8c36e4..84adf4995b 100644 --- a/inc/modules/admin/what-unlock_emails.php +++ b/inc/modules/admin/what-unlock_emails.php @@ -237,7 +237,7 @@ if ((SQL_NUMROWS($result_main) > 0) || (isset($_POST['lock']))) else { // Wrong call! - LOAD_TEMPLATE ("admin_settings_saved", false, ADMIN_WRONG_CALL); + LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_WRONG_CALL); } } else diff --git a/inc/modules/admin/what-usage.php b/inc/modules/admin/what-usage.php index c235fc02ee..f5afcc325e 100644 --- a/inc/modules/admin/what-usage.php +++ b/inc/modules/admin/what-usage.php @@ -96,7 +96,7 @@ if ($file !="") { $content = substr(substr($content, 0, $body_end), $body_start); $content = substr($content, strpos($content, ">") + 1); - OUTPUT_HTML ("
+ OUTPUT_HTML("
".$content."
"); } diff --git a/inc/modules/admin/what-user_online.php b/inc/modules/admin/what-user_online.php index bc44387c0b..a7f4aca9ca 100644 --- a/inc/modules/admin/what-user_online.php +++ b/inc/modules/admin/what-user_online.php @@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR("admin", basename(__FILE__)); -OUTPUT_HTML ("

"); +OUTPUT_HTML("

"); // Count guests, members and admins $result_guests = SQL_QUERY("SELECT id FROM "._MYSQL_PREFIX."_online WHERE is_admin='N' AND is_member='N'", __FILE__, __LINE__); diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php index 236b491fc9..ef39806ce3 100644 --- a/inc/modules/admin/what-usr_online.php +++ b/inc/modules/admin/what-usr_online.php @@ -85,22 +85,22 @@ if (EXT_IS_ACTIVE("online", true)) // Is a guest $uid = _IS_GUEST; } - OUTPUT_HTML (" + OUTPUT_HTML(" ".$id." "); if ($uid > 0) { - OUTPUT_HTML (ADMIN_USER_PROFILE_LINK($uid)); + OUTPUT_HTML(ADMIN_USER_PROFILE_LINK($uid)); } else { - OUTPUT_HTML ($uid); + OUTPUT_HTML($uid); } if ($ref > 0) { $ref = ADMIN_USER_PROFILE_LINK($ref); } - OUTPUT_HTML (" + OUTPUT_HTML(" ".$ip." ".$ref." ".$mod." diff --git a/inc/modules/chk_login.php b/inc/modules/chk_login.php index d034bc87ba..8bf1a9c3f0 100644 --- a/inc/modules/chk_login.php +++ b/inc/modules/chk_login.php @@ -40,7 +40,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) OPEN_TABLE("500", "guest_login_header dashed", "center"); -OUTPUT_HTML ("
".VALIDATING_LOGIN."
"); +OUTPUT_HTML("
".VALIDATING_LOGIN."
"); if (!empty($GLOBALS['userid']) && !empty($_COOKIE['u_hash']) && !empty($_COOKIE['lifetime'])) { diff --git a/inc/modules/frametester.php b/inc/modules/frametester.php index 1be7dd9d33..0b42976a8d 100644 --- a/inc/modules/frametester.php +++ b/inc/modules/frametester.php @@ -103,7 +103,7 @@ if ((!empty($_POST['url'])) || (!empty($_GET['url'])) || (!empty($_GET['frame']) break; case "test_top": - OUTPUT_HTML ("".GUEST_FRAMETESTER_TOP.""); + OUTPUT_HTML("".GUEST_FRAMETESTER_TOP.""); break; case "back": // Back buttom diff --git a/inc/modules/guest/what-agb.php b/inc/modules/guest/what-agb.php index 060d10625f..bf862413d9 100644 --- a/inc/modules/guest/what-agb.php +++ b/inc/modules/guest/what-agb.php @@ -41,7 +41,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) ADD_DESCR ("guest", basename(__FILE__)); OPEN_TABLE("100%", "guest_content_align", ""); -LOAD_TEMPLATE (substr(basename(__FILE__), 5, -4)); +LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4)); CLOSE_TABLE(); // ?> diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index aa1842c7fc..e9d62de682 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -46,7 +46,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR("guest", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // Check for possible running rallyes $ADMIN = " AND d.is_active='Y'"; @@ -143,6 +143,6 @@ if (SQL_NUMROWS($result) == 1) LOAD_TEMPLATE("guest_no_rallyes"); } // -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // ?> diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 80b313be03..e0e3ca9b3e 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -357,51 +357,51 @@ array( { if ($_POST['agree'] == "!") { - OUTPUT_HTML ("".HAVE_TO_AGREE."

"); + OUTPUT_HTML("".HAVE_TO_AGREE."

"); } 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'] = ""; } if ($_POST['family_name'] == "!") { - OUTPUT_HTML ("".ENTER_FAMILY."

"); + OUTPUT_HTML("".ENTER_FAMILY."

"); $_POST['family_name'] = ""; } 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.": ".$CONFIG['pass_len']."

"); + OUTPUT_HTML("".SHORT_PASS.": ".$CONFIG['pass_len']."

"); } if ($IP_TIMEOUT) { - OUTPUT_HTML ("".REMOTE_ADDR_TIMEOUT."

"); + OUTPUT_HTML("".REMOTE_ADDR_TIMEOUT."

"); } if ((!empty($cats)) && ($cats < $CONFIG['least_cats'])) { - OUTPUT_HTML ("".CATS_LEAST.": ".$CONFIG['least_cats']."

"); + OUTPUT_HTML("".CATS_LEAST.": ".$CONFIG['least_cats']."

"); } // Generate birthday selection diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 523fb8a979..7278e3bb97 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -172,7 +172,7 @@ case "MODULES": // TOP10 module clicks if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) { // Output header - OUTPUT_HTML (" + OUTPUT_HTML("
"); @@ -181,13 +181,13 @@ case "MODULES": // TOP10 module clicks if (SQL_NUMROWS($guest_t10) > 0) { // Guest clicks - OUTPUT_HTML (" + OUTPUT_HTML(""); $SW = 2; while (list($clicks, $title) = SQL_FETCHROW($guest_t10)) { - OUTPUT_HTML (" + OUTPUT_HTML(""); @@ -197,13 +197,13 @@ case "MODULES": // TOP10 module clicks if (SQL_NUMROWS($guest_t10) > 0) { // Guest clicks - OUTPUT_HTML (" + OUTPUT_HTML(""); $SW = 2; while (list($clicks, $title) = SQL_FETCHROW($mem_t10)) { - OUTPUT_HTML (" + OUTPUT_HTML(""); @@ -213,7 +213,7 @@ case "MODULES": // TOP10 module clicks if ((SQL_NUMROWS($guest_t10) > 0) || (SQL_NUMROWS($mem_t10) > 0)) { // Output footer - OUTPUT_HTML (" + OUTPUT_HTML("
".GUEST_TOPTEN_STATS."
".GUEST_TOP_GUEST_STATS."
".$title."   ".$clicks."
".GUEST_TOP_MEMBER_STATS."
".$title."   ".$clicks."
".$ltitle."
"); diff --git a/inc/modules/index.php b/inc/modules/index.php index f73e2c23f9..7a3af51f11 100644 --- a/inc/modules/index.php +++ b/inc/modules/index.php @@ -126,7 +126,7 @@ if (($CONFIG['guest_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) // Some advertising stuff? LOAD_TEMPLATE("guest_advert2"); - OUTPUT_HTML (" + OUTPUT_HTML(" "); // Goto TOP template diff --git a/inc/modules/login.php b/inc/modules/login.php index 47f34c07f4..5fa5aaf438 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -78,7 +78,7 @@ $BLOCK_MODE = false; LOAD_TEMPLATE("member_header"); // Adding your title's template here... -OUTPUT_HTML (" +OUTPUT_HTML(" "); // Adding the main content module here @@ -97,7 +97,7 @@ if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) ADD_MENU("member", GET_ACTION("member", $GLOBALS['what']), $GLOBALS['what']); } -OUTPUT_HTML (" +OUTPUT_HTML(" "); $INC_ACTION = sprintf(PATH."inc/modules/member/action-%s.php", $act); @@ -114,7 +114,7 @@ if ((file_exists($INC_ACTION)) && (is_readable($INC_ACTION)) && (VALIDATE_MENU_A if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) { - OUTPUT_HTML ("
+ OUTPUT_HTML("
"); @@ -123,7 +123,7 @@ if (($CONFIG['member_menu'] == 'Y') || (!EXT_IS_ACTIVE("sql_patches", true))) LOAD_TEMPLATE("member_advert"); } -OUTPUT_HTML (" +OUTPUT_HTML(" "); // Load same template for "Goto TOP" diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php index 1d34c43a0f..fbceeeb4da 100644 --- a/inc/modules/member/what-beg2.php +++ b/inc/modules/member/what-beg2.php @@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR("member", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // Autopurge installed? $LAST = "%s"; $ONLINE = ""; diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index e967ae56fc..00faebcc6b 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -49,7 +49,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR("member", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); if (GET_EXT_VERSION("bonus") >= "0.6.9") { diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php index 2d4643f8a7..b817a4bdf4 100644 --- a/inc/modules/member/what-nickname.php +++ b/inc/modules/member/what-nickname.php @@ -98,7 +98,7 @@ if ($VALID) // Do we have already submit the form? if (!empty($_POST['nickname'])) { - OUTPUT_HTML ("".NICKNAME_IS_INVALID."

"); + OUTPUT_HTML("".NICKNAME_IS_INVALID."

"); } // Load Template diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index fd306af3fb..ed6a17bead 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -782,19 +782,19 @@ LIMIT 1", array(bigintval($ucat)), __FILE__, __LINE__); else { // No mail types defined - OUTPUT_HTML ("".MEMBER_NO_PAYMENTS.""); + OUTPUT_HTML("".MEMBER_NO_PAYMENTS.""); } } else { // No points left! - OUTPUT_HTML ("".MEMBER_NO_POINTS.""); + OUTPUT_HTML("".MEMBER_NO_POINTS.""); } } else { // No cateogries are defined yet - OUTPUT_HTML ("".MEMBER_NO_CATS.""); + OUTPUT_HTML("".MEMBER_NO_CATS.""); } } elseif ($mmails == "0") diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php index 14a9597bc3..6a95c086fe 100644 --- a/inc/modules/member/what-rallyes.php +++ b/inc/modules/member/what-rallyes.php @@ -50,7 +50,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR("member", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // Check for possible running rallyes $ADMIN = " AND d.is_active='Y'"; @@ -147,6 +147,6 @@ if (SQL_NUMROWS($result) == 1) LOAD_TEMPLATE("guest_no_rallyes"); } // -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // ?> diff --git a/inc/modules/member/what-reflinks.php b/inc/modules/member/what-reflinks.php index 6b925bba1b..aa1ceba425 100644 --- a/inc/modules/member/what-reflinks.php +++ b/inc/modules/member/what-reflinks.php @@ -54,7 +54,7 @@ $result = SQL_QUERY_ESC("SELECT ref_clicks FROM "._MYSQL_PREFIX."_user_data WHER list($c) = SQL_FETCHROW($result); SQL_FREERESULT($result); -OUTPUT_HTML ("".YOUR_PERSONAL_REFLINK.":
+OUTPUT_HTML("".YOUR_PERSONAL_REFLINK.":
".URL."/ref.php?ref=".$GLOBALS['userid']."

"); @@ -66,20 +66,20 @@ if (EXT_IS_ACTIVE("nickname")) if (!empty($nick)) { // Display nickname link - OUTPUT_HTML (NICKNAME_YOUR_REFLINK.":
+ OUTPUT_HTML(NICKNAME_YOUR_REFLINK.":
".URL."/ref.php?ref=".$nick."

"); } else { // Display link to nickname form - OUTPUT_HTML ("".NO_NICKNAME_SET."
+ OUTPUT_HTML("".NO_NICKNAME_SET."
".PLEASE_CLICK_NICKNAME_FORM.""); } } // Clicks on your reflink -OUTPUT_HTML (YOUR_REFCLICKS.": ".$c." ".CLICKS."

"); +OUTPUT_HTML(YOUR_REFCLICKS.": ".$c." ".CLICKS."

"); $WHERE = " WHERE visible='Y'"; if (IS_ADMIN()) $WHERE = ""; $result = SQL_QUERY("SELECT id, url, alternate, counter, clicks FROM "._MYSQL_PREFIX."_refbanner", __FILE__, __LINE__); diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 0cc0be7d80..fdde08146f 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -234,44 +234,44 @@ case "new": // Start new transfer } // Transfer is completed - OUTPUT_HTML ("

"); + OUTPUT_HTML("

"); LOAD_TEMPLATE("admin_settings_saved", false, TRANSFER_COMPLETED."
".TRANSFER_CONTINUE_OVERVIEW.""); - OUTPUT_HTML ("

"); + OUTPUT_HTML("

"); } elseif (!$valid_code) { // Invalid Touring code! - OUTPUT_HTML ("

".TRANSFER_INVALID_CODE."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_CODE."

"); unset($_POST['ok']); } elseif (!$valid_pass) { // Wrong password entered - OUTPUT_HTML ("

".TRANSFER_INVALID_PASSWORD."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_PASSWORD."

"); unset($_POST['ok']); } elseif (!$valid_amount) { // Too much points entered - OUTPUT_HTML ("

".TRANSFER_INVALID_POINTS."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_POINTS."

"); unset($_POST['ok']); } elseif (!$valid_reason) { // No transfer reason entered - OUTPUT_HTML ("

".TRANSFER_INVALID_REASON."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_REASON."

"); unset($_POST['ok']); } elseif (!$valid_recipient) { // No recipient selected - OUTPUT_HTML ("

".TRANSFER_INVALID_RECIPIENT."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_RECIPIENT."

"); unset($_POST['ok']); } elseif (!$valid_data) { // No recipient selected - OUTPUT_HTML ("

".TRANSFER_INVALID_DATA."

"); + OUTPUT_HTML("

".TRANSFER_INVALID_DATA."

"); unset($_POST['ok']); } } @@ -588,7 +588,7 @@ case "": // Overview page $opt_in = $_POST['opt_in']; // "Settings saved..." - OUTPUT_HTML ("

".SETTINGS_SAVED."

"); + OUTPUT_HTML("

".SETTINGS_SAVED."

"); } switch ($opt_in) { diff --git a/inc/modules/member/what-welcome.php b/inc/modules/member/what-welcome.php index 9dc7e4c6cb..71787b967f 100644 --- a/inc/modules/member/what-welcome.php +++ b/inc/modules/member/what-welcome.php @@ -44,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) // Add description as navigation point ADD_DESCR ("member", basename(__FILE__)); -OUTPUT_HTML ("
"); +OUTPUT_HTML("
"); // Export data for template define('_LAST_ONLINE_VALUE', MAKE_DATETIME($LAST['online'])); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index ea9bff0ee3..593e21e029 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -280,14 +280,14 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) if ((!isset($DEPTH)) && (!$return)) { $DEPTH = "0"; - $PREFIX = "
".YOU_ARE_HERE." Home"; + $prefix = "
".YOU_ARE_HERE." Home"; } else { if (!$return) $DEPTH++; - $PREFIX = ""; + $prefix = ""; } - $PREFIX .= " -> "; + $prefix .= " -> "; if (ereg(".php", $search)) { $search = substr($search, 0, strpos($search, ".php")); @@ -306,7 +306,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($CONFIG['youre_here'] == 'Y')) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) { // Output HTML code - $OUT = $PREFIX."".$ret."\n"; + $OUT = $prefix."".$ret."\n"; //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n"; if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) { //* DEBUG: */ echo __LINE__."+".$type."+
\n"; @@ -343,7 +343,7 @@ function ADD_MENU($MODE, $act, $wht) //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; if (SQL_NUMROWS($result_main) > 0) { - OUTPUT_HTML (""); + OUTPUT_HTML("
"); // There are menus available, so we simply display them... :) while (list($main_title, $main_action) = SQL_FETCHROW($result_main)) { @@ -427,19 +427,19 @@ function ADD_MENU($MODE, $act, $wht) if ((file_exists($INC_BLOCK)) && (is_readable($INC_BLOCK))) { // Load include file - if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML (" + if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML(" + if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML(" "); } //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; } $main_cnt++; //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; - if (SQL_NUMROWS($result_main) > $main_cnt) OUTPUT_HTML (""); + if (SQL_NUMROWS($result_main) > $main_cnt) OUTPUT_HTML(""); } // Free memory @@ -447,7 +447,7 @@ function ADD_MENU($MODE, $act, $wht) // Close table //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; - OUTPUT_HTML ("
"); //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; include ($INC_BLOCK); //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n"; - if ((!EXT_IS_ACTIVE($main_action)) || ($main_action == "online")) OUTPUT_HTML ("
"); + OUTPUT_HTML(""); } } // This patched function will reduce many SELECT queries for the specified or current admin login @@ -569,7 +569,7 @@ function ADD_MAX_RECEIVE_LIST($MODE, $default="", $return=false) else { // Output directly (default) - OUTPUT_HTML ($OUT); + OUTPUT_HTML($OUT); } } // @@ -1531,7 +1531,7 @@ function META_DESCRIPTION($mod, $wht) // Exclude admin and member's area $DESCR = MAIN_TITLE." ".trim($CONFIG['title_middle'])." ".ADD_DESCR("guest", "what-".$wht, true); unset($DEPTH); - OUTPUT_HTML ("\n"); + OUTPUT_HTML("\n"); } } // diff --git a/inc/stylesheet.php b/inc/stylesheet.php index b63e94db6e..38e4e7cd8e 100644 --- a/inc/stylesheet.php +++ b/inc/stylesheet.php @@ -79,12 +79,12 @@ if (($CSS == "1") || ($CONFIG['css_php'] == "DIRECT")) switch ($CONFIG['css_php']) { case "DIRECT": - OUTPUT_HTML (""); + OUTPUT_HTML(""); break; case "FILE": $load = implode("", file($file)); - OUTPUT_HTML ($load); + OUTPUT_HTML($load); break; } } @@ -93,16 +93,16 @@ if (($CSS == "1") || ($CONFIG['css_php'] == "DIRECT")) else { // Now we load all CSS files from css.php! - OUTPUT_HTML (""); + OUTPUT_HTML("\">"); } // diff --git a/mailid_top.php b/mailid_top.php index a3f52f3601..6ba01b401e 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -330,28 +330,28 @@ if (defined('mxchange_installed') && (mxchange_installed)) break; } } - else OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (6)"); + else OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (6)"); } - else OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (5)"); + else OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (5)"); } - else OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (4)"); + else OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (4)"); } else { SQL_FREERESULT($result); - OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (3)"); + OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (3)"); } } else { SQL_FREERESULT($result); - OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (2)"); + OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (2)"); } } else { SQL_FREERESULT($result); - OUTPUT_HTML ("".MAIL_ALREADY_CONFIRMED." (1)"); + OUTPUT_HTML("".MAIL_ALREADY_CONFIRMED." (1)"); } if ($mode != "img") { -- 2.39.5