- Major change in LOAD_EMAIL_TEMPLATE(). The deprecated switch() block has
authorRoland Häder <roland@mxchange.org>
Sat, 13 Sep 2008 15:51:21 +0000 (15:51 +0000)
committerRoland Häder <roland@mxchange.org>
Sat, 13 Sep 2008 15:51:21 +0000 (15:51 +0000)
  been removed, all email templates are rewritten from direct variables like
  $salut, $surname, $family to $content[bla].
- Offensive word "sex" and "salut" replaced with "gender"
- Several minor fixes to templates and engine

247 files changed:
birthday_confirm.php
inc/databases.php
inc/extensions/ext-sponsor.php
inc/extensions/ext-sql_patches.php
inc/extensions/ext-user.php
inc/functions.php
inc/language/de.php
inc/language/en.ph
inc/language/sponsor_de.php
inc/libs/rallye_functions.php
inc/libs/register_functions.php
inc/libs/sponsor_functions.php
inc/modules/admin/overview-inc.php
inc/modules/admin/what-chk_regs.php
inc/modules/admin/what-del_sponsor.php
inc/modules/admin/what-edit_sponsor.php
inc/modules/admin/what-edit_user.php
inc/modules/admin/what-list_autopurge.php
inc/modules/admin/what-list_beg.php
inc/modules/admin/what-list_bonus.php
inc/modules/admin/what-list_norefs.php
inc/modules/admin/what-list_payouts.php
inc/modules/admin/what-list_refs.php
inc/modules/admin/what-list_sponsor.php
inc/modules/admin/what-list_unconfirmed.php
inc/modules/admin/what-list_user.php
inc/modules/admin/what-lock_sponsor.php
inc/modules/admin/what-lock_user.php
inc/modules/admin/what-unlock_sponsor.php
inc/modules/guest/what-confirm.php
inc/modules/guest/what-login.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/what-mydata.php
inc/modules/member/what-transfer.php
inc/modules/order.php
inc/modules/sponsor/account.php
inc/modules/sponsor/settings.php
inc/modules/sponsor/welcome.php
inc/mysql-manager.php
inc/pool-update.php
inc/profile-updte.php
install/tables.sql
mailid.php
mailid_top.php
show_bonus.php
templates/de/emails/add-points.tpl
templates/de/emails/admin-del_links.tpl
templates/de/emails/admin/admin_holiday_deactivated.tpl
templates/de/emails/admin/admin_holiday_request.tpl
templates/de/emails/admin/admin_mydata_notify.tpl
templates/de/emails/admin/admin_newsletter_request.tpl
templates/de/emails/admin/admin_newsletter_reset.tpl
templates/de/emails/admin/admin_payout_request.tpl
templates/de/emails/admin/admin_payout_request_banner.tpl
templates/de/emails/admin/admin_sponsor_change_data.tpl
templates/de/emails/admin/admin_sponsor_change_email.tpl
templates/de/emails/admin/admin_sponsor_edit.tpl
templates/de/emails/admin/admin_sponsor_pending.tpl
templates/de/emails/admin/admin_sponsor_reg.tpl
templates/de/emails/admin/admin_support-order.tpl
templates/de/emails/admin/admin_support-ordr.tpl
templates/de/emails/admin/admin_support-reflink.tpl
templates/de/emails/admin/admin_support-unconfirmed.tpl
templates/de/emails/admin/admin_transfer_points.tpl
templates/de/emails/admin/admin_wernis_request.tpl
templates/de/emails/back-admin.tpl
templates/de/emails/back-member.tpl
templates/de/emails/beg/beg_di_notify.tpl
templates/de/emails/beg/beg_en_notify.tpl
templates/de/emails/bonus-mail.tpl
templates/de/emails/bonus/bonus_di_notify.tpl
templates/de/emails/bonus/bonus_en_notify.tpl
templates/de/emails/confirm-member.tpl
templates/de/emails/confirm-referral.tpl
templates/de/emails/del-user.tpl
templates/de/emails/del_sponsor.tpl
templates/de/emails/done-admin.tpl
templates/de/emails/done-member.tpl
templates/de/emails/guest/guest_request_confirm.tpl
templates/de/emails/lock-user.tpl
templates/de/emails/lock_sponsor.tpl
templates/de/emails/member/member_autopurge_inactive.tpl
templates/de/emails/member/member_autopurge_points.tpl
templates/de/emails/member/member_beg.tpl
templates/de/emails/member/member_birthday.tpl
templates/de/emails/member/member_birthday_confirm.tpl
templates/de/emails/member/member_bonus.tpl
templates/de/emails/member/member_doubler.tpl
templates/de/emails/member/member_holiday_activated.tpl
templates/de/emails/member/member_holiday_removed.tpl
templates/de/emails/member/member_holiday_request.tpl
templates/de/emails/member/member_holiday_unlock.tpl
templates/de/emails/member/member_mydata_notify.tpl
templates/de/emails/member/member_newsletter_done.tpl
templates/de/emails/member/member_newsletter_request.tpl
templates/de/emails/member/member_newsletter_reset.tpl
templates/de/emails/member/member_payout_accepted.tpl
templates/de/emails/member/member_payout_rejected.tpl
templates/de/emails/member/member_payout_request.tpl
templates/de/emails/member/member_payout_request_banner.tpl
templates/de/emails/member/member_rallye_expired.tpl
templates/de/emails/member/member_rallye_expired_bronce.tpl
templates/de/emails/member/member_rallye_expired_gold.tpl
templates/de/emails/member/member_rallye_expired_silver.tpl
templates/de/emails/member/member_rallye_notify.tpl
templates/de/emails/member/member_stats_bonus.tpl
templates/de/emails/member/member_support-order.tpl
templates/de/emails/member/member_support-ordr.tpl
templates/de/emails/member/member_support-reflink.tpl
templates/de/emails/member/member_support-unconfirmed.tpl
templates/de/emails/member/member_transfer_recipient.tpl
templates/de/emails/member/member_transfer_sender.tpl
templates/de/emails/member/member_wernis_accepted.tpl
templates/de/emails/member/member_wernis_rejected.tpl
templates/de/emails/member/member_wernis_request.tpl
templates/de/emails/new-pass.tpl
templates/de/emails/newsletter.tpl
templates/de/emails/newsletter_html.tpl
templates/de/emails/normal-mail.tpl
templates/de/emails/order-accept.tpl
templates/de/emails/order-admin.tpl
templates/de/emails/order-deleted.tpl
templates/de/emails/order-member.tpl
templates/de/emails/order-reject.tpl
templates/de/emails/order_accept_sb.tpl
templates/de/emails/profile-updte.tpl
templates/de/emails/register-admin.tpl
templates/de/emails/register-member.tpl
templates/de/emails/sponsor/sponsor_activate.tpl
templates/de/emails/sponsor/sponsor_add_points.tpl
templates/de/emails/sponsor/sponsor_change_data.tpl
templates/de/emails/sponsor/sponsor_change_email.tpl
templates/de/emails/sponsor/sponsor_confirm.tpl
templates/de/emails/sponsor/sponsor_email.tpl
templates/de/emails/sponsor/sponsor_lost.tpl
templates/de/emails/sponsor/sponsor_pending.tpl
templates/de/emails/sponsor/sponsor_ref_notify.tpl
templates/de/emails/sponsor/sponsor_settings.tpl
templates/de/emails/sponsor/sponsor_sub_points.tpl
templates/de/emails/sponsor/sponsor_unlock.tpl
templates/de/emails/sponsor/sponsor_unlocked.tpl
templates/de/emails/sponsor_add_points.tpl
templates/de/emails/sponsor_confirm.tpl
templates/de/emails/sponsor_pending.tpl
templates/de/emails/sponsor_sub_points.tpl
templates/de/emails/sponsor_unlocked.tpl
templates/de/emails/sub-points.tpl
templates/de/emails/unlock-user.tpl
templates/de/html/admin/admin_add_sponsor.tpl
templates/de/html/admin/admin_add_sponsor_already.tpl
templates/de/html/admin/admin_admin_add.tpl
templates/de/html/admin/admin_admins_contact_form.tpl
templates/de/html/admin/admin_admins_contct_form.tpl
templates/de/html/admin/admin_config_active.tpl
templates/de/html/admin/admin_config_admin.tpl
templates/de/html/admin/admin_config_autopurge.tpl
templates/de/html/admin/admin_config_beg.tpl
templates/de/html/admin/admin_config_birthday.tpl
templates/de/html/admin/admin_config_bonus.tpl
templates/de/html/admin/admin_config_cache.tpl
templates/de/html/admin/admin_config_extensions.tpl
templates/de/html/admin/admin_config_home_settings.tpl
templates/de/html/admin/admin_config_home_settings_pro.tpl
templates/de/html/admin/admin_config_nickname.tpl
templates/de/html/admin/admin_config_order.tpl
templates/de/html/admin/admin_config_order_form.tpl
templates/de/html/admin/admin_config_rallye_del.tpl
templates/de/html/admin/admin_config_rallye_edit.tpl
templates/de/html/admin/admin_config_rallye_prices.tpl
templates/de/html/admin/admin_config_refid.tpl
templates/de/html/admin/admin_config_reg_pro.tpl
templates/de/html/admin/admin_config_register2.tpl
templates/de/html/admin/admin_config_secure.tpl
templates/de/html/admin/admin_config_sponsor.tpl
templates/de/html/admin/admin_config_stats.tpl
templates/de/html/admin/admin_config_surfbar.tpl
templates/de/html/admin/admin_config_title.tpl
templates/de/html/admin/admin_config_transfer.tpl
templates/de/html/admin/admin_config_user.tpl
templates/de/html/admin/admin_del_sponsor.tpl
templates/de/html/admin/admin_edit_sponsor_add_points.tpl
templates/de/html/admin/admin_edit_sponsor_edit.tpl
templates/de/html/admin/admin_edit_sponsor_sub_points.tpl
templates/de/html/admin/admin_edit_user.tpl
templates/de/html/admin/admin_email_nav_row.tpl
templates/de/html/admin/admin_guest_add.tpl
templates/de/html/admin/admin_list_autopurge.tpl
templates/de/html/admin/admin_list_autopurge_row.tpl
templates/de/html/admin/admin_list_beg_rows.tpl
templates/de/html/admin/admin_list_bonus_rows.tpl
templates/de/html/admin/admin_list_country_form.tpl
templates/de/html/admin/admin_list_doubler_already.tpl
templates/de/html/admin/admin_list_doubler_waiting.tpl
templates/de/html/admin/admin_list_extensions.tpl
templates/de/html/admin/admin_list_links.tpl
templates/de/html/admin/admin_list_rallye_usr.tpl
templates/de/html/admin/admin_list_refs_row.tpl
templates/de/html/admin/admin_list_sponsor_details.tpl
templates/de/html/admin/admin_list_sponsor_row.tpl
templates/de/html/admin/admin_list_transfer.tpl
templates/de/html/admin/admin_list_unconfirmed.tpl
templates/de/html/admin/admin_list_user_row.tpl
templates/de/html/admin/admin_lock_sponsor.tpl
templates/de/html/admin/admin_member_add.tpl
templates/de/html/admin/admin_reg.tpl
templates/de/html/admin/admin_reg_row.tpl
templates/de/html/admin/admin_send_bonus_form.tpl
templates/de/html/admin/admin_sponsor_paytypes.tpl
templates/de/html/admin/admin_unlock_emails.tpl
templates/de/html/admin/admin_unlock_sponsor_row.tpl
templates/de/html/admin/admin_user_details.tpl
templates/de/html/beg/beg_done.tpl
templates/de/html/beg/beg_failed.tpl
templates/de/html/beg/beg_link.tpl
templates/de/html/beg/beg_login.tpl
templates/de/html/birthday/birthday_confirm.tpl
templates/de/html/birthday/birthday_msg.tpl
templates/de/html/doubler/doubler_index.tpl
templates/de/html/guest/guest_confirm_table.tpl
templates/de/html/guest/guest_rallye_footer.tpl
templates/de/html/guest/guest_rallye_show.tpl
templates/de/html/guest/guest_register.tpl
templates/de/html/guest/guest_sponsor_infos.tpl
templates/de/html/guest/guest_sponsor_reg.tpl
templates/de/html/member/member_beg.tpl
templates/de/html/member/member_doubler.tpl
templates/de/html/member/member_holiday_deactivate.tpl
templates/de/html/member/member_holiday_form.tpl
templates/de/html/member/member_mydata_edit.tpl
templates/de/html/member/member_mydata_overview.tpl
templates/de/html/member/member_nickname_form.tpl
templates/de/html/member/member_themes.tpl
templates/de/html/member/member_transfer_list.tpl
templates/de/html/member/member_transfer_new.tpl
templates/de/html/member/member_transfer_overview.tpl
templates/de/html/member/member_transfer_settings.tpl
templates/de/html/show_bonus.tpl
templates/de/html/show_bonus_msg.tpl
templates/de/html/show_bonus_yr.tpl
templates/de/html/sponsor/sponsor_account_form.tpl
templates/de/html/sponsor/sponsor_main.tpl
templates/de/html/sponsor/sponsor_settings_form.tpl
templates/de/html/sponsor/sponsor_welcome.tpl
templates/de/html/theme_one.tpl

index 68fd150ef9c2194ff03db3b43bbcf5f8dd4b17b3..b9b4242e5a043526530ab0ce4f81cf1eb6e234dc 100644 (file)
@@ -53,7 +53,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        $chk = bigintval($_GET['check'], false);
 
        // Check if link is not clicked so far
        $chk = bigintval($_GET['check'], false);
 
        // Check if link is not clicked so far
-       $result = SQL_QUERY_ESC("SELECT b.points, d.sex, d.surname, d.family, d.status, d.ref_payout
+       $result = SQL_QUERY_ESC("SELECT b.points, d.gender, d.surname, d.family, d.status, d.ref_payout
 FROM "._MYSQL_PREFIX."_user_birthday AS b
 INNER JOIN "._MYSQL_PREFIX."_user_data AS d
 ON b.userid=d.userid
 FROM "._MYSQL_PREFIX."_user_birthday AS b
 INNER JOIN "._MYSQL_PREFIX."_user_data AS d
 ON b.userid=d.userid
@@ -87,7 +87,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1",
                        }
 
                        // Transfer data to constants for the template
                        }
 
                        // Transfer data to constants for the template
-                       define('__SALUT', TRANSLATE_SEX($data['sex']));
+                       define('__GENDER', TRANSLATE_GENDER($data['gender']));
                        define('__SNAME', $data['surname']);
                        define('__FNAME', $data['family']);
                        define('__GIFT' , $data['points']);
                        define('__SNAME', $data['surname']);
                        define('__FNAME', $data['family']);
                        define('__GIFT' , $data['points']);
index 7db0047ad7454d6f0ee0cd392dbde8072abc698f..424bd8c5a633a86bb107abdc391472ed37a1bbf8 100644 (file)
@@ -78,12 +78,12 @@ define('FULL_VERSION', "0.2.1-FINAL");
 
 // Replacement strings
 $REPLACER = array(
 
 // Replacement strings
 $REPLACER = array(
-       10 => "%uid%",                  // User-ID
-       11 => "%vorname%",              // Surname
-       12 => "%nachname%",             // Family name
-       13 => "%anrede%",               // Salutation
+       'userid'  => "%uid%",                   // User-ID
+       'surname' => "%vorname%",               // Surname
+       'family'  => "%nachname%",              // Family name
+       'gender'  => "%anrede%",                // Gender
 );
 );
-//
+
 // One day
 define('ONE_DAY', 60*60*24);
 
 // One day
 define('ONE_DAY', 60*60*24);
 
@@ -114,7 +114,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "315");
+define('CURR_SVN_REVISION', "316");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
@@ -122,5 +122,8 @@ define('_PRIME', 591623);
 // Calculate "entropy" with the prime number (for code generation)
 define('_ADD', (_PRIME * _PRIME / (pi() * $_CONFIG['code_length'] + 1)));
 
 // Calculate "entropy" with the prime number (for code generation)
 define('_ADD', (_PRIME * _PRIME / (pi() * $_CONFIG['code_length'] + 1)));
 
+// Extra title is empty by default
+$EXTRA_TITLE = "";
+
 //
 ?>
 //
 ?>
index 4201cc029abee2b5ea2ef22732aecf5c9526442e..3622ce3f86601a356b40c7f0833cd5c5b25abc1d 100644 (file)
@@ -66,7 +66,7 @@ id BIGINT(20) NOT NULL AUTO_INCREMENT,
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',
 tax_ident VARCHAR(255) NOT NULL DEFAULT '',
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',
 tax_ident VARCHAR(255) NOT NULL DEFAULT '',
-salut ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M',
+gender ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M',
 surname VARCHAR(255) NOT NULL DEFAULT '',
 family VARCHAR(255) NOT NULL DEFAULT '',
 street_nr1 VARCHAR(255) NOT NULL DEFAULT '',
 surname VARCHAR(255) NOT NULL DEFAULT '',
 family VARCHAR(255) NOT NULL DEFAULT '',
 street_nr1 VARCHAR(255) NOT NULL DEFAULT '',
@@ -268,7 +268,7 @@ PRIMARY KEY(id)
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('company', 'Y')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('position', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('tax_ident', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('company', 'Y')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('position', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('tax_ident', 'N')";
-               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('salut', 'N')";
+               $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('gender', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('surname', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('family', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr1', 'Y')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('surname', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('family', 'N')";
                $SQLs[] = "INSERT INTO "._MYSQL_PREFIX."_sponsor_admin_data (data_row, display) VALUES ('street_nr1', 'Y')";
index 5b073eec20599d925c0b28f8ec6f6a0a40e2e363..2bfb044c7b1c3e1cb981a90a7aa2495d8bdd2b76 100644 (file)
@@ -38,13 +38,13 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF']))) {
 }
 
 // Version number
 }
 
 // Version number
-$EXT_VERSION = "0.4.5";
+$EXT_VERSION = "0.4.6";
 
 // Auto-set extension version
 if (!isset($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
 
 // Auto-set extension version
 if (!isset($EXT_VER)) $EXT_VER = $EXT_VERSION;
 
 // Version history array (add more with , "0.1" and so on)
-$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1", "0.4.2", "0.4.3", "0.4.4", "0.4.5");
+$EXT_VER_HISTORY = array("0.0", "0.0.1", "0.0.2", "0.0.3", "0.0.4", "0.0.5", "0.0.6", "0.0.7", "0.0.8", "0.0.9", "0.1.0", "0.1.1", "0.1.2", "0.1.3", "0.1.4", "0.1.5", "0.1.6", "0.1.7", "0.1.8", "0.1.9", "0.2.0", "0.2.1", "0.2.2", "0.2.3", "0.2.4", "0.2.5", "0.2.6", "0.2.7", "0.2.8", "0.2.9", "0.3.0", "0.3.1", "0.3.2", "0.3.3", "0.3.4", "0.3.5", "0.3.6", "0.3.7", "0.3.8", "0.3.9", "0.4.0", "0.4.1", "0.4.2", "0.4.3", "0.4.4", "0.4.5", "0.4.6");
 
 switch ($EXT_LOAD_MODE)
 {
 
 switch ($EXT_LOAD_MODE)
 {
@@ -564,6 +564,15 @@ PRIMARY KEY (id)
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "T&auml;glichen/w&ouml;chentlichen/monatlichen Reset verbessert.";
                break;
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "T&auml;glichen/w&ouml;chentlichen/monatlichen Reset verbessert.";
                break;
+
+       case "0.4.6": // SQL queries for v0.4.6
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_data SET gender=sex WHERE sex != 'M'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP gender";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Offensives Wort &quot;Sex&quot; gegen &quot;Gender&quot; ausgetauscht.";
+               break;
        }
        break;
 
        }
        break;
 
index 057d1d3a2022616ee17034f4c5dedbd1e68071ba..b93a2731ebbc9a9f26d4f3639261de009c07a2e1 100644 (file)
@@ -146,7 +146,7 @@ case "update": // Update an extension
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
                break;
 
        case "0.2.2": // SQL queries for v0.2.2
-               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data CHANGE sex sex ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data CHANGE gender gender ENUM('M', 'F', 'C') NOT NULL DEFAULT 'M'";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anrede &quot;Firma&quot; hinzugef&uuml;gt.";
 
                // Update notes (these will be set as task text!)
                $UPDATE_NOTES = "Anrede &quot;Firma&quot; hinzugef&uuml;gt.";
index 7857554a5ce86d1bb13e3072cc9062fc5f410941..2f1f10302237a13f0a533805513c6ec9528a6051 100644 (file)
@@ -216,11 +216,25 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
        // DEPRECATED!!!
        if ($template == "member_support_form") {
                // Support request of a member
        // DEPRECATED!!!
        if ($template == "member_support_form") {
                // Support request of a member
-               $result = SQL_QUERY_ESC("SELECT sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array($GLOBALS['userid']), __FILE__, __LINE__);
                 array($GLOBALS['userid']), __FILE__, __LINE__);
-               list($sex, $surname, $family) = SQL_FETCHROW($result);
+               list($gender, $surname, $family, $email) = SQL_FETCHROW($result);
+
+               // Translate gender
+               $gender = TRANSLATE_GENDER($gender);
+
+               // Insert data if content is an array
+               if (is_array($content)) {
+                       // Please switch to $content[bla] in all your templates! Direct
+                       // variables are deprecated as of 09/13/2008.
+                       $content['gender']  = $gender;
+                       $content['surname'] = $surname;
+                       $content['family']  = $family;
+                       $content['email']   = $email;
+               } // END - if
+
+               // Free result
                SQL_FREERESULT($result);
                SQL_FREERESULT($result);
-               $salut = TRANSLATE_SEX($sex);
        }
 
        // Generate date/time string
        }
 
        // Generate date/time string
@@ -562,13 +576,13 @@ function DEREFERER ($URL) {
 }
 
 //
 }
 
 //
-function TRANSLATE_SEX ($sex) {
-       switch ($sex)
+function TRANSLATE_GENDER ($gender) {
+       switch ($gender)
        {
        {
-               case "M": $ret = SEX_M; break;
-               case "F": $ret = SEX_F; break;
-               case "C": $ret = SEX_C; break;
-               default : $ret = $sex; break;
+               case "M": $ret = GENDER_M; break;
+               case "F": $ret = GENDER_F; break;
+               case "C": $ret = GENDER_C; break;
+               default : $ret = $gender; break;
        }
        return $ret;
 }
        }
        return $ret;
 }
@@ -677,13 +691,21 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
        // Make sure all template names are lowercase!
        $template = strtolower($template);
 
-       // Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!)
-       $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
-       $surname = ""; $family = ""; $nick = ""; $sex = "N";
+       // Default "nickname" if extension is not installed
+       $nick = "---";
+
+       // Keept for backward-compatiblity (please replace these variables against our new {!CONST!} syntax!)
+       // No longer used: $MAIN_TITLE = MAIN_TITLE; $URL = URL; $WEBMASTER = WEBMASTER;
+
+       // Init variables (DEPRECATED! Use $content[bla] instead.
+       $surname = "";
+       $family  = "";
+       $nick    = "";
+       $gender     = "N";
 
        // Prepare IP number and User Agent
 
        // Prepare IP number and User Agent
-       $REMOTE_ADDR = getenv('REMOTE_ADDR');
-       $HTTP_USER_AGENT  = getenv('HTTP_USER_AGENT');
+       $REMOTE_ADDR     = getenv('REMOTE_ADDR');
+       $HTTP_USER_AGENT = getenv('HTTP_USER_AGENT');
 
        $ADMIN = MAIN_TITLE;
        if (isSessionVariableSet('admin_login')) {
 
        $ADMIN = MAIN_TITLE;
        if (isSessionVariableSet('admin_login')) {
@@ -692,7 +714,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
                        array(get_session('admin_login')), __FILE__, __LINE__);
                list($ADMIN) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
                        array(get_session('admin_login')), __FILE__, __LINE__);
                list($ADMIN) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
-       }
+       } // END - if
 
        // Expiration in a nice output format
        if ($_CONFIG['auto_purge'] == 0) {
 
        // Expiration in a nice output format
        if ($_CONFIG['auto_purge'] == 0) {
@@ -706,124 +728,55 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
                $EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
        }
 
                $EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
        }
 
-       // DEPRECATED switch!
-       switch ($template)
-       {
-       case "bonus-mail": // Load data for the bonus mail
-               $BONUSID    = $DATA[0];
-               $content    = $DATA[2];
-               $points     = TRANSLATE_COMMA($DATA[4]);
-               $TIME       = $DATA[5];
-               $TARGET_URL = $DATA[8];
-               $CATEGORY   = GET_CATEGORY($DATA[9]);
-               $DATA[10]   = $UID;
-
-               // Replace variables
-               foreach ($REPLACER as $key => $value)
-               {
-                       if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
-               }
-               break;
-
-       case "order-admin":
-       case "order-member":
-               $BLOCKS     = $_CONFIG['max_send'];
-               $SUBJECT    = $DATA[0];
-               $content    = $DATA[1];
-               $PAYMENT    = GET_PAYMENT($DATA[3]);
-               $TARGET_URL = $DATA[5];
-               $CATEGORY   = GET_CATEGORY($DATA[6]);
-               break;
-
-       case "order-reject":
-       case "order-deleted":
-       case "order-accept":
-               $TARGET_URL = $DATA[0];
-               $URL        = $DATA[0];
-               $SUBJECT    = $DATA[1];
-               break;
-
-       case "new-pass":
-               $PASS       = $DATA[0];
-               $REMOTE     = $DATA[1];
-               break;
-
-       case "confirm-member":
-               $points     = $_CONFIG['points_register'];
-               break;
-
-       case "confirm-referral":
-               $PERCENT    = $DATA[0];
-               $LEVEL      = $DATA[1];
-               $points     = $DATA[2];
-               $REFID      = $DATA[3];
-               break;
-
-       case "normal-mail":
-               $SEND_UID   = $DATA[1];
-               $CATEGORY   = GET_CATEGORY($DATA[9]);
-               $TIME       = GET_PAY_POINTS($DATA[5], "time");
-               $TARGET_URL = $DATA[7];
-               $points     = TRANSLATE_COMMA(GET_PAY_POINTS($DATA[5], "payment"));
-               // Warning! This ID has changed from 10 to 11!
-               $MAILID     = $DATA[11];
-
-               // Replace variables
-               foreach ($REPLACER as $key => $value)
-               {
-                       if (isset($DATA[$key])) $content = str_replace($value, $DATA[$key], $content);
-               }
-               break;
-
-       case "done-member":
-       case "done-admin":
-               $SEND_UID   = $DATA[1];
-               $CATEGORY   = GET_CATEGORY($DATA[9]);
-               $TARGET_URL = $DATA[7];
-               break;
-
-       case "back-admin":
-       case "back-member":
-               $points         = TRANSLATE_COMMA($DATA[10]);
-               break;
+       // Is content an array?
+       if (is_array($content)) {
+               // Add expiration to array, $EXPIRATION is now deprecated!
+               $content['expiration'] = $EXPIRATION;
+       } // END - if
 
 
-       case "add-points":
+       // @TODO Try to rewrite this part
+       if ($template == "add-points") {
                if (isset($_POST['points'])) {
                if (isset($_POST['points'])) {
-                       $points         = bigintval($_POST['points']);
+                       $points = bigintval($_POST['points']);
                } else {
                        $points = __POINTS_VALUE;
                }
                } else {
                        $points = __POINTS_VALUE;
                }
-               break;
-
-       case "guest_request_confirm":
-               $HASH       = $DATA[2];
-               break;
-       }
+       } // END - if
 
        // Load user's data
        if ($UID > 0) {
                if (EXT_IS_ACTIVE("nickname")) {
                        // Load nickname
 
        // Load user's data
        if ($UID > 0) {
                if (EXT_IS_ACTIVE("nickname")) {
                        // Load nickname
-                       $result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-                        array(bigintval($UID)), __FILE__, __LINE__);
-                       list($surname, $family, $sex, $email, $nick) = SQL_FETCHROW($result);
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               array(bigintval($UID)), __FILE__, __LINE__);
+                       list($surname, $family, $gender, $email, $nick) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Load normal data
                        SQL_FREERESULT($result);
                } else {
                        // Load normal data
-                       $result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-                        array(bigintval($UID)), __FILE__, __LINE__);
-                       list($surname, $family, $sex, $email) = SQL_FETCHROW($result);
+                       $result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               array(bigintval($UID)), __FILE__, __LINE__);
+                       list($surname, $family, $gender, $email) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        SQL_FREERESULT($result);
-                       $nick = "---";
                }
        } else {
                }
        } else {
-               // Neutral sex and email address is default
-               $sex = "N";
+               // Neutral gender and email address is default
+               $gender = "N";
                $email = WEBMASTER;
        }
 
        // Translate M to male or F to female
                $email = WEBMASTER;
        }
 
        // Translate M to male or F to female
-       $salut = TRANSLATE_SEX($sex);
+       $gender = TRANSLATE_GENDER($gender);
+
+       // Insert data if content is an array
+       if (is_array($content)) {
+               // Please do no longer use direct variable names, use $content[bla]
+               // instead.
+               $content['gender']  = $gender;
+               $content['surname'] = $surname;
+               $content['family']  = $family;
+               $content['email']   = $email;
+               $content['nick']    = $nick;
+       } // END - if
 
        // Store email for some functions in global data array
        $DATA['email'] = $email;
 
        // Store email for some functions in global data array
        $DATA['email'] = $email;
@@ -1304,31 +1257,37 @@ function GENERATE_IMAGE($img_code, $header=true) {
 // Create selection box or array of splitted timestamp
 function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
        // Calculate 15-seconds timestamp (15-seconds-steps shall be fine ;) )
 // Create selection box or array of splitted timestamp
 function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
        // Calculate 15-seconds timestamp (15-seconds-steps shall be fine ;) )
-       $timestamp = round($timestamp / 15) * 15;
+       $stamp = round($timestamp / 15) * 15;
 
        // Do we have a leap year?
        $SWITCH = 0;
        $TEST = date('Y', time()) / 4;
        $M1 = date("m", time());
 
        // Do we have a leap year?
        $SWITCH = 0;
        $TEST = date('Y', time()) / 4;
        $M1 = date("m", time());
-       $M2 = date("m", (time() + $timestamp));
+       $M2 = date("m", (time() + $stamp));
 
        // If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
        if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = ONE_DAY;
 
        // First of all years...
 
        // If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
        if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = ONE_DAY;
 
        // First of all years...
-       $Y = abs(floor($timestamp / (31536000 + $SWITCH)));
+       $Y = abs(floor($stamp / (31536000 + $SWITCH)));
        // Next months...
        // Next months...
-       $M = abs(floor($timestamp / 2628000 - $Y * 12));
+       $M = abs(floor($stamp / 2628000 - $Y * 12));
        // Next weeks
        // Next weeks
-       $W = abs(floor($timestamp / 604800 - $Y * ((365 + $SWITCH / ONE_DAY) / 7) - ($M / 12 * (365 + $SWITCH / ONE_DAY) / 7)));
+       $W = abs(floor($stamp / 604800 - $Y * ((365 + $SWITCH / ONE_DAY) / 7) - ($M / 12 * (365 + $SWITCH / ONE_DAY) / 7)));
        // Next days...
        // Next days...
-       $D = abs(floor($timestamp / 86400 - $Y * (365 + $SWITCH / ONE_DAY) - ($M / 12 * (365 + $SWITCH / ONE_DAY)) - $W * 7));
+       $D = abs(floor($stamp / 86400 - $Y * (365 + $SWITCH / ONE_DAY) - ($M / 12 * (365 + $SWITCH / ONE_DAY)) - $W * 7));
        // Next hours...
        // Next hours...
-       $h = abs(floor($timestamp / 3600 - $Y * (365 + $SWITCH / ONE_DAY) * 24 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24) - $W * 7 * 24 - $D * 24));
+       $h = abs(floor($stamp / 3600 - $Y * (365 + $SWITCH / ONE_DAY) * 24 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24) - $W * 7 * 24 - $D * 24));
        // Next minutes..
        // Next minutes..
-       $m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 60 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
+       $m = abs(floor($stamp / 60 - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 60 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
        // And at last seconds...
        // And at last seconds...
-       $s = abs(floor($timestamp - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+       $s = abs(floor($stamp - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+
+       // Is seconds zero and time is < 60 seconds?
+       if (($s == 0) && ($stamp < 60)) {
+               // Fix seconds
+               $s = $timestamp;
+       } // END - if
 
        //
        // Now we convert them in seconds...
 
        //
        // Now we convert them in seconds...
@@ -1571,11 +1530,13 @@ function CREATE_FANCY_TIME($stamp) {
                        $eval = "\$ret .= \", \".\$v.\" \"._".strtoupper($k).";";
                        eval($eval);
                        break;
                        $eval = "\$ret .= \", \".\$v.\" \"._".strtoupper($k).";";
                        eval($eval);
                        break;
-               }
-       }
+               } // END - if
+       } // END - foreach
 
 
-       // Remove first "comma,null" string
+       // Remove leading commata and space
        $ret = substr($ret, 2);
        $ret = substr($ret, 2);
+
+       // Return fancy time string
        return $ret;
 }
 //
        return $ret;
 }
 //
index 7bb2a1842550b8ffceafc9832112e34ea2124a81..cbcff93b9ebef3279867addb39371b336229be7b 100644 (file)
@@ -341,11 +341,11 @@ define('_ADMIN', "Administrator");
 define('LAST_ONLINE', "Sie waren als letztes Online am");
 define('LAST_MODULE', "Ihr zuletzt ausgew&auml;hltes Modul");
 define('MEMBER_EDIT_PROFILE', "Profildaten &auml;ndern");
 define('LAST_ONLINE', "Sie waren als letztes Online am");
 define('LAST_MODULE', "Ihr zuletzt ausgew&auml;hltes Modul");
 define('MEMBER_EDIT_PROFILE', "Profildaten &auml;ndern");
-define('SEX', "Anrede");
-define('GUEST_SEX', "Anrede");
-define('SEX_M', "Herr");
-define('SEX_F', "Frau");
-define('SEX_C', "Firma");
+define('GENDER', "Geschlecht");
+define('GUEST_GENDER', "Geschlecht");
+define('GENDER_M', "M&auml;nnlich");
+define('GENDER_F', "Weiblich");
+define('GENDER_C', "&quot;Firma&quot;");
 define('SAVE_CHANGES', "&Auml;nderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
 define('SAVE_CHANGES', "&Auml;nderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
index 54a4d8e39cdc9bd3f8fb9b96fb5f56da92565ae9..261ed215650e469b7a5521f486b1c8cd5437e521 100644 (file)
@@ -29,11 +29,11 @@ define('_ADMIN', "Administrator");
 define('LAST_ONLINE', "Your last online time was");
 define('LAST_MODULE', "Your last selected module was");
 define('MEMBER_EDIT_PROFILE', "Edit your profile");
 define('LAST_ONLINE', "Your last online time was");
 define('LAST_MODULE', "Your last selected module was");
 define('MEMBER_EDIT_PROFILE', "Edit your profile");
-define('SEX', "Salutation");
-define('GUEST_SEX', "Salutation);
-define('SEX_M', "Mr.");
-define('SEX_F', "Mrs.");
-define('SEX_C', "Company");
+define('GENDER', "Gender");
+define('GUEST_GENDER', "Gender);
+define('GENDER_M', "Male");
+define('GENDER_F', "Female");
+define('GENDER_C', "Company");
 define('SAVE_CHANGES', "Save changes");
 define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
 define('SAVE_CHANGES', "Save changes");
 define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
index 0b905a5e7a5bb69891580c1dca1c6577e53a29ec..e944f4fc85b9a062a2c74487a13a92bccd2fc5b6 100644 (file)
@@ -66,7 +66,7 @@ define('ADD_SPONSOR', "Sponsor hinzuf&uuml;gen");
 define('ADMIN_SPONSOR_COMPANY_NOTE', "Wenn Sie eine Privatperson anmelden wollen, lassen Sie bitte die folgenden drei Felder einfach leer!");
 define('SPONSOR_DATA_NOT_SAVED', "Sponsorendaten wurden <U>nicht</U> gespeichert.");
 define('ADMIN_SPONSOR_REALLY_ADD_SPONSOR', "Sponsor existiert bereits!");
 define('ADMIN_SPONSOR_COMPANY_NOTE', "Wenn Sie eine Privatperson anmelden wollen, lassen Sie bitte die folgenden drei Felder einfach leer!");
 define('SPONSOR_DATA_NOT_SAVED', "Sponsorendaten wurden <U>nicht</U> gespeichert.");
 define('ADMIN_SPONSOR_REALLY_ADD_SPONSOR', "Sponsor existiert bereits!");
-define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <B>{--__EMAIL--}</B>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
+define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <B>{!__EMAIL!}</B>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
 define('ADMIN_SPONSOR_ADDED', "Sponsor wurde hinzugef&uuml;gt.");
 define('ADMIN_SPONSOR_UPDATED', "Sponsordaten wurden aktualisiert.");
 define('ADMIN_SPONSOR_FAILED', "Konnte Daten nichtn speichern!");
 define('ADMIN_SPONSOR_ADDED', "Sponsor wurde hinzugef&uuml;gt.");
 define('ADMIN_SPONSOR_UPDATED', "Sponsordaten wurden aktualisiert.");
 define('ADMIN_SPONSOR_FAILED', "Konnte Daten nichtn speichern!");
index b7cb9d06359eac502f7b96a1a34e2ccf38afabf9..f5e88c4dc12fe13a3930b377c2c3a2abfdb5ccd5 100644 (file)
@@ -481,12 +481,12 @@ function RALLYE_LOAD_USER_DATA($uids_array)
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
        $uid_string = implode(",", $uids_array['uid']);
 
        // Load users
-       $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+       $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
         array($uid_string, count($uids_array)), __FILE__, __LINE__);
        $ret = "";
-       while (list($u, $sex, $surname, $family, $email) = SQL_FETCHROW($result))
+       while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
        {
        {
-               $ret .= TRANSLATE_SEX($sex)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
+               $ret .= TRANSLATE_GENDER($gender)." ".$surname." ".$family." (".$email.") - ".$uids_array['poi'][$u]."\n";
        }
 
        // Return result
        }
 
        // Return result
index 894e388e1bdf23769d26d19527bf242c3a898d4c..4ae9dba3bad6d038bcc9b84e5f716009e6f525e3 100644 (file)
@@ -54,7 +54,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
        SQL_FREERESULT($result);
 
        // Also fill other constants
        SQL_FREERESULT($result);
 
        // Also fill other constants
-       define('MUST_SEX'   , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
+       define('MUST_GENDER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_ADDY'  , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_BIRTH' , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_MARKER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_ADDY'  , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_BIRTH' , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_MARKER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
index fdf4eb9f43b4bded1bc1104cc22545c38181eeb5..7bc398f5b505c2bf14a3eed1389e069bf64beaa0 100644 (file)
@@ -584,8 +584,8 @@ function SPONSOR_SAVE_DATA($POST, $content)
                        $DATA = $POST;
 
                        // Change some data
                        $DATA = $POST;
 
                        // Change some data
-                       if (isset($content['salut'])) $content['salut'] = TRANSLATE_SEX($content['salut']);
-                       if (isset($DATA['salut']))    $DATA['salut']    = TRANSLATE_SEX($DATA['salut']);
+                       if (isset($content['gender'])) $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       if (isset($DATA['gender']))    $DATA['gender']    = TRANSLATE_GENDER($DATA['gender']);
                        if (isset($content['receive_warnings'])) $DATA['receive']     = TRANSLATE_YESNO($POST['receive_warnings']);
                        if (isset($content['warning_interval'])) $DATA['interval']    = CREATE_FANCY_TIME($POST['warning_interval']);
 
                        if (isset($content['receive_warnings'])) $DATA['receive']     = TRANSLATE_YESNO($POST['receive_warnings']);
                        if (isset($content['warning_interval'])) $DATA['interval']    = CREATE_FANCY_TIME($POST['warning_interval']);
 
index 3742b3bba18ca3eb2f5a0d1c86c0342277f2e1fc..443f8ad13c5b2a95e9d06a5de75eca4b51cbdc78 100644 (file)
@@ -170,13 +170,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) {
                                }
 
                                if ($uid > 0) {
                                }
 
                                if ($uid > 0) {
-                                       $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                                       $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1)
                                        {
                                         array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_NUMROWS($result_user) == 1)
                                        {
-                                               list($sex, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+                                               list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                                                SQL_FREERESULT($result_user);
                                                SQL_FREERESULT($result_user);
-                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
                                        }
                                }
 
                                        }
                                }
 
index e178a6d173a27ba98286e397f86aa40b5a78cf30..253e3e386a63bf1540600d1006802858292f34b4 100644 (file)
@@ -42,24 +42,24 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 ADD_DESCR ("admin", basename(__FILE__));
 
 // Check for accounts
 ADD_DESCR ("admin", basename(__FILE__));
 
 // Check for accounts
-$query = SQL_QUERY("SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, user_hash FROM "._MYSQL_PREFIX."_user_data WHERE status='UNCONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+$query = SQL_QUERY("SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, user_hash FROM "._MYSQL_PREFIX."_user_data WHERE status='UNCONFIRMED' ORDER BY userid", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($query) > 0) {
        // We have some (new?) registrations!
        $SW = 2; $OUT = "";
 
 if (SQL_NUMROWS($query) > 0) {
        // We have some (new?) registrations!
        $SW = 2; $OUT = "";
-       while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $hash) = SQL_FETCHROW($query)) {
+       while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $hash) = SQL_FETCHROW($query)) {
                if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                // Prepare array for the row template
                $content = array(
                if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                // Prepare array for the row template
                $content = array(
-                       'sw'    => $SW,
-                       'sex'   => TRANSLATE_SEX($sex),
-                       'sname' => $sname,
-                       'fname' => $fname,
-                       'email' => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
-                       'ip'    => $IP,
-                       'ref'   => $ref,
-                       'hash'  => $hash,
-                       'link'  => ADMIN_USER_PROFILE_LINK($uid),
+                       'sw'     => $SW,
+                       'gender' => TRANSLATE_GENDER($gender),
+                       'sname'  => $sname,
+                       'fname'  => $fname,
+                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+                       'ip'     => $IP,
+                       'ref'    => $ref,
+                       'hash'   => $hash,
+                       'link'   => ADMIN_USER_PROFILE_LINK($uid),
                );
 
                // Load row template and switch color
                );
 
                // Load row template and switch color
index d0140fc149c098ab2cdb80d342d05a6c395edd59..119fa08aaca15fed1c5d4755ce671539c98cdc34 100644 (file)
@@ -41,19 +41,19 @@ ADD_DESCR("admin", basename(__FILE__));
 
 if (!empty($_GET['id']))) {
        // Check for selected sponsor
 
 if (!empty($_GET['id']))) {
        // Check for selected sponsor
-       $result = SQL_QUERY_ESC("SELECT email, salut, surname, family FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
                if (isset($_POST['ok'])) {
                        // Load data and remember it in constants
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Remove sponsor
                if (isset($_POST['ok'])) {
                        // Load data and remember it in constants
-                       list($email, $salut, $surname, $family) = SQL_FETCHROW($result);
+                       list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
 
                        // Free result
                        SQL_FREERESULT($result);
 
                        define('__EMAIL'  , $email);
 
                        // Free result
                        SQL_FREERESULT($result);
 
                        define('__EMAIL'  , $email);
-                       define('__SALUT'  , TRANSLATE_SEX($salut));
+                       define('__GENDER'  , TRANSLATE_GENDER($gender));
                        define('__SURNAME', $surname);
                        define('__FAMILY' , $family);
 
                        define('__SURNAME', $surname);
                        define('__FAMILY' , $family);
 
@@ -76,13 +76,13 @@ if (!empty($_GET['id']))) {
                        LOAD_URL(URL."/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['id']));
                } else {
                        // Load data
                        LOAD_URL(URL."/modules.php?module=admin&amp;what=list_sponsor&amp;id=".bigintval($_GET['id']));
                } else {
                        // Load data
-                       list ($email, $salut, $sname, $fname) = SQL_FETCHROW($result);
+                       list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
 
                        // Transfer data to constants for the template
                        define('__EMAIL', $email);
                        define('__SNAME', $sname);
                        define('__FNAME', $fname);
 
                        // Transfer data to constants for the template
                        define('__EMAIL', $email);
                        define('__SNAME', $sname);
                        define('__FNAME', $fname);
-                       define('__SALUT', TRANSLATE_SEX($salut));
+                       define('__GENDER', TRANSLATE_GENDER($gender));
                        define('__UID'  , bigintval($_GET['id']));
 
                        // Display form
                        define('__UID'  , bigintval($_GET['id']));
 
                        // Display form
index 9081221758cf789938acd5872cacf61924cd689f..7526f9537d774a2867c182a516f33f7ac62110d6 100644 (file)
@@ -41,7 +41,7 @@ ADD_DESCR("admin", basename(__FILE__));
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        // Check for selected sponsor
 
 if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
        // Check for selected sponsor
-       $result = SQL_QUERY_ESC("SELECT company, position, salut, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, receive_warnings, warning_interval FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load sponsor details
@@ -56,24 +56,24 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                define('__POSITION'   , $DATA['position']);
                define('__TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
                define('__POSITION'   , $DATA['position']);
                define('__TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
-               switch ($DATA['salut'])
+               switch ($DATA['gender'])
                {
                case "M":
                {
                case "M":
-                       define('__SALUT_M', " selected");
-                       define('__SALUT_F', "");
-                       define('__SALUT_C', "");
+                       define('__GENDER_M', " selected");
+                       define('__GENDER_F', "");
+                       define('__GENDER_C', "");
                        break;
 
                case "F":
                        break;
 
                case "F":
-                       define('__SALUT_M', "");
-                       define('__SALUT_F', " selected");
-                       define('__SALUT_C', "");
+                       define('__GENDER_M', "");
+                       define('__GENDER_F', " selected");
+                       define('__GENDER_C', "");
                        break;
 
                case "C":
                        break;
 
                case "C":
-                       define('__SALUT_M', "");
-                       define('__SALUT_F', "");
-                       define('__SALUT_C', " selected");
+                       define('__GENDER_M', "");
+                       define('__GENDER_F', "");
+                       define('__GENDER_C', " selected");
                        break;
                }
                define('__SURNAME'    , $DATA['surname']);
                        break;
                }
                define('__SURNAME'    , $DATA['surname']);
@@ -159,7 +159,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) {
                                SPONSOR_HANDLE_SPONSOR($_POST);
 
                                // Convert some data for the email template
                                SPONSOR_HANDLE_SPONSOR($_POST);
 
                                // Convert some data for the email template
-                               $_POST['salut'] = TRANSLATE_SEX($_POST['salut']);
+                               $_POST['gender'] = TRANSLATE_GENDER($_POST['gender']);
                                $_POST['warning_interval'] = CREATE_FANCY_TIME($_POST['warning_interval']);
                                if (!$PASS) $_POST['pass1'] = SPONSOR_PASS_UNCHANGED;
 
                                $_POST['warning_interval'] = CREATE_FANCY_TIME($_POST['warning_interval']);
                                if (!$PASS) $_POST['pass1'] = SPONSOR_PASS_UNCHANGED;
 
index 2feb810224bad536f585996c49d267fcd657e964..a4be4f6398bcc4cfc100d98fa20a8eba42f59ee7 100644 (file)
@@ -44,7 +44,7 @@ ADD_DESCR("admin", basename(__FILE__));
 $result_main = false;
 if (isset($_GET['u_id'])) {
        //                                    0      1        2         3      4     5      6       7         8          9           10         11
 $result_main = false;
 if (isset($_GET['u_id'])) {
        //                                    0      1        2         3      4     5      6       7         8          9           10         11
-       $result_main = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+       $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 }
 
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 }
 
@@ -75,7 +75,7 @@ if ((SQL_NUMROWS($result_main) == 1) || (empty($_GET['u_id'])))
                {
                        // We have to add the following things: birthday and max receive mails
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
                {
                        // We have to add the following things: birthday and max receive mails
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
-sex='%s',
+gender='%s',
 surname='%s',
 family='%s',
 street_nr='%s',
 surname='%s',
 family='%s',
 street_nr='%s',
@@ -86,7 +86,7 @@ email='%s'
 ".$ADD."
 WHERE userid=%s LIMIT 1",
  array(
 ".$ADD."
 WHERE userid=%s LIMIT 1",
  array(
-       substr($_POST['salut'], 0, 1),
+       substr($_POST['gender'], 0, 1),
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
@@ -110,28 +110,28 @@ WHERE userid=%s LIMIT 1",
         else
        {
                // Display form to edit
         else
        {
                // Display form to edit
-               list($sex, $surname, $family, $street, $zip, $city, $country, $email, $bday, $bmonth, $byear, $max) = SQL_FETCHROW($result_main);
+               list($gender, $surname, $family, $street, $zip, $city, $country, $email, $bday, $bmonth, $byear, $max) = SQL_FETCHROW($result_main);
                SQL_FREERESULT($result_main);
 
                // Transfer data to constants for the template
                SQL_FREERESULT($result_main);
 
                // Transfer data to constants for the template
-               switch ($sex)
+               switch ($gender)
                {
                case "M":
                {
                case "M":
-                       define('_SEX_M', " selected=\"selected\"");
-                       define('_SEX_F', "");
-                       define('_SEX_C', "");
+                       define('_GENDER_M', " selected=\"selected\"");
+                       define('_GENDER_F', "");
+                       define('_GENDER_C', "");
                        break;
 
                case "F":
                        break;
 
                case "F":
-                       define('_SEX_M', "");
-                       define('_SEX_F', " selected=\"selected\"");
-                       define('_SEX_C', "");
+                       define('_GENDER_M', "");
+                       define('_GENDER_F', " selected=\"selected\"");
+                       define('_GENDER_C', "");
                        break;
 
                case "C":
                        break;
 
                case "C":
-                       define('_SEX_M', "");
-                       define('_SEX_F', "");
-                       define('_SEX_C', " selected=\"selected\"");
+                       define('_GENDER_M', "");
+                       define('_GENDER_F', "");
+                       define('_GENDER_C', " selected=\"selected\"");
                        break;
                }
 
                        break;
                }
 
index a66eff4229c6949e63016694fb2602bd943e58c4..d7f47b8de8430076db592642dba7385c389c7d6d 100644 (file)
@@ -50,7 +50,7 @@ if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
 if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
 
 // Check for all accounts
 if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
 
 // Check for all accounts
-$result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.sex, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
+$result = SQL_QUERY_ESC("SELECT DISTINCT d.userid, d.gender, d.surname, d.family, d.email, d.joined, d.last_online, d.ap_notified
 FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
 WHERE d.status='CONFIRMED' AND d.joined < %s AND d.last_online < %s AND d.ap_notified < %s
 ".$EXCLUDE_LIST."
 FROM "._MYSQL_PREFIX."_user_data AS d, "._MYSQL_PREFIX."_config AS c
 WHERE d.status='CONFIRMED' AND d.joined < %s AND d.last_online < %s AND d.ap_notified < %s
 ".$EXCLUDE_LIST."
@@ -60,13 +60,13 @@ if (SQL_NUMROWS($result) > 0)
 {
        // Ok, we have found some inactive accounts
        $SW = 2; $OUT = "";
 {
        // Ok, we have found some inactive accounts
        $SW = 2; $OUT = "";
-       while(list($uid, $sex, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
+       while(list($uid, $gender, $sname, $fname, $email, $joined, $last, $notified) = SQL_FETCHROW($result))
        {
                // Prepare data for the row template
                $content = array(
                        'sw'       => $SW,
                        'uid'      => ADMIN_USER_PROFILE_LINK($uid),
        {
                // Prepare data for the row template
                $content = array(
                        'sw'       => $SW,
                        'uid'      => ADMIN_USER_PROFILE_LINK($uid),
-                       'sex'      => TRANSLATE_SEX($sex),
+                       'gender'   => TRANSLATE_GENDER($gender),
                        'sname'    => $sname,
                        'fname'    => $fname,
                        'email'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
                        'sname'    => $sname,
                        'fname'    => $fname,
                        'email'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index afc6135273a15d7cce32d9c20f78e3517136815b..3fbf81c9acb61caff7ee68c526ed69dd14eb9338 100644 (file)
@@ -63,7 +63,7 @@ if ($_CONFIG['beg_rallye'] == "Y")
        }
 
        // Check if at least one is in the active rallye
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid, email, sex, surname, family, beg_points, last_online
+       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND beg_points > 0".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid",
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND beg_points > 0".$LAST."
 ORDER BY beg_points DESC, last_online DESC, userid",
@@ -73,7 +73,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
        {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
        {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
+               while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result))
                {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
@@ -84,17 +84,17 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                                $WIN2 = "</STRONG>";
                        }
                        $content = array(
                                $WIN2 = "</STRONG>";
                        }
                        $content = array(
-                               'uid'   => $uid,
-                               'email' => CREATE_EMAIL_LINK($email, "user_data"),
-                               'salut' => TRANSLATE_SEX($sex),
-                               'sname' => $sname,
-                               'fname' => $fname,
-                               'turbo' => TRANSLATE_COMMA($turbo),
-                               'last'  => MAKE_DATETIME($last, "2"),
-                               'sw'    => $SW,
-                               'win1'  => $WIN1,
-                               'win2'  => $WIN2,
-                               'cnt'   => $cnt,
+                               'uid'    => $uid,
+                               'email'  => CREATE_EMAIL_LINK($email, "user_data"),
+                               'gender' => TRANSLATE_GENDER($gender),
+                               'sname'  => $sname,
+                               'fname'  => $fname,
+                               'turbo'  => TRANSLATE_COMMA($turbo),
+                               'last'   => MAKE_DATETIME($last, "2"),
+                               'sw'     => $SW,
+                               'win1'   => $WIN1,
+                               'win2'   => $WIN2,
+                               'cnt'    => $cnt,
                        );
 
                        // Load template and add it
                        );
 
                        // Load template and add it
index caefd309c9a63003fd8b3966756ddc8691bc7460..ff592210f5fa4840e80b71266cae3d12b939c4a7 100644 (file)
@@ -74,7 +74,7 @@ if ($_CONFIG['bonus_active'] == "Y") {
        }
 
        // Check if at least one is in the active rallye
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid, email, sex, surname, family, ".$USE." AS active_bonus, last_online
+       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY active_bonus DESC, last_online DESC, userid",
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
 ORDER BY active_bonus DESC, last_online DESC, userid",
@@ -83,7 +83,7 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while(list($uid, $email, $sex, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+               while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= $_CONFIG['bonus_ranks']) {
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= $_CONFIG['bonus_ranks']) {
@@ -94,17 +94,17 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
 
                        // Prepare content
                        $content = array(
 
                        // Prepare content
                        $content = array(
-                               'uid'   => $uid,
-                               'email' => CREATE_EMAIL_LINK($email, "user_data"),
-                               'salut' => TRANSLATE_SEX($sex),
-                               'sname' => $sname,
-                               'fname' => $fname,
-                               'turbo' => TRANSLATE_COMMA($turbo),
-                               'last'  => MAKE_DATETIME($last, "2"),
-                               'sw'    => $SW,
-                               'win1'  => $WIN1,
-                               'win2'  => $WIN2,
-                               'cnt'   => $cnt,
+                               'uid'    => $uid,
+                               'email'  => CREATE_EMAIL_LINK($email, "user_data"),
+                               'gender' => TRANSLATE_GENDER($gender),
+                               'sname'  => $sname,
+                               'fname'  => $fname,
+                               'turbo'  => TRANSLATE_COMMA($turbo),
+                               'last'   => MAKE_DATETIME($last, "2"),
+                               'sw'     => $SW,
+                               'win1'   => $WIN1,
+                               'win2'   => $WIN2,
+                               'cnt'    => $cnt,
                        );
 
                        // Load template and add it
                        );
 
                        // Load template and add it
index 60f43bdfde2d2646f4a1a7574613dc89b251f327..e3f2c1567c6409cf35c6f06099ced4716f8ea197 100644 (file)
@@ -61,7 +61,7 @@ if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET[
        $whereStatement = " WHERE refid='0' AND family LIKE '".$_GET['letter']."%'";
 }
 if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
        $whereStatement = " WHERE refid='0' AND family LIKE '".$_GET['letter']."%'";
 }
 if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
-$SQL = "SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+$SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
 $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 // Calculate page count (0.5 fixes a bug with page count)
 $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
 // Calculate page count (0.5 fixes a bug with page count)
@@ -112,7 +112,7 @@ if (SQL_NUMROWS($result_master) > 0)
        }
 
        $SW = 2; $OUT = "";
        }
 
        $SW = 2; $OUT = "";
-       while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
+       while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
        {
                if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                $LINKS = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
        {
                if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                $LINKS = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
@@ -125,7 +125,7 @@ if (SQL_NUMROWS($result_master) > 0)
                $content = array(
                        'sw'     => $SW,
                        'uid'    => ADMIN_USER_PROFILE_LINK($uid),
                $content = array(
                        'sw'     => $SW,
                        'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                       'sex'    => TRANSLATE_SEX($sex),
+                       'gender' => TRANSLATE_GENDER($gender),
                        'sname'  => $sname,
                        'fname'  => $fname,
                        'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
                        'sname'  => $sname,
                        'fname'  => $fname,
                        'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index 5a6df80094415f13d6ea046d2d69b32d2b678c45..e266a79928a0efcc91b3de17ce7b67e2599b07e1 100644 (file)
@@ -66,13 +66,13 @@ if (!empty($_GET['pid']))
 
        if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
                // Load user's data
 
        if ((!empty($task)) && (!empty($uid)) && ($uid > 0)) {
                // Load user's data
-               $result = SQL_QUERY_ESC("SELECT email, sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT email, gender, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(bigintval($uid)), __FILE__, __LINE__);
                 array(bigintval($uid)), __FILE__, __LINE__);
-               list($email, $sex, $surname, $family) = SQL_FETCHROW($result);
+               list($email, $gender, $surname, $family) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // Konstante bauen
                SQL_FREERESULT($result);
 
                // Konstante bauen
-               define('PAYOUT_USERDATA_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$surname." ".$family."</A>");
+               define('PAYOUT_USERDATA_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</A>");
 
                if (($_GET['do'] == "accept") && (!empty($email)))
                {
 
                if (($_GET['do'] == "accept") && (!empty($email)))
                {
index 0d2434a7b3f63285bfdfba6374294cf9768fac35..35b5f3b6ac0061c5b95d823409a351699d37715f 100644 (file)
@@ -69,7 +69,7 @@ if (!empty($_GET['u_id']))
                SQL_FREERESULT($result);
                SQL_FREERESULT($result_lck);
 
                SQL_FREERESULT($result);
                SQL_FREERESULT($result_lck);
 
-               $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%s ORDER BY userid",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email, status, joined FROM "._MYSQL_PREFIX."_user_data WHERE refid=%s ORDER BY userid",
                 array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<br /><br />");
                 array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
 
                OUTPUT_HTML(ADMIN_TOTAL_REFS_1."".ADMIN_USER_PROFILE_LINK($_GET['u_id'])."".ADMIN_TOTAL_REFS_2.$menge.ADMIN_TOTAL_REFS_3.$menge_lck.ADMIN_TOTAL_REFS_4."<br /><br />");
@@ -92,7 +92,7 @@ if (!empty($_GET['u_id']))
                                        $content = array(
                                                'sw'         => $SW,
                                                'u_link'     => ADMIN_USER_PROFILE_LINK($row[0]),
                                        $content = array(
                                                'sw'         => $SW,
                                                'u_link'     => ADMIN_USER_PROFILE_LINK($row[0]),
-                                               'salut'      => TRANSLATE_SEX($row[1]),
+                                               'gender'     => TRANSLATE_GENDER($row[1]),
                                                'refs_link'  => "0",
                                                'surname'    => $row[2],
                                                'family'     => $row[3],
                                                'refs_link'  => "0",
                                                'surname'    => $row[2],
                                                'family'     => $row[3],
index 498444a912e223565386c1440283c5d9e3ae65dc..8791734a391cb306e4311b0fe6d7b5b1016ff8c4 100644 (file)
@@ -41,7 +41,7 @@ ADD_DESCR("admin", basename(__FILE__));
 
 if (!empty($_GET['id'])) {
        // Show detailed informations to a sponsor
 
 if (!empty($_GET['id'])) {
        // Show detailed informations to a sponsor
-       $result = SQL_QUERY_ESC("SELECT company, position, salut, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
+       $result = SQL_QUERY_ESC("SELECT company, position, gender, surname, family, street_nr1, street_nr2, zip, city, country, phone, fax, cell, email, url, tax_ident, status, sponsor_created, last_online, last_change, receive_warnings, points_amount, points_used, remote_addr, warning_interval, refid, ref_count
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' LIMIT 1",
  array(bigintval($_GET['id'])), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' LIMIT 1",
  array(bigintval($_GET['id'])), __FILE__, __LINE__);
@@ -71,7 +71,7 @@ WHERE id='%s' LIMIT 1",
                define('__SPONSOR_POSITION'   , $DATA['position']);
                define('__SPONSOR_TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
                define('__SPONSOR_POSITION'   , $DATA['position']);
                define('__SPONSOR_TAX_IDENT'  , $DATA['tax_ident']);
                //  Personal data
-               define('__SPONSOR_SALUT'      , TRANSLATE_SEX($DATA['salut']));
+               define('__SPONSOR_GENDER'      , TRANSLATE_GENDER($DATA['gender']));
                define('__SPONSOR_SURNAME'    , $DATA['surname']);
                define('__SPONSOR_FAMILY'     , $DATA['family']);
                define('__SPONSOR_STREET1'    , $DATA['street_nr1']);
                define('__SPONSOR_SURNAME'    , $DATA['surname']);
                define('__SPONSOR_FAMILY'     , $DATA['family']);
                define('__SPONSOR_STREET1'    , $DATA['street_nr1']);
@@ -119,7 +119,7 @@ WHERE id='%s' LIMIT 1",
                SQL_FREERESULT($result);
 
                // Sponsor found so let's list all his referrals
                SQL_FREERESULT($result);
 
                // Sponsor found so let's list all his referrals
-               $result = SQL_QUERY_ESC("SELECT id, salut, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr, ref_count
+               $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr, ref_count
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE refid='%s' ORDER BY id",
  array(bigintval($_GET['rid'])), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE refid='%s' ORDER BY id",
  array(bigintval($_GET['rid'])), __FILE__, __LINE__);
@@ -138,17 +138,17 @@ WHERE refid='%s' ORDER BY id",
        }
 } else {
        // List all sponsors
        }
 } else {
        // List all sponsors
-       $result_main = SQL_QUERY("SELECT id, salut, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr
+       $result_main = SQL_QUERY("SELECT id, gender, surname, family, email, status, sponsor_created, last_online, points_amount, points_used, remote_addr
 FROM "._MYSQL_PREFIX."_sponsor_data ORDER BY id", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // At least one sponsor found!
                $OUT = ""; $SW = 2;
 FROM "._MYSQL_PREFIX."_sponsor_data ORDER BY id", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                // At least one sponsor found!
                $OUT = ""; $SW = 2;
-               while(list($id, $salut, $sname, $fname, $email, $status, $created, $last, $amount, $used, $ip) = SQL_FETCHROW($result_main)) {
+               while(list($id, $gender, $sname, $fname, $email, $status, $created, $last, $amount, $used, $ip) = SQL_FETCHROW($result_main)) {
                        // Transfer data to array
                        $content = array(
                                'id'      => $id,
                                'sw'      => $SW,
                        // Transfer data to array
                        $content = array(
                                'id'      => $id,
                                'sw'      => $SW,
-                               'salut'   => TRANSLATE_SEX($salut),
+                               'gender'   => TRANSLATE_GENDER($gender),
                                'sname'   => $sname,
                                'fname'   => $fname,
                                'email'   => "mailto:".$email,
                                'sname'   => $sname,
                                'fname'   => $fname,
                                'email'   => "mailto:".$email,
index 7fe2287fa09dd131b08dead4f3d7df942b2a861a..729cbe8bd82f3da7cc3481b95b764fd96371d519 100644 (file)
@@ -107,7 +107,7 @@ if ($listed)
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                //
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                //
-               $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.sex, u.email
+               $result = SQL_QUERY_ESC("SELECT DISTINCT l.userid, u.status, u.surname, u.family, u.gender, u.email
 FROM "._MYSQL_PREFIX."_user_links AS l
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
 ON l.userid=u.userid
 FROM "._MYSQL_PREFIX."_user_links AS l
 LEFT JOIN "._MYSQL_PREFIX."_user_data AS u
 ON l.userid=u.userid
@@ -121,7 +121,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                        // At least one link left to confirm
                        $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
                        $SW = 2;
                        // At least one link left to confirm
                        $OUT = LOAD_TEMPLATE("admin_list_unconfirmed_header", true);
                        $SW = 2;
-                       while(list($uid, $status, $sname, $fname, $sex, $email) = SQL_FETCHROW($result))
+                       while(list($uid, $status, $sname, $fname, $gender, $email) = SQL_FETCHROW($result))
                        {
                                // Prepare data for the row template
                                $content = array(
                        {
                                // Prepare data for the row template
                                $content = array(
@@ -130,7 +130,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s",
                                        'uid'    => $uid,
                                        'link'   => $LINK,
                                        'id'     => $ID,
                                        'uid'    => $uid,
                                        'link'   => $LINK,
                                        'id'     => $ID,
-                                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>",
+                                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>",
                                        'status' => TRANSLATE_STATUS($status),
                                );
 
                                        'status' => TRANSLATE_STATUS($status),
                                );
 
index f8f5982e0df91eefd9180a1c5883d981428958f8..ccce2b0a2c336032da20019e4c236e25ad79139e 100644 (file)
@@ -72,7 +72,7 @@ if (!empty($_GET['u_id']))
        $uid = bigintval($_GET['u_id']);
 
        // Does the account exists?       0      1        2         3      4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
        $uid = bigintval($_GET['u_id']);
 
        // Does the account exists?       0      1        2         3      4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
-       $result = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
+       $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, zip, city, country, email, birth_day, birth_month, birth_year, max_mails, receive_mails, refid, status, REMOTE_ADDR, last_online, last_module, ref_clicks, total_logins, used_points, emails_sent, joined, last_update, last_profile_sent, notified, ref_payout".$MORE."
 FROM "._MYSQL_PREFIX."_user_data
 WHERE userid=%s LIMIT 1",
         array($uid), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_user_data
 WHERE userid=%s LIMIT 1",
         array($uid), __FILE__, __LINE__);
@@ -98,7 +98,7 @@ WHERE userid=%s LIMIT 1",
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);
                define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA[14]));
                define('_CATS' , $CATS);
                define('_LINKS', $LINKS);
                define('_ADMIN_LINKS', MEMBER_ACTION_LINKS($uid, $DATA[14]));
-               $DATA[0]      = TRANSLATE_SEX($DATA[0]);
+               $DATA[0]      = TRANSLATE_GENDER($DATA[0]);
                $DATA[28]     = CREATE_EMAIL_LINK($DATA[7], "user_data");
                $DATA[14]     = TRANSLATE_STATUS($DATA[14]);
                $DATA[16]     = MAKE_DATETIME($DATA[16], "0");
                $DATA[28]     = CREATE_EMAIL_LINK($DATA[7], "user_data");
                $DATA[14]     = TRANSLATE_STATUS($DATA[14]);
                $DATA[16]     = MAKE_DATETIME($DATA[16], "0");
@@ -148,7 +148,7 @@ WHERE userid=%s LIMIT 1",
                }
        }
 
                }
        }
 
-       $SQL = "SELECT userid, sex, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
+       $SQL = "SELECT userid, gender, surname, family, email, REMOTE_ADDR, refid, status".$MORE." FROM "._MYSQL_PREFIX."_user_data".$whereStatement." ORDER BY ".$_GET['sortby'];
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
        $result_master = SQL_QUERY($SQL, __FILE__, __LINE__);
 
        // Calculate page count (0.5 fixes a bug with page count)
@@ -209,7 +209,7 @@ WHERE userid=%s LIMIT 1",
                }
 
                $SW = 2; $OUT = "";
                }
 
                $SW = 2; $OUT = "";
-               while (list($uid, $sex, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
+               while (list($uid, $gender, $sname, $fname, $email, $IP, $ref, $status, $nick) = SQL_FETCHROW($result))
                {
                        if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                        $LINKS = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
                {
                        if ($ref > 0) $ref = ADMIN_USER_PROFILE_LINK($ref);
                        $LINKS = TRANSLATE_COMMA(GET_TOTAL_DATA($uid, "user_links", "id", "userid", true));
@@ -222,7 +222,7 @@ WHERE userid=%s LIMIT 1",
                        $content = array(
                                'sw'     => $SW,
                                'uid'    => ADMIN_USER_PROFILE_LINK($uid),
                        $content = array(
                                'sw'     => $SW,
                                'uid'    => ADMIN_USER_PROFILE_LINK($uid),
-                               'sex'    => TRANSLATE_SEX($sex),
+                               'gender' => TRANSLATE_GENDER($gender),
                                'sname'  => $sname,
                                'fname'  => $fname,
                                'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
                                'sname'  => $sname,
                                'fname'  => $fname,
                                'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index 433f5be562f3a273902bf1742a7654212e981298..816878d3641ffc909ba7e721c8b59c038c27146d 100644 (file)
@@ -42,16 +42,16 @@ $MSG = "";
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor
 
 if (!empty($_GET['id'])) {
        // Check for selected sponsor
-       $result = SQL_QUERY_ESC("SELECT salut, surname, family, email, status FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
+       $result = SQL_QUERY_ESC("SELECT gender, surname, family, email, status FROM "._MYSQL_PREFIX."_sponsor_data WHERE id='%s' LIMIT 1",
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Get sponsor's current status and let only confirmed and locked status pass
         array(bigintval($_GET['id'])), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Get sponsor's current status and let only confirmed and locked status pass
-               list($salut, $sname, $fname, $email, $status) = SQL_FETCHROW($result);
+               list($gender, $sname, $fname, $email, $status) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                if (($status == "CONFIRMED") || ($status == "LOCKED")) {
                        // Transfer data to constants
                SQL_FREERESULT($result);
 
                if (($status == "CONFIRMED") || ($status == "LOCKED")) {
                        // Transfer data to constants
-                       define('__SALUT'  , TRANSLATE_SEX($salut));
+                       define('__GENDER'  , TRANSLATE_GENDER($gender));
                        define('__SURNAME', $sname);
                        define('__FAMILY' , $fname);
                        define('__ID'     , bigintval($_GET['id']));
                        define('__SURNAME', $sname);
                        define('__FAMILY' , $fname);
                        define('__ID'     , bigintval($_GET['id']));
@@ -95,7 +95,7 @@ if (!empty($_GET['id'])) {
                                }
 
                                // Create email link
                                }
 
                                // Create email link
-                               define('__EMAIL_LINK', "<A href=\"mailto:".$email."\">".__SALUT." ".__SURNAME." ".__FAMILY."</A>");
+                               define('__EMAIL_LINK', "<A href=\"mailto:".$email."\">".__GENDER." ".__SURNAME." ".__FAMILY."</A>");
 
                                // Display form
                                LOAD_TEMPLATE("admin_lock_sponsor");
 
                                // Display form
                                LOAD_TEMPLATE("admin_lock_sponsor");
index 528ec3c737d36961ebb4086207e79b67c42f0713..09f08635be0a3d802ddd89149e9b9d072e0cf17a 100644 (file)
@@ -43,13 +43,13 @@ ADD_DESCR("admin", basename(__FILE__));
 
 if (!empty($_GET['u_id']))
 {
 
 if (!empty($_GET['u_id']))
 {
-       $result_user = SQL_QUERY_ESC("SELECT status, sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+       $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1)
        {
                // User found
         array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1)
        {
                // User found
-               list($status, $sex, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+               list($status, $gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
                SQL_FREERESULT($result_user);
                if (empty($_GET['u_id']))
                {
                SQL_FREERESULT($result_user);
                if (empty($_GET['u_id']))
                {
index d11c12855ffc548477667c3e7bb5ef72497c1d9e..c3894d99a6da88f5d699ff12edadf32396be9716 100644 (file)
@@ -39,14 +39,14 @@ if (isset($_POST['ok'])) {
                        $id = bigintval($id);
 
                        // Load his personal data
                        $id = bigintval($id);
 
                        // Load his personal data
-                       $result_main = SQL_QUERY_ESC("SELECT salut, surname, family, email, remote_addr, sponsor_created, points_amount, refid
+                       $result_main = SQL_QUERY_ESC("SELECT gender, surname, family, email, remote_addr, sponsor_created, points_amount, refid
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE status='PENDING' AND id='%s' LIMIT 1",
  array($id), __FILE__, __LINE__);
                        $refid = 0;
                        if (SQL_NUMROWS($result_main) == 1) {
                                // Load data and free memory
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE status='PENDING' AND id='%s' LIMIT 1",
  array($id), __FILE__, __LINE__);
                        $refid = 0;
                        if (SQL_NUMROWS($result_main) == 1) {
                                // Load data and free memory
-                               list($salut, $sname, $fname, $email, $ip, $created, $points, $refid) = SQL_FETCHROW($result_main);
+                               list($gender, $sname, $fname, $email, $ip, $created, $points, $refid) = SQL_FETCHROW($result_main);
 
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
 
                                // Check for open payments and close them
                                $result = SQL_QUERY_ESC("SELECT DISTINCT so.aid, so.pay_count, so.pay_ordered, so.pay_status,
@@ -114,7 +114,7 @@ WHERE id='%s' LIMIT 1",
                                // Whas that update fine?
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Load referral's data
                                // Whas that update fine?
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Load referral's data
-                                       $result = SQL_QUERY_ESC("SELECT id, salut, surname, family, email,
+                                       $result = SQL_QUERY_ESC("SELECT id, gender, surname, family, email,
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' LIMIT 1",
 (points_amount - points_used) AS points, receive_warnings, ref_count AS refs
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' LIMIT 1",
@@ -126,7 +126,7 @@ WHERE id='%s' LIMIT 1",
                                                // Translate some data
                                                $REFERRAL['points']     = TRANSLATE_COMMA($REFERRAL['points']);
                                                $REFERRAL['ref_points'] = TRANSLATE_COMMA($CONFIG['sponsor_ref_points']);
                                                // Translate some data
                                                $REFERRAL['points']     = TRANSLATE_COMMA($REFERRAL['points']);
                                                $REFERRAL['ref_points'] = TRANSLATE_COMMA($CONFIG['sponsor_ref_points']);
-                                               $REFERRAL['salut']      = TRANSLATE_SEX($REFERRAL['salut']);
+                                               $REFERRAL['gender']      = TRANSLATE_GENDER($REFERRAL['gender']);
 
                                                // Send notification to referral
                                                $REF_MSG = LOAD_EMAIL_TEMPLATE("sponsor_ref_notify", $REFERRAL);
 
                                                // Send notification to referral
                                                $REF_MSG = LOAD_EMAIL_TEMPLATE("sponsor_ref_notify", $REFERRAL);
@@ -139,7 +139,7 @@ WHERE id='%s' LIMIT 1",
                        }
 
                        // Transfer data to array
                        }
 
                        // Transfer data to array
-                       $content['salut']   = TRANSLATE_SEX($salut);
+                       $content['gender']   = TRANSLATE_GENDER($gender);
                        $content['surname'] = $sname;
                        $content['family']  = $fname;
                        $content['sponsor'] = $id;
                        $content['surname'] = $sname;
                        $content['family']  = $fname;
                        $content['sponsor'] = $id;
@@ -159,19 +159,19 @@ WHERE id='%s' LIMIT 1",
 }
 
 // Begin listing of all pending sponsor accounts
 }
 
 // Begin listing of all pending sponsor accounts
-$result = SQL_QUERY("SELECT id, salut, surname, family, email, remote_addr, sponsor_created
+$result = SQL_QUERY("SELECT id, gender, surname, family, email, remote_addr, sponsor_created
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE status='PENDING' ORDER BY id", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE status='PENDING' ORDER BY id", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) > 0) {
        // Entries found so let's list them!
        $OUT = ""; $SW = 2;
-       while(list($id, $salut, $sname, $fname, $email, $ip, $created) = SQL_FETCHROW($result)) {
+       while(list($id, $gender, $sname, $fname, $email, $ip, $created) = SQL_FETCHROW($result)) {
                // Transfer data to array
                $content = array(
                        'sw'      => $SW,
                        'id'      => $id,
                // Transfer data to array
                $content = array(
                        'sw'      => $SW,
                        'id'      => $id,
-                       'salut'   => TRANSLATE_SEX($salut),
+                       'gender'   => TRANSLATE_GENDER($gender),
                        'surname' => $sname,
                        'family'  => $fname,
                        'email'   => "mailto:".$email,
                        'surname' => $sname,
                        'family'  => $fname,
                        'email'   => "mailto:".$email,
index 1a1a632f656b6947646d426d13e6f3b0b2b51173..bb273a74d5d429e93134069402bfafb7e1be667b 100644 (file)
@@ -58,7 +58,7 @@ if (!empty($_GET['hash']))
                 array($_CONFIG['ref_payout'], $_GET['hash']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1)
                {
                 array($_CONFIG['ref_payout'], $_GET['hash']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1)
                {
-                       $msg = LOAD_EMAIL_TEMPLATE("confirm-member", "", bigintval($uid));
+                       $msg = LOAD_EMAIL_TEMPLATE("confirm-member", array('points' => $_CONFIG['points_register']), bigintval($uid));
 
                        // And send him right away the confirmation mail
                        SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);
 
                        // And send him right away the confirmation mail
                        SEND_EMAIL($email, GUEST_THANX_CONFIRM, $msg);
@@ -154,7 +154,7 @@ if (!empty($_GET['hash']))
                switch ($DATA[1])
                {
                case "UNCONFIRMED": // Account not confirmed
                switch ($DATA[1])
                {
                case "UNCONFIRMED": // Account not confirmed
-                       $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", "", $DATA[0]);
+                       $msg = LOAD_EMAIL_TEMPLATE("guest_request_confirm", array('hash' => $DATA[2]), $DATA[0]);
                        SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
                        $content = CONFIRM_LINK_SENT;
                        break;
                        SEND_EMAIL($_POST['email'], REQUEST_CONFIRM_LINK_SUBJ, $msg);
                        $content = CONFIRM_LINK_SENT;
                        break;
index ecf3887652dca4f3893b9ecaef704fce1e4468be..a0601049a557e944786f4d3393b80b8cc7633ae6 100644 (file)
@@ -44,31 +44,31 @@ ADD_DESCR("guest", basename(__FILE__));
 global $DATA, $FATAL;
 
 // Initialize data
 global $DATA, $FATAL;
 
 // Initialize data
-$probe_nickname = false; $UID = false; $hash = "";
+$probe_nickname = false; $uid = false; $hash = "";
 unset($login); unset($online);
 
 if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')))
 {
        // Already logged in?
 unset($login); unset($online);
 
 if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')))
 {
        // Already logged in?
-       $UID = $GLOBALS['userid'];
+       $uid = $GLOBALS['userid'];
 } elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok']))) {
        // Set userid and crypt password when login data was submitted
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['id'])."") != $_POST['id']));
        if ($probe_nickname)
        {
                // Nickname entered
 } elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok']))) {
        // Set userid and crypt password when login data was submitted
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['id'])."") != $_POST['id']));
        if ($probe_nickname)
        {
                // Nickname entered
-               $UID = SQL_ESCAPE($_POST['id']);
+               $uid = SQL_ESCAPE($_POST['id']);
        } else {
                // Direct userid entered
        } else {
                // Direct userid entered
-               $UID  = bigintval($_POST['id']);
+               $uid  = bigintval($_POST['id']);
        }
 } elseif (!empty($_POST['new_pass'])) {
        // New password requested
        }
 } elseif (!empty($_POST['new_pass'])) {
        // New password requested
-       $UID = 0;
-       if (!empty($_POST['id'])) $UID = $_POST['id'];
+       $uid = 0;
+       if (!empty($_POST['id'])) $uid = $_POST['id'];
 } else {
        // Not logged in
 } else {
        // Not logged in
-       $UID = 0; $hash = "";
+       $uid = 0; $hash = "";
 }
 
 $URL = ""; $ADD = "";
 }
 
 $URL = ""; $ADD = "";
@@ -91,13 +91,13 @@ if (IS_MEMBER()) {
        if ($probe_nickname) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",
        if ($probe_nickname) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",
-                array($UID), __FILE__, __LINE__);
-               list($UID2, $password, $online, $login) = SQL_FETCHROW($result);
-               if (!empty($UID2)) $UID = $UID2;
+                array($uid), __FILE__, __LINE__);
+               list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
+               if (!empty($uid2)) $uid = $uid2;
        } else {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
        } else {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-                array(bigintval($UID), $hash), __FILE__, __LINE__);
+                array(bigintval($uid), $hash), __FILE__, __LINE__);
                list($dmy, $password, $online, $login) = SQL_FETCHROW($result);
        }
        if (SQL_NUMROWS($result) == 1) {
                list($dmy, $password, $online, $login) = SQL_FETCHROW($result);
        }
        if (SQL_NUMROWS($result) == 1) {
@@ -121,7 +121,7 @@ if (IS_MEMBER()) {
 
                                // ... and update database
                                $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
 
                                // ... and update database
                                $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-                                array($hash, $UID), __FILE__, __LINE__);
+                                array($hash, $uid), __FILE__, __LINE__);
 
                                // No login bonus by default
                                $BONUS = false;
 
                                // No login bonus by default
                                $BONUS = false;
@@ -150,12 +150,12 @@ if (IS_MEMBER()) {
                                        $hash = generatePassString($hash);
 
                                        // Update cookies
                                        $hash = generatePassString($hash);
 
                                        // Update cookies
-                                       $login = (set_session("userid"  , $UID , $life, COOKIE_PATH)
+                                       $login = (set_session("userid"  , $uid , $life, COOKIE_PATH)
                                               && set_session("u_hash"  , $hash, $life, COOKIE_PATH)
                                               && set_session("lifetime", $l   , $life, COOKIE_PATH));
 
                                        // Update global array
                                               && set_session("u_hash"  , $hash, $life, COOKIE_PATH)
                                               && set_session("lifetime", $l   , $life, COOKIE_PATH));
 
                                        // Update global array
-                                       $GLOBALS['userid'] = bigintval($UID);
+                                       $GLOBALS['userid'] = bigintval($uid);
                                } else {
                                        // Check for login data
                                        $login = IS_MEMBER();
                                } else {
                                        // Check for login data
                                        $login = IS_MEMBER();
@@ -164,7 +164,7 @@ if (IS_MEMBER()) {
                                if ($login) {
                                        // Update database records
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
                                if ($login) {
                                        // Update database records
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
-                                        array(bigintval($UID)), __FILE__, __LINE__);
+                                        array(bigintval($uid)), __FILE__, __LINE__);
                                        if (SQL_AFFECTEDROWS() == 1) {
                                                // Procedure to checking for login data
                                                if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
                                        if (SQL_AFFECTEDROWS() == 1) {
                                                // Procedure to checking for login data
                                                if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
@@ -193,7 +193,7 @@ if (IS_MEMBER()) {
        } else {
                // Other account status?
                $result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
        } else {
                // Other account status?
                $result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-                array(bigintval($UID)), __FILE__, __LINE__);
+                array(bigintval($uid)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load status
                if (SQL_NUMROWS($result) == 1)
                {
                        // Load status
@@ -223,7 +223,7 @@ if (IS_MEMBER()) {
                $URL = URL."/modules.php?module=".$GLOBALS['module']."&what=login&login=".$ERROR;
        }
 }
                $URL = URL."/modules.php?module=".$GLOBALS['module']."&what=login&login=".$ERROR;
        }
 }
- elseif ((!empty($_POST['new_pass'])) && (isset($UID)))
+ elseif ((!empty($_POST['new_pass'])) && (isset($uid)))
 {
        // Compile email when found in address (only secure chars!)
        if (!empty($_POST['email'])) $_POST['email'] = str_replace("{DOT}", '.', $_POST['email']);
 {
        // Compile email when found in address (only secure chars!)
        if (!empty($_POST['email'])) $_POST['email'] = str_replace("{DOT}", '.', $_POST['email']);
@@ -237,32 +237,31 @@ if (IS_MEMBER()) {
        {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' OR email='%s' LIMIT 1",
        {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' OR email='%s' LIMIT 1",
-                array(addslashes($UID), $_POST['email']), __FILE__, __LINE__);
+                array(addslashes($uid), $_POST['email']), __FILE__, __LINE__);
        }
         else
        {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s OR email='%s' LIMIT 1",
        }
         else
        {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s OR email='%s' LIMIT 1",
-                array(bigintval($UID), $_POST['email']), __FILE__, __LINE__);
+                array(bigintval($uid), $_POST['email']), __FILE__, __LINE__);
        }
        if (SQL_NUMROWS($result) == 1)
        {
                // This data is valid, so we create a new pass... :-)
        }
        if (SQL_NUMROWS($result) == 1)
        {
                // This data is valid, so we create a new pass... :-)
-               list($UID, $status) = SQL_FETCHROW($result);
+               list($uid, $status) = SQL_FETCHROW($result);
 
                if ($status == "CONFIRMED")
                {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s LIMIT 1",
 
                if ($status == "CONFIRMED")
                {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();
                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s LIMIT 1",
-                        array(generateHash($NEW_PASS), bigintval($UID)), __FILE__, __LINE__);
+                        array(generateHash($NEW_PASS), bigintval($uid)), __FILE__, __LINE__);
 
                        // Prepare data and message for email
 
                        // Prepare data and message for email
-                       $DATA = array($NEW_PASS, getenv('REMOTE_ADDR'));
-                       $msg = LOAD_EMAIL_TEMPLATE("new-pass", "", bigintval($UID));
+                       $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), bigintval($uid));
 
                        // ... and send it away
 
                        // ... and send it away
-                       SEND_EMAIL(bigintval($UID), GUEST_NEW_PASSWORD, $msg);
+                       SEND_EMAIL(bigintval($uid), GUEST_NEW_PASSWORD, $msg);
 
                        // Output note to user
                        LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND);
 
                        // Output note to user
                        LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND);
index 9b5d88cd0450f0523cd4f9628d789b9cd9692a9c..1223294e8ada4a3d1d487298fcd5bc752d50ab9d 100644 (file)
@@ -230,11 +230,11 @@ if ((isset($_POST['ok'])) && (!$FAILED))
        // Create user's account... //
        //////////////////////////////
        //
        // Create user's account... //
        //////////////////////////////
        //
-       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (sex, surname, family, street_nr, %s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
+       $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_data (gender, surname, family, street_nr, %s, zip, city, email, birth_day, birth_month, birth_year, password, max_mails, receive_mails, refid, status, user_hash, REMOTE_ADDR, joined, last_update".$ADD1.")
 VALUES ('%s', '%s', '%s', '%s', '%s', %s, '%s', '%s', %s, %s, %s, '%s', %s, %s, %s, 'UNCONFIRMED', '%s', '%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
 array(
        $countryRow,
 VALUES ('%s', '%s', '%s', '%s', '%s', %s, '%s', '%s', %s, %s, %s, '%s', %s, %s, %s, 'UNCONFIRMED', '%s', '%s', UNIX_TIMESTAMP(), UNIX_TIMESTAMP()".$ADD2.")",
 array(
        $countryRow,
-       SQL_ESCAPE(substr($_POST['sex'], 0, 1)),
+       SQL_ESCAPE(substr($_POST['gender'], 0, 1)),
        SQL_ESCAPE($_POST['surname']),
        SQL_ESCAPE($_POST['family_name']),
        SQL_ESCAPE($_POST['street_nr']),
        SQL_ESCAPE($_POST['surname']),
        SQL_ESCAPE($_POST['family_name']),
        SQL_ESCAPE($_POST['street_nr']),
@@ -290,18 +290,18 @@ array(
                }
        }
 
                }
        }
 
-       // Rewrite sex
-       $sex = TRANSLATE_SEX($_POST['sex']);
+       // Rewrite gender
+       $gender = TRANSLATE_GENDER($_POST['gender']);
 
        // ... rewrite a zero referral ID to the main title
        if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
 
        // Prepare data array for the email template
 
        // ... rewrite a zero referral ID to the main title
        if ($_POST['refid'] == "0") $_POST['refid'] = MAIN_TITLE;
 
        // Prepare data array for the email template
-       // Start with the salutation...
+       // Start with the gender...
        $DATA = array(
                'hash'    => $hash,
                'uid'     => $userid,
        $DATA = array(
                'hash'    => $hash,
                'uid'     => $userid,
-               'salut'   => $sex,
+               'gender'   => $gender,
                'surname' => SQL_ESCAPE($_POST['surname']),
                'family'  => SQL_ESCAPE($_POST['family_name']),
                'email'   => SQL_ESCAPE($_POST['addy']),
                'surname' => SQL_ESCAPE($_POST['surname']),
                'family'  => SQL_ESCAPE($_POST['family_name']),
                'email'   => SQL_ESCAPE($_POST['addy']),
index 12584c5fe23a9f39dce2e9de67ba60b96cac3f1b..6da3f8aa85afe0833ce4d9f7e9767bc284bf103e 100644 (file)
@@ -55,7 +55,7 @@ if (!empty($_GET['mode']))
 if (!empty($_GET['hash']))
 {
        // Lookup sponsor
 if (!empty($_GET['hash']))
 {
        // Lookup sponsor
-       $result = SQL_QUERY_ESC("SELECT id, status, salut, surname, family,
+       $result = SQL_QUERY_ESC("SELECT id, status, gender, surname, family,
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr
 company, position, tax_ident,
 street_nr1, street_nr2, country, zip, city, email, phone, fax, cell,
 points_amount AS points, last_pay AS pay, last_curr AS curr
@@ -67,8 +67,8 @@ LIMIT 1", array($_GET['hash']), __FILE__, __LINE__);
                // Sponsor found, load his data...
                $SPONSOR = SQL_FETCHARRAY($result);
 
                // Sponsor found, load his data...
                $SPONSOR = SQL_FETCHARRAY($result);
 
-               // Translate salut and comma
-               $SPONSOR['salut']  = TRANSLATE_SEX($SPONSOR['salut']);
+               // Translate gender and comma
+               $SPONSOR['gender']  = TRANSLATE_GENDER($SPONSOR['gender']);
                $SPONSOR['points'] = TRANSLATE_COMMA($SPONSOR['points']);
                $SPONSOR['pay']    = TRANSLATE_COMMA($SPONSOR['pay']);
 
                $SPONSOR['points'] = TRANSLATE_COMMA($SPONSOR['points']);
                $SPONSOR['pay']    = TRANSLATE_COMMA($SPONSOR['pay']);
 
@@ -145,7 +145,7 @@ WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1",
        if (isset($_POST['ok']))
        {
                // Check email
        if (isset($_POST['ok']))
        {
                // Check email
-               $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, salut, surname, family, sponsor_created
+               $result = SQL_QUERY_ESC("SELECT id, hash, status, remote_addr, gender, surname, family, sponsor_created
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
  array($_POST['email']), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
  array($_POST['email']), __FILE__, __LINE__);
@@ -155,7 +155,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
                        $SPONSOR = SQL_FETCHARRAY($result);
 
                        // Translate some data
                        $SPONSOR = SQL_FETCHARRAY($result);
 
                        // Translate some data
-                       $SPONSOR['salut']           = TRANSLATE_SEX($SPONSOR['salut']);
+                       $SPONSOR['gender']           = TRANSLATE_GENDER($SPONSOR['gender']);
                        $SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
 
                        // Prepare email and send it to the sponsor
                        $SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
 
                        // Prepare email and send it to the sponsor
@@ -201,7 +201,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1",
        if (isset($_POST['ok']))
        {
                // Check email
        if (isset($_POST['ok']))
        {
                // Check email
-               $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, salut, surname, family, sponsor_created
+               $result = SQL_QUERY_ESC("SELECT id, hash, remote_addr, gender, surname, family, sponsor_created
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
  array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
  array($_POST['email'], bigintval($_POST['id'])), __FILE__, __LINE__);
@@ -211,7 +211,7 @@ WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1",
                        $SPONSOR = SQL_FETCHARRAY($result);
 
                        // Translate some data
                        $SPONSOR = SQL_FETCHARRAY($result);
 
                        // Translate some data
-                       $SPONSOR['salut']           = TRANSLATE_SEX($SPONSOR['salut']);
+                       $SPONSOR['gender']           = TRANSLATE_GENDER($SPONSOR['gender']);
                        $SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
 
                        // Generate password
                        $SPONSOR['sponsor_created'] = MAKE_DATETIME($SPONSOR['sponsor_created']);
 
                        // Generate password
index 875a6584ae249de3f57a911dd99448cdbced4bec..ec788933bfdd2679157cacaa67ebdb79333a1301 100644 (file)
@@ -47,10 +47,10 @@ if (isset($_POST['ok'])) {
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name
        // Check submitted form data
        //
        // 1. Salutation / Surname / family name
-       if (empty($_POST['salut']))
+       if (empty($_POST['gender']))
        {
                // Surname is empty
        {
                // Surname is empty
-               $FORM_ERRORS[] = SPONSOR_NO_SALUT_SELECTED;
+               $FORM_ERRORS[] = SPONSOR_NO_GENDER_SELECTED;
        }
        if (empty($_POST['surname']))
        {
        }
        if (empty($_POST['surname']))
        {
@@ -254,7 +254,7 @@ WHERE id='%s' LIMIT 1", array($_POST['pay_type']), __FILE__, __LINE__);
                        define('__EMAIL'    , $_POST['email']);
                        define('__SURNAME'  , $_POST['surname']);
                        define('__FAMILY'   , $_POST['family']);
                        define('__EMAIL'    , $_POST['email']);
                        define('__SURNAME'  , $_POST['surname']);
                        define('__FAMILY'   , $_POST['family']);
-                       define('__SALUT'    , TRANSLATE_SEX($_POST['salut']));
+                       define('__GENDER'    , TRANSLATE_GENDER($_POST['gender']));
                        define('__TIMESTAMP', MAKE_DATETIME(time(), 0));
                        define('__PASSWORD' , $_POST['pass1']);
 
                        define('__TIMESTAMP', MAKE_DATETIME(time(), 0));
                        define('__PASSWORD' , $_POST['pass1']);
 
@@ -340,25 +340,25 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        define('__EMAIL'    , COMPILE_CODE($_POST['email']));
                        define('__URL'      , COMPILE_CODE($_POST['url']));
 
                        define('__EMAIL'    , COMPILE_CODE($_POST['email']));
                        define('__URL'      , COMPILE_CODE($_POST['url']));
 
-                       // Check for salutation selection
-                       switch ($_POST['salut'])
+                       // Check for gender selection
+                       switch ($_POST['gender'])
                        {
                        case "M": // Male
                        {
                        case "M": // Male
-                               define('__SALUT_M'  , " selected");
-                               define('__SALUT_F'  , "");
-                               define('__SALUT_C'  , "");
+                               define('__GENDER_M'  , " selected");
+                               define('__GENDER_F'  , "");
+                               define('__GENDER_C'  , "");
                                break;
 
                        case "F": // Female
                                break;
 
                        case "F": // Female
-                               define('__SALUT_M'  , "");
-                               define('__SALUT_F'  , " selected");
-                               define('__SALUT_C'  , "");
+                               define('__GENDER_M'  , "");
+                               define('__GENDER_F'  , " selected");
+                               define('__GENDER_C'  , "");
                                break;
 
                        case "C": // Company
                                break;
 
                        case "C": // Company
-                               define('__SALUT_M'  , "");
-                               define('__SALUT_F'  , "");
-                               define('__SALUT_C'  , " selected");
+                               define('__GENDER_M'  , "");
+                               define('__GENDER_F'  , "");
+                               define('__GENDER_C'  , " selected");
                                break;
                        }
 
                                break;
                        }
 
@@ -395,9 +395,9 @@ ORDER BY pay_name", __FILE__, __LINE__);
                        define('__COMPANY'  , "");
                        define('__POSITION' , "");
                        define('__TAX_IDENT', "");
                        define('__COMPANY'  , "");
                        define('__POSITION' , "");
                        define('__TAX_IDENT', "");
-                       define('__SALUT_M'  , "");
-                       define('__SALUT_F'  , "");
-                       define('__SALUT_C'  , "");
+                       define('__GENDER_M'  , "");
+                       define('__GENDER_F'  , "");
+                       define('__GENDER_C'  , "");
                        define('__SURNAME'  , "");
                        define('__FAMILY'   , "");
                        define('__STREET1'  , "");
                        define('__SURNAME'  , "");
                        define('__FAMILY'   , "");
                        define('__STREET1'  , "");
index e5a89e273df7638076cae8f0243ea6236f980d03..19225380c08ee5789fcca6d47642754ad33802ae 100644 (file)
@@ -60,8 +60,8 @@ case "MEMBERS": // Statistics about your members
        $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
 
        // Only males / females
        $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
 
        // Only males / females
-       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE sex='M' AND status='CONFIRMED'", __FILE__, __LINE__));
-       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE sex='F' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $male   = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE gender='M' AND status='CONFIRMED'", __FILE__, __LINE__));
+       $female = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE gender='F' AND status='CONFIRMED'", __FILE__, __LINE__));
 
        // Unconfirmed accounts
        $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status != 'CONFIRMED'", __FILE__, __LINE__));
 
        // Unconfirmed accounts
        $unconfirmed = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE status != 'CONFIRMED'", __FILE__, __LINE__));
index fd02c9f0d673f1af84ee6fa846fb1538f5c597c6..5d1998991951fa6f61c21d60a1ea10f5f0021d81 100644 (file)
@@ -64,20 +64,20 @@ case "show": // Show his data
        if (EXT_IS_ACTIVE("country", true))
        {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
        if (EXT_IS_ACTIVE("country", true))
        {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, sex, max_mails, receive_mails, last_update FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        }
         else
        {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
                 array(UID_VALUE), __FILE__, __LINE__);
        }
         else
        {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, sex, max_mails, receive_mails, last_update FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        }
        $DATA = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        // Translate / add some things
                 array(UID_VALUE), __FILE__, __LINE__);
        }
        $DATA = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
        // Translate / add some things
-       $DATA[10] = TRANSLATE_SEX($DATA[10]);
+       $DATA[10] = TRANSLATE_GENDER($DATA[10]);
        $DATA[13] = MAKE_DATETIME($DATA[13], "0");
 
        // How far is last change on his profile away from now?
        $DATA[13] = MAKE_DATETIME($DATA[13], "0");
 
        // How far is last change on his profile away from now?
@@ -112,12 +112,12 @@ case "show": // Show his data
 case "edit": // Edit data
        if (EXT_IS_ACTIVE("country", true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
 case "edit": // Edit data
        if (EXT_IS_ACTIVE("country", true)) {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, sex, max_mails, receive_mails, last_update
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country_code, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
 FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        } else {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
 FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        } else {
                // Old way                         0        1         2        3      4     5     6        7           8            9       10      11           12           13
-               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, sex, max_mails, receive_mails, last_update
+               $result = SQL_QUERY_ESC("SELECT surname, family, street_nr, country, zip, city, email, birth_day, birth_month, birth_year, gender, max_mails, receive_mails, last_update
 FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        }
 FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(UID_VALUE), __FILE__, __LINE__);
        }
@@ -247,7 +247,7 @@ case "save": // Save entered data
                        {
                                // New way
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
                        {
                                // New way
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
-sex='%s', surname='%s', family='%s',
+gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country_code=%s, zip=%s, city='%s',
 email='%s',
 street_nr='%s',
 country_code=%s, zip=%s, city='%s',
 email='%s',
@@ -258,7 +258,7 @@ notified='N',
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
-       $_POST['sex'],
+       $_POST['gender'],
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
@@ -278,7 +278,7 @@ array(
                        {
                                // Old way
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
                        {
                                // Old way
                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET
-sex='%s', surname='%s', family='%s',
+gender='%s', surname='%s', family='%s',
 street_nr='%s',
 country='%s', zip=%s, city='%s',
 email='%s',
 street_nr='%s',
 country='%s', zip=%s, city='%s',
 email='%s',
@@ -289,7 +289,7 @@ notified='N',
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
 last_profile_sent=UNIX_TIMESTAMP()
 WHERE userid=%s AND password='%s' LIMIT 1",
 array(
-       $_POST['sex'],
+       $_POST['gender'],
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
        $_POST['surname'],
        $_POST['family_name'],
        $_POST['street_nr'],
index eac91e3a0b5b8c9492474b1d4a1f047497c9cdff..baa8aad018854c07cc30c10eb17fe8385f58f67d 100644 (file)
@@ -112,26 +112,26 @@ case "new": // Start new transfer
                        $nick = true;
                }
                // Re-check receivers and own personal data
                        $nick = true;
                }
                // Re-check receivers and own personal data
-               $result = SQL_QUERY_ESC("SELECT userid, sex, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s', '%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
+               $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email".$ADD." FROM "._MYSQL_PREFIX."_user_data WHERE userid IN ('%s', '%s') AND status='CONFIRMED' ORDER BY userid LIMIT 2",
                 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 
                if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient)
                {
                        // Let's start the transfer and load user data
                 array($GLOBALS['userid'], bigintval($_POST['to_uid'])), __FILE__, __LINE__);
                $valid_data = (SQL_NUMROWS($result) == 2);
 
                if ($valid_code && $valid_pass && $valid_amount && $valid_reason && $valid_recipient)
                {
                        // Let's start the transfer and load user data
-                       list($uid1, $sex1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
-                       list($uid2, $sex2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
+                       list($uid1, $gender1, $sname1, $fname1, $email1, $nick1) = SQL_FETCHROW($result);
+                       list($uid2, $gender2, $sname2, $fname2, $email2, $nick2) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        if ($uid1 == $GLOBALS['userid'])
                        {
                                // Data row 1 is sender's data
                        SQL_FREERESULT($result);
                        if ($uid1 == $GLOBALS['userid'])
                        {
                                // Data row 1 is sender's data
-                               define('__SENDER_SEX'     , TRANSLATE_SEX($sex1));
+                               define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender1));
                                define('__SENDER_NICK'    , $nick1);
                                define('__SENDER_SNAME'   , $sname1);
                                define('__SENDER_FNAME'   , $fname1);
                                define('__SENDER_EMAIL'   , $email1);
                                // Data row 2 is recpient's data
                                define('__SENDER_NICK'    , $nick1);
                                define('__SENDER_SNAME'   , $sname1);
                                define('__SENDER_FNAME'   , $fname1);
                                define('__SENDER_EMAIL'   , $email1);
                                // Data row 2 is recpient's data
-                               define('__RECIPIENT_SEX'  , TRANSLATE_SEX($sex2));
+                               define('__RECIPIENT_GENDER'  , TRANSLATE_GENDER($gender2));
                                define('__RECIPIENT_NICK' , $nick2);
                                define('__RECIPIENT_SNAME', $sname2);
                                define('__RECIPIENT_FNAME', $fname2);
                                define('__RECIPIENT_NICK' , $nick2);
                                define('__RECIPIENT_SNAME', $sname2);
                                define('__RECIPIENT_FNAME', $fname2);
@@ -144,13 +144,13 @@ case "new": // Start new transfer
                         else
                        {
                                // Data row 2 is sender's data
                         else
                        {
                                // Data row 2 is sender's data
-                               define('__SENDER_SEX'     , TRANSLATE_SEX($sex2));
+                               define('__SENDER_GENDER'     , TRANSLATE_GENDER($gender2));
                                define('__SENDER_NICK'    , $nick2);
                                define('__SENDER_SNAME'   , $sname2);
                                define('__SENDER_FNAME'   , $fname2);
                                define('__SENDER_EMAIL'   , $email2);
                                // Data row 1 is recpient's data
                                define('__SENDER_NICK'    , $nick2);
                                define('__SENDER_SNAME'   , $sname2);
                                define('__SENDER_FNAME'   , $fname2);
                                define('__SENDER_EMAIL'   , $email2);
                                // Data row 1 is recpient's data
-                               define('__RECIPIENT_SEX'  , TRANSLATE_SEX($sex1));
+                               define('__RECIPIENT_GENDER'  , TRANSLATE_GENDER($gender1));
                                define('__RECIPIENT_NICK' , $nick1);
                                define('__RECIPIENT_SNAME', $sname1);
                                define('__RECIPIENT_FNAME', $fname1);
                                define('__RECIPIENT_NICK' , $nick1);
                                define('__RECIPIENT_SNAME', $sname1);
                                define('__RECIPIENT_FNAME', $fname1);
index 74fbc6a45a58e087c6444d48f4de7113c72b2503..73626631b5e8f35824ff03cafcb1d5f80f644c2e 100644 (file)
@@ -72,9 +72,9 @@ if (empty($URL)) {
                UPDATE_LOGIN_DATA();
 
                // Load personal data...
                UPDATE_LOGIN_DATA();
 
                // Load personal data...
-               $result = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array($GLOBALS['userid']), __FILE__, __LINE__);
                 array($GLOBALS['userid']), __FILE__, __LINE__);
-               list($sex, $sname, $fname, $email) = SQL_FETCHROW($result);
+               list($gender, $sname, $fname, $email) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
 
                // Load mail again...              0       1        2           3          4      5      6         7
                SQL_FREERESULT($result);
 
                // Load mail again...              0       1        2           3          4      5      6         7
@@ -92,18 +92,21 @@ if (empty($URL)) {
                if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
                SUB_POINTS($GLOBALS['userid'], $USED);
 
                if ($_CONFIG['order_max_full'] == "ORDER") $ADD = ", mail_orders=mail_orders+1";
                SUB_POINTS($GLOBALS['userid'], $USED);
 
-               // Update mediadata as well
-               if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
-                       // Update database
-                       MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $USED);
-               }
+               // Prepare content
+               $content = array(
+                       'blocks'   => $_CONFIG['max_send'],
+                       'subject'  => $DATA[0],
+                       'text'     => $DATA[1],
+                       'payment'  => GET_PAYMENT($DATA[3]),
+                       'category' => GET_CATEGORY($DATA[6])
+               );
 
                // Send an email to the user
 
                // Send an email to the user
-               $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", "", $GLOBALS['userid']);
+               $msg_mem = LOAD_EMAIL_TEMPLATE("order-member", $content, $GLOBALS['userid']);
                SEND_EMAIL($email, MEMBER_NEW_QUEUE, $msg_mem);
 
                // Notify admins about this
                SEND_EMAIL($email, MEMBER_NEW_QUEUE, $msg_mem);
 
                // Notify admins about this
-               SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", "", $GLOBALS['userid']);
+               SEND_ADMIN_NOTIFICATION(ADMIN_NEW_QUEUE, "order-admin", $content, $GLOBALS['userid']);
 
                // Output back bottom
                LOAD_TEMPLATE("member_order-back", false);
 
                // Output back bottom
                LOAD_TEMPLATE("member_order-back", false);
index ec754c98e1c08c6dd5f2529eb0557fbfc0982f30..f9912e53d9788a4bd9b1d9d1496cbd3511ba9a4d 100644 (file)
@@ -45,7 +45,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
-salut, surname, family, street_nr1, street_nr2, zip, city, country,
+gender, surname, family, street_nr1, street_nr2, zip, city, country,
 phone, fax, cell, email, url,
 status, receive_warnings
 FROM "._MYSQL_PREFIX."_sponsor_data
 phone, fax, cell, email, url,
 status, receive_warnings
 FROM "._MYSQL_PREFIX."_sponsor_data
@@ -110,25 +110,25 @@ if (SQL_NUMROWS($result) == 1) {
                                $OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_MESSAGE_GENERATED);
                        }
                } else {
                                $OUT = LOAD_TEMPLATE("admin_settings_saved", true, SPONSOR_NO_MESSAGE_GENERATED);
                        }
                } else {
-                       // Check for salutation selection
-                       switch ($content['salut'])
+                       // Check for gender selection
+                       switch ($content['gender'])
                        {
                        case "M": // Male
                        {
                        case "M": // Male
-                               define('__SALUT_M', " selected");
-                               define('__SALUT_F', "");
-                               define('__SALUT_C', "");
+                               define('__GENDER_M', " selected");
+                               define('__GENDER_F', "");
+                               define('__GENDER_C', "");
                                break;
 
                        case "F": // Female
                                break;
 
                        case "F": // Female
-                               define('__SALUT_M', "");
-                               define('__SALUT_F', " selected");
-                               define('__SALUT_C', "");
+                               define('__GENDER_M', "");
+                               define('__GENDER_F', " selected");
+                               define('__GENDER_C', "");
                                break;
 
                        case "C": // Company
                                break;
 
                        case "C": // Company
-                               define('__SALUT_M', "");
-                               define('__SALUT_F', "");
-                               define('__SALUT_C', " selected");
+                               define('__GENDER_M', "");
+                               define('__GENDER_F', "");
+                               define('__GENDER_C', " selected");
                                break;
                        }
 
                                break;
                        }
 
index c8e7c4b4b73cf34d21d1d1c0c7bc31f1b64f86ad..927d33cf97906e6467923495d187b567ebb06126 100644 (file)
@@ -44,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 }
 
 // Data for the formular
 }
 
 // Data for the formular
-$result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, salut
+$result = SQL_QUERY_ESC("SELECT status, receive_warnings, warning_interval, email, surname, family, gender
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_COOKIE['sponsorid']), $_COOKIE['sponsorpass']), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_COOKIE['sponsorid']), $_COOKIE['sponsorpass']), __FILE__, __LINE__);
@@ -63,7 +63,7 @@ if (SQL_NUMROWS($result) == 1) {
                                $MSG = SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB;
                        } else {
                                // Unsecure data which we don't want here
                                $MSG = SPONSOR_CURRENT_PASSWORD_DIDNOT_MATCH_DB;
                        } else {
                                // Unsecure data which we don't want here
-                               $UNSAFE = array('company', 'position', 'tax_ident', 'salut', 'surname', 'family',
+                               $UNSAFE = array('company', 'position', 'tax_ident', 'gender', 'surname', 'family',
                                                'street_nr1', 'street_nr2', 'zip', 'city', 'country', 'phone', 'fax', 'cell',
                                                'email', 'url');
 
                                                'street_nr1', 'street_nr2', 'zip', 'city', 'country', 'phone', 'fax', 'cell',
                                                'email', 'url');
 
index e120cc286405349b7626aa34a70e740fa3481b8f..4aa7880e92ea56c03149deed544cb67f9e8e73cf 100644 (file)
@@ -44,17 +44,17 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 }
 
 // Load some data
 }
 
 // Load some data
-$result = SQL_QUERY_ESC("SELECT salut, surname, family, (points_amount - points_used) AS points
+$result = SQL_QUERY_ESC("SELECT gender, surname, family, (points_amount - points_used) AS points
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_COOKIE['sponsorid']), $_COOKIE['sponsorpass']), __FILE__, __LINE__);
 FROM "._MYSQL_PREFIX."_sponsor_data
 WHERE id='%s' AND password='%s' LIMIT 1",
  array(bigintval($_COOKIE['sponsorid']), $_COOKIE['sponsorpass']), __FILE__, __LINE__);
-list($salut, $surname, $family, $points) = SQL_FETCHROW($result);
+list($gender, $surname, $family, $points) = SQL_FETCHROW($result);
 
 // Free memory
 SQL_FREERESULT($result);
 
 // Prepare data for the template
 
 // Free memory
 SQL_FREERESULT($result);
 
 // Prepare data for the template
-define('__SALUT'  , TRANSLATE_SEX($salut));
+define('__GENDER'  , TRANSLATE_GENDER($gender));
 define('__SURNAME', $surname);
 define('__FAMILY' , $family);
 define('__POINTS' , TRANSLATE_COMMA($points));
 define('__SURNAME', $surname);
 define('__FAMILY' , $family);
 define('__POINTS' , TRANSLATE_COMMA($points));
index e1df712762f9ea86ceb7691c76a55959b953c2a1..5d52c25fae2ef886317a2f5b30cf2e4b44e8b582 100644 (file)
@@ -728,7 +728,7 @@ function SEND_MODE_MAILS($mod, $modes)
                $hash = generatePassString($hashDB);
                if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
                        // Load user's data
                $hash = generatePassString($hashDB);
                if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
                        // Load user's data
-                       $result = SQL_QUERY_ESC("SELECT sex, surname, family, street_nr, country, zip, city, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND password='%s' LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND password='%s' LIMIT 1",
                         array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load the data
                         array($GLOBALS['userid'], $hashDB), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Load the data
@@ -737,8 +737,8 @@ function SEND_MODE_MAILS($mod, $modes)
                                // Free result
                                SQL_FREERESULT($result);
 
                                // Free result
                                SQL_FREERESULT($result);
 
-                               // Translate salutation
-                               $DATA[0] = TRANSLATE_SEX($DATA[0]);
+                               // Translate gender
+                               $DATA[0] = TRANSLATE_GENDER($DATA[0]);
 
                                // Clear/init the content variable
                                $content = "";
 
                                // Clear/init the content variable
                                $content = "";
@@ -910,16 +910,20 @@ function GET_CATEGORY ($cid) {
        // Default is not found
        $ret = _CATEGORY_404;
 
        // Default is not found
        $ret = _CATEGORY_404;
 
-       // Lookup the category
-       $result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%s LIMIT 1",
-               array(bigintval($cid)), __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) == 1) {
-               // Category found... :-)
-               list($ret) = SQL_FETCHROW($result);
-       } // END - if
+       // Is the category id set?
+       if (!empty($cid)) {
 
 
-       // Free result
-       SQL_FREERESULT($result);
+               // Lookup the category
+               $result = SQL_QUERY_ESC("SELECT cat FROM "._MYSQL_PREFIX."_cats WHERE id=%s LIMIT 1",
+                       array(bigintval($cid)), __FILE__, __LINE__);
+               if (SQL_NUMROWS($result) == 1) {
+                       // Category found... :-)
+                       list($ret) = SQL_FETCHROW($result);
+               } // END - if
+
+               // Free result
+               SQL_FREERESULT($result);
+       } // END - if
 
        // Return result
        return $ret;
 
        // Return result
        return $ret;
@@ -1121,9 +1125,16 @@ function ADD_POINTS_REFSYSTEM($uid, $points, $send_notify=false, $rid="0", $lock
 
                        // Points updated, maybe I shall send him an email?
                        if (($send_notify) && ($ref > 0) && (!$locked)) {
 
                        // Points updated, maybe I shall send him an email?
                        if (($send_notify) && ($ref > 0) && (!$locked)) {
-                               //              0                1      2              3
-                               $DATA = array($per, bigintval($DEPTH), $ref_points, bigintval($ref));
-                               $msg = LOAD_EMAIL_TEMPLATE("confirm-referral", "", bigintval($uid));
+                               // Prepare content
+                               $content = array(
+                                       'percent' => $per,
+                                       'level'   => bigintval($DEPTH),
+                                       'points'  => $ref_points,
+                                       'refid'   => bigintval($ref)
+                               );
+
+                               // Load email template
+                               $msg = LOAD_EMAIL_TEMPLATE("confirm-referral", $content, bigintval($uid));
 
                                SEND_EMAIL($email, THANX_REFERRAL_ONE, $msg);
                        } elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == "direct") && (!defined('__POINTS_VALUE'))) {
 
                                SEND_EMAIL($email, THANX_REFERRAL_ONE, $msg);
                        } elseif (($send_notify) && ($ref == 0) && (!$locked) && ($add_mode == "direct") && (!defined('__POINTS_VALUE'))) {
@@ -1435,7 +1446,7 @@ WHERE p.userid=%s", array(bigintval($uid)), __FILE__, __LINE__);
                if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                        // Update database
                        MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points);
                if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                        // Update database
                        MEDIA_UPDATE_ENTRY(array("total_points"), "sub", $points);
-               }
+               } // END - if
 
                // Now, when we have all his points adds them do the jackpot!
                ADD_JACKPOT($points);
 
                // Now, when we have all his points adds them do the jackpot!
                ADD_JACKPOT($points);
index fad28479f8f987dc9c705f0d4e97c9e74467d86f..a6ef8e18ebd34d3fdce5458053649154966eae7f 100644 (file)
@@ -60,14 +60,14 @@ if (SQL_NUMROWS($result_main) > 0)
        while ($DATA = SQL_FETCHROW($result_main))
        {
                // Check fetched data for HTML
        while ($DATA = SQL_FETCHROW($result_main))
        {
                // Check fetched data for HTML
-               $HTML = $DATA[10]; if ($HTML == $DATA[0]) $HTML = "N";
+               $HTML = $DATA[10]; if ($HTML == $DATA['id']) $HTML = "N";
 
                // Compile URL and subject line
                $DATA[7] = COMPILE_CODE($DATA[7]);
 
                // Set mail order as "active". That means it will be sent out
                $result_active = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",
 
                // Compile URL and subject line
                $DATA[7] = COMPILE_CODE($DATA[7]);
 
                // Set mail order as "active". That means it will be sent out
                $result_active = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='ACTIVE' WHERE id=%s AND data_type='NEW' LIMIT 1",
-                array($DATA[0]), __FILE__, __LINE__);
+                array($DATA['id']), __FILE__, __LINE__);
                if (SQL_AFFECTEDROWS() == 1)
                {
                        // "Explode" all receivers into an array
                if (SQL_AFFECTEDROWS() == 1)
                {
                        // "Explode" all receivers into an array
@@ -93,7 +93,7 @@ if (SQL_NUMROWS($result_main) > 0)
                        foreach ($RECEIVERS as $key => $uid)
                        {
                                // Lookup user ID
                        foreach ($RECEIVERS as $key => $uid)
                        {
                                // Lookup user ID
-                               $result_user = SQL_QUERY_ESC("SELECT sex, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               $result_user = SQL_QUERY_ESC("SELECT gender, surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?
                                 array(bigintval($uid)), __FILE__, __LINE__);
 
                                // Is his data available?
@@ -101,14 +101,14 @@ if (SQL_NUMROWS($result_main) > 0)
                                if (SQL_NUMROWS($result_user) == 1)
                                {
                                        // The final receiver does exists so we can continue...
                                if (SQL_NUMROWS($result_user) == 1)
                                {
                                        // The final receiver does exists so we can continue...
-                                       list($salut, $sname, $fname, $email) = SQL_FETCHROW($result_user);
+                                       list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user);
 
                                        // Free memory
                                        SQL_FREERESULT($result_user);
 
                                        // Do we have a stats entry?
                                        $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
 
                                        // Free memory
                                        SQL_FREERESULT($result_user);
 
                                        // Do we have a stats entry?
                                        $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
-                                        array($DATA[0], $DATA[1], $DATA[6]), __FILE__, __LINE__);
+                                        array($DATA['id'], $DATA[1], $DATA[6]), __FILE__, __LINE__);
 
                                        // If there's no stats entry add it!
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
 
                                        // If there's no stats entry add it!
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
@@ -116,11 +116,11 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // No entry was found, so we add him!
                                                $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())",
                                        {
                                                // No entry was found, so we add him!
                                                $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())",
-                                                array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[9]), bigintval($DATA[5]), $DATA[2], $DATA[7], $DATA[8], bigintval($DATA[6])), __FILE__, __LINE__);
 
                                                // Receive it's ID for the links table
                                                $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
 
                                                // Receive it's ID for the links table
                                                $result_stats = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_user_stats WHERE pool_id=%s AND userid=%s AND timestamp_ordered='%s' LIMIT 1",
-                                                array(bigintval($DATA[0]), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['id']), bigintval($DATA[1]), bigintval($DATA[6])), __FILE__, __LINE__);
                                        }
 
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
                                        }
 
                                        //* DEBUG: */ echo "!L:".__LINE__."/".SQL_NUMROWS($result_stats)."!<br />";
@@ -131,18 +131,34 @@ if (SQL_NUMROWS($result_main) > 0)
                                                SQL_FREERESULT($result_stats);
 
                                                // Mark this user as "spammed" ;-) And place a line for him...
                                                SQL_FREERESULT($result_stats);
 
                                                // Mark this user as "spammed" ;-) And place a line for him...
-                                               //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<br />";
-                                               switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id)))
+                                               //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA['id']."/".$stats_id."?<br />";
+                                               switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA['id']), bigintval($stats_id)))
                                                {
                                                case "done":
                                                        // Prepare the mail
                                                        $DATA[11] = bigintval($stats_id);
                                                        $DATA[12] = $sname;
                                                        $DATA[13] = $fname;
                                                {
                                                case "done":
                                                        // Prepare the mail
                                                        $DATA[11] = bigintval($stats_id);
                                                        $DATA[12] = $sname;
                                                        $DATA[13] = $fname;
-                                                       $DATA[14] = TRANSLATE_SEX($salut);
+                                                       $DATA[14] = TRANSLATE_GENDER($gender);
+
+                                                       // Replace text variables
+                                                       foreach ($REPLACER as $key => $value) {
+                                                               if (isset($DATA[$key])) $DATA[3] = str_replace($value, $DATA[$key], $DATA[3]);
+                                                       } // END - if
+
+                                                       // Prepare content
+                                                       $content = array(
+                                                               'id'         => $DATA[11],
+                                                               'url'        => $DATA[3],
+                                                               'sender_uid' => $DATA[1],
+                                                               'category'   => GET_CATEGORY($DATA[9]),
+                                                               'time'       => CREATE_FANCY_TIME(GET_PAY_POINTS($DATA[5], "time")),
+                                                               'points'     => TRANSLATE_COMMA(GET_PAY_POINTS($DATA[5], "payment")),
+                                                               'text'       => $DATA[3]
+                                                       );
 
                                                        // Load message template
 
                                                        // Load message template
-                                                       $msg = LOAD_EMAIL_TEMPLATE("normal-mail", $DATA[3], bigintval($uid));
+                                                       $msg = LOAD_EMAIL_TEMPLATE("normal-mail", $content, bigintval($uid));
 
                                                        // Send mail away
                                                        SEND_EMAIL($email, $DATA[2], $msg, $HTML);
 
                                                        // Send mail away
                                                        SEND_EMAIL($email, $DATA[2], $msg, $HTML);
@@ -151,20 +167,18 @@ if (SQL_NUMROWS($result_main) > 0)
                                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET emails_sent=emails_sent+1 WHERE userid=%s LIMIT 1",
                                                         array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET emails_sent=emails_sent+1 WHERE userid=%s LIMIT 1",
                                                         array(bigintval($DATA[1])), __FILE__, __LINE__);
 
-                                                       if (GET_EXT_VERSION("user") >= "0.1.4")
-                                                       {
+                                                       if (GET_EXT_VERSION("user") >= "0.1.4") {
                                                                // Update mails received for receiver
                                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
                                                                array(bigintval($uid)), __FILE__, __LINE__);
                                                                // Update mails received for receiver
                                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET emails_received=emails_received+1 WHERE userid=%s LIMIT 1",
                                                                array(bigintval($uid)), __FILE__, __LINE__);
-                                                       }
+                                                       } // END - if
 
                                                        // Update mediadata if version is 0.0.4 or higher
 
                                                        // Update mediadata if version is 0.0.4 or higher
-                                                       if (GET_EXT_VERSION("mediadata") >= "0.0.4")
-                                                       {
+                                                       if (GET_EXT_VERSION("mediadata") >= "0.0.4") {
                                                                // Update entry (or add missing)
                                                                //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                                                MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1);
                                                                // Update entry (or add missing)
                                                                //* DEBUG: */ echo "*MEDIA/L:".__LINE__."*<br />";
                                                                MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1);
-                                                       }
+                                                       } // END - if
 
                                                        // And count up the mail
                                                        $cnt++;
 
                                                        // And count up the mail
                                                        $cnt++;
@@ -180,21 +194,27 @@ if (SQL_NUMROWS($result_main) > 0)
                                        }
 
                                        // Do we have reached the maximum to send mails? || ($_CONFIG['max_send'] >= $cnt)
                                        }
 
                                        // Do we have reached the maximum to send mails? || ($_CONFIG['max_send'] >= $cnt)
-                                       //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*<br />";
-                                       if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA[0]))
-                                       {
+                                       //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA['id']."*<br />";
+                                       if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA['id'])) {
+                                               // Prepare content
+                                               $content = array(
+                                                       'sender_uid' => $DATA[1],
+                                                       'category'   => GET_CATEGORY($DATA[9])
+                                               );
+
                                                // Yes we do, so we notify admin and sender about fully sent mail!
                                                // Yes we do, so we notify admin and sender about fully sent mail!
-                                               SEND_ADMIN_NOTIFICATION(ADMIN_SUBJ_SEND_DONE, "done-admin", $DATA[3], $uid);
+                                               SEND_ADMIN_NOTIFICATION(ADMIN_SUBJ_SEND_DONE, "done-admin", $content, $uid);
 
                                                // Get sender's data
                                                $result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                                 array(bigintval($DATA[1])), __FILE__, __LINE__);
 
                                                // Get sender's data
                                                $result_sender = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                                 array(bigintval($DATA[1])), __FILE__, __LINE__);
-                                               if (SQL_NUMROWS($result_sender) == 1)
-                                               {
+                                               if (SQL_NUMROWS($result_sender) == 1) {
                                                        // Load data and prepare mail
                                                        list($sname, $fname, $email) = SQL_FETCHROW($result_sender);
                                                        SQL_FREERESULT($result_sender);
                                                        // Load data and prepare mail
                                                        list($sname, $fname, $email) = SQL_FETCHROW($result_sender);
                                                        SQL_FREERESULT($result_sender);
-                                                       $msg = LOAD_EMAIL_TEMPLATE("done-member", $DATA[3], $DATA[1]);
+
+                                                       // Load email template
+                                                       $msg = LOAD_EMAIL_TEMPLATE("done-member", $content, $DATA[1]);
 
                                                        // Send it also waway
                                                        SEND_EMAIL($email, MEMBER_SUBJ_SEND_DONE, $msg);
 
                                                        // Send it also waway
                                                        SEND_EMAIL($email, MEMBER_SUBJ_SEND_DONE, $msg);
@@ -202,13 +222,13 @@ if (SQL_NUMROWS($result_main) > 0)
 
                                                // Set status to SEND because we completely send it away
                                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
 
                                                // Set status to SEND because we completely send it away
                                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
-                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
                                                // Update send-completed-time
                                                $result_user = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_stats SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",
 
                                                // Update send-completed-time
                                                $result_user = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_stats SET timestamp_send=UNIX_TIMESTAMP() WHERE pool_id=%s LIMIT 1",
-                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
 
-                                               $LAST_SENT_ID = $DATA[0]; $cnt = 0;
+                                               $LAST_SENT_ID = $DATA['id']; $cnt = 0;
                                                $cnt2 += $cnt;
 
                                                // Update mediadata if version is 0.0.4 or higher
                                                $cnt2 += $cnt;
 
                                                // Update mediadata if version is 0.0.4 or higher
@@ -229,7 +249,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                                $ADD = "";
                                                if ($cnt <= $DATA[8]) $ADD = ", target_send=target_send-".$cnt;
                                                $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1",
                                                $ADD = "";
                                                if ($cnt <= $DATA[8]) $ADD = ", target_send=target_send-".$cnt;
                                                $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='NEW', receivers='%s'".$ADD." WHERE id=%s LIMIT 1",
-                                                array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+                                                array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                break;
 
                                                //* DEBUG: */ echo"*EXIT/L:".__LINE__."*<br />";
                                                break;
@@ -242,7 +262,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // List was empty
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND' WHERE id=%s LIMIT 1",
                                        {
                                                // List was empty
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND' WHERE id=%s LIMIT 1",
-                                                array(bigintval($DATA[0])), __FILE__, __LINE__);
+                                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                        }
                                         else
                                        {
                                        }
                                         else
                                        {
@@ -271,40 +291,39 @@ if (SQL_NUMROWS($result_main) > 0)
 
                                        // Update receivers
                                        $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET receivers='%s' WHERE id=%s LIMIT 1",
 
                                        // Update receivers
                                        $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET receivers='%s' WHERE id=%s LIMIT 1",
-                                        array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+                                        array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                }
                        }
                }
        }
                                }
                        }
                }
        }
-       if ((sizeof($points_BACK) > 0) && (!empty($points_BACK[0])))
-       {
-               foreach ($points_BACK as $uid => $PB)
-               {
+       if ((sizeof($points_BACK) > 0) && (!empty($points_BACK[0]))) {
+               foreach ($points_BACK as $uid => $PB) {
                        // Add points only when we have points left to add and a valid user ID
                        // Add points only when we have points left to add and a valid user ID
-                       if (($PB > 0) && ($uid > 0))
-                       {
+                       if (($PB > 0) && ($uid > 0)) {
+                               // Prepare content
+                               $content = array(
+                                       'points' => TRANSLATE_COMMA($DATA[10])
+                               );
+
                                // We have to pay back some points to the sender (we add them directly :-P)
                                $result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
                                // We have to pay back some points to the sender (we add them directly :-P)
                                $result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
-                                array(bigintval($uid)), __FILE__, __LINE__);
+                                       array(bigintval($uid)), __FILE__, __LINE__);
                                $DATA[10] = $PB; $DATA[11] = $cnt_back[$uid];
                                $DATA[10] = $PB; $DATA[11] = $cnt_back[$uid];
-                               if (SQL_NUMROWS($result) == 1)
-                               {
+                               if (SQL_NUMROWS($result) == 1) {
                                        list($email) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
 
                                        // User account does exists, so we can safely pay back!
                                        list($email) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
 
                                        // User account does exists, so we can safely pay back!
-                                       $msg = LOAD_EMAIL_TEMPLATE("back-member", "", bigintval($uid));
+                                       $msg = LOAD_EMAIL_TEMPLATE("back-member", $content, bigintval($uid));
 
                                        // Send mail out to member
                                        SEND_EMAIL($email, MEMBER_BACK_JACKPOT." (".$uid.")", $msg);
 
                                        // Send mail out to member
                                        SEND_EMAIL($email, MEMBER_BACK_JACKPOT." (".$uid.")", $msg);
-                               }
-                                else
-                               {
+                               } else {
                                        // Add to jackpot
                                        ADD_JACKPOT($PB);
 
                                        // Send mail out to admin
                                        // Add to jackpot
                                        ADD_JACKPOT($PB);
 
                                        // Send mail out to admin
-                                       SEND_ADMIN_NOTIFICATION(ADMIN_BACK_JACKPOT." (".$uid.")", "back-admin", "", "admin");
+                                       SEND_ADMIN_NOTIFICATION(ADMIN_BACK_JACKPOT." (".$uid.")", "back-admin", $content, "admin");
                                }
                        }
                }
                                }
                        }
                }
@@ -318,43 +337,33 @@ SQL_FREERESULT($result_main);
 if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
 {
        // Do we need to send out bonus mails?
 if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
 {
        // Do we need to send out bonus mails?
-       if ($HTML_EXT)
-       {
+       if ($HTML_EXT) {
                //                                 0     1       2        3        4      5       6          7       8      9         10         11
                $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, html_msg FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
                //                                 0     1       2        3        4      5       6          7       8      9         10         11
                $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, html_msg FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
-       }
-        else
-       {
-               //                                 0     1       2        3        4      5       6          7       8      9         10      11
-               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send, 'N' FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
+       } else {
+               //                                 0     1       2        3        4      5       6          7       8      9         10
+               $result_bonus = SQL_QUERY("SELECT id, subject, text, receivers, points, time, data_type, timestamp, url, cat_id, target_send FROM "._MYSQL_PREFIX."_bonus WHERE data_type='NEW' ORDER BY timestamp DESC", __FILE__, __LINE__);
        }
 
        }
 
-       if (SQL_NUMROWS($result_bonus) > 0)
-       {
+       if (SQL_NUMROWS($result_bonus) > 0) {
                // Send these mails away...
                $cnt2 = "";
                // Send these mails away...
                $cnt2 = "";
-               while ($DATA = SQL_FETCHROW($result_bonus))
-               {
+               while ($DATA = SQL_FETCHARRAY($result_bonus)) {
                        // Compile URL
                        // Compile URL
-                       $DATA[8] = COMPILE_CODE($DATA[8]);
+                       $DATA['url'] = COMPILE_CODE($DATA['url']);
 
                        // Message is active in queue
                        $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='QUEUE' WHERE id=%s LIMIT 1",
 
                        // Message is active in queue
                        $result_queue = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='QUEUE' WHERE id=%s LIMIT 1",
-                        array(bigintval($DATA[0])), __FILE__, __LINE__);
+                        array(bigintval($DATA['id'])), __FILE__, __LINE__);
 
                        // "Explode" all receivers into an array
 
                        // "Explode" all receivers into an array
-                       if (ereg(";", $DATA[3]))
-                       {
+                       if (ereg(";", $DATA['receivers'])) {
                                // There's more than one receiver in the list...
                                // There's more than one receiver in the list...
-                               $RECEIVERS = explode(";", $DATA[3]);
-                       }
-                        elseif (!empty($DATA[4]))
-                       {
+                               $RECEIVERS = explode(";", $DATA['receivers']);
+                       } elseif (!empty($DATA['points'])) {
                                // Only one user left
                                // Only one user left
-                               $RECEIVERS = array($DATA[3]);
-                       }
-                        else
-                       {
+                               $RECEIVERS = array($DATA['receivers']);
+                       } else {
                                // No users left
                                $RECEIVERS = array("0");
                        }
                                // No users left
                                $RECEIVERS = array("0");
                        }
@@ -362,8 +371,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
 
                        // Now, if we are good little boys and girls Santa left us some user-ids.
                        // We can now send mails to them...
 
                        // Now, if we are good little boys and girls Santa left us some user-ids.
                        // We can now send mails to them...
-                       foreach ($RECEIVERS as $key => $uid)
-                       {
+                       foreach ($RECEIVERS as $key => $uid) {
                                // Load personal data
                                //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
                                $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                // Load personal data
                                //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*<br />";
                                $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
@@ -377,13 +385,34 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
                                        //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
                                        //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
-                                       if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA[0], $DATA[0], true) == "done")
+                                       if (REMOVE_RECEIVER($dummy, $key, $uid, $DATA['id'], $DATA['id'], true) == "done")
                                        {
                                        {
+                                               // Replace text variables
+                                               foreach ($REPLACER as $key => $value) {
+                                                       if (isset($DATA[$key])) $DATA['text'] = str_replace($value, $DATA[$key], $DATA['text']);
+                                               } // END - foreach
+
+                                               // Prepare content
+                                               $content = array(
+                                                       'id'       => $DATA['id'],
+                                                       'url'      => $DATA['url'],
+                                                       'time'     => CREATE_FANCY_TIME($DATA['time']),
+                                                       'points'   => TRANSLATE_COMMA($DATA['points']),
+                                                       'category' => GET_CATEGORY($DATA['cat_id']),
+                                                       'text'     => $DATA['text']
+                                               );
+
                                                // Prepare the mail
                                                // Prepare the mail
-                                               $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $DATA[2], $uid);
+                                               $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid);
 
                                                // Send mail away
 
                                                // Send mail away
-                                               SEND_EMAIL($email, $DATA[1], $msg, $DATA[11]);
+                                               if (isset($DATA['html_msg'])) {
+                                                       // Send HTML?
+                                                       SEND_EMAIL($email, $DATA['subject'], $msg, $DATA['html_msg']);
+                                               } else {
+                                                       // No HTML mail!
+                                                       SEND_EMAIL($email, $DATA['subject'], $msg);
+                                               }
 
                                                // Count one up and remove entry from dummy array
                                                $cnt++; unset($dummy[$key]);
 
                                                // Count one up and remove entry from dummy array
                                                $cnt++; unset($dummy[$key]);
@@ -425,7 +454,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
                        {
                                // Queue reached!
                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
                        {
                                // Queue reached!
                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='SEND', target_send='0', receivers='' WHERE id=%s LIMIT 1",
-                                array(bigintval($DATA[0])), __FILE__, __LINE__);
+                                array(bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
                                //* DEBUG: */ echo "*L:".__LINE__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
@@ -440,7 +469,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
                        {
                                // Update bonus pool
                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
                        {
                                // Update bonus pool
                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
-                                array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+                                array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<PRE>";
                                //* DEBUG: */ print_r($dummy);
                                //* DEBUG: */ echo "</PRE>\n!!!<br />";
                                //* DEBUG: */ echo "*L:".__LINE__."<PRE>";
                                //* DEBUG: */ print_r($dummy);
                                //* DEBUG: */ echo "</PRE>\n!!!<br />";
index 565b24cbfcc0224238313f992d319d835989e6f3..17f56d3d866d49272e6024794423638af54455a4 100644 (file)
@@ -46,7 +46,7 @@ if (($_CONFIG['send_prof_update'] == "Y") && ($_CONFIG['profile_update'] > 0) &&
        $TIMEOUT2 = bigintval(time() - $_CONFIG['resend_profile_update']);
 
        // Load personal data              0      1     2      3        4          5         6
        $TIMEOUT2 = bigintval(time() - $_CONFIG['resend_profile_update']);
 
        // Load personal data              0      1     2      3        4          5         6
-       $result = SQL_QUERY_ESC("SELECT userid, email, sex, surname, family, last_update, joined
+       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, last_update, joined
  FROM "._MYSQL_PREFIX."_user_data
  WHERE (last_update < %s AND last_update != '0' AND last_profile_sent < %s) OR (last_update='0' AND last_profile_sent='0' AND joined < %s)
  ORDER BY userid", array($TIMEOUT, $TIMEOUT2, $TIMEOUT), __FILE__, __LINE__);
  FROM "._MYSQL_PREFIX."_user_data
  WHERE (last_update < %s AND last_update != '0' AND last_profile_sent < %s) OR (last_update='0' AND last_profile_sent='0' AND joined < %s)
  ORDER BY userid", array($TIMEOUT, $TIMEOUT2, $TIMEOUT), __FILE__, __LINE__);
index 4fc1f609b7aec78e3bac3e6d90c00ae232246136..cbcca3921bc2e4d83cb12e31cf30eb248befc42a 100644 (file)
@@ -194,7 +194,7 @@ CREATE TABLE `mxchange_user_data` (
   `last_module` VARCHAR(20) NOT NULL DEFAULT '',\r
   `ref_clicks` BIGINT(20) NOT NULL DEFAULT '0',\r
   `total_logins` BIGINT(20) NOT NULL DEFAULT '0',\r
   `last_module` VARCHAR(20) NOT NULL DEFAULT '',\r
   `ref_clicks` BIGINT(20) NOT NULL DEFAULT '0',\r
   `total_logins` BIGINT(20) NOT NULL DEFAULT '0',\r
-  `sex` ENUM('M','F') NOT NULL DEFAULT 'M',\r
+  `gender` ENUM('M','F') NOT NULL DEFAULT 'M',\r
   `used_points` DOUBLE(22,3) NOT NULL DEFAULT '0.000',\r
   `emails_sent` BIGINT(20) NOT NULL DEFAULT '0',\r
   PRIMARY KEY  (`userid`)\r
   `used_points` DOUBLE(22,3) NOT NULL DEFAULT '0.000',\r
   `emails_sent` BIGINT(20) NOT NULL DEFAULT '0',\r
   PRIMARY KEY  (`userid`)\r
index 027898174b21f05a2f4dc0a3b4f71f54419d7ef5..97f943890e53dc2699f34a4b03a805d07015891e 100644 (file)
@@ -114,10 +114,10 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                                SQL_FREERESULT($result);
 
                                // Is the user's ID unlocked?
                                SQL_FREERESULT($result);
 
                                // Is the user's ID unlocked?
-                               $result = SQL_QUERY_ESC("SELECT status, sex, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
                                 array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1) {
-                                       list($status, $sex, $sname, $fname) = SQL_FETCHROW($result);
+                                       list($status, $gender, $sname, $fname) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
                                        if ($status == "CONFIRMED") {
                                                // User has confirmed his account so we can procede...
                                        SQL_FREERESULT($result);
                                        if ($status == "CONFIRMED") {
                                                // User has confirmed his account so we can procede...
index 6810f06aa3640aa10abcb69b18a1e0aed6e39249..0c54c6fc9bf20312f3244cb02962932e897da64e 100644 (file)
@@ -109,12 +109,12 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                                if ($ltype == "BONUS") $sender = 0;
 
                                // Is the user's ID unlocked?
                                if ($ltype == "BONUS") $sender = 0;
 
                                // Is the user's ID unlocked?
-                               $result = SQL_QUERY_ESC("SELECT status, sex, surname, family, ref_payout FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
+                               $result = SQL_QUERY_ESC("SELECT status, gender, surname, family, ref_payout FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                                 array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1)
                                {
                                        // Load data
                                 array($url_uid), __FILE__, __LINE__);
                                if (SQL_NUMROWS($result) == 1)
                                {
                                        // Load data
-                                       list($status, $sex, $sname, $fname, $ref_pay) = SQL_FETCHROW($result);
+                                       list($status, $gender, $sname, $fname, $ref_pay) = SQL_FETCHROW($result);
                                        SQL_FREERESULT($result);
 
                                        if ($status == "CONFIRMED")
                                        SQL_FREERESULT($result);
 
                                        if ($status == "CONFIRMED")
index 861d8ca78fe71c2237aa50ce1236fc2a6ebb184c..6ac941f49fd1da50b97a583c7b1cf4ef9ee209bc 100644 (file)
@@ -68,7 +68,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
                if (!empty($t))
                {
                        // Check for data
                if (!empty($t))
                {
                        // Check for data
-                       $result = SQL_QUERY_ESC("SELECT DISTINCT d.sex, d.surname, d.family, b.level, b.points
+                       $result = SQL_QUERY_ESC("SELECT DISTINCT d.gender, d.surname, d.family, b.level, b.points
 FROM "._MYSQL_PREFIX."_user_data AS d
 RIGHT JOIN "._MYSQL_PREFIX."_bonus_turbo AS b
 ON d.userid=b.userid
 FROM "._MYSQL_PREFIX."_user_data AS d
 RIGHT JOIN "._MYSQL_PREFIX."_bonus_turbo AS b
 ON d.userid=b.userid
@@ -77,10 +77,10 @@ WHERE d.status='CONFIRMED' AND d.userid=%s AND b.".$t."='%s' LIMIT 1",
                        if (SQL_NUMROWS($result) == 1)
                        {
                                // Load data
                        if (SQL_NUMROWS($result) == 1)
                        {
                                // Load data
-                               list($sex, $sname, $fname, $level, $points) = SQL_FETCHROW($result);
+                               list($gender, $sname, $fname, $level, $points) = SQL_FETCHROW($result);
 
                                // Prepare constants for the pre-template
 
                                // Prepare constants for the pre-template
-                               define('__SALUT'    , TRANSLATE_SEX($sex));
+                               define('__GENDER'    , TRANSLATE_GENDER($gender));
                                define('__SNAME'    , $sname);
                                define('__FNAME'    , $fname);
                                define('__RANK'     , $level);
                                define('__SNAME'    , $sname);
                                define('__FNAME'    , $fname);
                                define('__RANK'     , $level);
index 1fcfb550dc70d183e9bc712622144c5e2f27200a..1dd2bd056a058f430e6767f7a46afbfbe14c2eb8 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat Ihnen soeben {!__POINTS_VALUE!} {!POINTS!} gutgeschrieben!
 
 
 Einer unserer Administratoren hat Ihnen soeben {!__POINTS_VALUE!} {!POINTS!} gutgeschrieben!
 
index 6a5e4e5729aca9cb1502f2428e7795b7c99854d5..f70b75f1c51c2dacc9442b1a42a97e57b237288e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre unbestaetigten Mails geloescht!
 
 
 Einer unserer Administratoren hat soeben Ihre unbestaetigten Mails geloescht!
 
index dee7db41b36815889c2dea9ed47cb18fe7e392b0..58c73e1a3f8cf724f4047d49aebc4aee3f2a435a 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben seinen Urlaub beendet!
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 8ad3d9684e68877638725f2653276ef5efcbf340..72a5d68a2cb4fd1939fefd49a4c84538d3e7337b 100644 (file)
@@ -5,17 +5,17 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben Urlaub beantragt!
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
-Anfang des Urlaubes: {--_START_DAY--}. {--_START_MONTH--} {--_START_YEAR--}
+Anfang des Urlaubes: {!_START_DAY!}.{!_START_MONTH!}.{!_START_YEAR!}
 ------------------------------
 ------------------------------
-Ende des Urlaubes: {--_END_DAY--}. {--_END_MONTH--} {--_END_YEAR--}
+Ende des Urlaubes: {!_END_DAY!}.{!_END_MONTH!}.{!_END_YEAR!}
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index 26bdd4f998f35b539c07d4239f540e52f650eb25..1d83a10929a6073fcf0135bc321950f7ca78e897 100644 (file)
@@ -5,7 +5,7 @@
 ------------------------------------------
 {--MEMBER_UID--}: $UID
 ------------------------------------------
 ------------------------------------------
 {--MEMBER_UID--}: $UID
 ------------------------------------------
-{--SEX--}: $DATA[0]
+{--GENDER--}: $DATA[0]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
index 211fa878b5c43990dd9237d0cb495664d93e2215..1108a46c98427e3b8b81aa0afbe63b18c42e11e6 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben die Abbestellung Ihres Newsletters
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 20b95903afe490f4b933c113d95284d345df3423..b35bd4105c2edb46a66d24f315e54a40cd049ef9 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} wurde zum Newsletterempfang wieder freigegebe
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Die Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 4cc51d2acf98bd0fd1fbf9e21c690029e412b86d..db66acde3c521f59f55ca3c46c1c1f8098859f49 100644 (file)
@@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
 ------------------------------
 Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
index 62c96d71dab977aff0d6f64bc01fceb87ede24f1..a6ea5e8feebe9cf35030909e4a074fb70c4f4d9f 100644 (file)
@@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
 ------------------------------
 Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
index e11cf06630168d4965cf57965858946cc3179f6d..1ed92276e454e8c8d6d0820cb207c4ec979d9446 100644 (file)
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
-{--GUEST_SEX--}: $DATA[salut] ($content[salut])
+{--GUEST_GENDER--}: $DATA[gender] ($content[gender])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
index d245f66c12c65ea9fb324e380059a5c6d0067252..b1903a3d0091c909d42663d261823150b8905f07 100644 (file)
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
-{--GUEST_SEX--}: $DATA[salut] ($content[salut])
+{--GUEST_GENDER--}: $DATA[gender] ($content[gender])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
index 7eae163a38bc33f23e4f1052fd3fb3097cbe6c73..fbe2800211f7f0ea76813addcfc79c64c375b3fa 100644 (file)
@@ -1,7 +1,7 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 
 ------------------------------
-Ihre Sponsor-ID lautet: {--__SPONSOR_ID--}
+Ihre Sponsor-ID lautet: {!__SPONSOR_ID!}
 ------------------------------
 
 Einer unserer Administratoren hat soeben Ihren Sponsorenaccount geaendert.
 ------------------------------
 
 Einer unserer Administratoren hat soeben Ihren Sponsorenaccount geaendert.
@@ -12,7 +12,7 @@ Es sind nun folgende Daten gesetzt:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $content[position]
 {--SPONSOR_ENTER_TAX_IDENT--}: $content[tax_ident]
 ------------------------------
-{--GUEST_SEX--}: $content[salut]
+{--GUEST_GENDER--}: $content[gender]
 {--SURNAME_FAMILY--}: $content[surname] $content[family]
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]
 {--SURNAME_FAMILY--}: $content[surname] $content[family]
 {--SPONSOR_EMAIL_STREET_NR1--}: $content[street_nr1]
 {--SPONSOR_EMAIL_STREET_NR2--}: $content[street_nr2]
index 57276be076a03753c1090f4fd4781f8bcb58ff29..3651244b937291be09b7dd68249401d75524efb9 100644 (file)
@@ -12,7 +12,7 @@ Ihre Sponsor-ID lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
index 6f90d4ccccc4423ce9e183364081a6988001eb54..efe4f6721dac1e475167d708a55ecd1e6eed7a43 100644 (file)
@@ -5,21 +5,21 @@ als naechstes seine EMail-Adresse bestaetigen.
 
 Folgende Daten wurden dabei uebermittelt:
 ------------------------------
 
 Folgende Daten wurden dabei uebermittelt:
 ------------------------------
-Sponsor-ID: {--__ID--}
+Sponsor-ID: {!__ID!}
 ------------------------------
 Verwendeter Browser: $HTTP_USER_AGENT
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 Verwendeter Browser: $HTTP_USER_AGENT
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
-Hash-Wert: {--__HASH--}
+Hash-Wert: {!__HASH!}
 ------------------------------
 ------------------------------
-Angemeldet am: {--__TIMESTAMP--}
+Angemeldet am: {!__TIMESTAMP!}
 ------------------------------
 ------------------------------
-Anrede: {--__SALUT--}
+Anrede: {!__GENDER!}
 ------------------------------
 ------------------------------
-Vorname: {--__SURNAME--}
+Vorname: {!__SURNAME!}
 ------------------------------
 ------------------------------
-Nachname: {--__FAMILY--}
+Nachname: {!__FAMILY!}
 ------------------------------
 
 Die restliche Daten koennen Sie im Admin-Bereich einsehen.
 ------------------------------
 
 Die restliche Daten koennen Sie im Admin-Bereich einsehen.
index d05a9cbc2fe0ab7a771a7bac29f90fc7adadd61b..b604a534cec9c7dd1e3d620fe4f3b783e7a9b03a 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem Mailtausch hat soeben das Support-Formular ausgefuellt un
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index f5efabbf484001d41a334e018bb23f1b61823e65..0f53880069cfbd53335e7e63a0f168bcbd40af27 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 0331bfbd3d7fa70bd3d15cb4e57e142ec44b50bd..1b03928c53a5b7595092aa95718087bdfec79761 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 28df1c92f269d682db383ae0e0a3759f934c84fc..b9126e149e067fb7deb97d4b42ac59b53d008042 100644 (file)
@@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
 ------------------------------
 Seine Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
index 45c54ccf81d5cc44b4ba8f2e9cd27b1b84cd714d..0ac0204f6ec0c9406872a5c10622ad67de92aac0 100644 (file)
@@ -7,13 +7,13 @@ Hier alle Infos zum Transfer:
 --  Daten des Empfaengers:  --
 ------------------------------
 Mitglieder-ID: {!__RECIPIENT_UID!}
 --  Daten des Empfaengers:  --
 ------------------------------
 Mitglieder-ID: {!__RECIPIENT_UID!}
-Vollst. Name: {!__RECIPIENT_SEX!} {!__RECIPIENT_SNAME!} {!__RECIPIENT_FNAME!}
+Vollst. Name: {!__RECIPIENT_GENDER!} {!__RECIPIENT_SNAME!} {!__RECIPIENT_FNAME!}
 Email-Adresse: {!__RECIPIENT_EMAIL!}
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
 Mitglieder-ID: {!__SENDER_UID!}
 Email-Adresse: {!__RECIPIENT_EMAIL!}
 ------------------------------
 --   Daten des Absenders:   --
 ------------------------------
 Mitglieder-ID: {!__SENDER_UID!}
-Vollst. Name: {!__SENDER_SEX!} {!__SENDER_SNAME!} {!__SENDER_FNAME!}
+Vollst. Name: {!__SENDER_GENDER!} {!__SENDER_SNAME!} {!__SENDER_FNAME!}
 Email-Adresse: {!__SENDER_EMAIL!}
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 Email-Adresse: {!__SENDER_EMAIL!}
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
index 91c741e653b7d42527418d54d1b87cef24519786..536724eb7bc3b364c441a82a370f9ef0702c2a3f 100644 (file)
@@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
 ------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
 ------------------------------
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
index 66e96a244106754bfa98cdd4999f6c610ba3af61..7a36778d7a27ac06064cb9835492cac60df71f9a 100644 (file)
@@ -1,6 +1,6 @@
 {--HELLO_ADMIN--},
 
 {--HELLO_ADMIN--},
 
-soeben wurden in Ihrem {!MT_WORD!} $content {!POINTS!} aus nicht versendeten Mails in den Jackpot getan!
+soeben wurden in Ihrem {!MT_WORD!} $content[points] {!POINTS!} aus nicht versendeten Mails in den Jackpot getan!
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Script
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Script
index d88599d54eb681fbe10e04054748b8928b053b61..5d0194ef6357cddf3237fa43ddea7df799798740 100644 (file)
@@ -1,6 +1,6 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 
-Eine Buchung von Ihnen konnte nich vollstaendig ausgesendet werden. Wir haben Ihnen $points {!POINTS!} wieder gutgeschrieben!
+Eine Buchung von Ihnen konnte nich vollstaendig ausgesendet werden. Wir haben Ihnen $content[points] {!POINTS!} wieder gutgeschrieben!
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
index 9e5b3414aaf16320c5a32e6692ef6921e38a9d76..673bbefed4d282606d743009d24f958ea81d4b44 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index f89f06454a8aa790276ff75a02924af1d1aa813d..ef0aed69a8b03aa46732ca4a5567e012758f339e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index a0c889f9fd0bc3c56ebf2973bfc95861ca63a640..b009cbe7a233dce7743c4c10c41eda21e55b07bf 100644 (file)
@@ -1,26 +1,26 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Hier kommt eine Bonus-Mail von uns zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
 
 Hier kommt eine Bonus-Mail von uns zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$content
+$content[text]
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
-Verfallszeit: $EXPIRATION
+Verfallszeit: $content[expiration]
 ----------------
 ----------------
-Verguetung: $points {!POINTS!}
+Verguetung: $content[points] {!POINTS!}
 ----------------
 ----------------
-Bestaetigungszeit: $TIME Sekunden
+Bestaetigungszeit: $content[time]
 ----------------
 ----------------
-Beworbene Kategorie: $CATEGORY
+Beworbene Kategorie: $content[category]
 ----------------
 ----------------
-Beworbene URL: $TARGET_URL
+Beworbene URL: $content[url]
 ----------------
 Hinweis: Angesammelte {!POINTS!} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
 ----------------
 Hinweis: Angesammelte {!POINTS!} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
-Um Ihre {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{!URL!}/mailid.php?uid=$UID&bonusid=$BONUSID
+Um Ihre $content[points] {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
+{!URL!}/mailid.php?uid=$UID&bonusid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
index a4cf9ea70c68118ca222937083ebe19334e381de..99ba18dfb70e579df39dc501c2c9a05572895fa1 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index dfb3dfa38c030cf6276e68ad1bd9590274c81723..fd1d6538c9a564655a003cecbc668db325f2506a 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 6e5053335c24fc96fe11f73c482a00aa9f3586a4..a6145704c8a8f3ae0ffab15b0e3d247480153c23 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben Ihre Email-Adresse best&auml;tigt und sind somit f&uuml;r den {!MT_WORD!} {!MAIN_TITLE!} freigeschaltet!
 
 
 Sie haben soeben Ihre Email-Adresse best&auml;tigt und sind somit f&uuml;r den {!MT_WORD!} {!MAIN_TITLE!} freigeschaltet!
 
@@ -7,7 +7,7 @@ Sie k&ouml;nnen sich nun hier einloggen:
 Ihre Login-ID lautet: $UID
 URL zum Login: {!URL!}/login.php
 
 Ihre Login-ID lautet: $UID
 URL zum Login: {!URL!}/login.php
 
-f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $points {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
+f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $content[points] {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
 
 Wir w&uuml;nschen Ihnen viel Spass und Erfolg beim Mail-Versand!
 
 
 Wir w&uuml;nschen Ihnen viel Spass und Erfolg beim Mail-Versand!
 
index f858e293a7727d887b0b876429d19a31796f6ba7..cc4c79b8786c25afb054088b432b92664975654e 100644 (file)
@@ -1,12 +1,12 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben heute ein neues Mitglied f&uuml;r unseren {!MT_WORD!} geworben!
 
 Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:
 -----------------
 
 Sie haben heute ein neues Mitglied f&uuml;r unseren {!MT_WORD!} geworben!
 
 Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:
 -----------------
-Referral-Ebene ($PERCENT%): $LEVEL
-{!POINTS!}: $points
-ID des Mitgliedes: $REFID
+Referral-Ebene ($content[percent]%): $content[level]
+{!POINTS!}: $content[points]
+ID des Mitgliedes: $content[refid]
 -----------------
 
 Sie werden nun auch weiterhin {!POINTS!} &uuml;ber diese geworbene Person erhalten.
 -----------------
 
 Sie werden nun auch weiterhin {!POINTS!} &uuml;ber diese geworbene Person erhalten.
index 8a476f84d7714be525ff4a7b9927533d493f74a8..4bc5a3344a0babd1108c2d967ce65c75528134bd 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
index 328c2a4fdb21c69ca6fe4d18787380773fcf308e..16eec4bd1f563d2e4aef464639c9263ece3539d8 100644 (file)
@@ -1,4 +1,4 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
index de89e28a40e1f68c91043c33df21b79568a43087..6eee5df155b4b077cbbf7cd53ae9bd5b9a7b4bd2 100644 (file)
@@ -3,17 +3,17 @@
 Eine gebuchte Mail wurde soeben vollstaendig ausgesendet. Das werbende Mitglied wurde darueber in Kenntnis gesetzt.
 
 - - - - -  Werbetext-Anfang:  - - - - -
 Eine gebuchte Mail wurde soeben vollstaendig ausgesendet. Das werbende Mitglied wurde darueber in Kenntnis gesetzt.
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$content
+$content[text]
 - - - - -  Werbetext-Ende:   - - - - -
 
 ------------------------------
 - - - - -  Werbetext-Ende:   - - - - -
 
 ------------------------------
-Werber: $SEND_UID
+Werber: $content[sender_uid]
 ------------------------------
 ------------------------------
-Verfallszeit: $EXPIRATION
+Verfallszeit: $content[expiration]
 ------------------------------
 ------------------------------
-Beworbene Kategorie: $CATEGORY
+Beworbene Kategorie: $content[category]
 ------------------------------
 ------------------------------
-Beworbene URL: $TARGET_URL
+Beworbene URL: $content[url]
 ------------------------------
 
 Sollte diese Buchung nicht Ihren AGBs entsprechen, loggen Sie sich bitte in den Admin-Bereich ein und aendern die Mail.
 ------------------------------
 
 Sollte diese Buchung nicht Ihren AGBs entsprechen, loggen Sie sich bitte in den Admin-Bereich ein und aendern die Mail.
index 67dbdc7a10f91e6b57ebe7ff874e2d980132be86..fcad688338cab79297afe31a9293ec69beb22bd1 100644 (file)
@@ -1,19 +1,19 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihre gebuchte Mail wurde soeben vollstaendig von unserem System versendet! Wir wuenschen Ihnen viel Erfolg mit Ihrer Werbebuchung!
 
 - - - - -  Werbetext-Anfang:  - - - - -
 
 Ihre gebuchte Mail wurde soeben vollstaendig von unserem System versendet! Wir wuenschen Ihnen viel Erfolg mit Ihrer Werbebuchung!
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$content
+$content[text]
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
-Werber: $SEND_UID
+Werber: $content[sender_uid]
 ----------------
 ----------------
-Verfallszeit: $EXPIRATION
+Verfallszeit: $content[expiration]
 ----------------
 ----------------
-Beworbene Kategorie: $CATEGORY
+Beworbene Kategorie: $content[category]
 ----------------
 ----------------
-Beworbene URL: $TARGET_URL
+Beworbene URL: $content[url]
 ----------------
 
 Den weiteren Verlauf dieser Werbebuchung koennen Sie im Mitgliedsbereich unter Statistiken verfolgen!
 ----------------
 
 Den weiteren Verlauf dieser Werbebuchung koennen Sie im Mitgliedsbereich unter Statistiken verfolgen!
index ede6de54ac309a8796b4ce1ea6d61f89fd6e4ab5..f35c30ed3603a0a9ae40cdf7b6f7e89332d78df2 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten sich zu unserem {!MT_WORD!} {!MAIN_TITLE!} angemeldet und heute Ihren Best&auml;tigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse best&auml;tigt. Diesen Schritt koennen Sie jetzt nachholen, damit Sie sich einloggen koennen.
 
 Hier ist Ihr Best&auml;tigungslink:
 
 Sie hatten sich zu unserem {!MT_WORD!} {!MAIN_TITLE!} angemeldet und heute Ihren Best&auml;tigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse best&auml;tigt. Diesen Schritt koennen Sie jetzt nachholen, damit Sie sich einloggen koennen.
 
 Hier ist Ihr Best&auml;tigungslink:
-{!URL!}/confirm.php?hash=$HASH
+{!URL!}/confirm.php?hash=$content[hash]
 
 Vielen Dank.
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
 
 Vielen Dank.
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
 
-{!URL!} ({!WEBMASTER!})
\ No newline at end of file
+{!URL!} ({!WEBMASTER!})
index e04f0738eb598d8caf3dd591707198aa54af4edf..98b6914750cdd2f4aa1c353d28c3d3ca1856e14b 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
 
 --------------
 Ihre User-ID bei uns: $UID
index 9b8219a54601cc2bd8472786f245293c92cb824f..ec07d5c7475a682b0c4ffab47d2a657883cdd1b8 100644 (file)
@@ -1,10 +1,10 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 --------------------------
 Ihre Sponsor-ID bei uns: $UID
 --------------------------
 
 
 --------------------------
 Ihre Sponsor-ID bei uns: $UID
 --------------------------
 
-{--__EMAIL_MSG--}
+{!__EMAIL_MSG!}
 
 Grund der Sperrung war:
 --------------------------
 
 Grund der Sperrung war:
 --------------------------
index 26991f542098a20d7fae8c8f913855835b89675f..e5adfae39dae98203e0ee13a0cda75bc3719a3fd 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 9e7c4510b7bd31934ef99b2b7d7badb63965da01..011456be03b9cd60c6deb6b0f20a3018cb158cb8 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der automatischen Loeschung von Bestaetigungslinks wurden Ihnen $content {!POINTS!} wieder gutgeschrieben!
 
 
 Bei der automatischen Loeschung von Bestaetigungslinks wurden Ihnen $content {!POINTS!} wieder gutgeschrieben!
 
index 8d1019e4911c6af646ac25f6971f1921d1dadcb8..8bdf73e06933bb03de205b96e590d7cea6453811 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
 
 Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
index 4eb486903fcb996d05dc7dbfd8aac6a08ce89f21..82d419f99b1eb5a6f41a509bcade3eb0feea57e1 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content. Geburtstag!
 
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content. Geburtstag!
 
index ac9b6296c8a96ca1fe3197281b05d7ccb0b4f7a6..c6aaef023ceba0e2a29b3f4ef3ee7f333ffb8961 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
index 33ec6990170faf4b83e4e7e5a5aad72f5259a858..76af1e22fbc43f6822224b2f3b442cb2a2a0ad63 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
 
 Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
index ed708a79abd5ae6c7400a322567cdd38631c2d36..a2b4c3e35d2e6984059522124244a674e80f95cb 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir haben Ihnen soeben $content[points] {!POINTS!} durch eine Verdoppelung vom $content[when] Ihrem Account gutgeschrieben!
 
 
 Wir haben Ihnen soeben $content[points] {!POINTS!} durch eine Verdoppelung vom $content[when] Ihrem Account gutgeschrieben!
 
index 5caae8553833956c13a11456f27f5f68003b3358..81d61dcd80b4297b1e1cfc00ddff54fbd98b9d8c 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 Zeitpunkt Ihrer Beantragung: $content[activated] Uhr
 ------------------------------
 ------------------------------
 Zeitpunkt Ihrer Beantragung: $content[activated] Uhr
 ------------------------------
index e0053a32a9ce287c6f25fe11ea5394d5838e255a..64e7cb214d53ae1a427d75fd60f569ede02d9743 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 Anfang Ihres Urlaubes: $content[start]
 ------------------------------
 ------------------------------
 Anfang Ihres Urlaubes: $content[start]
 ------------------------------
index b71a3a46c7a302bc12359b2e3599741e34a1eb15..e5ae30746c4188a6fb32e7b6d2878d94a206b923 100644 (file)
@@ -1,17 +1,17 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 ------------------------------
-Anfang Ihres Urlaubes: {--_START_DAY--}. {--_START_MONTH--} {--_START_YEAR--}
+Anfang Ihres Urlaubes: {!_START_DAY!}.{!_START_MONTH!}.{!_START_YEAR!}
 ------------------------------
 ------------------------------
-Ende Ihres Urlaubes: {--_END_DAY--}. {--_END_MONTH--} {--_END_YEAR--}
+Ende Ihres Urlaubes: {!_END_DAY!}.{!_END_MONTH!}.{!_END_YEAR!}
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index d4fb8fffde88c54efcff8abee9f813520210258e..c3e0af03fea1b1515eae6ce6ff1e33b315127160 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 Anfang Ihres Urlaubes: $content[holiday_start]
 ------------------------------
 ------------------------------
 Anfang Ihres Urlaubes: $content[holiday_start]
 ------------------------------
index d96c0c966a7abcc7ff1b44c426615e2eec5cf173..cfb34f432adcfc886fe91af137b7b2ac59a8ea5c 100644 (file)
@@ -4,7 +4,7 @@
 
 {--YOUR_NEW_DATA--}:
 ------------------------------------------
 
 {--YOUR_NEW_DATA--}:
 ------------------------------------------
-{--SEX--}: $DATA[0]
+{--GENDER--}: $DATA[0]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
index cc2cfc88075b9ce4dcb14a268bdf42f74169428e..4bce17d1f4ebaec1568c8d8ab2ee646b0e37c617 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Diese wurde nun durchgefuehrt. Hier sind nochmals Ihre an uns uebermittelten Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Diese wurde nun durchgefuehrt. Hier sind nochmals Ihre an uns uebermittelten Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 Sie werden automatisch um 00:00 Uhr des Folgeabends wieder zum Newsletter-Empfang freigegeben, sobald die gebuchte Zeitspanne von 1 Monat abgelaufen ist.
 ------------------------------
 
 Sie werden automatisch um 00:00 Uhr des Folgeabends wieder zum Newsletter-Empfang freigegeben, sobald die gebuchte Zeitspanne von 1 Monat abgelaufen ist.
index 8df5147afefca9d9a1f6ec3418b4b8ff8e08f088..d6e65097c644c587dac063d9a185c94bc9e581fc 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Folgende Daten wurden dabei an uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Folgende Daten wurden dabei an uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 Bitte ueberweisen Sie {!__CHARGE_VALUE!} {!__CURRENCY!} auf folgendes Konto:
 ------------------------------
 
 Bitte ueberweisen Sie {!__CHARGE_VALUE!} {!__CURRENCY!} auf folgendes Konto:
index 43185a852e8cef7258749a8e4492e9bbf65fa21d..80b17f6ef4b95d3224219563f31aea1fd14aaf03 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Die gebuchte Zeitspanne ist nun abgelaufen. Hier sind nochmals Ihre Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Die gebuchte Zeitspanne ist nun abgelaufen. Hier sind nochmals Ihre Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 Sie wurden automatisch wieder zum Newsletter-Empfang freigegeben.
 ------------------------------
 
 Sie wurden automatisch wieder zum Newsletter-Empfang freigegeben.
index b7d5c39e9a3b8f9de605f0de1d65ceb52d92074d..4dc2e0e7f68a983683ea35c7f04dca4971b65e97 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,10 +6,10 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 
 Nachricht vom Admin:
 ------------------------------
 
 Nachricht vom Admin:
index b5264a63f4f2aace7c151903ad80e40b2b5d2fd4..877ed1d93db8fd48085beff57e90f556adfa93d0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,10 +6,10 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 
 Nachricht vom Admin:
 ------------------------------
 
 Nachricht vom Admin:
index 349dd7b77bf8c69c10f9d17b0a87c3f7b728fb2c..685a71d20fdcb25a960bf03ef487fffa6d34a2a3 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,18 +6,18 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 ------------------------------
-Auszahlungsart: {--PAYOUT_TYPE_VALUE!}
+Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
 Bei Bank/Webseite: $_POST[bank]
 ------------------------------
 
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
 Bei Bank/Webseite: $_POST[bank]
 ------------------------------
 
-Die dazu noetigen {--PAYOUT_POINTS_VALUE!} haben wir Ihnen bereits abgezogen.
+Die dazu noetigen {--PAYOUT_POINTS_VALUE--} haben wir Ihnen bereits abgezogen.
 
 Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausgefuellt wurde, werden wir die Uerberweisung dann auch taetigen.
 
 
 Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausgefuellt wurde, werden wir die Uerberweisung dann auch taetigen.
 
index 402c1d6fae8026d74f52f405e148df73567daca1..33eb138b8c71674cf8b0b5a69bcdcade8c3edb43 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,12 +6,12 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 ------------------------------
-Auszahlungsart: {--PAYOUT_TYPE_VALUE!}
+Auszahlungsart: {--PAYOUT_TYPE_VALUE--}
 Auszahlungshoehe: $_POST[payout]
 ------------------------------
 Ziel-URL: $_POST[turl]
 Auszahlungshoehe: $_POST[payout]
 ------------------------------
 Ziel-URL: $_POST[turl]
@@ -19,7 +19,7 @@ Linktext: $_POST[alt]
 Banner-URL: $_POST[banner]
 ------------------------------
 
 Banner-URL: $_POST[banner]
 ------------------------------
 
-Die dazu noetigen {--PAYOUT_POINTS_VALUE!} haben wir Ihnen bereits abgezogen.
+Die dazu noetigen {--PAYOUT_POINTS_VALUE--} haben wir Ihnen bereits abgezogen.
 
 Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausgefuellt wurde, werden wir die Uerberweisung dann auch taetigen.
 
 
 Sobald wir Ihre Anfrage readaktionell geprueft haben und diese auch korrekt ausgefuellt wurde, werden wir die Uerberweisung dann auch taetigen.
 
index e02544fdcb03aa8e8ec62fb18fcf5f51dc7608eb..0b97a4962dcd4cfa0b8761115dac19b3f605f75a 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 56fe3f012a1ef9b484f1f6df8f8baf7beb6591bf..826f1a26affb18e9e164b6eaef149aa6f2addacc 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 2336e1bd35c68e573cf1798402efe1eda35d09cf..15ec2226972bf545632d73fe33e6a8604c5b58ca 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index cdd2680ea04ae4d6d9589c6f55141a332bd1fc6d..324306e6359c1b0fcaba886d00c2011067c9db12 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 974fb5c205df7ef4b4ecacfc964eea77fabef734..11c8890bf7be579baaf0da2f2393c5d9de134c00 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 6883b919d1973dd39e484981468e97bec8525a16..e4f85627fa8e1e28601b3bc50be5c3f8d066c32b 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben {!__STATS_BONUS!} {!POINTS!} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 
 
 Sie haben soeben {!__STATS_BONUS!} {!POINTS!} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 
index 0949af4cce3d9fcd55fc14f6913c0fd0382439e3..f0af71df8fd837ecee76621ddedf01d9df3a5343 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index 0949af4cce3d9fcd55fc14f6913c0fd0382439e3..f0af71df8fd837ecee76621ddedf01d9df3a5343 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index c91ad7953da5cb5976757182fb525f689b0d23ff..74c14e728c371bbe76a3595672bc31676bb632e6 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zu Ihrem Referal-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten eine Frage zu Ihrem Referal-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index 3208dfd4a7a72cfd8563ade85895f405ad000c82..b1be97bbd0fde8b12882e5677585b78222e50ac4 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten uns wegen Ihrer unbestaetigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
 
 Sie hatten uns wegen Ihrer unbestaetigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
 ------------------------------
 
 $content
index c8e10b59d66dc6c59f00320aa6cf3692cbd1d94c..6ca84e2c7994e2f65ab6409aa36af51c7420bde9 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung von einem unserer Mitglieder erhalten!
 
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung von einem unserer Mitglieder erhalten!
 
index 7d2a32d7411ec2ed790a2e2e45f1452c1d46ffaa..defc6db8427a3dcada2653f8a9b73e5fc0fefd3d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung an eines unserer Mitglieder abgeschlossen!
 
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung an eines unserer Mitglieder abgeschlossen!
 
index b7d5c39e9a3b8f9de605f0de1d65ceb52d92074d..4dc2e0e7f68a983683ea35c7f04dca4971b65e97 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,10 +6,10 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 
 Nachricht vom Admin:
 ------------------------------
 
 Nachricht vom Admin:
index 037fcc4ecbd1be8f0d83ad2854fef8b47b2ed66a..a0f55e54e8c19bbc6188c80f4a17c9c2424223ff 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,10 +6,10 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 
 Nachricht vom Admin:
 ------------------------------
 
 Nachricht vom Admin:
index b0e3a59b46857a3ef0cc443e47d469b06bcec117..27427bdc2e08f4aa584680f62c89db802cc4c0e0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -6,10 +6,10 @@ Wir haben folgende Daten von Ihnen per Mail erhalten:
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
 ------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
 ------------------------------
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
 ------------------------------
 Auszahlungshoehe: $_POST[payout]
 An Konto: $_POST[account]
index 7420649c8d0d1e317990ea1070ac5b4842390c7b..8b177885af0075f967fc73df1f8bb4c87eaee466 100644 (file)
@@ -1,12 +1,16 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 
-Sie oder ein anderes Mitglied ($REMOTE) haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
+Sie oder ein anderes Mitglied haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
 
 
-------------------
-Ihre Login-ID lautet: $UID / Nickname: $nick
-Neues Passwort: $PASS
+------------------------------------
+Ihre Login-ID lautet: $UID / Nickname: $content[nick]
+Neues Passwort: $content[new_pass]
 Sie k&ouml;nnen sich nun hier einloggen:: {!URL!}/login.php
 Sie k&ouml;nnen sich nun hier einloggen:: {!URL!}/login.php
-------------------
+------------------------------------
+IP-Nummer: $REMOTE_ADDR
+------------------------------------
+Browser: $HTTP_USER_AGENT
+------------------------------------
 
 Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
 
 Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
index 0be43438575b1b534b3dedb4d2ebe4b8dc89f3d4..60bbb454c83fdeee300f91e293aca37a6a4eba87 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
 
 --------------
 Ihre User-ID bei uns: $UID
index 2c82f294337ee022c8ed04f54838b7b8d95fc0d7..b49c423bbcf7cae73ee504aa4f4b718c7b65b784 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
 
 --------------
 Ihre User-ID bei uns: $UID
index d8c91e836c60ccd7796b3ebeb40510a750b0266f..b9e14a4c9574c6729a1b1b73ebc37bce07f361eb 100644 (file)
@@ -1,26 +1,26 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Hier kommt eine weitere Mail von einem unserer Mitglieder zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
 
 Hier kommt eine weitere Mail von einem unserer Mitglieder zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$content
+$content[text]
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
 - - - - -  Werbetext-Ende:   - - - - -
 
 ----------------
-Werber: $SEND_UID
+Werber: $content[sender_uid]
 ----------------
 ----------------
-Verfallszeit: $EXPIRATION
+Verfallszeit: $content[expiration]
 ----------------
 ----------------
-Beworbene Kategorie: $CATEGORY
+Beworbene Kategorie: $content[category]
 ----------------
 ----------------
-Wartezeit: $TIME Sekunden
+Wartezeit: $content[time]
 ----------------
 ----------------
-Beworbene URL: $TARGET_URL
+Beworbene URL: $content[url]
 ----------------
 Hinweis: Angesammelte {!POINTS!} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
 ----------------
 Hinweis: Angesammelte {!POINTS!} k&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
-Um Ihre $points {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{!URL!}/mailid.php?uid=$UID&mailid=$MAILID
+Um Ihre $content[points] {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
+{!URL!}/mailid.php?uid=$UID&mailid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
index 68e501390db732623671ce7c1270df8a88e4d130..580123354356cc409e557c395ca3917debfbdf24 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
index cba60e6b987f805e776b6855d24874648f771197..19faec192741ca07ff9f7f79b0e601b1e6bf83b2 100644 (file)
@@ -2,26 +2,27 @@
 
 Ein Mitglied hat soeben eine Mailbuchung durchgef&uuml;hrt!
 
 
 Ein Mitglied hat soeben eine Mailbuchung durchgef&uuml;hrt!
 
-Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in $BLOCKS-Mail-Bloecken versand.
+Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in $content[blocks] Mail-Bloecken versand.
 
 Hier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung:
 ------------------------------------------------
 
 Hier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung:
 ------------------------------------------------
-Anrede: $salut
-Vorname: $surname
-Nachname: $family
-Email-Adresse: $email
-Gebuchte Kategorie: $CATEGORY
-Gebuchter Payment-Typ: $PAYMENT
-Betreffzeile in den Mails: $SUBJECT
-Gebuchte URL: $TARGET_URL
+Anrede: $content[gender]
+Vorname: $content[surname]
+Nachname: $content[family]
+Email-Adresse: $content[email]
+Gebuchte Kategorie: $content[category]
+Gebuchter Payment-Typ: $content[payment]
+Betreffzeile in den Mails: $content[subject]
+Gebuchte URL: $content[url]
 ------------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------------------------
 
 ------------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------------
 Browser: $HTTP_USER_AGENT
 ------------------------------------------------
 
+Werbetext:
 ------------------------------------------------
 ------------------------------------------------
-$content
+$content[text]
 ------------------------------------------------
 
 Sie werden bald nochmals benachrichtig, sobald der Versand vollstaendig beendet wurde.
 ------------------------------------------------
 
 Sie werden bald nochmals benachrichtig, sobald der Versand vollstaendig beendet wurde.
index 359dcf2d8f8affd34320a1bb63c4efb913c1ee8a..739031596a9a797e184056957eb17fcfcc653e54 100644 (file)
@@ -1,10 +1,10 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung geloescht. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
 ---------------
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung geloescht. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
 ---------------
-Beworbene URL: $TARGET_URL
-Betreffzeile: $SUBJECT
+Beworbene URL: $content[url]
+Betreffzeile: $content[subject]
 ---------------
 
 Ihre Mailbuchung wurde somit gel&ouml;scht. Sollten Sie Fragen hierzu haben, so wenden Sie sich bitte an unseren Support.
 ---------------
 
 Ihre Mailbuchung wurde somit gel&ouml;scht. Sollten Sie Fragen hierzu haben, so wenden Sie sich bitte an unseren Support.
index 44b88eaa825bb5e4208812a1b71aa53301842f35..7d7675aa4a1aa59a529313ca3b7adcb6e23c159b 100644 (file)
@@ -1,17 +1,18 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!
 
 Hier sind nochmals Ihre Daten aus dem Buchungsformular:
 ------------------------------------------------
 
 Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!
 
 Hier sind nochmals Ihre Daten aus dem Buchungsformular:
 ------------------------------------------------
-Gebuchte Kategorie: $CATEGORY
-Gebuchter Payment-Typ: $PAYMENT
-Betreffzeile in den Mails: $SUBJECT
-Gebuchte URL: $TARGET_URL
+Gebuchte Kategorie: $content[category]
+Gebuchter Payment-Typ: $content[payment]
+Betreffzeile in den Mails: $content[subject]
+Gebuchte URL: $content[url]
 ------------------------------------------------
 
 ------------------------------------------------
 
+Werbetext:
 ------------------------------------------------
 ------------------------------------------------
-$content
+$content[text]
 ------------------------------------------------
 
 Sobald Ihre Mailbuchung vollst&auml;ndig gesendet wurde, erhalten Sie eine zweite Mail! Sie k&ouml;nnen bereits eine weitere Mailbuchung durchf&uuml;hren!
 ------------------------------------------------
 
 Sobald Ihre Mailbuchung vollst&auml;ndig gesendet wurde, erhalten Sie eine zweite Mail! Sie k&ouml;nnen bereits eine weitere Mailbuchung durchf&uuml;hren!
index f332d2aba86d91d7bb795dbf42c3f1a4972d5e99..25ae7c4bb81937596cb38548b120bc082b2640ed 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung abgelehnt. Bite beachten Sie unsere AGBs! Bei weiteren Verstoessen gegen unsere AGBs werden wir Ihre URL und ggf. auch Ihren Account sperren. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung abgelehnt. Bite beachten Sie unsere AGBs! Bei weiteren Verstoessen gegen unsere AGBs werden wir Ihre URL und ggf. auch Ihren Account sperren. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
index a8792904bf8164299c5a273761fe9ea2fa22dd78..bae215b49eba8d2ca456120b237a2094f5cff9a4 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
index b98088e9d649b1cc539101e8ef78ba16429e5fbe..1e08acfac11055188b5a617375d544ccc30e7961 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Haben Sie Neuigkeiten fuer uns?
 
 
 Haben Sie Neuigkeiten fuer uns?
 
index ffb386cb690368639a9f07fdeb299067de7b2e08..6a79a6f5c57a41192089f407297542db3dff2fab 100644 (file)
@@ -4,7 +4,7 @@ Ein Gast hat sich soeben bei uns angemeldet.
 
 Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten:
 -------------------------
 
 Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten:
 -------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
index e5a6f4ed4f5447344467a67956857d8d51025f00..7b1c99fe2b4e556ce4dd2b5cb71c49bede1ea089 100644 (file)
@@ -1,10 +1,10 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 vielen Dank, dass Sie sich f&uuml;r unseren {!MT_WORD!} entschieden haben! Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
 Hier sind nochmals zur &Uuml;berpr&uuml;fung Ihre pers&ouml;nlichen Daten:
 -----------------------------------------------
 
 vielen Dank, dass Sie sich f&uuml;r unseren {!MT_WORD!} entschieden haben! Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
 Hier sind nochmals zur &Uuml;berpr&uuml;fung Ihre pers&ouml;nlichen Daten:
 -----------------------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
index 66014f5e2b7644feb3b0216a7919dbebcf8fc151..be536b0e2a50cc62d36623dc2af0dbabb78f929d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben Ihren Bestaetigungslink erneut angefordert.
 
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben Ihren Bestaetigungslink erneut angefordert.
 
index 91001c4528efa4790fe604b7a9b9b1618e0c64a1..b9d685db123ae617a81dbbbf0bbf0226c9eebdf4 100644 (file)
@@ -1,6 +1,6 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 
-Einer unserer Administratoren hat Ihnen soeben {--__POINTS--} {!POINTS!} Ihrem Sponsoren-Account mit der ID {--__ID--} gutgeschrieben!
+Einer unserer Administratoren hat Ihnen soeben {!__POINTS!} {!POINTS!} Ihrem Sponsoren-Account mit der ID {!__ID!} gutgeschrieben!
 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------
index c3c26a3d540b490c87785e3feb9eaab403f74881..9de66795820bfcc149fe1b63ff79a0c5b369e74c 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $DATA[salut] $DATA[surname] $DATA[family].
+Hallo $DATA[gender] $DATA[surname] $DATA[family].
 
 Sie haben heute Ihre Daten geaendert.
 
 
 Sie haben heute Ihre Daten geaendert.
 
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
-{--GUEST_SEX--}: $DATA[salut] ($content[salut])
+{--GUEST_GENDER--}: $DATA[gender] ($content[gender])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
 {--SURNAME_FAMILY--}: $DATA[surname] $DATA[family] ($content[surname] $content[family])
 {--SPONSOR_EMAIL_STREET_NR1--}: $DATA[street_nr1] ($content[street_nr1])
 {--SPONSOR_EMAIL_STREET_NR2--}: $DATA[street_nr2] ($content[street_nr2])
index dc43d87ee4f860276274284206b3380a60dc97f0..15041d4caeac94923bb459f86ae266d1a79d4c60 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $DATA[salut] $DATA[surname] $DATA[family].
+Hallo $DATA[gender] $DATA[surname] $DATA[family].
 
 Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie koennen es nun mit
 dem folgenden Link wieder freigeben:
 
 Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie koennen es nun mit
 dem folgenden Link wieder freigeben:
index db943796cbaa240ba4a67dac5d99c033bf0c4d50..ea5f607489c926208d6397f371dd329cc911c17e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben sich soeben als Sponsor zu unserem {!MT_WORD!}
 angemeldet. Sie haben somit den ersten Schritt zu uns getan wofuer wir uns sehr bedanken.
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben sich soeben als Sponsor zu unserem {!MT_WORD!}
 angemeldet. Sie haben somit den ersten Schritt zu uns getan wofuer wir uns sehr bedanken.
@@ -8,11 +8,11 @@ dass auch kein anderer Sie angemeldet hat.
 
 Hier ist Ihr Link:
 ------------------------------
 
 Hier ist Ihr Link:
 ------------------------------
-{!URL!}/sponsor_confirm.php?hash={--__HASH--}
+{!URL!}/sponsor_confirm.php?hash={!__HASH!}
 ------------------------------
 ------------------------------
-Ihre Sponsor-ID lautet: {--__ID--}
+Ihre Sponsor-ID lautet: {!__ID!}
 ------------------------------
 ------------------------------
-Passwort zum Login: {--__PASSWORD--}
+Passwort zum Login: {!__PASSWORD!}
 ------------------------------
 
 Sollten Sie diesen nicht anklicken koennen, kopieren Sie ihn bitte in die Adresszeile Ihres Browsers.
 ------------------------------
 
 Sollten Sie diesen nicht anklicken koennen, kopieren Sie ihn bitte in die Adresszeile Ihres Browsers.
@@ -26,7 +26,7 @@ Verwendeter Browser: $HTTP_USER_AGENT
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
-Angemeldet am: {--__TIMESTAMP--}
+Angemeldet am: {!__TIMESTAMP!}
 ------------------------------
 
 Mit freundlichem Gruss,
 ------------------------------
 
 Mit freundlichem Gruss,
index caa022f165e7c1cc12b641924d33db1cf8174159..7d9c9a416191c9591ee8b60d67f17889af7142f2 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Ihre EMail-Adresse geaendert und den Bestaetigungslink erneut angefordert. Hier sind nun
 alle noetigen Daten dazu.
 
 Sie hatten bei uns Ihre EMail-Adresse geaendert und den Bestaetigungslink erneut angefordert. Hier sind nun
 alle noetigen Daten dazu.
index 7094c0ec7890d8607963637acf03d47bcfc6b570..03e1f2a5d55898ea4e7150fe0727a892bc404be3 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben ein neues Passwort angefordert.
 
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben ein neues Passwort angefordert.
 
index 23162b479a5ed7b5e2e93c5aa2b0aa9e4b2f2c0b..e056d6a7be96c6cdfbd60722f6f434f9cfd75beb 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben Ihre EMail-Adresse bestaetigt. Dies wurde von der IP-Nummer $REMOTE_ADDR aus durchgefuehrt.
 
 
 Sie haben soeben Ihre EMail-Adresse bestaetigt. Dies wurde von der IP-Nummer $REMOTE_ADDR aus durchgefuehrt.
 
@@ -18,7 +18,7 @@ Ihre Sponsor-ID lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
index 29ccf39ed37f8e972f2f598e59ebb016780d51bd..5768e2e0a87705dba96274369134440023bf87f0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[id]
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[id]
index f7a45213af1c9d07e7bf8b210369c1bb6f73dd5d..3a7fc5721dc32831c5a19208fce74f999441d6fc 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family].
+Hallo $content[gender] $content[surname] $content[family].
 
 Sie haben heute Ihre Einstellungen geaendert.
 
 
 Sie haben heute Ihre Einstellungen geaendert.
 
index 16adb34477677e33a32415b8f1a35536d5832ad1..939c08252a669ac404087ed28202667b060f23c0 100644 (file)
@@ -1,6 +1,6 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 
-Einer unserer Administratoren hat Ihnen soeben {--__POINTS--} {!POINTS!} von Ihrem Sponsoren-Account mit der ID {--__ID--} abgezogen!
+Einer unserer Administratoren hat Ihnen soeben {!__POINTS!} {!POINTS!} von Ihrem Sponsoren-Account mit der ID {!__ID!} abgezogen!
 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------
index 66014f5e2b7644feb3b0216a7919dbebcf8fc151..be536b0e2a50cc62d36623dc2af0dbabb78f929d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben Ihren Bestaetigungslink erneut angefordert.
 
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben Ihren Bestaetigungslink erneut angefordert.
 
index 117dc2e72a77203b55ce210d01e414d5cc67eb83..c4b6c59beae956cab2f4304e7d2ded6d4f338d73 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[sponsor]
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[sponsor]
index 91001c4528efa4790fe604b7a9b9b1618e0c64a1..b9d685db123ae617a81dbbbf0bbf0226c9eebdf4 100644 (file)
@@ -1,6 +1,6 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 
-Einer unserer Administratoren hat Ihnen soeben {--__POINTS--} {!POINTS!} Ihrem Sponsoren-Account mit der ID {--__ID--} gutgeschrieben!
+Einer unserer Administratoren hat Ihnen soeben {!__POINTS!} {!POINTS!} Ihrem Sponsoren-Account mit der ID {!__ID!} gutgeschrieben!
 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------
index db943796cbaa240ba4a67dac5d99c033bf0c4d50..ea5f607489c926208d6397f371dd329cc911c17e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben sich soeben als Sponsor zu unserem {!MT_WORD!}
 angemeldet. Sie haben somit den ersten Schritt zu uns getan wofuer wir uns sehr bedanken.
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben sich soeben als Sponsor zu unserem {!MT_WORD!}
 angemeldet. Sie haben somit den ersten Schritt zu uns getan wofuer wir uns sehr bedanken.
@@ -8,11 +8,11 @@ dass auch kein anderer Sie angemeldet hat.
 
 Hier ist Ihr Link:
 ------------------------------
 
 Hier ist Ihr Link:
 ------------------------------
-{!URL!}/sponsor_confirm.php?hash={--__HASH--}
+{!URL!}/sponsor_confirm.php?hash={!__HASH!}
 ------------------------------
 ------------------------------
-Ihre Sponsor-ID lautet: {--__ID--}
+Ihre Sponsor-ID lautet: {!__ID!}
 ------------------------------
 ------------------------------
-Passwort zum Login: {--__PASSWORD--}
+Passwort zum Login: {!__PASSWORD!}
 ------------------------------
 
 Sollten Sie diesen nicht anklicken koennen, kopieren Sie ihn bitte in die Adresszeile Ihres Browsers.
 ------------------------------
 
 Sollten Sie diesen nicht anklicken koennen, kopieren Sie ihn bitte in die Adresszeile Ihres Browsers.
@@ -26,7 +26,7 @@ Verwendeter Browser: $HTTP_USER_AGENT
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
 ------------------------------
 IP-Nummer: $REMOTE_ADDR
 ------------------------------
-Angemeldet am: {--__TIMESTAMP--}
+Angemeldet am: {!__TIMESTAMP!}
 ------------------------------
 
 Mit freundlichem Gruss,
 ------------------------------
 
 Mit freundlichem Gruss,
index 23162b479a5ed7b5e2e93c5aa2b0aa9e4b2f2c0b..e056d6a7be96c6cdfbd60722f6f434f9cfd75beb 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben Ihre EMail-Adresse bestaetigt. Dies wurde von der IP-Nummer $REMOTE_ADDR aus durchgefuehrt.
 
 
 Sie haben soeben Ihre EMail-Adresse bestaetigt. Dies wurde von der IP-Nummer $REMOTE_ADDR aus durchgefuehrt.
 
@@ -18,7 +18,7 @@ Ihre Sponsor-ID lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
index 16adb34477677e33a32415b8f1a35536d5832ad1..939c08252a669ac404087ed28202667b060f23c0 100644 (file)
@@ -1,6 +1,6 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 
-Einer unserer Administratoren hat Ihnen soeben {--__POINTS--} {!POINTS!} von Ihrem Sponsoren-Account mit der ID {--__ID--} abgezogen!
+Einer unserer Administratoren hat Ihnen soeben {!__POINTS!} {!POINTS!} von Ihrem Sponsoren-Account mit der ID {!__ID!} abgezogen!
 
 Grund dazu war folgender:
 ------------------------------
 
 Grund dazu war folgender:
 ------------------------------
index 117dc2e72a77203b55ce210d01e414d5cc67eb83..c4b6c59beae956cab2f4304e7d2ded6d4f338d73 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[sponsor]
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[sponsor]
index a7e2d8f72612e6489c5b8a721de9ce1840d5537a..48a1ad0abf0e0c86a9c8e9b83fc5a27a65e76837 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat Ihnen soeben {!__POINTS_VALUE!} {!POINTS!} abgezogen!
 
 
 Einer unserer Administratoren hat Ihnen soeben {!__POINTS_VALUE!} {!POINTS!} abgezogen!
 
index ab2492d59f11f41c946595b5409a53bb172aba10..7710f82cd04431690781ac88a52987a04f460692 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie koennen sich nun wieder unter folgender URL einloggen:
 
 
 Einer unserer Administratoren hat soeben Ihren Account wieder freigeben! Sie koennen sich nun wieder unter folgender URL einloggen:
 
index fc156088b541a66885fab56eea1ee1a5b5b8a199..ff40a71ac2184b5dd50714641eff3ed81fa7f5bb 100644 (file)
 <TR>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD align="right">
 <TR>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD align="right">
-    {--GUEST_SEX--}:&nbsp;
+    {--GUEST_GENDER--}:&nbsp;
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="salut" class="admin_select" size="1">
-      <OPTION value="M">{--SEX_M--}</OPTION>
-        <OPTION value="F">{--SEX_F--}</OPTION>
-        <OPTION value="C">{--SEX_C--}</OPTION>
+    <SELECT name="gender" class="admin_select" size="1">
+      <OPTION value="M">{--GENDER_M--}</OPTION>
+        <OPTION value="F">{--GENDER_F--}</OPTION>
+        <OPTION value="C">{--GENDER_C--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="points_amount" class="admin_normal" size="6" maxlength="20" value="{--__SPONSOR_MIN_VALUE--}">
+    <INPUT type="text" name="points_amount" class="admin_normal" size="6" maxlength="20" value="{!__SPONSOR_MIN_VALUE!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
index 52d0fdbde179659b79cec907f46fa243c645f72a..da5404e42b4edeb5fadf1fc97c03a689a1181628 100644 (file)
@@ -19,8 +19,8 @@
 <TR>
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
   <TD class="admin_footer">
 <TR>
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
   <TD class="admin_footer">
-       {--__HIDDEN_DATA--}
-    <INPUT type="submit" name="ok" class="admin_submit" value="{--ADD_SPONSOR--}">
+    {!__HIDDEN_DATA!}
+    <INPUT type="submit" name="ok" class="admin_submit" value="{--ADD_SPONSOR--}" />
   </TD>
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="admin_footer seperator" width="10">&nbsp;</TD>
 </TR>
index 9eac064beb23085375e5ec3e0f814387140ca7b4..ee89e209053914983c32b5bef7fc9e31461e6695 100644 (file)
@@ -19,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD class="admin_table" align="center">{--__WHAT_SELECTION--} <BR />
+               <TD class="admin_table" align="center">{!__WHAT_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -30,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD class="admin_table" align="center">{--__ACTION_SELECTION--} <BR />
+               <TD class="admin_table" align="center">{!__ACTION_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -52,7 +52,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD class="admin_table" align="center">{--__BELOW_SELECTION--}</TD>
+               <TD class="admin_table" align="center">{!-__BELOW_SELECTION!}</TD>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
index 8a785dafbd4d9969d5b6726bb8c5dbc14663fc4b..8235f0a71cf8b7f67ace8bd41730be48e8ffe45f 100644 (file)
@@ -1,19 +1,16 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=admins_contact&amp;admin={--__ADMIN--}"
-       method="POST" style="margin-bottom: 0px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="400"
-       class="admin_table dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_contact&amp;admin={!__ADMIN!}" method="POST" style="margin-bottom: 0px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="400" class="admin_table dashed">
        <TR>
                <TD width="195" class="admin_title bottom2" align="right" height="28"><STRONG>{--ADMINS_ADMIN_ID--}:</STRONG></TD>
                <TD width="10" class="admin_title bottom2 seperator">&nbsp;</TD>
        <TR>
                <TD width="195" class="admin_title bottom2" align="right" height="28"><STRONG>{--ADMINS_ADMIN_ID--}:</STRONG></TD>
                <TD width="10" class="admin_title bottom2 seperator">&nbsp;</TD>
-               <TD width="195" class="admin_title bottom2"><STRONG>{--__ADMIN--}</STRONG></TD>
+               <TD width="195" class="admin_title bottom2"><STRONG>{!__ADMIN!}</STRONG></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR />
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" align="center">{--ADMINS_ENTER_CONTACT_TEXT--}:<BR />
-               <TEXTAREA class="admin_normal" name="text" rows="5" cols="40"></TEXTAREA>
+                       <TEXTAREA class="admin_normal" name="text" rows="5" cols="40"></TEXTAREA>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD class="admin_footer top2" align="right"><INPUT type="reset"
-                       class="admin_reset" value="{--CLEAR_FORM--}">
+               <TD class="admin_footer top2" align="right">
+                       <INPUT type="reset" class="admin_reset" value="{--CLEAR_FORM--}" />
+               </TD>
                <TD width="10" class="admin_footer top2 seperator">&nbsp;</TD>
                <TD width="10" class="admin_footer top2 seperator">&nbsp;</TD>
-               <TD class="admin_footer top2"><INPUT type="submit" name="ok"
-                       class="admin_submit" value="{--ADMINS_CONTACT_SUBMIT--}"></TD>
+               <TD class="admin_footer top2">
+                       <INPUT type="submit" name="ok" class="admin_submit" value="{--ADMINS_CONTACT_SUBMIT--}" />
+               </TD>
        </TR>
 </TABLE>
 </FORM>
        </TR>
 </TABLE>
 </FORM>
index 908317a8586168afc62b5533e138c78d7cd40cf4..126ab1e240418c60606bf942e4214862526f764d 100644 (file)
@@ -1,12 +1,9 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin={--__ADMIN--}"
-       method="POST" style="margin-bottom: 0px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="400"
-       class="admin_table dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=admins_contct&amp;admin={!__ADMIN!}" method="POST" style="margin-bottom: 0px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="400" class="admin_table dashed">
        <TR>
                <TD width="195" class="admin_header bottom2" align="right" height="28"><STRONG>{--ADMINS_ADMIN_ID--}:</STRONG></TD>
                <TD width="10" class="admin_header bottom2 seperator">&nbsp;</TD>
        <TR>
                <TD width="195" class="admin_header bottom2" align="right" height="28"><STRONG>{--ADMINS_ADMIN_ID--}:</STRONG></TD>
                <TD width="10" class="admin_header bottom2 seperator">&nbsp;</TD>
-               <TD width="195" class="admin_header bottom2" align="left"><STRONG>{--__ADMIN--}</STRONG></TD>
+               <TD width="195" class="admin_header bottom2" align="left"><STRONG>{!__ADMIN!}</STRONG></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator">&nbsp;</TD>
index d2545121b6f18cfb08da3d6ba4d21abf1d2ac9d3..5be693200decdb3bc68ebbfedb9e06d95c394ba6 100644 (file)
@@ -16,7 +16,7 @@
                <TD align="right" width="275">{--ADMIN_ACTIVE_LIMIT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275"><INPUT type="input"
                <TD align="right" width="275">{--ADMIN_ACTIVE_LIMIT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275"><INPUT type="input"
-                       name="active_limit" class="admin_normal" value="{--__LIMIT_VALUE!}"
+                       name="active_limit" class="admin_normal" value="{!__LIMIT_VALUE!}"
                        size="5" maxlength="20"></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                        size="5" maxlength="20"></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
index 0437ee61d4353cc5a62fbf9b61cd078b2426a246..9e2f06006a940fa98257a78b8227b2b0b2091d4e 100644 (file)
                        style="padding-top: 3px; padding-right: 20px">
                {--ADMIN_SELECT_MENU_TYPE--}:</TD>
                <TD width="40" align="center" valign="top" style="padding-top: 3px">
                        style="padding-top: 3px; padding-right: 20px">
                {--ADMIN_SELECT_MENU_TYPE--}:</TD>
                <TD width="40" align="center" valign="top" style="padding-top: 3px">
-               <INPUT type="radio" name="admin_menu" class="admin_normal" value="NEW"{--__ADMIN_MENU_NEW--}>
+               <INPUT type="radio" name="admin_menu" class="admin_normal" value="NEW"{!__ADMIN_MENU_NEW!}>
                </TD>
                <TD width="360">{--ADMIN_MENU_NEW--}</TD>
        </TR>
        <TR>
                <TD width="200" class="seperator">&nbsp;</TD>
                <TD width="40" align="center" valign="top" style="padding-top: 3px">
                </TD>
                <TD width="360">{--ADMIN_MENU_NEW--}</TD>
        </TR>
        <TR>
                <TD width="200" class="seperator">&nbsp;</TD>
                <TD width="40" align="center" valign="top" style="padding-top: 3px">
-               <INPUT type="radio" name="admin_menu" class="admin_normal" value="OLD"{--__ADMIN_MENU_OLD--}>
+               <INPUT type="radio" name="admin_menu" class="admin_normal" value="OLD"{!__ADMIN_MENU_OLD!}>
                </TD>
                <TD width="360">{--ADMIN_MENU_OLD--}</TD>
        </TR>
                </TD>
                <TD width="360">{--ADMIN_MENU_OLD--}</TD>
        </TR>
index d69455ec4d1202525519bf807944275ecdef9ad9..966be18d3b984da896b0a026dce7b510086b9f2d 100644 (file)
@@ -17,7 +17,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_INACTIVE_SELECTION--}</TD>
+               <TD>{!__AP_INACTIVE_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -25,7 +25,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_SINCE--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_SINCE--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_IN_SINCE--}</TD>
+               <TD>{!__AP_IN_SINCE!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -33,7 +33,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_INACTIVE_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_IN_TIME--}</TD>
+               <TD>{!__AP_IN_TIME!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
@@ -48,7 +48,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_UNCONFIRMED_SELECTION--}</TD>
+               <TD>{!__AP_UNCONFIRMED_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -56,7 +56,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_UN_TIME--}</TD>
+               <TD>{!__AP_UN_TIME!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
@@ -71,7 +71,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TASKS--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TASKS--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_TASKS_SELECTION--}</TD>
+               <TD>{!__AP_TASKS_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -79,7 +79,7 @@
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TASKS_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TASKS_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_TASK_TIME--}</TD>
+               <TD>{!__AP_TASK_TIME!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_OPTION_MAIL_LIFETIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_OPTION_MAIL_LIFETIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--_CFG_AUTO_PURGE--}</TD>
+               <TD>{!_CFG_AUTO_PURGE!}</TD>
        </TR>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_NOTIFY_DEL_MAILS--}</TD>
+               <TD>{!__AP_NOTIFY_DEL_MAILS!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_DEL_MAILS--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_DEL_MAILS--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_DEL_MAILS_SELECTION--}</TD>
+               <TD>{!__AP_DEL_MAILS_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_DEL_MAILS_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_DEL_MAILS_TIME--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_DEL_MAILS_TIME--}</TD>
+               <TD>{!__AP_DEL_MAILS_TIME!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_INACTIVE--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_INACTIVE--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_NOTIFY_INACTIVE--}</TD>
+               <TD>{!__AP_NOTIFY_INACTIVE!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_NOTIFY_UNCONFIRMED--}</TD>
+               <TD>{!__AP_NOTIFY_UNCONFIRMED!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_TASKS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_NOTIFY_TASKS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__AP_NOTIFY_TASKS--}</TD>
+               <TD>{!__AP_NOTIFY_TASKS!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="10">&nbsp;</TD>
index d3db0985e46d39d70d2c97f7228515195992e4dc..d909842aeaa39a4a63b5bda679c26c5ebecf2af3 100644 (file)
@@ -43,7 +43,7 @@
                <TD align="right" height="20">
                {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="right" height="20">
                {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__BEG_UID_TIMEOUT--}</TD>
+               <TD align="center">{!__BEG_UID_TIMEOUT!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -52,7 +52,7 @@
                <TD align="right" height="20">
                {--ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="right" height="20">
                {--ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__BEG_REMOTE_IP_TIMEOUT--}</TD>
+               <TD align="center">{!__BEG_REMOTE_IP_TIMEOUT!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio" name="beg_mode"
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio" name="beg_mode"
-                       class="admin_normal" value="DIRECT"{--__BEG_MODE_DIRECT--}>&nbsp;{--BEG_MODE_DIRECT--}<BR />
+                       class="admin_normal" value="DIRECT"{!__BEG_MODE_DIRECT!}>&nbsp;{--BEG_MODE_DIRECT--}<BR />
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_mode"
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_mode"
-                       class="admin_normal" value="REF"{--__BEG_MODE_REF--}>&nbsp;{--BEG_MODE_REF--}
+                       class="admin_normal" value="REF"{!__BEG_MODE_REF!}>&nbsp;{--BEG_MODE_REF--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -98,8 +98,8 @@
                <TD align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_rallye"
                <TD align="right" height="20">{--ADMIN_BEG_RALLYE_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_rallye"
-                       class="admin_normal" value="Y"{--__BEG_RALLYE_Y--}>&nbsp;{--YES--}<BR />
-               <INPUT type="radio" name="beg_rallye" class="admin_normal" value="N"{--__BEG_RALLYE_N--}>&nbsp;{--NO--}
+                       class="admin_normal" value="Y"{!__BEG_RALLYE_Y!}>&nbsp;{--YES--}<BR />
+               <INPUT type="radio" name="beg_rallye" class="admin_normal" value="N"{!__BEG_RALLYE_N!}>&nbsp;{--NO--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                <TD align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_include_own"
                <TD align="right" height="20">{--ADMIN_BEG_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_include_own"
-                       class="admin_normal" value="Y"{--__BEG_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR />
+                       class="admin_normal" value="Y"{!__BEG_INCLUDE_OWN_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_include_own" class="admin_normal"
                <INPUT type="radio" name="beg_include_own" class="admin_normal"
-                       value="N"{--__BEG_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BEG_INCLUDE_OWN_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD align="right" height="20">{--ADMIN_BEG_RANKS--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="beg_ranks"
                <TD align="right" height="20">{--ADMIN_BEG_RANKS--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="beg_ranks"
-                       class="admin_normal" size="3" maxlength="7" value="{--__BEG_RANKS--}">
+                       class="admin_normal" size="3" maxlength="7" value="{!__BEG_RANKS!}" />
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_active"
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_active"
-                       class="admin_normal" value="Y"{--__BEG_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
-               <INPUT type="radio" name="beg_active" class="admin_normal" value="N"{--__BEG_ACTIVE_N--}>&nbsp;{--NO--}
+                       class="admin_normal" value="Y"{!__BEG_ACTIVE_Y!}>&nbsp;{--YES--}<BR />
+               <INPUT type="radio" name="beg_active" class="admin_normal" value="N"{!__BEG_ACTIVE_N!}>&nbsp;{--NO--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                <TD align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_en_notify"
                <TD align="right" height="20">{--ADMIN_BEG_RAL_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_en_notify"
-                       class="admin_normal" value="Y"{--__BEG_RAL_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       class="admin_normal" value="Y"{!__BEG_RAL_EN_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_ral_en_notify" class="admin_normal"
                <INPUT type="radio" name="beg_ral_en_notify" class="admin_normal"
-                       value="N"{--__BEG_RAL_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BEG_RAL_EN_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_di_notify"
                <TD align="right" height="20">{--ADMIN_BEG_RAL_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_ral_di_notify"
-                       class="admin_normal" value="Y"{--__BEG_RAL_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       class="admin_normal" value="Y"{!__BEG_RAL_DI_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_ral_di_notify" class="admin_normal"
                <INPUT type="radio" name="beg_ral_di_notify" class="admin_normal"
-                       value="N"{--__BEG_RAL_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BEG_RAL_DI_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_new_mem_notify"
                <TD align="right" height="20">{--ADMIN_BEG_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="beg_new_mem_notify"
-                       class="admin_normal" value="Y"{--__BEG_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       class="admin_normal" value="Y"{!__BEG_NEW_MEMBER_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="beg_new_mem_notify" class="admin_normal"
                <INPUT type="radio" name="beg_new_mem_notify" class="admin_normal"
-                       value="N"{--__BEG_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BEG_NEW_MEMBER_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="beg_notify_bonus"
                        class="admin_normal" size="3" maxlength="7"
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="beg_notify_bonus"
                        class="admin_normal" size="3" maxlength="7"
-                       value="{--__BEG_NOTIFY_BONUS--}"></TD>
+                       value="{!__BEG_NOTIFY_BONUS!}"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_BEG_NOTIFY_WAIT--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_BEG_NOTIFY_WAIT--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__WAIT_SELECTION--}</TD>
+               <TD align="center">{!__WAIT_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
index 8d88768d5267ae8489c78abd34424f7d2a382fbd..b49653490009d598676e8bb13a790eee19a653db 100644 (file)
@@ -27,9 +27,9 @@
                <TD align="right" height="20">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_active"
                <TD align="right" height="20">{--ADMIN_BIRTHDAY_ONLY_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_active"
-                       class="admin_normal" value="Y"{--__BIRTHDAY_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
+                       class="admin_normal" value="Y"{!__BIRTHDAY_ACTIVE_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="birthday_active" class="admin_normal"
                <INPUT type="radio" name="birthday_active" class="admin_normal"
-                       value="N"{--__BIRTHDAY_ACTIVE_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BIRTHDAY_ACTIVE_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio"
        </TR>
        <TR>
                <TD align="right" height="20"><INPUT type="radio"
-                       name="birthday_mode" class="admin_normal" value="DIRECT"{--__BIRTHDAY_MODE_DIRECT--}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<BR />
+                       name="birthday_mode" class="admin_normal" value="DIRECT"{!__BIRTHDAY_MODE_DIRECT!}>&nbsp;{--BIRTHDAY_MODE_DIRECT--}<BR />
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_mode"
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="radio" name="birthday_mode"
-                       class="admin_normal" value="REF"{--__BIRTHDAY_MODE_REF--}>&nbsp;{--BIRTHDAY_MODE_REF--}
+                       class="admin_normal" value="REF"{!__BIRTHDAY_MODE_REF!}>&nbsp;{--BIRTHDAY_MODE_REF--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
index ba2e81062fa94d09f531e42c94469aa32d10571f..db613358d6ff2b3d670719e73d76f0a48094f858 100644 (file)
@@ -14,8 +14,8 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_IS_ACTIVE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_active" class="admin_normal" value="Y"{--__BONUS_ACTIVE_Y--}>&nbsp;{--YES--}<BR />
-               <INPUT type="radio" name="bonus_active" class="admin_normal" value="N"{--__BONUS_ACTIVE_N--}>&nbsp;{--NO--}
+                       name="bonus_active" class="admin_normal" value="Y"{!__BONUS_ACTIVE_Y!}>&nbsp;{--YES--}<BR />
+               <INPUT type="radio" name="bonus_active" class="admin_normal" value="N"{!__BONUS_ACTIVE_N!}>&nbsp;{--NO--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -26,9 +26,9 @@
                &nbsp;{--ADMIN_BONUS_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_INCLUDE_OWN--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_include_own" class="admin_normal" value="Y"{--__BONUS_INCLUDE_OWN_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_include_own" class="admin_normal" value="Y"{!__BONUS_INCLUDE_OWN_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_include_own" class="admin_normal"
                <INPUT type="radio" name="bonus_include_own" class="admin_normal"
-                       value="N"{--__BONUS_INCLUDE_OWN_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_INCLUDE_OWN_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -41,9 +41,9 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_click_yn" class="admin_normal" value="Y"{--__BONUS_CLICK_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_click_yn" class="admin_normal" value="Y"{!__BONUS_CLICK_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_click_yn" class="admin_normal"
                <INPUT type="radio" name="bonus_click_yn" class="admin_normal"
-                       value="N"{--__BONUS_CLICK_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_CLICK_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -56,9 +56,9 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_login_yn" class="admin_normal" value="Y"{--__BONUS_LOGIN_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_login_yn" class="admin_normal" value="Y"{!__BONUS_LOGIN_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_login_yn" class="admin_normal"
                <INPUT type="radio" name="bonus_login_yn" class="admin_normal"
-                       value="N"{--__BONUS_LOGIN_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_LOGIN_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -71,9 +71,9 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_order_yn" class="admin_normal" value="Y"{--__BONUS_ORDER_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_order_yn" class="admin_normal" value="Y"{!__BONUS_ORDER_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_order_yn" class="admin_normal"
                <INPUT type="radio" name="bonus_order_yn" class="admin_normal"
-                       value="N"{--__BONUS_ORDER_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_ORDER_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -86,9 +86,9 @@
                &nbsp;{--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_STATS_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_stats_yn" class="admin_normal" value="Y"{--__BONUS_STATS_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_stats_yn" class="admin_normal" value="Y"{!__BONUS_STATS_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_stats_yn" class="admin_normal"
                <INPUT type="radio" name="bonus_stats_yn" class="admin_normal"
-                       value="N"{--__BONUS_STATS_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_STATS_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
                &nbsp;{--ADMIN_BONUS_RALLYE_REF_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_REF_INCLUDE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_ref_yn" class="admin_normal" value="Y"{--__BONUS_REF_Y--}>&nbsp;{--YES--}<BR />
-               <INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value="N"{--__BONUS_REF_N--}>&nbsp;{--NO--}
+                       name="bonus_ref_yn" class="admin_normal" value="Y"{!__BONUS_REF_Y!}>&nbsp;{--YES--}<BR />
+               <INPUT type="radio" name="bonus_ref_yn" class="admin_normal" value="N"{!__BONUS_REF_N!}>&nbsp;{--NO--}
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                </DIV>
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                </DIV>
                </TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center" valign="top">{--__TRATES_LIST--}</TD>
+               <TD align="center" valign="top">{!__TRATES_LIST!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_LOGIN_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__LOGIN_TIMEOUT_SELECTION--}</TD>
+               <TD align="center">{!__LOGIN_TIMEOUT_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_BONUS_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_BONUS_TIMEOUT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__BONUS_TIMEOUT_SELECTION--}</TD>
+               <TD align="center">{!__BONUS_TIMEOUT_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="bonus_ranks"
                        class="admin_normal" size="3" maxlength="5"
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="bonus_ranks"
                        class="admin_normal" size="3" maxlength="5"
-                       value="{--__TRANKS_VALUE!}"></TD>
+                       value="{!__TRANKS_VALUE!}"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="bonus_lines"
                        class="admin_normal" size="3" maxlength="5"
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="center"><INPUT type="text" name="bonus_lines"
                        class="admin_normal" size="3" maxlength="5"
-                       value="{--__TLINES_VALUE!}"></TD>
+                       value="{!__TLINES_VALUE!}"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                &nbsp;{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_EN_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_en_notify" class="admin_normal" value="Y"{--__BONUS_EN_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_en_notify" class="admin_normal" value="Y"{!__BONUS_EN_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_en_notify" class="admin_normal"
                <INPUT type="radio" name="bonus_en_notify" class="admin_normal"
-                       value="N"{--__BONUS_EN_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_EN_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                &nbsp;{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_DI_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_di_notify" class="admin_normal" value="Y"{--__BONUS_DI_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_di_notify" class="admin_normal" value="Y"{!__BONUS_DI_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_di_notify" class="admin_normal"
                <INPUT type="radio" name="bonus_di_notify" class="admin_normal"
-                       value="N"{--__BONUS_DI_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_DI_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                &nbsp;{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
                &nbsp;{--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="radio"
-                       name="bonus_new_mem_notify" class="admin_normal" value="Y"{--__BONUS_NEW_MEMBER_NOTIFY_Y--}>&nbsp;{--YES--}<BR />
+                       name="bonus_new_mem_notify" class="admin_normal" value="Y"{!__BONUS_NEW_MEMBER_NOTIFY_Y!}>&nbsp;{--YES--}<BR />
                <INPUT type="radio" name="bonus_new_mem_notify" class="admin_normal"
                <INPUT type="radio" name="bonus_new_mem_notify" class="admin_normal"
-                       value="N"{--__BONUS_NEW_MEMBER_NOTIFY_N--}>&nbsp;{--NO--}</TD>
+                       value="N"{!__BONUS_NEW_MEMBER_NOTIFY_N!}>&nbsp;{--NO--}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="text"
                        name="bonus_notify_points" class="admin_normal" size="8"
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="195" align="center"><INPUT type="text"
                        name="bonus_notify_points" class="admin_normal" size="8"
-                       maxlength="20" value="{--__NOTIFY_VALUE!}">&nbsp;<FONT
+                       maxlength="20" value="{!__NOTIFY_VALUE!}">&nbsp;<FONT
                        class="admin_note">({!POINTS!})</FONT></TD>
        </TR>
        <TR>
                        class="admin_note">({!POINTS!})</FONT></TD>
        </TR>
        <TR>
                <TD align="right" width="300" height="20">
                {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD align="right" width="300" height="20">
                {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD width="195" align="center">{--__WAIT_SELECTION--}</TD>
+               <TD width="195" align="center">{!__WAIT_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
index b3a57de0315c2e8a99ddcbd1ddbf04227a6e2465..356d39ea0727d135231a8770284e5140cdbf9f6a 100644 (file)
@@ -13,8 +13,8 @@
                <TD class="switch_sw1" align="right" width="350" height="20">
                {--ADMIN_CACHE_ADMINS--}</TD>
                <TD class="switch_sw1" width="150" style="padding-left: 10px"><INPUT
                <TD class="switch_sw1" align="right" width="350" height="20">
                {--ADMIN_CACHE_ADMINS--}</TD>
                <TD class="switch_sw1" width="150" style="padding-left: 10px"><INPUT
-                       type="radio" name="cache_admins" value="Y" class="admin_normal"{--__ADMINS_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_admins" value="N" class="admin_normal"{--__ADMINS_N--}>&nbsp;{--NO--}&nbsp;
+                       type="radio" name="cache_admins" value="Y" class="admin_normal"{!__ADMINS_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_admins" value="N" class="admin_normal"{!__ADMINS_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -24,8 +24,8 @@
                <TD class="switch_sw2" align="right" width="350" height="20">
                {--ADMIN_CACHE_ACLS--}</TD>
                <TD class="switch_sw2" width="150" style="padding-left: 10px"><INPUT
                <TD class="switch_sw2" align="right" width="350" height="20">
                {--ADMIN_CACHE_ACLS--}</TD>
                <TD class="switch_sw2" width="150" style="padding-left: 10px"><INPUT
-                       type="radio" name="cache_acls" value="Y" class="admin_normal"{--__ACLS_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_acls" value="N" class="admin_normal"{--__ACLS_N--}>&nbsp;{--NO--}&nbsp;
+                       type="radio" name="cache_acls" value="Y" class="admin_normal"{!__ACLS_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_acls" value="N" class="admin_normal"{!__ACLS_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -35,8 +35,8 @@
                <TD align="right" width="350" height="20">{--ADMIN_CACHE_EXTS--}
                </TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
                <TD align="right" width="350" height="20">{--ADMIN_CACHE_EXTS--}
                </TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
-                       name="cache_exts" value="Y" class="admin_normal"{--__EXTS_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_exts" value="N" class="admin_normal"{--__EXTS_N--}>&nbsp;{--NO--}&nbsp;
+                       name="cache_exts" value="Y" class="admin_normal"{!__EXTS_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_exts" value="N" class="admin_normal"{!__EXTS_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -46,8 +46,8 @@
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_CONFIG--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_CONFIG--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
-                       name="cache_config" value="Y" class="admin_normal"{--__CONFIG_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_config" value="N" class="admin_normal"{--__CONFIG_N--}>&nbsp;{--NO--}&nbsp;
+                       name="cache_config" value="Y" class="admin_normal"{!__CONFIG_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_config" value="N" class="admin_normal"{!__CONFIG_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -57,8 +57,8 @@
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_MODREG--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_MODREG--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
-                       name="cache_modreg" value="Y" class="admin_normal"{--__MODREG_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_modreg" value="N" class="admin_normal"{--__MODREG_N--}>&nbsp;{--NO--}&nbsp;
+                       name="cache_modreg" value="Y" class="admin_normal"{!__MODREG_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_modreg" value="N" class="admin_normal"{!__MODREG_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -68,9 +68,9 @@
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_REFDEPTH--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_REFDEPTH--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
-                       name="cache_refdepth" value="Y" class="admin_normal"{--__REFDEPTH_Y--}>&nbsp;{--YES--}
+                       name="cache_refdepth" value="Y" class="admin_normal"{!__REFDEPTH_Y!}>&nbsp;{--YES--}
                <INPUT type="radio" name="cache_refdepth" value="N"
                <INPUT type="radio" name="cache_refdepth" value="N"
-                       class="admin_normal"{--__REFDEPTH_N--}>&nbsp;{--NO--}&nbsp;</TD>
+                       class="admin_normal"{!__REFDEPTH_N!}>&nbsp;{--NO--}&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="2" class="seperator" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="2" class="seperator" height="10">&nbsp;</TD>
@@ -79,8 +79,8 @@
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_REFSYS--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_REFSYS--}</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="radio"
-                       name="cache_refsys" value="Y" class="admin_normal"{--__REFSYS_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="cache_refsys" value="N" class="admin_normal"{--__REFSYS_N--}>&nbsp;{--NO--}&nbsp;
+                       name="cache_refsys" value="Y" class="admin_normal"{!__REFSYS_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="cache_refsys" value="N" class="admin_normal"{!__REFSYS_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -90,7 +90,7 @@
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_PATH--}:</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="text"
                <TD align="right" width="350" height="20">
                {--ADMIN_CACHE_PATH--}:</TD>
                <TD width="150" style="padding-left: 10px"><INPUT type="text"
-                       name="cache_path" class="admin_normal" value="{--__PATH--}" size="10"
+                       name="cache_path" class="admin_normal" value="{!__PATH!}" size="10"
                        maxlength="255"></TD>
        </TR>
        <TR>
                        maxlength="255"></TD>
        </TR>
        <TR>
index a1d8b94c595d370ae9ccf1ba623213d2586faf63..ca976521f786ed745935a28ce02a833b71164bae 100644 (file)
@@ -11,8 +11,8 @@
                <TD class="bottom2" align="right" width="350" height="20">
                {--ADMIN_VERBOSE_SQL--}:</TD>
                <TD class="bottom2" width="150" align="right"><INPUT type="radio"
                <TD class="bottom2" align="right" width="350" height="20">
                {--ADMIN_VERBOSE_SQL--}:</TD>
                <TD class="bottom2" width="150" align="right"><INPUT type="radio"
-                       name="verbose_sql" value="Y" class="admin_normal"{--__VERBOSE_Y--}>&nbsp;{--YES--}
-               <INPUT type="radio" name="verbose_sql" value="N" class="admin_normal"{--__VERBOSE_N--}>&nbsp;{--NO--}&nbsp;
+                       name="verbose_sql" value="Y" class="admin_normal"{!__VERBOSE_Y!}>&nbsp;{--YES--}
+               <INPUT type="radio" name="verbose_sql" value="N" class="admin_normal"{!__VERBOSE_N!}>&nbsp;{--NO--}&nbsp;
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
index edf1c21e9ccb2c06f78bc25602855b1b3f8ed5f1..c4c812f2a4c43e40b6afbec220b4df5239eb6711 100644 (file)
@@ -36,7 +36,7 @@
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__INDEX_COOKIE_SELECTION--}</TD>
+               <TD align="center">{!__INDEX_COOKIE_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
index 86df23dadb93a1bec3ecf0d8827c28ce1f1cd33e..b4f9d1e3eb278ec6edc8cb4dcf49a6208790fd4c 100644 (file)
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="185" align="center"><SELECT name="index_delay"
                        size="1" class="admin_select">
                <TD class="seperator" width="5">&nbsp;</TD>
                <TD width="185" align="center"><SELECT name="index_delay"
                        size="1" class="admin_select">
-                       <OPTION value="-1"{--$content['-1']--}>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
-                       <OPTION value="0"{--$content['0']--}>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
+                       <OPTION value="-1"{--$content[-1]--}>{--ADMIN_INDEX_MANUAL_FORWARD--}</OPTION>
+                       <OPTION value="0"{--$content[0]--}>{--ADMIN_INDEX_NO_DELAY--}</OPTION>
                        <!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen -->
                        <!-- Fuehren Sie dies einfach so weiter, wenn Sie mehr Werte brauchen -->
-                       <OPTION value="1"{--$content['1']--}>1 {--_SECONDS--}</OPTION>
-                       <OPTION value="2"{--$content['2']--}>2 {--_SECONDS--}</OPTION>
-                       <OPTION value="3"{--$content['3']--}>3 {--_SECONDS--}</OPTION>
-                       <OPTION value="4"{--$content['4']--}>4 {--_SECONDS--}</OPTION>
-                       <OPTION value="5"{--$content['5']--}>5 {--_SECONDS--}</OPTION>
-                       <OPTION value="10"{--$content['10']--}>10 {--_SECONDS--}</OPTION>
+                       <OPTION value="1"{--$content[1]--}>1 {--_SECONDS--}</OPTION>
+                       <OPTION value="2"{--$content[2]--}>2 {--_SECONDS--}</OPTION>
+                       <OPTION value="3"{--$content[3]--}>3 {--_SECONDS--}</OPTION>
+                       <OPTION value="4"{--$content[4]--}>4 {--_SECONDS--}</OPTION>
+                       <OPTION value="5"{--$content[5]--}>5 {--_SECONDS--}</OPTION>
+                       <OPTION value="10"{--$content[10]--}>10 {--_SECONDS--}</OPTION>
                </SELECT></TD>
        </TR>
        <TR>
                </SELECT></TD>
        </TR>
        <TR>
@@ -33,7 +33,7 @@
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
        <TR>
                <TD align="right" height="20">{--ADMIN_CONFIG_INDEX_COOKIE--}</TD>
                <TD class="seperator" width="5">&nbsp;</TD>
-               <TD align="center">{--__INDEX_COOKIE_SELECTION--}</TD>
+               <TD align="center">{!__INDEX_COOKIE_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
index 6cbe6eaa6f4560211c7e8fe04a94364bc4b0a55d..07d0e99556a2d9efa0a70f3bf15ad66de9cf1a6e 100644 (file)
@@ -13,7 +13,7 @@
                <TD width="400" align="right">{--ADMIN_NICKNAME_MIN_LENGTH--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_len"
                <TD width="400" align="right">{--ADMIN_NICKNAME_MIN_LENGTH--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_len"
-                       class="admin_normal" value="{--__NICKNAME_LENGTH--}" size="3"
+                       class="admin_normal" value="{!__NICKNAME_LENGTH!}" size="3"
                        maxlength="4"></TD>
        </TR>
        <TR>
                        maxlength="4"></TD>
        </TR>
        <TR>
@@ -23,7 +23,7 @@
                <TD width="400" align="right">{--ADMIN_NICKNAME_PATTERN--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_pattern"
                <TD width="400" align="right">{--ADMIN_NICKNAME_PATTERN--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_pattern"
-                       class="admin_normal" value="{--__NICKNAME_PATTERN--}" size="10"
+                       class="admin_normal" value="{!__NICKNAME_PATTERN!}" size="10"
                        maxlength="255"></TD>
        </TR>
        <TR>
                        maxlength="255"></TD>
        </TR>
        <TR>
@@ -33,7 +33,7 @@
                <TD width="400" align="right">{--ADMIN_NICKNAME_LANG_CHARS--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_chars"
                <TD width="400" align="right">{--ADMIN_NICKNAME_LANG_CHARS--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="nickname_chars"
-                       class="admin_normal" value="{--__NICKNAME_LANG_CHARS--}" size="15"
+                       class="admin_normal" value="{!__NICKNAME_LANG_CHARS!}" size="15"
                        maxlength="255"></TD>
        </TR>
        <TR>
                        maxlength="255"></TD>
        </TR>
        <TR>
index 1433ffeffca07cc202c7efd017319fa577e39a39..159aeb4ac372132a3dfec7ec8ed49a55b0df3388 100644 (file)
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_MAX--}:&nbsp;<INPUT
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_MAX--}:&nbsp;<INPUT
-                       type="radio" name="order_max_full" class="admin_normal" value="MAX"{--__MAX_DEFAULT--}>
+                       type="radio" name="order_max_full" class="admin_normal" value="MAX"{!__MAX_DEFAULT!}>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_ORDER--}:&nbsp;<INPUT
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_ORDER--}:&nbsp;<INPUT
-                       type="radio" name="order_max_full" class="admin_normal" value="ORDER"{--__ORDER_DEFAULT--}>
+                       type="radio" name="order_max_full" class="admin_normal" value="ORDER"{!__ORDER_DEFAULT!}>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275"><SELECT name="order_select"
                        class="admin_select" size="1">
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275"><SELECT name="order_select"
                        class="admin_select" size="1">
-                       {--__ORDER_SELECT--}
+                       {!__ORDER_SELECT!}
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">
                        <SELECT name="order_mode" class="admin_select" size="1">
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">
                        <SELECT name="order_mode" class="admin_select" size="1">
-                               <OPTION value="ASC"{--__ASC_DEFAULT--}">{--SORT_ASCENDING--}</OPTION>
-                               <OPTION value="DESC"{--__DESC_DEFAULT--}">{--SORT_DESCENDING--}</OPTION>
+                               <OPTION value="ASC"{!__ASC_DEFAULT!}">{--SORT_ASCENDING--}</OPTION>
+                               <OPTION value="DESC"{!__DESC_DEFAULT!}">{--SORT_DESCENDING--}</OPTION>
                        </SELECT>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                        </SELECT>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
index 0b118d728d3281d3c162c789ac106182e2441b7b..5b3404587cd7d4cbf44a7ebee112110494f7bb6c 100644 (file)
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_MAX--}:&nbsp;<INPUT
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_MAX--}:&nbsp;<INPUT
-                       type="radio" name="order_max_full" class="admin_normal" value="MAX"{--__MAX_DEFAULT--}>
+                       type="radio" name="order_max_full" class="admin_normal" value="MAX"{!__MAX_DEFAULT!}>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_ORDER--}:&nbsp;<INPUT
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="center" width="275">{--ORDER_ADMIN_ORDER--}:&nbsp;<INPUT
-                       type="radio" name="order_max_full" class="admin_normal" value="ORDER"{--__ORDER_DEFAULT--}>
+                       type="radio" name="order_max_full" class="admin_normal" value="ORDER"{!__ORDER_DEFAULT!}>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
@@ -39,7 +39,8 @@
        </TR>
        <TR>
                <TD colspan="5" height="30" class="admin_title bottom2" align="center">
        </TR>
        <TR>
                <TD colspan="5" height="30" class="admin_title bottom2" align="center">
-               <STRONG>{--ORDER_ADMIN_MISC_SETTINGS--}:</STRONG></TD>
+                       <STRONG>{--ORDER_ADMIN_MISC_SETTINGS--}:</STRONG>
+               </TD>
        </TR>
        <TR>
                <TD colspan="5" height="7" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="5" height="7" class="seperator">&nbsp;</TD>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="275">
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="275">
-               {--ORDER_MIN_RECEIVER_PER_ORDER--}:</TD>
+                       {--ORDER_MIN_RECEIVER_PER_ORDER--}:
+               </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center" width="275"><INPUT type="input"
-                       name="order_min" class="admin_normal" value="{--__MIN_VALUE!}"
-                       size="5" maxlength="20"></TD>
+               <TD align="center" width="275">
+                       <INPUT type="input" name="order_min" class="admin_normal" value="{!__MIN_VALUE!}" size="5" maxlength="20" />
+               </TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
index db6c0cc9274e032dc7c5ebd4160261214da7e595..428972eebfee8d6f7ca7a651cea5ccc270817a38 100644 (file)
@@ -1,6 +1,4 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={--__RALLYE_ID--}"
-       method="POST" style="margin-bottom: 10px">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
        class="admin_table dashed">
        <TR>
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
        class="admin_table dashed">
        <TR>
index cd339b7b8882f096777f354cbc6b88b040261318..abca671a7fd289b05437961159031bb76099fdba 100644 (file)
@@ -1,8 +1,5 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={--__RALLYE_ID--}"
-       method="POST" style="margin-bottom: 10px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       class="admin_table dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" class="admin_table dashed">
        <TR>
                <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_SELECTED_PRICES--}</STRONG>
                </TD>
        <TR>
                <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_SELECTED_PRICES--}</STRONG>
                </TD>
index 00c9d16a884a553c665b92ecdc291bac885f748e..8c289b469019da168f60a69ed18bf4fcf008d3e7 100644 (file)
@@ -1,8 +1,5 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={--__RALLYE_ID--}"
-       method="POST" style="margin-bottom: 10px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="580"
-       class="admin_table dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_rallye_prices&amp;rallye={!__RALLYE_ID!}" method="POST" style="margin-bottom: 10px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
        <TR>
                <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_DEL_PRICES--}</STRONG>
                </TD>
        <TR>
                <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_EDIT_DEL_PRICES--}</STRONG>
                </TD>
index 2f01f009a285deec35d58cfb836ac64b495310c1..d52e1f3db661d461e13d17eb1b016fea957526a0 100644 (file)
@@ -30,8 +30,8 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD colspan="2"><SELECT name="refid_target" size="1"
                        class="admin_select">
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD colspan="2"><SELECT name="refid_target" size="1"
                        class="admin_select">
-                       <OPTION value="register"{--__DEF_RT_REGISTER--}">{--ADMIN_REF_TARGET_REGISTER--}</OPTION>
-                       <OPTION value="index"{--__DEF_RT_INDEX--}">{--ADMIN_REF_TARGET_INDEX--}</OPTION>
+                       <OPTION value="register"{!__DEF_RT_REGISTER!}">{--ADMIN_REF_TARGET_REGISTER--}</OPTION>
+                       <OPTION value="index"{!__DEF_RT_INDEX!}">{--ADMIN_REF_TARGET_INDEX--}</OPTION>
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
index 7c90d629a2c8bf635050b984db09f81b0908363f..328ec85517d2d907dd2cc1f4181d03cf42c9d0f8 100644 (file)
@@ -27,7 +27,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--DISPLAY_REFID--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--DISPLAY_REFID--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__CFG_SHOW_REFID--}</TD>
+               <TD align="center">{!__CFG_SHOW_REFID!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -37,7 +37,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--IP_TIMEOUT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--IP_TIMEOUT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD>{--__TIMEOUT_SELECTION--}</TD>
+               <TD>{!__TIMEOUT_SELECTION!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
index 87968330889a5173ab4345274dcbf7865f2cec5d..b5c65388edc93518d434e0b9ce6f476c173d0396 100644 (file)
@@ -1,8 +1,5 @@
-<FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=config_register2"
-       method="POST">
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-       class="admin_table dashed" width="430">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=config_register2" method="POST">
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" class="admin_table dashed" width="430">
        <TR>
                <TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
                <TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_REGFORM_SETTINGS--}</STRONG>
        <TR>
                <TD class="admin_title bottom2 seperator" height="30" width="10">&nbsp;</TD>
                <TD class="admin_title bottom2" colspan="3" align="center"><STRONG>{--EDIT_REGFORM_SETTINGS--}</STRONG>
@@ -28,7 +25,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="250">{--ADMIN_CFG_REGISTER_DEFAULT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="250">{--ADMIN_CFG_REGISTER_DEFAULT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center" width="150">{--__CFG_CAT_DEFAULT--}</TD>
+               <TD align="center" width="150">{!__CFG_CAT_DEFAULT!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -38,7 +35,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__CFG_SHOW_REFID--}</TD>
+               <TD align="center">{!__CFG_SHOW_REFID!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -48,7 +45,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--IP_TIMEOUT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right">{--IP_TIMEOUT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__TIMEOUT_SELECTION--}</TD>
+               <TD align="center">{!__TIMEOUT_SELECTION!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -58,7 +55,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="280">{--REJECT_DOUBLE_EMAIL--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="280">{--REJECT_DOUBLE_EMAIL--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__CFG_DBL_EMAIL--}</TD>
+               <TD align="center">{!__CFG_DBL_EMAIL!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -68,7 +65,7 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="280">{--REJECT_DOUBLE_PASS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD align="right" width="280">{--REJECT_DOUBLE_PASS--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__CFG_DBL_PASS--}</TD>
+               <TD align="center">{!__CFG_DBL_PASS!}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
index b425ada0766965b94b7e99bdb15b0383b05ca86e..3ce0df97c4468198b91e5db00f8fa3576194259e 100644 (file)
@@ -16,7 +16,7 @@
                <TD align="right" width="280">{--MIN_PASS_LENGTH--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="pass_len" class="admin_normal"
                <TD align="right" width="280">{--MIN_PASS_LENGTH--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="pass_len" class="admin_normal"
-                       size="3" maxlength="3" value="{--__PASS_LEN--}"></TD>
+                       size="3" maxlength="3" value="{!__PASS_LEN!}"></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
@@ -27,7 +27,7 @@
                <TD align="right" width="280">{--ADMIN_SALT_LENGTH--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="salt_length" class="admin_normal"
                <TD align="right" width="280">{--ADMIN_SALT_LENGTH--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="salt_length" class="admin_normal"
-                       size="3" maxlength="3" value="{--__SALT_LENGTH--}"></TD>
+                       size="3" maxlength="3" value="{!__SALT_LENGTH!}"></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
index 59f5a23d767f9c426fb205a3e03b39cd8b39d862..7f0c6ae35ecfa8883d350d27fe9accd4c03dc865 100644 (file)
@@ -11,7 +11,7 @@
     {--ADMIN_SPONSOR_MIN_POINTS--}:
   </TD>
   <TD width="150" align="center">
     {--ADMIN_SPONSOR_MIN_POINTS--}:
   </TD>
   <TD width="150" align="center">
-    <INPUT type="text" class="admin_normal" name="sponsor_min_points" size="12" maxlength="20" value="{--__SPONSOR_MIN_POINTS--}">
+    <INPUT type="text" class="admin_normal" name="sponsor_min_points" size="12" maxlength="20" value="{!__SPONSOR_MIN_POINTS!}">
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator" height="5">&nbsp;</TD></TR>
@@ -20,7 +20,7 @@
     {--ADMIN_SPONSOR_REF_POINTS--}:
   </TD>
   <TD width="150" align="center">
     {--ADMIN_SPONSOR_REF_POINTS--}:
   </TD>
   <TD width="150" align="center">
-    <INPUT type="text" class="admin_normal" name="sponsor_ref_points" size="12" maxlength="20" value="{--__SPONSOR_REF_POINTS--}">
+    <INPUT type="text" class="admin_normal" name="sponsor_ref_points" size="12" maxlength="20" value="{!__SPONSOR_REF_POINTS!}">
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator bottom2" height="5">&nbsp;</TD></TR>
   </TD>
 </TR>
 <TR><TD colspan="2" class="seperator bottom2" height="5">&nbsp;</TD></TR>
index d87f7adf4b568355344447c9c37123ca343860e1..939871a452acb0a54e8a8392d5d8f48567b2b093 100644 (file)
@@ -14,7 +14,7 @@
                <FONT class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</FONT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="50"><INPUT type="radio" name="guest_stats"
                <FONT class="tiny">({--ADMIN_GSTATS_MEMBERS_NOTE--})</FONT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="50"><INPUT type="radio" name="guest_stats"
-                       class="admin_normal" value="members"{--__MEMBERS_RADIO--}></TD>
+                       class="admin_normal" value="members"{!__MEMBERS_RADIO!}></TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
@@ -27,7 +27,7 @@
                <FONT class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
                <FONT class="tiny">({--ADMIN_GSTATS_MODULES_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
-                       value="modules"{--__MODULES_RADIO--}></TD>
+                       value="modules"{!__MODULES_RADIO!}></TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
@@ -40,7 +40,7 @@
                <FONT class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
                <FONT class="tiny">({--ADMIN_GSTATS_INACTIVE_NOTE--})</FONT></TD>
                <TD class="seperator">&nbsp;</TD>
                <TD><INPUT type="radio" name="guest_stats" class="admin_normal"
-                       value="inactive"{--__INACTIVE_RADIO--}></TD>
+                       value="inactive"{!__INACTIVE_RADIO!}></TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator bottom2">&nbsp;</TD>
@@ -56,7 +56,7 @@
                <TD height="40" align="right">{--ADMIN_MEMBER_STATS_LIMIT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="stats_limit" class="admin_normal"
                <TD height="40" align="right">{--ADMIN_MEMBER_STATS_LIMIT--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><INPUT type="text" name="stats_limit" class="admin_normal"
-                       value="{--__STATS_LIMIT--}" size="4" maxlength="20"></TD>
+                       value="{!__STATS_LIMIT!}" size="4" maxlength="20"></TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="5" class="seperator">&nbsp;</TD>
index 47a9711d7de5ce96dfe12020e0d1feaa4fb8ba28..e0cee5cd643ea51acbcc3a7d5ec0cccd72d01add 100644 (file)
@@ -88,7 +88,7 @@
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}
                </TD>
                <TD>
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--}
                </TD>
                <TD>
-                       <INPUT type="radio" name="surfbar_pay_model" value="STATIC"{--__CONFIG_SURFBAR_PAY_MODEL_STATIC--} />
+                       <INPUT type="radio" name="surfbar_pay_model" value="STATIC"{!__CONFIG_SURFBAR_PAY_MODEL_STATIC!} />
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -96,7 +96,7 @@
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--}
                </TD>
                <TD>
                        {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--}
                </TD>
                <TD>
-                       <INPUT type="radio" name="surfbar_pay_model" value="DYNAMIC"{--__CONFIG_SURFBAR_PAY_MODEL_DYNAMIC--} />
+                       <INPUT type="radio" name="surfbar_pay_model" value="DYNAMIC"{!__CONFIG_SURFBAR_PAY_MODEL_DYNAMIC!} />
                </TD>
        </TR>
        <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
                </TD>
        </TR>
        <TR><TD height="3" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
        <TR><TD height="8" colspan="2" class="seperator">&nbsp;</TD></TR>
        <TR>
                <TD align="center" colspan="2">
        <TR><TD height="8" colspan="2" class="seperator">&nbsp;</TD></TR>
        <TR>
                <TD align="center" colspan="2">
-                       <INPUT type="radio" name="surfbar_autostart" value="Y"{--__CONFIG_SURFBAR_AUTOSTART_Y--} /> {--YES--}
-                       <INPUT type="radio" name="surfbar_autostart" value="N"{--__CONFIG_SURFBAR_AUTOSTART_N--} /> {--NO--}
+                       <INPUT type="radio" name="surfbar_autostart" value="Y"{!__CONFIG_SURFBAR_AUTOSTART_Y!} />&nbsp;{--YES--}
+                       <INPUT type="radio" name="surfbar_autostart" value="N"{!__CONFIG_SURFBAR_AUTOSTART_N!} />&nbsp;{--NO--}
                </TD>
        </TR>
        <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
                </TD>
        </TR>
        <TR><TD height="8" colspan="2" class="seperator bottom2">&nbsp;</TD></TR>
index ed5bd1176e1422390023d04e1a3705a92ba93ef0..70626c5da81d323fe510c2151ef51956b06a81ae 100644 (file)
@@ -12,7 +12,7 @@
        <TR>
                <TD width="400" align="right">{--ADMIN_TITLE_ENABLE_DECORATIONS--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
        <TR>
                <TD width="400" align="right">{--ADMIN_TITLE_ENABLE_DECORATIONS--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD width="170">{--__CFG_TITLE_DECOS--}</TD>
+               <TD width="170">{!__CFG_TITLE_DECOS!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -20,7 +20,7 @@
        <TR>
                <TD align="right">{--ADMIN_TITLE_ENABLE_MODULE_TITLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_TITLE_ENABLE_MODULE_TITLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD>{--__CFG_TITLE_MOD_SHOW--}</TD>
+               <TD>{!__CFG_TITLE_MOD_SHOW!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -28,7 +28,7 @@
        <TR>
                <TD align="right">{--ADMIN_TITLE_ENABLE_WHAT_TITLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_TITLE_ENABLE_WHAT_TITLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD>{--__CFG_TITLE_WHAT_SHOW--}</TD>
+               <TD>{!__CFG_TITLE_WHAT_SHOW!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom2" height="5">&nbsp;</TD>
@@ -44,7 +44,7 @@
                <TD align="right">{--ADMIN_TITLE_LEFT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_left" class="admin_normal"
                <TD align="right">{--ADMIN_TITLE_LEFT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_left" class="admin_normal"
-                       value="{--__CFG_TITLE_LEFT--}" size="4" maxlength="10"></TD>
+                       value="{!__CFG_TITLE_LEFT!}" size="4" maxlength="10"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -53,7 +53,7 @@
                <TD align="right">{--ADMIN_TITLE_MIDDLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_middle" class="admin_normal"
                <TD align="right">{--ADMIN_TITLE_MIDDLE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_middle" class="admin_normal"
-                       value="{--__CFG_TITLE_MIDDLE--}" size="4" maxlength="10"></TD>
+                       value="{!__CFG_TITLE_MIDDLE!}" size="4" maxlength="10"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -62,7 +62,7 @@
                <TD align="right">{--ADMIN_TITLE_RIGHT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_right" class="admin_normal"
                <TD align="right">{--ADMIN_TITLE_RIGHT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="title_right" class="admin_normal"
-                       value="{--__CFG_TITLE_RIGHT--}" size="4" maxlength="10"></TD>
+                       value="{!__CFG_TITLE_RIGHT!}" size="4" maxlength="10"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="bottom2 seperator" height="5">&nbsp;</TD>
index 2e2ebe2314e5a825aa71814b85f8cbfd2edf430e..c99adaf675d8a999d65e4d5507ea49c8a0e59178 100644 (file)
@@ -13,7 +13,7 @@
                <TD width="360" align="right">{--ADMIN_TRANSFER_MAX--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="210"><INPUT type="text" name="transfer_max"
                <TD width="360" align="right">{--ADMIN_TRANSFER_MAX--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="210"><INPUT type="text" name="transfer_max"
-                       class="admin_normal" value="{--__TRANS_MAX_VALUE!}" size="4"
+                       class="admin_normal" value="{!__TRANS_MAX_VALUE!}" size="4"
                        maxlength="6"></TD>
        </TR>
        <TR>
                        maxlength="6"></TD>
        </TR>
        <TR>
@@ -22,7 +22,7 @@
        <TR>
                <TD align="right">{--ADMIN_TRANSFER_AGE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_TRANSFER_AGE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD>{--__TRANS_AGE_SELECTION--}</TD>
+               <TD>{!__TRANS_AGE_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -30,7 +30,7 @@
        <TR>
                <TD align="right">{--ADMIN_TRANSFER_TIMEOUT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
        <TR>
                <TD align="right">{--ADMIN_TRANSFER_TIMEOUT--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD>{--__TRANS_TIMEOUT_SELECTION--}</TD>
+               <TD>{!__TRANS_TIMEOUT_SELECTION!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -39,7 +39,7 @@
                <TD align="right">{--ADMIN_TRANSFER_BALANCE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="transfer_balance"
                <TD align="right">{--ADMIN_TRANSFER_BALANCE--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="transfer_balance"
-                       class="admin_normal" value="{--__TRANS_BALANCE_VALUE!}" size="4"
+                       class="admin_normal" value="{!__TRANS_BALANCE_VALUE!}" size="4"
                        maxlength="6">&nbsp;<FONT class="tiny">({!POINTS!})</FONT></TD>
        </TR>
        <TR>
                        maxlength="6">&nbsp;<FONT class="tiny">({!POINTS!})</FONT></TD>
        </TR>
        <TR>
@@ -50,7 +50,7 @@
                <FONT class="admin_note">({--ADMIN_TRANSFER_CODE_NOTE--})</FONT></TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="transfer_code" class="admin_normal"
                <FONT class="admin_note">({--ADMIN_TRANSFER_CODE_NOTE--})</FONT></TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD><INPUT type="text" name="transfer_code" class="admin_normal"
-                       value="{--__TRANS_CODE_VALUE!}" size="4" maxlength="6"></TD>
+                       value="{!__TRANS_CODE_VALUE!}" size="4" maxlength="6"></TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -59,8 +59,8 @@
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TRANSFER--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SELECT name="ap_transfer" size="1" class="admin_select">
                <TD align="right" width="250">{--ADMIN_AUTOPURGE_TRANSFER--}</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SELECT name="ap_transfer" size="1" class="admin_select">
-                       <OPTION value="Y"{--__YES_IN--}>{--YES--}</OPTION>
-                       <OPTION value="N"{--__NO_IN--}>{--NO--}</OPTION>
+                       <OPTION value="Y"{!__YES_IN!}>{--YES--}</OPTION>
+                       <OPTION value="N"{!__NO_IN!}>{--NO--}</OPTION>
                </SELECT></TD>
        </TR>
        <TR>
                </SELECT></TD>
        </TR>
        <TR>
index b33525cbdc221432798373a04d780fc6ab4f9724..ac72130a298c4617901c62ccf1d6b01e3fea4b5d 100644 (file)
@@ -13,7 +13,7 @@
                <TD width="400" align="right">{--USER_ADMIN_LIMIT_USER--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="user_limit"
                <TD width="400" align="right">{--USER_ADMIN_LIMIT_USER--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="user_limit"
-                       class="admin_normal" value="{--__LIMIT_VALUE!}" size="4"
+                       class="admin_normal" value="{!__LIMIT_VALUE!}" size="4"
                        maxlength="6"></TD>
        </TR>
        <TR>
                        maxlength="6"></TD>
        </TR>
        <TR>
@@ -23,7 +23,7 @@
                <TD width="400" align="right">{--USER_ADMIN_ALPHA_USER--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="user_alpha"
                <TD width="400" align="right">{--USER_ADMIN_ALPHA_USER--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD width="170"><INPUT type="text" name="user_alpha"
-                       class="admin_normal" value="{--__ALPHA_VALUE!}" size="4"
+                       class="admin_normal" value="{!__ALPHA_VALUE!}" size="4"
                        maxlength="6"></TD>
        </TR>
        <TR>
                        maxlength="6"></TD>
        </TR>
        <TR>
index e9fda09f1d6ee0e0f9c6bc73d48abe7c872f8195..63d71857c831db15a75f353fdc732537c312c15b 100644 (file)
@@ -13,7 +13,7 @@
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
-  <TD align="center"><A href="mailto:{--__EMAIL--}">{!__SNAME!} {!__FNAME!}</A>({!__EMAIL!})</TD>
+  <TD align="center"><A href="mailto:{!__EMAIL!}">{!__SNAME!} {!__FNAME!}</A>({!__EMAIL!})</TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
index 1902418dc1bb5dbe734250dc504ce83b68ff69db..a1c9ca52d1e6a075910b4f365764d2ca75105d23 100644 (file)
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id={--__SPONSOR_ID--}" method="POST">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=add_points&amp;id={!__SPONSOR_ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
     {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<BR />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
     {--ADMIN_ADD_POINTS_TO_SPONSOR--}:<BR />
-    <STRONG>{--__SPONSOR_VALUE--}</STRONG>
+    <STRONG>{!__SPONSOR_VALUE!}</STRONG>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
index 8b57adf05220796a89cba1c6054b7e39286b68a9..8468f8cb9e8b71d5425bd44dbef698c058b7b800 100644 (file)
@@ -1,8 +1,8 @@
-<DIV align="center"><FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=edit" method="POST">
+<DIV align="center"><FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed" align="center">
 <TR>
   <TD colspan="5" align="center" class="admin_title bottom2" height="30">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed" align="center">
 <TR>
   <TD colspan="5" align="center" class="admin_title bottom2" height="30">
-    <STRONG>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({--__SPONSOR_ID--})</STRONG>
+    <STRONG>{--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({!__SPONSOR_ID!})</STRONG>
   </TD>
 </TR>
 <TR>
   </TD>
 </TR>
 <TR>
@@ -20,7 +20,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="255">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="255">
-    <INPUT type="text" name="company" class="admin_normal" size="20" maxlength="255" value="{--__COMPANY--}">
+    <INPUT type="text" name="company" class="admin_normal" size="20" maxlength="255" value="{!__COMPANY!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -31,7 +31,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="position" class="admin_normal" size="20" maxlength="255" value="{--__POSITION--}">
+    <INPUT type="text" name="position" class="admin_normal" size="20" maxlength="255" value="{!__POSITION!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -42,7 +42,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="tax_ident" class="admin_normal" size="20" maxlength="255" value="{--__TAX_IDENT--}">
+    <INPUT type="text" name="tax_ident" class="admin_normal" size="20" maxlength="255" value="{!__TAX_IDENT!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
 <TR>
   <TD width="10">&nbsp;</TD>
   <TD width="295" align="right" height="21">
 <TR>
   <TD width="10">&nbsp;</TD>
   <TD width="295" align="right" height="21">
-    {--GUEST_SEX--}:
+    {--GUEST_GENDER--}:
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="255">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="255">
-    <SELECT name="salut" class="admin_select" size="1">
-      <OPTION value="M"{--__SALUT_M--}">{--SEX_M--}</OPTION>
-      <OPTION value="F"{--__SALUT_F--}">{--SEX_F--}</OPTION>
-      <OPTION value="C"{--__SALUT_C--}">{--SEX_C--}</OPTION>
+    <SELECT name="gender" class="admin_select" size="1">
+      <OPTION value="M"{!__GENDER_M!}">{--GENDER_M--}</OPTION>
+      <OPTION value="F"{!__GENDER_F!}">{--GENDER_F--}</OPTION>
+      <OPTION value="C"{!__GENDER_C!}">{--GENDER_C--}</OPTION>
     </SELECT>
   </TD>
   <TD width="10">&nbsp;</TD>
     </SELECT>
   </TD>
   <TD width="10">&nbsp;</TD>
@@ -78,8 +78,8 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="surname" class="admin_normal" size="8" maxlength="255" value="{--__SURNAME--}">
-    <INPUT type="text" name="family" class="admin_normal" size="8" maxlength="255" value="{--__FAMILY--}">
+    <INPUT type="text" name="surname" class="admin_normal" size="8" maxlength="255" value="{!__SURNAME!}">
+    <INPUT type="text" name="family" class="admin_normal" size="8" maxlength="255" value="{!__FAMILY!}">
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
@@ -91,7 +91,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="street_nr1" class="admin_normal" size="20" maxlength="255" value="{--__STREET1--}">
+    <INPUT type="text" name="street_nr1" class="admin_normal" size="20" maxlength="255" value="{!__STREET1!}">
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="street_nr2" class="admin_normal" size="20" maxlength="255" value="{--__STREET2--}">
+    <INPUT type="text" name="street_nr2" class="admin_normal" size="20" maxlength="255" value="{!__STREET2!}">
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="country" class="admin_normal" size="2" maxlength="3" value="{--__COUNTRY--}">-<INPUT type="text" name="zip" class="admin_normal" size="5" maxlength="6" value="{--__ZIP--}">
-    <INPUT type="text" name="city" class="admin_normal" size="15" maxlength="255" value="{--__CITY--}">
+    <INPUT type="text" name="country" class="admin_normal" size="2" maxlength="3" value="{!__COUNTRY!}">-<INPUT type="text" name="zip" class="admin_normal" size="5" maxlength="6" value="{!__ZIP!}">
+    <INPUT type="text" name="city" class="admin_normal" size="15" maxlength="255" value="{!__CITY!}">
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="phone" class="admin_normal" size="20" maxlength="255" value="{--__PHONE--}">
+    <INPUT type="text" name="phone" class="admin_normal" size="20" maxlength="255" value="{!__PHONE!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="fax" class="admin_normal" size="20" maxlength="255" value="{--__FAX--}">
+    <INPUT type="text" name="fax" class="admin_normal" size="20" maxlength="255" value="{!__FAX!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="cell" class="admin_normal" size="20" maxlength="255" value="{--__CELL--}">
+    <INPUT type="text" name="cell" class="admin_normal" size="20" maxlength="255" value="{!__CELL!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="email" class="admin_normal" size="30" maxlength="255" value="{--__EMAIL--}">
+    <INPUT type="text" name="email" class="admin_normal" size="30" maxlength="255" value="{!__EMAIL!}">
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="url" class="admin_normal" size="30" maxlength="255" value="{--__URL--}">
+    <INPUT type="text" name="url" class="admin_normal" size="30" maxlength="255" value="{!__URL!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    {--__INTERVAL--}
+    {!__INTERVAL!}
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
index f4c2d8d8f72d89da57df5bfff916e8d8c004ca73..95f44ecfd40a80d58c25a39201f04dae4c9a3657 100644 (file)
@@ -1,10 +1,10 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id={--__SPONSOR_ID--}" method="POST">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;mode=sub_points&amp;id={!__SPONSOR_ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
     {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<BR />
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR><TD class="admin_title seperator" height="10" colspan="3">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_title" colspan="3" align="center">
     {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:<BR />
-    <STRONG>{--__SPONSOR_VALUE--}</STRONG>
+    <STRONG>{!__SPONSOR_VALUE!}</STRONG>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
   </TD>
 </TR>
 <TR><TD class="admin_title seperator bottom2" height="10" colspan="3">&nbsp;</TD></TR>
index 3a189f2178efc5283555935143b09a886383fbc2..0996c2a9db454ab258e5335372e75b889581e3c2 100644 (file)
@@ -8,13 +8,13 @@
                <STRONG>{--ADMIN_EDIT_USER_PROFILE--}: ($content)</STRONG></TD>
        </TR>
        <TR>
                <STRONG>{--ADMIN_EDIT_USER_PROFILE--}: ($content)</STRONG></TD>
        </TR>
        <TR>
-               <TD width="195" align="right" height="21">{--SEX--}:</TD>
+               <TD width="195" align="right" height="21">{--GENDER--}:</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
                <TD class="seperator" width="10">&nbsp;</TD>
-               <TD width="195"><SELECT name="salut" class="admin_select"
+               <TD width="195"><SELECT name="gender" class="admin_select"
                        size="1">
                        size="1">
-                       <OPTION value="M"{!_SEX_M!}">{--SEX_M--}</OPTION>
-                       <OPTION value="F"{!_SEX_F!}">{--SEX_F--}</OPTION>
-                       <OPTION value="C"{!_SEX_C!}">{--SEX_C--}</OPTION>
+                       <OPTION value="M"{!_GENDER_M!}">{--GENDER_M--}</OPTION>
+                       <OPTION value="F"{!_GENDER_F!}">{--GENDER_F--}</OPTION>
+                       <OPTION value="C"{!_GENDER_C!}">{--GENDER_C--}</OPTION>
                </SELECT></TD>
        </TR>
        <TR>
                </SELECT></TD>
        </TR>
        <TR>
index 9e8fef153ae5bb6cc87bfe547494af9ea46ae87b..cfc8cf9a3675f0bc23399d1e363ddf593ad10f1f 100644 (file)
@@ -1,11 +1,10 @@
 <TR>
 <TR>
-       <TD class="admin_title{!__NAV_TOP!}" colspan="{!__NAV_COLSPAN!}"
-               align="center">
+       <TD class="admin_title{!__NAV_TOP!}" colspan="{!__NAV_COLSPAN!}" align="center">
        <TABLE border="0" cellspacing="0" cellpadding="0" width="520">
                {!__NAV_SEP!}
                <TR>
                        <TD class="admin_pagenav" align="left">
        <TABLE border="0" cellspacing="0" cellpadding="0" width="520">
                {!__NAV_SEP!}
                <TR>
                        <TD class="admin_pagenav" align="left">
-                       [&nbsp;{--EMAILS_PAGENAV--}:&nbsp;{--__NAV_OUTPUT--}&nbsp;]</TD>
+                       [&nbsp;{--EMAILS_PAGENAV--}:&nbsp;{!__NAV_OUTPUT!}&nbsp;]</TD>
                </TR>
                <TR>
                        <TD colspan="{!__NAV_COLSPAN!}" class="seperator">&nbsp;</TD>
                </TR>
                <TR>
                        <TD colspan="{!__NAV_COLSPAN!}" class="seperator">&nbsp;</TD>
index f7f9934e4e2d5085594da70045216f87227dc963..a611fe1677fd68aad1ce436d4163c067eaad8db1 100644 (file)
@@ -19,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR />
+               <TD align="center" class="admin_table">{!__WHAT_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -30,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR />
+               <TD align="center" class="admin_table">{!__ACTION_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -41,7 +41,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__BELOW_SELECTION--}</TD>
+               <TD align="center" class="admin_table">{!__BELOW_SELECTION!}</TD>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
index 0d6c9a14d29f7adf39c07f20fcc5e105c5a5f39e..87cb8a4c02133b86e9c936bae1c24007ed6a3a27 100644 (file)
@@ -2,7 +2,7 @@
        class="admin_table dashed">
        <TR>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}</STRONG></TD>
        class="admin_table dashed">
        <TR>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--_UID--}</STRONG></TD>
-               <TD class="admin_title bottom2 right2" align="center"><STRONG>{--SEX--}</STRONG></TD>
+               <TD class="admin_title bottom2 right2" align="center"><STRONG>{--GENDER--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--SURNAME--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--FAMILY_NAME--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADDY--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--SURNAME--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--FAMILY_NAME--}</STRONG></TD>
                <TD class="admin_title bottom2 right2" align="center"><STRONG>{--ADDY--}</STRONG></TD>
index 44c5f4355097507e427bb7580d046ba397724653..4ee80e8c824d93996d649d210b76657676f86c5d 100644 (file)
@@ -1,6 +1,6 @@
 <TR>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[uid]</TD>
 <TR>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[uid]</TD>
-       <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[sex]</TD>
+       <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[gender]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[sname]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[fname]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[email]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[sname]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[fname]</TD>
        <TD align="center" class="switch_sw$content[sw] bottom2 right2">$content[email]</TD>
index 0fccc80105727e67e5d854ba57f798871075ec3d..17e1fc6867da0c8265a62ea29762e0de09de6731 100644 (file)
@@ -3,7 +3,7 @@
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<A
                href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<A
                href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A
-               href="$content[email]">$content[salut] $content[sname]
+               href="$content[email]">$content[gender] $content[sname]
        $content[fname]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[turbo]
        {!POINTS!}</TD>
        $content[fname]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[turbo]
        {!POINTS!}</TD>
index 0fccc80105727e67e5d854ba57f798871075ec3d..17e1fc6867da0c8265a62ea29762e0de09de6731 100644 (file)
@@ -3,7 +3,7 @@
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<A
                href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A
        <TD class="switch_sw$content[sw] bottom2 right2" align="center">$content[win1]<A
                href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id=$content[uid]">$content[uid]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[win1]<A
-               href="$content[email]">$content[salut] $content[sname]
+               href="$content[email]">$content[gender] $content[sname]
        $content[fname]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[turbo]
        {!POINTS!}</TD>
        $content[fname]</A>$content[win2]</TD>
        <TD class="switch_sw$content[sw] bottom2 right2">&nbsp;$content[turbo]
        {!POINTS!}</TD>
index 8fab7cfaa5ccaf692d8ea98d25dc17e03243c730..016c80916ff87f416b31befaf0765a863a0fada4 100644 (file)
@@ -1,9 +1,8 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_country"
-       method="POST">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="520"
-       class="admin_table dashed" align="center">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=list_country" method="POST">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="admin_table dashed" align="center">
        <TR>
        <TR>
-               <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--__COUNTRY_TITLE--}:</STRONG>
+               <TD colspan="4" align="center" class="admin_title" height="30">
+                       <STRONG>{!__COUNTRY_TITLE!}:</STRONG>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -15,9 +14,9 @@
        {!__COUNTRY_ROWS!}
        <TR>
                <TD colspan="4" class="admin_footer">
        {!__COUNTRY_ROWS!}
        <TR>
                <TD colspan="4" class="admin_footer">
-               {--__COUNTRY_RESET--} <INPUT type="submit" name="{--__COUNTRY_MODE--}"
-                       class="{--__COUNTRY_CLASS--}" value="{--__COUNTRY_SUBMIT--}">
+               {!__COUNTRY_RESET!} <INPUT type="submit" name="{!__COUNTRY_MODE!}"
+                       class="{!__COUNTRY_CLASS!}" value="{!__COUNTRY_SUBMIT!}" />
                </TD>
        </TR>
 </TABLE>
                </TD>
        </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</FORM>
index 13baa9e7344803230a49ff2314161295bc9614e1..fbdee00178915586fe9da47796945cfb166f1453 100644 (file)
@@ -1,21 +1,24 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="540"
-       class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="540" class="admin_table dashed">
        <TR>
        <TR>
-               <TD class="admin_title" align="center" height="30" colspan="4"><STRONG
-                       class="big">{--__ADMIN_DOUBLER_LIST_ALREADY--}</STRONG></TD>
+               <TD class="admin_title" align="center" height="30" colspan="4">
+                       <STRONG class="big">{!__ADMIN_DOUBLER_LIST_ALREADY!}</STRONG>
+               </TD>
        </TR>
        <TR>
        </TR>
        <TR>
-               <TD class="admin_title bottom2 right2" align="center" height="25"
-                       width="25%"><STRONG class="medium">{--_UID--}:</STRONG></TD>
+               <TD class="admin_title bottom2 right2" align="center" height="25" width="25%">
+                       <STRONG class="medium">{--_UID--}:</STRONG>
+               </TD>
                <TD class="admin_title bottom2 right2" align="center" width="25%">
                <TD class="admin_title bottom2 right2" align="center" width="25%">
-               <STRONG class="medium">{!POINTS!}:</STRONG></TD>
+                       <STRONG class="medium">{!POINTS!}:</STRONG>
+               </TD>
                <TD class="admin_title bottom2 right2" align="center" width="25%">
                <TD class="admin_title bottom2 right2" align="center" width="25%">
-               <STRONG class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</STRONG>
+                       <STRONG class="medium">{--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}:</STRONG>
+               </TD>
+               <TD class="admin_title bottom2" align="center" width="25%">
+                       <STRONG class="medium">{--REMOTE_IP--}:</STRONG>
                </TD>
                </TD>
-               <TD class="admin_title bottom2" align="center" width="25%"><STRONG
-                       class="medium">{--REMOTE_IP--}:</STRONG></TD>
        </TR>
        </TR>
-       {--__ROWS_CONTENT--}
+       {!__ROWS_CONTENT!}
        <TR>
                <TD colspan="4" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="4" class="seperator">&nbsp;</TD>
        </TR>
index c301e08dab5e5f954e2fcad1349433b2fd4a375b..24086f476a2b5e2af34a61445d9d887f1388f0a3 100644 (file)
@@ -1,8 +1,7 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="540"
-       class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="540" class="admin_table dashed">
        <TR>
                <TD class="admin_title" align="center" height="30" colspan="4"><STRONG
        <TR>
                <TD class="admin_title" align="center" height="30" colspan="4"><STRONG
-                       class="big">{--__ADMIN_DOUBLER_LIST_WAITING--}</STRONG></TD>
+                       class="big">{!__ADMIN_DOUBLER_LIST_WAITING!}</STRONG></TD>
        </TR>
        <TR>
                <TD class="admin_title bottom2 right2" align="center" height="25"
        </TR>
        <TR>
                <TD class="admin_title bottom2 right2" align="center" height="25"
@@ -15,7 +14,7 @@
                <TD class="admin_title bottom2" align="center" width="25%"><STRONG
                        class="medium">{--REMOTE_IP--}:</STRONG></TD>
        </TR>
                <TD class="admin_title bottom2" align="center" width="25%"><STRONG
                        class="medium">{--REMOTE_IP--}:</STRONG></TD>
        </TR>
-       {--__ROWS_CONTENT--}
+       {!__ROWS_CONTENT!}
        <TR>
                <TD colspan="4" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="4" class="seperator">&nbsp;</TD>
        </TR>
index 85195665127fbcabd7eb2e7ebeea522e44bd9f26..de84c5b37ce60ac47c9345e0f0853348bdf76800 100644 (file)
@@ -16,7 +16,7 @@
                {--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<STRONG>{!__TEXT_VALUE!}</STRONG>
        </TD>
        <TD colspan="3" align="right" class="admin_title right2">
                {--ADMIN_EXT_TOTAL_FOUND--}:&nbsp;<STRONG>{!__TEXT_VALUE!}</STRONG>
        </TD>
        <TD colspan="3" align="right" class="admin_title right2">
-               {--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<STRONG>{--__TKBYTES_VALUE!} {--KBYTES--}</STRONG>
+               {--ADMIN_EXT_TOTAL_FSIZE--}:&nbsp;<STRONG>{!__TKBYTES_VALUE!} {--KBYTES--}</STRONG>
        </TD>
 </TR>
 </TABLE>
        </TD>
 </TR>
 </TABLE>
index 1ef17a5adf57df18ac98235a113918cf2b48aef7..aaf7cd3ae7765647af716a0b3abfb51b695aeb37 100644 (file)
@@ -1,15 +1,14 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="500"
-       align="center" class="admin_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
        <TR>
                <TD colspan="4" align="center" class="admin_header bottom2"
                        height="40"><STRONG><A
        <TR>
                <TD colspan="4" align="center" class="admin_header bottom2"
                        height="40"><STRONG><A
-                       href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID_VALUE!}">{--__SNAME_VALUE!}
-               {--__FNAME_VALUE!}</A></STRONG> ({--__EMAIL_VALUE!}):</TD>
+                       href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__UID_VALUE!}">{!__SNAME_VALUE!}
+               {!__FNAME_VALUE!}</A></STRONG> ({!__EMAIL_VALUE!}):</TD>
        </TR>
        </TR>
-       {--__EMAIL_LIST--}
+       {!__EMAIL_LIST!}
        <TR>
                <TD colspan="4" height="40" class="admin_header" align="center">
        <TR>
                <TD colspan="4" height="40" class="admin_header" align="center">
-               {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<BR />
+               {--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}<BR />
                <A
                        href="{!URL!}/modules.php?module=admin&amp;what=list_links&amp;u_id={!__UID_VALUE!}&del=all"
                        onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</A>
                <A
                        href="{!URL!}/modules.php?module=admin&amp;what=list_links&amp;u_id={!__UID_VALUE!}&del=all"
                        onclick="return confirm('{--ADMIN_REALLY_DELETE_ALL_MAILS--}')">{--ADMIN_DEL_UNCONFIRMED_LINKS--}</A>
index e4030a3aa9a2571a58cb58308051bca272b40861..5ce67b56a48ed278eaa59e2a8d292d0a86080ca9 100644 (file)
@@ -1,18 +1,18 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="580"
-       class="admin_table dashed">
-       <TR>
-               <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_LIST_USERS_1--}{--__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}:</STRONG>
-               </TD>
-       </TR>
-       <TR>
-               <TD align="center" class="admin_title bottom2 right2"><STRONG>{--_UID--}:</STRONG></TD>
-               <TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_OLD_REFS--}:</STRONG></TD>
-               <TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_NEW_REFS--}:</STRONG></TD>
-               <TD align="center" class="admin_title bottom2"><STRONG>{--RALLYE_REF_POINTS--}:</STRONG></TD>
-       </TR>
-       {!__RALLYE_USER_ROWS!}
-       <TR>
-               <TD colspan="4" class="admin_footer"><STRONG
-                       class="admin_note">{--RALLYE_REF_POINTS_NOTE--}</STRONG></TD>
-       </TR>
+<TABLE border="0" cellspacing="0" cellpadding="0" width="580" class="admin_table dashed">
+<TR>
+       <TD colspan="4" align="center" class="admin_title" height="30"><STRONG>{--RALLYE_LIST_USERS_1--}{!__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}:</STRONG>
+       </TD>
+</TR>
+<TR>
+       <TD align="center" class="admin_title bottom2 right2"><STRONG>{--_UID--}:</STRONG></TD>
+       <TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_OLD_REFS--}:</STRONG></TD>
+       <TD align="center" class="admin_title bottom2 right2"><STRONG>{--RALLYE_NEW_REFS--}:</STRONG></TD>
+       <TD align="center" class="admin_title bottom2"><STRONG>{--RALLYE_REF_POINTS--}:</STRONG></TD>
+</TR>
+{!__RALLYE_USER_ROWS!}
+<TR>
+       <TD colspan="4" class="admin_footer">
+               <STRONG class="admin_note">{--RALLYE_REF_POINTS_NOTE--}</STRONG>
+       </TD>
+</TR>
 </TABLE>
 </TABLE>
index c9a4aaed55ce2f4b0e48d9dd165079b2542738d8..7ba25b37bb5e326c77ea9a27d55012224d4d6284 100644 (file)
@@ -2,7 +2,7 @@
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]"
                align="right" valign="top">$content[u_link]&nbsp;&nbsp;</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[refs_link]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]"
                align="right" valign="top">$content[u_link]&nbsp;&nbsp;</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[refs_link]</TD>
-       <TD class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[salut]
+       <TD class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[gender]
        $content[surname] $content[family]</TD>
        <TD class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[email]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[status]</TD>
        $content[surname] $content[family]</TD>
        <TD class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[email]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">&nbsp;$content[status]</TD>
index 9a3eb200d9df1dc6c02e62aaf0406e6f574c2aad..60df811cf7b66dcbafa5993e78eb61f30aee02b4 100644 (file)
@@ -6,7 +6,7 @@
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2" height="25">{--SPONSOR_ID--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2" height="25">{--SPONSOR_ID--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_ID--} [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={--__SPONSOR_ID--}">{--__SPONSOR_STATUS--}</A></STRONG>&nbsp;]</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_ID!} [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{!__SPONSOR_STATUS!}</A></STRONG>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_COMPANY_TITLE--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_COMPANY_TITLE--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_COMPANY--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_COMPANY!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_COMPANY_POSITION--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_COMPANY_POSITION--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_POSITION--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_POSITION!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_TAX_IDENT--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_TAX_IDENT--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_TAX_IDENT--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_TAX_IDENT!}</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SURNAME_FAMILY--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SURNAME_FAMILY--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_SALUT--} {--__SPONSOR_SURNAME--} {--__SPONSOR_FAMILY--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_GENDER!} {!__SPONSOR_SURNAME!} {!__SPONSOR_FAMILY!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_STREET_NR1--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_STREET_NR1--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_STREET1--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_STREET1!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_STREET_NR2--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_STREET_NR2--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_STREET2--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_STREET2!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_COUNTRY--}-{--__SPONSOR_ZIP--}&nbsp;{--__SPONSOR_CITY--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_COUNTRY!}-{!__SPONSOR_ZIP!}&nbsp;{!__SPONSOR_CITY!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_PHONE--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_PHONE--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_PHONE--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_PHONE!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_FAX--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_FAX--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_FAX--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_FAX!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_CELL--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_CELL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;{--__SPONSOR_CELL--}</TD>
+  <TD class="bottom2">&nbsp;{!__SPONSOR_CELL!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_EMAIL--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_EMAIL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;<A href="{--__SPONSOR_EMAIL--}">{--__SPONSOR_EMAIL_VALUE--}</A>&nbsp;</TD>
+  <TD class="bottom2">&nbsp;<A href="{!__SPONSOR_EMAIL!}">{!__SPONSOR_EMAIL_VALUE!}</A>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_URL--}:&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_ENTER_URL--}:&nbsp;</TD>
-  <TD class="bottom2">&nbsp;[&nbsp;<A href="{--__SPONSOR_URL--}" target="_blank"><STRONG>{--ADMIN_TEST_URL--}</STRONG></A>&nbsp;]&nbsp;</TD>
+  <TD class="bottom2">&nbsp;[&nbsp;<A href="{!__SPONSOR_URL!}" target="_blank"><STRONG>{--ADMIN_TEST_URL--}</STRONG></A>&nbsp;]&nbsp;</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_RECEIVE_WARNINGS_SHORT--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_RECEIVE_WARNINGS_SHORT--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_REC_WARNING--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_REC_WARNING!}</TD>
 <TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_WARNING_INTERVAL_SHORT--}:</STRONG>&nbsp;</TD>
 <TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_WARNING_INTERVAL_SHORT--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_INTERVAL--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_INTERVAL!}</TD>
 <TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_AMOUNT--}:</STRONG>&nbsp;</TD>
 <TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_AMOUNT--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><STRONG>{--__SPONSOR_AMOUNT--}</STRONG></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}"><STRONG>{!__SPONSOR_AMOUNT!}</STRONG></A>&nbsp;]</TD>
 <TR>
 </TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_USED--}:</STRONG>&nbsp;</TD>
 <TR>
 </TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_POINTS_USED--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><STRONG>{--__SPONSOR_USED--}</STRONG></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=sub_points" title="{--ADMIN_SPONSOR_SUB_POINTS_LINK_TITLE--}"><STRONG>{!__SPONSOR_USED!}</STRONG></A>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD colspan="2" align="center" class="admin_title bottom2" height="30">
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_CREATED--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_CREATED--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_CREATED--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_CREATED!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--ADMIN_LAST_ONLINE--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--ADMIN_LAST_ONLINE--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_LAST_ONLINE--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_LAST_ONLINE!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--ADMIN_LAST_CHANGE--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--ADMIN_LAST_CHANGE--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_LAST_CHANGE--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_LAST_CHANGE!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--REMOTE_IP--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--REMOTE_IP--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_REMOTE_ADR--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_REMOTE_ADR!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_REFID--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_REFID--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">{--__SPONSOR_REFID--}</TD>
+  <TD align="center" class="bottom2">{!__SPONSOR_REFID!}</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_REFERRALS--}:</STRONG>&nbsp;</TD>
 </TR>
 <TR>
   <TD align="right" class="bottom2 right2">{--SPONSOR_REFERRALS--}:</STRONG>&nbsp;</TD>
-  <TD align="center" class="bottom2">[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={--__SPONSOR_ID--}"><STRONG>{--__SPONSOR_REFS--}</STRONG></A>&nbsp;]</TD>
+  <TD align="center" class="bottom2">[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;rid={!__SPONSOR_ID!}"><STRONG>{!__SPONSOR_REFS!}</STRONG></A>&nbsp;]</TD>
 </TR>
 <TR>
   <TD colspan="2" class="admin_footer" style="padding: 5px">
     <DIV align="center"><STRONG>{--ADMIN_SPONSOR_ACTIONS--}:</STRONG></DIV>
     <UL>
 </TR>
 <TR>
   <TD colspan="2" class="admin_footer" style="padding: 5px">
     <DIV align="center"><STRONG>{--ADMIN_SPONSOR_ACTIONS--}:</STRONG></DIV>
     <UL>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={--__SPONSOR_ID--}&amp;mode=edit">{--ADMIN_SPONSOR_EDIT--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={--__SPONSOR_ID--}">{--ADMIN_SPONSOR_DEL--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={--__SPONSOR_ID--}">{--ADMIN_SPONSOR_LOCK--}</A>&nbsp;]</LI>
-      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={--__SPONSOR_ID--}">{--ADMIN_LIST_SPONSOR_ORDERS--}</A>&nbsp;] (<STRONG>{--__SPONSOR_ORDERS--}</STRONG>)</LI>
+      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id={!__SPONSOR_ID!}&amp;mode=edit">{--ADMIN_SPONSOR_EDIT--}</A>&nbsp;]</LI>
+      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=del_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_DEL--}</A>&nbsp;]</LI>
+      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__SPONSOR_ID!}">{--ADMIN_SPONSOR_LOCK--}</A>&nbsp;]</LI>
+      <LI>&nbsp;[&nbsp;<A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor_pays&amp;id={!__SPONSOR_ID!}">{--ADMIN_LIST_SPONSOR_ORDERS--}</A>&nbsp;] (<STRONG>{!__SPONSOR_ORDERS!}</STRONG>)</LI>
     </UL>
   </TD>
 </TR>
     </UL>
   </TD>
 </TR>
index 08f6e58ef2fa67be2e254a9d4fce0d91f53f0e02..41618d5652e48ef7902236a8de94fbc823a6b47d 100644 (file)
@@ -8,7 +8,7 @@
     [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</A></STRONG>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2">
     [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=list_sponsor&amp;id=$content[id]" title="{--ADMIN_SPONSOR_DETAILS_LINK_TITLE--}">$content[id]</A></STRONG>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2" width="240" colspan="2">
-    <A href="$content[email]">$content[salut] $content[sname] $content[fname]</A>
+    <A href="$content[email]">$content[gender] $content[sname] $content[fname]</A>
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2" width="160">
     [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</A></STRONG>&nbsp;]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2" width="160">
     [&nbsp;<STRONG><A href="{!URL!}/modules.php?module=admin&amp;what=edit_sponsor&amp;id=$content[id]&amp;mode=add_points" title="{--ADMIN_SPONSOR_ADD_POINTS_LINK_TITLE--}">$content[points]</A></STRONG>&nbsp;]
index bc2e0e3b5c8663fbebe762a97493c64a1b0e024d..e860779f04b48bf1de102a4b6ac133d4d4286c31 100644 (file)
@@ -1,10 +1,9 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=del_transfer"
-       method="POST">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="620"
-       class="admin_table dashed">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=del_transfer" method="POST">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="admin_table dashed">
        <TR>
        <TR>
-               <TD colspan="6" align="center" class="admin_title2 bottom2"
-                       height="30"><STRONG>{--__TRANSFER_TITLE--}</STRONG></TD>
+               <TD colspan="6" align="center" class="admin_title2 bottom2" height="30">
+                       <STRONG>{!__TRANSFER_TITLE!}</STRONG>
+               </TD>
        </TR>
        <TR>
                <TD width="80" align="center" class="admin_title2 bottom2 right2">
        </TR>
        <TR>
                <TD width="80" align="center" class="admin_title2 bottom2 right2">
@@ -23,7 +22,8 @@
        {!__TRANSFER_ROWS!}
        <TR>
                <TD colspan="6" class="admin_footer">
        {!__TRANSFER_ROWS!}
        <TR>
                <TD colspan="6" class="admin_footer">
-               {--__TRANSFER_DELETE--}</TD>
+                       {!__TRANSFER_DELETE!}
+               </TD>
        </TR>
 </TABLE>
 </FORM>
        </TR>
 </TABLE>
 </FORM>
index a2ed8f0aba0367ef38e1ddeba3e1045c3a22dada..f4984095f5ce129d1ac1dddaa6397a6f100851c0 100644 (file)
@@ -1,36 +1,35 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="520"
-       class="admin_table dashed">
-       <TR>
-               <TD width="260" align="center" class="bottom2 right2">
-               {--EMAIL_SENDER--}:<BR />
-               <STRONG><A
-                       href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={--__LIST_UNCON_SENDER--}">{--__LIST_UNCON_SENDER--}</A></STRONG>
-               </TD>
-               <TD width="260" align="center" class="bottom2">
-               {--EMAIL_SUBJECT--}:<BR />
-               <STRONG>{--__LIST_UNCON_SUBJECT--}</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<BR />
-               <STRONG><A
-                       href="{!URL!}/modules.php?module=frametester&amp;url={--__LIST_UNCON_URL--}"
-                       target="_blank">{--ADMIN_TEST_URL--}</A></STRONG></TD>
-               <TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<BR />
-               <STRONG>{--__LIST_UNCON_STAMP--}</STRONG></TD>
-       </TR>
-       <TR>
-               <TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<BR />
-               <STRONG>{--__LIST_UNCON_TEXT--}</STRONG></TD>
-               <TD align="center" class="bottom2">{--USERS_LINKS--}:<BR />
-               <STRONG>{--__LIST_UNCO_UNCONFIRMED--}</STRONG></TD>
-       </TR>
-       <TR>
-               <TD colspan="2" height="5" class="seperator">&nbsp;</TD>
-       </TR>
-       <TR>
-               <TD colspan="2" align="center">{--__LIST_UNCON_LISTING--}</TD>
-       </TR>
-       <TR>
-               <TD colspan="2" height="5" class="seperator">&nbsp;</TD>
-       </TR>
+<TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="admin_table dashed">
+<TR>
+       <TD width="260" align="center" class="bottom2 right2">
+       {--EMAIL_SENDER--}:<BR />
+       <STRONG><A
+               href="{!URL!}/modules.php?module=admin&amp;what=list_user&amp;u_id={!__LIST_UNCON_SENDER!}">{!__LIST_UNCON_SENDER!}</A></STRONG>
+       </TD>
+       <TD width="260" align="center" class="bottom2">
+       {--EMAIL_SUBJECT--}:<BR />
+       <STRONG>{!__LIST_UNCON_SUBJECT!}</STRONG></TD>
+</TR>
+<TR>
+       <TD align="center" class="bottom2 right2">{--EMAIL_URL--}:<BR />
+       <STRONG><A
+               href="{!URL!}/modules.php?module=frametester&amp;url={!__LIST_UNCON_URL!}"
+               target="_blank">{--ADMIN_TEST_URL--}</A></STRONG></TD>
+       <TD align="center" class="bottom2">{--EMAIL_TIMESTAMP--}:<BR />
+       <STRONG>{!__LIST_UNCON_STAMP!}</STRONG></TD>
+</TR>
+<TR>
+       <TD align="center" class="bottom2 right2">{--EMAIL_TEXT--}:<BR />
+       <STRONG>{!__LIST_UNCON_TEXT!}</STRONG></TD>
+       <TD align="center" class="bottom2">{--USERS_LINKS--}:<BR />
+       <STRONG>{!__LIST_UNCO_UNCONFIRMED!}</STRONG></TD>
+</TR>
+<TR>
+       <TD colspan="2" height="5" class="seperator">&nbsp;</TD>
+</TR>
+<TR>
+       <TD colspan="2" align="center">{!__LIST_UNCON_LISTING!}</TD>
+</TR>
+<TR>
+       <TD colspan="2" height="5" class="seperator">&nbsp;</TD>
+</TR>
 </TABLE>
 </TABLE>
index 0d461d0fd0c0869e58cefdb96d12995d4f3de21c..2dd71cfe8d523c4aacff689b12a0803aa38fd444 100644 (file)
@@ -3,7 +3,7 @@
        <TD width="20%" align="center"
                class="right2 top2 switch_sw$content[sw]"><STRONG>{--_UID--}:</STRONG></TD>
        <TD width="20%" align="center"
        <TD width="20%" align="center"
                class="right2 top2 switch_sw$content[sw]"><STRONG>{--_UID--}:</STRONG></TD>
        <TD width="20%" align="center"
-               class="right2 top2 switch_sw$content[sw]"><STRONG>{--SEX--}:</STRONG></TD>
+               class="right2 top2 switch_sw$content[sw]"><STRONG>{--GENDER--}:</STRONG></TD>
        <TD width="20%" align="center"
                class="right2 top2 switch_sw$content[sw]"><STRONG>{--SURNAME--}:</STRONG></TD>
        <TD width="20%" align="center"
        <TD width="20%" align="center"
                class="right2 top2 switch_sw$content[sw]"><STRONG>{--SURNAME--}:</STRONG></TD>
        <TD width="20%" align="center"
@@ -13,7 +13,7 @@
 <TR>
        <TD width="5" class="switch_sw$content[sw] seperator bottom2">&nbsp;</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[uid]</TD>
 <TR>
        <TD width="5" class="switch_sw$content[sw] seperator bottom2">&nbsp;</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[uid]</TD>
-       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[sex]</TD>
+       <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[gender]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[sname]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[fname]</TD>
        <TD align="center" class="bottom2 switch_sw$content[sw]">$content[nick]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[sname]</TD>
        <TD align="center" class="bottom2 right2 switch_sw$content[sw]">$content[fname]</TD>
        <TD align="center" class="bottom2 switch_sw$content[sw]">$content[nick]</TD>
index e8b301ef2df365d0d2c1d0fc2313c9fe03dfcb8f..0abdfab2b55412bc5b64dad5e7eb124f0d5053ed 100644 (file)
@@ -1,20 +1,20 @@
-<FORM action="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={--__ID--}" method="POST">
+<FORM action="{!URL!}/modules.php?module=admin&amp;what=lock_sponsor&amp;id={!__ID!}" method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR>
   <TD align="center" class="admin_title bottom2">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="500" align="center" class="admin_table dashed">
 <TR>
   <TD align="center" class="admin_title bottom2">
-    <STRONG class="admin_done">{--__HEADER_MESSAGE--}</STRONG>
+    <STRONG class="admin_done">{!__HEADER_MESSAGE!}</STRONG>
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
   <TD align="center">
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
   <TD align="center">
-    {--__TEXT_MESSAGE--} 
+    {!__TEXT_MESSAGE!}
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
   <TD align="center">
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
 <TR>
   <TD align="center">
-    {--__EMAIL_LINK--}
+    {!__EMAIL_LINK!}
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
   </TD>
 </TR>
 <TR><TD height="5" class="seperator">&nbsp;</TD></TR>
@@ -26,9 +26,9 @@
 <TR><TD height="5" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_footer">
 <TR><TD height="5" class="seperator bottom2">&nbsp;</TD></TR>
 <TR>
   <TD class="admin_footer">
-    <INPUT type="submit" name="no" class="admin_no" value="{--NO--}">&nbsp;*
-    <INPUT type="submit" name="ok" class="admin_yes" value="{--YES--}">
+    <INPUT type="submit" name="no" class="admin_no" value="{--NO--}" />&nbsp;*
+    <INPUT type="submit" name="ok" class="admin_yes" value="{--YES--}" />
   </TD>
 </TR>
 </TABLE>
   </TD>
 </TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</FORM>
index 0a4fef5d88c93cb0db03996e15df354d38e0b5ed..6116b71ebbc08eecaa632187118c52bf5f7e0adb 100644 (file)
@@ -19,7 +19,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_WHAT_NAME--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__WHAT_SELECTION--} <BR />
+               <TD align="center" class="admin_table">{!__WHAT_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_WHAT_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -30,7 +30,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_PARENT_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__ACTION_SELECTION--} <BR />
+               <TD align="center" class="admin_table">{!__ACTION_SELECTION!} <BR />
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
                <SPAN class="admin_note">({--CREATE_ACTION_FIRST--})</SPAN></TD>
                <TD width="10">&nbsp;</TD>
        </TR>
@@ -41,7 +41,7 @@
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
                <TD width="10">&nbsp;</TD>
                <TD align="right">{--SELECT_BELOW_MENU--}:</TD>
                <TD width="10">&nbsp;</TD>
-               <TD align="center" class="admin_table">{--__BELOW_SELECTION--}</TD>
+               <TD align="center" class="admin_table">{!__BELOW_SELECTION!}</TD>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="10">&nbsp;</TD>
        </TR>
        <TR>
index 9d52bc38d6483cdc7410a45326b152b1be8e9c57..78a7fba49646ff892d9a12b218dab3610528b61e 100644 (file)
@@ -6,7 +6,7 @@
        </TR>
        <TR>
                <TD class="admin_header right2" align="center" width="20">{--_UID--}</TD>
        </TR>
        <TR>
                <TD class="admin_header right2" align="center" width="20">{--_UID--}</TD>
-               <TD class="admin_header right2" align="center">{--SEX--}</TD>
+               <TD class="admin_header right2" align="center">{--GENDER--}</TD>
                <TD class="admin_header right2" align="center">{--SURNAME--}</TD>
                <TD class="admin_header right2" align="center">{--FAMILY_NAME--}</TD>
                <TD class="admin_header right2" align="center">{--ADDY--}</TD>
                <TD class="admin_header right2" align="center">{--SURNAME--}</TD>
                <TD class="admin_header right2" align="center">{--FAMILY_NAME--}</TD>
                <TD class="admin_header right2" align="center">{--ADDY--}</TD>
index cff58e9c15836c677a33498a282286f98eccdc79..93a75afdbe92f7ac62a6cfc879ab2a17420c480b 100644 (file)
@@ -1,6 +1,6 @@
 <TR>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[link]</TD>
 <TR>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[link]</TD>
-       <TD align="center" class="switch_sw$content[sw] top2 right2">$content[sex]</TD>
+       <TD align="center" class="switch_sw$content[sw] top2 right2">$content[gender]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[sname]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[fname]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[email]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[sname]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[fname]</TD>
        <TD align="center" class="switch_sw$content[sw] top2 right2">$content[email]</TD>
index 0ededdeffaedd70433560728fb3484cbbb13f7ef..8af4fdfe9401ed24b5a7fadb0ad5ac6c31b8b7b4 100644 (file)
@@ -1,5 +1,5 @@
 <FORM
 <FORM
-       action="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode={--__MODE--}"
+       action="{!URL!}/modules.php?module=admin&amp;what=send_bonus&amp;mode={!__MODE!}"
        method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
        class="admin_table dashed" align="center">
        method="POST">
 <TABLE border="0" cellspacing="0" cellpadding="0" width="580"
        class="admin_table dashed" align="center">
@@ -12,8 +12,8 @@
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SELECT name="cat" size="1" class="member_select">
                        <OPTION value="" disabled>{--PLEASE_SELECT--}</OPTION>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD><SELECT name="cat" size="1" class="member_select">
                        <OPTION value="" disabled>{--PLEASE_SELECT--}</OPTION>
-                       <OPTION value="0">{--ALL_MEMBERS--} ({--__ALL_VALUE!})</OPTION>
-                       {--__OPTION_LINES--}
+                       <OPTION value="0">{--ALL_MEMBERS--} ({!__ALL_VALUE!})</OPTION>
+                       {!__OPTION_LINES!}
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
                </SELECT></TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        </TR>
index 8920cfbf26ddbd420037464c77a1cc1cd5651be6..e8b58bc71d216d9546dcde94004bcad57fdbc484 100644 (file)
@@ -1,5 +1,5 @@
 <DIV align="center">
 <DIV align="center">
-  {--__LIST_CONTENT--}<BR />
+  {!__LIST_CONTENT!}<BR />
   <BR />
   <BR />
-  {--__ADD_CONTENT--}
-</DIV>
\ No newline at end of file
+  {!__ADD_CONTENT!}
+</DIV>
index bf217afe122644e8db59551581b36fe31b34fff8..a60f99b48a480f57ff880401c42111dc7b075483 100644 (file)
@@ -22,7 +22,7 @@
                <TD class="admin_footer top2" colspan="8" align="center" height="35">
                {--ADMIN_ENTER_REDIRECT_URL--}: <INPUT type="text" name="redirect"
                        class="admin_normal" size="30" maxlength="255"
                <TD class="admin_footer top2" colspan="8" align="center" height="35">
                {--ADMIN_ENTER_REDIRECT_URL--}: <INPUT type="text" name="redirect"
                        class="admin_normal" size="30" maxlength="255"
-                       value="{--__REJECT_URL--}"></TD>
+                       value="{!__REJECT_URL!}"></TD>
        </TR>
        <TR>
                <TD class="admin_footer top2" colspan="8" align="center" height="35">
        </TR>
        <TR>
                <TD class="admin_footer top2" colspan="8" align="center" height="35">
index d3e9ad97ffe8e7a599ac62689ab394921ae7731c..6ca9d3fe9903d657ab9594c398d3b84bf39d498d 100644 (file)
@@ -3,7 +3,7 @@
     <INPUT type="checkbox" name="id[$content[id]]" class="admin_normal" value="1">
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2">
     <INPUT type="checkbox" name="id[$content[id]]" class="admin_normal" value="1">
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2">
-    <A href="$content[email]">$content[salut] $content[surname] $content[family]</A>
+    <A href="$content[email]">$content[gender] $content[surname] $content[family]</A>
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2">
     $content[remote]
   </TD>
   <TD align="center" class="switch_sw$content[sw] bottom2 right2">
     $content[remote]
index a33f77d44f2bfadad38ef4fe5c76ebe582b4e562..f0ef072dd04585d5573d8c14af14ea0575c3b21a 100644 (file)
@@ -6,7 +6,7 @@
                $content</STRONG></TD>
        </TR>
        <TR>
                $content</STRONG></TD>
        </TR>
        <TR>
-               <TD align="center" width="20%" class="top right">{--SEX--}:<BR />
+               <TD align="center" width="20%" class="top right">{--GENDER--}:<BR />
                <STRONG>$DATA[0]</STRONG></TD>
                <TD align="center" width="20%" class="top right">{--SURNAME--}:<BR />
                <STRONG>$DATA[1]</STRONG></TD>
                <STRONG>$DATA[0]</STRONG></TD>
                <TD align="center" width="20%" class="top right">{--SURNAME--}:<BR />
                <STRONG>$DATA[1]</STRONG></TD>
index 31adb59c29ad35b39e953080de0e7c0b4de5e218..ba1ed5d9953db22a04c7cf7b6686c81372011588 100644 (file)
@@ -2,7 +2,7 @@
        <TR>
                <TD align="center">
                <P>{--BEG_UID_STEAL_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_UID_STEAL_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_UID_STEAL_3--}</P>
        <TR>
                <TD align="center">
                <P>{--BEG_UID_STEAL_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_UID_STEAL_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_UID_STEAL_3--}</P>
-               <P>{--BEG_CLICKS_1--}<STRONG>{--__BEG_CLICKS--}</STRONG>{--BEG_CLICKS_2--}</P>
+               <P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
                <P align="right">{--BEG_THANKS_FOR_CLICK--}</P>
                </TD>
        </TR>
                <P align="right">{--BEG_THANKS_FOR_CLICK--}</P>
                </TD>
        </TR>
index 2d66218991c62e5de3601dba31284f9e5c62a3e5..a1ac14fbe3b8bdc3bdff49d48fb03ba083f46bb3 100644 (file)
@@ -2,7 +2,7 @@
        <TR>
                <TD align="center">
                <P>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</P>
        <TR>
                <TD align="center">
                <P>{--BEG_SORRY_ANOTHER_WAS_HERE_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_ANOTHER_WAS_HERE_3--}</P>
-               <P>{--BEG_CLICKS_1--}<STRONG>{--__BEG_CLICKS--}</STRONG>{--BEG_CLICKS_2--}</P>
+               <P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
                <P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
                </TD>
        </TR>
                <P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
                </TD>
        </TR>
index a24ff16de63ad62666b32a2bbbe57361a70e61af..6f70747d45487af62f48e0509547b81f8aff9fb7 100644 (file)
@@ -1,14 +1,12 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
-       style="height: 100%">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="100%" style="height: 100%">
        <TR>
                <TD height="10%" align="center">
        <TR>
                <TD height="10%" align="center">
-               <P align="center">{--__BEG_BANNER--}</P>
+                       <P align="center">{!__BEG_BANNER!}</P>
                </TD>
        </TR>
        <TR>
                <TD height="80%" align="center">
                </TD>
        </TR>
        <TR>
                <TD height="80%" align="center">
-               <TABLE border="0" cellspacing="0" cellpadding="0"
-                       class="beg_table dashed" width="620">
+               <TABLE border="0" cellspacing="0" cellpadding="0" class="beg_table dashed" width="620">
                        <TR>
                                <TD align="center" height="50" class="bottom2"><FONT
                                        class="big">{--BEG_LINK_BY_1--}<STRONG>{!MAIN_TITLE!}</STRONG>{--BEG_LINK_BY_2--}</FONT><br />
                        <TR>
                                <TD align="center" height="50" class="bottom2"><FONT
                                        class="big">{--BEG_LINK_BY_1--}<STRONG>{!MAIN_TITLE!}</STRONG>{--BEG_LINK_BY_2--}</FONT><br />
@@ -16,7 +14,7 @@
                        </TR>
                        <TR>
                                <TD align="center" height="120" class="beg_msg bottom2">
                        </TR>
                        <TR>
                                <TD align="center" height="120" class="beg_msg bottom2">
-                               {--__BEG_MSG--}</TD>
+                               {!__BEG_MSG!}</TD>
                        </TR>
                        <TR>
                                <TD align="center" height="30"><A
                        </TR>
                        <TR>
                                <TD align="center" height="30"><A
@@ -28,7 +26,7 @@
        </TR>
        <TR>
                <TD height="10%" align="center">
        </TR>
        <TR>
                <TD height="10%" align="center">
-               <P align="center">{--__BEG_BANNER--}</P>
+                       <P align="center">{!__BEG_BANNER!}</P>
                </TD>
        </TR>
 </TABLE>
                </TD>
        </TR>
 </TABLE>
index d01749d538f9194aaac652c815bebe8cf7989a92..7b108fe198f6a989e1385accfc98867825f1c765 100644 (file)
@@ -2,7 +2,7 @@
        <TR>
                <TD align="center">
                <P>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</P>
        <TR>
                <TD align="center">
                <P>{--BEG_SORRY_YOURE_LOGGED_IN_1--}<STRONG>{!__BEG_UID!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_2--}<STRONG>{!__BEG_POINTS!}</STRONG>{--BEG_SORRY_YOURE_LOGGED_IN_3--}</P>
-               <P>{--BEG_CLICKS_1--}<STRONG>{--__BEG_CLICKS--}</STRONG>{--BEG_CLICKS_2--}</P>
+               <P>{--BEG_CLICKS_1--}<STRONG>{!__BEG_CLICKS!}</STRONG>{--BEG_CLICKS_2--}</P>
                <P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
                </TD>
        </TR>
                <P align="right">{--BEG_THANKS_FOR_CLICK_AGAIN--}</P>
                </TD>
        </TR>
index f3ebdafb17ee6a0b88a6b3154ea85b2f492cd864..0c705ce6aef1737e6c0788973566b2692d1b6360 100644 (file)
@@ -1,12 +1,11 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
-       style="height: 100%">
-       <TR>
-               <TD height="10%" align="center">{--__BIRTHDAY_HEADER--}</TD>
-       </TR>
-       <TR>
-               <TD height="80%" align="center">{--__MSG--}</TD>
-       </TR>
-       <TR>
-               <TD height="10%" align="center">{--__BIRTHDAY_FOOTER--}</TD>
-       </TR>
-</TABLE>
\ No newline at end of file
+<TABLE border="0" cellspacing="0" cellpadding="0" width="100%" style="height: 100%">
+<TR>
+       <TD height="10%" align="center">{!__BIRTHDAY_HEADER!}</TD>
+</TR>
+<TR>
+       <TD height="80%" align="center">{!__MSG!}</TD>
+</TR>
+<TR>
+       <TD height="10%" align="center">{!__BIRTHDAY_FOOTER!}</TD>
+</TR>
+</TABLE>
index b6bf6bc41a2c86657301454f777f2047eb38c07c..5f4d2eee6f9db7bd6414a15fb52bd28d83709c3b 100644 (file)
@@ -1,12 +1,8 @@
-<STRONG class="big">Herzlichen Gl&uuml;ckwunsch zum Geburtstag!</STRONG>
+<STRONG class="big">Herzlichen Gl&uuml;ckwunsch zum Geburtstag!</STRONG> <br />
 <br />
 <br />
+Hallo {!__GENDER!} {!__SNAME!} {!__FNAME!}!<br />
 <br />
 <br />
-Hallo {!__SALUT!} {!__SNAME!} {!__FNAME!}!
-<br />
-<br />
-Wir das Team von
-<STRONG class="nobr">{!MAIN_TITLE!}</STRONG>
-w&uuml;schen Ihnen alles Gute und Gesundheit zum Geburtstag. Als kleines
-Geschenk von uns haben wir Ihnen soeben
-<STRONG class="nobr">{--__GIFT--} {!POINTS!}</STRONG>
-Ihrem Account gutgeschrieben!
+Wir das Team von <STRONG class="nobr">{!MAIN_TITLE!}</STRONG> w&uuml;schen Ihnen
+alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben wir
+Ihnen soeben <STRONG class="nobr">{!__GIFT!} {!POINTS!}</STRONG> Ihrem Account
+gutgeschrieben!
index e63cdc7a663c1e036d17bc48693e52f3ae6e71a1..4e4de9ab5e534f7dc1df46ab70b1c095eae01fe5 100644 (file)
@@ -1,7 +1,7 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="doubler_table"
        width="100%">
        <TR>
 <TABLE border="0" cellspacing="0" cellpadding="0" class="doubler_table"
        width="100%">
        <TR>
-               <TD height="80" align="center">{--__DOUBLER_HEADER--}</TD>
+               <TD height="80" align="center">{!__DOUBLER_HEADER!}</TD>
        </TR>
        <TR>
                <TD align="center" class="doubler_main">
        </TR>
        <TR>
                <TD align="center" class="doubler_main">
                <TABLE border="0" cellspacing="0" cellpadding="0"
                        class="guest_table dashed" width="520">
                        <TR>
                <TABLE border="0" cellspacing="0" cellpadding="0"
                        class="guest_table dashed" width="520">
                        <TR>
-                               <TD colspan="2" class="guest_title2 bottom2" height="30"><STRONG>{!POINTS!}-{--DOUBLER_TITLE--}</STRONG><br />
-                               <FONT class="doubler_error">{--__ERROR_MSG--}</FONT></TD>
+                               <TD colspan="2" class="guest_title2 bottom2" height="30">
+                                       <STRONG>{!POINTS!}-{--DOUBLER_TITLE--}</STRONG><br />
+                                       <FONT class="doubler_error">{!__ERROR_MSG!}</FONT>
+                               </TD>
                        </TR>
                        <TR>
                                <TD colspan="2" class="seperator" height="5">&nbsp;</TD>
                        </TR>
                        <TR>
                                <TD colspan="2" class="seperator" height="5">&nbsp;</TD>
                {!POINTS!}</STRONG> {--DOUBLER_REFERRAL_6--} <STRONG>100 {!POINTS!}</STRONG>
                {--DOUBLER_REFERRAL_8--} <STRONG>300 {!POINTS!}</STRONG>
                {--DOUBLER_REFERRAL_8--} {--DOUBLER_REFERRAL_LINK--}<br />
                {!POINTS!}</STRONG> {--DOUBLER_REFERRAL_6--} <STRONG>100 {!POINTS!}</STRONG>
                {--DOUBLER_REFERRAL_8--} <STRONG>300 {!POINTS!}</STRONG>
                {--DOUBLER_REFERRAL_8--} {--DOUBLER_REFERRAL_LINK--}<br />
-               {--__DOUBLER_MSG--} <br />
+               {!__DOUBLER_MSG!} <br />
                {--DOUBLER_NOT_YET_REGISTERED--} <A
                        href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</A><br />
                <br />
                {--DOUBLER_YOUR_ADVERTISING_HERE--} <A
                        href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</A><br />
                <br />
                {--DOUBLER_NOT_YET_REGISTERED--} <A
                        href="{!URL!}/ref.php?refid={!__REFID!}">{--DOUBLER_REGISTER_NOW--}</A><br />
                <br />
                {--DOUBLER_YOUR_ADVERTISING_HERE--} <A
                        href="{!URL!}/modules.php?module=index&amp;what=impressum&amp;refid={!__REFID!}">{--DOUBLER_CONTACT_US--}</A><br />
                <br />
-               {--__DOUBLER_BANNER--}<br />
+               {!__DOUBLER_BANNER!}<br />
                <br />
                {!__DOUBLER_PAYOUT_HISTORY!}</TD>
        </TR>
        <TR>
                <br />
                {!__DOUBLER_PAYOUT_HISTORY!}</TD>
        </TR>
        <TR>
-               <TD height="80" align="center">{--__DOUBLER_FOOTER--}</TD>
+               <TD height="80" align="center">{!__DOUBLER_FOOTER!}</TD>
        </TR>
 </TABLE>
        </TR>
 </TABLE>
index 573f43babd95968cb5eeca5930a98add6f1644ba..f85e597fa06cd749c7a46828bbfe92e14c321fbe 100644 (file)
@@ -1,7 +1,7 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" align="center"
-       width="400" class="guest_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" align="center" width="400" class="guest_table dashed">
        <TR>
        <TR>
-               <TD align="center" height="40"><STRONG class="guest_done">{--__CONFIRM_MSG--}</STRONG>
+               <TD align="center" height="40">
+                       <STRONG class="guest_done">{!__CONFIRM_MSG!}</STRONG>
                </TD>
        </TR>
 </TABLE>
\ No newline at end of file
                </TD>
        </TR>
 </TABLE>
\ No newline at end of file
index cfc287729e6e735e84b0552ce3a56b9debba8a7b..3c1919b2014402a24a98f95e55ad5a5581bfb04d 100644 (file)
@@ -1,13 +1,10 @@
 <TR>
 <TR>
-       <TD colspan="3" class="guest_title2" height="10"
-               style="padding-top: 5px; padding-bottom: 5px">
+       <TD colspan="3" class="guest_title2" height="10" style="padding-top: 5px; padding-bottom: 5px">
        <UL>
        <UL>
-               <LI><FONT class="guest_note">Es werden nur aktive User
-               gewertet.</FONT></LI>
-               <LI><FONT class="guest_note">{--__RALLYE_MAX_USERS--}</FONT></LI>
-               <LI><FONT class="guest_note">{--__RALLYE_MIN_PRICES--}</FONT></LI>
-               <LI><FONT class="guest_note">Der Rechtsweg ist
-               ausgeschlossen.</FONT></LI>
+               <LI><FONT class="guest_note">Es werden nur aktive User gewertet.</FONT></LI>
+               <LI><FONT class="guest_note">{!__RALLYE_MAX_USERS!}</FONT></LI>
+               <LI><FONT class="guest_note">{!__RALLYE_MIN_PRICES!}</FONT></LI>
+               <LI><FONT class="guest_note">Der Rechtsweg ist ausgeschlossen.</FONT></LI>
        </UL>
        </TD>
 </TR>
        </UL>
        </TD>
 </TR>
index 70b57d78935b2f7c0dd53f911bf30772cdc95eb6..9f5c5dc0f25610eeb29e585a53d9608e48a72cc7 100644 (file)
@@ -1,44 +1,39 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="90%"
-       class="guest_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="90%" class="guest_table dashed">
        <TR>
        <TR>
-               <TD class="guest_title2 bottom2" height="25"><STRONG>Referal-Rallye
-               gestartet!</STRONG></TD>
+               <TD class="guest_title2 bottom2" height="25">
+                       <STRONG>Referal-Rallye gestartet!</STRONG>
+               </TD>
        </TR>
        <TR>
        </TR>
        <TR>
-               <TD class="bottom2" align="center">
-               <DIV
-                       style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px"
-                       align="center">
-               <DIV align="left">
+               <TD class="bottom2" align="left" style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
                <UL>
                <UL>
-                       <LI>Titel: <STRONG>{--__RALLYE_TITLE--}</STRONG></LI>
-                       <LI>Start: <STRONG>{--__RALLYE_START--}</STRONG></LI>
-                       <LI>Ende : <STRONG>{--__RALLYE_END--}</STRONG></LI>
+                       <LI>Titel: <STRONG>{!__RALLYE_TITLE!}</STRONG></LI>
+                       <LI>Start: <STRONG>{!__RALLYE_START!}</STRONG></LI>
+                       <LI>Ende : <STRONG>{!__RALLYE_END!}</STRONG></LI>
                </UL>
                </UL>
-               </DIV>
-               </DIV>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
-               <TD class="guest_title2 bottom2" height="25"><STRONG>...::
-               {--__RALLYE_TITLE--} ::...</STRONG></TD>
+               <TD class="guest_title2 bottom2" height="25">
+                       <STRONG>...::&nbsp;{!__RALLYE_TITLE!}&nbsp;::...</STRONG>
+               </TD>
        </TR>
        <TR>
                <TD class="bottom2">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
        </TR>
        <TR>
                <TD class="bottom2">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-               {--__RALLYE_DESCR--}</DIV>
+               {!__RALLYE_DESCR!}</DIV>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
-               <TD class="guest_title2 bottom2" height="25"><STRONG>{--__RALLYE_CAN_WIN_THIS--}:</STRONG>
+               <TD class="guest_title2 bottom2" height="25"><STRONG>{!__RALLYE_CAN_WIN_THIS!}:</STRONG>
                </TD>
        </TR>
        <TR>
                <TD class="bottom2">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
                </TD>
        </TR>
        <TR>
                <TD class="bottom2">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px">
-               {--__RALLYE_PRICES--}</DIV>
+               {!__RALLYE_PRICES!}</DIV>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
                <TD class="bottom2" align="center">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px"
                <TD class="bottom2" align="center">
                <DIV
                        style="margin-left: 5px; margin-right: 5px; margin-top: 10px; margin-bottom: 10px"
-                       align="center">{--__RALLYE_TOP_USERS--}</DIV>
+                       align="center">{!__RALLYE_TOP_USERS!}</DIV>
                </TD>
        </TR>
        <TR>
                <TD class="guest_title2" height="25">
                </TD>
        </TR>
        <TR>
                <TD class="guest_title2" height="25">
-               <DIV align="center"
-                       style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
-               <STRONG>...:: {--__RALLYE_EXTRAS--} ::...</STRONG></DIV>
+               <DIV align="center" style="margin-left: 5px; margin-right: 5px; margin-top: 3px; margin-bottom: 3px">
+                       <STRONG>...::&nbsp;{!__RALLYE_EXTRAS!}&nbsp;::...</STRONG>
+               </DIV>
                </TD>
        </TR>
                </TD>
        </TR>
-</TABLE>
\ No newline at end of file
+</TABLE>
index a2e00e0265970a230326092a619a7b69d72b6385..35cbdd592d482c1adaeee1d375d96d524acbfb27 100644 (file)
                <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
                        <TR>
                                <TD width="50%" class="register_left">
                <TABLE border="0" cellspacing="0" cellpadding="0" width="100%">
                        <TR>
                                <TD width="50%" class="register_left">
-                               {--GUEST_SEX--}{!MUST_SEX!}:&nbsp;&nbsp;</TD>
-                               <TD width="50%" class="register_right"><SELECT name="sex"
+                               {--GUEST_GENDER--}{!MUST_GENDER!}:&nbsp;&nbsp;</TD>
+                               <TD width="50%" class="register_right"><SELECT name="gender"
                                        size="1" class="guest_select">
                                        size="1" class="guest_select">
-                                       <OPTION value="M">{--SEX_M--}</OPTION>
-                                       <OPTION value="F">{--SEX_F--}</OPTION>
-                                       <OPTION value="C">{--SEX_C--}</OPTION>
+                                       <OPTION value="M">{--GENDER_M--}</OPTION>
+                                       <OPTION value="F">{--GENDER_F--}</OPTION>
+                                       <OPTION value="C">{--GENDER_C--}</OPTION>
                                </SELECT></TD>
                        </TR>
                        <TR>
                                </SELECT></TD>
                        </TR>
                        <TR>
index 465f7245ce08c7df26a8b914ea26c2a8fcdeca31..a6fc7ee7e80cbc5c12e79cf216bee89e8fb55811 100644 (file)
@@ -10,7 +10,7 @@
   <TD align="center" class="bottom2" style="padding-top:15px; padding-bottom: 15px">
     {--GUEST_SPONSOR_PRICING_HEADER--}<br />
     <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="450">
   <TD align="center" class="bottom2" style="padding-top:15px; padding-bottom: 15px">
     {--GUEST_SPONSOR_PRICING_HEADER--}<br />
     <TABLE border="0" cellspacing="0" cellpadding="0" class="guest_table dashed" width="450">
-{--__SPONSOR_PAYTYPES--}
+{!__SPONSOR_PAYTYPES!}
     <TR><TD colspan="2" class="guest_title2 seperator" height="29">&nbsp;</TD></TR>
     </TABLE>
   </TD>
     <TR><TD colspan="2" class="guest_title2 seperator" height="29">&nbsp;</TD></TR>
     </TABLE>
   </TD>
@@ -23,7 +23,7 @@
         <STRONG>{--GUEST_SPONSOR_ACTIONS_HEADER--}</STRONG>
       </TD>
     </TR>
         <STRONG>{--GUEST_SPONSOR_ACTIONS_HEADER--}</STRONG>
       </TD>
     </TR>
-{--__SPONSOR_ACTIONS--}
+{!__SPONSOR_ACTIONS!}
     <TR><TD colspan="2" class="guest_title2 seperator" height="29">&nbsp;</TD></TR>
     </TABLE>
   </TD>
     <TR><TD colspan="2" class="guest_title2 seperator" height="29">&nbsp;</TD></TR>
     </TABLE>
   </TD>
index d8ab59724b425eef86fc3d0a543d65b486979208..b50c4aa28ae76bb02bedd93e30b474423d909e25 100644 (file)
@@ -1,4 +1,4 @@
-{--__SPONSOR_FORM_ERRORS--}
+{!__SPONSOR_FORM_ERRORS!}
 <DIV align="center"><STRONG class="big">{--GUEST_SPONSOR_TITLE--}</STRONG></DIV>
 <br />
 {--GUEST_SPONSOR_TEASER_1--}<br />
 <DIV align="center"><STRONG class="big">{--GUEST_SPONSOR_TITLE--}</STRONG></DIV>
 <br />
 {--GUEST_SPONSOR_TEASER_1--}<br />
@@ -31,7 +31,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="300">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD width="300">
-    <INPUT type="text" name="company" class="guest_normal" size="20" maxlength="255" value="{--__COMPANY--}">
+    <INPUT type="text" name="company" class="guest_normal" size="20" maxlength="255" value="{!__COMPANY!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -43,7 +43,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="position" class="guest_normal" size="20" maxlength="255" value="{--__POSITION--}">
+    <INPUT type="text" name="position" class="guest_normal" size="20" maxlength="255" value="{!__POSITION!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
@@ -55,7 +55,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="{--__TAX_IDENT--}">
+    <INPUT type="text" name="tax_ident" class="guest_normal" size="20" maxlength="255" value="{!__TAX_IDENT!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
 <TR>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD align="right">
 <TR>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD align="right">
-    {--GUEST_SEX--}:&nbsp;
+    {--GUEST_GENDER--}:&nbsp;
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <SELECT name="salut" class="guest_select" size="1">
-      <OPTION value="M"{--__SALUT_M--}>{--SEX_M--}</OPTION>
-        <OPTION value="F"{--__SALUT_F--}>{--SEX_F--}</OPTION>
-        <OPTION value="C"{--__SALUT_C--}>{--SEX_C--}</OPTION>
+    <SELECT name="gender" class="guest_select" size="1">
+      <OPTION value="M"{!__GENDER_M!}>{--GENDER_M--}</OPTION>
+      <OPTION value="F"{!__GENDER_F!}>{--GENDER_F--}</OPTION>
+      <OPTION value="C"{!__GENDER_C!}>{--GENDER_C--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
@@ -91,7 +91,7 @@
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="{--__SURNAME--}">
+    <INPUT type="text" name="surname" class="guest_normal" size="20" maxlength="255" value="{!__SURNAME!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="family" class="guest_normal" size="20" maxlength="255" value="{--__FAMILY--}">
+    <INPUT type="text" name="family" class="guest_normal" size="20" maxlength="255" value="{!__FAMILY!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="{--__STREET1--}">
+    <INPUT type="text" name="street_nr1" class="guest_normal" size="20" maxlength="255" value="{!__STREET1!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="{--__STREET2--}">
+    <INPUT type="text" name="street_nr2" class="guest_normal" size="20" maxlength="255" value="{!__STREET2!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="country" class="guest_normal" size="2" maxlength="2" value="{--__COUNTRY--}">-<INPUT type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="{--__ZIP--}">
-    <INPUT type="text" name="city" class="guest_normal" size="10" maxlength="255" value="{--__CITY--}">
+    <INPUT type="text" name="country" class="guest_normal" size="2" maxlength="2" value="{!__COUNTRY!}">-<INPUT type="text" name="zip" class="guest_normal" size="5" maxlength="6" value="{!__ZIP!}">
+    <INPUT type="text" name="city" class="guest_normal" size="10" maxlength="255" value="{!__CITY!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="phone" class="guest_normal" size="20" maxlength="255" value="{--__PHONE--}">
+    <INPUT type="text" name="phone" class="guest_normal" size="20" maxlength="255" value="{!__PHONE!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="fax" class="guest_normal" size="20" maxlength="255" value="{--__FAX--}">
+    <INPUT type="text" name="fax" class="guest_normal" size="20" maxlength="255" value="{!__FAX!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="cell" class="guest_normal" size="20" maxlength="255" value="{--__CELL--}">
+    <INPUT type="text" name="cell" class="guest_normal" size="20" maxlength="255" value="{!__CELL!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="email" class="guest_normal" size="20" maxlength="255" value="{--__EMAIL--}">
+    <INPUT type="text" name="email" class="guest_normal" size="20" maxlength="255" value="{!__EMAIL!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <INPUT type="text" name="url" class="guest_normal" size="20" maxlength="255" value="{--__URL--}">
+    <INPUT type="text" name="url" class="guest_normal" size="20" maxlength="255" value="{!__URL!}">
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    <STRONG>{--__SPONSOR_REFID--}</STRONG>
+    <STRONG>{!__SPONSOR_REFID!}</STRONG>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
     <SELECT name="receive_warnings" class="guest_select" size="1">
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
     <SELECT name="receive_warnings" class="guest_select" size="1">
-      <OPTION value="Y"{--__REC_Y--}>{--YES--}</OPTION>
-        <OPTION value="N"{--__REC_N--}>{--NO--}</OPTION>
+      <OPTION value="Y"{!__REC_Y!}>{--YES--}</OPTION>
+      <OPTION value="N"{!__REC_N!}>{--NO--}</OPTION>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
     </SELECT>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
   <TD>
-    {--__PAYMENT_LIST--}
+    {!__PAYMENT_LIST!}
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
   </TD>
   <TD class="seperator" width="10">&nbsp;</TD>
 </TR>
 <TR>
   <TD class="guest_footer seperator" width="10">&nbsp;</TD>
   <TD class="guest_footer" colspan="3" align="center">
 <TR>
   <TD class="guest_footer seperator" width="10">&nbsp;</TD>
   <TD class="guest_footer" colspan="3" align="center">
-    <INPUT type="hidden" name="refid" value="{--__SPONSOR_REFID--}">
+    <INPUT type="hidden" name="refid" value="{!__SPONSOR_REFID!}">
     <INPUT type="reset" class="guest_reset" value="{--CLEAR_FORM--}">&nbsp;*
     <INPUT type="submit" name="ok" class="guest_submit" value="{--REGISTER_SPONSOR--}">
   </TD>
     <INPUT type="reset" class="guest_reset" value="{--CLEAR_FORM--}">&nbsp;*
     <INPUT type="submit" name="ok" class="guest_submit" value="{--REGISTER_SPONSOR--}">
   </TD>
index 89d8903ce8173cd773be0bdcd8fcaf6689757184..d337544daaa754154041834f69efc152451092b1 100644 (file)
@@ -17,7 +17,7 @@
        <TR>
                <TD align="center" class="beg_msg" height="60">
                {--BEG_MEMBER_CLICKS_TOTAL--}:<br />
        <TR>
                <TD align="center" class="beg_msg" height="60">
                {--BEG_MEMBER_CLICKS_TOTAL--}:<br />
-               <STRONG>{--__BEG_CLICKS--}</STRONG></TD>
+               <STRONG>{!__BEG_CLICKS!}</STRONG></TD>
        </TR>
        <TR>
                <TD height="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD height="5" class="seperator">&nbsp;</TD>
index bcf4049cefbdb2f929bd3bb04c2aa1bbb2a99918..fa17aff5a40e45e101d5ae841907f198b21a2e28 100644 (file)
@@ -1,5 +1,5 @@
 <DIV align="center">{--DOUBLER_MEMBER_YOUR_LINK--}:<br />
 <DIV align="center">{--DOUBLER_MEMBER_YOUR_LINK--}:<br />
-<STRONG><A href="{!URL!}/doubler.php?refid={--__USERID--}">{!URL!}/doubler.php?refid={--__USERID--}</A></STRONG><br />
+<STRONG><A href="{!URL!}/doubler.php?refid={!__USERID!}">{!URL!}/doubler.php?refid={!__USERID!}</A></STRONG><br />
 <br />
 {--DOUBLER_MEMBER_LINK_NOTE--}</DIV>
 
 <br />
 {--DOUBLER_MEMBER_LINK_NOTE--}</DIV>
 
@@ -13,7 +13,7 @@
 
 <div align="center"><STRONG class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</STRONG><br />
 <br />
 
 <div align="center"><STRONG class="big">{--DOUBLER_MEMBER_REF_PAYOUT--}:</STRONG><br />
 <br />
-{--__DOUBLER_PAYOUT_REF--}</div>
+{!__DOUBLER_PAYOUT_REF!}</div>
 
 <DIV align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0"
 
 <DIV align="center">
 <TABLE border="0" cellspacing="0" cellpadding="0"
index a6b203f89030af7f38606a2c72e3b101fabdba4b..f1f47b0d9a1925905124c4256a750259985ae8df 100644 (file)
@@ -11,7 +11,7 @@
        <TR>
                <TD align="right" width="50%">{--HOLIDAY_MEMBER_TSTART--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right" width="50%">{--HOLIDAY_MEMBER_TSTART--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center" width="50%">{--__HOLIDAY_START--}</TD>
+               <TD align="center" width="50%">{!__HOLIDAY_START!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -19,7 +19,7 @@
        <TR>
                <TD align="right">{--HOLIDAY_MEMBER_TEND--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right">{--HOLIDAY_MEMBER_TEND--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__HOLIDAY_END--}</TD>
+               <TD align="center">{!__HOLIDAY_END!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator" height="5">&nbsp;</TD>
@@ -27,7 +27,7 @@
        <TR>
                <TD align="right">{--HOLIDAY_MEMBER_TLOCK--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
        <TR>
                <TD align="right">{--HOLIDAY_MEMBER_TLOCK--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD align="center">{--__HOLIDAY_LOCK--}</TD>
+               <TD align="center">{!__HOLIDAY_LOCK!}</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom" height="5">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" class="seperator bottom" height="5">&nbsp;</TD>
index 4b9ed3335988fe4dc3aa853b0645284fb4d405a0..2051fa8b7e279aefa6f819f46dc717de71492ee9 100644 (file)
@@ -30,7 +30,7 @@
        </TR>
        <TR>
                <TD colspan="3" align="center">
        </TR>
        <TR>
                <TD colspan="3" align="center">
-                       <SPAN class="member_note">{--HOLIDAY_MAX_DAYS_1--}<STRONG>{--__HOLIDAY_MAX--}</STRONG>{--HOLIDAY_MAX_DAYS_2--}</SPAN>
+                       <SPAN class="member_note">{--HOLIDAY_MAX_DAYS_1--}<STRONG>{!__HOLIDAY_MAX!}</STRONG>{--HOLIDAY_MAX_DAYS_2--}</SPAN>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
index 24f4857f1982a437c473294be30a68ab9219e2d2..e94d17510b7e1f3c6705e20d8a1ed084479e7594 100644 (file)
                <TD colspan="3" height="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="3" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD align="right">{--SEX--}:</TD>
+               <TD align="right">{--GENDER--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
-               <TD><SELECT name="sex" size="1" class="member_select">
-                       <OPTION value="M"{--M_DEFAULT--}>{--SEX_M--}</OPTION>
-                       <OPTION value="F"{--F_DEFAULT--}>{--SEX_F--}</OPTION>
-                       <OPTION value="C"{--C_DEFAULT--}>{--SEX_C--}</OPTION>
+               <TD><SELECT name="gender" size="1" class="member_select">
+                       <OPTION value="M"{--M_DEFAULT--}>{--GENDER_M--}</OPTION>
+                       <OPTION value="F"{--F_DEFAULT--}>{--GENDER_F--}</OPTION>
+                       <OPTION value="C"{--C_DEFAULT--}>{--GENDER_C--}</OPTION>
                </SELECT></TD>
        </TR>
        <TR>
                </SELECT></TD>
        </TR>
        <TR>
index 4ed625054a51a418ea2fee1be56a0a84a6e6854c..75d6d4613149ff68c855460bdfbe4c0a49e8aaba 100644 (file)
@@ -20,7 +20,7 @@
                <TD colspan="3" height="7" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="3" height="7" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
-               <TD width="225" align="right">{--SEX--}:</TD>
+               <TD width="225" align="right">{--GENDER--}:</TD>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="225"><STRONG>$DATA[10]</STRONG></TD>
        </TR>
                <TD width="10" class="seperator">&nbsp;</TD>
                <TD width="225"><STRONG>$DATA[10]</STRONG></TD>
        </TR>
index 56a5822545f29d3b2ad0bfc90ea4b263d2b1a484..61a31e9f8d66fb7d351b1aa43d232b2d08f92bcf 100644 (file)
@@ -21,8 +21,9 @@
                <TD width="5" class="seperator">&nbsp;</TD>
                <TD align="right">{--NICKNAME_ENTER_NICKNAME--}:</TD>
                <TD width="5" class="seperator">&nbsp;</TD>
                <TD width="5" class="seperator">&nbsp;</TD>
                <TD align="right">{--NICKNAME_ENTER_NICKNAME--}:</TD>
                <TD width="5" class="seperator">&nbsp;</TD>
-               <TD><INPUT type="text" name="nickname" class="member_normal"
-                       size="30" maxlength="30" value="{--__NICKNAME--}"></TD>
+               <TD>
+                       <INPUT type="text" name="nickname" class="member_normal" size="30" maxlength="30" value="{!__NICKNAME!}" />
+               </TD>
                <TD width="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD width="5" class="seperator">&nbsp;</TD>
        </TR>
        <TR>
index acab691a183bee4faeed5dcb7a25a50504c25af8..9890e6f2bca1f5c1bdd32133a4e16153bcd9d528 100644 (file)
@@ -13,7 +13,7 @@
                <TD class="admin_title2 bottom2 right2" align="center">{--THEME_URL--}</TD>
                <TD class="admin_title2 bottom2" align="center">{--THEME_VERSION--}</TD>
        </TR>
                <TD class="admin_title2 bottom2 right2" align="center">{--THEME_URL--}</TD>
                <TD class="admin_title2 bottom2" align="center">{--THEME_VERSION--}</TD>
        </TR>
-       {--__THEME_LIST--}
+       {!__THEME_LIST!}
        <TR>
                <TD colspan="5" class="admin_footer" align="center"><INPUT
                        type="reset" class="member_reset" value="{--UNDO_SELECTIONS--}">&nbsp;*
        <TR>
                <TD colspan="5" class="admin_footer" align="center"><INPUT
                        type="reset" class="member_reset" value="{--UNDO_SELECTIONS--}">&nbsp;*
index e7bfb046cd7cce40749943a27b8e36dd653450c3..00c0b8b40c16cc09153f3fa41705b093b98b6b9a 100644 (file)
@@ -1,9 +1,8 @@
 <DIV align="center">
 <DIV align="center">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="620"
-       class="member_table dashed">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="620" class="member_table dashed">
        <TR>
                <TD colspan="5" align="center" class="member_title2 bottom2"
        <TR>
                <TD colspan="5" align="center" class="member_title2 bottom2"
-                       height="30"><STRONG>{--__TRANSFER_TITLE--}</STRONG></TD>
+                       height="30"><STRONG>{!__TRANSFER_TITLE!}</STRONG></TD>
        </TR>
        <TR>
                <TD width="80" align="center" class="member_title2 bottom2 right2">
        </TR>
        <TR>
                <TD width="80" align="center" class="member_title2 bottom2 right2">
@@ -20,9 +19,9 @@
        {!__TRANSFER_ROWS!}
        <TR>
                <TD colspan="4" align="right" class="member_footer right2">
        {!__TRANSFER_ROWS!}
        <TR>
                <TD colspan="4" align="right" class="member_footer right2">
-               {--__TRANSFER_SUM--} ({!POINTS!}):&nbsp;</TD>
-               <TD width="80" align="center" class="member_footer"><STRONG>{--__TRANSFER_TOTAL_VALUE!}</STRONG>
+               {!__TRANSFER_SUM!} ({!POINTS!}):&nbsp;</TD>
+               <TD width="80" align="center" class="member_footer"><STRONG>{!__TRANSFER_TOTAL_VALUE!}</STRONG>
                </TD>
        </TR>
 </TABLE>
                </TD>
        </TR>
 </TABLE>
-</DIV>
\ No newline at end of file
+</DIV>
index 644df997debc5f5e9a91f2fcc0cf0847dbe2549b..868969345aab1e65abe20ece93d5d89722b341bf 100644 (file)
@@ -1,22 +1,19 @@
-<FORM
-       action="{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=new"
-       method="POST" style="margin-bottom: 0px">
-<TABLE border="0" cellspacing="0" cellpadding="0" width="520"
-       class="guest_table dashed">
+<FORM action="{!URL!}/modules.php?module=login&amp;what=transfer&amp;mode=new" method="POST" style="margin-bottom: 0px">
+<TABLE border="0" cellspacing="0" cellpadding="0" width="520" class="guest_table dashed">
        <TR>
                <TD align="right" width="220" class="bottom2" height="40"><STRONG>{--TRANSFER_SELECT_TARGET_UID--}:</STRONG>
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD align="center" width="280" class="bottom2">
        <TR>
                <TD align="right" width="220" class="bottom2" height="40"><STRONG>{--TRANSFER_SELECT_TARGET_UID--}:</STRONG>
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD align="center" width="280" class="bottom2">
-               {--__TRANSFER_USERID_SELECTION--}</TD>
+               {!__TRANSFER_USERID_SELECTION!}</TD>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_MAXIMUM--}:</STRONG>
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_MAXIMUM--}:</STRONG>
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
-               <TD class="bottom2">{--__TRANSFER_MAX_VALUE!} {!POINTS!}</TD>
+               <TD class="bottom2">{!__TRANSFER_MAX_VALUE!} {!POINTS!}</TD>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_AMOUNT--}:</STRONG>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_POINTS_AMOUNT--}:</STRONG>
@@ -25,7 +22,7 @@
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="text" name="points"
                        class="member_normal" size="5" maxlength="10"
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="text" name="points"
                        class="member_normal" size="5" maxlength="10"
-                       value="{--__TRANSFER_POINTS_VALUE!}"{--__TRANSFER_TO_DISABLED--}>
+                       value="{!__TRANSFER_POINTS_VALUE!}"{!__TRANSFER_TO_DISABLED!}>
                {!POINTS!}</TD>
        </TR>
        <TR>
                {!POINTS!}</TD>
        </TR>
        <TR>
@@ -35,7 +32,7 @@
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="text" name="reason"
                        class="member_normal" size="30" maxlength="255"
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="text" name="reason"
                        class="member_normal" size="30" maxlength="255"
-                       value="{--__TRANSFER_REASON_VALUE!}"{--__TRANSFER_TO_DISABLED--}>
+                       value="{!__TRANSFER_REASON_VALUE!}"{!__TRANSFER_TO_DISABLED!}>
                </TD>
        </TR>
        <TR>
                </TD>
        </TR>
        <TR>
@@ -43,7 +40,7 @@
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                </TD>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
-               <TD class="bottom2">{--__TRANSFER_IMAGE_INPUT--}</TD>
+               <TD class="bottom2">{!__TRANSFER_IMAGE_INPUT!}</TD>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_ENTER_PASSWORD--}:</STRONG>
        </TR>
        <TR>
                <TD align="right" class="bottom2" height="40"><STRONG>{--TRANSFER_ENTER_PASSWORD--}:</STRONG>
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="password" name="password"
                <TD width="10" class="bottom2 right2 seperator">&nbsp;</TD>
                <TD width="10" class="bottom2 seperator">&nbsp;</TD>
                <TD class="bottom2"><INPUT type="password" name="password"
-                       class="member_normal" size="10" maxlength="255"{--__TRANSFER_TO_DISABLED--}>
+                       class="member_normal" size="10" maxlength="255"{!__TRANSFER_TO_DISABLED!}>
                </TD>
        </TR>
        <TR>
                <TD colspan="4" align="center" class="member_footer"><INPUT
                </TD>
        </TR>
        <TR>
                <TD colspan="4" align="center" class="member_footer"><INPUT
-                       type="reset" class="member_reset" value="{--CLEAR_FORM--}"{--__TRANSFER_TO_DISABLED--}>&nbsp;*
+                       type="reset" class="member_reset" value="{--CLEAR_FORM--}"{!__TRANSFER_TO_DISABLED!}>&nbsp;*
                <INPUT type="submit" name="ok" class="member_submit"
                <INPUT type="submit" name="ok" class="member_submit"
-                       value="{--TRANSFER_ADD_NEW--}"{--__TRANSFER_TO_DISABLED--}></TD>
+                       value="{--TRANSFER_ADD_NEW--}"{!__TRANSFER_TO_DISABLED!}></TD>
        </TR>
 </TABLE>
 </FORM>
        </TR>
 </TABLE>
 </FORM>
index 69b9e65d8896b9ce6f0694587fbf57fb40cc3e8d..191941ae626f2ad35fd545f49a19c8570c647e69 100644 (file)
@@ -4,26 +4,28 @@
        <TR>
                <TD align="center" width="260" class="bottom2 right2" height="40">
                {--TRANSFER_LIST_INCOMING--}:<br />
        <TR>
                <TD align="center" width="260" class="bottom2 right2" height="40">
                {--TRANSFER_LIST_INCOMING--}:<br />
-               <STRONG>{--__TRANSFER_IN_LINK--}</STRONG></TD>
+               <STRONG>{!-__TRANSFER_IN_LINK!}</STRONG></TD>
                <TD align="center" width="260" class="bottom2">
                {--TRANSFER_LIST_OUTGOING--}:<br />
                <TD align="center" width="260" class="bottom2">
                {--TRANSFER_LIST_OUTGOING--}:<br />
-               <STRONG>{--__TRANSFER_OUT_LINK--}</STRONG></TD>
+               <STRONG>{!__TRANSFER_OUT_LINK!}</STRONG></TD>
        </TR>
        <TR>
                <TD align="center" colspan="2" height="40" class="bottom2">
                {--TRANSFER_LIST_ALL--}:<br />
        </TR>
        <TR>
                <TD align="center" colspan="2" height="40" class="bottom2">
                {--TRANSFER_LIST_ALL--}:<br />
-               <STRONG>{--__TRANSFER_ALL_LINK--}</STRONG></TD>
+               <STRONG>{!__TRANSFER_ALL_LINK!}</STRONG></TD>
        </TR>
        <TR>
        </TR>
        <TR>
-               <TD align="center" colspan="2" height="40" class="bottom2"><STRONG>{--TRANSFER_TO_MEMBER_NOW--}:</STRONG><br />
-               {--__TRANSFER_NEW_LINK--}</TD>
+               <TD align="center" colspan="2" height="40" class="bottom2">
+                       <STRONG>{--TRANSFER_TO_MEMBER_NOW--}:</STRONG><br />
+                       {!__TRANSFER_NEW_LINK!}
+               </TD>
        </TR>
        <TR>
                <TD colspan="2" class="member_main seperator" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="center" colspan="2" class="member_main">
        </TR>
        <TR>
                <TD colspan="2" class="member_main seperator" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD align="center" colspan="2" class="member_main">
-               {--__TRANSFER_SETTINGS_CONTENT--}</TD>
+               {!__TRANSFER_SETTINGS_CONTENT!}</TD>
        </TR>
        <TR>
                <TD colspan="2" class="member_main seperator" height="10">&nbsp;</TD>
        </TR>
        <TR>
                <TD colspan="2" class="member_main seperator" height="10">&nbsp;</TD>
index f3805c4362108398970108b02f996ed556d73f79..f472bb8928b3e30d43ece10c004ea97e22925b36 100644 (file)
@@ -7,9 +7,9 @@
                {--TRANSFER_ALLOW_OPT_IN--}</TD>
                <TD align="center" width="160" class="admin_title bottom2" height="50">
                {--YES--}:&nbsp;<INPUT type="radio" name="opt_in"
                {--TRANSFER_ALLOW_OPT_IN--}</TD>
                <TD align="center" width="160" class="admin_title bottom2" height="50">
                {--YES--}:&nbsp;<INPUT type="radio" name="opt_in"
-                       class="member_normal" value="Y"{--__TRANSFER_ALLOW_Y--}>
+                       class="member_normal" value="Y"{!__TRANSFER_ALLOW_Y!}>
                {--NO--}:&nbsp;<INPUT type="radio" name="opt_in" class="member_normal"
                {--NO--}:&nbsp;<INPUT type="radio" name="opt_in" class="member_normal"
-                       value="N"{--__TRANSFER_ALLOW_N--}></TD>
+                       value="N"{!__TRANSFER_ALLOW_N!}></TD>
        </TR>
        <TR>
                <TD align="center" colspan="2" height="40"><INPUT type="reset"
        </TR>
        <TR>
                <TD align="center" colspan="2" height="40"><INPUT type="reset"
index 6bf687aec2bd86044ef22e3aec5a9ad01b7e7bbf..2c154f621759be322f51782b63c235b3f85fef06 100644 (file)
@@ -1,12 +1,12 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
        style="height: 100%">
        <TR>
 <TABLE border="0" cellspacing="0" cellpadding="0" width="100%"
        style="height: 100%">
        <TR>
-               <TD height="10%" align="center">{--__BONUS_HEADER--}</TD>
+               <TD height="10%" align="center">{!__BONUS_HEADER!}</TD>
        </TR>
        <TR>
        </TR>
        <TR>
-               <TD height="80%" align="center">{--__BONUS_MSG--}</TD>
+               <TD height="80%" align="center">{!__BONUS_MSG!}</TD>
        </TR>
        <TR>
        </TR>
        <TR>
-               <TD height="10%" align="center">{--__BONUS_FOOTER--}</TD>
+               <TD height="10%" align="center">{!__BONUS_FOOTER!}</TD>
        </TR>
 </TABLE>
\ No newline at end of file
        </TR>
 </TABLE>
\ No newline at end of file
index e14fde0204ae4ad92e4bd8e0e61851b5eed41640..933ce8fde16626faad2906825598bff2bb0217c0 100644 (file)
@@ -1,4 +1,4 @@
-{--HELLO--} {!__SALUT!} {!__SNAME!} {!__FNAME!}!
+{--HELLO--} {!__GENDER!} {!__SNAME!} {!__FNAME!}!
 <br />
 <br />
 {--BONUS_SHOW_HEADER_LINE_1--}
 <br />
 <br />
 {--BONUS_SHOW_HEADER_LINE_1--}
index 48c01fa98d5b1fc8f50295abe1e647d66f215ce4..8245f6480924d96e88ce5a3d1f041ed307cd9d8f 100644 (file)
@@ -1,9 +1,8 @@
-<TABLE border="0" cellspacing="0" cellpadding="0" width="300"
-       class="member_table">
-       <TR>
-               <TD align="center">{--BONUS_SHOW_YOU_HAVE_CONFIRMED--} <STRONG
-                       class="nobr">{--__YR_TMARK--}</STRONG> {--_ON--} <STRONG>{--__YR_LEVEL--}.</STRONG>
-               {--BONUS_SHOW_CONFIRMED_BONUS_IS--}:&nbsp;<STRONG class="nobr">{--__YR_POINTS--}
-               {!POINTS!}</STRONG></TD>
-       </TR>
+<TABLE border="0" cellspacing="0" cellpadding="0" width="300" class="member_table">
+<TR>
+       <TD align="center">{--BONUS_SHOW_YOU_HAVE_CONFIRMED--} <STRONG
+               class="nobr">{!__YR_TMARK!}</STRONG> {--_ON--} <STRONG>{!__YR_LEVEL!}.</STRONG>
+       {--BONUS_SHOW_CONFIRMED_BONUS_IS--}:&nbsp;<STRONG class="nobr">{!__YR_POINTS!}
+       {!POINTS!}</STRONG></TD>
+</TR>
 </TABLE>
 </TABLE>
index b003b7fbc4856254e688e100ef088fd4412d8b52..1f2f5d10c42889218cffe4cf2b13bee565cb5f1b 100644 (file)
 </TR>
 <TR>
   <TD class="bottom2 right2" width="275" align="right" height="27">
 </TR>
 <TR>
   <TD class="bottom2 right2" width="275" align="right" height="27">
-    {--GUEST_SEX--}:&nbsp;
+    {--GUEST_GENDER--}:&nbsp;
   </TD>
   <TD class="bottom2" width="275">
   </TD>
   <TD class="bottom2" width="275">
-    &nbsp;<SELECT name="salut" class="guest_select" size="1">
-      <OPTION value="M"{--__SALUT_M--}>{--SEX_M--}</OPTION>
-      <OPTION value="F"{--__SALUT_F--}>{--SEX_F--}</OPTION>
-      <OPTION value="C"{--__SALUT_C--}>{--SEX_C--}</OPTION>
+    &nbsp;<SELECT name="gender" class="guest_select" size="1">
+      <OPTION value="M"{!__GENDER_M!}>{--GENDER_M--}</OPTION>
+      <OPTION value="F"{!__GENDER_F!}>{--GENDER_F--}</OPTION>
+      <OPTION value="C"{!__GENDER_C!}>{--GENDER_C--}</OPTION>
     </SELECT>                                                                                                     
   </TD>
 </TR>
     </SELECT>                                                                                                     
   </TD>
 </TR>
index f9df75c9648fd94014b28237d13096e62c0d9047..597ab6b7174b6f237a1cd08f34160c36e25570b8 100644 (file)
@@ -2,21 +2,21 @@
 <TABLE border="0" cellspacing="0" cellpadding="0" class="sponsor_table" width="100%" height="100%">
 <TR>
   <TD colspan="2" class="sponsor_header" align="center" height="75">
 <TABLE border="0" cellspacing="0" cellpadding="0" class="sponsor_table" width="100%" height="100%">
 <TR>
   <TD colspan="2" class="sponsor_header" align="center" height="75">
-    {--__SPONSOR_HEADER--}
+    {!__SPONSOR_HEADER!}
   </TD>
 </TR>
 <TR>
   <TD width="200" class="top2" align="center" valign="top">
   </TD>
 </TR>
 <TR>
   <TD width="200" class="top2" align="center" valign="top">
-    {--__SPONSOR_MENU--}
+    {!__SPONSOR_MENU!}
   </TD>
   <TD align="left" valign="top" style="padding-left: 5px; padding-right: 5px">
   </TD>
   <TD align="left" valign="top" style="padding-left: 5px; padding-right: 5px">
-    {--__SPONSOR_YOURE_HERE--}
-    {--__SPONSOR_CONTENT--}
+    {!__SPONSOR_YOURE_HERE!}
+    {!__SPONSOR_CONTENT!}
   </TD>
 </TR>
 <TR>
   <TD colspan="2" class="sponsor_table_footer" align="center" height="75">
   </TD>
 </TR>
 <TR>
   <TD colspan="2" class="sponsor_table_footer" align="center" height="75">
-    {--__SPONSOR_FOOTER--}
+    {!__SPONSOR_FOOTER!}
   </TD>
 </TR>
 </TABLE>
   </TD>
 </TR>
 </TABLE>
index c537f8e3dee5b2cfe23441715d334e6f19c578d5..6af0d020a903e3da0cb2c7780c0d247802f77671 100644 (file)
@@ -11,8 +11,8 @@
     {--GUEST_SPONSOR_RECEIVE_WARNINGS--}
   </TD>
   <TD class="bottom2" width="275" align="center">
     {--GUEST_SPONSOR_RECEIVE_WARNINGS--}
   </TD>
   <TD class="bottom2" width="275" align="center">
-    {--YES--}<INPUT type="radio" name="receive_warnings" class="guest_normal" value="Y"{--__YES--}>
-    {--NO--}<INPUT type="radio" name="receive_warnings" class="guest_normal" value="N"{--__NO--}>
+    {--YES--}<INPUT type="radio" name="receive_warnings" class="guest_normal" value="Y"{!__YES!}>
+    {--NO--}<INPUT type="radio" name="receive_warnings" class="guest_normal" value="N"{!__NO!}>
   </TD>
 </TR>
 <TR>
   </TD>
 </TR>
 <TR>
@@ -21,7 +21,7 @@
   </TD>
   <TD class="bottom2" width="275" align="center">
     <SELECT name="warning_interval" class="guest_select" size="1">
   </TD>
   <TD class="bottom2" width="275" align="center">
     <SELECT name="warning_interval" class="guest_select" size="1">
-      <OPTION value="$content[warning_interval]">{--__CURRENT--}</OPTION>
+      <OPTION value="$content[warning_interval]">{!__CURRENT!}</OPTION>
       <OPTION value="{--(ONE_DAY*1)--}">1 {--DAYS--}</OPTION>
       <OPTION value="{--(ONE_DAY*3)--}">3 {--DAYS--}</OPTION>
       <OPTION value="{--(ONE_DAY*7)--}">1 {--LIFE_WEEKS--}</OPTION>
       <OPTION value="{--(ONE_DAY*1)--}">1 {--DAYS--}</OPTION>
       <OPTION value="{--(ONE_DAY*3)--}">3 {--DAYS--}</OPTION>
       <OPTION value="{--(ONE_DAY*7)--}">1 {--LIFE_WEEKS--}</OPTION>
index d8bb0c097b025c8bb076d4de96ddf98b1e75774c..667f0311bb0ae05fd6b697e9987a6df40ee4d731 100644 (file)
@@ -1,5 +1,5 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--}!<br />
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!}!<br />
 <br />
 Sch&ouml;n, dass wir Sie wieder in unserem Sponsorenbereich begr&uuml;ssen d&uuml;rfen!<br />
 <br />
 <br />
 Sch&ouml;n, dass wir Sie wieder in unserem Sponsorenbereich begr&uuml;ssen d&uuml;rfen!<br />
 <br />
-Sie haben noch {--__POINTS--} {!POINTS!} f&uuml;r weitere Sponsorenaktionen &uuml;brig.
+Sie haben noch {!__POINTS!} {!POINTS!} f&uuml;r weitere Sponsorenaktionen &uuml;brig.
index b02f8132f462e21120c4c4f50317256d71f031a9..e579cf8b2c23397cb0ac03472500af2de8d4689c 100644 (file)
@@ -1,5 +1,5 @@
 {--CURR_THEME_IS_1--}
 <br />
 {--CURR_THEME_IS_1--}
 <br />
-<FONT class="theme_note">{--__THEME_NAME--}</FONT>
+<FONT class="theme_note">{!__THEME_NAME!}</FONT>
 <br />
 {--CURR_THEME_IS_2--}
 <br />
 {--CURR_THEME_IS_2--}