From: quix0r Date: Mon, 28 Jun 2010 09:04:42 +0000 (+0000) Subject: Next wave of lesser getMessage() usage and more EL X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=80c4d572aeea86286b6e1db8b845f46813b478c5;p=mailer.git Next wave of lesser getMessage() usage and more EL --- diff --git a/DOCS/lint.sh b/DOCS/lint.sh new file mode 100755 index 0000000000..2f79ca40f5 --- /dev/null +++ b/DOCS/lint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +echo "$0: Analysing PHP script for syntax errors (lint) ..." +LINT=`find -name "*.php" -exec php -l -f {} 2>&1 \; | grep -v "No syntax errors detected in"` + +if test "${LINT}" != ""; then + echo "${LINT}" +else + echo "$0: No syntax errors found." +fi diff --git a/birthday_confirm.php b/birthday_confirm.php index b06b0c71d1..157a035837 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.php @@ -112,7 +112,7 @@ if (SQL_NUMROWS($result) == 1) { } } else { // Cannot load data! - $content['message'] = getMessage('BIRTHDAY_CANNOT_LOAD_DATA'); + $content['message'] = '{--BIRTHDAY_CANNOT_LOAD_DATA--}'; } // Free memory diff --git a/doubler.php b/doubler.php index f53908359a..f8acd23ae9 100644 --- a/doubler.php +++ b/doubler.php @@ -131,39 +131,39 @@ if (isFormSent()) { $content['message'] = loadTemplate('doubler_reflink', true, postRequestParameter('userid')); } else { // Not enougth points left - $content['message'] = getMessage('DOUBLER_FORM_NO_POINTS_LEFT'); + $content['message'] = '{--DOUBLER_FORM_NO_POINTS_LEFT--}'; } } elseif (getUserData('status') == 'CONFIRMED') { // Account is unconfirmed! - $content['message'] = getMessage('DOUBLER_FORM_WRONG_PASS'); + $content['message'] = '{--DOUBLER_FORM_WRONG_PASS--}'; } elseif (getUserData('status') == 'UNCONFIRMED') { // Account is unconfirmed! - $content['message'] = getMessage('DOUBLER_FORM_STATUS_UNCONFIRMED'); + $content['message'] = '{--DOUBLER_FORM_STATUS_UNCONFIRMED--}'; } elseif (getUserData('status') == 'LOCKED') { // Account is locked by admin / holiday! - $content['message'] = getMessage('DOUBLER_FORM_STATUS_LOCKED'); + $content['message'] = '{--DOUBLER_FORM_STATUS_LOCKED--}'; } elseif (postRequestParameter('points') < getConfig('doubler_min')) { // Not enougth points entered - $content['message'] = getMessage('DOUBLER_FORM_POINTS_MIN'); + $content['message'] = '{--DOUBLER_FORM_POINTS_MIN--}'; } elseif (postRequestParameter('points') > getConfig('doubler_max')) { // Too much points entered - $content['message'] = getMessage('DOUBLER_FORM_POINTS_MAX'); + $content['message'] = '{--DOUBLER_FORM_POINTS_MAX--}'; } elseif (isNickNameUsed(postRequestParameter('userid'))) { // Cannot resolv nickname -> userid - $content['message'] = getMessage('DOUBLER_FORM_404_NICKNAME'); + $content['message'] = '{--DOUBLER_FORM_404_NICKNAME--}'; } else { // Wrong password or account not found - $content['message'] = getMessage('DOUBLER_FORM_404_MEMBER'); + $content['message'] = '{--DOUBLER_FORM_404_MEMBER--}'; } } elseif (!isPostRequestParameterSet('userid')) { // Login not entered - $content['message'] = getMessage('DOUBLER_FORM_404_LOGIN'); + $content['message'] = '{--DOUBLER_FORM_404_LOGIN--}'; } elseif (!isPostRequestParameterSet('pass')) { // Password not entered - $content['message'] = getMessage('DOUBLER_FORM_404_PASSWORD'); + $content['message'] = '{--DOUBLER_FORM_404_PASSWORD--}'; } elseif (!isPostRequestParameterSet('points')) { // points not entered - $content['message'] = getMessage('DOUBLER_FORM_404_POINTS'); + $content['message'] = '{--DOUBLER_FORM_404_POINTS--}'; } } // END - if (isFormSet()) @@ -191,14 +191,14 @@ if (isUserDataValid()) { // Text "Enter login" if (isExtensionActive('nickname')) { // Choose login/nickname - $content['enter_login'] = getMessage('GUEST_ENTER_LOGIN_NICKNAME'); + $content['enter_login'] = '{--GUEST_ENTER_LOGIN_NICKNAME--}'; } else { // Simple login id - $content['enter_login'] = getMessage('GUEST_ENTER_LOGIN'); + $content['enter_login'] = '{--GUEST_ENTER_LOGIN--}'; } // Which mail-send-mode did the admin setup? -$content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode')); +$content['payout_time'] = '{--DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode') . '--}'; // Generate table with already payed out doubles $content['payout_history'] = generateDoublerTable(0, 'Y', 'N', 'DESC'); diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index 8c52528550..22c40b3587 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -724,7 +724,7 @@ function addExtensionVerboseSqlTable ($title = '', $dashed = '', $switch = false // Empty title? if (empty($title)) { // Then fix it to default - $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REMOVAL'); + $title = '{--ADMIN_SQLS_EXECUTED_ON_REMOVAL--}'; } // END - if // Init variables diff --git a/inc/filters.php b/inc/filters.php index 1d96aa316c..a96ee6022a 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -823,11 +823,11 @@ function FILTER_HANDLE_FATAL_ERRORS () { } // Message to regular users (non-admin) - $CORR = getMessage('FATAL_REPORT_ERRORS'); + $CORR = '{--FATAL_REPORT_ERRORS--}'; // PHP warnings fixed if ($check == 'done') { - if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS'); + if (isAdmin()) $CORR = '{--FATAL_CORRECT_ERRORS--}'; } // END - if // Remember all in array diff --git a/inc/functions.php b/inc/functions.php index ab3c7099da..7448f7e5cc 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -437,13 +437,13 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') { // Add expiration to array if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) { // Will never expire! - $content['expiration'] = getMessage('MAIL_WILL_NEVER_EXPIRE'); + $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}'; } elseif (isConfigEntrySet('auto_purge')) { // Create nice date string $content['expiration'] = createFancyTime(getConfig('auto_purge')); } else { // Missing entry - $content['expiration'] = getMessage('MAIL_NO_CONFIG_AUTO_PURGE'); + $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}'; } } // END - if @@ -516,7 +516,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') { if (!isDebugModeEnabled()) $newContent = secureString($newContent); } else { // No template name supplied! - $newContent = getMessage('NO_TEMPLATE_SUPPLIED'); + $newContent = '{--NO_TEMPLATE_SUPPLIED--}'; } // Is there some content? @@ -752,8 +752,8 @@ function translateYesNo ($yn) { // Default $translated = '??? (' . $yn . ')'; switch ($yn) { - case 'Y': $translated = getMessage('YES'); break; - case 'N': $translated = getMessage('NO'); break; + case 'Y': $translated = '{--YES--}'; break; + case 'N': $translated = '{--NO--}'; break; default: // Log unknown value logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown value %s. Expected Y/N!", $yn)); @@ -831,9 +831,9 @@ function translateGender ($gender) { // Male/female or company? switch ($gender) { - case 'M': $ret = getMessage('GENDER_M'); break; - case 'F': $ret = getMessage('GENDER_F'); break; - case 'C': $ret = getMessage('GENDER_C'); break; + case 'M': $ret = '{--GENDER_M--}'; break; + case 'F': $ret = '{--GENDER_F--}'; break; + case 'C': $ret = '{--GENDER_C--}'; break; default: // Please report bugs on unknown genders debug_report_bug(__FUNCTION__, __LINE__, sprintf("Unknown gender %s detected.", $gender)); @@ -856,7 +856,7 @@ function translateUserStatus ($status) { case '': case null: - $ret = getMessage('ACCOUNT_DELETED'); + $ret = '{--ACCOUNT_DELETED--}'; break; default: @@ -2562,39 +2562,39 @@ function getMessageFromErrorCode ($code) { $message = ''; switch ($code) { case '': break; - case getCode('LOGOUT_DONE') : $message = getMessage('LOGOUT_DONE'); break; + case getCode('LOGOUT_DONE') : $message = '{--LOGOUT_DONE--}'; break; case getCode('LOGOUT_FAILED') : $message = '{--LOGOUT_FAILED--}'; break; - case getCode('DATA_INVALID') : $message = getMessage('MAIL_DATA_INVALID'); break; - case getCode('POSSIBLE_INVALID') : $message = getMessage('MAIL_POSSIBLE_INVALID'); break; - case getCode('USER_404') : $message = getMessage('USER_404'); break; - case getCode('STATS_404') : $message = getMessage('MAIL_STATS_404'); break; - case getCode('ALREADY_CONFIRMED') : $message = getMessage('MAIL_ALREADY_CONFIRMED'); break; - case getCode('WRONG_PASS') : $message = getMessage('LOGIN_WRONG_PASS'); break; - case getCode('WRONG_ID') : $message = getMessage('LOGIN_WRONG_ID'); break; - case getCode('ACCOUNT_LOCKED') : $message = getMessage('LOGIN_STATUS_LOCKED'); break; - case getCode('ACCOUNT_UNCONFIRMED'): $message = getMessage('LOGIN_STATUS_UNCONFIRMED'); break; - case getCode('COOKIES_DISABLED') : $message = getMessage('LOGIN_COOKIES_DISABLED'); break; - case getCode('BEG_SAME_AS_OWN') : $message = getMessage('BEG_SAME_UID_AS_OWN'); break; - case getCode('LOGIN_FAILED') : $message = getMessage('LOGIN_FAILED_GENERAL'); break; + case getCode('DATA_INVALID') : $message = '{--MAIL_DATA_INVALID--}'; break; + case getCode('POSSIBLE_INVALID') : $message = '{--MAIL_POSSIBLE_INVALID--}'; break; + case getCode('USER_404') : $message = '{--USER_404--}'; break; + case getCode('STATS_404') : $message = '{--MAIL_STATS_404--}'; break; + case getCode('ALREADY_CONFIRMED') : $message = '{--MAIL_ALREADY_CONFIRMED--}'; break; + case getCode('WRONG_PASS') : $message = '{--LOGIN_WRONG_PASS--}'; break; + case getCode('WRONG_ID') : $message = '{--LOGIN_WRONG_ID--}'; break; + case getCode('ACCOUNT_LOCKED') : $message = '{--LOGIN_STATUS_LOCKED--}'; break; + case getCode('ACCOUNT_UNCONFIRMED'): $message = '{--LOGIN_STATUS_UNCONFIRMED--}'; break; + case getCode('COOKIES_DISABLED') : $message = '{--LOGIN_COOKIES_DISABLED--}'; break; + case getCode('BEG_SAME_AS_OWN') : $message = '{--BEG_SAME_UID_AS_OWN--}'; break; + case getCode('LOGIN_FAILED') : $message = '{--LOGIN_FAILED_GENERAL--}'; break; case getCode('MODULE_MEMBER_ONLY') : $message = getMaskedMessage('MODULE_MEMBER_ONLY', getRequestParameter('mod')); break; - case getCode('OVERLENGTH') : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break; - case getCode('URL_FOUND') : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break; - case getCode('SUBJ_URL') : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break; + case getCode('OVERLENGTH') : $message = '{--MEMBER_TEXT_OVERLENGTH--}'; break; + case getCode('URL_FOUND') : $message = '{--MEMBER_TEXT_CONTAINS_URL--}'; break; + case getCode('SUBJ_URL') : $message = '{--MEMBER_SUBJ_CONTAINS_URL--}'; break; case getCode('BLIST_URL') : $message = '{--MEMBER_URL_BLACK_LISTED--}
{--MEMBER_BLIST_TIME--}: ' . generateDateTime(getRequestParameter('blist'), 0); break; - case getCode('NO_RECS_LEFT') : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break; - case getCode('INVALID_TAGS') : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break; - case getCode('MORE_POINTS') : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break; - case getCode('MORE_RECEIVERS1') : $message = getMessage('MEMBER_ENTER_MORE_RECEIVERS'); break; - case getCode('MORE_RECEIVERS2') : $message = getMessage('MEMBER_NO_MORE_RECEIVERS_FOUND'); break; - case getCode('MORE_RECEIVERS3') : $message = getMessage('MEMBER_ENTER_MORE_MIN_RECEIVERS'); break; - case getCode('INVALID_URL') : $message = getMessage('MEMBER_ENTER_INVALID_URL'); break; - case getCode('NO_MAIL_TYPE') : $message = getMessage('MEMBER_NO_MAIL_TYPE_SELECTED'); break; - case getCode('UNKNOWN_ERROR') : $message = getMessage('LOGIN_UNKNOWN_ERROR'); break; - case getCode('UNKNOWN_STATUS') : $message = getMessage('LOGIN_UNKNOWN_STATUS'); break; + case getCode('NO_RECS_LEFT') : $message = '{--MEMBER_SELECTED_MORE_RECS--}'; break; + case getCode('INVALID_TAGS') : $message = '{--MEMBER_HTML_INVALID_TAGS--}'; break; + case getCode('MORE_POINTS') : $message = '{--MEMBER_MORE_POINTS_NEEDED--}'; break; + case getCode('MORE_RECEIVERS1') : $message = '{--MEMBER_ENTER_MORE_RECEIVERS--}'; break; + case getCode('MORE_RECEIVERS2') : $message = '{--MEMBER_NO_MORE_RECEIVERS_FOUND--}'; break; + case getCode('MORE_RECEIVERS3') : $message = '{--MEMBER_ENTER_MORE_MIN_RECEIVERS--}'; break; + case getCode('INVALID_URL') : $message = '{--MEMBER_ENTER_INVALID_URL--}'; break; + case getCode('NO_MAIL_TYPE') : $message = '{--MEMBER_NO_MAIL_TYPE_SELECTED--}'; break; + case getCode('UNKNOWN_ERROR') : $message = '{--LOGIN_UNKNOWN_ERROR--}'; break; + case getCode('UNKNOWN_STATUS') : $message = '{--LOGIN_UNKNOWN_STATUS--}'; break; case getCode('ERROR_MAILID'): if (isExtensionActive('mailid', true)) { - $message = getMessage('ERROR_CONFIRMING_MAIL'); + $message = '{--ERROR_CONFIRMING_MAIL--}'; } else { $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'mailid'); } @@ -2604,7 +2604,7 @@ function getMessageFromErrorCode ($code) { if (isGetRequestParameterSet('ext')) { $message = generateExtensionInactiveNotInstalledMessage(getRequestParameter('ext')); } else { - $message = getMessage('EXTENSION_PROBLEM_UNSET_EXT'); + $message = '{--EXTENSION_PROBLEM_UNSET_EXT--}'; } break; @@ -3535,13 +3535,13 @@ function determinePageTitle () { $pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]'; } elseif ((isInstalled()) && (!isAdminRegistered())) { // Installed but no admin registered - $pageTitle = getMessage('SETUP_OF_MAILER'); + $pageTitle = '{--SETUP_OF_MAILER--}'; } elseif ((!isInstalled()) || (!isAdminRegistered())) { // Installation mode - $pageTitle = getMessage('INSTALLATION_OF_MAILER'); + $pageTitle = '{--INSTALLATION_OF_MAILER--}'; } else { // Configuration not found! - $pageTitle = getMessage('NO_CONFIG_FOUND_TITLE'); + $pageTitle = '{--NO_CONFIG_FOUND_TITLE--}'; // Do not add the fatal message in installation mode if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND')); @@ -3650,16 +3650,16 @@ function sendModeMails ($mod, $modes) { switch ($mode) { case 'normal': break; // Do not add any special lines case 'email': // Email was changed! - $content['message'] = getMessage('MEMBER_CHANGED_EMAIL').": ".postRequestParameter('old_email')."\n"; + $content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n"; break; case 'pass': // Password was changed - $content['message'] = getMessage('MEMBER_CHANGED_PASS')."\n"; + $content['message'] = '{--MEMBER_CHANGED_PASS--}' . "\n"; break; default: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode)); - $content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n"; + $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . "\n\n"; break; } // END - switch } // END - foreach @@ -3678,7 +3678,7 @@ function sendModeMails ($mod, $modes) { if (getConfig('admin_notify') == 'Y') { // The admin needs to be notified about a profile change $message_admin = 'admin_mydata_notify'; - $sub_adm = getMessage('ADMIN_CHANGED_DATA'); + $sub_adm = '{--ADMIN_CHANGED_DATA--}'; } else { // No mail to admin $message_admin = ''; @@ -3686,7 +3686,7 @@ function sendModeMails ($mod, $modes) { } // Set subject lines - $sub_mem = getMessage('MEMBER_CHANGED_DATA'); + $sub_mem = '{--MEMBER_CHANGED_DATA--}'; // Output success message $content = '{--MYDATA_MAIL_SENT--}'; @@ -3719,7 +3719,7 @@ function sendModeMails ($mod, $modes) { sendAdminNotification($sub_adm, $message_admin, $content, getMemberId()); } elseif (getConfig('admin_notify') == 'Y') { // Cannot send mails to admin! - $content = getMessage('CANNOT_SEND_ADMIN_MAILS'); + $content = '{--CANNOT_SEND_ADMIN_MAILS--}'; } else { // No mail to admin $content = '{--MYDATA_MAIL_SENT--}'; diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 2b9a008104..b06ff86814 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -169,7 +169,7 @@ function adminsChangeAdminAccount ($postData, $element = '') { array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__); // Admin account saved - $message = getMessage('ADMIN_ACCOUNT_SAVED'); + $message = '{--ADMIN_ACCOUNT_SAVED--}'; } elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) { // Update only if both passwords match if (($postData['pass1'][$id] == $postData['pass2'][$id])) { @@ -246,10 +246,10 @@ LIMIT 1", } // Admin account saved - $message = getMessage('ADMIN_ACCOUNT_SAVED'); + $message = '{--ADMIN_ACCOUNT_SAVED--}'; } else { // Passwords did not match - $message = getMessage('ADMINS_ERROR_PASS_MISMATCH'); + $message = '{--ADMINS_ERROR_PASS_MISMATCH--}'; } } else { // Update whole array @@ -348,8 +348,8 @@ function adminsDeleteAdminAccount ($postData) { // Entry found $content = SQL_FETCHARRAY($result); SQL_FREERESULT($result); - $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE'); - $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING'); + $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}'; + $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}'; // Prepare some more data $content['sw'] = $SW; @@ -400,8 +400,8 @@ function adminsListAdminAccounts() { $OUT = ''; $SW = 2; while ($content = SQL_FETCHARRAY($result)) { // Compile some variables - $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE'); - $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING'); + $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}'; + $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}'; // Prepare some more data $content['sw'] = $SW; diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index ed24b4b0b3..d89df55f30 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -206,7 +206,7 @@ LIMIT 1", if ($self === false) { // If current user was not found set constant - $GLOBALS['ranking_content']['rankings'] = getMessage('BONUS_RANK_YOU_ARE_404'); + $GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}'; } // END - if } else { // No entries found! diff --git a/inc/libs/country_functions.php b/inc/libs/country_functions.php index eb185682b2..b02728ab8a 100644 --- a/inc/libs/country_functions.php +++ b/inc/libs/country_functions.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { // Generate a human-readable country description with code function generateCountryInfo ($id) { // Not found is the default - $ret = getMessage('COUNTRY_404'); + $ret = '{--COUNTRY_404--}'; // Load code and description $result = SQL_QUERY_ESC("SELECT `code`, `descr` FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id`=%s LIMIT 1", diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php index 71b43ae3db..8a455f6ea0 100644 --- a/inc/libs/doubler_functions.php +++ b/inc/libs/doubler_functions.php @@ -51,11 +51,11 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = ' // Load entries only from a single user $add = sprintf(" AND `userid`=%s", bigintval($userid)); $mode = 'member'; $COLS = 4; $DT_MODE = 2; - $message = getMessage('DOUBLER_MEMBER_NO_ENTRIES_FOUND'); + $message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}'; } else { // Guest mode! $mode = 'guest'; $COLS = 3; $DT_MODE = 3; - $message = getMessage('DOUBLER_GUEST_NO_ENTRIES_FOUND'); + $message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}'; } if (($done == 'Y') && ($sort == 'ASC')) { diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index be9110404b..001d5b26be 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -651,7 +651,7 @@ function doAdminNetworkProcessHandlenetworkForm () { $OUT .= loadTemplate('admin_edit_networks_row', true, $networkData); } elseif (isFormSent('del')) { // Translate the request type - $networkData['network_request_type'] = getMessage('ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type']); + $networkData['network_request_type'] = '{--ADMIN_NETWORK_REQUEST_TYPE_' . $networkData['network_request_type'] . '--}'; // Add row template for deleting $OUT .= loadTemplate('admin_del_networks_row', true, $networkData); diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php index a33429bf5d..8cdac37d2b 100644 --- a/inc/libs/payout_functions.php +++ b/inc/libs/payout_functions.php @@ -87,7 +87,7 @@ ORDER BY // "Translates" the payout status into a human-readable message function translatePayoutStatus ($status) { // Try to get a message from given status - $message = getMessage('PAYOUT_STATUS_' . strtoupper($status) . ''); + $message = '{--PAYOUT_STATUS_' . strtoupper($status) . '--}'; // Return it } diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index ae14ace7c0..e4dff31d02 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -855,7 +855,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') { $OUT .= ''; } else { // No rallye templates found - $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND'); + $OUT = '{--RALLYE_NO_TEMPLATES_FOUND--}'; } // Return selection @@ -938,7 +938,7 @@ WHERE // Determines the right language string for min_users function determineReferalRallyeMinimumUsers ($min_users) { // Rallye ends without user limitation is the default - $return = getMessage('RALLYE_END_NO_USER_LIMITATION'); + $return = '{--RALLYE_END_NO_USER_LIMITATION--}'; if ($min_users > 0) { // Rallye ends when X members are totally in your exchange @@ -952,7 +952,7 @@ function determineReferalRallyeMinimumUsers ($min_users) { // Determines the right language string for min_prices function determineReferalRallyeMinimumPrices ($min_prices) { // Rallye ends without user limitation is the default - $return = getMessage('RALLYE_END_NO_PRICE_LIMITATION'); + $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}'; if ($min_prices > 0) { // Rallye ends when X members are totally in your exchange diff --git a/inc/libs/refback_functions.php b/inc/libs/refback_functions.php index dcd553bf17..2b69d37af3 100644 --- a/inc/libs/refback_functions.php +++ b/inc/libs/refback_functions.php @@ -355,20 +355,20 @@ function getArrayFromUserRefbackData ($id) { function updateMemberRefbackPercents ($id, $percents) { //* DEBUG: */ print("----------------------- ".__FUNCTION__." - ENTRY ------------------------