Next wave of lesser getMessage()
authorRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 09:20:13 +0000 (09:20 +0000)
committerRoland Häder <roland@mxchange.org>
Mon, 28 Jun 2010 09:20:13 +0000 (09:20 +0000)
92 files changed:
inc/autopurge/purge-inact.php
inc/extensions-functions.php
inc/extensions/ext-rewrite.php
inc/filters.php
inc/functions.php
inc/install-inc.php
inc/libs/admins_functions.php
inc/libs/autopurge_functions.php
inc/libs/holiday_functions.php
inc/libs/network_functions.php
inc/libs/refback_functions.php
inc/libs/register_functions.php
inc/libs/sponsor_functions.php
inc/libs/surfbar_functions.php
inc/libs/user_functions.php
inc/libs/wernis_functions.php
inc/mails/doubler_mails.php
inc/modules/admin.php
inc/modules/admin/action-admins.php
inc/modules/admin/action-bank.php
inc/modules/admin/action-country.php
inc/modules/admin/action-doubler.php
inc/modules/admin/action-email.php
inc/modules/admin/action-holiday.php
inc/modules/admin/action-login.php
inc/modules/admin/action-menu.php
inc/modules/admin/action-misc.php
inc/modules/admin/action-mods.php
inc/modules/admin/action-newsletter.php
inc/modules/admin/action-payouts.php
inc/modules/admin/action-primera.php
inc/modules/admin/action-rallye.php
inc/modules/admin/action-repair.php
inc/modules/admin/action-setup.php
inc/modules/admin/action-sponsor.php
inc/modules/admin/action-stats.php
inc/modules/admin/action-surfbar.php
inc/modules/admin/action-task.php
inc/modules/admin/action-theme.php
inc/modules/admin/action-transfer.php
inc/modules/admin/action-user.php
inc/modules/admin/action-wernis.php
inc/modules/admin/admin-inc.php
inc/modules/admin/what-add_points.php
inc/modules/admin/what-add_rallye.php
inc/modules/admin/what-admins_contct.php
inc/modules/admin/what-del_email.php
inc/modules/admin/what-del_holiday.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-extensions.php
inc/modules/admin/what-list_country.php
inc/modules/admin/what-list_links.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-sub_points.php
inc/modules/admin/what-unlock_emails.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/admin/what-user_contct.php
inc/modules/guest/action-admin.php
inc/modules/guest/action-main.php
inc/modules/guest/action-members.php
inc/modules/guest/action-sponsor.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-mediadata.php
inc/modules/guest/what-register.php
inc/modules/guest/what-sponsor_login.php
inc/modules/guest/what-sponsor_reg.php
inc/modules/guest/what-stats.php
inc/modules/member/action-
inc/modules/member/what-holiday.php
inc/modules/member/what-payout.php
inc/modules/member/what-transfer.php
inc/modules/order.php
inc/modules/sponsor.php
inc/modules/sponsor/.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/modules/sponsor/welcome.php
inc/monthly/monthly_beg.php
inc/monthly/monthly_bonus.php
inc/mysql-connect.php
inc/mysql-manager.php
inc/pool/pool-user.php
inc/reset/reset_100_bonus.php
inc/reset/reset_birthday.php
inc/reset/reset_holiday.php
inc/reset/reset_profile.php
install.php
modules.php

index 3f98e70..a6fc4fc 100644 (file)
@@ -101,14 +101,14 @@ ORDER BY
                        $content = merge_array($content, $row);
 
                        // Remember userids for the admin
-                       $useridsContent .= $content['userid'].", ";
+                       $useridsContent .= $content['userid'] . ', ';
 
                        // Get date/time from timestamp
                        $content['last_online'] = generateDateTime($content['last_online'], 0);
 
                        // Load mail template
                        $message = loadEmailTemplate('member_autopurge_inactive', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('AUTOPURGE_MEMBER_INACTIVE_SUBJECT'), $message);
+                       sendEmail($content['email'], '{--AUTOPURGE_MEMBER_INACTIVE_SUBJECT--}', $message);
 
                        // Update this account
                        addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `ap_notified`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
index 22c40b3..4bc33da 100644 (file)
@@ -984,7 +984,7 @@ function createNewExtensionTask ($adminId, $subject, $ext) {
 // Creates a task for automatically deactivated (deprecated) extension
 function createExtensionDeactivationTask ($ext) {
        // Create subject line
-       $subject = sprintf("[%s:] %s", $ext, getMessage('TASK_SUBJ_EXTENSION_DEACTIVATED'));
+       $subject = sprintf("[%s:] %s", $ext, '{--TASK_SUBJ_EXTENSION_DEACTIVATED--}');
 
        // Not installed and do we have created a task for the admin?
        if ((determineTaskIdBySubject($subject) == '0') && (isExtensionInstalled($ext))) {
@@ -1109,13 +1109,13 @@ function addExtensionNotes ($ver) {
                        // Initial release
                        $content = array(
                                'ver'   => $ver,
-                               'notes' => getMessage('INITIAL_RELEASE')
+                               'notes' => '{--INITIAL_RELEASE--}'
                        );
                } else {
                        // No update notes found!
                        $content = array(
                                'ver'   => $ver,
-                               'notes' => getMessage('NO_UPDATE_NOTES')
+                               'notes' => '{--NO_UPDATE_NOTES--}'
                        );
                }
 
index 42f7f58..14e59fe 100644 (file)
@@ -56,7 +56,7 @@ switch (getExtensionMode()) {
                // Check if mod_rewrite is loadeded
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        setExtensionReportsFailure(true);
-                       addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
 
                // SQL commands to run
@@ -73,7 +73,7 @@ switch (getExtensionMode()) {
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
                        setExtensionReportsFailure(true);
-                       addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
         } // END - if
 
         // SQL commands to run
@@ -151,7 +151,7 @@ switch (getExtensionMode()) {
                                // Check if mod_rewrite is loadeded
                                if (!isApacheModuleLoaded('mod_rewrite')) {
                                        setExtensionReportsFailure(true);
-                                       //addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                                       //addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                                } // END - if
                                setExtensionUpdateNotes("Es wird beim Registrieren und aktivieren gepr&uuml;ft, ob im Apache das Modul mod_rewrite geladen wurde. Wenn mod_rewrite nicht gefunden werden konnte, wird abgebrochen.");
                                break;
@@ -169,7 +169,7 @@ switch (getExtensionMode()) {
                if (!isApacheModuleLoaded('mod_rewrite')) {
                        setExtensionReportsFailure(true);
                        SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_extensions` SET `ext_active`='N' WHERE `ext_name`='rewrite' LIMIT 1", __FILE__, __LINE__);
-                       if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, getMessage('MOD_REWRITE_ERROR'));
+                       if (!isAdmin()) addFatalMessage(__FILE__, __LINE__, '{--MOD_REWRITE_ERROR--}');
                } // END - if
                break;
 
index a96ee60..658e0fb 100644 (file)
@@ -56,7 +56,7 @@ function FILTER_FLUSH_FILTERS () {
        // Is a database link here and not in installation mode?
        if ((!SQL_IS_LINK_UP()) && (!isInstalling())) {
                // Abort here
-               addFatalMessage(__FUNCTION__, __LINE__, getMessage('FILTER_FLUSH_FAILED_NO_DATABASE'));
+               addFatalMessage(__FUNCTION__, __LINE__, '{--FILTER_FLUSH_FAILED_NO_DATABASE--}');
                return false;
        } // END - if
 
index 7448f7e..107542e 100644 (file)
@@ -3133,7 +3133,7 @@ function shutdown () {
                SQL_CLOSE(__FUNCTION__, __LINE__);
        } elseif (!isInstallationPhase()) {
                // No database link
-               addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_DB_LINK_SHUTDOWN'));
+               addFatalMessage(__FUNCTION__, __LINE__, '{--NO_DB_LINK_SHUTDOWN--}');
        }
 
        // Stop executing here
@@ -3544,7 +3544,7 @@ function determinePageTitle () {
                $pageTitle = '{--NO_CONFIG_FOUND_TITLE--}';
 
                // Do not add the fatal message in installation mode
-               if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, getMessage('NO_CONFIG_FOUND'));
+               if ((!isInstalling()) && (!isConfigurationLoaded())) addFatalMessage(__FUNCTION__, __LINE__, '{--NO_CONFIG_FOUND--}');
        }
 
        // Return title
index 17c0c0c..2962d37 100644 (file)
@@ -202,7 +202,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // Check for dumps
                                                if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found!
-                                                       addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
+                                                       addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
                                                        return;
                                                } // END - if
 
@@ -234,7 +234,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                        // Are some SQLs found?
                                                        if (countSqls() == 0) {
                                                                // Abort here
-                                                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+                                                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}');
                                                                return;
                                                        } // END - if
 
@@ -273,7 +273,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                }
                        } else {
                                // Something goes wrong during installation! :-(
-                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+                               addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}');
                        }
                        break;
 
@@ -294,7 +294,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
        } // END - switch
 } else {
        // Already installed!
-       addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+       addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 }
 
 // [EOF]
index b06ff86..0e50ea7 100644 (file)
@@ -311,12 +311,12 @@ function adminsEditAdminAccount ($postData) {
                        // Shall we allow changing default ACL?
                        if ($currMode == 'allow') {
                                // Allow chaning it
-                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array(getMessage('ADMINS_ALLOW_MODE'), getMessage('ADMINS_DENY_MODE')), $content['mode']);
+                               $content['mode']    = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
                        } else {
                                // Don't allow it
                                $content['mode'] = '&nbsp;';
                        }
-                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(getMessage('ADMINS_GLOBAL_LA_SETTING'), getMessage('ADMINS_OLD_LA_SETTING'), getMessage('ADMINS_NEW_LA_SETTING')), $content['la_mode']);
+                       $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_edit_admins_row', true, $content);
index 8c5372f..76be497 100644 (file)
@@ -49,7 +49,7 @@ function addPointsAutoPurge ($userid, $points) {
 
        // Send out mail to user
        $message = loadEmailTemplate('member_autopurge_points', array('points' => $points), $userid);
-       sendEmail($userid, getMessage('AUTOPURGE_MEMBER_SUBJECT'), $message);
+       sendEmail($userid, '{--AUTOPURGE_MEMBER_SUBJECT--}', $message);
 }
 
 // [EOF]
index 0b07bf1..54064d8 100644 (file)
@@ -85,7 +85,7 @@ LIMIT 1",
 
                        // Send mail to user
                        $message = loadEmailTemplate('member_holiday_unlock', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_UNLOCK_SUBJ'), $message);
+                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_UNLOCK_SUBJ--}', $message);
 
                        // Remember userid for admin
                        $admin .= $content['userid']."\n";
index 001d5b2..8f4e0a5 100644 (file)
@@ -62,7 +62,7 @@ function doNetworkHandleForm () {
                        doAdminNetworkProcessForm();
                } else {
                        // No 'do' found
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
                }
        } // END - if
 }
@@ -72,11 +72,11 @@ function doAdminNetworkProcessForm () {
        // Form really sent?
        if ((!isFormSent()) && (!isFormSent('edit')) && (!isFormSent('del')) && (!isFormSent('change')) && (!isFormSent('remove'))) {
                // Abort here
-               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_FORM_NOT_SENT'));
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_FORM_NOT_SENT--}');
                return;
        } elseif (!isGetRequestParameterSet('do')) {
                // No 'do' found
-               loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_DO_404'));
+               loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_DO_404--}');
                return;
        }
 
@@ -381,7 +381,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network', 'network_id');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -425,7 +425,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -469,7 +469,7 @@ ORDER BY
                $content = generateSelectionBoxFromArray($rows, 'network_type', 'network_type_id', '', '_title');
        } else {
                // Nothing selected
-               $content = loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_ENTRIES_404'));
+               $content = loadTemplate('admin_settings_unsaved', false, '{--ADMIN_ENTRIES_404--}');
        }
 
        // Free the result
@@ -682,7 +682,7 @@ function doAdminNetworkProcessHandlenetworkForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -749,7 +749,7 @@ function doAdminNetworkProcessHandlenetworktypeForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -828,7 +828,7 @@ function doAdminNetworkProcessHandlerequestparamsForm () {
                        $GLOBALS['network_display'] = false;
                } else {
                        // Nothing selected/found
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_FOUND--}');
                }
        } // END - if
 }
@@ -873,7 +873,7 @@ function doAdminNetworkProcessChangenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -900,7 +900,7 @@ function doAdminNetworkProcessRemovenetworkForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -993,7 +993,7 @@ function doAdminNetworkProcessChangenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1044,7 +1044,7 @@ function doAdminNetworkProcessChangenetworkparamForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_UPDATED', $updated));
                } else {
                        // Nothing changed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_CHANGED--}');
                }
        } // END - if
 }
@@ -1071,7 +1071,7 @@ function doAdminNetworkProcessRemovenetworktypeForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_TYPES_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_TYPES_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_TYPES_NOTHING_REMOVED--}');
                }
        } // END - if
 }
@@ -1098,7 +1098,7 @@ function doAdminNetworkProcessRemovenetworkparamForm () {
                        loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_NETWORK_REQUEST_PARAMETER_REMOVED', $removed));
                } else {
                        // Nothing removed
-                       loadTemplate('admin_settings_unsaved', false, getMessage('ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED'));
+                       loadTemplate('admin_settings_unsaved', false, '{--ADMIN_NETWORK_REQUEST_PARAMETER_NOTHING_REMOVED--}');
                }
        } // END - if
 }
index 2b69d37..9305e2d 100644 (file)
@@ -403,7 +403,7 @@ function updateMemberRefbackPercents ($id, $percents) {
        $mail = loadEmailTemplate('member_refback', $dummy, $dummy['refid']);
 
        // Send email to user
-       sendEmail($dummy['refid'], getMessage('MEMBER_REFBACK_SUBJECT'), $mail);
+       sendEmail($dummy['refid'], '{--MEMBER_REFBACK_SUBJECT--}', $mail);
 
        // Send admin notification
        sendAdminNotification(getMessage('ADMIN_REFBACK_SUBJECT'), 'admin_refback', $dummy, getMemberId());
index 4a58e23..4da3b60 100644 (file)
@@ -466,7 +466,7 @@ VALUES ('%s','%s','%s','%s','%s',%s,'%s','%s',%s, %s,%s,'%s',%s, %s,'%s','UNCONF
 
        // Send mail to user (confirmation link!)
        $email = $content['email'];
-       sendEmail($content['email'], getMessage('GUEST_SUBJECT_CONFIRM_LINK'), $messageGuest);
+       sendEmail($content['email'], '{--GUEST_SUBJECT_CONFIRM_LINK--}', $messageGuest);
        $content['email'] = $email;
 
        // Send mail to admin
index cf855ac..80d000c 100644 (file)
@@ -491,7 +491,7 @@ function saveSponsorData ($postData, $content) {
                                switch (getWhat()) {
                                        case 'account': // Change account data
                                                $email_msg = loadEmailTemplate('sponsor_change_data', $content);
-                                               sendEmail($content['email'], getMessage('SPONSOR_ACC_DATA_SUBJ'), $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_ACC_DATA_SUBJ--}', $email_msg);
 
                                                if ($EMAIL === true) {
                                                        // Add hash code to content array
@@ -499,14 +499,14 @@ function saveSponsorData ($postData, $content) {
 
                                                        // Second mail goes to the new address
                                                        $email_msg = loadEmailTemplate('sponsor_change_email', $content);
-                                                       sendEmail($content['email'], getMessage('SPONSOR_ACC_EMAIL_SUBJ'), $email_msg);
+                                                       sendEmail($content['email'], '{--SPONSOR_ACC_EMAIL_SUBJ--}', $email_msg);
                                                } // END - if
                                                break;
 
                                        case 'settings': // Change settings
                                                // Send email
                                                $email_msg = loadEmailTemplate('sponsor_settings', $content);
-                                               sendEmail($content['email'], getMessage('SPONSOR_SETTINGS_SUBJ'), $email_msg);
+                                               sendEmail($content['email'], '{--SPONSOR_SETTINGS_SUBJ--}', $email_msg);
                                                break;
                                } // END - switch
                        } // END - if
index 5d311cd..71973d3 100644 (file)
@@ -418,7 +418,7 @@ function SURFBAR_MEMBER_EXECUTE_ACTION ($action, $urlData) {
                } // END - if
        } else {
                // Not found!
-               addFatalMessage(__FUNCTION__, __LINE__, getMessage('MEMBER_SURFBAR_EXECUTE_ACTION_404'), $functionName);
+               addFatalMessage(__FUNCTION__, __LINE__, '{--MEMBER_SURFBAR_EXECUTE_ACTION_404--}', $functionName);
        }
 
        // Return status
index 517f0eb..d400066 100644 (file)
@@ -49,7 +49,7 @@ function alpha ($sortby, $colspan, $return=false) {
        if (isGetRequestParameterSet('mode')) $add .= '&amp;mode='.getRequestParameter('mode');
 
        /* Creates the list of letters and makes them a link. */
-       $alphabet = explode(',', getMessage('_ALL2') . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . getMessage('_OTHERS'));
+       $alphabet = explode(',', '{--_ALL2--}' . ',A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,' . '{--_OTHERS--}');
        $num = count($alphabet) - 1;
        $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
@@ -105,10 +105,10 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
        // Prepare array with all possible sorters
        $list = array(
-               'userid'      => getMessage('_UID'),
-               'family'      => getMessage('FAMILY'),
-               'email'       => getMessage('EMAIL'),
-               'REMOTE_ADDR' => getMessage('REMOTE_IP')
+               'userid'      => '{--_UID--}',
+               'family'      => '{--FAMILY--}',
+               'email'       => '{--EMAIL--}',
+               'REMOTE_ADDR' => '{--REMOTE_IP--}'
        );
 
        // Add nickname if extension is installed
@@ -159,7 +159,7 @@ function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=fal
                if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        $OUT .= '<strong>-';
                } else {
-                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '{--_ALL2--}');
                        if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
                        // Base link
@@ -453,7 +453,7 @@ function doNewUserPassword ($email, $userid) {
                        $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
                        // ... and send it away
-                       sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
+                       sendEmail($userid, '{--GUEST_NEW_PASSWORD--}', $message);
 
                        // Output note to user
                        loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
index a6fe7be..2c3a85d 100644 (file)
@@ -80,7 +80,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Then abort here!
                return array(
                        'status'  => 'failed_general',
-                       'message' => getMessage('WERNIS_API_REQUEST_DATA_INVALID')
+                       'message' => '{--WERNIS_API_REQUEST_DATA_INVALID--}'
                );
        } // END - if
 
@@ -89,7 +89,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                // Abort here...
                return array(
                        'status'  => 'failed_general',
-                       'message' => getMessage('WERNIS_API_REQUEST_DATA_MISSING')
+                       'message' => '{--WERNIS_API_REQUEST_DATA_MISSING--}'
                );
        } // END - if
 
@@ -148,7 +148,7 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        case 'AUTH': // Authorization has failed
                                $return = array(
                                        'status'  => 'auth_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_AUTH')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_AUTH--}'
                                );
                                break;
 
@@ -157,28 +157,28 @@ function WERNIS_SEND_REQUEST ($scriptName, $requestData =  array()) {
                        case 'USER': // Missing account or invalid password
                                $return = array(
                                        'status'  => 'user_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_USER')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_USER--}'
                                );
                                break;
 
                        case 'OWN': // Transfer to own account
                                $return = array(
                                        'status'  => 'own_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_OWN')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_OWN--}'
                                );
                                break;
 
                        case 'AMOUNT': // Amount is depleted
                                $return = array(
                                        'status'  => 'amount_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_AMOUNT')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_AMOUNT--}'
                                );
                                break;
 
                        case 'AMOUNT-SEND': // API amount is depleted
                                $return = array(
                                        'status'  => 'api_amount_failed',
-                                       'message' => getMessage('WERNIS_API_REQUEST_FAILED_API_AMOUNT')
+                                       'message' => '{--WERNIS_API_REQUEST_FAILED_API_AMOUNT--}'
                                );
                                break;
 
index a261234..ffb1121 100644 (file)
@@ -188,7 +188,7 @@ if (((SQL_NUMROWS($result_total) > 0) && (getConfig('doubler_sent_all') == 'Y'))
 
                        // Load mail template and send mail away...
                        $message = loadEmailTemplate('member_doubler', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('DOUBLER_MEMBER_SUBJECT'), $message);
+                       sendEmail($content['userid'], '{--DOUBLER_MEMBER_SUBJECT--}', $message);
                } // END - if
        } // END - while
 } // END - if
index 14c4809..3ea2e49 100644 (file)
@@ -352,7 +352,7 @@ if (!isAdminRegistered()) {
                loadTemplate('admin_settings_saved', false, '<div class="admin_fatal">{--ADMIN_LOGOUT_FAILED--}</div>');
 
                // Add fatal message
-               addFatalMessage(__FILE__, __LINE__, getMessage('CANNOT_UNREG_SESS'));
+               addFatalMessage(__FILE__, __LINE__, '{--CANNOT_UNREG_SESS--}');
        }
 } else {
        // Maybe an Admin want's to login?
index 73b2fc3..93d1899 100644 (file)
@@ -40,7 +40,7 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index ebd637b..fce5df4 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index a39f4bd..6e2c554 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 724773b..b14905c 100644 (file)
@@ -52,7 +52,7 @@ if (isIncludeReadable($inc)) {
        loadInclude($inc);
 } else {
        // "what file" not found
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index d874eba..43250f1 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 2c3437f..40c627a 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 7420fb5..38d95a1 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index f682285..ee3e5ef 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 64fe147..62e677d 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 //
index 4729d6e..9053888 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 5da3012..611a410 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 8b1702c..1cd17de 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 50a785e..9d8d02d 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index f6bf141..a703482 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 6e7756a..bbdbaf7 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 0e3496d..3edce1f 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 3f85e84..6fbc041 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 4084274..f904b45 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index ca5996c..3054eef 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 40ee2ef..deeb1c8 100644 (file)
@@ -56,7 +56,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index e9d0375..03d5a25 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index e776de9..859f1d9 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index a6c63c1..249fe36 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 // [EOF]
index 2165992..2548470 100644 (file)
@@ -51,7 +51,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the admin action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('ADMIN_WHAT_404'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--ADMIN_WHAT_404--}', getWhat());
 }
 
 //
index cbd8f46..40e5d1a 100644 (file)
@@ -1133,7 +1133,7 @@ function sendAdminPasswordResetLink ($email) {
        $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       sendEmail($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJ--}', $mailText);
 
        // Prepare output
        return getMessage('ADMIN_RESET_LINK_SENT');
index 5c64717..7d0921b 100644 (file)
@@ -74,7 +74,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load email template and send email away
                        $message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-                       sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
+                       sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJ--}', $message);
                } // END - while
 
                // Free memory
@@ -105,7 +105,7 @@ if (getRequestParameter('userid') == 'all') {
                        // Message laden
                        $message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
 
-                       sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
+                       sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJ--}', $message);
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
                } else {
                        // Prepare content
index 4ddb85b..04c3486 100644 (file)
@@ -93,9 +93,9 @@ VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s')",
 }
 
 // Prepare some constants for the template
-$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
-$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , getMessage('YES')));
-$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), getMessage('NO') ));
+$content['auto_add_options'] = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), '{--NO--}' ));
+$content['active_options']   = generateOptionList('/ARRAY/', array('N','Y'), array(getMessage('NO') , '{--YES--}'));
+$content['notify_options']   = generateOptionList('/ARRAY/', array('Y','N'), array(getMessage('YES'), '{--NO--}' ));
 
 // Starting day
 $content['start_sec']   = addSelectionBox('sec'  , 0              , 'start');
index 9203b25..b0d89e2 100644 (file)
@@ -50,14 +50,14 @@ if ((isFormSent()) && (isGetRequestParameterSet('admin'))) {
        if ((isExtensionActive('msg')) && (postRequestParameter('type') == 'message')) {
                // Add message
                $message = loadEmailTemplate('admins_msg_contct_admin', postRequestParameter('text'), 0);
-               sendAdminMessage(getRequestParameter('admin'), getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
+               sendAdminMessage(getRequestParameter('admin'), '{--ADMINS_MSG_FROM_ADMIN--}', $message);
        } else {
                // Load admin's email address
                $email = getAdminEmail(bigintval(getRequestParameter('admin')));
 
                // Load email template and send the mail to the admin
                $message = loadEmailTemplate('admins_mail_contct_admin', postRequestParameter('text'), 0);
-               sendEmail($email, getMessage('ADMINS_MSG_FROM_ADMIN'), $message);
+               sendEmail($email, '{--ADMINS_MSG_FROM_ADMIN--}', $message);
        }
 
        // Mail / message dropped
index c2d870f..0e98689 100644 (file)
@@ -68,7 +68,7 @@ if (isGetRequestParameterSet('mid')) {
 
                // Load email template and send the email away
                $message_user = loadEmailTemplate('order-deleted', $content, $sender);
-               sendEmail($sender, getMessage('MEMBER_ORDER_DELETED'), $message_user);
+               sendEmail($sender, '{--MEMBER_ORDER_DELETED--}', $message_user);
 
                // Fetch right stats_id from pool
                $result_pool = SQL_QUERY_ESC("SELECT
index 19d0175..6361bd3 100644 (file)
@@ -87,7 +87,7 @@ LIMIT 1", array(bigintval($id)), __FILE__, __LINE__);
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_removed', $content, $userid);
-                       sendEmail($userid, getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+                       sendEmail($userid, '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
                        $cnt++;
                }
        }
@@ -118,7 +118,7 @@ LIMIT 1", array(bigintval(getRequestParameter('userid'))), __FILE__, __LINE__);
 
                // Send email to user
                $message = loadEmailTemplate('member_holiday_removed', $content, getRequestParameter('userid'));
-               sendEmail(getRequestParameter('userid'), getMessage('HOLIDAY_ADMIN_REMOVED_SUBJ'), $message);
+               sendEmail(getRequestParameter('userid'), '{--HOLIDAY_ADMIN_REMOVED_SUBJ--}', $message);
 
                // Set message
                $message = '{--HOLIDAY_ADMIN_SINGLE_DELETED--}';
index c1c493d..c66851f 100644 (file)
@@ -61,7 +61,7 @@ if (isGetRequestParameterSet('id')) {
 
                        // Prepare message and send it away
                        $message = loadEmailTemplate('del_sponsor', $content, bigintval(getRequestParameter('id')));
-                       sendEmail($content['email'], getMessage('ADMIN_SPONSOR_DEL_SUBJECT'), $message);
+                       sendEmail($content['email'], '{--ADMIN_SPONSOR_DEL_SUBJECT--}', $message);
 
                        // Remove account
                        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`='%s' LIMIT 1",
index b41767f..059fce3 100644 (file)
@@ -101,7 +101,7 @@ LIMIT 1",
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_add_points', $content);
-                                               sendEmail($content['email'], getMessage('ADMIN_SPONSOR_ADD_POINTS_SUBJ'), $message);
+                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_ADD_POINTS_SUBJ--}', $message);
                                                $message = '{--ADMIN_SPONSOR_POINTS_ADDED--}';
                                        } else {
                                                // No points entered to add!
@@ -124,7 +124,7 @@ LIMIT 1",
 
                                                // Send email
                                                $message = loadEmailTemplate('sponsor_sub_points', $content);
-                                               sendEmail($content['email'], getMessage('ADMIN_SPONSOR_SUB_POINTS_SUBJ'), $message);
+                                               sendEmail($content['email'], '{--ADMIN_SPONSOR_SUB_POINTS_SUBJ--}', $message);
                                                $message = '{--ADMIN_SPONSOR_POINTS_SUBTRACTED--}';
                                        } else {
                                                // No points entered to add!
@@ -152,11 +152,11 @@ LIMIT 1",
                                        postRequestParameter('gender'          , translateGender(postRequestParameter('gender')));
                                        postRequestParameter('warning_interval', createFancyTime(postRequestParameter('warning_interval')));
 
-                                       if ($PASS === false) setPostRequestParameter('pass1', getMessage('SPONSOR_PASS_UNCHANGED'));
+                                       if ($PASS === false) setPostRequestParameter('pass1', '{--SPONSOR_PASS_UNCHANGED--}');
 
                                        // Load email template and send the mail away
                                        $message = loadEmailTemplate('admin_sponsor_edit', postRequestArray(), false);
-                                       sendEmail(postRequestParameter('email'), getMessage('ADMIN_SPONSOR_EDIT_SUBJECT'), $message);
+                                       sendEmail(postRequestParameter('email'), '{--ADMIN_SPONSOR_EDIT_SUBJECT--}', $message);
                                        break;
 
                                default: // Unknown mode
index 24f0716..5dd017e 100644 (file)
@@ -346,12 +346,12 @@ ORDER BY `ext_name` ASC", __FILE__, __LINE__);
                                                        if (isExtensionActive('task')) {
                                                                loadTemplate('admin_next_link', false, array(
                                                                        'url'   => 'modules.php?module=admin&amp;what=list_task',
-                                                                       'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
+                                                                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                                                                ));
                                                        } else {
                                                                loadTemplate('admin_next_link', false, array(
                                                                        'url'   => 'modules.php?module=admin',
-                                                                       'title' => getMessage('ADMIN_EXTENSION_REGISTER_NEXT_LINK')
+                                                                       'title' => '{--ADMIN_EXTENSION_REGISTER_NEXT_LINK--}'
                                                                ));
                                                        }
                                                } else {
index 43cda0e..f7c4fd1 100644 (file)
@@ -78,7 +78,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
        // Show next link
        loadTemplate('admin_next_link', false, array(
                'url'   => 'modules.php?module=admin&amp;what=list_country',
-               'title' => getMessage('ADMIN_COUNTRY_ACTIVATION_NEXT_LINK')
+               'title' => '{--ADMIN_COUNTRY_ACTIVATION_NEXT_LINK--}'
        ));
 } elseif (((isFormSent('edit')) || (isPostRequestParameterSet('delete'))) && (isPostRequestParameterSet('id'))) {
        if (count(postRequestParameter('id')) > 0) {
@@ -121,7 +121,7 @@ if ((isFormSent('add')) && (isPostRequestParameterSet('code')) && (isPostRequest
 
                                if ($post == 'modify') {
                                        // Generate default selection in edit-mode
-                                       $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array(getMessage('YES'), getMessage('NO')), $status);
+                                       $content['status'] = generateOptionList('/ARRAY/', array('Y', 'N'), array('{--YES--}', '{--NO--}'), $status);
                                } else {
                                        // Only display status when in delete-mode
                                        $content['status'] = translateYesNo($status);
index e320188..cd560e6 100644 (file)
@@ -77,7 +77,7 @@ if (isGetRequestParameterSet('userid')) {
 
                                // Prepare mail and send it away
                                $message = loadEmailTemplate('admin-del_links', $nums, bigintval(getRequestParameter('userid')));
-                               sendEmail(getUserData('email'), getMessage('ADMIN_DEL_LINK_SUBJ'), $message);
+                               sendEmail(getUserData('email'), '{--ADMIN_DEL_LINK_SUBJ--}', $message);
 
                                // Display message
                                loadTemplate('admin_settings_saved', false, '{--ADMIN_LINKS_DELETED--}');
index 4fa5375..cd00ee7 100644 (file)
@@ -152,7 +152,7 @@ LIMIT 1",
                                                }
 
                                                // Finally send mail
-                                               sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_ACCEPTED_SUBJECT'), $message);
+                                               sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
                                        } else {
                                                // Something goes wrong... :-(
                                                $content = implode('<br />', $ret);
@@ -192,7 +192,7 @@ LIMIT 1",
                                loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
                                // Finally send mail
-                               sendEmail(getUserData('email'), getMessage('MEMBER_PAYOUT_REJECTED_SUBJECT'), $message);
+                               sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
                        } else {
                                // Prepare content
                                $content = array(
index 920c3cd..a016dbe 100644 (file)
@@ -74,7 +74,7 @@ LIMIT 1";
        // Load admin_list_unconfirmed template
        $listed = true; $DATA = getRequestParameter('mid'); $LINK = 'mailid';
 } elseif ((isGetRequestParameterSet('bid')) && (isExtensionActive('bonus'))) {
-       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', getMessage('LIST_UNCONFIRMED_BONUS_LINKS'));
+       // @TODO This constant might be unused? define('__LIST_UNCON_TITLE', '{--LIST_UNCONFIRMED_BONUS_LINKS--}');
 
        // SQL query for mail data (both ids are required for compatiblity to above normal mail
        $sql = "SELECT `id`, `id`, `subject`, `text`, `url`, `timestamp`, `mails_sent` FROM `{?_MYSQL_PREFIX?}_bonus` WHERE `id`='".getRequestParameter('bid')."' LIMIT 1";
index b8ce952..0e90bfb 100644 (file)
@@ -86,7 +86,7 @@ if (isExtensionActive('country')) {
 }
 
 // Init unset data
-if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', getMessage('_ALL2')); }
+if (!isGetRequestParameterSet('letter')) { setGetRequestParameter('letter', '{--_ALL2--}'); }
 if (!isGetRequestParameterSet('sortby')) { setGetRequestParameter('sortby', 'userid');            }
 if (!isGetRequestParameterSet('page'))   { setGetRequestParameter('page'  , 1);                 }
 
index f91f2ae..9eb4635 100644 (file)
@@ -71,7 +71,7 @@ if (isGetRequestParameterSet('userid')) {
                                $message = loadEmailTemplate('lock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_LOCKED_SUBJ'), $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_LOCKED_SUBJ--}', $message);
                        } // END - if
 
                        // Prepare message
@@ -103,7 +103,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('unlock-user', array('text' => postRequestParameter('reason')), bigintval(getRequestParameter('userid')));
 
                                // Send away...
-                               sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $message);
+                               sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_UNLOCKED_SUBJ--}', $message);
                                if (isExtensionActive('rallye')) {
                                        addUserToReferalRallye(getRequestParameter('userid'));
                                } // END - if
index 48e9190..06074f5 100644 (file)
@@ -67,7 +67,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load message and send it away
                        $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
                } // END - while
 
                // Free memory
@@ -95,7 +95,7 @@ if (getRequestParameter('userid') == 'all') {
 
                        // Load email and send it away
                        $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJ--}', $message);
 
                        // Output message
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}');
index e5e116a..c8d9ef6 100644 (file)
@@ -106,7 +106,7 @@ LIMIT 1",
                                        $message_user = loadEmailTemplate('order-accept', $content, $content['sender']);
 
                                        // Send email
-                                       sendEmail($content['sender'], getMessage('MEMBER_ORDER_ACCEPTED'), $message_user);
+                                       sendEmail($content['sender'], '{--MEMBER_ORDER_ACCEPTED--}', $message_user);
 
                                        // Unlock selected email
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `data_type`='NEW' WHERE `id`=%s AND `data_type`='ADMIN' LIMIT 1",
@@ -143,7 +143,7 @@ LIMIT 1",
 
                                // Load email template and send it away
                                $message_user = loadEmailTemplate('order-reject', $content, $content['sender']);
-                               sendEmail($content['sender'], getMessage('MEMBER_ORDER_REJECTED'), $message_user);
+                               sendEmail($content['sender'], '{--MEMBER_ORDER_REJECTED--}', $message_user);
 
                                // If you do not enter an URL to redirect to, your URL will be set!
                                if ((!isPostRequestParameterSet('redirect')) || (postRequestParameter('redirect') == 'http://')) setPostRequestParameter('redirect', getConfig('URL'));
index b4af6fa..a86a7f8 100644 (file)
@@ -165,7 +165,7 @@ LIMIT 1",
                                        if ($REFERAL['receive_warnings'] == 'Y') {
                                                // Send notification to referal
                                                $REF_MSG = loadEmailTemplate('sponsor_ref_notify', $REFERAL);
-                                               sendEmail($REFERAL['email'], getMessage('SPONSOR_REF_NOTIFY_SUBJ'), $REF_MSG);
+                                               sendEmail($REFERAL['email'], '{--SPONSOR_REF_NOTIFY_SUBJ--}', $REF_MSG);
                                        } // END - if
 
                                        // Free memory
@@ -178,7 +178,7 @@ LIMIT 1",
 
                        // So let's send the email away
                        $message = loadEmailTemplate('sponsor_unlocked', $content);
-                       sendEmail($content['email'], getMessage('SPONSOR_UNLOCKED_SUBJ'), $message);
+                       sendEmail($content['email'], '{--SPONSOR_UNLOCKED_SUBJ--}', $message);
                } // END - foreach
        } else {
                // Nothing selected
index 95525b0..a7ecebb 100644 (file)
@@ -64,7 +64,7 @@ if ((isGetRequestParameterSet('userid')) && (bigintval(getRequestParameter('user
                        $message = loadEmailTemplate('member_contct', $content, getRequestParameter('userid'));
 
                        // Send contact form out
-                       sendEmail($content['email'], getMessage('ADMIN_CONTACT_USER_SUBJECT'), $message);
+                       sendEmail($content['email'], '{--ADMIN_CONTACT_USER_SUBJECT--}', $message);
 
                        // Display message
                        loadTemplate('admin_settings_saved', false, '{--ADMIN_USER_CONTACTED--}');
index 8b51d0b..8c87c35 100644 (file)
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
index e698f0e..8bc2251 100644 (file)
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
index 72c40b1..a97e479 100644 (file)
@@ -54,7 +54,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
index 5502dda..4b044ed 100644 (file)
@@ -50,7 +50,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the guest action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('GUEST_404_WHAT'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--GUEST_404_WHAT--}', getWhat());
 }
 
 // [EOF]
index 38018fd..2c3025c 100644 (file)
@@ -47,7 +47,7 @@ addMenuDescription('guest', __FILE__);
 
 // Init content
 $content = array(
-       'message' => getMessage('GUEST_CONFIRMED_FAILED'),
+       'message' => '{--GUEST_CONFIRMED_FAILED--}',
        'userid'  => 0,
 );
 
@@ -88,7 +88,7 @@ LIMIT 1",
                        $message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
 
                        // And send him right away the confirmation mail
-                       sendEmail($email, getMessage('GUEST_THANX_CONFIRM'), $message);
+                       sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
 
                        // Maybe he got "referaled"?
                        if (($refid > 0) && ($refid != $userid)) {
@@ -169,7 +169,7 @@ LIMIT 1",
                                $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
 
                                // Send email
-                               sendEmail(postRequestParameter('email'), getMessage('REQUEST_CONFIRM_LINK_SUBJ'), $message);
+                               sendEmail(postRequestParameter('email'), '{--REQUEST_CONFIRM_LINK_SUBJ--}', $message);
 
                                // And set message
                                $content['message'] = '{--CONFIRM_LINK_SENT--}';
index 50078e5..804b419 100644 (file)
@@ -77,7 +77,7 @@ $TEST = makeTime(0, 0, 0, $PROJECTED);
 if ($TEST > time()) {
        $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', generateDateTime($PROJECTED, 3));
 } else {
-       $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', getMessage('USER_PROJECTION_UNKNOWN'));
+       $content['projected'] = getMaskedMessage('USER_MT_PROJECTED', '{--USER_PROJECTION_UNKNOWN--}');
 }
 
 // User who can receive mails
@@ -184,7 +184,7 @@ $OUT_SPECIAL = ''; // We don't need row count here
 if (isExtensionActive('beg')) {
        // Clicks on beg links
        $data = array(
-               'lang'  => getMessage('MEDIA_BEG_CLICKS'),
+               'lang'  => '{--MEDIA_BEG_CLICKS--}',
                'value' => countSumTotalData('0', 'user_data', 'beg_clicks', 'userid', false, " AND `beg_clicks` > 0")
        );
        $OUT_EXTRA .= loadTemplate('mediadata_extra_row', true, $data);
@@ -192,28 +192,28 @@ if (isExtensionActive('beg')) {
 
 if (isExtensionActive('doubler')) {
        // Add header
-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_DOUBLER_HEADER'));
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_DOUBLER_HEADER--}');
 
        // Add first line (count)
        $data = array(
-               'lang'  => getMessage('MEDIA_DOUBLER_COUNT'),
+               'lang'  => '{--MEDIA_DOUBLER_COUNT--}',
                'value' => countSumTotalData('Y','doubler','id','completed', true, " AND `points` > 0"),
        );
 
        // Add points
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_DOUBLER_CPOINTS'),
+               'lang'  => '{--MEDIA_DOUBLER_CPOINTS--}',
                'value' => translateComma(countSumTotalData('Y','doubler','id','completed', false, " AND `points` > 0"))
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_DOUBLER_WAITING'),
+               'lang'  => '{--MEDIA_DOUBLER_WAITING--}',
                'value' => translateComma(countSumTotalData('N','doubler','id','completed', true, " AND `points` > 0"))
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_DOUBLER_WPOINTS'),
+               'lang'  => '{--MEDIA_DOUBLER_WPOINTS--}',
                'value' => translateComma(countSumTotalData('N','doubler','id','completed', false, " AND `points` > 0"))
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
@@ -236,7 +236,7 @@ WHERE
        SQL_FREERESULT($result);
        if (empty($holiday)) $holiday = '0';
        $data = array(
-               'lang'  => getMessage('MEDIA_HOLIDAY_COUNT'),
+               'lang'  => '{--MEDIA_HOLIDAY_COUNT--}',
                'value' => $holiday
        );
        $OUT_USER .= loadTemplate('mediadata_extra_row', true, $data);
@@ -269,24 +269,24 @@ ON t.userid=d.userid",
        if (empty($points_out)) $points_out = '0';
 
        // Add header
-       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, getMessage('MEDIA_TRANSFER_HEADER'));
+       $OUT_SPECIAL .= loadTemplate('mediadata_extra_hrow', true, '{--MEDIA_TRANSFER_HEADER--}');
        $data = array(
-               'lang'  => getMessage('MEDIA_TRANSFER_IN_COUNT'),
+               'lang'  => '{--MEDIA_TRANSFER_IN_COUNT--}',
                'value' => $count_in,
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row2', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_TRANSFER_IN_POINTS'),
+               'lang'  => '{--MEDIA_TRANSFER_IN_POINTS--}',
                'value' => translateComma($points_in)
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_TRANSFER_OUT_COUNT'),
+               'lang'  => '{--MEDIA_TRANSFER_OUT_COUNT--}',
                'value' => $count_out
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
        $data = array(
-               'lang'  => getMessage('MEDIA_TRANSFER_OUT_POINTS'),
+               'lang'  => '{--MEDIA_TRANSFER_OUT_POINTS--}',
                'value' => translateComma($points_out)
        );
        $OUT_SPECIAL .= loadTemplate('mediadata_extra_row', true, $data);
index c712e17..a44a10e 100644 (file)
@@ -103,7 +103,7 @@ if ((isFormSent()) && (isRegistrationDataComplete())) {
                } // END - if
 
                if ((!empty($GLOBALS['register_selected_cats'])) && ($GLOBALS['register_selected_cats'] < getConfig('least_cats'))) {
-                       registerOutputFailedMessage('', getMessage('CATS_LEAST'));
+                       registerOutputFailedMessage('', '{--CATS_LEAST--}');
                } // END - if
        } // END - if
 
index 1952a4c..e4fb6d1 100644 (file)
@@ -97,7 +97,7 @@ LIMIT 1",
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Prepare mail and send it to the sponsor
                                $message = loadEmailTemplate('sponsor_pending', $data);
-                               sendEmail($data['email'], getMessage('SPONSOR_ACCOUNT_PENDING_SUBJ'), $message);
+                               sendEmail($data['email'], '{--SPONSOR_ACCOUNT_PENDING_SUBJ--}', $message);
 
                                // Send email to admin
                                sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_pending', $data);
@@ -170,7 +170,7 @@ WHERE email='%s' AND (`status`='UNCONFIRMED' OR `status`='EMAIL') LIMIT 1",
                                // Confirmed email address
                                $message_sponsor = loadEmailTemplate('sponsor_email', $data);
                        }
-                       sendEmail(postRequestParameter('email'), getMessage('SPONSOR_ACTIVATION_LINK_SUBJ'), $message_sponsor);
+                       sendEmail(postRequestParameter('email'), '{--SPONSOR_ACTIVATION_LINK_SUBJ--}', $message_sponsor);
 
                        // Output message
                        loadTemplate('admin_settings_saved', false, '{--SPONSOR_ACTIVATION_LINK_SENT--}');
@@ -213,7 +213,7 @@ WHERE `email`='%s' AND `id`='%s' AND `status`='CONFIRMED' LIMIT 1",
 
                        // Prepare email and send it to the sponsor
                        $message_sponsor = loadEmailTemplate('sponsor_lost', $DATA);
-                       sendEmail(postRequestParameter('email'), getMessage('SPONSOR_LOST_PASSWORD_SUBJ'), $message_sponsor);
+                       sendEmail(postRequestParameter('email'), '{--SPONSOR_LOST_PASSWORD_SUBJ--}', $message_sponsor);
 
                        // Update password
                        SQL_QUERY_ESC("UPDATE
index 18c3ba1..d3adcaf 100644 (file)
@@ -202,8 +202,8 @@ if (isFormSent()) {
 if ((isFormSent()) && (count($FORM_ERRORS) == 0)) {
        // Generate message array
        $messageArray = array(
-               'failed' => getMessage('SPONSOR_REGISTRATION_FAILED'),
-               'added'  => getMessage('SPONSOR_REGISTRATION_COMPLETED'),
+               'failed' => '{--SPONSOR_REGISTRATION_FAILED--}',
+               'added'  => '{--SPONSOR_REGISTRATION_COMPLETED--}',
        );
 
        // Calulate points
@@ -247,7 +247,7 @@ WHERE `id`='%s' LIMIT 1",
 
                                // Generate email and send it to the new sponsor
                                $message = loadEmailTemplate('sponsor_confirm', $hash);
-                               sendEmail(postRequestParameter('email'), getMessage('SPONSOR_PLEASE_CONFIRM_SUBJ'), $message);
+                               sendEmail(postRequestParameter('email'), '{--SPONSOR_PLEASE_CONFIRM_SUBJ--}', $message);
 
                                // Send mail to admin
                                sendAdminNotification(getMessage('ADMIN_NEW_SPONSOR'), 'admin_sponsor_reg', $hash);
index d289d11..2ef513c 100644 (file)
@@ -198,7 +198,7 @@ switch (getConfig('guest_stats')) {
 
                if (SQL_NUMROWS($guest_t10) > 0) {
                        // Guest clicks
-                       $OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_GUEST_STATS'));
+                       $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_GUEST_STATS--}');
                        $SW = 2;
                        while ($content = SQL_FETCHARRAY($guest_t10)) {
                                $content['sw'] = $SW;
@@ -211,7 +211,7 @@ switch (getConfig('guest_stats')) {
 
                if (SQL_NUMROWS($mem_t10) > 0) {
                        // Member clicks
-                       $OUT .= loadTemplate('guest_stats_header', true, getMessage('GUEST_TOP_MEMBER_STATS'));
+                       $OUT .= loadTemplate('guest_stats_header', true, '{--GUEST_TOP_MEMBER_STATS--}');
                        $SW = 2;
                        while ($content = SQL_FETCHARRAY($mem_t10)) {
                                $content['sw'] = $SW;
index d2d71af..4396696 100644 (file)
@@ -61,7 +61,7 @@ if (isIncludeReadable($inc)) {
        // Ok, we finally load the member action module
        loadInclude($inc);
 } else {
-       addFatalMessage(__FILE__, __LINE__, getMessage('MEMBER_404_WHAT'), getWhat());
+       addFatalMessage(__FILE__, __LINE__, '{--MEMBER_404_WHAT--}', getWhat());
 }
 
 // [EOF]
index bfcffff..18742cc 100644 (file)
@@ -145,7 +145,7 @@ LIMIT 1",
 
                // Send mail to member
                $message = loadEmailTemplate('member_holiday_request', $content, getMemberId());
-               sendEmail(getMemberId(), getMessage('HOLIDAY_MEMBER_SUBJECT'), $message);
+               sendEmail(getMemberId(), '{--HOLIDAY_MEMBER_SUBJECT--}', $message);
 
                // Send mail to all admins
                sendAdminNotification(getMessage('HOLIDAY_ADMIN_SUBJECT'), 'admin_holiday_request', $content, getMemberId());
index dadbf5b..1fecd69 100644 (file)
@@ -229,7 +229,7 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
                                createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
                                // Send out mails
-                               sendEmail(getMemberId(), getMessage('MEMBER_PAYOUT_REQUEST_SUBJ'), $message_mem);
+                               sendEmail(getMemberId(), '{--MEMBER_PAYOUT_REQUEST_SUBJ--}', $message_mem);
 
                                // To admin(s)
                                sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
index 8fbaab9..ffb4a4c 100644 (file)
@@ -161,14 +161,14 @@ switch ($mode) {
 
                                // First send email to recipient
                                $message = loadEmailTemplate('member_transfer_recipient', $content, postRequestParameter('to_userid'));
-                               sendEmail($content['recipient']['email'], getMessage('TRANSFER_MEMBER_RECIPIENT_SUBJ') . ': ' . $SENDER, $message);
+                               sendEmail($content['recipient']['email'], '{--TRANSFER_MEMBER_RECIPIENT_SUBJ--}' . ': ' . $SENDER, $message);
 
                                // Second send email to sender
                                $message = loadEmailTemplate('member_transfer_sender', $content, getMemberId());
-                               sendEmail($content['sender']['email'], getMessage('TRANSFER_MEMBER_SENDER_SUBJ') . ': ' . $RECIPIENT, $message);
+                               sendEmail($content['sender']['email'], '{--TRANSFER_MEMBER_SENDER_SUBJ--}' . ': ' . $RECIPIENT, $message);
 
                                // At last send admin mail(s)
-                               $adminSubject = sprintf("%s (%s->%s)", getMessage('TRANSFER_ADMIN_SUBJECT'), $SENDER, $RECIPIENT);
+                               $adminSubject = sprintf("%s (%s->%s)", '{--TRANSFER_ADMIN_SUBJECT--}', $SENDER, $RECIPIENT);
                                sendAdminNotification($adminSubject, 'admin_transfer_points', $content);
 
                                // Transfer is completed
index b7a4652..3964d68 100644 (file)
@@ -101,7 +101,7 @@ if (empty($url)) {
 
                // Send an email to the user
                $message_mem = loadEmailTemplate('order-member', $content, getMemberId());
-               sendEmail(getMemberId(), getMessage('MEMBER_NEW_QUEUE'), $message_mem);
+               sendEmail(getMemberId(), '{--MEMBER_NEW_QUEUE--}', $message_mem);
 
                // Notify admins about this
                sendAdminNotification(getMessage('ADMIN_NEW_QUEUE'), 'order-admin', $content, getMemberId());
index 8fe2cba..6473576 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
-       addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+       addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
 } elseif (!isWhatSet()) {
        // Empty what value detected!
index 1b7ed8c..e1beb63 100644 (file)
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
-       addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+       addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
 }
 
index db18c7d..12803ba 100644 (file)
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
-       addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+       addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
 }
 
index 6c06b08..d5d9b78 100644 (file)
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
-       addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+       addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
 }
 
index 0d73865..4a0dccc 100644 (file)
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
        return;
 } elseif (!isSponsor()) {
        // No sponsor!
-       addFatalMessage(__FILE__, __LINE__, getMessage('SPONSOR_ONLY_AREA_ENTERED'));
+       addFatalMessage(__FILE__, __LINE__, '{--SPONSOR_ONLY_AREA_ENTERED--}');
        return;
 }
 
index 7554259..a509f4d 100644 (file)
@@ -92,7 +92,7 @@ LIMIT {?beg_ranks?}", __FILE__, __LINE__);
 
                        // Load email template and email it away
                        $message = loadEmailTemplate('member_beg', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('BEG_MONTHLY_RALLYE'), $message);
+                       sendEmail($content['email'], '{--BEG_MONTHLY_RALLYE--}', $message);
                } // END - while
 
                // Reset accounts
index d4131cd..500f9f2 100644 (file)
@@ -100,7 +100,7 @@ LIMIT {?bonus_ranks?}", __FILE__, __LINE__);
 
                                // Load email template and email it away
                                $message = loadEmailTemplate('member_bonus', $content, bigintval($content['userid']));
-                               sendEmail($content['email'], getMessage('BONUS_MONTHLY_ONLINE_BONUS'), $message);
+                               sendEmail($content['email'], '{--BONUS_MONTHLY_ONLINE_BONUS--}', $message);
                        } // END - if
                } // END - while
 
index c01636f..82e55ff 100644 (file)
@@ -121,15 +121,15 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                }
                        } else {
                                // Wrong database?
-                               addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
+                               addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
                        }
                } else {
                        // No link to database!
-                       addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
+                       addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
                }
        } else {
                // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
+               addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
        }
 } else {
        ///////////////////////////////////////////////////
index e6d61fb..559361d 100644 (file)
@@ -1301,11 +1301,11 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
 
                                // Send email
-                               sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
+                               sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
                        } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
                                // Prepare content
                                $content = array(
-                                       'text'   => getMessage('REASON_DIRECT_PAYMENT'),
+                                       'text'   => '{--REASON_DIRECT_PAYMENT--}',
                                        'points' => $ref_points
                                );
 
@@ -1313,7 +1313,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
                                $message = loadEmailTemplate('add-points', $content, $userid);
 
                                // And sent it away
-                               sendEmail($userid, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+                               sendEmail($userid, '{--SUBJECT_DIRECT_PAYMENT--}', $message);
                                if (!isGetRequestParameterSet('mid')) loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
                        }
 
@@ -1736,7 +1736,7 @@ LIMIT 1",
 
        // Now a mail to the user and that's all...
        $message = loadEmailTemplate('del-user', $data, $userid);
-       sendEmail($userid, getMessage('ADMIN_DEL_ACCOUNT'), $message);
+       sendEmail($userid, '{--ADMIN_DEL_ACCOUNT--}', $message);
 
        // Ok, delete the account!
        SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1", array(bigintval($userid)), __FUNCTION__, __LINE__);
index d51453f..85388e4 100644 (file)
@@ -189,7 +189,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                                        $mailText = loadEmailTemplate('done-member', $content, $DATA['sender']);
 
                                                        // Send it also waway
-                                                       sendEmail(getUserData('email'), getMessage('MEMBER_SUBJ_SEND_DONE'), $mailText);
+                                                       sendEmail(getUserData('email'), '{--MEMBER_SUBJ_SEND_DONE--}', $mailText);
                                                } // END - if
 
                                                // Set status to SEND because we completely send it away
@@ -279,7 +279,7 @@ if (SQL_NUMROWS($result_main) > 0) {
                                        $mailText = loadEmailTemplate('back-member', $content, bigintval($userid));
 
                                        // Send mail out to member
-                                       sendEmail(getUserData('email'), getMessage('MEMBER_BACK_JACKPOT') . ' (' . $userid . ')', $mailText);
+                                       sendEmail(getUserData('email'), '{--MEMBER_BACK_JACKPOT--}' . ' (' . $userid . ')', $mailText);
                                } elseif (isExtensionActive('jackpot')) {
                                        // Add to jackpot
                                        addPointsToJackpot($PB);
index f5cff94..7b480c1 100644 (file)
@@ -72,7 +72,7 @@ if (SQL_NUMROWS($result_bonus) > 0) {
 
                // Load email template and send email
                $message = loadEmailTemplate('member_stats_bonus', $content, bigintval($content['userid']));
-               sendEmail($content['userid'], getMessage('BONUS_MEMBER_STATS_SUBJECT'), $message);
+               sendEmail($content['userid'], '{--BONUS_MEMBER_STATS_SUBJECT--}', $message);
 
                // Update database
                $result_update = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_stats` SET `bonus_stats_active`='Y' WHERE `id`=%s LIMIT 1",
index e2a95fd..fb45557 100644 (file)
@@ -108,7 +108,7 @@ if (SQL_NUMROWS($result_birthday) > 0) {
                }
 
                // Send email
-               sendEmail($content['email'], getMessage('HAPPY_BIRTHDAY_SUBJECT'), $message);
+               sendEmail($content['email'], '{--HAPPY_BIRTHDAY_SUBJECT--}', $message);
 
                // Remember him that he has received a birthday mail
                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `birthday_sent`=UNIX_TIMESTAMP() WHERE `userid`=%s LIMIT 1",
index 09c45a5..bf8fffc 100644 (file)
@@ -94,7 +94,7 @@ LIMIT 1",
 
                        // Send email to user
                        $message = loadEmailTemplate('member_holiday_activated', $content, $content['userid']);
-                       sendEmail($content['userid'], getMessage('HOLIDAY_MEMBER_ACTIVATED_SUBJ'), $message);
+                       sendEmail($content['userid'], '{--HOLIDAY_MEMBER_ACTIVATED_SUBJ--}', $message);
 
                        // Update account
                        addSql(SQL_QUERY_ESC("UPDATE
index ebd7ab0..efb8658 100644 (file)
@@ -51,20 +51,17 @@ if (!defined('__SECURITY')) {
 
 if ((getConfig('send_prof_update') == 'Y') && (getConfig('profile_update') > 0) && (getConfig('resend_profile_update'))) {
        // Load personal data
-       $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `last_update`, `joined`
+       $result = SQL_QUERY("SELECT `userid`, `email`, `last_update`, `joined`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       (`last_update` < (UNIX_TIMESTAMP() - %s) AND `last_update` != 0 AND `last_profile_sent` < (UNIX_TIMESTAMP() - %s))
+       (`last_update` < (UNIX_TIMESTAMP() - {?profile_update?}) AND
+       `last_update` != 0 AND
+       `last_profile_sent` < (UNIX_TIMESTAMP() - {?resend_profile_update?}))
 OR
-       (`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - %s))
+       (`last_update` = '0' AND `last_profile_sent` = '0' AND `joined` < (UNIX_TIMESTAMP() - {?profile_update?}))
 ORDER BY
-       `userid` ASC",
-               array(
-                       getConfig('profile_update'),
-                       getConfig('resend_profile_update'),
-                       getConfig('profile_update')
-               ), __FILE__, __LINE__);
+       `userid` ASC", __FILE__, __LINE__);
 
        // Do we have some notifications to sent?
        if (SQL_NUMROWS($result) > 0) {
@@ -83,7 +80,7 @@ ORDER BY
 
                        // Load email template and send mail away
                        $message = loadEmailTemplate('profile-updte', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], getMessage('PROFILE_OUTDATED'), $message);
+                       sendEmail($content['email'], '{--PROFILE_OUTDATED--}', $message);
 
                        // Update profile data
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `last_profile_sent`=UNIX_TIMESTAMP(), `notified`='Y' WHERE `userid`=%s LIMIT 1",
index 5053ac7..c5e1c0b 100644 (file)
@@ -82,7 +82,7 @@ setUsername('{--USERNAME_INSTALLER--}');
 // Already installed?
 if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
        // Add fatal message
-       addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
+       addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
 
 // Load header here
index 796b1e8..5dcf9f0 100644 (file)
@@ -76,7 +76,7 @@ $check = 'failed';
 // Is the maintenance mode active or goes all well?
 if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) {
        // Maintain mode is active and you are no admin
-       addFatalMessage(__FILE__, __LINE__, getMessage('MAILER_DOWN_FOR_MAINTENANCE'));
+       addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
 } elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
        // Construct module name
        $GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
@@ -133,7 +133,7 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
        } // END - switch
 } elseif (!ifFatalErrorsDetected()) {
        // MySQL problems detected
-       addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+       addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {