From 43918668518996fcf51f360bcd0d2690427d53a9 Mon Sep 17 00:00:00 2001 From: quix0r Date: Fri, 8 Jul 2011 03:25:03 +0000 Subject: [PATCH] More usage of EL code, no longer required checks removed: - More usage of EL code for messages generated from functions with one parameter - No longer needed checks for what/action script's own extension - TODOs.txt updated --- DOCS/TODOs.txt | 4 +-- inc/functions.php | 4 +-- inc/libs/register_functions.php | 2 +- inc/modules/admin/action-task.php | 5 --- inc/modules/admin/what-config_other.php | 6 ---- inc/modules/admin/what-config_yoomedia.php | 5 --- inc/modules/admin/what-list_beg.php | 2 +- inc/modules/admin/what-list_bonus.php | 2 +- inc/modules/admin/what-list_links.php | 2 +- inc/modules/admin/what-list_notifications.php | 2 +- inc/modules/admin/what-list_task.php | 9 ++--- inc/modules/admin/what-list_unconfirmed.php | 2 +- inc/modules/admin/what-list_user.php | 6 ---- inc/modules/admin/what-list_yoomedia_tm.php | 9 ++--- inc/modules/admin/what-send_bonus.php | 2 +- inc/modules/admin/what-theme_edit.php | 9 ++--- inc/modules/admin/what-theme_import.php | 33 ++++++++--------- inc/modules/guest/action- | 2 +- inc/modules/guest/action-themes.php | 2 +- inc/modules/guest/what-active.php | 2 +- inc/modules/guest/what-beg.php | 2 +- inc/modules/guest/what-confirm.php | 2 +- inc/modules/guest/what-doubler.php | 2 +- inc/modules/guest/what-login.php | 2 +- inc/modules/guest/what-mediadata.php | 4 +-- inc/modules/guest/what-rallyes.php | 2 +- inc/modules/guest/what-register.php | 4 +-- inc/modules/guest/what-sponsor_agb.php | 2 +- inc/modules/guest/what-sponsor_infos.php | 2 +- inc/modules/guest/what-sponsor_login.php | 2 +- inc/modules/guest/what-sponsor_reg.php | 2 +- inc/modules/guest/what-stats.php | 2 +- inc/modules/guest/what-top10.php | 3 +- inc/modules/guest/what-wernis_portal.php | 2 +- inc/modules/member/action- | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-coupon.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/modules/member/action-themes.php | 2 +- inc/modules/member/what- | 2 +- inc/modules/member/what-bank_create.php | 2 +- inc/modules/member/what-bank_deposit.php | 2 +- inc/modules/member/what-bank_infos.php | 2 +- inc/modules/member/what-bank_output.php | 2 +- inc/modules/member/what-bank_withdraw.php | 2 +- inc/modules/member/what-beg.php | 2 +- inc/modules/member/what-beg2.php | 2 +- inc/modules/member/what-bonus.php | 2 +- inc/modules/member/what-booking.php | 2 +- inc/modules/member/what-cash_coupon.php | 2 +- inc/modules/member/what-doubler.php | 2 +- inc/modules/member/what-holiday.php | 2 +- inc/modules/member/what-html_mail.php | 2 +- inc/modules/member/what-list_coupon.php | 2 +- inc/modules/member/what-mydata.php | 2 +- inc/modules/member/what-nickname.php | 2 +- inc/modules/member/what-order.php | 2 +- inc/modules/member/what-payout.php | 2 +- inc/modules/member/what-points.php | 2 +- inc/modules/member/what-primera.php | 2 +- inc/modules/member/what-rallyes.php | 2 +- inc/modules/member/what-refback.php | 2 +- inc/modules/member/what-sponsor_list.php | 2 +- inc/modules/member/what-support.php | 2 +- inc/modules/member/what-surfbar_book.php | 2 +- inc/modules/member/what-surfbar_list.php | 2 +- inc/modules/member/what-surfbar_start.php | 2 +- inc/modules/member/what-surfbar_stats.php | 2 +- inc/modules/member/what-themes.php | 35 ++++++++++--------- inc/modules/member/what-transfer.php | 2 +- inc/modules/member/what-wernis.php | 2 +- inc/modules/order.php | 2 +- inc/modules/sponsor.php | 2 +- inc/modules/sponsor/.php | 2 +- inc/modules/sponsor/account.php | 2 +- inc/modules/sponsor/guest.php | 2 +- inc/modules/sponsor/logout.php | 2 +- inc/modules/sponsor/settings.php | 2 +- inc/modules/sponsor/welcome.php | 2 +- 80 files changed, 118 insertions(+), 150 deletions(-) diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 605bc0690f..b794024348 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -142,8 +142,8 @@ ./inc/modules/admin/what-list_refs.php:107: // @TODO Try to rewrite some to EL ./inc/modules/admin/what-list_unconfirmed.php:107: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus ./inc/modules/admin/what-list_unconfirmed.php:84: // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--ADMIN_LIST_UNCONFIRMED_BONUS_LINKS--}'); -./inc/modules/admin/what-list_user.php:257: // @TODO Rewrite this into a filter -./inc/modules/admin/what-list_user.php:300: // @TODO Rewrite this into a filter +./inc/modules/admin/what-list_user.php:251: // @TODO Rewrite this into a filter +./inc/modules/admin/what-list_user.php:294: // @TODO Rewrite this into a filter ./inc/modules/admin/what-logs.php:64: // @TODO Fix content-type here ./inc/modules/admin/what-logs.php:70: // @TODO Fix content-type here ./inc/modules/admin/what-mem_add.php:124: // @TODO This can be somehow rewritten to a function diff --git a/inc/functions.php b/inc/functions.php index 72bb5460e2..ba6ccc3710 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -1207,13 +1207,13 @@ function getMessageFromErrorCode ($code) { if (isExtensionActive('mailid', true)) { $message = '{--ERROR_CONFIRMING_MAIL--}'; } else { - $message = generateExtensionInactiveNotInstalledMessage('mailid'); + $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}'; } break; case getCode('EXTENSION_PROBLEM'): if (isGetRequestParameterSet('ext')) { - $message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext')); + $message = '{%pipe,generateExtensionInactiveNotInstalledMessage=' . getRequestParameter('ext') . '%}'; } else { $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}'; } diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 21db407cb6..5bf3cdbb91 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -293,7 +293,7 @@ function doRegistration () { if (isExtensionInstalledAndNewer('theme', '0.0.8')) { // Okay, add design here $GLOBALS['register_sql_columns'] .= ', `curr_theme`'; - $GLOBALS['register_sql_data'] .= ", '" . getCurrentTheme() . "'"; + $GLOBALS['register_sql_data'] .= ", '{%pipe,getCurrentTheme%}'"; } // END - if // Check if I shall disable sending mail to newly registered members out about active/begging rallye diff --git a/inc/modules/admin/action-task.php b/inc/modules/admin/action-task.php index 1716b20c47..710d2ad860 100644 --- a/inc/modules/admin/action-task.php +++ b/inc/modules/admin/action-task.php @@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('task')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('task')); - return; -} // END - if - // Load the include file $inc = sprintf("inc/modules/admin/what-%s.php", getWhat()); if (isIncludeReadable($inc)) { diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php index 4f79de60ff..c1a24294b8 100644 --- a/inc/modules/admin/what-config_other.php +++ b/inc/modules/admin/what-config_other.php @@ -43,12 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('other')) { - // Missing extension! - displayMessage(generateExtensionInactiveNotInstalledMessage('other')); - return; -} // END - if - // Stop saving data if one input field is !isset if (isFormSent()) { // Calculate stamps and set calculated stamps diff --git a/inc/modules/admin/what-config_yoomedia.php b/inc/modules/admin/what-config_yoomedia.php index f911b3d184..831b21ae5d 100644 --- a/inc/modules/admin/what-config_yoomedia.php +++ b/inc/modules/admin/what-config_yoomedia.php @@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('yoomedia')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia')); - return; -} // END - if - // Was the form submitted? if (isFormSent()) { // Test Yoo!Media config diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index cad194c34a..459ea16c3b 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -122,7 +122,7 @@ ORDER BY if (isExtensionActive('autopurge')) { $content['autopurge_timeout'] = generateDateTime(time() - getApInactiveSince(), 2); } else { - $content['autopurge_timeout'] = displayMessage(generateExtensionInactiveNotInstalledMessage('autopurge'), true); + $content['autopurge_timeout'] = displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}', true); } // Load final template diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index da8b9ba4f8..eb22173578 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -134,7 +134,7 @@ ORDER BY if (isExtensionActive('autopurge')) { $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}'; } else { - $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge'); + $content['autopurge_timeout'] = '{%pipe,generateExtensionInactiveNotInstalledMessage=autopurge%}'; } // Load final template diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php index 13f3f973af..c337642ab1 100644 --- a/inc/modules/admin/what-list_links.php +++ b/inc/modules/admin/what-list_links.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); if (!isExtensionActive('mailid')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('mailid')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}'); return; } // END - if diff --git a/inc/modules/admin/what-list_notifications.php b/inc/modules/admin/what-list_notifications.php index 73ef864cd1..62f575b9e6 100644 --- a/inc/modules/admin/what-list_notifications.php +++ b/inc/modules/admin/what-list_notifications.php @@ -67,7 +67,7 @@ ORDER BY $result_max = SQL_QUERY($SQL2, __FILE__, __LINE__); } else { // Bonus extension required! - displayMessage(generateExtensionInactiveNotInstalledMessage('bonus')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}'); } // Create limitation line diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php index c2194ec323..b2c97da360 100644 --- a/inc/modules/admin/what-list_task.php +++ b/inc/modules/admin/what-list_task.php @@ -43,13 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('task')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('task')); - return; -} // END - if - $whereStatement = ''; -if (!isGetRequestParameterSet('type')) setGetRequestParameter('type', 'your'); +if (!isGetRequestParameterSet('type')) { + setGetRequestParameter('type', 'your'); +} // END - if switch (getRequestParameter('type')) { case 'your': // List only your own open (new) tasks diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 5add439d21..bd1b932e2b 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); if (!isExtensionActive('mailid')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('mailid')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mailid%}'); return; } // END - if diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index 36fc44e79c..1ba71b686e 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -43,12 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if ((!isExtensionInstalled('user')) || (!isExtensionActive('user'))) { - // Missing extension! - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); - return; -} // END - if - // Init variables $MORE = ''; $colspan = 4; diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php index 64e47cab93..5f4b295e5d 100644 --- a/inc/modules/admin/what-list_yoomedia_tm.php +++ b/inc/modules/admin/what-list_yoomedia_tm.php @@ -42,13 +42,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('yoomedia')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('yoomedia')); +if (!isExtensionActive('bonus')) { + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}'); return; -} elseif (!isExtensionActive('bonus')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bonus')); - return; -} +} // END - if // Do actions here if (isFormSent()) { diff --git a/inc/modules/admin/what-send_bonus.php b/inc/modules/admin/what-send_bonus.php index 20514fd4ac..2f083fdf10 100644 --- a/inc/modules/admin/what-send_bonus.php +++ b/inc/modules/admin/what-send_bonus.php @@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); if (!isExtensionActive('order')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('order')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}'); return; } // END - if diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php index c90166a3c5..6f761b2450 100644 --- a/inc/modules/admin/what-theme_edit.php +++ b/inc/modules/admin/what-theme_edit.php @@ -43,11 +43,6 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { // Add description as navigation point addYouAreHereLink('admin', __FILE__); -if (!isExtensionActive('theme')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('theme')); - return; -} // END - if - // Check for selected themes if (ifPostContainsSelections()) { $OUT = ''; @@ -124,7 +119,9 @@ if (!SQL_HASZERONUMS($result)) { // Is the loaded theme name != current theme name? $content['link'] = $content['theme_path']; - if ($content['theme_path'] != getCurrentTheme()) $content['link'] = '' . $content['theme_path'] . ''; + if ($content['theme_path'] != getCurrentTheme()) { + $content['link'] = '' . $content['theme_path'] . ''; + } // END - if // Prepare data for the row template $content['email'] = ' array(), // Unix name from filesystem 'theme_name' => array(), // Title 'theme_author' => array(), // Theme author's name @@ -112,20 +107,20 @@ foreach ($includes as $inc) { loadInclude($inc); // Add found theme to array - $THEMES['theme_unix'][] = $dir; - $THEMES['theme_name'][] = $GLOBALS['theme_data']['name']; - $THEMES['theme_author'][] = $GLOBALS['theme_data']['author']; - $THEMES['theme_email'][] = $GLOBALS['theme_data']['email']; - $THEMES['theme_url'][] = $GLOBALS['theme_data']['url']; - $THEMES['theme_version'][] = $GLOBALS['theme_data']['version']; + $themes['theme_unix'][] = $dir; + $themes['theme_name'][] = $GLOBALS['theme_data']['name']; + $themes['theme_author'][] = $GLOBALS['theme_data']['author']; + $themes['theme_email'][] = $GLOBALS['theme_data']['email']; + $themes['theme_url'][] = $GLOBALS['theme_data']['url']; + $themes['theme_version'][] = $GLOBALS['theme_data']['version']; } // END - while // Sort array by Uni* name -array_pk_sort($THEMES, array('theme_name')); +array_pk_sort($themes, array('theme_name')); // Generate output lines for the template $OUT = ''; -foreach ($THEMES['theme_unix'] as $key => $unix) { +foreach ($themes['theme_unix'] as $key => $unix) { // Already installed is default $formContent = '
{%message,ADMIN_THEME_ALREADY_INSTALLED=' . $unix . '%}
'; @@ -138,11 +133,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { // Prepare content $content = array( 'unix' => $unix, - 'theme_name' => $THEMES['theme_name'][$key], - 'theme_email' => $THEMES['theme_email'][$key], - 'theme_author' => $THEMES['theme_author'][$key], - 'theme_url' => $THEMES['theme_url'][$key], - 'theme_version' => $THEMES['theme_version'][$key], + 'theme_name' => $themes['theme_name'][$key], + 'theme_email' => $themes['theme_email'][$key], + 'theme_author' => $themes['theme_author'][$key], + 'theme_url' => $themes['theme_url'][$key], + 'theme_version' => $themes['theme_version'][$key], 'form_content' => $formContent ); diff --git a/inc/modules/guest/action- b/inc/modules/guest/action- index 840262730f..ff7b1c2f41 100644 --- a/inc/modules/guest/action- +++ b/inc/modules/guest/action- @@ -47,7 +47,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}'); return; } diff --git a/inc/modules/guest/action-themes.php b/inc/modules/guest/action-themes.php index 4733e5f45a..998d08471f 100644 --- a/inc/modules/guest/action-themes.php +++ b/inc/modules/guest/action-themes.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { } if ((!isExtensionActive('theme')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('theme')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}'); return; } // END - if diff --git a/inc/modules/guest/what-active.php b/inc/modules/guest/what-active.php index a0075a13c9..d4e951dc20 100644 --- a/inc/modules/guest/what-active.php +++ b/inc/modules/guest/what-active.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('active')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('active')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=active%}'); return; } // END - if diff --git a/inc/modules/guest/what-beg.php b/inc/modules/guest/what-beg.php index 06d0321683..4e4ee7333d 100644 --- a/inc/modules/guest/what-beg.php +++ b/inc/modules/guest/what-beg.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('beg')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('beg')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}'); return; } // END - if diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 9437acbf4c..7c45f008c2 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('user')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); return; } // END - if diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php index c185800cc8..7523568f4d 100644 --- a/inc/modules/guest/what-doubler.php +++ b/inc/modules/guest/what-doubler.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('doubler')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('doubler')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=doubler%}'); return; } // END - if diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index 8d4abf712d..3cad847ee1 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('user')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); return; } // END - if diff --git a/inc/modules/guest/what-mediadata.php b/inc/modules/guest/what-mediadata.php index 577b030c75..be3ef309c4 100644 --- a/inc/modules/guest/what-mediadata.php +++ b/inc/modules/guest/what-mediadata.php @@ -45,10 +45,10 @@ addYouAreHereLink('guest', __FILE__); // Both ext-mediadata and ext-user must be there if ((!isExtensionActive('mediadata')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('mediadata')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mediadata%}'); return; } elseif ((!isExtensionActive('user')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); return; } diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index 50760250e4..7a47b42e70 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('rallye')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('rallye')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}'); return; } // END - if diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 6050874d19..5016b33538 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -44,10 +44,10 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if (!isExtensionActive('register')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('register')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=register%}'); return; } elseif (!isExtensionActive('country')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('country')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=country%}'); return; } diff --git a/inc/modules/guest/what-sponsor_agb.php b/inc/modules/guest/what-sponsor_agb.php index bea40fcc1f..aca880d3dd 100644 --- a/inc/modules/guest/what-sponsor_agb.php +++ b/inc/modules/guest/what-sponsor_agb.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('sponsor'))) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } // END - if diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php index 089f83de14..cb394bdd9f 100644 --- a/inc/modules/guest/what-sponsor_infos.php +++ b/inc/modules/guest/what-sponsor_infos.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('sponsor'))) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } // END - if diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index 1f09c0a3e7..f81b710249 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('sponsor'))) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (isSponsor()) { // Is already a logged-in sponsor diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 9dd8629eb3..5242b16023 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('sponsor'))) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } // END - if diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index ca20611192..77e54c93bd 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -45,7 +45,7 @@ addYouAreHereLink('guest', __FILE__); // This part only works if ext-user is active if ((!isExtensionActive('user')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); return; } // END - if diff --git a/inc/modules/guest/what-top10.php b/inc/modules/guest/what-top10.php index 863ff62ae6..3435584416 100644 --- a/inc/modules/guest/what-top10.php +++ b/inc/modules/guest/what-top10.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('top10')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('top10')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=top10%}'); return; } // END - if @@ -122,6 +122,7 @@ LIMIT {?top10_max?}", __FILE__, __LINE__); $OUT = ''; $count = 1; while ($content = SQL_FETCHARRAY($result)) { // Prepare data for template + $content['cnt'] = $count; $content['last_online'] = generateDateTime($content['last_online'], '3'); // Load row template diff --git a/inc/modules/guest/what-wernis_portal.php b/inc/modules/guest/what-wernis_portal.php index 813425e464..dd8fe7e88f 100644 --- a/inc/modules/guest/what-wernis_portal.php +++ b/inc/modules/guest/what-wernis_portal.php @@ -47,7 +47,7 @@ loadIncludeOnce('inc/classes/rdf.class.php'); addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('wernis')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('wernis')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=wernis%}'); return; } // END - if diff --git a/inc/modules/member/action- b/inc/modules/member/action- index e528dfc985..eaab958c97 100644 --- a/inc/modules/member/action- +++ b/inc/modules/member/action- @@ -49,7 +49,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}'); return; } // END - if diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php index 542012af60..27b02f256c 100644 --- a/inc/modules/member/action-bank.php +++ b/inc/modules/member/action-bank.php @@ -49,7 +49,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } // END - if diff --git a/inc/modules/member/action-coupon.php b/inc/modules/member/action-coupon.php index 20ea631c0a..7edf01ff4d 100644 --- a/inc/modules/member/action-coupon.php +++ b/inc/modules/member/action-coupon.php @@ -49,7 +49,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('coupon')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('coupon')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}'); return; } // END - if diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php index 16654635f6..f50a87f8f4 100644 --- a/inc/modules/member/action-order.php +++ b/inc/modules/member/action-order.php @@ -49,7 +49,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('order')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('order')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}'); return; } // END - if diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php index dcaeb51492..0b5743fa44 100644 --- a/inc/modules/member/action-surfbar.php +++ b/inc/modules/member/action-surfbar.php @@ -49,7 +49,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('surfbar')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}'); return; } // END - if diff --git a/inc/modules/member/action-themes.php b/inc/modules/member/action-themes.php index 9a725b1672..7313a94653 100644 --- a/inc/modules/member/action-themes.php +++ b/inc/modules/member/action-themes.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { } if ((!isExtensionActive('theme')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('theme')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}'); return; } // END - if diff --git a/inc/modules/member/what- b/inc/modules/member/what- index 71eb76f229..cb2169a6b0 100644 --- a/inc/modules/member/what- +++ b/inc/modules/member/what- @@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__); // Continue only if the proper extension is active (admins can always continue) if ((!isExtensionActive('')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=%}'); return; } // END - if diff --git a/inc/modules/member/what-bank_create.php b/inc/modules/member/what-bank_create.php index a15af144d5..bf00bd096d 100644 --- a/inc/modules/member/what-bank_create.php +++ b/inc/modules/member/what-bank_create.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } // END - if diff --git a/inc/modules/member/what-bank_deposit.php b/inc/modules/member/what-bank_deposit.php index d78bd5454a..cf9497ed3c 100644 --- a/inc/modules/member/what-bank_deposit.php +++ b/inc/modules/member/what-bank_deposit.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } // END - if diff --git a/inc/modules/member/what-bank_infos.php b/inc/modules/member/what-bank_infos.php index 5c019a242b..7a1bb0060e 100644 --- a/inc/modules/member/what-bank_infos.php +++ b/inc/modules/member/what-bank_infos.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } diff --git a/inc/modules/member/what-bank_output.php b/inc/modules/member/what-bank_output.php index a15af144d5..bf00bd096d 100644 --- a/inc/modules/member/what-bank_output.php +++ b/inc/modules/member/what-bank_output.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } // END - if diff --git a/inc/modules/member/what-bank_withdraw.php b/inc/modules/member/what-bank_withdraw.php index 5c019a242b..7a1bb0060e 100644 --- a/inc/modules/member/what-bank_withdraw.php +++ b/inc/modules/member/what-bank_withdraw.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bank')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bank')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bank%}'); return; } diff --git a/inc/modules/member/what-beg.php b/inc/modules/member/what-beg.php index 9afb697d6f..0bc948f7ec 100644 --- a/inc/modules/member/what-beg.php +++ b/inc/modules/member/what-beg.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('beg')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('beg')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}'); return; } // END - if diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php index 78285c2ca1..d41f5964f5 100644 --- a/inc/modules/member/what-beg2.php +++ b/inc/modules/member/what-beg2.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('beg')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('beg')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=beg%}'); return; } // END - if diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index 0850e12853..21c07396ff 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('bonus')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('bonus')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=bonus%}'); return; } // END - if diff --git a/inc/modules/member/what-booking.php b/inc/modules/member/what-booking.php index 210450fbfd..0b28f4d24b 100644 --- a/inc/modules/member/what-booking.php +++ b/inc/modules/member/what-booking.php @@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__); // Continue only if the proper extension is active (admins can always continue) if ((!isExtensionActive('booking')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('booking')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=booking%}'); return; } // END - if diff --git a/inc/modules/member/what-cash_coupon.php b/inc/modules/member/what-cash_coupon.php index ebc427f4f7..3e538b9aa2 100644 --- a/inc/modules/member/what-cash_coupon.php +++ b/inc/modules/member/what-cash_coupon.php @@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__); // Continue only if the proper extension is active (admins can always continue) if ((!isExtensionActive('coupon')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('coupon')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}'); return; } // END - if diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php index 45f5512c68..44e0a9eee9 100644 --- a/inc/modules/member/what-doubler.php +++ b/inc/modules/member/what-doubler.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('doubler')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('doubler')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=doubler%}'); return; } // END - if diff --git a/inc/modules/member/what-holiday.php b/inc/modules/member/what-holiday.php index 2583ca37a0..c5d648bd9a 100644 --- a/inc/modules/member/what-holiday.php +++ b/inc/modules/member/what-holiday.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('holiday')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('holiday')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=holiday%}'); return; } // END - if diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php index c00badbd45..aec4b2c5f9 100644 --- a/inc/modules/member/what-html_mail.php +++ b/inc/modules/member/what-html_mail.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('html_mail')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('html_mail')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=html_mail%}'); return; } // END - if diff --git a/inc/modules/member/what-list_coupon.php b/inc/modules/member/what-list_coupon.php index cbba7c7f34..57563750dc 100644 --- a/inc/modules/member/what-list_coupon.php +++ b/inc/modules/member/what-list_coupon.php @@ -47,7 +47,7 @@ addYouAreHereLink('member', __FILE__); // Continue only if the proper extension is active (admins can always continue) if ((!isExtensionActive('coupon')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('coupon')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=coupon%}'); return; } // END - if diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 4e958f7ac0..39b6d3f0a9 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('mydata')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('mydata')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=mydata%}'); return; } // END - if diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php index 96df72550d..f3b1485269 100644 --- a/inc/modules/member/what-nickname.php +++ b/inc/modules/member/what-nickname.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('nickname')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('nickname')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=nickname%}'); return; } // END - if diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php index f6ed2dd996..bcaece4fec 100644 --- a/inc/modules/member/what-order.php +++ b/inc/modules/member/what-order.php @@ -44,7 +44,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('order')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('order')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}'); return; } // END - if diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php index 280912e15a..1a3811e04e 100644 --- a/inc/modules/member/what-payout.php +++ b/inc/modules/member/what-payout.php @@ -48,7 +48,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('payout')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('payout')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=payout%}'); return; } // END - if diff --git a/inc/modules/member/what-points.php b/inc/modules/member/what-points.php index a9e39378d6..3362d432df 100644 --- a/inc/modules/member/what-points.php +++ b/inc/modules/member/what-points.php @@ -167,7 +167,7 @@ if (isExtensionActive('user')) { loadTemplate('member_points', false, $content); } elseif (isAdmin()) { // Missing extension - displayMessage(generateExtensionInactiveNotInstalledMessage('user')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=user%}'); } else { // Message for user displayMessage('{--PROBLEM_POINTS_OVERVIEW_UNAVAILABLE--}'); diff --git a/inc/modules/member/what-primera.php b/inc/modules/member/what-primera.php index ca079da54a..684bd1e2c3 100644 --- a/inc/modules/member/what-primera.php +++ b/inc/modules/member/what-primera.php @@ -48,7 +48,7 @@ addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('primera')) && (!isAdmin())) { // Extension 'primera' is not activated - displayMessage(generateExtensionInactiveNotInstalledMessage('primera')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=primera%}'); return; } // END - if diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php index 40591fb49c..88bf9bb768 100644 --- a/inc/modules/member/what-rallyes.php +++ b/inc/modules/member/what-rallyes.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('rallye')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('rallye')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}'); return; } // END - if diff --git a/inc/modules/member/what-refback.php b/inc/modules/member/what-refback.php index ee2afa4f87..1e431f4fb9 100644 --- a/inc/modules/member/what-refback.php +++ b/inc/modules/member/what-refback.php @@ -53,7 +53,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('refback')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('refback')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=refback%}'); return; } // END - if diff --git a/inc/modules/member/what-sponsor_list.php b/inc/modules/member/what-sponsor_list.php index 0677350616..1a2cd463a7 100644 --- a/inc/modules/member/what-sponsor_list.php +++ b/inc/modules/member/what-sponsor_list.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('sponsor')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } // END - if diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php index 31642af3c4..a7066b1426 100644 --- a/inc/modules/member/what-support.php +++ b/inc/modules/member/what-support.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('support')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('support')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=support%}'); return; } // END - if diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php index f7dd0aa465..e428c713c5 100644 --- a/inc/modules/member/what-surfbar_book.php +++ b/inc/modules/member/what-surfbar_book.php @@ -47,7 +47,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('surfbar')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}'); return; } // END - if diff --git a/inc/modules/member/what-surfbar_list.php b/inc/modules/member/what-surfbar_list.php index 46474d6656..6d17f2560f 100644 --- a/inc/modules/member/what-surfbar_list.php +++ b/inc/modules/member/what-surfbar_list.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('surfbar')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}'); return; } // END - if diff --git a/inc/modules/member/what-surfbar_start.php b/inc/modules/member/what-surfbar_start.php index c721627d3c..bf720d7bad 100644 --- a/inc/modules/member/what-surfbar_start.php +++ b/inc/modules/member/what-surfbar_start.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('surfbar')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}'); return; } // END - if diff --git a/inc/modules/member/what-surfbar_stats.php b/inc/modules/member/what-surfbar_stats.php index b4eebd6769..76170db60c 100644 --- a/inc/modules/member/what-surfbar_stats.php +++ b/inc/modules/member/what-surfbar_stats.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('surfbar')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('surfbar')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=surfbar%}'); return; } // END - if diff --git a/inc/modules/member/what-themes.php b/inc/modules/member/what-themes.php index 20d74a441e..0dad311230 100644 --- a/inc/modules/member/what-themes.php +++ b/inc/modules/member/what-themes.php @@ -46,14 +46,17 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('theme')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('theme')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=theme%}'); return; } // END - if if (isPostRequestParameterSet('member_theme')) { // Save theme to member's profile SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `curr_theme`='%s' WHERE `userid`=%s LIMIT 1", - array(postRequestParameter('member_theme'), getMemberId()), __FILE__, __LINE__); + array( + postRequestParameter('member_theme'), + getMemberId() + ), __FILE__, __LINE__); // Set new theme for guests $newTheme = SQL_ESCAPE(postRequestParameter('member_theme')); @@ -66,7 +69,7 @@ if (isPostRequestParameterSet('member_theme')) { } // END - if // Initialize array -$THEMES = array( +$themes = array( 'theme_unix' => array(), // Unix name from filesystem 'theme_name' => array(), // Title 'theme_author' => array(), // Theme author's name @@ -89,12 +92,12 @@ foreach ($includes as $inc) { loadInclude($inc); // Add found theme to array - $THEMES['theme_unix'][] = $dir; - $THEMES['theme_name'][] = $GLOBALS['theme_data']['name']; - $THEMES['theme_author'][] = $GLOBALS['theme_data']['author']; - $THEMES['theme_email'][] = $GLOBALS['theme_data']['email']; - $THEMES['theme_url'][] = $GLOBALS['theme_data']['url']; - $THEMES['theme_version'][] = $GLOBALS['theme_data']['version']; + $themes['theme_unix'][] = $dir; + $themes['theme_name'][] = $GLOBALS['theme_data']['name']; + $themes['theme_author'][] = $GLOBALS['theme_data']['author']; + $themes['theme_email'][] = $GLOBALS['theme_data']['email']; + $themes['theme_url'][] = $GLOBALS['theme_data']['url']; + $themes['theme_version'][] = $GLOBALS['theme_data']['version']; } // END - if } // END - while @@ -102,11 +105,11 @@ foreach ($includes as $inc) { unset($GLOBALS['theme_data']); // Sort array by Uni* name -array_pk_sort($THEMES, array('theme_name')); +array_pk_sort($themes, array('theme_name')); // Generate output lines for the template $OUT = ''; -foreach ($THEMES['theme_unix'] as $key => $unix) { +foreach ($themes['theme_unix'] as $key => $unix) { $default = ''; if (getCurrentTheme() == $unix) { $default = ' checked="checked"'; @@ -116,11 +119,11 @@ foreach ($THEMES['theme_unix'] as $key => $unix) { $content = array( 'unix' => $unix, 'default' => $default, - 'theme_name' => $THEMES['theme_name'][$key], - 'theme_email' => $THEMES['theme_email'][$key], - 'theme_author' => $THEMES['theme_author'][$key], - 'theme_url' => $THEMES['theme_url'][$key], - 'theme_version' => $THEMES['theme_version'][$key] + 'theme_name' => $themes['theme_name'][$key], + 'theme_email' => $themes['theme_email'][$key], + 'theme_author' => $themes['theme_author'][$key], + 'theme_url' => $themes['theme_url'][$key], + 'theme_version' => $themes['theme_version'][$key] ); // Load row template diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index 03231df4cc..45c272e081 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -46,7 +46,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('transfer')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('transfer')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=transfer%}'); return; } // END - if diff --git a/inc/modules/member/what-wernis.php b/inc/modules/member/what-wernis.php index af105f761c..9ea20c2112 100644 --- a/inc/modules/member/what-wernis.php +++ b/inc/modules/member/what-wernis.php @@ -47,7 +47,7 @@ if (!defined('__SECURITY')) { addYouAreHereLink('member', __FILE__); if ((!isExtensionActive('wernis')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('wernis')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=wernis%}'); return; } // END - if diff --git a/inc/modules/order.php b/inc/modules/order.php index e47f21b2c7..c491d07983 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -40,7 +40,7 @@ $url = ''; if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('order')) && (!isAdmin())) { - displayMessage(generateExtensionInactiveNotInstalledMessage('order')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=order%}'); return; } elseif (!isMember()) { // Sorry, no guest access! diff --git a/inc/modules/sponsor.php b/inc/modules/sponsor.php index ce813aa415..2ccd61cfdb 100644 --- a/inc/modules/sponsor.php +++ b/inc/modules/sponsor.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('sponsor'))) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/.php b/inc/modules/sponsor/.php index 03310a253a..d1b27bc96e 100644 --- a/inc/modules/sponsor/.php +++ b/inc/modules/sponsor/.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('sponsor'))) { - addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor')); + addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index 8e98ea28f5..b5680854fc 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { die(); } elseif (!isExtensionActive('sponsor')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/guest.php b/inc/modules/sponsor/guest.php index ec30ef8a35..1c987a8a3a 100644 --- a/inc/modules/sponsor/guest.php +++ b/inc/modules/sponsor/guest.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('sponsor'))) { - addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor')); + addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/logout.php b/inc/modules/sponsor/logout.php index 55f1415775..5a5857ab88 100644 --- a/inc/modules/sponsor/logout.php +++ b/inc/modules/sponsor/logout.php @@ -38,7 +38,7 @@ if (!defined('__SECURITY')) { die(); } elseif ((!isExtensionActive('sponsor'))) { - addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor')); + addFatalMessage(__FILE__, __LINE__, '{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index f71ee51a3b..673718a23e 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { die(); } elseif (!isExtensionActive('sponsor')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php index a740df3933..e4b71d0530 100644 --- a/inc/modules/sponsor/welcome.php +++ b/inc/modules/sponsor/welcome.php @@ -39,7 +39,7 @@ if (!defined('__SECURITY')) { die(); } elseif (!isExtensionActive('sponsor')) { - displayMessage(generateExtensionInactiveNotInstalledMessage('sponsor')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=sponsor%}'); return; } elseif (!isSponsor()) { // No sponsor! -- 2.39.2