From: Roland Häder <roland@mxchange.org>
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=f2aeaab0cd313b2eeb151642455ed558f6b186dc;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 = '<span class="guest_failed">{--LOGOUT_FAILED--}</span>'; 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--}<br />{--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 = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
@@ -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 = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
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 .= '</select>';
} 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("----------------------- <font color=\"#00aa00\">".__FUNCTION__." - ENTRY</font> ------------------------<ul><li>\n");
// Default status is failed
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_GENERAL');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_GENERAL--}';
// Do some sanity-checks
if (!isMember()) {
// No member!
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_NO_MEMBER');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_NO_MEMBER--}';
return $status;
} elseif (''.$id.'' != ''.($id + 0).'') {
// No number!
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_INVALID_ID_NUMBER');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_INVALID_ID_NUMBER--}';
return $status;
} elseif (($percents < 0) || ($percents > 100)) {
// Percentage is not valid!
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_INVALID_PERCENTAGE');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_INVALID_PERCENTAGE--}';
return $status;
}
@@ -378,7 +378,7 @@ function updateMemberRefbackPercents ($id, $percents) {
// Is this valid?
if (count($dummy) == 0) {
// id does not belong to user!
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_ID_MISMATCH');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_ID_MISMATCH--}';
return $status;
} // END - if
@@ -392,7 +392,7 @@ function updateMemberRefbackPercents ($id, $percents) {
// Entry updated?
if (SQL_AFFECTEDROWS() < 1) {
// Entry not updated!
- $status['message'] = getMessage('MEMBER_REFBACK_ERROR_NOT_UPDATED');
+ $status['message'] = '{--MEMBER_REFBACK_ERROR_NOT_UPDATED--}';
return $status;
} // END - if
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index ab624167ce..cf855ac254 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -385,7 +385,7 @@ function saveSponsorData ($postData, $content) {
'ok', 'pass1', 'pass2');
// Set default message ("not saved")
- $message = getMessage('SPONSOR_ACCOUNT_DATA_NOT_SAVED');
+ $message = '{--SPONSOR_ACCOUNT_DATA_NOT_SAVED--}';
// Check for submitted passwords
if ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) {
@@ -442,21 +442,21 @@ function saveSponsorData ($postData, $content) {
switch (getWhat()) {
case 'account': // Change account data
if ($EMAIL === true) {
- $message = getMessage('SPONSOR_ACCOUNT_EMAIL_CHANGED');
+ $message = '{--SPONSOR_ACCOUNT_EMAIL_CHANGED--}';
$templ = 'admin_sponsor_change_email';
- $subj = getMessage('ADMIN_SPONSOR_ACC_EMAIL_SUBJ');
+ $subj = '{--ADMIN_SPONSOR_ACC_EMAIL_SUBJ--}';
} else {
- $message = getMessage('SPONSOR_ACCOUNT_DATA_SAVED');
+ $message = '{--SPONSOR_ACCOUNT_DATA_SAVED--}';
$templ = 'admin_sponsor_change_data';
- $subj = getMessage('ADMIN_SPONSOR_ACC_DATA_SUBJ');
+ $subj = '{--ADMIN_SPONSOR_ACC_DATA_SUBJ--}';
}
break;
case 'settings': // Change settings
// Set message template and subject for admin
- $message = getMessage('SPONSOR_SETTINGS_SAVED');
+ $message = '{--SPONSOR_SETTINGS_SAVED--}';
$templ = 'admin_sponsor_settings';
- $subj = getMessage('ADMIN_SPONSOR_SETTINGS_SUBJ');
+ $subj = '{--ADMIN_SPONSOR_SETTINGS_SUBJ--}';
break;
default: // Unknown sponsor what value!
diff --git a/inc/libs/surfbar_functions.php b/inc/libs/surfbar_functions.php
index 543f145bdb..5d311cd7e9 100644
--- a/inc/libs/surfbar_functions.php
+++ b/inc/libs/surfbar_functions.php
@@ -702,7 +702,7 @@ function SURFBAR_NOTIFY_USER ($messageType, $content) {
// Is the subject line there?
if ((substr($subject, 0, 1) == '!') && (substr($subject, -1, 1) == '!')) {
// Set default subject if following eval() wents wrong
- $subject = getMessage('MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT');
+ $subject = '{--MEMBER_SURFBAR_NOTIFY_DEFAULT_SUBJECT--}';
} // END - if
// Translate some data if present
@@ -731,7 +731,7 @@ function translateSurfbarLimit ($limit) {
// Is this zero?
if ($limit == '0') {
// Unlimited!
- $return = getMessage('MEMBER_SURFBAR_UNLIMITED_VIEWS');
+ $return = '{--MEMBER_SURFBAR_UNLIMITED_VIEWS--}';
} else {
// Translate comma
$return = translateComma($limit);
diff --git a/inc/libs/task_functions.php b/inc/libs/task_functions.php
index 6ba4d34649..95e0082d82 100644
--- a/inc/libs/task_functions.php
+++ b/inc/libs/task_functions.php
@@ -230,7 +230,7 @@ function outputAdvancedOverview (&$result_main) {
} elseif (isExtensionActive('bonus')) {
$content['send_bonus_mails'] = getMaskedMessage('ADMIN_EXTENSION_BONUS_OUTDATED', '0.1.8');
} else {
- $content['send_bonus_mails'] = getMessage('ADMIN_EXTENSION_BONUS_404');
+ $content['send_bonus_mails'] = '{--ADMIN_EXTENSION_BONUS_404--}';
}
if (isExtensionActive('autopurge')) {
@@ -262,15 +262,15 @@ WHERE
ORDER BY
d.userid ASC");
$WHATs[] = 'list_autopurge';
- $DESCRs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE');
- $TITLEs[] = getMessage('ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE--}';
+ $TITLEs[] = '{--ADMIN_TASK_INACTIVE_AUTOPURGE_TITLE--}';
}
if (isExtensionInstalledAndNewer('sql_patches', '0.3.4')) {
// Check for accounts without referal
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `refid`=0 ORDER BY `userid` ASC");
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_ACCOUNT_NOREF_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ACCOUNT_NOREF_TITLE--}';
$WHATs[] = 'list_user&mode=norefs';
}
@@ -278,44 +278,44 @@ ORDER BY
// List new payout requests
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` WHERE `status`='NEW' ORDER BY `userid` ASC");
$WHATs[] = 'list_payouts';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_WAITING_TITLE--}';
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_payouts` ORDER BY `userid` ASC");
$WHATs[] = 'list_payouts';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_PAYOUTS_ALL_TITLE--}';
}
if (isExtensionActive('wernis')) {
// List new wernis requests
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_wernis` ORDER BY `userid` ASC");
$WHATs[] = 'list_wernis';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_WERNIS_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_WERNIS_ALL_TITLE--}';
}
if (isExtensionActive('primera')) {
// List new primera requests
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_primera` ORDER BY `userid` ASC");
$WHATs[] = 'list_primera';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_PRIMERA_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_PRIMERA_ALL_TITLE--}';
}
if (isExtensionActive('holiday')) {
// List holiday requests
addSql("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_holidays` ORDER BY `userid` ASC");
$WHATs[] = 'list_holiday';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_HOLIDAYS_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_HOLIDAYS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_HOLIDAYS_TITLE--}';
}
if (isExtensionInstalledAndNewer('bonus', '0.8.7')) {
// List all notifications
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `is_notify`='Y' ORDER BY `timestamp` DESC");
$WHATs[] = 'list_notifications';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_NOTIFICATIONS_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_NOTIFICATIONS_TITLE--}';
} // END - if
if (isExtensionInstalledAndNewer('bonus', '0.2.3')) {
@@ -351,8 +351,8 @@ ORDER BY
`points` DESC,
`userid` ASC");
$WHATs[] = 'list_bonus';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_BONUS');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_BONUS_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_BONUS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_BONUS_TITLE--}';
}
if (isExtensionInstalledAndNewer('beg', '0.1.2')) {
@@ -377,20 +377,20 @@ ORDER BY
`beg_points` DESC,
`userid` ASC");
$WHATs[] = 'list_beg';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_BEG');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_BEG_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_BEG--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_BEG_TITLE--}';
}
if (isExtensionActive('doubler')) {
// List waiting payouts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` WHERE `completed`='N' ORDER BY `id` ASC");
$WHATs[] = 'list_doubler&mode=waiting&select=all';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_WAITING_TITLE--}';
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_doubler` ORDER BY `id` ASC");
$WHATs[] = 'list_doubler';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_DOUBLER_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_DOUBLER_ALL_TITLE--}';
}
//
@@ -398,139 +398,139 @@ ORDER BY
//
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` ORDER BY `id` ASC");
$WHATs[] = 'refbanner';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ALL_TITLE--}';
//
// All activated referal banner
//
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_refbanner` WHERE `visible`='Y' ORDER BY `id` ASC");
$WHATs[] = 'refbanner';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_REFBANNER_ACTIVE--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_REFBANNER_ACTIVE_TITLE--}';
//
// All extensions
//
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` ORDER BY `id` ASC");
$WHATs[] = 'extensions';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ALL_TITLE--}';
//
// All activated extensions
//
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_extensions` WHERE `ext_active`='Y' ORDER BY `id` ASC");
$WHATs[] = 'extensions&active=Y';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ACTIVE');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_EXTENSIONS_ACTIVE_TITLE--}';
if (isExtensionActive('engine')) {
// List all export accounts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` ORDER BY `id` ASC");
$WHATs[] = 'list_engine';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_TITLE--}';
// List all pending accounts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_accounts` WHERE `status`='UNCONFIRMED' ORDER BY `id` ASC");
$WHATs[] = 'unlock_engine';
- $DESCRs[] = getMessage('ADMIN_TASK_UNLOCK_ENGINE');
- $TITLEs[] = getMessage('ADMIN_TASK_UNLOCK_ENGINE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_UNLOCK_ENGINE--}';
+ $TITLEs[] = '{--ADMIN_TASK_UNLOCK_ENGINE_TITLE--}';
// List all safes
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_safe` ORDER BY `id` ASC");
$WHATs[] = 'list_engine&mode=safe';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE_SAFES');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_SAFES_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_SAFES_TITLE--}';
// List all export URLs
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_engine_urls` ORDER BY `id` ASC");
$WHATs[] = 'engine_urls';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_ENGINE_URLS_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ENGINE_URLS_TITLE--}';
} // END - if
if (isExtensionActive('sponsor')) {
// List all sponsors
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` ORDER BY `id` ASC");
$WHATs[] = 'list_sponsor';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_TITLE--}';
// List confirmed sponsor accounts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `status`='CONFIRMED' ORDER BY `id` ASC");
$WHATs[] = 'list_sponsor';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_CONFIRMED');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_CONFIRMED_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR_CONFIRMED--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_CONFIRMED_TITLE--}';
// List unconfirmed sponsor accounts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `status`='UNCONFIRMED' ORDER BY `id` ASC");
$WHATs[] = 'list_sponsor';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_UNCONFIRMED_TITLE--}';
// List locked sponsor accounts
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `status`='LOCKED' ORDER BY `id` ASC");
$WHATs[] = 'list_sponsor';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_LOCKED');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_LOCKED_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR_LOCKED--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_LOCKED_TITLE--}';
// List waiting sponsor accounts to be approved
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `status`='PENDING' ORDER BY `id` ASC");
$WHATs[] = 'unlock_sponsor';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_PENDING');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_PENDING_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR_PENDING--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_PENDING_TITLE--}';
// Waiting payments
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_orders` WHERE `pay_status`='PENDING' ORDER BY `id` ASC");
$WHATs[] = 'list_sponsor_pays';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SPONSOR_ORDERS_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SPONSOR_ORDERS--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SPONSOR_ORDERS_TITLE--}';
} // END - if
if (isExtensionActive('country')) {
// List country codes
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_countries` ORDER BY `id` ASC");
$WHATs[] = 'list_country';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_COUNTRY');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_COUNTRY_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_COUNTRY--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_COUNTRY_TITLE--}';
} // END - if
if (isExtensionActive('theme')) {
// List all themes
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` ORDER BY `id` ASC");
$WHATs[] = 'theme_edit';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_THEME_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_THEME_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_THEME_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_THEME_ALL_TITLE--}';
// List active themes
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_themes` WHERE `theme_active`='Y' ORDER BY `id` ASC");
$WHATs[] = 'theme_edit';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_THEME_ACTIVE_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_THEME_ACTIVE--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_THEME_ACTIVE_TITLE--}';
} // END - if
if (isExtensionActive('admins')) {
// List all administrator logins
addSql("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC");
$WHATs[] = 'admins_edit';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_ADMINS_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_ADMINS_ALL_TITLE--}';
} // END - if
if (isExtensionActive('surfbar')) {
// List all URLs in surfbar
addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` ORDER BY `url_id` ASC");
$WHATs[] = 'list_surfbar_urls';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_ALL_TITLE--}';
// List all pending URLs in surfbar
addSql("SELECT `url_id` FROM `{?_MYSQL_PREFIX?}_surfbar_urls` WHERE `url_status`='PENDING' ORDER BY `url_id` ASC");
$WHATs[] = 'unlock_surfbar_urls';
- $DESCRs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING');
- $TITLEs[] = getMessage('ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE');
+ $DESCRs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING--}';
+ $TITLEs[] = '{--ADMIN_TASK_LIST_SURFBAR_URLS_PENDING_TITLE--}';
} // END - if
// Generate extra overview rows
@@ -575,7 +575,7 @@ function createExtraTaskRows ($WHATs, $DESCRs, $TITLEs) {
if ($key < (count($sqls) - 1)) $content['bottom'] = 'bottom';
if (($value > 0) && (!empty($WHATs[$key]))) {
- if (empty($TITLEs[$key])) $TITLEs[$key] = getMessage('ADMIN_TASK_UNKNOWN_LIST_TITLE');
+ if (empty($TITLEs[$key])) $TITLEs[$key] = '{--ADMIN_TASK_UNKNOWN_LIST_TITLE--}';
$content['row_link'] = '<a href="{%url=modules.php?module=admin&what=' . $WHATs[$key] . '%}" title="' . $TITLEs[$key] . '">' . $value . '</a>';
} else {
$content['row_link'] = '0';
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 8d9d74d72f..517f0ebdd3 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -101,7 +101,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
// Makes order by links..
- if ($letter == 'front') $letter = getMessage('_ALL2');
+ if ($letter == 'front') $letter = '{--_ALL2--}';
// Prepare array with all possible sorters
$list = array(
@@ -113,7 +113,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
// Add nickname if extension is installed
if (isExtensionActive('nickname')) {
- $list['nickname'] = getMessage('NICKNAME');
+ $list['nickname'] = '{--NICKNAME--}';
} // END - if
foreach ($list as $sort => $title) {
diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php
index 83cdb59cef..a6fe7be92e 100644
--- a/inc/libs/wernis_functions.php
+++ b/inc/libs/wernis_functions.php
@@ -318,15 +318,15 @@ function WERNIS_TRANSFER_STATUS ($status) {
$return = getMaskedMessage('WERNIS_STATUS_UNKNWOWN', $status);
switch ($status) {
case 'IN': // Withdraw
- $return = getMessage('WERNIS_STATUS_WITHDRAW');
+ $return = '{--WERNIS_STATUS_WITHDRAW--}';
break;
case 'OUT': // Payout
- $return = getMessage('WERNIS_STATUS_PAYOUT');
+ $return = '{--WERNIS_STATUS_PAYOUT--}';
break;
case 'FAILED': // Payout
- $return = getMessage('WERNIS_STATUS_FAILED');
+ $return = '{--WERNIS_STATUS_FAILED--}';
break;
}
diff --git a/inc/mails/beg_mails.php b/inc/mails/beg_mails.php
index 5806fe5f59..29d9c589c5 100644
--- a/inc/mails/beg_mails.php
+++ b/inc/mails/beg_mails.php
@@ -82,7 +82,7 @@ if (!empty($sql)) {
$sql .= ") AND `status`='CONFIRMED' ORDER BY `last_online` ASC";
// No IP locking setuped by default
- $content['ip_locker'] = getMessage('BEG_NO_LIMITATION');
+ $content['ip_locker'] = '{--BEG_NO_LIMITATION--}';
if (getConfig('beg_ip_timeout') > 0) {
// Create timemark
@@ -96,7 +96,7 @@ if (!empty($sql)) {
$sentBonusMails = ((getConfig('beg_notify_bonus') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
// Generate subject line
- $subject = getMessage('BEG_RALLYE_'.strtoupper($mode).'_NOTIFY');
+ $subject = '{--BEG_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
// Load message body for bonus mails
$message = loadEmailTemplate('beg_enable_notify_body', '', '{PER}userid{PER}');
diff --git a/inc/mails/bonus_mails.php b/inc/mails/bonus_mails.php
index 99f47d66a7..ce784a4652 100644
--- a/inc/mails/bonus_mails.php
+++ b/inc/mails/bonus_mails.php
@@ -85,7 +85,7 @@ if (!empty($sql)) {
$sentBonusMails = ((getConfig('bonus_notify_points') > 0) && ($mode == 'enable') && (isExtensionActive('bonus')));
// Generate subject line
- $subject = getMessage('BONUS_RALLYE_' . strtoupper($mode).'_NOTIFY');
+ $subject = '{--BONUS_RALLYE_' . strtoupper($mode) . '_NOTIFY--}';
// Load message body for bonus mails
$message = loadEmailTemplate('bonus_enable_notify_body', '', '{PER}userid{PER}');
diff --git a/inc/modules/admin.php b/inc/modules/admin.php
index 05deff7ed5..14c4809dd0 100644
--- a/inc/modules/admin.php
+++ b/inc/modules/admin.php
@@ -80,7 +80,7 @@ if (!isAdminRegistered()) {
redirectToUrl('modules.php?module=admin&register=done');
} else {
// Registration incomplete
- $errorMessage = getMessage('ADMIN_CANNOT_COMPLETE');
+ $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
// Set this to have our error message displayed
setPostRequestParameter('ok', '***');
@@ -88,14 +88,14 @@ if (!isAdminRegistered()) {
break;
case 'failed': // Registration has failed
- $errorMessage = getMessage('ADMIN_REGISTER_FAILED');
+ $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
// Set this to have our error message displayed
setPostRequestParameter('ok', '***');
break;
case 'already': // Admin does already exists!
- $errorMessage = getMessage('ADMIN_LOGIN_ALREADY_REG');
+ $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
// Set this to have our error message displayed
setPostRequestParameter('ok', '***');
@@ -133,24 +133,24 @@ if (!isAdminRegistered()) {
$pass2Message = '';
// No login entered?
- if (empty($content['login'])) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (empty($content['login'])) $loginMessage = '{--ADMIN_NO_LOGIN--}';
// An error comes back from registration?
if ((!empty($ret)) && ($ret != 'init')) $loginMessage = $errorMessage;
// No password 1 entered or to short?
- if (!isPostRequestParameterSet('pass1')) $pass1Message = getMessage('ADMIN_NO_PASS1');
- elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = getMessage('ADMIN_SHORT_PASS1');
+ if (!isPostRequestParameterSet('pass1')) $pass1Message = '{--ADMIN_NO_PASS1--}';
+ elseif (strlen(postRequestParameter('pass1')) < 4) $pass1Message = '{--ADMIN_SHORT_PASS1--}';
// No password 2 entered or to short?
- if (!isPostRequestParameterSet('pass2')) $pass2Message = getMessage('ADMIN_NO_PASS2');
- elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = getMessage('ADMIN_SHORT_PASS2');
+ if (!isPostRequestParameterSet('pass2')) $pass2Message = '{--ADMIN_NO_PASS2--}';
+ elseif (strlen(postRequestParameter('pass2')) < 4) $pass2Message = '{--ADMIN_SHORT_PASS2--}';
// Both didn't match?
if (postRequestParameter('pass1') != postRequestParameter('pass2')) {
// No match
- if (empty($pass1Message)) $pass1Message = getMessage('ADMIN_PASS1_MISMATCH');
- if (empty($pass2Message)) $pass2Message = getMessage('ADMIN_PASS2_MISMATCH');
+ if (empty($pass1Message)) $pass1Message = '{--ADMIN_PASS1_MISMATCH--}';
+ if (empty($pass2Message)) $pass2Message = '{--ADMIN_PASS2_MISMATCH--}';
} // END - if
// Output error messages
@@ -279,16 +279,16 @@ if (!isAdminRegistered()) {
$loginMessage = ''; $passwdMessage = '';
// No login entered?
- if (!isPostRequestParameterSet('login')) $loginMessage = getMessage('ADMIN_NO_LOGIN');
+ if (!isPostRequestParameterSet('login')) $loginMessage = '{--ADMIN_NO_LOGIN--}';
// An error comes back from login?
if ((!empty($ret)) && (postRequestParameter('ok') == '404')) $loginMessage = $ret;
// No password entered?
- if (!isPostRequestParameterSet('pass')) $passwdMessage = getMessage('ADMIN_NO_PASS');
+ if (!isPostRequestParameterSet('pass')) $passwdMessage = '{--ADMIN_NO_PASS--}';
// Or password too short?
- if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = getMessage('ADMIN_SHORT_PASS');
+ if (strlen(postRequestParameter('pass')) < 4) $passwdMessage = '{--ADMIN_SHORT_PASS--}';
// An error comes back from login?
if ((!empty($ret)) && (postRequestParameter('ok') == 'pass')) $passwdMessage = $ret;
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index d2fc10212b..cbd8f464d3 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -456,7 +456,7 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
$OUT .= '</select>';
} else {
// No menus???
- $OUT = getMessage('ADMIN_PROBLEM_NO_MENU');
+ $OUT = '{--ADMIN_PROBLEM_NO_MENU--}';
}
// Return output
@@ -733,7 +733,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
// Is the raw userid set?
if (postRequestParameter($userid, $id) > 0) {
// Generate subject
- $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+ $subjectLine = '{--MEMBER_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
// Load email template
if (!empty($subjectPart)) {
@@ -747,7 +747,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
} // END - if
// Generate subject
- $subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+ $subjectLine = '{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
// Send admin notification out
if (!empty($subjectPart)) {
diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php
index 0b83fa2923..e5d3f0cdcb 100644
--- a/inc/modules/admin/overview-inc.php
+++ b/inc/modules/admin/overview-inc.php
@@ -195,7 +195,7 @@ LIMIT 1",
// Initialize variables (no title for SQL commands by default)
$ext_name = ''; $ext_ver = '';
- $title = getMessage('TASK_NO_TITLE');
+ $title = '{--TASK_NO_TITLE--}';
// Shall I list SQL commands assigned to an extension installation or update task?
if ((getConfig('verbose_sql') == 'Y')) {
@@ -220,7 +220,7 @@ LIMIT 1",
$taskData['text'] .= getExtensionNotes();
// Set title
- $title = getMessage('ADMIN_SQLS_EXECUTED_ON_REGISTER');
+ $title = '{--ADMIN_SQLS_EXECUTED_ON_REGISTER--}';
} elseif ($taskData['task_type'] == 'EXTENSION_UPDATE') {
// Prepare extension name and version
$ext_name = substr($ext_name, 7);
@@ -239,7 +239,7 @@ LIMIT 1",
$taskData['text'] .= getExtensionNotes();
// Set title
- $title = getMessage('ADMIN_SQLS_EXECUTED_ON_UPDATE');
+ $title = '{--ADMIN_SQLS_EXECUTED_ON_UPDATE--}';
} else {
// Remove extension's name
$ext_name = '';
@@ -448,7 +448,7 @@ LIMIT 1",
}
// Get task type
- $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+ $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
if (isValidUserId($content['userid'])) {
// Member found otherwise it's a system task
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index d41753b54a..a26f5db01e 100644
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -53,7 +53,7 @@ if (isGetRequestParameterSet('sub')) {
} // END - if
// List all menu points and make them editable
-if ((isFormSent('edit')l) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
// Edit menu entries
// @TODO Kill all constants in this file
$content['sub'] = $SUB;
diff --git a/inc/modules/admin/what-config_admins.php b/inc/modules/admin/what-config_admins.php
index f8b9eac5f0..360ec7b2e5 100644
--- a/inc/modules/admin/what-config_admins.php
+++ b/inc/modules/admin/what-config_admins.php
@@ -119,7 +119,7 @@ if ((isFormSent('edit')) && (countPostSelection() > 0)) {
if (empty($what)) $what = '---';
// Get admin mode
- $mode = getMessage('ADMINS_'.strtoupper($mode).'_MODE');
+ $mode = '{--ADMINS_' . strtoupper($mode) . '_MODE--}';
// Generate link
$admin = generateAdminLink($admin);
@@ -184,7 +184,7 @@ VALUES ('%s','%s','%s','%s')",
postRequestParameter('what_menu'),
postRequestParameter('mode')
), __FILE__, __LINE__);
- $content = getMessage('ADMIN_ADMINS_ACL_SAVED');
+ $content = '{--ADMIN_ADMINS_ACL_SAVED--}';
// Update cache when installed
if (isExtensionActive('cache')) {
@@ -192,18 +192,18 @@ VALUES ('%s','%s','%s','%s')",
} // END - if
} else {
// ACL does already exist!
- $content = getMessage('ADMIN_ADMINS_ACL_ALREADY_ADDED');
+ $content = '{--ADMIN_ADMINS_ACL_ALREADY_ADDED--}';
}
// Free memory
SQL_FREERESULT($result);
} else {
// No menu selected makes also no sence...
- $content = getMessage('ADMIN_ADMINS_SELECT_ACTION_WHAT');
+ $content = '{--ADMIN_ADMINS_SELECT_ACTION_WHAT--}';
}
} else {
// Same mode makes no sence...
- $content = getMessage('ADMIN_ADMINS_SAME_MODE_SELECTED');
+ $content = '{--ADMIN_ADMINS_SAME_MODE_SELECTED--}';
}
// Display message
@@ -222,7 +222,7 @@ VALUES ('%s','%s','%s','%s')",
if (empty($content['what_menu'])) $content['what_menu'] = '---';
// Get mode
- $content['access_mode'] = getMessage('ADMINS_'.strtoupper($content['access_mode']).'_MODE');
+ $content['access_mode'] = '{--ADMINS_' . strtoupper($content['access_mode']) . '_MODE--}';
// Prepare data for the row template
$content = array(
@@ -263,5 +263,5 @@ VALUES ('%s','%s','%s','%s')",
loadTemplate('admin_admins_add_acl', false, $content);
}
-//
+// [EOF]
?>
diff --git a/inc/modules/admin/what-config_cats.php b/inc/modules/admin/what-config_cats.php
index bb91e4f749..b2246e48a2 100644
--- a/inc/modules/admin/what-config_cats.php
+++ b/inc/modules/admin/what-config_cats.php
@@ -61,7 +61,7 @@ if (isFormSent('add')) {
postRequestParameter('visible'),
bigintval(postRequestParameter('parent') + 1)
), __FILE__, __LINE__);
- $content = getMessage('CATEGORY_ADDED');
+ $content = '{--CATEGORY_ADDED--}';
} else {
// Category does already exists
$content = '<span class="admin_failed">{--CATEGORY_ALREADY_EXISTS--}</span>';
@@ -90,7 +90,7 @@ if (isFormSent('add')) {
postRequestParameter('sort', $id),
$id
), __FILE__, __LINE__);
- $TEXT = getMessage('CATEGORIES_SAVED');
+ $TEXT = '{--CATEGORIES_SAVED--}';
break;
case 'del': // Delete categories
@@ -98,7 +98,7 @@ if (isFormSent('add')) {
array($id), __FILE__, __LINE__);
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `cat_id`=%s",
array($id), __FILE__, __LINE__);
- $TEXT = getMessage('CATEGORIES_DELETED');
+ $TEXT = '{--CATEGORIES_DELETED--}';
break;
} // END - switch
} else {
diff --git a/inc/modules/admin/what-config_email.php b/inc/modules/admin/what-config_email.php
index 3986db1a1c..1383d4e54a 100644
--- a/inc/modules/admin/what-config_email.php
+++ b/inc/modules/admin/what-config_email.php
@@ -56,7 +56,7 @@ if (isPostRequestParameterSet(('add_max'))) {
// Add this value (including comment)
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_max_receive` (value, comment) VALUES ('%s','%s')",
array(bigintval(postRequestParameter('max')), postRequestParameter('comment')),__FILE__, __LINE__);
- $content = getMessage('MAX_VALUE_SAVED');
+ $content = '{--MAX_VALUE_SAVED--}';
} else {
// Value does alread exists!
$content = '<span class="admin_failed">{--MAX_VALUE_ALREADY--}</span>';
@@ -83,13 +83,13 @@ if (isPostRequestParameterSet(('add_max'))) {
postRequestParameter('comm', $id),
$id
),__FILE__, __LINE__);
- $TEXT = getMessage('MRECEIVE_SAVED');
+ $TEXT = '{--MRECEIVE_SAVED--}';
break;
case 'del':
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `id`=%s LIMIT 1",
array($id), __FILE__, __LINE__);
- $TEXT = getMessage('MRECEIVE_DELETED');
+ $TEXT = '{--MRECEIVE_DELETED--}';
break;
}
}
diff --git a/inc/modules/admin/what-config_payouts.php b/inc/modules/admin/what-config_payouts.php
index c0b4fc7c94..810e489b64 100644
--- a/inc/modules/admin/what-config_payouts.php
+++ b/inc/modules/admin/what-config_payouts.php
@@ -70,7 +70,7 @@ VALUES ('%s', %d, %d,'%s','%s','%s','%s','%s','%s','%s')",
), __FILE__, __LINE__);
// Get message
- $message = getMessage('ADMIN_PAYOUT_TYPE_ADDED');
+ $message = '{--ADMIN_PAYOUT_TYPE_ADDED--}';
} else {
// Free memory
SQL_FREERESULT($result);
@@ -120,7 +120,7 @@ LIMIT 1",
runFilterChain('run_sqls');
// Get message
- $message = getMessage('ADMIN_PAYOUT_ENTRIES_CHANGED');
+ $message = '{--ADMIN_PAYOUT_ENTRIES_CHANGED--}';
} else {
$display = false; //Suppress any other outputs
$OUT = ''; $SW = 2;
@@ -165,7 +165,7 @@ LIMIT 1",
runFilterChain('run_sqls');
// Get message
- $message = getMessage('ADMIN_PAYOUT_ENTRIES_DELETED');
+ $message = '{--ADMIN_PAYOUT_ENTRIES_DELETED--}';
} else {
$display = false; //Suppress any other outputs
$OUT = ''; $SW = 2;
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 23ac087310..06b6f2b762 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -97,7 +97,7 @@ if (isFormSent()) {
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refdepths` SET `level`='%s', `percents`='%s' WHERE `id`=%s LIMIT 1",
array(bigintval($value), postRequestParameter('percents', $id), $id), __FILE__, __LINE__);
}
- $message = getMessage('REF_DEPTHS_SAVED');
+ $message = '{--REF_DEPTHS_SAVED--}';
break;
case 'del':
@@ -105,7 +105,7 @@ if (isFormSent()) {
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_refdepths` WHERE `id`=%s LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
}
- $message = getMessage('REF_DEPTHS_DELETED');
+ $message = '{--REF_DEPTHS_DELETED--}';
break;
}
@@ -147,7 +147,7 @@ WHERE `mails_confirmed` < %s", $REF, $REF));
runFilterChain('run_sqls');
// Entry saved...
- $message = getMessage('SETTINGS_SAVED');
+ $message = '{--SETTINGS_SAVED--}';
// Destroy config cache file here...
rebuildCache('config', 'config');
diff --git a/inc/modules/admin/what-del_transfer.php b/inc/modules/admin/what-del_transfer.php
index bd575c1f0c..c48e0f3dc2 100644
--- a/inc/modules/admin/what-del_transfer.php
+++ b/inc/modules/admin/what-del_transfer.php
@@ -107,7 +107,7 @@ $content['rows'] = $OUT;
$content['total'] = translateComma($total);
// Set title
-$content['title'] = getMessage('TRANSFER_LIST_ALL');
+$content['title'] = '{--TRANSFER_LIST_ALL--}';
// Show delete button here
$content['delete'] = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" />
diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index b18689ddeb..f90c9c1e3b 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -91,7 +91,7 @@ LIMIT 1",
), __FILE__, __LINE__);
if (SQL_AFFECTEDROWS() == 1) {
- $content = getMessage('SETTINGS_SAVED');
+ $content = '{--SETTINGS_SAVED--}';
} else {
$content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
}
diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php
index d6f091d76a..b41767f444 100644
--- a/inc/modules/admin/what-edit_sponsor.php
+++ b/inc/modules/admin/what-edit_sponsor.php
@@ -102,10 +102,10 @@ LIMIT 1",
// Send email
$message = loadEmailTemplate('sponsor_add_points', $content);
sendEmail($content['email'], getMessage('ADMIN_SPONSOR_ADD_POINTS_SUBJ'), $message);
- $message = getMessage('ADMIN_SPONSOR_POINTS_ADDED');
+ $message = '{--ADMIN_SPONSOR_POINTS_ADDED--}';
} else {
// No points entered to add!
- $message = getMessage('ADMIN_SPONSPOR_NO_POINTS_TO_ADD');
+ $message = '{--ADMIN_SPONSPOR_NO_POINTS_TO_ADD--}';
}
break;
@@ -125,10 +125,10 @@ LIMIT 1",
// Send email
$message = loadEmailTemplate('sponsor_sub_points', $content);
sendEmail($content['email'], getMessage('ADMIN_SPONSOR_SUB_POINTS_SUBJ'), $message);
- $message = getMessage('ADMIN_SPONSOR_POINTS_SUBTRACTED');
+ $message = '{--ADMIN_SPONSOR_POINTS_SUBTRACTED--}';
} else {
// No points entered to add!
- $message = getMessage('ADMIN_SPONSPOR_NO_POINTS_TO_SUBTRACT');
+ $message = '{--ADMIN_SPONSPOR_NO_POINTS_TO_SUBTRACT--}';
}
break;
diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php
index a9acd58ae1..9952eb94e2 100644
--- a/inc/modules/admin/what-edit_user.php
+++ b/inc/modules/admin/what-edit_user.php
@@ -111,10 +111,10 @@ LIMIT 1",
postRequestParameter('email'),
bigintval(getRequestParameter('userid')),
), __FILE__, __LINE__);
- $content = getMessage('USER_ACCOUNT_SAVED');
+ $content = '{--USER_ACCOUNT_SAVED--}';
} else {
// Problem while saving data
- $content = getMessage('USER_ACCOUNT_NOT_SAVED');
+ $content = '{--USER_ACCOUNT_NOT_SAVED--}';
}
// Load template
diff --git a/inc/modules/admin/what-email_details.php b/inc/modules/admin/what-email_details.php
index 14f7e44c50..c761546c94 100644
--- a/inc/modules/admin/what-email_details.php
+++ b/inc/modules/admin/what-email_details.php
@@ -65,30 +65,34 @@ WHERE
ORDER BY
`timestamp` DESC";
-$WHO = getMessage('_ALL');
+$WHO = '{--_ALL--}';
$SQL2 = '';
if (isGetRequestParameterSet(('mid'))) {
// Only a specific mail shall be displayed
- $sql = "SELECT
+ $sql = sprintf("SELECT
`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `id`='".bigintval(getRequestParameter('mid'))."'
-LIMIT 1";
- $WHO = getMessage('MAIL_ID') . ': ' . getRequestParameter('mid');
+ `id`=%s
+LIMIT 1",
+ bigintval(getRequestParameter('mid'))
+ );
+ $WHO = '{--MAIL_ID--}' . ': ' . getRequestParameter('mid');
} elseif (isGetRequestParameterSet('userid')) {
// All mails by a specific member shall be displayed
- $sql = "SELECT
+ $sql = sprintf("SELECT
`id`, `sender`, `subject`, `text`, `receivers`, `payment_id`, `data_type`, `timestamp`, `url`, `target_send`, `cat_id`
FROM
`{?_MYSQL_PREFIX?}_pool`
WHERE
- `sender`='".bigintval(getRequestParameter('userid'))."'
+ `sender`=%s
ORDER BY
- `timestamp` DESC";
- $WHO = getMessage('USER_ID') . ': ' . getRequestParameter('userid');
+ `timestamp` DESC",
+ bigintval(getRequestParameter('userid'))
+ );
+ $WHO = '{--USER_ID--}' . ': ' . getRequestParameter('userid');
}
// Init result_bonus
diff --git a/inc/modules/admin/what-list_country.php b/inc/modules/admin/what-list_country.php
index d4f2fbdddc..43cda0efda 100644
--- a/inc/modules/admin/what-list_country.php
+++ b/inc/modules/admin/what-list_country.php
@@ -87,16 +87,16 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
$row = 'admin_list_country_edit_row';
$post = 'modify';
$class = 'admin_submit';
- $submit = getMessage('ADMIN_COUNTRY_EDIT_NOW');
- $title = getMessage('ADMIN_COUNTRY_EDIT_TITLE');
+ $submit = '{--ADMIN_COUNTRY_EDIT_NOW--}';
+ $title = '{--ADMIN_COUNTRY_EDIT_TITLE--}';
$reset = '<input type="reset" class="admin_reset" value="{--UNDO_SELECTIONS--}" /> ';
} else {
// Delete template
$row = 'admin_list_country_del_row';
$post = 'remove';
$class = 'admin_delete';
- $submit = getMessage('ADMIN_COUNTRY_DELETE_NOW');
- $title = getMessage('ADMIN_COUNTRY_DELETE_TITLE');
+ $submit = '{--ADMIN_COUNTRY_DELETE_NOW--}';
+ $title = '{--ADMIN_COUNTRY_DELETE_TITLE--}';
$reset = '';
}
@@ -156,14 +156,14 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
}
// Create message
- $message = getMessage('ADMIN_COUNTRIES_MODIFIED');
+ $message = '{--ADMIN_COUNTRIES_MODIFIED--}';
} elseif ((isFormSent('remove')) && (isPostRequestParameterSet('id'))) {
// Remove
$IDs = implode(',', array_keys(postRequestParameter('id')));
addSql("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_countries` WHERE `id` IN (".$IDs.") LIMIT ".count(postRequestParameter('id'))."");
// Create message
- $message = getMessage('ADMIN_COUNTRIES_REMOVED');
+ $message = '{--ADMIN_COUNTRIES_REMOVED--}';
}
if ((!empty($message)) && (countSqls() > 0)) {
diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php
index b56224f2cb..0bf30c0e8e 100644
--- a/inc/modules/admin/what-list_doubler.php
+++ b/inc/modules/admin/what-list_doubler.php
@@ -53,7 +53,7 @@ if (!isGetRequestParameterSet('mode')) {
if (!isGetRequestParameterSet('select')) setGetRequestParameter('select', 'all');
// Prepare header
- $content['list_' . strtolower(getRequestParameter('mode'))] = getMessage('ADMIN_DOUBLER_LIST_' . strtoupper(getRequestParameter('mode')) . '_' . strtoupper(getRequestParameter('select')).'');
+ $content['list_' . strtolower(getRequestParameter('mode'))] = '{--ADMIN_DOUBLER_LIST_' . strtoupper(getRequestParameter('mode')) . '_' . strtoupper(getRequestParameter('select')) . '--}';
}
// Load data for the template
diff --git a/inc/modules/admin/what-list_links.php b/inc/modules/admin/what-list_links.php
index b0c69441bb..e3201889f1 100644
--- a/inc/modules/admin/what-list_links.php
+++ b/inc/modules/admin/what-list_links.php
@@ -91,7 +91,7 @@ if (isGetRequestParameterSet('userid')) {
// Initializes some variables
$cat = '';
$DATA = '';
- $PROBLEM = getMessage('GENERAL_MAIL_PROBLEM');
+ $PROBLEM = '{--GENERAL_MAIL_PROBLEM--}';
$result_data = false; // Closes Bug #58
// Load data from stats table...
@@ -100,14 +100,14 @@ if (isGetRequestParameterSet('userid')) {
case 'NORMAL':
$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp_ordered` AS `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_user_stats` WHERE `id`=%s LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
- $type = 'mailid'; $DATA = $id; $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+ $type = 'mailid'; $DATA = $id; $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
$LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&mailid=' . $id . '%}" target="_blank">' . $id . '</a>';
break;
case 'BONUS':
$result_data = SQL_QUERY_ESC("SELECT `subject`, `timestamp`, `cat_id` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`=%s LIMIT 1",
array(bigintval($id2)), __FILE__, __LINE__);
- $type = 'bonusid'; $DATA = $id2; $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+ $type = 'bonusid'; $DATA = $id2; $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
$LINK = '<a href="{%url=mailid.php?userid=' . getRequestParameter('userid') . '&bonusid=' . $id2 . '%}" target="_blank">' . $id2 . '</a>';
break;
@@ -122,7 +122,7 @@ if (isGetRequestParameterSet('userid')) {
$content = SQL_FETCHARRAY($result_data);
// Fix empty subject
- if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+ if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
// Prepare data for the row template
$content = array(
diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index 4f4d42c43d..4fa53756a5 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -75,7 +75,7 @@ if (isGetRequestParameterSet(('pid'))) {
debug_report_bug(__FILE__, __LINE__, 'No user account ' . $userid . ' found.');
} // END - if
- if ((getRequestParameter('do') == 'accept') && (!empty(getUserData('email')))) {
+ if ((getRequestParameter('do') == 'accept') && (getUserData('email') != '')) {
// Ok, now we can output the form or execute accepting
if (isFormSent()) {
// Obtain payout type and other data
@@ -173,7 +173,7 @@ LIMIT 1",
// Load template
loadTemplate('admin_payout_accept_form', false, $content);
}
- } elseif ((getRequestParameter('do') == 'reject') && (!empty(getUserData('email')))) {
+ } elseif ((getRequestParameter('do') == 'reject') && (getUserData('email') != '')) {
// Ok, now we can output the form or execute rejecting
if (isFormSent()) {
if ($task > 0) {
diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 205d3c2139..81cc4ae8ae 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -123,10 +123,10 @@ if (isGetRequestParameterSet('rallye')) {
runFilterChain('run_sqls');
// Output message
- $message = getMessage('RALLYE_DELETED');
+ $message = '{--RALLYE_DELETED--}';
} else {
// No rallye selected to delete!
- $message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
+ $message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
}
} elseif (isFormSent('change')) {
// Change rallye
@@ -173,7 +173,7 @@ LIMIT 1",
runFilterChain('run_sqls');
// Output message
- $message = getMessage('RALLYE_CHANGED');
+ $message = '{--RALLYE_CHANGED--}';
}
}
@@ -349,12 +349,12 @@ ORDER BY
case 'Y':
// Rallye is active so do not edit it!
$row['select'] = '<div class="big">' . $row['id'] . '</div>';
- $row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
+ $row['active_title'] = '{--RALLYE_DEACTIVATE_NOW--}';
$row['active'] = '0';
break;
case 'N':
- $row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
+ $row['active_title'] = '{--RALLYE_ACTIVATE_NOW--}';
$row['active'] = 1;
break;
} // END - switch
@@ -362,12 +362,12 @@ ORDER BY
// Notification to members?
switch ($data['send_notify']) {
case 'Y':
- $row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
+ $row['notify_title'] = '{--RALLYE_STOP_NOTIFY_NOW--}';
$row['notify'] = '0';
break;
case 'N':
- $row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
+ $row['notify_title'] = '{--RALLYE_START_NOTIFY_NOW--}';
$row['notify'] = 1;
break;
} // END - switch
@@ -375,12 +375,12 @@ ORDER BY
// Auto-add of new joined members?
switch ($data['auto_add_new_user']) {
case 'Y':
- $row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
+ $row['auto_title'] = '{--RALLYE_STOP_AUTO_ADD_NOW--}';
$row['auto'] = '0';
break;
case 'N':
- $row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
+ $row['auto_title'] = '{--RALLYE_START_AUTO_ADD_NOW--}';
$row['auto'] = 1;
break;
} // END - switch
diff --git a/inc/modules/admin/what-list_sponsor_pay.php b/inc/modules/admin/what-list_sponsor_pay.php
index f0874d6a17..b4636b937b 100644
--- a/inc/modules/admin/what-list_sponsor_pay.php
+++ b/inc/modules/admin/what-list_sponsor_pay.php
@@ -92,7 +92,7 @@ LIMIT 1",
}
// Generate message
- $message = getMessage('SPONSOR_PAY_ENTRIES_CHANGED');
+ $message = '{--SPONSOR_PAY_ENTRIES_CHANGED--}';
} elseif (isFormSent('remove')) {
// Remove entries here...
foreach (postRequestParameter('id') as $id => $sel) {
@@ -102,7 +102,7 @@ LIMIT 1",
}
// Generate message
- $message = getMessage('SPONSOR_PAY_ENTRIES_REMOVED');
+ $message = '{--SPONSOR_PAY_ENTRIES_REMOVED--}';
}
if (!empty($message)) {
diff --git a/inc/modules/admin/what-list_surfbar_actions.php b/inc/modules/admin/what-list_surfbar_actions.php
index 60c3948e53..c2908405e1 100644
--- a/inc/modules/admin/what-list_surfbar_actions.php
+++ b/inc/modules/admin/what-list_surfbar_actions.php
@@ -71,7 +71,7 @@ if (SQL_NUMROWS($result) > 0) {
$content['actions_new_status'] = translateSurfbarUrlStatus($content['actions_new_status']);
} else {
// "Do nothing" status
- $content['actions_new_status'] = getMessage('SURFBAR_URL_STATUS_NONE');
+ $content['actions_new_status'] = '{--SURFBAR_URL_STATUS_NONE--}';
}
// Add color
diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index 97957c0b8b..18749aaa98 100644
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -142,7 +142,7 @@ ORDER BY
}
// There are uncompleted jobs!
- $type = getMessage('ADMIN_OVERVIEW_TASK_'.strtoupper(getRequestParameter('type')).'_TYPE');
+ $type = '{--ADMIN_OVERVIEW_TASK_' . strtoupper(getRequestParameter('type')) . '_TYPE--}';
// @TODO Rewrite these templates to one and add $OUT
loadTemplate('admin_overview_header_task', false, array(
'message' => $type,
@@ -157,7 +157,7 @@ ORDER BY
$content['assigned_admin'] = generateAdminLink($content['assigned_admin']);
// Get admin task
- $content['task_type_msg'] = getMessage('ADMIN_TASK_IS_'.strtoupper($content['task_type']).'');
+ $content['task_type_msg'] = '{--ADMIN_TASK_IS_' . strtoupper($content['task_type']) . '--}';
// Generate infos
switch ($content['task_type']) {
diff --git a/inc/modules/admin/what-list_transfer.php b/inc/modules/admin/what-list_transfer.php
index 7413805395..fe7fea5f0a 100644
--- a/inc/modules/admin/what-list_transfer.php
+++ b/inc/modules/admin/what-list_transfer.php
@@ -83,13 +83,13 @@ if (SQL_NUMROWS($result) > 0) {
$content['rows'] = $OUT;
// Remeber total amount
-$content['total'] = translateComma($total);
+$content['total'] = $total;
// Set title
-$content['title'] = getMessage('TRANSFER_LIST_ALL');
+$content['title'] = '{--TRANSFER_LIST_ALL--}';
// Set "balance" word
-$content['balance'] = getMessage('TRANSFER_TOTAL_BALANCE');
+$content['balance'] = '{--TRANSFER_TOTAL_BALANCE--}';
// Don't show a delete button
$content['delete'] = ' ';
diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php
index 5c8220c823..b8ce952787 100644
--- a/inc/modules/admin/what-list_user.php
+++ b/inc/modules/admin/what-list_user.php
@@ -159,7 +159,7 @@ LIMIT 1",
if ((empty($content['nickname'])) || ($content['nickname'] == $userid)) $content['nickname'] = '---';
} else {
// Extension not found
- $content['nickname'] = getMessage('EXT_NICKNAME_404');
+ $content['nickname'] = '{--EXT_NICKNAME_404--}';
}
// Clickrate
@@ -335,7 +335,7 @@ LIMIT 1",
$content['rows'] = $OUT;
// Init title with "all accounts"
- $content['title'] = getMessage('ADMIN_ALL_ACCOUNTS');
+ $content['title'] = '{--ADMIN_ALL_ACCOUNTS--}';
if (isGetRequestParameterSet(('status'))) {
// Set title according to the 'status'
$content['title'] = getMessage(sprintf("ADMIN_LIST_STATUS_%s_ACCOUNTS", strtoupper(getRequestParameter(('status')))));
diff --git a/inc/modules/admin/what-list_yoomedia_tm.php b/inc/modules/admin/what-list_yoomedia_tm.php
index 617f41263e..bc9a516af7 100644
--- a/inc/modules/admin/what-list_yoomedia_tm.php
+++ b/inc/modules/admin/what-list_yoomedia_tm.php
@@ -99,7 +99,6 @@ $OUT = ''; $SW = 2;
foreach ($result as $entry) {
// Translate some data
$entry['pay'] = translateComma($entry['pay'], true, 5);
- $entry['remain'] = translateComma($entry['remain']);
$entry['sw'] = $SW;
// Check reload lock
@@ -125,7 +124,7 @@ foreach ($result as $entry) {
$entry['already'] = getMaskedMessage('ADMIN_YOOMEDIA_TEXTMAIL_SEND_AGAIN', createFancyTime($countdown));
} else {
// Never resentable unless manual removal
- $entry['already'] = getMessage('ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED');
+ $entry['already'] = '{--ADMIN_YOOMEDIA_TEXTMAIL_MANUALLY_LOCKED--}';
}
// Load row template for displaying
diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php
index fa24ea4180..a59eaf4e04 100644
--- a/inc/modules/admin/what-lock_sponsor.php
+++ b/inc/modules/admin/what-lock_sponsor.php
@@ -56,7 +56,6 @@ if (isGetRequestParameterSet('id')) {
if (($content['status'] == 'CONFIRMED') || ($content['status'] == 'LOCKED')) {
// Transfer data to constants
- $content['gender'] = translateGender($content['gender']);
$content['id'] = bigintval(getRequestParameter('id'));
$content['reason'] = secureString(postRequestParameter('reason'));
@@ -64,13 +63,13 @@ if (isGetRequestParameterSet('id')) {
// Create messages
if ($content['status'] == 'CONFIRMED') {
// Message when sponsor's account got lock
- $content['message'] = getMessage('SPONSOR_ACCOUNT_LOCKED');
- $subject = getMessage('SPONSOR_SUBJECT_LOCKED');
+ $content['message'] = '{--SPONSOR_ACCOUNT_LOCKED--}';
+ $subject = '{--SPONSOR_SUBJECT_LOCKED--}';
$content['status'] = 'LOCKED';
} else {
// Message when sponsor's account got unlock
- $content['message'] = getMessage('SPONSOR_ACCOUNT_UNLOCKED');
- $subject = getMessage('SPONSOR_SUBJECT_UNLOCKED');
+ $content['message'] = '{--SPONSOR_ACCOUNT_UNLOCKED--}';
+ $subject = '{--SPONSOR_SUBJECT_UNLOCKED--}';
$content['status'] = 'CONFIRMED';
}
@@ -90,12 +89,12 @@ if (isGetRequestParameterSet('id')) {
// Create header and text messages
if ($content['status'] == 'CONFIRMED') {
// Messages when sponsor's account is confirmed
- $content['header_message'] = getMessage('SPONSOR_LOCK_SPONSOR_HEADER');
- $content['text_message'] = getMessage('SPONSOR_LOCK_SPONSOR_TEXT');
+ $content['header_message'] = '{--SPONSOR_LOCK_SPONSOR_HEADER--}';
+ $content['text_message'] = '{--SPONSOR_LOCK_SPONSOR_TEXT--}';
} else {
// Messages when sponsor's account is locked
- $content['header_message'] = getMessage('SPONSOR_UNLOCK_SPONSOR_HEADER');
- $content['text_message'] = getMessage('SPONSOR_UNLOCK_SPONSOR_TEXT');
+ $content['header_message'] = '{--SPONSOR_UNLOCK_SPONSOR_HEADER--}';
+ $content['text_message'] = '{--SPONSOR_UNLOCK_SPONSOR_TEXT--}';
}
// Create email link
@@ -106,7 +105,7 @@ if (isGetRequestParameterSet('id')) {
}
} else {
// Cannot change status on unconfirmed or pending accounts!
- $message = getMessage('ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS');
+ $message = '{--ADMIN_SPONSPOR_CANNOT_LOCK_PENDING_UNCINFIRMED_ACCOUNTS--}';
}
} else {
// Sponsor not found!
@@ -117,7 +116,7 @@ if (isGetRequestParameterSet('id')) {
SQL_FREERESULT($result_sponsor);
} else {
// Not called by what-list_sponsor.php
- $message = getMessage('ADMIN_CALL_NOT_DIRECTLY');
+ $message = '{--ADMIN_CALL_NOT_DIRECTLY--}';
}
if (!empty($message)) {
diff --git a/inc/modules/admin/what-maintenance.php b/inc/modules/admin/what-maintenance.php
index 145cc95d3e..5f3154dcea 100644
--- a/inc/modules/admin/what-maintenance.php
+++ b/inc/modules/admin/what-maintenance.php
@@ -40,7 +40,7 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
addMenuDescription('admin', __FILE__);
@@ -50,12 +50,12 @@ if (isFormSent()) {
switch (getConfig('maintenance')) {
case 'Y':
$target_mode = 'N';
- $out = getMessage('ADMIN_MAINTENANCE_DEACTIVATED');
+ $out = '{--ADMIN_MAINTENANCE_DEACTIVATED--}';
break;
case 'N':
$target_mode = 'Y';
- $out = getMessage('ADMIN_MAINTENANCE_ACTIVATED');
+ $out = '{--ADMIN_MAINTENANCE_ACTIVATED--}';
break;
}
@@ -67,11 +67,11 @@ if (isFormSent()) {
} else {
switch (getConfig('maintenance')) {
case 'Y': // Maintenance mode is active
- $message = getMessage('ADMIN_MAINTENANCE_MODE_IS_ACTIVE');
+ $message = '{--ADMIN_MAINTENANCE_MODE_IS_ACTIVE--}';
break;
case 'N': // Maintenance mode is inactive
- $message = getMessage('ADMIN_MAINTENANCE_MODE_IS_INACTIVE');
+ $message = '{--ADMIN_MAINTENANCE_MODE_IS_INACTIVE--}';
break;
}
diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index 57ee9229e1..102e4ca1bb 100644
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -191,7 +191,7 @@ if (!isFormSent()) {
bigintval(postRequestParameter('sort')),
), __FILE__, __LINE__);
}
- loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED'));
+ loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED');
} else {
// Demo mode!
loadTemplate('admin_settings_saved', false, '{--SETTINGS_NOT_SAVED--}');
diff --git a/inc/modules/admin/what-optimize.php b/inc/modules/admin/what-optimize.php
index 1290113e3a..cfdd26f694 100644
--- a/inc/modules/admin/what-optimize.php
+++ b/inc/modules/admin/what-optimize.php
@@ -58,16 +58,16 @@ foreach ($DATA['tables'] as $row_array) {
if (empty($row_array[1])) $row_array[1] = 'NONE';
// Get optimization status
- $REP = getMessage('OPTIMIZE_STATUS_' . strtoupper($row_array[1]).'');
+ $REP = '{--OPTIMIZE_STATUS_' . strtoupper($row_array[1]) . '--}';
- $OPT = getMessage('OPTIMIZE_STATUS_UNSUPPORTED');
+ $OPT = '{--OPTIMIZE_STATUS_UNSUPPORTED--}';
if ($row_array[4] > 0) {
- $OPT = getMessage('OPTIMIZE_STATUS_OPTIMIZED');
+ $OPT = '{--OPTIMIZE_STATUS_OPTIMIZED--}';
$B1 = '<strong>'; $B2 = '<strong>';
$gain_tabs++;
} elseif (count(explode(' ', $row_array[2])) == 0) {
- $OPT = getMessage('OPTIMIZE_STATUS_' . strtoupper($row_array[2]).'');
+ $OPT = '{--OPTIMIZE_STATUS_' . strtoupper($row_array[2]) . '--}';
}
// Prepare data for the row template
diff --git a/inc/modules/admin/what-refbanner.php b/inc/modules/admin/what-refbanner.php
index dae9146b22..95bfc0973d 100644
--- a/inc/modules/admin/what-refbanner.php
+++ b/inc/modules/admin/what-refbanner.php
@@ -90,7 +90,7 @@ VALUES ('%s','%s','%s')",
// Check if we have saved (updated)
if (SQL_AFFECTEDROWS() == 1) {
// Updated!
- $content = getMessage('SETTINGS_SAVED');
+ $content = '{--SETTINGS_SAVED--}';
} else {
// Nothing has been updated
$content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php
index 946b9cab16..00cb2d514e 100644
--- a/inc/modules/admin/what-repair_amnu.php
+++ b/inc/modules/admin/what-repair_amnu.php
@@ -68,12 +68,12 @@ SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`='999' WHERE `action`
// Now sort every each menu
foreach ($ACTIONS as $action) {
- $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
+ $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC",
array($action), __FILE__, __LINE__);
$cnt = 1;
while ($content = SQL_FETCHARRAY($result_fix)) {
// Fix weight
- SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admin_menu` SET `sort`=%s WHERE `id`=%s LIMIT 1",
array($cnt, $content['id']), __FILE__, __LINE__);
$REP += SQL_AFFECTEDROWS();
@@ -86,7 +86,7 @@ foreach ($ACTIONS as $action) {
if ($REP > 0) {
$message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REP);
} else {
- $message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
+ $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
}
// Output message
diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php
index 63a9f4413c..a3b3ce3e34 100644
--- a/inc/modules/admin/what-repair_gmnu.php
+++ b/inc/modules/admin/what-repair_gmnu.php
@@ -87,7 +87,7 @@ foreach ($ACTIONS as $action) {
if ($REP > 0) {
$message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REP);
} else {
- $message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
+ $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
}
// Output message
diff --git a/inc/modules/admin/what-repair_mmnu.php b/inc/modules/admin/what-repair_mmnu.php
index d9b8ed255f..9ce232fef3 100644
--- a/inc/modules/admin/what-repair_mmnu.php
+++ b/inc/modules/admin/what-repair_mmnu.php
@@ -86,7 +86,7 @@ foreach ($ACTIONS as $action) {
if ($REP > 0) {
$message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REP);
} else {
- $message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
+ $message = '{--ADMIN_REPAIR_NOTHING_FIXED--}';
}
// Output message
diff --git a/inc/modules/admin/what-theme_edit.php b/inc/modules/admin/what-theme_edit.php
index a870ab77e0..dbc3674a82 100644
--- a/inc/modules/admin/what-theme_edit.php
+++ b/inc/modules/admin/what-theme_edit.php
@@ -63,11 +63,11 @@ if (countPostSelection() > 0) {
} else {
$sql = "UPDATE `{?_MYSQL_PREFIX?}_themes` SET `theme_active`='Y' WHERE `id`=%s LIMIT 1";
}
- $OUT = getMessage('ADMIN_THEMES_UPDATED');
+ $OUT = '{--ADMIN_THEMES_UPDATED--}';
} elseif (isFormSent('del')) {
// Delete themes
$sql = "DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_themes` WHERE `id`=%s LIMIT 1";
- $OUT = getMessage('ADMIN_THEMES_DELETED');
+ $OUT = '{--ADMIN_THEMES_DELETED--}';
}
// Run SQL command?
@@ -81,7 +81,7 @@ if (countPostSelection() > 0) {
} // END - foreach
// Output generated?
- if (empty($OUT)) $OUT = getMessage('ADMIN_THEME_NO_OUTPUT');
+ if (empty($OUT)) $OUT = '{--ADMIN_THEME_NO_OUTPUT--}';
} elseif (isGetRequestParameterSet('default_theme')) {
// Escape string from input
$postData['default_theme'] = getRequestParameter('default_theme');
diff --git a/inc/modules/admin/what-unlock_emails.php b/inc/modules/admin/what-unlock_emails.php
index 83eb8c0cd2..e5e116a770 100644
--- a/inc/modules/admin/what-unlock_emails.php
+++ b/inc/modules/admin/what-unlock_emails.php
@@ -115,10 +115,10 @@ LIMIT 1",
} // END - foreach
// Set message
- $message = getMessage('ADMIN_MAILS_ACTIVATED');
+ $message = '{--ADMIN_MAILS_ACTIVATED--}';
} else {
// Nothing checked!
- $message = getMessage('ADMIN_MAILS_NOTHING_CHECKED');
+ $message = '{--ADMIN_MAILS_NOTHING_CHECKED--}';
}
// Mails unlocked for mail delivery
@@ -217,7 +217,7 @@ LIMIT 1",
loadTemplate('admin_settings_saved', false, '{--ADMIN_URL_BLACKLIST_DISABLED--}');
} else {
// Wrong call!
- loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_WRONG_CALL--}');
}
} else {
// No mail orders fond
diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php
index e8676e512a..b4af6fa752 100644
--- a/inc/modules/admin/what-unlock_sponsor.php
+++ b/inc/modules/admin/what-unlock_sponsor.php
@@ -94,7 +94,7 @@ ORDER BY
$content = merge_array($content, $content2);
// Set default email
- $content['email'] = getMessage('SPONSOR_NO_ADMIN');
+ $content['email'] = '{--SPONSOR_NO_ADMIN--}';
if ($content['admin_id'] > 0) {
// Load admin's email address for contact
$content['email'] = getAdminEmail($content['admin_id']);
@@ -113,7 +113,7 @@ ORDER BY
}
} else {
// No payments found
- $content['message'] = getMessage('SPONSOR_NO_PAYMENTS_FOUND');
+ $content['message'] = '{--SPONSOR_NO_PAYMENTS_FOUND--}';
}
// Free memory
diff --git a/inc/modules/admin/what-usr_online.php b/inc/modules/admin/what-usr_online.php
index e0c4136358..a19cb85f15 100644
--- a/inc/modules/admin/what-usr_online.php
+++ b/inc/modules/admin/what-usr_online.php
@@ -69,10 +69,10 @@ if (isExtensionActive('online')) {
if ($row['is_admin'] == 'Y') {
// Is an administrator
- $row['userid'] = getMessage('_IS_ADMIN');
+ $row['userid'] = '{--_IS_ADMIN--}';
} elseif (($row['is_member'] != 'Y') && ($row['is_admin'] != 'Y')) {
// Is a guest
- $row['userid'] = getMessage('_IS_GUEST');
+ $row['userid'] = '{--_IS_GUEST--}';
} elseif (isValidUserId($row['userid'])) {
// Add profile link to userid
$row['userid'] = generateUserProfileLink($row['userid']);
@@ -92,7 +92,7 @@ if (isExtensionActive('online')) {
// Remember rows and fancy time in array
$content['rows'] = $OUT;
- $content['online_timeout'] = getMessage('ONLINE_TIMEOUT_IS');
+ $content['online_timeout'] = '{--ONLINE_TIMEOUT_IS--}';
// Load footer template
loadTemplate('admin_list_online', false, $content);
diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php
index 1121248be5..38018fd621 100644
--- a/inc/modules/guest/what-confirm.php
+++ b/inc/modules/guest/what-confirm.php
@@ -136,7 +136,7 @@ LIMIT 1",
// Lead-Code mode enabled
redirectToUrl('lead-confirm.php');
} else {
- $content['message'] = getMessage('GUEST_CONFIRMED_DONE');
+ $content['message'] = '{--GUEST_CONFIRMED_DONE--}';
$content['userid'] = bigintval($userid);
}
} elseif (isExtensionActive('lead')) {
@@ -147,11 +147,11 @@ LIMIT 1",
redirectToUrl('lead-confirm.php');
} else {
// Nobody was found unter this hash key... or our new member want's to confirm twice?
- $content['message'] = getMessage('GUEST_CONFIRMED_TWICE');
+ $content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
}
} else {
// Nobody was found unter this hash key... or our new member want's to confirm twice?
- $content['message'] = getMessage('GUEST_CONFIRMED_TWICE');
+ $content['message'] = '{--GUEST_CONFIRMED_TWICE--}';
}
// Load template
@@ -172,20 +172,20 @@ LIMIT 1",
sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
// And set message
- $content['message'] = getMessage('CONFIRM_LINK_SENT');
+ $content['message'] = '{--CONFIRM_LINK_SENT--}';
break;
case 'CONFIRMED': // Account already confirmed
- $content['message'] = getMessage('LOGIN_ID_CONFIRMED');
+ $content['message'] = '{--LOGIN_ID_CONFIRMED--}';
break;
case 'LOCKED': // Account is locked
- $content['message'] = getMessage('LOGIN_ID_LOCKED');
+ $content['message'] = '{--LOGIN_ID_LOCKED--}';
break;
} // END - switch
} else {
// Email address not registered
- $content['message'] = getMessage('EMAIL_404');
+ $content['message'] = '{--EMAIL_404--}';
}
// Load template
diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index 8457a98c8c..a4809fb0af 100644
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -51,7 +51,7 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
} // END - if
// 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/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index 232520584a..f712818c33 100644
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -78,11 +78,11 @@ if (SQL_NUMROWS($result) == 1) {
$expired = false;
if ($end < time()) {
// Rallye is expired
- $content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+ $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
$expired = true;
} elseif (time() >= ($end - getConfig('ONE_DAY'))) {
// Rallye will expire in less one day!
- $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
+ $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
} else {
$content['extras'] = '<a href="{%url=modules.php?module=index&what=register%}">{--RALLYE_REGISTER_NOW--}</a>';
}
@@ -115,11 +115,11 @@ if (SQL_NUMROWS($result) == 1) {
if ($expired === true) {
$content['prices'] = addReferalRallyeWinners($id);
$content['top_users'] = '<div align="center" class="big">' . $content['extras'] . '</div>';
- $content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
+ $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
} else {
$content['prices'] = addReferalRallyePrices($id, 'html');
$content['top_users'] = addReferalRallyeTopUsers($id, getMemberId());
- $content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+ $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
}
// And load final template
diff --git a/inc/modules/guest/what-sponsor_infos.php b/inc/modules/guest/what-sponsor_infos.php
index a60c582d2b..420778fbb9 100644
--- a/inc/modules/guest/what-sponsor_infos.php
+++ b/inc/modules/guest/what-sponsor_infos.php
@@ -87,7 +87,7 @@ if (SQL_NUMROWS($result_act) > 0) {
$OUT_PAY = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result_pay)) {
// Prepare data for the row template
- $content['sw'] => $SW;
+ $content['sw'] = $SW;
// Load row template and switch color
$OUT_PAY .= loadTemplate('guest_sponsor_pay_row', true, $content);
diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php
index 10672fb648..18c3ba173b 100644
--- a/inc/modules/guest/what-sponsor_reg.php
+++ b/inc/modules/guest/what-sponsor_reg.php
@@ -60,139 +60,139 @@ if (isFormSent()) {
// 1. Salutation / Surname / family name
if (!isPostRequestParameterSet('gender')) {
// Surname is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_NO_GENDER_SELECTED');
+ $FORM_ERRORS[] = '{--SPONSOR_NO_GENDER_SELECTED--}';
} // END - if
if (!isPostRequestParameterSet('surname')) {
// Surname is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_SURNAME_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_SURNAME_IS_EMPTY--}';
} // END - if
if (!isPostRequestParameterSet('family')) {
// Surname is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_FAMILY_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_FAMILY_IS_EMPTY--}';
} // END - if
// 2. Company name
- // 012 3 32 23 4 43 3 4 4321 12 3 32 2 3 3210
+ // 012 3 32 23 4 43 3 4 4321 12 3 32 2 3 3210
if (((!isPostRequestParameterSet('company')) && ((isPostRequestParameterSet('tax_ident')) || (isPostRequestParameterSet('position')))) || ((isPostRequestParameterSet('company')) && (!isPostRequestParameterSet('tax_ident')))) {
if (!isPostRequestParameterSet('company')) {
// Company name is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_COMPANY_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_COMPANY_IS_EMPTY--}';
} elseif (!isPostRequestParameterSet('tax_ident')) {
// Tax ident number name is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_TAX_IDENT_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_TAX_IDENT_IS_EMPTY--}';
}
if (!isPostRequestParameterSet('position')) {
// Not fatal but not nice: position in company is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_POSITION_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_POSITION_IS_EMPTY--}';
} // END - if
} // END - if
// 3. Street and number
if (!isPostRequestParameterSet('street_nr1')) {
// Street name and house number are empty
- $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_STREET_NR1_IS_EMPTY--}';
} elseif ((isPostRequestParameterSet('street_nr2')) && (!isPostRequestParameterSet('street_nr1'))) {
// 1st line for street is empty, but 2nd line not
- $FORM_ERRORS[] = getMessage('SPONSOR_STREET_NR1_IS_EMPTY_2_NOT');
+ $FORM_ERRORS[] = '{--SPONSOR_STREET_NR1_IS_EMPTY_2_NOT--}';
}
// 4. Country code
if (!isPostRequestParameterSet('country')) {
// Country code is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_COUNTRY_IS_EMPTY');
+ $FORM_ERRORS[] = '{--kSPONSOR_COUNTRY_IS_EMPTY--}';
} elseif (strlen(postRequestParameter('country')) != 2) {
// Country code is invalid
- $FORM_ERRORS[] = getMessage('SPONSOR_COUNTRY_IS_INVALID');
+ $FORM_ERRORS[] = '{--SPONSOR_COUNTRY_IS_INVALID--}';
}
// 3. ZIP code
if (!isPostRequestParameterSet('zip')) {
// ZIP code is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_ZIP_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_ZIP_IS_EMPTY--}';
} elseif (bigintval(postRequestParameter('zip')) != postRequestParameter('zip')) {
// ZIP is invalid
- $FORM_ERRORS[] = getMessage('SPONSOR_ZIP_IS_INVALID');
+ $FORM_ERRORS[] = '{--SPONSOR_ZIP_IS_INVALID--}';
setPostRequestParameter('zip', '');
}
// 4. City
if (!isPostRequestParameterSet('city')) {
// City is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_CITY_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_CITY_IS_EMPTY--}';
} // END - if
// 5. Phone number
if (!isPostRequestParameterSet('phone')) {
// City is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_PHONE_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_PHONE_IS_EMPTY--}';
} // END - if
// 6. Homepage URL
if (!isPostRequestParameterSet('url')) {
// Homepage URL is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_URL_IS_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_URL_IS_EMPTY--}';
} elseif (!isUrlValid(postRequestParameter('url'))) {
// Homepage URL is invalid
- $FORM_ERRORS[] = getMessage('SPONSOR_URL_IS_INVALID');
+ $FORM_ERRORS[] = '{--SPONSOR_URL_IS_INVALID--}';
setPostRequestParameter('url', '');
}
// 7. Light validation of email address
if ((!isPostRequestParameterSet('email')) || (postRequestParameter('email') == '@')) {
// Email is invalid/empty
- $FORM_ERRORS[] = getMessage('SPONSOR_EMAIL_IS_INVALID');
+ $FORM_ERRORS[] = '{--SPONSOR_EMAIL_IS_INVALID--}';
} elseif (isSponsorRegisteredWithEmail(postRequestParameter('email'))) {
// Email already found in database!
- $FORM_ERRORS[] = getMessage('SPONSOR_EMAIL_IS_ALREADY_REGISTERED');
+ $FORM_ERRORS[] = '{--SPONSOR_EMAIL_IS_ALREADY_REGISTERED--}';
setPostRequestParameter('email', '');
}
// 8. Pay type selected?
if (!isPostRequestParameterSet('pay_type')) {
// Not pay type selected
- $FORM_ERRORS[] = getMessage('SPONSOR_NO_PAYTYPE_SELECTED');
+ $FORM_ERRORS[] = '{--SPONSOR_NO_PAYTYPE_SELECTED--}';
} // END - if
// 9. Interval of mails
if (!isPostRequestParameterSet('warning_interval')) {
// No warning interval selected
- $FORM_ERRORS[] = getMessage('SPONSOR_NO_WARNING_INTERVAL_SELECTED');
+ $FORM_ERRORS[] = '{--SPONSOR_NO_WARNING_INTERVAL_SELECTED--}';
} // END - if
// 10. Mail notifications disabled/enabled
if (!isPostRequestParameterSet('receive_warnings')) {
// Option not selected!
- $FORM_ERRORS[] = getMessage('SPONSOR_NO_RECEIVE_WARNINGS_SELECTED');
+ $FORM_ERRORS[] = '{--SPONSOR_NO_RECEIVE_WARNINGS_SELECTED--}';
} // END - if
// Did he enter his password twice?
if (((!isPostRequestParameterSet('pass1')) || (!isPostRequestParameterSet('pass2'))) || ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')))) {
if ((postRequestParameter('pass1') != postRequestParameter('pass2')) && (isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
// Passwords missmatch
- $FORM_ERRORS[] = getMessage('SPONSOR_PASSWORDS_MISMATCH');
+ $FORM_ERRORS[] = '{--SPONSOR_PASSWORDS_MISMATCH--}';
} else {
if (!isPostRequestParameterSet('pass1')) {
// Password 1 is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_PASSWORD1_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_PASSWORD1_EMPTY--}';
}
if (!isPostRequestParameterSet('pass2')) {
// Password 2 is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_PASSWORD2_EMPTY');
+ $FORM_ERRORS[] = '{--SPONSOR_PASSWORD2_EMPTY--}';
}
}
} elseif (strlen(postRequestParameter('pass1')) < getConfig('pass_len')) {
// Password is to short!
- $FORM_ERRORS[] = getMessage('SPONSOR_PASSWORD_TOO_SHORT');
+ $FORM_ERRORS[] = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
}
// Check if he has accepted the terms&conditions
if (!isPostRequestParameterSet('terms')) {
// Homepage URL is empty
- $FORM_ERRORS[] = getMessage('SPONSOR_TERMS_NOT_ACCEPTED');
+ $FORM_ERRORS[] = '{--SPONSOR_TERMS_NOT_ACCEPTED--}';
} // END - if
// If there is something wrong/missing stop registration
diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php
index f605c8fc0d..d289d11caa 100644
--- a/inc/modules/guest/what-stats.php
+++ b/inc/modules/guest/what-stats.php
@@ -71,7 +71,7 @@ switch (getRequestParameter('mode')) {
}
// Set link title
-$ltitle = getMessage('GUEST_STATS_' . strtoupper($lmode));
+$ltitle = '{--GUEST_STATS_' . strtoupper($lmode) . '--}';
// @TODO This can be rewritten in a dynamic include
switch (getConfig('guest_stats')) {
diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index 520853db57..c6e61825a6 100644
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -62,7 +62,7 @@ if (isExtensionActive('nickname')) {
} // END - if
// 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(getMemberId(), 'Y', 'N', 'DESC');
diff --git a/inc/modules/member/what-nickname.php b/inc/modules/member/what-nickname.php
index 7a9e7b5114..294973e4ce 100644
--- a/inc/modules/member/what-nickname.php
+++ b/inc/modules/member/what-nickname.php
@@ -74,13 +74,13 @@ if ($isValid === true) {
// Nickname not in use, so set it now
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `nickname`='%s' WHERE `userid`=%s LIMIT 1",
array(postRequestParameter('nickname'), getMemberId()), __FILE__, __LINE__);
- $content = getMessage('NICKNAME_SAVED');
+ $content = '{--NICKNAME_SAVED--}';
} else {
// Free result
SQL_FREERESULT($result);
// Nickname already in use!
- $content = getMessage('NICKNAME_ALREADY_IN_USE');
+ $content = '{--NICKNAME_ALREADY_IN_USE--}';
}
// Load template
diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index 1e3301a939..b6dcc84b2f 100644
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -557,7 +557,7 @@ LIMIT 1",
// Check how many mail orders he has placed today and how many he's allowed to send
switch (getConfig('order_max_full')) {
case 'MAX': // He is allowed to send as much as possible
- $content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_MAX');
+ $content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_MAX--}';
break;
case 'ORDER': // He is allowed to send as much as he setup the receiving value
@@ -566,7 +566,7 @@ LIMIT 1",
default: // Unknown/invalid
logDebugMessage(__FILE__, __LINE__, sprintf("Unknown order_mas_full config detected.", getConfig('order_max_full')));
- $content['order_max_full'] = getMessage('MEMBER_ORDER_ALLOWED_UNKNOWN');
+ $content['order_max_full'] = '{--MEMBER_ORDER_ALLOWED_UNKNOWN--}';
break;
} // END - switch
diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index 52b1964800..ac5b58d53a 100644
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -77,11 +77,11 @@ if (SQL_NUMROWS($result) == 1) {
$expired = false;
if ($content['end_time'] < time()) {
// Rallye is expired
- $content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+ $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
$expired = true;
} elseif (time() >= ($content['end_time'] - getConfig('ONE_DAY'))) {
// Rallye will expire in less one day!
- $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
+ $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
} else {
// Link to referal links page
$content['extras'] = '<a href="{%url=modules.php?module=login&what=reflinks%}">{--RALLYE_GET_REFLINK--}</a>';
@@ -107,11 +107,11 @@ if (SQL_NUMROWS($result) == 1) {
if ($expired === true) {
$content['prices'] = addReferalRallyeWinners($content['id']);
$content['top_users'] = '<div align="center" class="big">' . $content['extras'] . '</div>';
- $content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
+ $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
} else {
$content['prices'] = addReferalRallyePrices($content['id'], 'html');
$content['top_users'] = addReferalRallyeTopUsers($content['id'], getMemberId());
- $content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+ $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
}
// And load final template
diff --git a/inc/modules/member/what-support.php b/inc/modules/member/what-support.php
index 253836a1ee..285dc0b1eb 100644
--- a/inc/modules/member/what-support.php
+++ b/inc/modules/member/what-support.php
@@ -67,18 +67,18 @@ if ((!isFormSent()) || (!isPostRequestParameterSet(('qsummary')))) {
// Select right subject
switch (postRequestParameter('qsummary')) {
case 'ordr':
- $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_ORDER');
- $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_ORDER');
+ $subj_a = '{--SUPPORT_SUBJ_ADMIN_ORDER--}';
+ $subj_m = '{--SUPPORT_SUBJ_MEMBER_ORDER--}';
break;
case 'reflink':
- $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_REFLINK');
- $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_REFLINK');
+ $subj_a = '{--SUPPORT_SUBJ_ADMIN_REFLINK--}';
+ $subj_m = '{--SUPPORT_SUBJ_MEMBER_REFLINK--}';
break;
case 'unconfirmed':
- $subj_a = getMessage('SUPPORT_SUBJ_ADMIN_UNCONFIRMED');
- $subj_m = getMessage('SUPPORT_SUBJ_MEMBER_UNCONFIRMED');
+ $subj_a = '{--SUPPORT_SUBJ_ADMIN_UNCONFIRMED--}';
+ $subj_m = '{--SUPPORT_SUBJ_MEMBER_UNCONFIRMED--}';
break;
} // END - switch
diff --git a/inc/modules/member/what-surfbar_book.php b/inc/modules/member/what-surfbar_book.php
index 1c57183d09..a06466e858 100644
--- a/inc/modules/member/what-surfbar_book.php
+++ b/inc/modules/member/what-surfbar_book.php
@@ -65,7 +65,7 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
} // END - if
// By default something went wrong
- $message = getMessage('MEMBER_SURFBAR_URL_NOT_ADDED');
+ $message = '{--MEMBER_SURFBAR_URL_NOT_ADDED--}';
// Register the new URL
$insertId = SURFBAR_MEMBER_ADD_URL(postRequestParameter('url'), postRequestParameter('limit'));
@@ -73,7 +73,7 @@ if (!SURFBAR_IF_USER_BOOK_MORE_URLS()) {
// Was this fine?
if ($insertId > 0) {
// URL added and waiting for unlock
- $message = getMessage('MEMBER_SURFBAR_URL_ADDED');
+ $message = '{--MEMBER_SURFBAR_URL_ADDED--}';
} // END - if
// Load message template
diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index 7741e57601..8fbaab9869 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -281,16 +281,16 @@ switch ($mode) {
switch ($mode) {
case 'list_in':
$sql = "SELECT `trans_id`, `from_userid` AS party_userid, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_in` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}";
- $nothingMessage = getMessage('TRANSFER_NO_INCOMING_TRANSFERS');
- $content['balance'] = getMessage('TRANSFER_TOTAL_INCOMING');
- $content['title'] = getMessage('TRANSFER_LIST_INCOMING');
+ $nothingMessage = '{--TRANSFER_NO_INCOMING_TRANSFERS--}';
+ $content['balance'] = '{--TRANSFER_TOTAL_INCOMING--}';
+ $content['title'] = '{--TRANSFER_LIST_INCOMING--}';
break;
case 'list_out':
$sql = "SELECT `trans_id`, `to_userid` AS party_userid, `points`, `reason`, `time_trans` FROM `{?_MYSQL_PREFIX?}_user_transfers_out` WHERE `userid`=%s ORDER BY `time_trans` DESC LIMIT {?transfer_max?}";
- $nothingMessage = getMessage('TRANSFER_NO_OUTGOING_TRANSFERS');
- $content['balance'] = getMessage('TRANSFER_TOTAL_OUTGOING');
- $content['title'] = getMessage('TRANSFER_LIST_OUTGOING');
+ $nothingMessage = '{--TRANSFER_NO_OUTGOING_TRANSFERS--}';
+ $content['balance'] = '{--TRANSFER_TOTAL_OUTGOING--}';
+ $content['title'] = '{--TRANSFER_LIST_OUTGOING--}';
break;
} // END - switch
@@ -429,10 +429,10 @@ KEY (`party_userid`)
$content['total'] = translateComma($total);
// Set title
- $content['title'] = getMessage('TRANSFER_LIST_ALL');
+ $content['title'] = '{--TRANSFER_LIST_ALL--}';
// Set "balance" word
- $content['balance'] = getMessage('TRANSFER_TOTAL_BALANCE');
+ $content['balance'] = '{--TRANSFER_TOTAL_BALANCE--}';
// At the end we don't need a temporary table in memory
$result = SQL_QUERY("DROP TABLE IF EXISTS `{?_MYSQL_PREFIX?}_transfers_tmp`", __FILE__, __LINE__);
@@ -474,9 +474,6 @@ KEY (`party_userid`)
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `opt_in`='%s' WHERE `userid`=%s LIMIT 1",
array(postRequestParameter('opt_in'), getMemberId()), __FILE__, __LINE__);
- // Rember for next switch() command
- getUserData('opt_in') = substr(postRequestParameter('opt_in'), 0, 1);
-
// "Settings saved..."
loadTemplate('admin_settings_saved', false, '<div class="member_done">{--SETTINGS_SAVED--}</div>');
} // END - if
@@ -496,7 +493,7 @@ KEY (`party_userid`)
break;
case 'N':
- $content['new_link'] = getMessage('TRANSFER_PLEASE_ALLOW_OPT_IN');
+ $content['new_link'] = '{--TRANSFER_PLEASE_ALLOW_OPT_IN--}';
break;
} // END - switch
diff --git a/inc/modules/member/what-unconfirmed.php b/inc/modules/member/what-unconfirmed.php
index 4cc86f57cf..1cd9e9d533 100644
--- a/inc/modules/member/what-unconfirmed.php
+++ b/inc/modules/member/what-unconfirmed.php
@@ -145,7 +145,7 @@ if (SQL_NUMROWS($result) > 0) {
// Load data from stats table...
$cat = '';
$result_data = false;
- $PROBLEM = getMessage('MEMBER_GENERAL_MAIL_PROBLEM');
+ $PROBLEM = '{--MEMBER_GENERAL_MAIL_PROBLEM--}';
$DATA = $id . '/' . $id2 . '/' . $type;
switch ($type) {
case 'NORMAL':
@@ -163,7 +163,7 @@ LIMIT 1",
array(bigintval($id)), __FILE__, __LINE__);
$type = 'mailid';
$DATA = $id;
- $PROBLEM = getMessage('NORMAL_MAIL_PROBLEM');
+ $PROBLEM = '{--NORMAL_MAIL_PROBLEM--}';
break;
case 'BONUS':
@@ -171,7 +171,7 @@ LIMIT 1",
array(bigintval($id2)), __FILE__, __LINE__);
$type = 'bonusid';
$DATA = $id2;
- $PROBLEM = getMessage('BONUS_MAIL_PROBLEM');
+ $PROBLEM = '{--BONUS_MAIL_PROBLEM--}';
break;
default: // Unknown type detected!
@@ -187,7 +187,7 @@ LIMIT 1",
// Subject line found?
if (empty($subject)) {
// No subject line!
- $subject = getMessage('DEFAULT_SUBJECT_LINE');
+ $subject = '{--DEFAULT_SUBJECT_LINE--}';
} // END - if
// Prepare sender id
@@ -196,10 +196,10 @@ LIMIT 1",
$sender = bigintval($sender);
} elseif ($type == 'bonusid') {
// Is admin
- $sender = getMessage('USERNAME_ADMIN_SHORT');
+ $sender = '{--USERNAME_ADMIN_SHORT--}';
} else {
// Deleted
- $sender = getMessage('EMAIL_STATUS_DELETED');
+ $sender = '{--EMAIL_STATUS_DELETED--}';
}
// Prepare data for template
diff --git a/inc/modules/order.php b/inc/modules/order.php
index e70a2b03f1..b7a46520a8 100644
--- a/inc/modules/order.php
+++ b/inc/modules/order.php
@@ -57,13 +57,13 @@ if (empty($url)) {
// Is the auto-send mechanism active or inactive?
if (getConfig('autosend_active') == 'Y') {
// Auto-send is active
- $content['admin_autosend'] = getMessage('ADMIN_AUTOSEND_ACTIVE');
- $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_ACTIVE');
+ $content['admin_autosend'] = '{--ADMIN_AUTOSEND_ACTIVE--}';
+ $content['member_autosend'] = '{--MEMBER_AUTOSEND_ACTIVE--}';
$type = 'NEW';
} else {
// Auto-send is inactive
- $content['admin_autosend'] = getMessage('ADMIN_AUTOSEND_INACTIVE');
- $content['member_autosend'] = getMessage('MEMBER_AUTOSEND_INACTIVE');
+ $content['admin_autosend'] = '{--ADMIN_AUTOSEND_INACTIVE--}';
+ $content['member_autosend'] = '{--MEMBER_AUTOSEND_INACTIVE--}';
$type = 'ADMIN';
}
@@ -85,7 +85,7 @@ if (empty($url)) {
SQL_FREERESULT($result);
// Fix empty subject line
- if (empty($content['subject'])) $content['subject'] = getMessage('DEFAULT_SUBJECT_LINE');
+ if (empty($content['subject'])) $content['subject'] = '{--DEFAULT_SUBJECT_LINE--}';
// Calculate used points
$usedPoints = $content['target_send'] * getPaymentPoints($content['payment_id']);
diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php
index 62d18a26c1..db18c7d152 100644
--- a/inc/modules/sponsor/account.php
+++ b/inc/modules/sponsor/account.php
@@ -68,22 +68,22 @@ if (SQL_NUMROWS($result) == 1) {
// Check passwords
if (!isPostRequestParameterSet('pass_old')) {
// No current password entered
- $message = getMessage('SPONSOR_NO_CURRENT_PASSWORD_ENTERED');
+ $message = '{--SPONSOR_NO_CURRENT_PASSWORD_ENTERED--}';
} elseif (md5(postRequestParameter('pass_old')) != getSession('sponsorpass')) {
// Entered password didn't match password in DB
- $message = getMessage('SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB');
+ $message = '{--SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB--}';
} elseif ((isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2')) && (postRequestParameter('pass1') != postRequestParameter('pass2'))) {
// Both new passwords did not match
- $message = getMessage('SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH');
+ $message = '{--SPONSOR_BOTH_NEW_PASSWORDS_DIDNOT_MATCH--}';
} elseif ((!isPostRequestParameterSet('pass1')) && (isPostRequestParameterSet('pass2'))) {
// No password one entered
- $message = getMessage('SPONSOR_PASSWORD_ONE_EMPTY');
+ $message = '{--SPONSOR_PASSWORD_ONE_EMPTY--}';
} elseif ((isPostRequestParameterSet('pass1')) && (!isPostRequestParameterSet('pass2'))) {
// No password two entered
- $message = getMessage('SPONSOR_PASSWORD_TWO_EMPTY');
+ $message = '{--SPONSOR_PASSWORD_TWO_EMPTY--}';
} elseif ((isPostRequestParameterSet('pass1')) && (strlen(postRequestParameter('pass1')) < getConfig('pass_len'))) {
// Too short password
- $message = getMessage('SPONSOR_PASSWORD_TOO_SHORT');
+ $message = '{--SPONSOR_PASSWORD_TOO_SHORT--}';
} else {
// Default is we don't want to change password!
$PASS_AND = ''; $PASS_DATA = '';
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ebb750ba27..e6d61fbcbe 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -999,12 +999,12 @@ function getActionFromModuleWhat ($module, $what) {
// Get category name back
function getCategory ($cid) {
// Default is not found
- $data['cat'] = getMessage('_CATEGORY_404');
+ $data['cat'] = '{--_CATEGORY_404--}';
// Is the category id set?
if ($cid == '0') {
// No category
- $data['cat'] = getMessage('_CATEGORY_NONE');
+ $data['cat'] = '{--_CATEGORY_NONE--}';
} elseif ($cid > 0) {
// Lookup the category in database
$result = SQL_QUERY_ESC("SELECT `cat` FROM `{?_MYSQL_PREFIX?}_cats` WHERE `id`=%s LIMIT 1",
@@ -1025,7 +1025,7 @@ function getCategory ($cid) {
// Get a string of "mail title" and price back
function getPaymentTitlePrice ($pid, $full=false) {
// Default is not found
- $ret = getMessage('_PAYMENT_404');
+ $ret = '{--_PAYMENT_404--}';
// Load payment data
$result = SQL_QUERY_ESC("SELECT `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
@@ -2063,12 +2063,12 @@ ORDER BY
} // END - if
// Activity is 'active' by default because if autopurge is not installed
- $row['activity'] = getMessage('MEMBER_ACTIVITY_ACTIVE');
+ $row['activity'] = '{--MEMBER_ACTIVITY_ACTIVE--}';
// Is autopurge installed and the user inactive?
if ((isExtensionActive('autopurge')) && ((time() - getConfig('ap_inactive_since')) >= $row['last_online'])) {
// Inactive user!
- $row['activity'] = getMessage('MEMBER_ACTIVITY_INACTIVE');
+ $row['activity'] = '{--MEMBER_ACTIVITY_INACTIVE--}';
} // END - if
// Remove some entries
diff --git a/inc/reset/reset_profile.php b/inc/reset/reset_profile.php
index 9432706036..ebd7ab008d 100644
--- a/inc/reset/reset_profile.php
+++ b/inc/reset/reset_profile.php
@@ -75,7 +75,7 @@ ORDER BY
if (round($content['last_update']) == '0') {
// Has never changed his accont
- $content['last_update'] = getMessage('PROFILE_NEVER_CHANGED');
+ $content['last_update'] = '{--PROFILE_NEVER_CHANGED--}';
} else {
// Has changed his account
$content['last_update'] = generateDateTime($content['last_update'], 0);
diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 8e7ae4c14e..c80742992c 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -751,7 +751,7 @@ function getUsername () {
// User name set?
if (!isset($GLOBALS['username'])) {
// No, so it has to be a guest
- $GLOBALS['username'] = getMessage('USERNAME_GUEST');
+ $GLOBALS['username'] = '{--USERNAME_GUEST--}';
} // END - if
// Return it
@@ -907,7 +907,7 @@ function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
// Is it cached?
if (!isset($GLOBALS['user_data_cache'][$userid][$keyColumn][$valueColumn])) {
// Default is 'guest'
- $data = getMessage('USERNAME_GUEST');
+ $data = '{--USERNAME_GUEST--}';
// Can we fetch the user data?
if (($userid > 0) && (fetchUserData($userid, $keyColumn))) {
diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl
index f7a0faf70d..9191fd5ed0 100644
--- a/templates/de/html/admin/admin_list_transfer.tpl
+++ b/templates/de/html/admin/admin_list_transfer.tpl
@@ -27,6 +27,14 @@
</td>
</tr>
$content[rows]
+ <tr>
+ <td colspan="5" class="admin_footer bottom">
+ <strong>{--TRANSFER_POINTS_TOTAL--}</strong>
+ </td>
+ <td align="center" class="header_column bottom">
+ {%pipe,translateComma=$content[total]%}
+ </td>
+ </tr>
<tr>
<td align="center" colspan="6" class="admin_footer">
$content[delete]
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl
index 42447db711..bf39680cdb 100644
--- a/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl
+++ b/templates/de/html/admin/admin_list_yoomedia_tm_already.tpl
@@ -3,7 +3,7 @@
<td class="switch_sw$content[sw] bottom right">$content[name]</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[reload] {--_HOURS--}</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[wait] {--_SECONDS--}</td>
- <td class="switch_sw$content[sw] bottom right" align="center">$content[remain]</td>
+ <td class="switch_sw$content[sw] bottom right" align="center">{%pipe,translateComma=$content[remain]%}</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[pay] €</td>
<td class="switch_sw$content[sw] bottom">
<table border="0" cellspacing="0" cellpadding="0" width="100%">
diff --git a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
index feed4ead54..f0840d01d3 100644
--- a/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
+++ b/templates/de/html/admin/admin_list_yoomedia_tm_row.tpl
@@ -3,7 +3,7 @@
<td class="switch_sw$content[sw] bottom right">$content[name]</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[reload] {--_HOURS--}</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[wait] {--_SECONDS--}</td>
- <td class="switch_sw$content[sw] bottom right" align="center">$content[remain]</td>
+ <td class="switch_sw$content[sw] bottom right" align="center">{%pipe,translateComma=$content[remain]%}</td>
<td class="switch_sw$content[sw] bottom right" align="center">$content[pay] €</td>
<td class="switch_sw$content[sw] bottom" align="center" style="padding-left:1px;padding-right:1px;padding-top:2px;padding-bottom:2px">
<form accept-charset="utf-8" action="{%url=modules.php?module=admin&what=list_yoomedia_tm%}" method="post">