From f01652b7b8efac92d97889e312402c4a845c2f14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 13 Sep 2008 15:51:21 +0000 Subject: [PATCH] - Major change in LOAD_EMAIL_TEMPLATE(). The deprecated switch() block has 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 --- birthday_confirm.php | 4 +- inc/databases.php | 15 +- inc/extensions/ext-sponsor.php | 4 +- inc/extensions/ext-sql_patches.php | 13 +- inc/extensions/ext-user.php | 2 +- inc/functions.php | 211 +++++++----------- inc/language/de.php | 10 +- inc/language/en.ph | 10 +- inc/language/sponsor_de.php | 2 +- inc/libs/rallye_functions.php | 6 +- inc/libs/register_functions.php | 2 +- inc/libs/sponsor_functions.php | 4 +- inc/modules/admin/overview-inc.php | 6 +- inc/modules/admin/what-chk_regs.php | 22 +- inc/modules/admin/what-del_sponsor.php | 10 +- inc/modules/admin/what-edit_sponsor.php | 24 +- inc/modules/admin/what-edit_user.php | 28 +-- inc/modules/admin/what-list_autopurge.php | 6 +- inc/modules/admin/what-list_beg.php | 26 +-- inc/modules/admin/what-list_bonus.php | 26 +-- inc/modules/admin/what-list_norefs.php | 6 +- inc/modules/admin/what-list_payouts.php | 6 +- inc/modules/admin/what-list_refs.php | 4 +- inc/modules/admin/what-list_sponsor.php | 12 +- inc/modules/admin/what-list_unconfirmed.php | 6 +- inc/modules/admin/what-list_user.php | 10 +- inc/modules/admin/what-lock_sponsor.php | 8 +- inc/modules/admin/what-lock_user.php | 4 +- inc/modules/admin/what-unlock_sponsor.php | 16 +- inc/modules/guest/what-confirm.php | 4 +- inc/modules/guest/what-login.php | 47 ++-- inc/modules/guest/what-register.php | 12 +- inc/modules/guest/what-sponsor_login.php | 14 +- inc/modules/guest/what-sponsor_reg.php | 34 +-- inc/modules/guest/what-stats.php | 4 +- inc/modules/member/what-mydata.php | 18 +- inc/modules/member/what-transfer.php | 14 +- inc/modules/order.php | 21 +- inc/modules/sponsor/account.php | 24 +- inc/modules/sponsor/settings.php | 4 +- inc/modules/sponsor/welcome.php | 6 +- inc/mysql-manager.php | 43 ++-- inc/pool-update.php | 177 +++++++++------ inc/profile-updte.php | 2 +- install/tables.sql | 2 +- mailid.php | 4 +- mailid_top.php | 4 +- show_bonus.php | 6 +- templates/de/emails/add-points.tpl | 2 +- templates/de/emails/admin-del_links.tpl | 2 +- .../admin/admin_holiday_deactivated.tpl | 4 +- .../de/emails/admin/admin_holiday_request.tpl | 8 +- .../de/emails/admin/admin_mydata_notify.tpl | 2 +- .../emails/admin/admin_newsletter_request.tpl | 4 +- .../emails/admin/admin_newsletter_reset.tpl | 4 +- .../de/emails/admin/admin_payout_request.tpl | 8 +- .../admin/admin_payout_request_banner.tpl | 8 +- .../admin/admin_sponsor_change_data.tpl | 2 +- .../admin/admin_sponsor_change_email.tpl | 2 +- .../de/emails/admin/admin_sponsor_edit.tpl | 6 +- .../de/emails/admin/admin_sponsor_pending.tpl | 2 +- .../de/emails/admin/admin_sponsor_reg.tpl | 12 +- .../de/emails/admin/admin_support-order.tpl | 4 +- .../de/emails/admin/admin_support-ordr.tpl | 4 +- .../de/emails/admin/admin_support-reflink.tpl | 4 +- .../admin/admin_support-unconfirmed.tpl | 4 +- .../de/emails/admin/admin_transfer_points.tpl | 4 +- .../de/emails/admin/admin_wernis_request.tpl | 8 +- templates/de/emails/back-admin.tpl | 2 +- templates/de/emails/back-member.tpl | 4 +- templates/de/emails/beg/beg_di_notify.tpl | 2 +- templates/de/emails/beg/beg_en_notify.tpl | 2 +- templates/de/emails/bonus-mail.tpl | 18 +- templates/de/emails/bonus/bonus_di_notify.tpl | 2 +- templates/de/emails/bonus/bonus_en_notify.tpl | 2 +- templates/de/emails/confirm-member.tpl | 4 +- templates/de/emails/confirm-referral.tpl | 8 +- templates/de/emails/del-user.tpl | 2 +- templates/de/emails/del_sponsor.tpl | 2 +- templates/de/emails/done-admin.tpl | 10 +- templates/de/emails/done-member.tpl | 12 +- .../de/emails/guest/guest_request_confirm.tpl | 6 +- templates/de/emails/lock-user.tpl | 2 +- templates/de/emails/lock_sponsor.tpl | 4 +- .../member/member_autopurge_inactive.tpl | 2 +- .../emails/member/member_autopurge_points.tpl | 2 +- templates/de/emails/member/member_beg.tpl | 2 +- .../de/emails/member/member_birthday.tpl | 2 +- .../emails/member/member_birthday_confirm.tpl | 2 +- templates/de/emails/member/member_bonus.tpl | 2 +- templates/de/emails/member/member_doubler.tpl | 2 +- .../member/member_holiday_activated.tpl | 6 +- .../emails/member/member_holiday_removed.tpl | 6 +- .../emails/member/member_holiday_request.tpl | 10 +- .../emails/member/member_holiday_unlock.tpl | 6 +- .../de/emails/member/member_mydata_notify.tpl | 2 +- .../emails/member/member_newsletter_done.tpl | 6 +- .../member/member_newsletter_request.tpl | 6 +- .../emails/member/member_newsletter_reset.tpl | 6 +- .../emails/member/member_payout_accepted.tpl | 10 +- .../emails/member/member_payout_rejected.tpl | 10 +- .../emails/member/member_payout_request.tpl | 14 +- .../member/member_payout_request_banner.tpl | 14 +- .../emails/member/member_rallye_expired.tpl | 2 +- .../member/member_rallye_expired_bronce.tpl | 2 +- .../member/member_rallye_expired_gold.tpl | 2 +- .../member/member_rallye_expired_silver.tpl | 2 +- .../de/emails/member/member_rallye_notify.tpl | 2 +- .../de/emails/member/member_stats_bonus.tpl | 2 +- .../de/emails/member/member_support-order.tpl | 6 +- .../de/emails/member/member_support-ordr.tpl | 6 +- .../emails/member/member_support-reflink.tpl | 6 +- .../member/member_support-unconfirmed.tpl | 6 +- .../member/member_transfer_recipient.tpl | 2 +- .../emails/member/member_transfer_sender.tpl | 2 +- .../emails/member/member_wernis_accepted.tpl | 10 +- .../emails/member/member_wernis_rejected.tpl | 10 +- .../emails/member/member_wernis_request.tpl | 10 +- templates/de/emails/new-pass.tpl | 16 +- templates/de/emails/newsletter.tpl | 2 +- templates/de/emails/newsletter_html.tpl | 2 +- templates/de/emails/normal-mail.tpl | 18 +- templates/de/emails/order-accept.tpl | 2 +- templates/de/emails/order-admin.tpl | 21 +- templates/de/emails/order-deleted.tpl | 6 +- templates/de/emails/order-member.tpl | 13 +- templates/de/emails/order-reject.tpl | 2 +- templates/de/emails/order_accept_sb.tpl | 2 +- templates/de/emails/profile-updte.tpl | 2 +- templates/de/emails/register-admin.tpl | 2 +- templates/de/emails/register-member.tpl | 4 +- .../de/emails/sponsor/sponsor_activate.tpl | 2 +- .../de/emails/sponsor/sponsor_add_points.tpl | 4 +- .../de/emails/sponsor/sponsor_change_data.tpl | 4 +- .../emails/sponsor/sponsor_change_email.tpl | 2 +- .../de/emails/sponsor/sponsor_confirm.tpl | 10 +- templates/de/emails/sponsor/sponsor_email.tpl | 2 +- templates/de/emails/sponsor/sponsor_lost.tpl | 2 +- .../de/emails/sponsor/sponsor_pending.tpl | 4 +- .../de/emails/sponsor/sponsor_ref_notify.tpl | 2 +- .../de/emails/sponsor/sponsor_settings.tpl | 2 +- .../de/emails/sponsor/sponsor_sub_points.tpl | 4 +- .../de/emails/sponsor/sponsor_unlock.tpl | 2 +- .../de/emails/sponsor/sponsor_unlocked.tpl | 2 +- templates/de/emails/sponsor_add_points.tpl | 4 +- templates/de/emails/sponsor_confirm.tpl | 10 +- templates/de/emails/sponsor_pending.tpl | 4 +- templates/de/emails/sponsor_sub_points.tpl | 4 +- templates/de/emails/sponsor_unlocked.tpl | 2 +- templates/de/emails/sub-points.tpl | 2 +- templates/de/emails/unlock-user.tpl | 2 +- templates/de/html/admin/admin_add_sponsor.tpl | 12 +- .../html/admin/admin_add_sponsor_already.tpl | 4 +- templates/de/html/admin/admin_admin_add.tpl | 6 +- .../html/admin/admin_admins_contact_form.tpl | 21 +- .../html/admin/admin_admins_contct_form.tpl | 9 +- .../de/html/admin/admin_config_active.tpl | 2 +- .../de/html/admin/admin_config_admin.tpl | 4 +- .../de/html/admin/admin_config_autopurge.tpl | 28 +-- templates/de/html/admin/admin_config_beg.tpl | 38 ++-- .../de/html/admin/admin_config_birthday.tpl | 8 +- .../de/html/admin/admin_config_bonus.tpl | 54 ++--- .../de/html/admin/admin_config_cache.tpl | 30 +-- .../de/html/admin/admin_config_extensions.tpl | 4 +- .../html/admin/admin_config_home_settings.tpl | 2 +- .../admin/admin_config_home_settings_pro.tpl | 18 +- .../de/html/admin/admin_config_nickname.tpl | 6 +- .../de/html/admin/admin_config_order.tpl | 10 +- .../de/html/admin/admin_config_order_form.tpl | 16 +- .../de/html/admin/admin_config_rallye_del.tpl | 4 +- .../html/admin/admin_config_rallye_edit.tpl | 7 +- .../html/admin/admin_config_rallye_prices.tpl | 7 +- .../de/html/admin/admin_config_refid.tpl | 4 +- .../de/html/admin/admin_config_reg_pro.tpl | 4 +- .../de/html/admin/admin_config_register2.tpl | 17 +- .../de/html/admin/admin_config_secure.tpl | 4 +- .../de/html/admin/admin_config_sponsor.tpl | 4 +- .../de/html/admin/admin_config_stats.tpl | 8 +- .../de/html/admin/admin_config_surfbar.tpl | 8 +- .../de/html/admin/admin_config_title.tpl | 12 +- .../de/html/admin/admin_config_transfer.tpl | 14 +- templates/de/html/admin/admin_config_user.tpl | 4 +- templates/de/html/admin/admin_del_sponsor.tpl | 2 +- .../admin/admin_edit_sponsor_add_points.tpl | 4 +- .../de/html/admin/admin_edit_sponsor_edit.tpl | 44 ++-- .../admin/admin_edit_sponsor_sub_points.tpl | 4 +- templates/de/html/admin/admin_edit_user.tpl | 10 +- .../de/html/admin/admin_email_nav_row.tpl | 5 +- templates/de/html/admin/admin_guest_add.tpl | 6 +- .../de/html/admin/admin_list_autopurge.tpl | 2 +- .../html/admin/admin_list_autopurge_row.tpl | 2 +- .../de/html/admin/admin_list_beg_rows.tpl | 2 +- .../de/html/admin/admin_list_bonus_rows.tpl | 2 +- .../de/html/admin/admin_list_country_form.tpl | 15 +- .../html/admin/admin_list_doubler_already.tpl | 25 ++- .../html/admin/admin_list_doubler_waiting.tpl | 7 +- .../de/html/admin/admin_list_extensions.tpl | 2 +- templates/de/html/admin/admin_list_links.tpl | 11 +- .../de/html/admin/admin_list_rallye_usr.tpl | 34 +-- .../de/html/admin/admin_list_refs_row.tpl | 2 +- .../html/admin/admin_list_sponsor_details.tpl | 54 ++--- .../de/html/admin/admin_list_sponsor_row.tpl | 2 +- .../de/html/admin/admin_list_transfer.tpl | 14 +- .../de/html/admin/admin_list_unconfirmed.tpl | 69 +++--- .../de/html/admin/admin_list_user_row.tpl | 4 +- .../de/html/admin/admin_lock_sponsor.tpl | 14 +- templates/de/html/admin/admin_member_add.tpl | 6 +- templates/de/html/admin/admin_reg.tpl | 2 +- templates/de/html/admin/admin_reg_row.tpl | 2 +- .../de/html/admin/admin_send_bonus_form.tpl | 6 +- .../de/html/admin/admin_sponsor_paytypes.tpl | 6 +- .../de/html/admin/admin_unlock_emails.tpl | 2 +- .../html/admin/admin_unlock_sponsor_row.tpl | 2 +- .../de/html/admin/admin_user_details.tpl | 2 +- templates/de/html/beg/beg_done.tpl | 2 +- templates/de/html/beg/beg_failed.tpl | 2 +- templates/de/html/beg/beg_link.tpl | 12 +- templates/de/html/beg/beg_login.tpl | 2 +- .../de/html/birthday/birthday_confirm.tpl | 23 +- templates/de/html/birthday/birthday_msg.tpl | 16 +- templates/de/html/doubler/doubler_index.tpl | 14 +- .../de/html/guest/guest_confirm_table.tpl | 6 +- .../de/html/guest/guest_rallye_footer.tpl | 13 +- templates/de/html/guest/guest_rallye_show.tpl | 43 ++-- templates/de/html/guest/guest_register.tpl | 10 +- .../de/html/guest/guest_sponsor_infos.tpl | 4 +- templates/de/html/guest/guest_sponsor_reg.tpl | 50 ++--- templates/de/html/member/member_beg.tpl | 2 +- templates/de/html/member/member_doubler.tpl | 4 +- .../html/member/member_holiday_deactivate.tpl | 6 +- .../de/html/member/member_holiday_form.tpl | 2 +- .../de/html/member/member_mydata_edit.tpl | 10 +- .../de/html/member/member_mydata_overview.tpl | 2 +- .../de/html/member/member_nickname_form.tpl | 5 +- templates/de/html/member/member_themes.tpl | 2 +- .../de/html/member/member_transfer_list.tpl | 11 +- .../de/html/member/member_transfer_new.tpl | 23 +- .../html/member/member_transfer_overview.tpl | 14 +- .../html/member/member_transfer_settings.tpl | 4 +- templates/de/html/show_bonus.tpl | 6 +- templates/de/html/show_bonus_msg.tpl | 2 +- templates/de/html/show_bonus_yr.tpl | 15 +- .../de/html/sponsor/sponsor_account_form.tpl | 10 +- templates/de/html/sponsor/sponsor_main.tpl | 10 +- .../de/html/sponsor/sponsor_settings_form.tpl | 6 +- templates/de/html/sponsor/sponsor_welcome.tpl | 4 +- templates/de/html/theme_one.tpl | 2 +- 247 files changed, 1261 insertions(+), 1270 deletions(-) diff --git a/birthday_confirm.php b/birthday_confirm.php index 68fd150ef9..b9b4242e5a 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.php @@ -53,7 +53,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install $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 @@ -87,7 +87,7 @@ WHERE b.userid=%s AND b.chk_value='%s' LIMIT 1", } // 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']); diff --git a/inc/databases.php b/inc/databases.php index 7db0047ad7..424bd8c5a6 100644 --- a/inc/databases.php +++ b/inc/databases.php @@ -78,12 +78,12 @@ define('FULL_VERSION', "0.2.1-FINAL"); // 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); @@ -114,7 +114,7 @@ define('USAGE_BASE', "usage"); 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); @@ -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))); +// Extra title is empty by default +$EXTRA_TITLE = ""; + // ?> diff --git a/inc/extensions/ext-sponsor.php b/inc/extensions/ext-sponsor.php index 4201cc029a..3622ce3f86 100644 --- a/inc/extensions/ext-sponsor.php +++ b/inc/extensions/ext-sponsor.php @@ -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 '', -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 '', @@ -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 ('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')"; diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php index 5b073eec20..2bfb044c7b 100644 --- a/inc/extensions/ext-sql_patches.php +++ b/inc/extensions/ext-sql_patches.php @@ -38,13 +38,13 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF']))) { } // 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) -$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) { @@ -564,6 +564,15 @@ PRIMARY KEY (id) // Update notes (these will be set as task text!) $UPDATE_NOTES = "Täglichen/wö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 "Sex" gegen "Gender" ausgetauscht."; + break; } break; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 057d1d3a20..b93a2731eb 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -146,7 +146,7 @@ case "update": // Update an extension 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 "Firma" hinzugefügt."; diff --git a/inc/functions.php b/inc/functions.php index 7857554a5c..2f1f103022 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -216,11 +216,25 @@ function LOAD_TEMPLATE($template, $return=false, $content="") { // 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__); - 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); - $salut = TRANSLATE_SEX($sex); } // 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; } @@ -677,13 +691,21 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") { // 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 - $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')) { @@ -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); - } + } // END - if // 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; } - // 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'])) { - $points = bigintval($_POST['points']); + $points = bigintval($_POST['points']); } 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 - $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 - $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); - $nick = "---"; } } 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 - $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; @@ -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 ;) ) - $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()); - $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... - $Y = abs(floor($timestamp / (31536000 + $SWITCH))); + $Y = abs(floor($stamp / (31536000 + $SWITCH))); // Next months... - $M = abs(floor($timestamp / 2628000 - $Y * 12)); + $M = abs(floor($stamp / 2628000 - $Y * 12)); // 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... - $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... - $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.. - $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... - $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... @@ -1571,11 +1530,13 @@ function CREATE_FANCY_TIME($stamp) { $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); + + // Return fancy time string return $ret; } // diff --git a/inc/language/de.php b/inc/language/de.php index 7bb2a18425..cbcff93b9e 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -341,11 +341,11 @@ define('_ADMIN', "Administrator"); define('LAST_ONLINE', "Sie waren als letztes Online am"); define('LAST_MODULE', "Ihr zuletzt ausgewähltes Modul"); define('MEMBER_EDIT_PROFILE', "Profildaten ä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ännlich"); +define('GENDER_F', "Weiblich"); +define('GENDER_C', ""Firma""); define('SAVE_CHANGES', "Änderungen speichern"); define('MYDATA_NOTE', "Geben Sie nur bei Passwort Ihr aktuelles Passwort ein, wenn Sie nur Daten ändern wollen. Geben Sie bei Passwortbestätigung das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort ändern wollen."); define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum Ändern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut."); diff --git a/inc/language/en.ph b/inc/language/en.ph index 54a4d8e39c..261ed21565 100644 --- a/inc/language/en.ph +++ b/inc/language/en.ph @@ -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('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 Passwort Ihr aktuelles Passwort ein, wenn Sie nur Daten ändern wollen. Geben Sie bei Passwortbestätigung das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort ändern wollen."); define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum Ändern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut."); diff --git a/inc/language/sponsor_de.php b/inc/language/sponsor_de.php index 0b905a5e7a..e944f4fc85 100644 --- a/inc/language/sponsor_de.php +++ b/inc/language/sponsor_de.php @@ -66,7 +66,7 @@ define('ADD_SPONSOR', "Sponsor hinzufü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 nicht 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 {--__EMAIL--}. Wollen Sie ihn dennoch hinzufügen?"); +define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse {!__EMAIL!}. Wollen Sie ihn dennoch hinzufügen?"); define('ADMIN_SPONSOR_ADDED', "Sponsor wurde hinzugefügt."); define('ADMIN_SPONSOR_UPDATED', "Sponsordaten wurden aktualisiert."); define('ADMIN_SPONSOR_FAILED', "Konnte Daten nichtn speichern!"); diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index b7cb9d0635..f5e88c4dc1 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -481,12 +481,12 @@ function RALLYE_LOAD_USER_DATA($uids_array) $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 = ""; - 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 diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 894e388e1b..4ae9dba3ba 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -54,7 +54,7 @@ function REGISTER_FILL_MUST_CONSTANTS() SQL_FREERESULT($result); // Also fill other constants - define('MUST_SEX' , " (*)"); + define('MUST_GENDER', " (*)"); define('MUST_ADDY' , " (*)"); define('MUST_BIRTH' , " (*)"); define('MUST_MARKER', " (*)"); diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php index fdf4eb9f43..7bc398f5b5 100644 --- a/inc/libs/sponsor_functions.php +++ b/inc/libs/sponsor_functions.php @@ -584,8 +584,8 @@ function SPONSOR_SAVE_DATA($POST, $content) $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']); diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 3742b3bba1..443f8ad13c 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -170,13 +170,13 @@ function OUTPUT_SELECTED_TASKS($_POST, $result_tasks) { } 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) { - list($sex, $sname, $fname, $email) = SQL_FETCHROW($result_user); + list($gender, $sname, $fname, $email) = SQL_FETCHROW($result_user); SQL_FREERESULT($result_user); - $ADD = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_SEX($sex)." ".$sname." ".$fname.")
    • "; + $ADD = "
  • ".ADMIN_MEMBER_UID.": ".ADMIN_USER_PROFILE_LINK($uid)." (".TRANSLATE_GENDER($gender)." ".$sname." ".$fname.")
    • "; } } diff --git a/inc/modules/admin/what-chk_regs.php b/inc/modules/admin/what-chk_regs.php index e178a6d173..253e3e386a 100644 --- a/inc/modules/admin/what-chk_regs.php +++ b/inc/modules/admin/what-chk_regs.php @@ -42,24 +42,24 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) 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 = ""; - 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( - 'sw' => $SW, - 'sex' => TRANSLATE_SEX($sex), - 'sname' => $sname, - 'fname' => $fname, - 'email' => "".$email."", - 'ip' => $IP, - 'ref' => $ref, - 'hash' => $hash, - 'link' => ADMIN_USER_PROFILE_LINK($uid), + 'sw' => $SW, + 'gender' => TRANSLATE_GENDER($gender), + 'sname' => $sname, + 'fname' => $fname, + 'email' => "".$email."", + 'ip' => $IP, + 'ref' => $ref, + 'hash' => $hash, + 'link' => ADMIN_USER_PROFILE_LINK($uid), ); // Load row template and switch color diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index d0140fc149..119fa08aac 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -41,19 +41,19 @@ ADD_DESCR("admin", basename(__FILE__)); 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 - list($email, $salut, $surname, $family) = SQL_FETCHROW($result); + list($email, $gender, $surname, $family) = SQL_FETCHROW($result); // Free result SQL_FREERESULT($result); define('__EMAIL' , $email); - define('__SALUT' , TRANSLATE_SEX($salut)); + define('__GENDER' , TRANSLATE_GENDER($gender)); define('__SURNAME', $surname); define('__FAMILY' , $family); @@ -76,13 +76,13 @@ if (!empty($_GET['id']))) { LOAD_URL(URL."/modules.php?module=admin&what=list_sponsor&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); - define('__SALUT', TRANSLATE_SEX($salut)); + define('__GENDER', TRANSLATE_GENDER($gender)); define('__UID' , bigintval($_GET['id'])); // Display form diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 9081221758..7526f9537d 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -41,7 +41,7 @@ ADD_DESCR("admin", basename(__FILE__)); 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 @@ -56,24 +56,24 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) { define('__POSITION' , $DATA['position']); define('__TAX_IDENT' , $DATA['tax_ident']); // Personal data - switch ($DATA['salut']) + switch ($DATA['gender']) { 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": - define('__SALUT_M', ""); - define('__SALUT_F', " selected"); - define('__SALUT_C', ""); + define('__GENDER_M', ""); + define('__GENDER_F', " selected"); + define('__GENDER_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']); @@ -159,7 +159,7 @@ if ((!empty($_GET['id'])) && (!empty($_GET['mode']))) { 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; diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index 2feb810224..a4be4f6398 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -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 = 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__); } @@ -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 -sex='%s', +gender='%s', surname='%s', family='%s', street_nr='%s', @@ -86,7 +86,7 @@ email='%s' ".$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'], @@ -110,28 +110,28 @@ WHERE userid=%s LIMIT 1", 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 - switch ($sex) + switch ($gender) { 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": - 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": - define('_SEX_M', ""); - define('_SEX_F', ""); - define('_SEX_C', " selected=\"selected\""); + define('_GENDER_M', ""); + define('_GENDER_F', ""); + define('_GENDER_C', " selected=\"selected\""); break; } diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index a66eff4229..d7f47b8de8 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -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 -$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." @@ -60,13 +60,13 @@ if (SQL_NUMROWS($result) > 0) { // 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), - 'sex' => TRANSLATE_SEX($sex), + 'gender' => TRANSLATE_GENDER($gender), 'sname' => $sname, 'fname' => $fname, 'email' => "".$email."", diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index afc6135273..3fbf81c9ac 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -63,7 +63,7 @@ if ($_CONFIG['beg_rallye'] == "Y") } // 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", @@ -73,7 +73,7 @@ ORDER BY beg_points DESC, last_online DESC, userid", { // 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 = ""; @@ -84,17 +84,17 @@ ORDER BY beg_points DESC, last_online DESC, userid", $WIN2 = ""; } $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 diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index caefd309c9..ff592210f5 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -74,7 +74,7 @@ if ($_CONFIG['bonus_active'] == "Y") { } // 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", @@ -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; - 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']) { @@ -94,17 +94,17 @@ ORDER BY active_bonus DESC, last_online DESC, userid", // 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 diff --git a/inc/modules/admin/what-list_norefs.php b/inc/modules/admin/what-list_norefs.php index 60f43bdfde..e3f2c1567c 100644 --- a/inc/modules/admin/what-list_norefs.php +++ b/inc/modules/admin/what-list_norefs.php @@ -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"; -$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) @@ -112,7 +112,7 @@ if (SQL_NUMROWS($result_master) > 0) } $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)); @@ -125,7 +125,7 @@ if (SQL_NUMROWS($result_master) > 0) $content = array( 'sw' => $SW, 'uid' => ADMIN_USER_PROFILE_LINK($uid), - 'sex' => TRANSLATE_SEX($sex), + 'gender' => TRANSLATE_GENDER($gender), 'sname' => $sname, 'fname' => $fname, 'email' => "".$email."", diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index 5a6df80094..e266a79928 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -66,13 +66,13 @@ if (!empty($_GET['pid'])) 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__); - list($email, $sex, $surname, $family) = SQL_FETCHROW($result); + list($email, $gender, $surname, $family) = SQL_FETCHROW($result); SQL_FREERESULT($result); // Konstante bauen - define('PAYOUT_USERDATA_VALUE', "".TRANSLATE_SEX($sex)." ".$surname." ".$family.""); + define('PAYOUT_USERDATA_VALUE', "".TRANSLATE_GENDER($gender)." ".$surname." ".$family.""); if (($_GET['do'] == "accept") && (!empty($email))) { diff --git a/inc/modules/admin/what-list_refs.php b/inc/modules/admin/what-list_refs.php index 0d2434a7b3..35b5f3b6ac 100644 --- a/inc/modules/admin/what-list_refs.php +++ b/inc/modules/admin/what-list_refs.php @@ -69,7 +69,7 @@ if (!empty($_GET['u_id'])) 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."

    "); @@ -92,7 +92,7 @@ if (!empty($_GET['u_id'])) $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], diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 498444a912..8791734a39 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -41,7 +41,7 @@ ADD_DESCR("admin", basename(__FILE__)); 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__); @@ -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_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']); @@ -119,7 +119,7 @@ WHERE id='%s' LIMIT 1", 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__); @@ -138,17 +138,17 @@ WHERE refid='%s' ORDER BY id", } } 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; - 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, - 'salut' => TRANSLATE_SEX($salut), + 'gender' => TRANSLATE_GENDER($gender), 'sname' => $sname, 'fname' => $fname, 'email' => "mailto:".$email, diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 7fe2287fa0..729cbe8bd8 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -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 // - $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 @@ -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; - 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( @@ -130,7 +130,7 @@ WHERE l.%s='%s' ORDER BY l.userid LIMIT %s", 'uid' => $uid, 'link' => $LINK, 'id' => $ID, - 'email' => "".TRANSLATE_SEX($sex)." ".$sname." ".$fname."", + 'email' => "".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."", 'status' => TRANSLATE_STATUS($status), ); diff --git a/inc/modules/admin/what-list_user.php b/inc/modules/admin/what-list_user.php index f8f5982e0d..ccce2b0a2c 100644 --- a/inc/modules/admin/what-list_user.php +++ b/inc/modules/admin/what-list_user.php @@ -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 - $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__); @@ -98,7 +98,7 @@ WHERE userid=%s LIMIT 1", 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"); @@ -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) @@ -209,7 +209,7 @@ WHERE userid=%s LIMIT 1", } $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)); @@ -222,7 +222,7 @@ WHERE userid=%s LIMIT 1", $content = array( 'sw' => $SW, 'uid' => ADMIN_USER_PROFILE_LINK($uid), - 'sex' => TRANSLATE_SEX($sex), + 'gender' => TRANSLATE_GENDER($gender), 'sname' => $sname, 'fname' => $fname, 'email' => "".$email."", diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index 433f5be562..816878d364 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -42,16 +42,16 @@ $MSG = ""; 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 - 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 - define('__SALUT' , TRANSLATE_SEX($salut)); + define('__GENDER' , TRANSLATE_GENDER($gender)); define('__SURNAME', $sname); define('__FAMILY' , $fname); define('__ID' , bigintval($_GET['id'])); @@ -95,7 +95,7 @@ if (!empty($_GET['id'])) { } // Create email link - define('__EMAIL_LINK', "".__SALUT." ".__SURNAME." ".__FAMILY.""); + define('__EMAIL_LINK', "".__GENDER." ".__SURNAME." ".__FAMILY.""); // Display form LOAD_TEMPLATE("admin_lock_sponsor"); diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php index 528ec3c737..09f08635be 100644 --- a/inc/modules/admin/what-lock_user.php +++ b/inc/modules/admin/what-lock_user.php @@ -43,13 +43,13 @@ ADD_DESCR("admin", basename(__FILE__)); 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 - 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'])) { diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index d11c12855f..c3894d99a6 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -39,14 +39,14 @@ if (isset($_POST['ok'])) { $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 - 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, @@ -114,7 +114,7 @@ WHERE id='%s' LIMIT 1", // 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", @@ -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']); - $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); @@ -139,7 +139,7 @@ WHERE id='%s' LIMIT 1", } // Transfer data to array - $content['salut'] = TRANSLATE_SEX($salut); + $content['gender'] = TRANSLATE_GENDER($gender); $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 -$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; - 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, - 'salut' => TRANSLATE_SEX($salut), + 'gender' => TRANSLATE_GENDER($gender), 'surname' => $sname, 'family' => $fname, 'email' => "mailto:".$email, diff --git a/inc/modules/guest/what-confirm.php b/inc/modules/guest/what-confirm.php index 1a1a632f65..bb273a74d5 100644 --- a/inc/modules/guest/what-confirm.php +++ b/inc/modules/guest/what-confirm.php @@ -58,7 +58,7 @@ if (!empty($_GET['hash'])) 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); @@ -154,7 +154,7 @@ if (!empty($_GET['hash'])) 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; diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php index ecf3887652..a0601049a5 100644 --- a/inc/modules/guest/what-login.php +++ b/inc/modules/guest/what-login.php @@ -44,31 +44,31 @@ ADD_DESCR("guest", basename(__FILE__)); 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? - $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 - $UID = SQL_ESCAPE($_POST['id']); + $uid = SQL_ESCAPE($_POST['id']); } else { // Direct userid entered - $UID = bigintval($_POST['id']); + $uid = bigintval($_POST['id']); } } 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 - $UID = 0; $hash = ""; + $uid = 0; $hash = ""; } $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", - 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", - 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) { @@ -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", - array($hash, $UID), __FILE__, __LINE__); + array($hash, $uid), __FILE__, __LINE__); // No login bonus by default $BONUS = false; @@ -150,12 +150,12 @@ if (IS_MEMBER()) { $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 - $GLOBALS['userid'] = bigintval($UID); + $GLOBALS['userid'] = bigintval($uid); } 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", - 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"))) { @@ -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", - array(bigintval($UID)), __FILE__, __LINE__); + array(bigintval($uid)), __FILE__, __LINE__); 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; } } - 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']); @@ -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", - 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", - 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... :-) - 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", - array(generateHash($NEW_PASS), bigintval($UID)), __FILE__, __LINE__); + array(generateHash($NEW_PASS), bigintval($uid)), __FILE__, __LINE__); // 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 - 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); diff --git a/inc/modules/guest/what-register.php b/inc/modules/guest/what-register.php index 9b5d88cd04..1223294e8a 100644 --- a/inc/modules/guest/what-register.php +++ b/inc/modules/guest/what-register.php @@ -230,11 +230,11 @@ if ((isset($_POST['ok'])) && (!$FAILED)) // 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, - 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']), @@ -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 - // Start with the salutation... + // Start with the gender... $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']), diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index 12584c5fe2..6da3f8aa85 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -55,7 +55,7 @@ if (!empty($_GET['mode'])) 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 @@ -67,8 +67,8 @@ LIMIT 1", array($_GET['hash']), __FILE__, __LINE__); // 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']); @@ -145,7 +145,7 @@ WHERE id='%s' AND hash='%s' AND status='EMAIL' LIMIT 1", 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__); @@ -155,7 +155,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1", $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 @@ -201,7 +201,7 @@ WHERE email='%s' AND (status='UNCONFIRMED' OR status='EMAIL') LIMIT 1", 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__); @@ -211,7 +211,7 @@ WHERE email='%s' AND id='%s' AND status='CONFIRMED' LIMIT 1", $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 diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 875a6584ae..ec788933bf 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -47,10 +47,10 @@ if (isset($_POST['ok'])) { // Check submitted form data // // 1. Salutation / Surname / family name - if (empty($_POST['salut'])) + if (empty($_POST['gender'])) { // Surname is empty - $FORM_ERRORS[] = SPONSOR_NO_SALUT_SELECTED; + $FORM_ERRORS[] = SPONSOR_NO_GENDER_SELECTED; } 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('__SALUT' , TRANSLATE_SEX($_POST['salut'])); + define('__GENDER' , TRANSLATE_GENDER($_POST['gender'])); 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'])); - // Check for salutation selection - switch ($_POST['salut']) + // Check for gender selection + switch ($_POST['gender']) { 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 - define('__SALUT_M' , ""); - define('__SALUT_F' , " selected"); - define('__SALUT_C' , ""); + define('__GENDER_M' , ""); + define('__GENDER_F' , " selected"); + define('__GENDER_C' , ""); 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; } @@ -395,9 +395,9 @@ ORDER BY pay_name", __FILE__, __LINE__); 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' , ""); diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index e5a89e273d..19225380c0 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -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 - $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__)); diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index fd02c9f0d6..5d19989919 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -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 - $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 - $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 - $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? @@ -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 - $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 - $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__); } @@ -247,7 +247,7 @@ case "save": // Save entered data { // 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', @@ -258,7 +258,7 @@ notified='N', 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'], @@ -278,7 +278,7 @@ array( { // 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', @@ -289,7 +289,7 @@ notified='N', 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'], diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index eac91e3a0b..baa8aad018 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -112,26 +112,26 @@ case "new": // Start new transfer $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 - 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 - 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('__RECIPIENT_SEX' , TRANSLATE_SEX($sex2)); + define('__RECIPIENT_GENDER' , TRANSLATE_GENDER($gender2)); 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 - 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('__RECIPIENT_SEX' , TRANSLATE_SEX($sex1)); + define('__RECIPIENT_GENDER' , TRANSLATE_GENDER($gender1)); define('__RECIPIENT_NICK' , $nick1); define('__RECIPIENT_SNAME', $sname1); define('__RECIPIENT_FNAME', $fname1); diff --git a/inc/modules/order.php b/inc/modules/order.php index 74fbc6a45a..73626631b5 100644 --- a/inc/modules/order.php +++ b/inc/modules/order.php @@ -72,9 +72,9 @@ if (empty($URL)) { 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__); - 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 @@ -92,18 +92,21 @@ if (empty($URL)) { 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 - $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_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); diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index ec754c98e1..f9912e53d9 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -45,7 +45,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { // 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 @@ -110,25 +110,25 @@ if (SQL_NUMROWS($result) == 1) { $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 - define('__SALUT_M', " selected"); - define('__SALUT_F', ""); - define('__SALUT_C', ""); + define('__GENDER_M', " selected"); + define('__GENDER_F', ""); + define('__GENDER_C', ""); 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 - define('__SALUT_M', ""); - define('__SALUT_F', ""); - define('__SALUT_C', " selected"); + define('__GENDER_M', ""); + define('__GENDER_F', ""); + define('__GENDER_C', " selected"); break; } diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index c8e7c4b4b7..927d33cf97 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -44,7 +44,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { } // 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__); @@ -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 - $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'); diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php index e120cc2864..4aa7880e92 100644 --- a/inc/modules/sponsor/welcome.php +++ b/inc/modules/sponsor/welcome.php @@ -44,17 +44,17 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) { } // 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__); -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 -define('__SALUT' , TRANSLATE_SEX($salut)); +define('__GENDER' , TRANSLATE_GENDER($gender)); define('__SURNAME', $surname); define('__FAMILY' , $family); define('__POINTS' , TRANSLATE_COMMA($points)); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index e1df712762..5d52c25fae 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -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 - $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 @@ -737,8 +737,8 @@ function SEND_MODE_MAILS($mod, $modes) // 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 = ""; @@ -910,16 +910,20 @@ function GET_CATEGORY ($cid) { // 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; @@ -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)) { - // 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'))) { @@ -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); - } + } // END - if // Now, when we have all his points adds them do the jackpot! ADD_JACKPOT($points); diff --git a/inc/pool-update.php b/inc/pool-update.php index fad28479f8..a6ef8e18eb 100644 --- a/inc/pool-update.php +++ b/inc/pool-update.php @@ -60,14 +60,14 @@ if (SQL_NUMROWS($result_main) > 0) 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", - array($DATA[0]), __FILE__, __LINE__); + array($DATA['id']), __FILE__, __LINE__); 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 - $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? @@ -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... - 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", - 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)."!
    "; @@ -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())", - 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", - 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)."!
    "; @@ -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... - //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?
    "; - 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."?
    "; + 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; - $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 - $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); @@ -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__); - 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__); - } + } // END - if // 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__."*
    "; MEDIA_UPDATE_ENTRY(array("total_send", "normal_send"), "add", 1); - } + } // END - if // 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) - //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA[0]."*
    "; - 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']."*
    "; + 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! - 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__); - 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); - $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); @@ -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", - 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", - 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 @@ -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", - array(implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__); + array(implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__); //* DEBUG: */ echo"*EXIT/L:".__LINE__."*
    "; 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", - array(bigintval($DATA[0])), __FILE__, __LINE__); + array(bigintval($DATA['id'])), __FILE__, __LINE__); } 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", - 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 - 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", - array(bigintval($uid)), __FILE__, __LINE__); + array(bigintval($uid)), __FILE__, __LINE__); $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! - $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); - } - else - { + } else { // 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 ($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__); - } - 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 = ""; - while ($DATA = SQL_FETCHROW($result_bonus)) - { + while ($DATA = SQL_FETCHARRAY($result_bonus)) { // 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", - array(bigintval($DATA[0])), __FILE__, __LINE__); + array(bigintval($DATA['id'])), __FILE__, __LINE__); // "Explode" all receivers into an array - if (ereg(";", $DATA[3])) - { + if (ereg(";", $DATA['receivers'])) { // 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 - $RECEIVERS = array($DATA[3]); - } - else - { + $RECEIVERS = array($DATA['receivers']); + } else { // 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... - foreach ($RECEIVERS as $key => $uid) - { + foreach ($RECEIVERS as $key => $uid) { // Load personal data //* DEBUG: */ echo "*L:".__LINE__."/".$uid."*
    "; $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__."
    "; // 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 - $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $DATA[2], $uid); + $msg = LOAD_EMAIL_TEMPLATE("bonus-mail", $content, $uid); // 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]); @@ -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", - array(bigintval($DATA[0])), __FILE__, __LINE__); + array(bigintval($DATA['id'])), __FILE__, __LINE__); //* DEBUG: */ echo "*L:".__LINE__."*
    "; // 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", - 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__."
    ";
 				//* DEBUG: */ print_r($dummy);
 				//* DEBUG: */ echo "
    \n!!!
    "; diff --git a/inc/profile-updte.php b/inc/profile-updte.php index 565b24cbfc..17f56d3d86 100644 --- a/inc/profile-updte.php +++ b/inc/profile-updte.php @@ -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 - $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__); diff --git a/install/tables.sql b/install/tables.sql index 4fc1f609b7..cbcca3921b 100644 --- a/install/tables.sql +++ b/install/tables.sql @@ -194,7 +194,7 @@ CREATE TABLE `mxchange_user_data` ( `last_module` VARCHAR(20) NOT NULL DEFAULT '', `ref_clicks` BIGINT(20) NOT NULL DEFAULT '0', `total_logins` BIGINT(20) NOT NULL DEFAULT '0', - `sex` ENUM('M','F') NOT NULL DEFAULT 'M', + `gender` ENUM('M','F') NOT NULL DEFAULT 'M', `used_points` DOUBLE(22,3) NOT NULL DEFAULT '0.000', `emails_sent` BIGINT(20) NOT NULL DEFAULT '0', PRIMARY KEY (`userid`) diff --git a/mailid.php b/mailid.php index 027898174b..97f943890e 100644 --- a/mailid.php +++ b/mailid.php @@ -114,10 +114,10 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install 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) { - 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... diff --git a/mailid_top.php b/mailid_top.php index 6810f06aa3..0c54c6fc9b 100644 --- a/mailid_top.php +++ b/mailid_top.php @@ -109,12 +109,12 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install 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 - 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") diff --git a/show_bonus.php b/show_bonus.php index 861d8ca78f..6ac941f49f 100644 --- a/show_bonus.php +++ b/show_bonus.php @@ -68,7 +68,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install 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 @@ -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 - list($sex, $sname, $fname, $level, $points) = SQL_FETCHROW($result); + list($gender, $sname, $fname, $level, $points) = SQL_FETCHROW($result); // 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); diff --git a/templates/de/emails/add-points.tpl b/templates/de/emails/add-points.tpl index 1fcfb550dc..1dd2bd056a 100644 --- a/templates/de/emails/add-points.tpl +++ b/templates/de/emails/add-points.tpl @@ -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! diff --git a/templates/de/emails/admin-del_links.tpl b/templates/de/emails/admin-del_links.tpl index 6a5e4e5729..f70b75f1c5 100644 --- a/templates/de/emails/admin-del_links.tpl +++ b/templates/de/emails/admin-del_links.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], Einer unserer Administratoren hat soeben Ihre unbestaetigten Mails geloescht! diff --git a/templates/de/emails/admin/admin_holiday_deactivated.tpl b/templates/de/emails/admin/admin_holiday_deactivated.tpl index dee7db41b3..58c73e1a3f 100644 --- a/templates/de/emails/admin/admin_holiday_deactivated.tpl +++ b/templates/de/emails/admin/admin_holiday_deactivated.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben seinen Urlaub beendet! ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_holiday_request.tpl b/templates/de/emails/admin/admin_holiday_request.tpl index 8ad3d9684e..72a5d68a2c 100644 --- a/templates/de/emails/admin/admin_holiday_request.tpl +++ b/templates/de/emails/admin/admin_holiday_request.tpl @@ -5,17 +5,17 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben Urlaub beantragt! ------------------------------ 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 ------------------------------ -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 diff --git a/templates/de/emails/admin/admin_mydata_notify.tpl b/templates/de/emails/admin/admin_mydata_notify.tpl index 26bdd4f998..1d83a10929 100644 --- a/templates/de/emails/admin/admin_mydata_notify.tpl +++ b/templates/de/emails/admin/admin_mydata_notify.tpl @@ -5,7 +5,7 @@ ------------------------------------------ {--MEMBER_UID--}: $UID ------------------------------------------ -{--SEX--}: $DATA[0] +{--GENDER--}: $DATA[0] {--SURNAME--}: $DATA[1] {--FAMILY_NAME--}: $DATA[2] {--STREET_NR--}: $DATA[3] diff --git a/templates/de/emails/admin/admin_newsletter_request.tpl b/templates/de/emails/admin/admin_newsletter_request.tpl index 211fa878b5..1108a46c98 100644 --- a/templates/de/emails/admin/admin_newsletter_request.tpl +++ b/templates/de/emails/admin/admin_newsletter_request.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben die Abbestellung Ihres Newsletters ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_newsletter_reset.tpl b/templates/de/emails/admin/admin_newsletter_reset.tpl index 20b95903af..b35bd4105c 100644 --- a/templates/de/emails/admin/admin_newsletter_reset.tpl +++ b/templates/de/emails/admin/admin_newsletter_reset.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} wurde zum Newsletterempfang wieder freigegebe ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_payout_request.tpl b/templates/de/emails/admin/admin_payout_request.tpl index 4cc51d2acf..db66acde3c 100644 --- a/templates/de/emails/admin/admin_payout_request.tpl +++ b/templates/de/emails/admin/admin_payout_request.tpl @@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR ------------------------------ 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] diff --git a/templates/de/emails/admin/admin_payout_request_banner.tpl b/templates/de/emails/admin/admin_payout_request_banner.tpl index 62c96d71da..a6ea5e8fee 100644 --- a/templates/de/emails/admin/admin_payout_request_banner.tpl +++ b/templates/de/emails/admin/admin_payout_request_banner.tpl @@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR ------------------------------ 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] diff --git a/templates/de/emails/admin/admin_sponsor_change_data.tpl b/templates/de/emails/admin/admin_sponsor_change_data.tpl index e11cf06630..1ed92276e4 100644 --- a/templates/de/emails/admin/admin_sponsor_change_data.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_data.tpl @@ -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]) ------------------------------ -{--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]) diff --git a/templates/de/emails/admin/admin_sponsor_change_email.tpl b/templates/de/emails/admin/admin_sponsor_change_email.tpl index d245f66c12..b1903a3d00 100644 --- a/templates/de/emails/admin/admin_sponsor_change_email.tpl +++ b/templates/de/emails/admin/admin_sponsor_change_email.tpl @@ -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]) ------------------------------ -{--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]) diff --git a/templates/de/emails/admin/admin_sponsor_edit.tpl b/templates/de/emails/admin/admin_sponsor_edit.tpl index 7eae163a38..fbe2800211 100644 --- a/templates/de/emails/admin/admin_sponsor_edit.tpl +++ b/templates/de/emails/admin/admin_sponsor_edit.tpl @@ -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. @@ -12,7 +12,7 @@ Es sind nun folgende Daten gesetzt: {--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] diff --git a/templates/de/emails/admin/admin_sponsor_pending.tpl b/templates/de/emails/admin/admin_sponsor_pending.tpl index 57276be076..3651244b93 100644 --- a/templates/de/emails/admin/admin_sponsor_pending.tpl +++ b/templates/de/emails/admin/admin_sponsor_pending.tpl @@ -12,7 +12,7 @@ Ihre Sponsor-ID lautet: $content[id] ------------------------------ -- Persoenliche Daten: -- ------------------------------ -Anrede: $content[salut] +Anrede: $content[gender] ------------------------------ Vorname: $content[surname] ------------------------------ diff --git a/templates/de/emails/admin/admin_sponsor_reg.tpl b/templates/de/emails/admin/admin_sponsor_reg.tpl index 6f90d4cccc..efe4f6721d 100644 --- a/templates/de/emails/admin/admin_sponsor_reg.tpl +++ b/templates/de/emails/admin/admin_sponsor_reg.tpl @@ -5,21 +5,21 @@ als naechstes seine EMail-Adresse bestaetigen. Folgende Daten wurden dabei uebermittelt: ------------------------------ -Sponsor-ID: {--__ID--} +Sponsor-ID: {!__ID!} ------------------------------ 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. diff --git a/templates/de/emails/admin/admin_support-order.tpl b/templates/de/emails/admin/admin_support-order.tpl index d05a9cbc2f..b604a534ce 100644 --- a/templates/de/emails/admin/admin_support-order.tpl +++ b/templates/de/emails/admin/admin_support-order.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem Mailtausch hat soeben das Support-Formular ausgefuellt un ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_support-ordr.tpl b/templates/de/emails/admin/admin_support-ordr.tpl index f5efabbf48..0f53880069 100644 --- a/templates/de/emails/admin/admin_support-ordr.tpl +++ b/templates/de/emails/admin/admin_support-ordr.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_support-reflink.tpl b/templates/de/emails/admin/admin_support-reflink.tpl index 0331bfbd3d..1b03928c53 100644 --- a/templates/de/emails/admin/admin_support-reflink.tpl +++ b/templates/de/emails/admin/admin_support-reflink.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_support-unconfirmed.tpl b/templates/de/emails/admin/admin_support-unconfirmed.tpl index 28df1c92f2..b9126e149e 100644 --- a/templates/de/emails/admin/admin_support-unconfirmed.tpl +++ b/templates/de/emails/admin/admin_support-unconfirmed.tpl @@ -5,9 +5,9 @@ Ein Mitglied aus Ihrem {!MT_WORD!} hat soeben das Support-Formular ausgefuellt u ------------------------------ 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 ------------------------------ diff --git a/templates/de/emails/admin/admin_transfer_points.tpl b/templates/de/emails/admin/admin_transfer_points.tpl index 45c54ccf81..0ac0204f6e 100644 --- a/templates/de/emails/admin/admin_transfer_points.tpl +++ b/templates/de/emails/admin/admin_transfer_points.tpl @@ -7,13 +7,13 @@ Hier alle Infos zum Transfer: -- 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!} -Vollst. Name: {!__SENDER_SEX!} {!__SENDER_SNAME!} {!__SENDER_FNAME!} +Vollst. Name: {!__SENDER_GENDER!} {!__SENDER_SNAME!} {!__SENDER_FNAME!} Email-Adresse: {!__SENDER_EMAIL!} ------------------------------ IP-Nummer: $REMOTE_ADDR diff --git a/templates/de/emails/admin/admin_wernis_request.tpl b/templates/de/emails/admin/admin_wernis_request.tpl index 91c741e653..536724eb7b 100644 --- a/templates/de/emails/admin/admin_wernis_request.tpl +++ b/templates/de/emails/admin/admin_wernis_request.tpl @@ -14,10 +14,10 @@ IP-Nummer: $REMOTE_ADDR ------------------------------ 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] diff --git a/templates/de/emails/back-admin.tpl b/templates/de/emails/back-admin.tpl index 66e96a2441..7a36778d7a 100644 --- a/templates/de/emails/back-admin.tpl +++ b/templates/de/emails/back-admin.tpl @@ -1,6 +1,6 @@ {--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 diff --git a/templates/de/emails/back-member.tpl b/templates/de/emails/back-member.tpl index d88599d54e..5d0194ef63 100644 --- a/templates/de/emails/back-member.tpl +++ b/templates/de/emails/back-member.tpl @@ -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 diff --git a/templates/de/emails/beg/beg_di_notify.tpl b/templates/de/emails/beg/beg_di_notify.tpl index 9e5b3414aa..673bbefed4 100644 --- a/templates/de/emails/beg/beg_di_notify.tpl +++ b/templates/de/emails/beg/beg_di_notify.tpl @@ -1,4 +1,4 @@ -Hallo $surname $family, +Hallo $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/beg/beg_en_notify.tpl b/templates/de/emails/beg/beg_en_notify.tpl index f89f06454a..ef0aed69a8 100644 --- a/templates/de/emails/beg/beg_en_notify.tpl +++ b/templates/de/emails/beg/beg_en_notify.tpl @@ -1,4 +1,4 @@ -Hallo $surname $family, +Hallo $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/bonus-mail.tpl b/templates/de/emails/bonus-mail.tpl index a0c889f9fd..b009cbe7a2 100644 --- a/templates/de/emails/bonus-mail.tpl +++ b/templates/de/emails/bonus-mail.tpl @@ -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: - - - - - -$content +$content[text] - - - - - 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önnen versteigert oder verkauft werden, jedoch muß der Kä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öglichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gelöscht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, prüfen Sie Ihren Account! ---------------- diff --git a/templates/de/emails/bonus/bonus_di_notify.tpl b/templates/de/emails/bonus/bonus_di_notify.tpl index a4cf9ea70c..99ba18dfb7 100644 --- a/templates/de/emails/bonus/bonus_di_notify.tpl +++ b/templates/de/emails/bonus/bonus_di_notify.tpl @@ -1,4 +1,4 @@ -Hallo $surname $family, +Hallo $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/bonus/bonus_en_notify.tpl b/templates/de/emails/bonus/bonus_en_notify.tpl index dfb3dfa38c..fd1d6538c9 100644 --- a/templates/de/emails/bonus/bonus_en_notify.tpl +++ b/templates/de/emails/bonus/bonus_en_notify.tpl @@ -1,4 +1,4 @@ -Hallo $surname $family, +Hallo $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/confirm-member.tpl b/templates/de/emails/confirm-member.tpl index 6e5053335c..a6145704c8 100644 --- a/templates/de/emails/confirm-member.tpl +++ b/templates/de/emails/confirm-member.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], Sie haben soeben Ihre Email-Adresse bestätigt und sind somit für den {!MT_WORD!} {!MAIN_TITLE!} freigeschaltet! @@ -7,7 +7,7 @@ Sie können sich nun hier einloggen: Ihre Login-ID lautet: $UID URL zum Login: {!URL!}/login.php -für Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $points {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails bestätigt haben. Erst dann können Sie Mails an die anderen Mitglieder verschicken! +für Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $content[points] {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails bestätigt haben. Erst dann können Sie Mails an die anderen Mitglieder verschicken! Wir wünschen Ihnen viel Spass und Erfolg beim Mail-Versand! diff --git a/templates/de/emails/confirm-referral.tpl b/templates/de/emails/confirm-referral.tpl index f858e293a7..cc4c79b878 100644 --- a/templates/de/emails/confirm-referral.tpl +++ b/templates/de/emails/confirm-referral.tpl @@ -1,12 +1,12 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], Sie haben heute ein neues Mitglied fü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!} über diese geworbene Person erhalten. diff --git a/templates/de/emails/del-user.tpl b/templates/de/emails/del-user.tpl index 8a476f84d7..4bc5a3344a 100644 --- a/templates/de/emails/del-user.tpl +++ b/templates/de/emails/del-user.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], Einer unserer Administratoren hat soeben Ihren Account geloescht! diff --git a/templates/de/emails/del_sponsor.tpl b/templates/de/emails/del_sponsor.tpl index 328c2a4fdb..16eec4bd1f 100644 --- a/templates/de/emails/del_sponsor.tpl +++ b/templates/de/emails/del_sponsor.tpl @@ -1,4 +1,4 @@ -Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--}, +Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!}, Einer unserer Administratoren hat soeben Ihren Account geloescht! diff --git a/templates/de/emails/done-admin.tpl b/templates/de/emails/done-admin.tpl index de89e28a40..6eee5df155 100644 --- a/templates/de/emails/done-admin.tpl +++ b/templates/de/emails/done-admin.tpl @@ -3,17 +3,17 @@ Eine gebuchte Mail wurde soeben vollstaendig ausgesendet. Das werbende Mitglied wurde darueber in Kenntnis gesetzt. - - - - - Werbetext-Anfang: - - - - - -$content +$content[text] - - - - - 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. diff --git a/templates/de/emails/done-member.tpl b/templates/de/emails/done-member.tpl index 67dbdc7a10..fcad688338 100644 --- a/templates/de/emails/done-member.tpl +++ b/templates/de/emails/done-member.tpl @@ -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: - - - - - -$content +$content[text] - - - - - 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! diff --git a/templates/de/emails/guest/guest_request_confirm.tpl b/templates/de/emails/guest/guest_request_confirm.tpl index ede6de54ac..f35c30ed36 100644 --- a/templates/de/emails/guest/guest_request_confirm.tpl +++ b/templates/de/emails/guest/guest_request_confirm.tpl @@ -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ätigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse bestätigt. Diesen Schritt koennen Sie jetzt nachholen, damit Sie sich einloggen koennen. Hier ist Ihr Bestätigungslink: -{!URL!}/confirm.php?hash=$HASH +{!URL!}/confirm.php?hash=$content[hash] Vielen Dank. Mit freundlichem Gruss, Ihr {!MAIN_TITLE!} Team -{!URL!} ({!WEBMASTER!}) \ No newline at end of file +{!URL!} ({!WEBMASTER!}) diff --git a/templates/de/emails/lock-user.tpl b/templates/de/emails/lock-user.tpl index e04f0738eb..98b6914750 100644 --- a/templates/de/emails/lock-user.tpl +++ b/templates/de/emails/lock-user.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], -------------- Ihre User-ID bei uns: $UID diff --git a/templates/de/emails/lock_sponsor.tpl b/templates/de/emails/lock_sponsor.tpl index 9b8219a546..ec07d5c747 100644 --- a/templates/de/emails/lock_sponsor.tpl +++ b/templates/de/emails/lock_sponsor.tpl @@ -1,10 +1,10 @@ -Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--}, +Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!}, -------------------------- Ihre Sponsor-ID bei uns: $UID -------------------------- -{--__EMAIL_MSG--} +{!__EMAIL_MSG!} Grund der Sperrung war: -------------------------- diff --git a/templates/de/emails/member/member_autopurge_inactive.tpl b/templates/de/emails/member/member_autopurge_inactive.tpl index 26991f5420..e5adfae39d 100644 --- a/templates/de/emails/member/member_autopurge_inactive.tpl +++ b/templates/de/emails/member/member_autopurge_inactive.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_autopurge_points.tpl b/templates/de/emails/member/member_autopurge_points.tpl index 9e7c4510b7..011456be03 100644 --- a/templates/de/emails/member/member_autopurge_points.tpl +++ b/templates/de/emails/member/member_autopurge_points.tpl @@ -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! diff --git a/templates/de/emails/member/member_beg.tpl b/templates/de/emails/member/member_beg.tpl index 8d1019e491..8bdf73e069 100644 --- a/templates/de/emails/member/member_beg.tpl +++ b/templates/de/emails/member/member_beg.tpl @@ -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! diff --git a/templates/de/emails/member/member_birthday.tpl b/templates/de/emails/member/member_birthday.tpl index 4eb486903f..82d419f99b 100644 --- a/templates/de/emails/member/member_birthday.tpl +++ b/templates/de/emails/member/member_birthday.tpl @@ -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! diff --git a/templates/de/emails/member/member_birthday_confirm.tpl b/templates/de/emails/member/member_birthday_confirm.tpl index ac9b6296c8..c6aaef023c 100644 --- a/templates/de/emails/member/member_birthday_confirm.tpl +++ b/templates/de/emails/member/member_birthday_confirm.tpl @@ -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! diff --git a/templates/de/emails/member/member_bonus.tpl b/templates/de/emails/member/member_bonus.tpl index 33ec699017..76af1e22fb 100644 --- a/templates/de/emails/member/member_bonus.tpl +++ b/templates/de/emails/member/member_bonus.tpl @@ -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! diff --git a/templates/de/emails/member/member_doubler.tpl b/templates/de/emails/member/member_doubler.tpl index ed708a79ab..a2b4c3e35d 100644 --- a/templates/de/emails/member/member_doubler.tpl +++ b/templates/de/emails/member/member_doubler.tpl @@ -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! diff --git a/templates/de/emails/member/member_holiday_activated.tpl b/templates/de/emails/member/member_holiday_activated.tpl index 5caae85538..81d61dcd80 100644 --- a/templates/de/emails/member/member_holiday_activated.tpl +++ b/templates/de/emails/member/member_holiday_activated.tpl @@ -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 ------------------------------ -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 ------------------------------ diff --git a/templates/de/emails/member/member_holiday_removed.tpl b/templates/de/emails/member/member_holiday_removed.tpl index e0053a32a9..64e7cb214d 100644 --- a/templates/de/emails/member/member_holiday_removed.tpl +++ b/templates/de/emails/member/member_holiday_removed.tpl @@ -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 ------------------------------ -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] ------------------------------ diff --git a/templates/de/emails/member/member_holiday_request.tpl b/templates/de/emails/member/member_holiday_request.tpl index b71a3a46c7..e5ae30746c 100644 --- a/templates/de/emails/member/member_holiday_request.tpl +++ b/templates/de/emails/member/member_holiday_request.tpl @@ -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 ------------------------------ -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 diff --git a/templates/de/emails/member/member_holiday_unlock.tpl b/templates/de/emails/member/member_holiday_unlock.tpl index d4fb8fffde..c3e0af03fe 100644 --- a/templates/de/emails/member/member_holiday_unlock.tpl +++ b/templates/de/emails/member/member_holiday_unlock.tpl @@ -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 ------------------------------ -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] ------------------------------ diff --git a/templates/de/emails/member/member_mydata_notify.tpl b/templates/de/emails/member/member_mydata_notify.tpl index d96c0c966a..cfb34f432a 100644 --- a/templates/de/emails/member/member_mydata_notify.tpl +++ b/templates/de/emails/member/member_mydata_notify.tpl @@ -4,7 +4,7 @@ {--YOUR_NEW_DATA--}: ------------------------------------------ -{--SEX--}: $DATA[0] +{--GENDER--}: $DATA[0] {--SURNAME--}: $DATA[1] {--FAMILY_NAME--}: $DATA[2] {--STREET_NR--}: $DATA[3] diff --git a/templates/de/emails/member/member_newsletter_done.tpl b/templates/de/emails/member/member_newsletter_done.tpl index cc2cfc8807..4bce17d1f4 100644 --- a/templates/de/emails/member/member_newsletter_done.tpl +++ b/templates/de/emails/member/member_newsletter_done.tpl @@ -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 ------------------------------ -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. diff --git a/templates/de/emails/member/member_newsletter_request.tpl b/templates/de/emails/member/member_newsletter_request.tpl index 8df5147afe..d6e65097c6 100644 --- a/templates/de/emails/member/member_newsletter_request.tpl +++ b/templates/de/emails/member/member_newsletter_request.tpl @@ -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 ------------------------------ -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: diff --git a/templates/de/emails/member/member_newsletter_reset.tpl b/templates/de/emails/member/member_newsletter_reset.tpl index 43185a852e..80b17f6ef4 100644 --- a/templates/de/emails/member/member_newsletter_reset.tpl +++ b/templates/de/emails/member/member_newsletter_reset.tpl @@ -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 ------------------------------ -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. diff --git a/templates/de/emails/member/member_payout_accepted.tpl b/templates/de/emails/member/member_payout_accepted.tpl index b7d5c39e9a..4dc2e0e7f6 100644 --- a/templates/de/emails/member/member_payout_accepted.tpl +++ b/templates/de/emails/member/member_payout_accepted.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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: diff --git a/templates/de/emails/member/member_payout_rejected.tpl b/templates/de/emails/member/member_payout_rejected.tpl index b5264a63f4..877ed1d93d 100644 --- a/templates/de/emails/member/member_payout_rejected.tpl +++ b/templates/de/emails/member/member_payout_rejected.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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: diff --git a/templates/de/emails/member/member_payout_request.tpl b/templates/de/emails/member/member_payout_request.tpl index 349dd7b77b..685a71d20f 100644 --- a/templates/de/emails/member/member_payout_request.tpl +++ b/templates/de/emails/member/member_payout_request.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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] ------------------------------ -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. diff --git a/templates/de/emails/member/member_payout_request_banner.tpl b/templates/de/emails/member/member_payout_request_banner.tpl index 402c1d6fae..33eb138b8c 100644 --- a/templates/de/emails/member/member_payout_request_banner.tpl +++ b/templates/de/emails/member/member_payout_request_banner.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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] @@ -19,7 +19,7 @@ Linktext: $_POST[alt] 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. diff --git a/templates/de/emails/member/member_rallye_expired.tpl b/templates/de/emails/member/member_rallye_expired.tpl index e02544fdcb..0b97a4962d 100644 --- a/templates/de/emails/member/member_rallye_expired.tpl +++ b/templates/de/emails/member/member_rallye_expired.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_rallye_expired_bronce.tpl b/templates/de/emails/member/member_rallye_expired_bronce.tpl index 56fe3f012a..826f1a26af 100644 --- a/templates/de/emails/member/member_rallye_expired_bronce.tpl +++ b/templates/de/emails/member/member_rallye_expired_bronce.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_rallye_expired_gold.tpl b/templates/de/emails/member/member_rallye_expired_gold.tpl index 2336e1bd35..15ec222697 100644 --- a/templates/de/emails/member/member_rallye_expired_gold.tpl +++ b/templates/de/emails/member/member_rallye_expired_gold.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_rallye_expired_silver.tpl b/templates/de/emails/member/member_rallye_expired_silver.tpl index cdd2680ea0..324306e635 100644 --- a/templates/de/emails/member/member_rallye_expired_silver.tpl +++ b/templates/de/emails/member/member_rallye_expired_silver.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_rallye_notify.tpl b/templates/de/emails/member/member_rallye_notify.tpl index 974fb5c205..11c8890bf7 100644 --- a/templates/de/emails/member/member_rallye_notify.tpl +++ b/templates/de/emails/member/member_rallye_notify.tpl @@ -1,4 +1,4 @@ -Hallo $surname $family, +Hallo $content[surname] $content[family], ------------------------------ Ihre Mitglied-ID lautet: $UID diff --git a/templates/de/emails/member/member_stats_bonus.tpl b/templates/de/emails/member/member_stats_bonus.tpl index 6883b919d1..e4f85627fa 100644 --- a/templates/de/emails/member/member_stats_bonus.tpl +++ b/templates/de/emails/member/member_stats_bonus.tpl @@ -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: diff --git a/templates/de/emails/member/member_support-order.tpl b/templates/de/emails/member/member_support-order.tpl index 0949af4cce..f0af71df8f 100644 --- a/templates/de/emails/member/member_support-order.tpl +++ b/templates/de/emails/member/member_support-order.tpl @@ -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 ------------------------------ -E-Mail Adresse: $email +E-Mail Adresse: $content[email] ------------------------------ -Vor-, Nachname: $salut $surname $family +Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ $content diff --git a/templates/de/emails/member/member_support-ordr.tpl b/templates/de/emails/member/member_support-ordr.tpl index 0949af4cce..f0af71df8f 100644 --- a/templates/de/emails/member/member_support-ordr.tpl +++ b/templates/de/emails/member/member_support-ordr.tpl @@ -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 ------------------------------ -E-Mail Adresse: $email +E-Mail Adresse: $content[email] ------------------------------ -Vor-, Nachname: $salut $surname $family +Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ $content diff --git a/templates/de/emails/member/member_support-reflink.tpl b/templates/de/emails/member/member_support-reflink.tpl index c91ad7953d..74c14e728c 100644 --- a/templates/de/emails/member/member_support-reflink.tpl +++ b/templates/de/emails/member/member_support-reflink.tpl @@ -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 ------------------------------ -E-Mail Adresse: $email +E-Mail Adresse: $content[email] ------------------------------ -Vor-, Nachname: $salut $surname $family +Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ $content diff --git a/templates/de/emails/member/member_support-unconfirmed.tpl b/templates/de/emails/member/member_support-unconfirmed.tpl index 3208dfd4a7..b1be97bbd0 100644 --- a/templates/de/emails/member/member_support-unconfirmed.tpl +++ b/templates/de/emails/member/member_support-unconfirmed.tpl @@ -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 ------------------------------ -E-Mail Adresse: $email +E-Mail Adresse: $content[email] ------------------------------ -Vor-, Nachname: $salut $surname $family +Vor-, Nachname: $content[gender] $content[surname] $content[family] ------------------------------ $content diff --git a/templates/de/emails/member/member_transfer_recipient.tpl b/templates/de/emails/member/member_transfer_recipient.tpl index c8e10b59d6..6ca84e2c79 100644 --- a/templates/de/emails/member/member_transfer_recipient.tpl +++ b/templates/de/emails/member/member_transfer_recipient.tpl @@ -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! diff --git a/templates/de/emails/member/member_transfer_sender.tpl b/templates/de/emails/member/member_transfer_sender.tpl index 7d2a32d741..defc6db842 100644 --- a/templates/de/emails/member/member_transfer_sender.tpl +++ b/templates/de/emails/member/member_transfer_sender.tpl @@ -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! diff --git a/templates/de/emails/member/member_wernis_accepted.tpl b/templates/de/emails/member/member_wernis_accepted.tpl index b7d5c39e9a..4dc2e0e7f6 100644 --- a/templates/de/emails/member/member_wernis_accepted.tpl +++ b/templates/de/emails/member/member_wernis_accepted.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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: diff --git a/templates/de/emails/member/member_wernis_rejected.tpl b/templates/de/emails/member/member_wernis_rejected.tpl index 037fcc4ecb..a0f55e54e8 100644 --- a/templates/de/emails/member/member_wernis_rejected.tpl +++ b/templates/de/emails/member/member_wernis_rejected.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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: diff --git a/templates/de/emails/member/member_wernis_request.tpl b/templates/de/emails/member/member_wernis_request.tpl index b0e3a59b46..27427bdc2e 100644 --- a/templates/de/emails/member/member_wernis_request.tpl +++ b/templates/de/emails/member/member_wernis_request.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], 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 ------------------------------ -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] diff --git a/templates/de/emails/new-pass.tpl b/templates/de/emails/new-pass.tpl index 7420649c8d..8b177885af 100644 --- a/templates/de/emails/new-pass.tpl +++ b/templates/de/emails/new-pass.tpl @@ -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ö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! diff --git a/templates/de/emails/newsletter.tpl b/templates/de/emails/newsletter.tpl index 0be4343857..60bbb454c8 100644 --- a/templates/de/emails/newsletter.tpl +++ b/templates/de/emails/newsletter.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], -------------- Ihre User-ID bei uns: $UID diff --git a/templates/de/emails/newsletter_html.tpl b/templates/de/emails/newsletter_html.tpl index 2c82f29433..b49c423bbc 100644 --- a/templates/de/emails/newsletter_html.tpl +++ b/templates/de/emails/newsletter_html.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], -------------- Ihre User-ID bei uns: $UID diff --git a/templates/de/emails/normal-mail.tpl b/templates/de/emails/normal-mail.tpl index d8c91e836c..b9e14a4c95 100644 --- a/templates/de/emails/normal-mail.tpl +++ b/templates/de/emails/normal-mail.tpl @@ -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: - - - - - -$content +$content[text] - - - - - 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önnen versteigert oder verkauft werden, jedoch muß der Kä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öglichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gelöscht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, prüfen Sie Ihren Account! ---------------- diff --git a/templates/de/emails/order-accept.tpl b/templates/de/emails/order-accept.tpl index 68e501390d..5801233543 100644 --- a/templates/de/emails/order-accept.tpl +++ b/templates/de/emails/order-accept.tpl @@ -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: diff --git a/templates/de/emails/order-admin.tpl b/templates/de/emails/order-admin.tpl index cba60e6b98..19faec1927 100644 --- a/templates/de/emails/order-admin.tpl +++ b/templates/de/emails/order-admin.tpl @@ -2,26 +2,27 @@ Ein Mitglied hat soeben eine Mailbuchung durchgefü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: ------------------------------------------------ -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 ------------------------------------------------ +Werbetext: ------------------------------------------------ -$content +$content[text] ------------------------------------------------ Sie werden bald nochmals benachrichtig, sobald der Versand vollstaendig beendet wurde. diff --git a/templates/de/emails/order-deleted.tpl b/templates/de/emails/order-deleted.tpl index 359dcf2d8f..739031596a 100644 --- a/templates/de/emails/order-deleted.tpl +++ b/templates/de/emails/order-deleted.tpl @@ -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: --------------- -Beworbene URL: $TARGET_URL -Betreffzeile: $SUBJECT +Beworbene URL: $content[url] +Betreffzeile: $content[subject] --------------- Ihre Mailbuchung wurde somit gelöscht. Sollten Sie Fragen hierzu haben, so wenden Sie sich bitte an unseren Support. diff --git a/templates/de/emails/order-member.tpl b/templates/de/emails/order-member.tpl index 44b88eaa82..7d7675aa4a 100644 --- a/templates/de/emails/order-member.tpl +++ b/templates/de/emails/order-member.tpl @@ -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: ------------------------------------------------ -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ändig gesendet wurde, erhalten Sie eine zweite Mail! Sie können bereits eine weitere Mailbuchung durchführen! diff --git a/templates/de/emails/order-reject.tpl b/templates/de/emails/order-reject.tpl index f332d2aba8..25ae7c4bb8 100644 --- a/templates/de/emails/order-reject.tpl +++ b/templates/de/emails/order-reject.tpl @@ -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: diff --git a/templates/de/emails/order_accept_sb.tpl b/templates/de/emails/order_accept_sb.tpl index a8792904bf..bae215b49e 100644 --- a/templates/de/emails/order_accept_sb.tpl +++ b/templates/de/emails/order_accept_sb.tpl @@ -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: diff --git a/templates/de/emails/profile-updte.tpl b/templates/de/emails/profile-updte.tpl index b98088e9d6..1e08acfac1 100644 --- a/templates/de/emails/profile-updte.tpl +++ b/templates/de/emails/profile-updte.tpl @@ -1,4 +1,4 @@ -Hallo $salut $surname $family, +Hallo $content[gender] $content[surname] $content[family], Haben Sie Neuigkeiten fuer uns? diff --git a/templates/de/emails/register-admin.tpl b/templates/de/emails/register-admin.tpl index ffb386cb69..6a79a6f5c5 100644 --- a/templates/de/emails/register-admin.tpl +++ b/templates/de/emails/register-admin.tpl @@ -4,7 +4,7 @@ Ein Gast hat sich soeben bei uns angemeldet. Hier sind zur Überprüfung nochmals seine persönlichen Daten: ------------------------- -Anrede: $content[salut] +Anrede: $content[gender] Vorname: $content[surname] Nachname: $content[family] Straße und Hausnummer: $content[street] diff --git a/templates/de/emails/register-member.tpl b/templates/de/emails/register-member.tpl index e5a6f4ed4f..7b1c99fe2b 100644 --- a/templates/de/emails/register-member.tpl +++ b/templates/de/emails/register-member.tpl @@ -1,10 +1,10 @@ -Hallo $content[salut] $content[surname] $content[family], +Hallo $content[gender] $content[surname] $content[family], vielen Dank, dass Sie sich für unseren {!MT_WORD!} entschieden haben! Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns! Hier sind nochmals zur Überprüfung Ihre persönlichen Daten: ----------------------------------------------- -Anrede: $content[salut] +Anrede: $content[gender] Vorname: $content[surname] Nachname: $content[family] Straße und Hausnummer: $content[street] diff --git a/templates/de/emails/sponsor/sponsor_activate.tpl b/templates/de/emails/sponsor/sponsor_activate.tpl index 66014f5e2b..be536b0e2a 100644 --- a/templates/de/emails/sponsor/sponsor_activate.tpl +++ b/templates/de/emails/sponsor/sponsor_activate.tpl @@ -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. diff --git a/templates/de/emails/sponsor/sponsor_add_points.tpl b/templates/de/emails/sponsor/sponsor_add_points.tpl index 91001c4528..b9d685db12 100644 --- a/templates/de/emails/sponsor/sponsor_add_points.tpl +++ b/templates/de/emails/sponsor/sponsor_add_points.tpl @@ -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: ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_change_data.tpl b/templates/de/emails/sponsor/sponsor_change_data.tpl index c3c26a3d54..9de6679582 100644 --- a/templates/de/emails/sponsor/sponsor_change_data.tpl +++ b/templates/de/emails/sponsor/sponsor_change_data.tpl @@ -1,4 +1,4 @@ -Hallo $DATA[salut] $DATA[surname] $DATA[family]. +Hallo $DATA[gender] $DATA[surname] $DATA[family]. 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]) ------------------------------ -{--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]) diff --git a/templates/de/emails/sponsor/sponsor_change_email.tpl b/templates/de/emails/sponsor/sponsor_change_email.tpl index dc43d87ee4..15041d4cae 100644 --- a/templates/de/emails/sponsor/sponsor_change_email.tpl +++ b/templates/de/emails/sponsor/sponsor_change_email.tpl @@ -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: diff --git a/templates/de/emails/sponsor/sponsor_confirm.tpl b/templates/de/emails/sponsor/sponsor_confirm.tpl index db943796cb..ea5f607489 100644 --- a/templates/de/emails/sponsor/sponsor_confirm.tpl +++ b/templates/de/emails/sponsor/sponsor_confirm.tpl @@ -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. @@ -8,11 +8,11 @@ dass auch kein anderer Sie angemeldet hat. 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. @@ -26,7 +26,7 @@ Verwendeter Browser: $HTTP_USER_AGENT ------------------------------ IP-Nummer: $REMOTE_ADDR ------------------------------ -Angemeldet am: {--__TIMESTAMP--} +Angemeldet am: {!__TIMESTAMP!} ------------------------------ Mit freundlichem Gruss, diff --git a/templates/de/emails/sponsor/sponsor_email.tpl b/templates/de/emails/sponsor/sponsor_email.tpl index caa022f165..7d9c9a4161 100644 --- a/templates/de/emails/sponsor/sponsor_email.tpl +++ b/templates/de/emails/sponsor/sponsor_email.tpl @@ -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. diff --git a/templates/de/emails/sponsor/sponsor_lost.tpl b/templates/de/emails/sponsor/sponsor_lost.tpl index 7094c0ec78..03e1f2a5d5 100644 --- a/templates/de/emails/sponsor/sponsor_lost.tpl +++ b/templates/de/emails/sponsor/sponsor_lost.tpl @@ -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. diff --git a/templates/de/emails/sponsor/sponsor_pending.tpl b/templates/de/emails/sponsor/sponsor_pending.tpl index 23162b479a..e056d6a7be 100644 --- a/templates/de/emails/sponsor/sponsor_pending.tpl +++ b/templates/de/emails/sponsor/sponsor_pending.tpl @@ -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. @@ -18,7 +18,7 @@ Ihre Sponsor-ID lautet: $content[id] ------------------------------ -- Persoenliche Daten: -- ------------------------------ -Anrede: $content[salut] +Anrede: $content[gender] ------------------------------ Vorname: $content[surname] ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_ref_notify.tpl b/templates/de/emails/sponsor/sponsor_ref_notify.tpl index 29ccf39ed3..5768e2e0a8 100644 --- a/templates/de/emails/sponsor/sponsor_ref_notify.tpl +++ b/templates/de/emails/sponsor/sponsor_ref_notify.tpl @@ -1,4 +1,4 @@ -Hallo $content[salut] $content[surname] $content[family], +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Sponsor-ID lautet: $content[id] diff --git a/templates/de/emails/sponsor/sponsor_settings.tpl b/templates/de/emails/sponsor/sponsor_settings.tpl index f7a45213af..3a7fc5721d 100644 --- a/templates/de/emails/sponsor/sponsor_settings.tpl +++ b/templates/de/emails/sponsor/sponsor_settings.tpl @@ -1,4 +1,4 @@ -Hallo $content[salut] $content[surname] $content[family]. +Hallo $content[gender] $content[surname] $content[family]. Sie haben heute Ihre Einstellungen geaendert. diff --git a/templates/de/emails/sponsor/sponsor_sub_points.tpl b/templates/de/emails/sponsor/sponsor_sub_points.tpl index 16adb34477..939c08252a 100644 --- a/templates/de/emails/sponsor/sponsor_sub_points.tpl +++ b/templates/de/emails/sponsor/sponsor_sub_points.tpl @@ -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: ------------------------------ diff --git a/templates/de/emails/sponsor/sponsor_unlock.tpl b/templates/de/emails/sponsor/sponsor_unlock.tpl index 66014f5e2b..be536b0e2a 100644 --- a/templates/de/emails/sponsor/sponsor_unlock.tpl +++ b/templates/de/emails/sponsor/sponsor_unlock.tpl @@ -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. diff --git a/templates/de/emails/sponsor/sponsor_unlocked.tpl b/templates/de/emails/sponsor/sponsor_unlocked.tpl index 117dc2e72a..c4b6c59bea 100644 --- a/templates/de/emails/sponsor/sponsor_unlocked.tpl +++ b/templates/de/emails/sponsor/sponsor_unlocked.tpl @@ -1,4 +1,4 @@ -Hallo $content[salut] $content[surname] $content[family], +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Sponsor-ID lautet: $content[sponsor] diff --git a/templates/de/emails/sponsor_add_points.tpl b/templates/de/emails/sponsor_add_points.tpl index 91001c4528..b9d685db12 100644 --- a/templates/de/emails/sponsor_add_points.tpl +++ b/templates/de/emails/sponsor_add_points.tpl @@ -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: ------------------------------ diff --git a/templates/de/emails/sponsor_confirm.tpl b/templates/de/emails/sponsor_confirm.tpl index db943796cb..ea5f607489 100644 --- a/templates/de/emails/sponsor_confirm.tpl +++ b/templates/de/emails/sponsor_confirm.tpl @@ -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. @@ -8,11 +8,11 @@ dass auch kein anderer Sie angemeldet hat. 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. @@ -26,7 +26,7 @@ Verwendeter Browser: $HTTP_USER_AGENT ------------------------------ IP-Nummer: $REMOTE_ADDR ------------------------------ -Angemeldet am: {--__TIMESTAMP--} +Angemeldet am: {!__TIMESTAMP!} ------------------------------ Mit freundlichem Gruss, diff --git a/templates/de/emails/sponsor_pending.tpl b/templates/de/emails/sponsor_pending.tpl index 23162b479a..e056d6a7be 100644 --- a/templates/de/emails/sponsor_pending.tpl +++ b/templates/de/emails/sponsor_pending.tpl @@ -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. @@ -18,7 +18,7 @@ Ihre Sponsor-ID lautet: $content[id] ------------------------------ -- Persoenliche Daten: -- ------------------------------ -Anrede: $content[salut] +Anrede: $content[gender] ------------------------------ Vorname: $content[surname] ------------------------------ diff --git a/templates/de/emails/sponsor_sub_points.tpl b/templates/de/emails/sponsor_sub_points.tpl index 16adb34477..939c08252a 100644 --- a/templates/de/emails/sponsor_sub_points.tpl +++ b/templates/de/emails/sponsor_sub_points.tpl @@ -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: ------------------------------ diff --git a/templates/de/emails/sponsor_unlocked.tpl b/templates/de/emails/sponsor_unlocked.tpl index 117dc2e72a..c4b6c59bea 100644 --- a/templates/de/emails/sponsor_unlocked.tpl +++ b/templates/de/emails/sponsor_unlocked.tpl @@ -1,4 +1,4 @@ -Hallo $content[salut] $content[surname] $content[family], +Hallo $content[gender] $content[surname] $content[family], ------------------------------ Ihre Sponsor-ID lautet: $content[sponsor] diff --git a/templates/de/emails/sub-points.tpl b/templates/de/emails/sub-points.tpl index a7e2d8f726..48a1ad0abf 100644 --- a/templates/de/emails/sub-points.tpl +++ b/templates/de/emails/sub-points.tpl @@ -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! diff --git a/templates/de/emails/unlock-user.tpl b/templates/de/emails/unlock-user.tpl index ab2492d59f..7710f82cd0 100644 --- a/templates/de/emails/unlock-user.tpl +++ b/templates/de/emails/unlock-user.tpl @@ -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: diff --git a/templates/de/html/admin/admin_add_sponsor.tpl b/templates/de/html/admin/admin_add_sponsor.tpl index fc156088b5..ff40a71ac2 100644 --- a/templates/de/html/admin/admin_add_sponsor.tpl +++ b/templates/de/html/admin/admin_add_sponsor.tpl @@ -62,14 +62,14 @@   - {--GUEST_SEX--}:  + {--GUEST_GENDER--}:    - + + +   @@ -275,7 +275,7 @@   - +   diff --git a/templates/de/html/admin/admin_add_sponsor_already.tpl b/templates/de/html/admin/admin_add_sponsor_already.tpl index 52d0fdbde1..da5404e42b 100644 --- a/templates/de/html/admin/admin_add_sponsor_already.tpl +++ b/templates/de/html/admin/admin_add_sponsor_already.tpl @@ -19,8 +19,8 @@   - {--__HIDDEN_DATA--} - + {!__HIDDEN_DATA!} +   diff --git a/templates/de/html/admin/admin_admin_add.tpl b/templates/de/html/admin/admin_admin_add.tpl index 9eac064beb..ee89e20905 100644 --- a/templates/de/html/admin/admin_admin_add.tpl +++ b/templates/de/html/admin/admin_admin_add.tpl @@ -19,7 +19,7 @@   {--SELECT_WHAT_NAME--}:   - {--__WHAT_SELECTION--}
    + {!__WHAT_SELECTION!}
    ({--CREATE_WHAT_FIRST--})   @@ -30,7 +30,7 @@   {--SELECT_PARENT_MENU--}:   - {--__ACTION_SELECTION--}
    + {!__ACTION_SELECTION!}
    ({--CREATE_ACTION_FIRST--})   @@ -52,7 +52,7 @@   {--SELECT_BELOW_MENU--}:   - {--__BELOW_SELECTION--} + {!-__BELOW_SELECTION!}   diff --git a/templates/de/html/admin/admin_admins_contact_form.tpl b/templates/de/html/admin/admin_admins_contact_form.tpl index 8a785dafbd..8235f0a71c 100644 --- a/templates/de/html/admin/admin_admins_contact_form.tpl +++ b/templates/de/html/admin/admin_admins_contact_form.tpl @@ -1,19 +1,16 @@ -
    - + +
    - + @@ -24,11 +21,13 @@ - - +
    {--ADMINS_ADMIN_ID--}:  {--__ADMIN--}{!__ADMIN!}
     
    {--ADMINS_ENTER_CONTACT_TEXT--}:
    - +
     
    + + +   + +
    diff --git a/templates/de/html/admin/admin_admins_contct_form.tpl b/templates/de/html/admin/admin_admins_contct_form.tpl index 908317a858..126ab1e240 100644 --- a/templates/de/html/admin/admin_admins_contct_form.tpl +++ b/templates/de/html/admin/admin_admins_contct_form.tpl @@ -1,12 +1,9 @@ -
    - + +
    - + diff --git a/templates/de/html/admin/admin_config_active.tpl b/templates/de/html/admin/admin_config_active.tpl index d2545121b6..5be693200d 100644 --- a/templates/de/html/admin/admin_config_active.tpl +++ b/templates/de/html/admin/admin_config_active.tpl @@ -16,7 +16,7 @@ diff --git a/templates/de/html/admin/admin_config_admin.tpl b/templates/de/html/admin/admin_config_admin.tpl index 0437ee61d4..9e2f06006a 100644 --- a/templates/de/html/admin/admin_config_admin.tpl +++ b/templates/de/html/admin/admin_config_admin.tpl @@ -12,14 +12,14 @@ style="padding-top: 3px; padding-right: 20px"> {--ADMIN_SELECT_MENU_TYPE--}: diff --git a/templates/de/html/admin/admin_config_autopurge.tpl b/templates/de/html/admin/admin_config_autopurge.tpl index d69455ec4d..966be18d3b 100644 --- a/templates/de/html/admin/admin_config_autopurge.tpl +++ b/templates/de/html/admin/admin_config_autopurge.tpl @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -105,12 +105,12 @@ - + - + @@ -125,7 +125,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -164,7 +164,7 @@ - + diff --git a/templates/de/html/admin/admin_config_beg.tpl b/templates/de/html/admin/admin_config_beg.tpl index d3db0985e4..d909842aea 100644 --- a/templates/de/html/admin/admin_config_beg.tpl +++ b/templates/de/html/admin/admin_config_beg.tpl @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -77,11 +77,11 @@ @@ -98,8 +98,8 @@ @@ -109,9 +109,9 @@ + value="N"{!__BEG_INCLUDE_OWN_N!}> {--NO--} @@ -120,7 +120,7 @@ @@ -131,8 +131,8 @@ @@ -149,9 +149,9 @@ + value="N"{!__BEG_RAL_EN_NOTIFY_N!}> {--NO--} @@ -160,9 +160,9 @@ + value="N"{!__BEG_RAL_DI_NOTIFY_N!}> {--NO--} @@ -171,9 +171,9 @@ + value="N"{!__BEG_NEW_MEMBER_NOTIFY_N!}> {--NO--} @@ -183,7 +183,7 @@ + value="{!__BEG_NOTIFY_BONUS!}"> @@ -191,7 +191,7 @@ - + diff --git a/templates/de/html/admin/admin_config_birthday.tpl b/templates/de/html/admin/admin_config_birthday.tpl index 8d88768d52..b496534900 100644 --- a/templates/de/html/admin/admin_config_birthday.tpl +++ b/templates/de/html/admin/admin_config_birthday.tpl @@ -27,9 +27,9 @@ + value="N"{!__BIRTHDAY_ACTIVE_N!}> {--NO--} @@ -43,11 +43,11 @@ diff --git a/templates/de/html/admin/admin_config_bonus.tpl b/templates/de/html/admin/admin_config_bonus.tpl index ba2e81062f..db613358d6 100644 --- a/templates/de/html/admin/admin_config_bonus.tpl +++ b/templates/de/html/admin/admin_config_bonus.tpl @@ -14,8 +14,8 @@  {--ADMIN_BONUS_RALLYE_IS_ACTIVE--} @@ -26,9 +26,9 @@  {--ADMIN_BONUS_INCLUDE_OWN--} + value="N"{!__BONUS_INCLUDE_OWN_N!}> {--NO--} @@ -41,9 +41,9 @@  {--ADMIN_BONUS_RALLYE_CLICK_INCLUDE--} + value="N"{!__BONUS_CLICK_N!}> {--NO--} @@ -56,9 +56,9 @@  {--ADMIN_BONUS_RALLYE_LOGIN_INCLUDE--} + value="N"{!__BONUS_LOGIN_N!}> {--NO--} @@ -71,9 +71,9 @@  {--ADMIN_BONUS_RALLYE_ORDER_INCLUDE--} + value="N"{!__BONUS_ORDER_N!}> {--NO--} @@ -86,9 +86,9 @@  {--ADMIN_BONUS_RALLYE_STATS_INCLUDE--} + value="N"{!__BONUS_STATS_N!}> {--NO--} @@ -101,8 +101,8 @@  {--ADMIN_BONUS_RALLYE_REF_INCLUDE--} @@ -197,7 +197,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -237,7 +237,7 @@ + value="{!__TRANKS_VALUE!}"> @@ -247,7 +247,7 @@ + value="{!__TLINES_VALUE!}"> @@ -275,9 +275,9 @@  {--ADMIN_BONUS_RALLYE_EN_NOTIFY--} + value="N"{!__BONUS_EN_NOTIFY_N!}> {--NO--} @@ -287,9 +287,9 @@  {--ADMIN_BONUS_RALLYE_DI_NOTIFY--} + value="N"{!__BONUS_DI_NOTIFY_N!}> {--NO--} @@ -299,9 +299,9 @@  {--ADMIN_BONUS_RALLYE_NEW_MEMBER_NOTIFY--} + value="N"{!__BONUS_NEW_MEMBER_NOTIFY_N!}> {--NO--} @@ -312,7 +312,7 @@ @@ -322,7 +322,7 @@ - + diff --git a/templates/de/html/admin/admin_config_cache.tpl b/templates/de/html/admin/admin_config_cache.tpl index b3a57de031..356d39ea07 100644 --- a/templates/de/html/admin/admin_config_cache.tpl +++ b/templates/de/html/admin/admin_config_cache.tpl @@ -13,8 +13,8 @@ @@ -24,8 +24,8 @@ @@ -35,8 +35,8 @@ @@ -46,8 +46,8 @@ @@ -57,8 +57,8 @@ @@ -68,9 +68,9 @@ + class="admin_normal"{!__REFDEPTH_N!}> {--NO--}  @@ -79,8 +79,8 @@ @@ -90,7 +90,7 @@ diff --git a/templates/de/html/admin/admin_config_extensions.tpl b/templates/de/html/admin/admin_config_extensions.tpl index a1d8b94c59..ca976521f7 100644 --- a/templates/de/html/admin/admin_config_extensions.tpl +++ b/templates/de/html/admin/admin_config_extensions.tpl @@ -11,8 +11,8 @@ diff --git a/templates/de/html/admin/admin_config_home_settings.tpl b/templates/de/html/admin/admin_config_home_settings.tpl index edf1c21e9c..c4c812f2a4 100644 --- a/templates/de/html/admin/admin_config_home_settings.tpl +++ b/templates/de/html/admin/admin_config_home_settings.tpl @@ -36,7 +36,7 @@ - + diff --git a/templates/de/html/admin/admin_config_home_settings_pro.tpl b/templates/de/html/admin/admin_config_home_settings_pro.tpl index 86df23dadb..b4f9d1e3eb 100644 --- a/templates/de/html/admin/admin_config_home_settings_pro.tpl +++ b/templates/de/html/admin/admin_config_home_settings_pro.tpl @@ -16,15 +16,15 @@ @@ -33,7 +33,7 @@ - + diff --git a/templates/de/html/admin/admin_config_nickname.tpl b/templates/de/html/admin/admin_config_nickname.tpl index 6cbe6eaa6f..07d0e99556 100644 --- a/templates/de/html/admin/admin_config_nickname.tpl +++ b/templates/de/html/admin/admin_config_nickname.tpl @@ -13,7 +13,7 @@ @@ -23,7 +23,7 @@ @@ -33,7 +33,7 @@ diff --git a/templates/de/html/admin/admin_config_order.tpl b/templates/de/html/admin/admin_config_order.tpl index 1433ffeffc..159aeb4ac3 100644 --- a/templates/de/html/admin/admin_config_order.tpl +++ b/templates/de/html/admin/admin_config_order.tpl @@ -31,11 +31,11 @@ @@ -152,7 +152,7 @@ @@ -165,8 +165,8 @@ diff --git a/templates/de/html/admin/admin_config_order_form.tpl b/templates/de/html/admin/admin_config_order_form.tpl index 0b118d728d..5b3404587c 100644 --- a/templates/de/html/admin/admin_config_order_form.tpl +++ b/templates/de/html/admin/admin_config_order_form.tpl @@ -26,11 +26,11 @@ @@ -39,7 +39,8 @@ + {--ORDER_ADMIN_MISC_SETTINGS--}: + @@ -47,11 +48,12 @@ + {--ORDER_MIN_RECEIVER_PER_ORDER--}: + - + diff --git a/templates/de/html/admin/admin_config_rallye_del.tpl b/templates/de/html/admin/admin_config_rallye_del.tpl index db6c0cc927..428972eebf 100644 --- a/templates/de/html/admin/admin_config_rallye_del.tpl +++ b/templates/de/html/admin/admin_config_rallye_del.tpl @@ -1,6 +1,4 @@ - +
    {--ADMINS_ADMIN_ID--}:  {--__ADMIN--}{!__ADMIN!}
     {--ADMIN_ACTIVE_LIMIT--}:    
    - + {--ADMIN_MENU_NEW--}
      - + {--ADMIN_MENU_OLD--}
    {--ADMIN_AUTOPURGE_INACTIVE--}  {--__AP_INACTIVE_SELECTION--}{!__AP_INACTIVE_SELECTION!}
     
    {--ADMIN_AUTOPURGE_INACTIVE_SINCE--}:  {--__AP_IN_SINCE--}{!__AP_IN_SINCE!}
     
    {--ADMIN_AUTOPURGE_INACTIVE_TIME--}:  {--__AP_IN_TIME--}{!__AP_IN_TIME!}
     
    {--ADMIN_AUTOPURGE_UNCONFIRMED--}  {--__AP_UNCONFIRMED_SELECTION--}{!__AP_UNCONFIRMED_SELECTION!}
     
    {--ADMIN_AUTOPURGE_UNCONFIRMED_TIME--}:  {--__AP_UN_TIME--}{!__AP_UN_TIME!}
     
    {--ADMIN_AUTOPURGE_TASKS--}  {--__AP_TASKS_SELECTION--}{!__AP_TASKS_SELECTION!}
     
    {--ADMIN_AUTOPURGE_TASKS_TIME--}:  {--__AP_TASK_TIME--}{!__AP_TASK_TIME!}
     
    {--ADMIN_OPTION_MAIL_LIFETIME--}:  {--_CFG_AUTO_PURGE--}{!_CFG_AUTO_PURGE!}
    {--ADMIN_AUTOPURGE_NOTIFY_DEL_MAILS--}:  {--__AP_NOTIFY_DEL_MAILS--}{!__AP_NOTIFY_DEL_MAILS!}
     
    {--ADMIN_AUTOPURGE_DEL_MAILS--}  {--__AP_DEL_MAILS_SELECTION--}{!__AP_DEL_MAILS_SELECTION!}
     
    {--ADMIN_AUTOPURGE_DEL_MAILS_TIME--}:  {--__AP_DEL_MAILS_TIME--}{!__AP_DEL_MAILS_TIME!}
     
    {--ADMIN_AUTOPURGE_NOTIFY_INACTIVE--}:  {--__AP_NOTIFY_INACTIVE--}{!__AP_NOTIFY_INACTIVE!}
     
    {--ADMIN_AUTOPURGE_NOTIFY_UNCONFIRMED--}:  {--__AP_NOTIFY_UNCONFIRMED--}{!__AP_NOTIFY_UNCONFIRMED!}
     
    {--ADMIN_AUTOPURGE_NOTIFY_TASKS--}:  {--__AP_NOTIFY_TASKS--}{!__AP_NOTIFY_TASKS!}
      {--ADMIN_CONFIG_BEG_UID_TIMEOUT--}:  {--__BEG_UID_TIMEOUT--}{!__BEG_UID_TIMEOUT!}
      {--ADMIN_CONFIG_BEG_REMOTE_IP_TIMEOUT--}:  {--__BEG_REMOTE_IP_TIMEOUT--}{!__BEG_REMOTE_IP_TIMEOUT!}
     
     {--BEG_MODE_DIRECT--}
    + class="admin_normal" value="DIRECT"{!__BEG_MODE_DIRECT!}> {--BEG_MODE_DIRECT--}
    		    {--BEG_MODE_REF--} + class="admin_normal" value="REF"{!__BEG_MODE_REF!}> {--BEG_MODE_REF--}
    {--ADMIN_BEG_RALLYE_ACTIVE--}    {--YES--}
    -  {--NO--} + class="admin_normal" value="Y"{!__BEG_RALLYE_Y!}> {--YES--}
    +  {--NO--}
    {--ADMIN_BEG_INCLUDE_OWN--}    {--YES--}
    + class="admin_normal" value="Y"{!__BEG_INCLUDE_OWN_Y!}> {--YES--}
     {--NO--}
     {--ADMIN_BEG_RANKS--}   + class="admin_normal" size="3" maxlength="7" value="{!__BEG_RANKS!}" />
       {--YES--}
    -  {--NO--} + class="admin_normal" value="Y"{!__BEG_ACTIVE_Y!}> {--YES--}
    +  {--NO--}
    {--ADMIN_BEG_RAL_EN_NOTIFY--}    {--YES--}
    + class="admin_normal" value="Y"{!__BEG_RAL_EN_NOTIFY_Y!}> {--YES--}
     {--NO--}
     {--ADMIN_BEG_RAL_DI_NOTIFY--}    {--YES--}
    + class="admin_normal" value="Y"{!__BEG_RAL_DI_NOTIFY_Y!}> {--YES--}
     {--NO--}
     {--ADMIN_BEG_NEW_MEMBER_NOTIFY--}    {--YES--}
    + class="admin_normal" value="Y"{!__BEG_NEW_MEMBER_NOTIFY_Y!}> {--YES--}
     {--NO--}
      
     
    {--ADMIN_BEG_NOTIFY_WAIT--}  {--__WAIT_SELECTION--}{!__WAIT_SELECTION!}
     {--ADMIN_BIRTHDAY_ONLY_ACTIVE--}    {--YES--}
    + class="admin_normal" value="Y"{!__BIRTHDAY_ACTIVE_Y!}> {--YES--}
     {--NO--}
     
     {--BIRTHDAY_MODE_DIRECT--}
    + name="birthday_mode" class="admin_normal" value="DIRECT"{!__BIRTHDAY_MODE_DIRECT!}> {--BIRTHDAY_MODE_DIRECT--}
    		    {--BIRTHDAY_MODE_REF--} + class="admin_normal" value="REF"{!__BIRTHDAY_MODE_REF!}> {--BIRTHDAY_MODE_REF--}
       {--YES--}
    -  {--NO--} + name="bonus_active" class="admin_normal" value="Y"{!__BONUS_ACTIVE_Y!}> {--YES--}
    +  {--NO--}
       {--YES--}
    + name="bonus_include_own" class="admin_normal" value="Y"{!__BONUS_INCLUDE_OWN_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_click_yn" class="admin_normal" value="Y"{!__BONUS_CLICK_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_login_yn" class="admin_normal" value="Y"{!__BONUS_LOGIN_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_order_yn" class="admin_normal" value="Y"{!__BONUS_ORDER_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_stats_yn" class="admin_normal" value="Y"{!__BONUS_STATS_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    -  {--NO--} + name="bonus_ref_yn" class="admin_normal" value="Y"{!__BONUS_REF_Y!}> {--YES--}
    +  {--NO--}
     {--__TRATES_LIST--}{!__TRATES_LIST!}
     
    {--ADMIN_CONFIG_LOGIN_TIMEOUT--}:  {--__LOGIN_TIMEOUT_SELECTION--}{!__LOGIN_TIMEOUT_SELECTION!}
     
    {--ADMIN_CONFIG_BONUS_TIMEOUT--}:  {--__BONUS_TIMEOUT_SELECTION--}{!__BONUS_TIMEOUT_SELECTION!}
      
      
         {--YES--}
    + name="bonus_en_notify" class="admin_normal" value="Y"{!__BONUS_EN_NOTIFY_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_di_notify" class="admin_normal" value="Y"{!__BONUS_DI_NOTIFY_Y!}> {--YES--}
     {--NO--}
         {--YES--}
    + name="bonus_new_mem_notify" class="admin_normal" value="Y"{!__BONUS_NEW_MEMBER_NOTIFY_Y!}> {--YES--}
     {--NO--}
         ({!POINTS!})
    {--ADMIN_BONUS_RALLYE_NOTIFY_WAIT--}:  {--__WAIT_SELECTION--}{!__WAIT_SELECTION!}
      {--ADMIN_CACHE_ADMINS--}  {--YES--} -  {--NO--}  + type="radio" name="cache_admins" value="Y" class="admin_normal"{!__ADMINS_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_ACLS--}  {--YES--} -  {--NO--}  + type="radio" name="cache_acls" value="Y" class="admin_normal"{!__ACLS_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_EXTS--}  {--YES--} -  {--NO--}  + name="cache_exts" value="Y" class="admin_normal"{!__EXTS_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_CONFIG--}  {--YES--} -  {--NO--}  + name="cache_config" value="Y" class="admin_normal"{!__CONFIG_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_MODREG--}  {--YES--} -  {--NO--}  + name="cache_modreg" value="Y" class="admin_normal"{!__MODREG_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_REFDEPTH--}  {--YES--} + name="cache_refdepth" value="Y" class="admin_normal"{!__REFDEPTH_Y!}> {--YES--}  {--NO--} 
      {--ADMIN_CACHE_REFSYS--}  {--YES--} -  {--NO--}  + name="cache_refsys" value="Y" class="admin_normal"{!__REFSYS_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CACHE_PATH--}:
    {--ADMIN_VERBOSE_SQL--}:  {--YES--} -  {--NO--}  + name="verbose_sql" value="Y" class="admin_normal"{!__VERBOSE_Y!}> {--YES--} +  {--NO--} 
    {--ADMIN_CONFIG_INDEX_COOKIE--}  {--__INDEX_COOKIE_SELECTION--}{!__INDEX_COOKIE_SELECTION!}
      
    {--ADMIN_CONFIG_INDEX_COOKIE--}  {--__INDEX_COOKIE_SELECTION--}{!__INDEX_COOKIE_SELECTION!}
     {--ADMIN_NICKNAME_MIN_LENGTH--}:  
    {--ADMIN_NICKNAME_PATTERN--}:  
    {--ADMIN_NICKNAME_LANG_CHARS--}:  
      {--ORDER_ADMIN_MAX--}:  + type="radio" name="order_max_full" class="admin_normal" value="MAX"{!__MAX_DEFAULT!}>   {--ORDER_ADMIN_ORDER--}:  + type="radio" name="order_max_full" class="admin_normal" value="ORDER"{!__ORDER_DEFAULT!}>  
       
       
      {--ORDER_ADMIN_MAX--}:  + type="radio" name="order_max_full" class="admin_normal" value="MAX"{!__MAX_DEFAULT!}>   {--ORDER_ADMIN_ORDER--}:  + type="radio" name="order_max_full" class="admin_normal" value="ORDER"{!__ORDER_DEFAULT!}>  
    - {--ORDER_ADMIN_MISC_SETTINGS--}:
     
      - {--ORDER_MIN_RECEIVER_PER_ORDER--}:   + +  
    diff --git a/templates/de/html/admin/admin_config_rallye_edit.tpl b/templates/de/html/admin/admin_config_rallye_edit.tpl index cd339b7b88..abca671a7f 100644 --- a/templates/de/html/admin/admin_config_rallye_edit.tpl +++ b/templates/de/html/admin/admin_config_rallye_edit.tpl @@ -1,8 +1,5 @@ - -
    + +
    diff --git a/templates/de/html/admin/admin_config_rallye_prices.tpl b/templates/de/html/admin/admin_config_rallye_prices.tpl index 00c9d16a88..8c289b4690 100644 --- a/templates/de/html/admin/admin_config_rallye_prices.tpl +++ b/templates/de/html/admin/admin_config_rallye_prices.tpl @@ -1,8 +1,5 @@ - -
    {--RALLYE_EDIT_SELECTED_PRICES--}
    + +
    diff --git a/templates/de/html/admin/admin_config_refid.tpl b/templates/de/html/admin/admin_config_refid.tpl index 2f01f009a2..d52e1f3db6 100644 --- a/templates/de/html/admin/admin_config_refid.tpl +++ b/templates/de/html/admin/admin_config_refid.tpl @@ -30,8 +30,8 @@ diff --git a/templates/de/html/admin/admin_config_reg_pro.tpl b/templates/de/html/admin/admin_config_reg_pro.tpl index 7c90d629a2..328ec85517 100644 --- a/templates/de/html/admin/admin_config_reg_pro.tpl +++ b/templates/de/html/admin/admin_config_reg_pro.tpl @@ -27,7 +27,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/templates/de/html/admin/admin_config_register2.tpl b/templates/de/html/admin/admin_config_register2.tpl index 8796833088..b5c65388ed 100644 --- a/templates/de/html/admin/admin_config_register2.tpl +++ b/templates/de/html/admin/admin_config_register2.tpl @@ -1,8 +1,5 @@ - -
    {--RALLYE_EDIT_DEL_PRICES--}    
      {--DISPLAY_REFID--}:  {--__CFG_SHOW_REFID--}{!__CFG_SHOW_REFID!}  
      {--IP_TIMEOUT--}:  {--__TIMEOUT_SELECTION--}{!__TIMEOUT_SELECTION!}  
    + +
    - + @@ -38,7 +35,7 @@ - + @@ -48,7 +45,7 @@ - + @@ -58,7 +55,7 @@ - + @@ -68,7 +65,7 @@ - + diff --git a/templates/de/html/admin/admin_config_secure.tpl b/templates/de/html/admin/admin_config_secure.tpl index b425ada076..3ce0df97c4 100644 --- a/templates/de/html/admin/admin_config_secure.tpl +++ b/templates/de/html/admin/admin_config_secure.tpl @@ -16,7 +16,7 @@ + size="3" maxlength="3" value="{!__PASS_LEN!}"> @@ -27,7 +27,7 @@ + size="3" maxlength="3" value="{!__SALT_LENGTH!}"> diff --git a/templates/de/html/admin/admin_config_sponsor.tpl b/templates/de/html/admin/admin_config_sponsor.tpl index 59f5a23d76..7f0c6ae35e 100644 --- a/templates/de/html/admin/admin_config_sponsor.tpl +++ b/templates/de/html/admin/admin_config_sponsor.tpl @@ -11,7 +11,7 @@ {--ADMIN_SPONSOR_MIN_POINTS--}: @@ -20,7 +20,7 @@ {--ADMIN_SPONSOR_REF_POINTS--}: diff --git a/templates/de/html/admin/admin_config_stats.tpl b/templates/de/html/admin/admin_config_stats.tpl index d87f7adf4b..939871a452 100644 --- a/templates/de/html/admin/admin_config_stats.tpl +++ b/templates/de/html/admin/admin_config_stats.tpl @@ -14,7 +14,7 @@ ({--ADMIN_GSTATS_MEMBERS_NOTE--}) + class="admin_normal" value="members"{!__MEMBERS_RADIO!}> @@ -27,7 +27,7 @@ ({--ADMIN_GSTATS_MODULES_NOTE--}) + value="modules"{!__MODULES_RADIO!}> @@ -40,7 +40,7 @@ ({--ADMIN_GSTATS_INACTIVE_NOTE--}) + value="inactive"{!__INACTIVE_RADIO!}> @@ -56,7 +56,7 @@ + value="{!__STATS_LIMIT!}" size="4" maxlength="20"> diff --git a/templates/de/html/admin/admin_config_surfbar.tpl b/templates/de/html/admin/admin_config_surfbar.tpl index 47a9711d7d..e0cee5cd64 100644 --- a/templates/de/html/admin/admin_config_surfbar.tpl +++ b/templates/de/html/admin/admin_config_surfbar.tpl @@ -88,7 +88,7 @@ {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_STATIC--} @@ -96,7 +96,7 @@ {--ADMIN_CONFIG_SURFBAR_PAYMENT_MODEL_DYNAMIC--} @@ -108,8 +108,8 @@ diff --git a/templates/de/html/admin/admin_config_title.tpl b/templates/de/html/admin/admin_config_title.tpl index ed5bd1176e..70626c5da8 100644 --- a/templates/de/html/admin/admin_config_title.tpl +++ b/templates/de/html/admin/admin_config_title.tpl @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -44,7 +44,7 @@ + value="{!__CFG_TITLE_LEFT!}" size="4" maxlength="10"> @@ -53,7 +53,7 @@ + value="{!__CFG_TITLE_MIDDLE!}" size="4" maxlength="10"> @@ -62,7 +62,7 @@ + value="{!__CFG_TITLE_RIGHT!}" size="4" maxlength="10"> diff --git a/templates/de/html/admin/admin_config_transfer.tpl b/templates/de/html/admin/admin_config_transfer.tpl index 2e2ebe2314..c99adaf675 100644 --- a/templates/de/html/admin/admin_config_transfer.tpl +++ b/templates/de/html/admin/admin_config_transfer.tpl @@ -13,7 +13,7 @@ @@ -22,7 +22,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -39,7 +39,7 @@ @@ -50,7 +50,7 @@ ({--ADMIN_TRANSFER_CODE_NOTE--}) + value="{!__TRANS_CODE_VALUE!}" size="4" maxlength="6"> @@ -59,8 +59,8 @@ diff --git a/templates/de/html/admin/admin_config_user.tpl b/templates/de/html/admin/admin_config_user.tpl index b33525cbdc..ac72130a29 100644 --- a/templates/de/html/admin/admin_config_user.tpl +++ b/templates/de/html/admin/admin_config_user.tpl @@ -13,7 +13,7 @@ @@ -23,7 +23,7 @@ diff --git a/templates/de/html/admin/admin_del_sponsor.tpl b/templates/de/html/admin/admin_del_sponsor.tpl index e9fda09f1d..63d71857c8 100644 --- a/templates/de/html/admin/admin_del_sponsor.tpl +++ b/templates/de/html/admin/admin_del_sponsor.tpl @@ -13,7 +13,7 @@ - + diff --git a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl index 1902418dc1..a1c9ca52d1 100644 --- a/templates/de/html/admin/admin_edit_sponsor_add_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_add_points.tpl @@ -1,10 +1,10 @@ - +
      {--EDIT_REGFORM_SETTINGS--} @@ -28,7 +25,7 @@   {--ADMIN_CFG_REGISTER_DEFAULT--}:  {--__CFG_CAT_DEFAULT--}{!__CFG_CAT_DEFAULT!}  
      {--ADMIN_CFG_REGISTER_DISPLAY_REFID--}:  {--__CFG_SHOW_REFID--}{!__CFG_SHOW_REFID!}  
      {--IP_TIMEOUT--}:  {--__TIMEOUT_SELECTION--}{!__TIMEOUT_SELECTION!}  
      {--REJECT_DOUBLE_EMAIL--}:  {--__CFG_DBL_EMAIL--}{!__CFG_DBL_EMAIL!}  
      {--REJECT_DOUBLE_PASS--}:  {--__CFG_DBL_PASS--}{!__CFG_DBL_PASS!}  
    {--MIN_PASS_LENGTH--}:    
    {--ADMIN_SALT_LENGTH--}:    
    - +
     
    - +
     
     
       
       
     {--ADMIN_MEMBER_STATS_LIMIT--}:  
      - +
    - +
     
     
    - {--YES--} - {--NO--} +  {--YES--} +  {--NO--}
     
    {--ADMIN_TITLE_ENABLE_DECORATIONS--}:  {--__CFG_TITLE_DECOS--}{!__CFG_TITLE_DECOS!}
     
    {--ADMIN_TITLE_ENABLE_MODULE_TITLE--}:  {--__CFG_TITLE_MOD_SHOW--}{!__CFG_TITLE_MOD_SHOW!}
     
    {--ADMIN_TITLE_ENABLE_WHAT_TITLE--}:  {--__CFG_TITLE_WHAT_SHOW--}{!__CFG_TITLE_WHAT_SHOW!}
     {--ADMIN_TITLE_LEFT--}:  
     {--ADMIN_TITLE_MIDDLE--}:  
     {--ADMIN_TITLE_RIGHT--}:  
     {--ADMIN_TRANSFER_MAX--}:  
    {--ADMIN_TRANSFER_AGE--}:  {--__TRANS_AGE_SELECTION--}{!__TRANS_AGE_SELECTION!}
     
    {--ADMIN_TRANSFER_TIMEOUT--}:  {--__TRANS_TIMEOUT_SELECTION--}{!__TRANS_TIMEOUT_SELECTION!}
     {--ADMIN_TRANSFER_BALANCE--}:    ({!POINTS!})
     
     {--ADMIN_AUTOPURGE_TRANSFER--}  
    {--USER_ADMIN_LIMIT_USER--}:  
    {--USER_ADMIN_ALPHA_USER--}:  
     
    {!__SNAME!} {!__FNAME!}({!__EMAIL!}){!__SNAME!} {!__FNAME!}({!__EMAIL!})
     
    diff --git a/templates/de/html/admin/admin_edit_sponsor_edit.tpl b/templates/de/html/admin/admin_edit_sponsor_edit.tpl index 8b57adf052..8468f8cb9e 100644 --- a/templates/de/html/admin/admin_edit_sponsor_edit.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_edit.tpl @@ -1,8 +1,8 @@ -
    +
     
    {--ADMIN_ADD_POINTS_TO_SPONSOR--}:
    - {--__SPONSOR_VALUE--} + {!__SPONSOR_VALUE!}
     
    @@ -20,7 +20,7 @@ @@ -31,7 +31,7 @@ @@ -42,7 +42,7 @@ @@ -58,14 +58,14 @@ @@ -78,8 +78,8 @@ @@ -91,7 +91,7 @@ @@ -102,7 +102,7 @@ @@ -114,8 +114,8 @@ @@ -127,7 +127,7 @@ @@ -138,7 +138,7 @@ @@ -149,7 +149,7 @@ @@ -161,7 +161,7 @@ @@ -172,7 +172,7 @@ @@ -232,7 +232,7 @@ diff --git a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl index f4c2d8d8f7..95f44ecfd4 100644 --- a/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl +++ b/templates/de/html/admin/admin_edit_sponsor_sub_points.tpl @@ -1,10 +1,10 @@ - +
    - {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({--__SPONSOR_ID--}) + {--ADMIN_SPONSOR_ENTER_COMPANY_DATA--}: ({!__SPONSOR_ID!})
      - +  
      - +  
      - +  
      - {--GUEST_SEX--}: + {--GUEST_GENDER--}:   - + + +     - - + +  
      - +  
      - +  
      - - - + - +  
      - +  
      - +  
      - +  
      - +  
      - +  
      - {--__INTERVAL--} + {!__INTERVAL!}  
    diff --git a/templates/de/html/admin/admin_edit_user.tpl b/templates/de/html/admin/admin_edit_user.tpl index 3a189f2178..0996c2a9db 100644 --- a/templates/de/html/admin/admin_edit_user.tpl +++ b/templates/de/html/admin/admin_edit_user.tpl @@ -8,13 +8,13 @@ {--ADMIN_EDIT_USER_PROFILE--}: ($content) - + - diff --git a/templates/de/html/admin/admin_email_nav_row.tpl b/templates/de/html/admin/admin_email_nav_row.tpl index 9e8fef153a..cfc8cf9a36 100644 --- a/templates/de/html/admin/admin_email_nav_row.tpl +++ b/templates/de/html/admin/admin_email_nav_row.tpl @@ -1,11 +1,10 @@ - - @@ -30,7 +30,7 @@ - @@ -41,7 +41,7 @@ - + diff --git a/templates/de/html/admin/admin_reg.tpl b/templates/de/html/admin/admin_reg.tpl index 9d52bc38d6..78a7fba496 100644 --- a/templates/de/html/admin/admin_reg.tpl +++ b/templates/de/html/admin/admin_reg.tpl @@ -6,7 +6,7 @@ - + diff --git a/templates/de/html/admin/admin_reg_row.tpl b/templates/de/html/admin/admin_reg_row.tpl index cff58e9c15..93a75afdbe 100644 --- a/templates/de/html/admin/admin_reg_row.tpl +++ b/templates/de/html/admin/admin_reg_row.tpl @@ -1,6 +1,6 @@ - + diff --git a/templates/de/html/admin/admin_send_bonus_form.tpl b/templates/de/html/admin/admin_send_bonus_form.tpl index 0ededdeffa..8af4fdfe94 100644 --- a/templates/de/html/admin/admin_send_bonus_form.tpl +++ b/templates/de/html/admin/admin_send_bonus_form.tpl @@ -1,5 +1,5 @@
     
    {--ADMIN_SUB_POINTS_FROM_SPONSOR--}:
    - {--__SPONSOR_VALUE--} + {!__SPONSOR_VALUE!}
     
    {--SEX--}:{--GENDER--}:   - - - + + +
    + {!__NAV_SEP!} + [ {--EMAILS_PAGENAV--}: {!__NAV_OUTPUT!} ] diff --git a/templates/de/html/admin/admin_guest_add.tpl b/templates/de/html/admin/admin_guest_add.tpl index f7f9934e4e..a611fe1677 100644 --- a/templates/de/html/admin/admin_guest_add.tpl +++ b/templates/de/html/admin/admin_guest_add.tpl @@ -19,7 +19,7 @@ - @@ -30,7 +30,7 @@ - @@ -41,7 +41,7 @@ - + diff --git a/templates/de/html/admin/admin_list_autopurge.tpl b/templates/de/html/admin/admin_list_autopurge.tpl index 0d6c9a14d2..87cb8a4c02 100644 --- a/templates/de/html/admin/admin_list_autopurge.tpl +++ b/templates/de/html/admin/admin_list_autopurge.tpl @@ -2,7 +2,7 @@ class="admin_table dashed"> - + diff --git a/templates/de/html/admin/admin_list_autopurge_row.tpl b/templates/de/html/admin/admin_list_autopurge_row.tpl index 44c5f43550..4ee80e8c82 100644 --- a/templates/de/html/admin/admin_list_autopurge_row.tpl +++ b/templates/de/html/admin/admin_list_autopurge_row.tpl @@ -1,6 +1,6 @@ - + diff --git a/templates/de/html/admin/admin_list_beg_rows.tpl b/templates/de/html/admin/admin_list_beg_rows.tpl index 0fccc80105..17e1fc6867 100644 --- a/templates/de/html/admin/admin_list_beg_rows.tpl +++ b/templates/de/html/admin/admin_list_beg_rows.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_list_bonus_rows.tpl b/templates/de/html/admin/admin_list_bonus_rows.tpl index 0fccc80105..17e1fc6867 100644 --- a/templates/de/html/admin/admin_list_bonus_rows.tpl +++ b/templates/de/html/admin/admin_list_bonus_rows.tpl @@ -3,7 +3,7 @@ diff --git a/templates/de/html/admin/admin_list_country_form.tpl b/templates/de/html/admin/admin_list_country_form.tpl index 8fab7cfaa5..016c80916f 100644 --- a/templates/de/html/admin/admin_list_country_form.tpl +++ b/templates/de/html/admin/admin_list_country_form.tpl @@ -1,9 +1,8 @@ - -
    - [ {--EMAILS_PAGENAV--}: {--__NAV_OUTPUT--} ]
       {--SELECT_WHAT_NAME--}:  {--__WHAT_SELECTION--}
    +     		{!__WHAT_SELECTION!}
    ({--CREATE_WHAT_FIRST--})    		  
      {--SELECT_PARENT_MENU--}:  {--__ACTION_SELECTION--}
    +     		{!__ACTION_SELECTION!}
    ({--CREATE_ACTION_FIRST--})    		  
      {--SELECT_BELOW_MENU--}:  {--__BELOW_SELECTION--}{!__BELOW_SELECTION!}  
    {--_UID--}{--SEX--}{--GENDER--} {--SURNAME--} {--FAMILY_NAME--} {--ADDY--}
    $content[uid]$content[sex]$content[gender] $content[sname] $content[fname] $content[email]$content[win1]$content[uid]$content[win2]  $content[win1]$content[salut] $content[sname] + href="$content[email]">$content[gender] $content[sname] $content[fname]$content[win2]  $content[turbo] {!POINTS!}$content[win1]$content[uid]$content[win2]  $content[win1]$content[salut] $content[sname] + href="$content[email]">$content[gender] $content[sname] $content[fname]$content[win2]  $content[turbo] {!POINTS!}
    + +
    - @@ -15,9 +14,9 @@ {!__COUNTRY_ROWS!}
    {--__COUNTRY_TITLE--}: + + {!__COUNTRY_TITLE!}:
    - {--__COUNTRY_RESET--} + {!__COUNTRY_RESET!}
    - \ No newline at end of file + diff --git a/templates/de/html/admin/admin_list_doubler_already.tpl b/templates/de/html/admin/admin_list_doubler_already.tpl index 13baa9e734..fbdee00178 100644 --- a/templates/de/html/admin/admin_list_doubler_already.tpl +++ b/templates/de/html/admin/admin_list_doubler_already.tpl @@ -1,21 +1,24 @@ - +
    - + - + + {!POINTS!}: + + - - {--__ROWS_CONTENT--} + {!__ROWS_CONTENT!} diff --git a/templates/de/html/admin/admin_list_doubler_waiting.tpl b/templates/de/html/admin/admin_list_doubler_waiting.tpl index c301e08dab..24086f476a 100644 --- a/templates/de/html/admin/admin_list_doubler_waiting.tpl +++ b/templates/de/html/admin/admin_list_doubler_waiting.tpl @@ -1,8 +1,7 @@ -
    {--__ADMIN_DOUBLER_LIST_ALREADY--} + {!__ADMIN_DOUBLER_LIST_ALREADY!} +
    {--_UID--}: + {--_UID--}: + - {!POINTS!}: - {--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}: + {--ADMIN_DOUBLER_PAYMENT_TIMEMARK--}: + + {--REMOTE_IP--}: {--REMOTE_IP--}:
     
    +
    + class="big">{!__ADMIN_DOUBLER_LIST_WAITING!} - {--__ROWS_CONTENT--} + {!__ROWS_CONTENT!} diff --git a/templates/de/html/admin/admin_list_extensions.tpl b/templates/de/html/admin/admin_list_extensions.tpl index 8519566512..de84c5b37c 100644 --- a/templates/de/html/admin/admin_list_extensions.tpl +++ b/templates/de/html/admin/admin_list_extensions.tpl @@ -16,7 +16,7 @@ {--ADMIN_EXT_TOTAL_FOUND--}: {!__TEXT_VALUE!}
    {--__ADMIN_DOUBLER_LIST_WAITING--}
    {--REMOTE_IP--}:
     
    - {--ADMIN_EXT_TOTAL_FSIZE--}: {--__TKBYTES_VALUE!} {--KBYTES--} + {--ADMIN_EXT_TOTAL_FSIZE--}: {!__TKBYTES_VALUE!} {--KBYTES--}
    diff --git a/templates/de/html/admin/admin_list_links.tpl b/templates/de/html/admin/admin_list_links.tpl index 1ef17a5adf..aaf7cd3ae7 100644 --- a/templates/de/html/admin/admin_list_links.tpl +++ b/templates/de/html/admin/admin_list_links.tpl @@ -1,15 +1,14 @@ - +
    + href="{!URL!}/modules.php?module=admin&what=list_user&u_id={!__UID_VALUE!}">{!__SNAME_VALUE!} + {!__FNAME_VALUE!} ({!__EMAIL_VALUE!}): - {--__EMAIL_LIST--} + {!__EMAIL_LIST!} - diff --git a/templates/de/html/admin/admin_list_sponsor_details.tpl b/templates/de/html/admin/admin_list_sponsor_details.tpl index 9a3eb200d9..60df811cf7 100644 --- a/templates/de/html/admin/admin_list_sponsor_details.tpl +++ b/templates/de/html/admin/admin_list_sponsor_details.tpl @@ -6,7 +6,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/templates/de/html/admin/admin_list_sponsor_row.tpl b/templates/de/html/admin/admin_list_sponsor_row.tpl index 08f6e58ef2..41618d5652 100644 --- a/templates/de/html/admin/admin_list_sponsor_row.tpl +++ b/templates/de/html/admin/admin_list_sponsor_row.tpl @@ -8,7 +8,7 @@ [ $content[id] ] + class="right2 top2 switch_sw$content[sw]">{--GENDER--}: - + diff --git a/templates/de/html/admin/admin_lock_sponsor.tpl b/templates/de/html/admin/admin_lock_sponsor.tpl index e8b301ef2d..0abdfab2b5 100644 --- a/templates/de/html/admin/admin_lock_sponsor.tpl +++ b/templates/de/html/admin/admin_lock_sponsor.tpl @@ -1,20 +1,20 @@ - +
    {--__SNAME_VALUE!} - {--__FNAME_VALUE!} ({--__EMAIL_VALUE!}):
    - {--MEMBER_TOTAL_LINKS_1--}{--__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
    + {--MEMBER_TOTAL_LINKS_1--}{!__NUMS_VALUE!}{--MEMBER_TOTAL_LINKS_2--}
    {--ADMIN_DEL_UNCONFIRMED_LINKS--} diff --git a/templates/de/html/admin/admin_list_rallye_usr.tpl b/templates/de/html/admin/admin_list_rallye_usr.tpl index e4030a3aa9..5ce67b56a4 100644 --- a/templates/de/html/admin/admin_list_rallye_usr.tpl +++ b/templates/de/html/admin/admin_list_rallye_usr.tpl @@ -1,18 +1,18 @@ - - - - - - - - - - - {!__RALLYE_USER_ROWS!} - - - +
    {--RALLYE_LIST_USERS_1--}{--__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}: -
    {--_UID--}:{--RALLYE_OLD_REFS--}:{--RALLYE_NEW_REFS--}:{--RALLYE_REF_POINTS--}:
    {--RALLYE_REF_POINTS_NOTE--}
    + + + + + + + + + +{!__RALLYE_USER_ROWS!} + + +
    {--RALLYE_LIST_USERS_1--}{!__RALLYE_VALUE!}{--RALLYE_LIST_USERS_2--}: +
    {--_UID--}:{--RALLYE_OLD_REFS--}:{--RALLYE_NEW_REFS--}:{--RALLYE_REF_POINTS--}:
    + {--RALLYE_REF_POINTS_NOTE--} +
    diff --git a/templates/de/html/admin/admin_list_refs_row.tpl b/templates/de/html/admin/admin_list_refs_row.tpl index c9a4aaed55..7ba25b37bb 100644 --- a/templates/de/html/admin/admin_list_refs_row.tpl +++ b/templates/de/html/admin/admin_list_refs_row.tpl @@ -2,7 +2,7 @@     		$content[u_link]   $content[refs_link] $content[salut] +  $content[gender] $content[surname] $content[family]  $content[email]  $content[status]
    {--SPONSOR_ID--}:  {--__SPONSOR_ID--} [ {--__SPONSOR_STATUS--} ] {!__SPONSOR_ID!} [ {!__SPONSOR_STATUS!} ]
    @@ -15,15 +15,15 @@
    {--SPONSOR_ENTER_COMPANY_TITLE--}:  {--__SPONSOR_COMPANY--} {!__SPONSOR_COMPANY!}
    {--SPONSOR_ENTER_COMPANY_POSITION--}:  {--__SPONSOR_POSITION--} {!__SPONSOR_POSITION!}
    {--SPONSOR_ENTER_TAX_IDENT--}:  {--__SPONSOR_TAX_IDENT--} {!__SPONSOR_TAX_IDENT!}
    @@ -32,39 +32,39 @@
    {--SURNAME_FAMILY--}:  {--__SPONSOR_SALUT--} {--__SPONSOR_SURNAME--} {--__SPONSOR_FAMILY--} {!__SPONSOR_GENDER!} {!__SPONSOR_SURNAME!} {!__SPONSOR_FAMILY!}
    {--SPONSOR_ENTER_STREET_NR1--}:  {--__SPONSOR_STREET1--} {!__SPONSOR_STREET1!}
    {--SPONSOR_ENTER_STREET_NR2--}:  {--__SPONSOR_STREET2--} {!__SPONSOR_STREET2!}
    {--SPONSOR_ENTER_CNTRY_ZIP_CITY--}:  {--__SPONSOR_COUNTRY--}-{--__SPONSOR_ZIP--} {--__SPONSOR_CITY--} {!__SPONSOR_COUNTRY!}-{!__SPONSOR_ZIP!} {!__SPONSOR_CITY!}
    {--SPONSOR_ENTER_PHONE--}:  {--__SPONSOR_PHONE--} {!__SPONSOR_PHONE!}
    {--SPONSOR_ENTER_FAX--}:  {--__SPONSOR_FAX--} {!__SPONSOR_FAX!}
    {--SPONSOR_ENTER_CELL--}:  {--__SPONSOR_CELL--} {!__SPONSOR_CELL!}
    {--SPONSOR_ENTER_EMAIL--}:  {--__SPONSOR_EMAIL_VALUE--}  {!__SPONSOR_EMAIL_VALUE!} 
    {--SPONSOR_ENTER_URL--}:  [ {--ADMIN_TEST_URL--} ]  [ {--ADMIN_TEST_URL--} ] 
    @@ -73,19 +73,19 @@
    {--SPONSOR_RECEIVE_WARNINGS_SHORT--}: {--__SPONSOR_REC_WARNING--}{!__SPONSOR_REC_WARNING!}
    {--SPONSOR_WARNING_INTERVAL_SHORT--}: {--__SPONSOR_INTERVAL--}{!__SPONSOR_INTERVAL!}
    {--SPONSOR_POINTS_AMOUNT--}:  [ {--__SPONSOR_AMOUNT--} ] [ {!__SPONSOR_AMOUNT!} ]
    {--SPONSOR_POINTS_USED--}:  [ {--__SPONSOR_USED--} ] [ {!__SPONSOR_USED!} ]
    @@ -94,36 +94,36 @@
    {--SPONSOR_CREATED--}: {--__SPONSOR_CREATED--}{!__SPONSOR_CREATED!}
    {--ADMIN_LAST_ONLINE--}: {--__SPONSOR_LAST_ONLINE--}{!__SPONSOR_LAST_ONLINE!}
    {--ADMIN_LAST_CHANGE--}: {--__SPONSOR_LAST_CHANGE--}{!__SPONSOR_LAST_CHANGE!}
    {--REMOTE_IP--}: {--__SPONSOR_REMOTE_ADR--}{!__SPONSOR_REMOTE_ADR!}
    {--SPONSOR_REFID--}: {--__SPONSOR_REFID--}{!__SPONSOR_REFID!}
    {--SPONSOR_REFERRALS--}: [ {--__SPONSOR_REFS--} ][ {!__SPONSOR_REFS!} ]
    {--ADMIN_SPONSOR_ACTIONS--}:
    - $content[salut] $content[sname] $content[fname] + $content[gender] $content[sname] $content[fname] [ $content[points] ] diff --git a/templates/de/html/admin/admin_list_transfer.tpl b/templates/de/html/admin/admin_list_transfer.tpl index bc2e0e3b5c..e860779f04 100644 --- a/templates/de/html/admin/admin_list_transfer.tpl +++ b/templates/de/html/admin/admin_list_transfer.tpl @@ -1,10 +1,9 @@ -
    - + +
    - + + {!__TRANSFER_DELETE!} +
    {--__TRANSFER_TITLE--} + {!__TRANSFER_TITLE!} +
    @@ -23,7 +22,8 @@ {!__TRANSFER_ROWS!}
    - {--__TRANSFER_DELETE--}
    diff --git a/templates/de/html/admin/admin_list_unconfirmed.tpl b/templates/de/html/admin/admin_list_unconfirmed.tpl index a2ed8f0aba..f4984095f5 100644 --- a/templates/de/html/admin/admin_list_unconfirmed.tpl +++ b/templates/de/html/admin/admin_list_unconfirmed.tpl @@ -1,36 +1,35 @@ - - - - - - - - - - - - - - - - - - - - - - +
    - {--EMAIL_SENDER--}:
    - {--__LIST_UNCON_SENDER--} -     		- {--EMAIL_SUBJECT--}:
    - {--__LIST_UNCON_SUBJECT--}
    {--EMAIL_URL--}:
    - {--ADMIN_TEST_URL--}    		{--EMAIL_TIMESTAMP--}:
    - {--__LIST_UNCON_STAMP--}
    {--EMAIL_TEXT--}:
    - {--__LIST_UNCON_TEXT--}    		{--USERS_LINKS--}:
    - {--__LIST_UNCO_UNCONFIRMED--}
     
    {--__LIST_UNCON_LISTING--}
     
    + + + + + + + + + + + + + + + + + + + + +
    + {--EMAIL_SENDER--}:
    + {!__LIST_UNCON_SENDER!} +     		+ {--EMAIL_SUBJECT--}:
    + {!__LIST_UNCON_SUBJECT!}
    {--EMAIL_URL--}:
    + {--ADMIN_TEST_URL--}    		{--EMAIL_TIMESTAMP--}:
    + {!__LIST_UNCON_STAMP!}
    {--EMAIL_TEXT--}:
    + {!__LIST_UNCON_TEXT!}    		{--USERS_LINKS--}:
    + {!__LIST_UNCO_UNCONFIRMED!}
     
    {!__LIST_UNCON_LISTING!}
     
    diff --git a/templates/de/html/admin/admin_list_user_row.tpl b/templates/de/html/admin/admin_list_user_row.tpl index 0d461d0fd0..2dd71cfe8d 100644 --- a/templates/de/html/admin/admin_list_user_row.tpl +++ b/templates/de/html/admin/admin_list_user_row.tpl @@ -3,7 +3,7 @@     		{--_UID--}: {--SEX--}: {--SURNAME--}:   $content[uid]$content[sex]$content[gender] $content[sname] $content[fname] $content[nick]
    @@ -26,9 +26,9 @@
    - {--__HEADER_MESSAGE--} + {!__HEADER_MESSAGE!}
     
    - {--__TEXT_MESSAGE--} + {!__TEXT_MESSAGE!}
     
    - {--__EMAIL_LINK--} + {!__EMAIL_LINK!}
     
     
    -  * - +  * +
    - \ No newline at end of file + diff --git a/templates/de/html/admin/admin_member_add.tpl b/templates/de/html/admin/admin_member_add.tpl index 0a4fef5d88..6116b71ebb 100644 --- a/templates/de/html/admin/admin_member_add.tpl +++ b/templates/de/html/admin/admin_member_add.tpl @@ -19,7 +19,7 @@     		  {--SELECT_WHAT_NAME--}:  {--__WHAT_SELECTION--}
    +     		{!__WHAT_SELECTION!}
    ({--CREATE_WHAT_FIRST--})    		  
      {--SELECT_PARENT_MENU--}:  {--__ACTION_SELECTION--}
    +     		{!__ACTION_SELECTION!}
    ({--CREATE_ACTION_FIRST--})    		  
      {--SELECT_BELOW_MENU--}:  {--__BELOW_SELECTION--}{!__BELOW_SELECTION!}  
    {--_UID--}{--SEX--}{--GENDER--} {--SURNAME--} {--FAMILY_NAME--} {--ADDY--}
    $content[link]$content[sex]$content[gender] $content[sname] $content[fname] $content[email]
    @@ -12,8 +12,8 @@ diff --git a/templates/de/html/admin/admin_sponsor_paytypes.tpl b/templates/de/html/admin/admin_sponsor_paytypes.tpl index 8920cfbf26..e8b58bc71d 100644 --- a/templates/de/html/admin/admin_sponsor_paytypes.tpl +++ b/templates/de/html/admin/admin_sponsor_paytypes.tpl @@ -1,5 +1,5 @@
    - {--__LIST_CONTENT--}
    + {!__LIST_CONTENT!}

    - {--__ADD_CONTENT--} -
    \ No newline at end of file + {!__ADD_CONTENT!} + diff --git a/templates/de/html/admin/admin_unlock_emails.tpl b/templates/de/html/admin/admin_unlock_emails.tpl index bf217afe12..a60f99b48a 100644 --- a/templates/de/html/admin/admin_unlock_emails.tpl +++ b/templates/de/html/admin/admin_unlock_emails.tpl @@ -22,7 +22,7 @@ + value="{!__REJECT_URL!}"> - diff --git a/templates/de/html/beg/beg_done.tpl b/templates/de/html/beg/beg_done.tpl index 31adb59c29..ba1ed5d995 100644 --- a/templates/de/html/beg/beg_done.tpl +++ b/templates/de/html/beg/beg_done.tpl @@ -2,7 +2,7 @@ diff --git a/templates/de/html/beg/beg_failed.tpl b/templates/de/html/beg/beg_failed.tpl index 2d66218991..a1ac14fbe3 100644 --- a/templates/de/html/beg/beg_failed.tpl +++ b/templates/de/html/beg/beg_failed.tpl @@ -2,7 +2,7 @@ diff --git a/templates/de/html/beg/beg_link.tpl b/templates/de/html/beg/beg_link.tpl index a24ff16de6..6f70747d45 100644 --- a/templates/de/html/beg/beg_link.tpl +++ b/templates/de/html/beg/beg_link.tpl @@ -1,14 +1,12 @@ -
       
    {--ADMIN_ENTER_REDIRECT_URL--}:
    diff --git a/templates/de/html/admin/admin_unlock_sponsor_row.tpl b/templates/de/html/admin/admin_unlock_sponsor_row.tpl index d3e9ad97ff..6ca9d3fe99 100644 --- a/templates/de/html/admin/admin_unlock_sponsor_row.tpl +++ b/templates/de/html/admin/admin_unlock_sponsor_row.tpl @@ -3,7 +3,7 @@ - $content[salut] $content[surname] $content[family] + $content[gender] $content[surname] $content[family] $content[remote] diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index a33f77d44f..f0ef072dd0 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -6,7 +6,7 @@ $content
    {--SEX--}:
    +     		{--GENDER--}:
    $DATA[0]    		 {--SURNAME--}:
    $DATA[1]

    {--BEG_UID_STEAL_1--}{!__BEG_UID!}{--BEG_UID_STEAL_2--}{!__BEG_POINTS!}{--BEG_UID_STEAL_3--}

    -

    {--BEG_CLICKS_1--}{--__BEG_CLICKS--}{--BEG_CLICKS_2--}

    +

    {--BEG_CLICKS_1--}{!__BEG_CLICKS!}{--BEG_CLICKS_2--}

    {--BEG_THANKS_FOR_CLICK--}

    {--BEG_SORRY_ANOTHER_WAS_HERE_1--}{!__BEG_UID!}{--BEG_SORRY_ANOTHER_WAS_HERE_2--}{!__BEG_POINTS!}{--BEG_SORRY_ANOTHER_WAS_HERE_3--}

    -

    {--BEG_CLICKS_1--}{--__BEG_CLICKS--}{--BEG_CLICKS_2--}

    +

    {--BEG_CLICKS_1--}{!__BEG_CLICKS!}{--BEG_CLICKS_2--}

    {--BEG_THANKS_FOR_CLICK_AGAIN--}
    +
    diff --git a/templates/de/html/birthday/birthday_confirm.tpl b/templates/de/html/birthday/birthday_confirm.tpl index f3ebdafb17..0c705ce6ae 100644 --- a/templates/de/html/birthday/birthday_confirm.tpl +++ b/templates/de/html/birthday/birthday_confirm.tpl @@ -1,12 +1,11 @@ -
    -

    {--__BEG_BANNER--}

    +

    {!__BEG_BANNER!}
    - +
    + {!__BEG_MSG!}
    {--BEG_LINK_BY_1--}{!MAIN_TITLE!}{--BEG_LINK_BY_2--}
    @@ -16,7 +14,7 @@
    - {--__BEG_MSG--}
    -

    {--__BEG_BANNER--}

    +

    {!__BEG_BANNER!}
    diff --git a/templates/de/html/beg/beg_login.tpl b/templates/de/html/beg/beg_login.tpl index d01749d538..7b108fe198 100644 --- a/templates/de/html/beg/beg_login.tpl +++ b/templates/de/html/beg/beg_login.tpl @@ -2,7 +2,7 @@

    {--BEG_SORRY_YOURE_LOGGED_IN_1--}{!__BEG_UID!}{--BEG_SORRY_YOURE_LOGGED_IN_2--}{!__BEG_POINTS!}{--BEG_SORRY_YOURE_LOGGED_IN_3--}

    -

    {--BEG_CLICKS_1--}{--__BEG_CLICKS--}{--BEG_CLICKS_2--}

    +

    {--BEG_CLICKS_1--}{!__BEG_CLICKS!}{--BEG_CLICKS_2--}

    {--BEG_THANKS_FOR_CLICK_AGAIN--}
    - - - - - - - - - -
    {--__BIRTHDAY_HEADER--}
    {--__MSG--}
    {--__BIRTHDAY_FOOTER--}
    \ No newline at end of file + + + + + + + + + + +
    {!__BIRTHDAY_HEADER!}
    {!__MSG!}
    {!__BIRTHDAY_FOOTER!}
    diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl index b6bf6bc41a..5f4d2eee6f 100644 --- a/templates/de/html/birthday/birthday_msg.tpl +++ b/templates/de/html/birthday/birthday_msg.tpl @@ -1,12 +1,8 @@ -Herzlichen Glückwunsch zum Geburtstag! +Herzlichen Glückwunsch zum Geburtstag!

    +Hallo {!__GENDER!} {!__SNAME!} {!__FNAME!}!

    -Hallo {!__SALUT!} {!__SNAME!} {!__FNAME!}! -
    -
    -Wir das Team von -{!MAIN_TITLE!} -wüschen Ihnen alles Gute und Gesundheit zum Geburtstag. Als kleines -Geschenk von uns haben wir Ihnen soeben -{--__GIFT--} {!POINTS!} -Ihrem Account gutgeschrieben! +Wir das Team von {!MAIN_TITLE!} wüschen Ihnen +alles Gute und Gesundheit zum Geburtstag. Als kleines Geschenk von uns haben wir +Ihnen soeben {!__GIFT!} {!POINTS!} Ihrem Account +gutgeschrieben! diff --git a/templates/de/html/doubler/doubler_index.tpl b/templates/de/html/doubler/doubler_index.tpl index e63cdc7a66..4e4de9ab5e 100644 --- a/templates/de/html/doubler/doubler_index.tpl +++ b/templates/de/html/doubler/doubler_index.tpl @@ -1,7 +1,7 @@ - + - diff --git a/templates/de/html/guest/guest_rallye_show.tpl b/templates/de/html/guest/guest_rallye_show.tpl index 70b57d7893..9f5c5dc0f2 100644 --- a/templates/de/html/guest/guest_rallye_show.tpl +++ b/templates/de/html/guest/guest_rallye_show.tpl @@ -1,44 +1,39 @@ -
    {--__DOUBLER_HEADER--}{!__DOUBLER_HEADER!}
    @@ -15,8 +15,10 @@ - + @@ -78,18 +80,18 @@ {!POINTS!} {--DOUBLER_REFERRAL_6--} 100 {!POINTS!} {--DOUBLER_REFERRAL_8--} 300 {!POINTS!} {--DOUBLER_REFERRAL_8--} {--DOUBLER_REFERRAL_LINK--}
    - {--__DOUBLER_MSG--}
    + {!__DOUBLER_MSG!}
    {--DOUBLER_NOT_YET_REGISTERED--} {--DOUBLER_REGISTER_NOW--}

    {--DOUBLER_YOUR_ADVERTISING_HERE--} {--DOUBLER_CONTACT_US--}

    - {--__DOUBLER_BANNER--}
    + {!__DOUBLER_BANNER!}

    {!__DOUBLER_PAYOUT_HISTORY!} - +
    {!POINTS!}-{--DOUBLER_TITLE--}
    - {--__ERROR_MSG--}    		 + {!POINTS!}-{--DOUBLER_TITLE--}
    + {!__ERROR_MSG!} +
     
    {--__DOUBLER_FOOTER--}{!__DOUBLER_FOOTER!}
    diff --git a/templates/de/html/guest/guest_confirm_table.tpl b/templates/de/html/guest/guest_confirm_table.tpl index 573f43babd..f85e597fa0 100644 --- a/templates/de/html/guest/guest_confirm_table.tpl +++ b/templates/de/html/guest/guest_confirm_table.tpl @@ -1,7 +1,7 @@ - +
    -
    {--__CONFIRM_MSG--} + + {!__CONFIRM_MSG!}
    \ No newline at end of file diff --git a/templates/de/html/guest/guest_rallye_footer.tpl b/templates/de/html/guest/guest_rallye_footer.tpl index cfc287729e..3c1919b201 100644 --- a/templates/de/html/guest/guest_rallye_footer.tpl +++ b/templates/de/html/guest/guest_rallye_footer.tpl @@ -1,13 +1,10 @@
    +
      -
    • Es werden nur aktive User - gewertet.
      • -
    • {--__RALLYE_MAX_USERS--}
      • -
    • {--__RALLYE_MIN_PRICES--}
      • -
    • Der Rechtsweg ist - ausgeschlossen.
      • +
    • Es werden nur aktive User gewertet.
      • +
    • {!__RALLYE_MAX_USERS!}
      • +
    • {!__RALLYE_MIN_PRICES!}
      • +
    • Der Rechtsweg ist ausgeschlossen.
    +
    - + - - + - @@ -49,14 +44,14 @@ -
    Referal-Rallye - gestartet! + Referal-Rallye gestartet! +
    -
    -
    +
      -
    • Titel: {--__RALLYE_TITLE--}
      • -
    • Start: {--__RALLYE_START--}
      • -
    • Ende : {--__RALLYE_END--}
      • +
    • Titel: {!__RALLYE_TITLE!}
      • +
    • Start: {!__RALLYE_START!}
      • +
    • Ende : {!__RALLYE_END!}
    - -
    ...:: - {--__RALLYE_TITLE--} ::... + ...:: {!__RALLYE_TITLE!} ::... +
    - {--__RALLYE_DESCR--}
    + {!__RALLYE_DESCR!}
    {--__RALLYE_CAN_WIN_THIS--}: + {!__RALLYE_CAN_WIN_THIS!}:
    - {--__RALLYE_PRICES--}
    + {!__RALLYE_PRICES!}
    {--__RALLYE_TOP_USERS--}
    + align="center">{!__RALLYE_TOP_USERS!}
    -
    - ...:: {--__RALLYE_EXTRAS--} ::...
    +
    + ...:: {!__RALLYE_EXTRAS!} ::... +
    \ No newline at end of file + diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index a2e00e0265..35cbdd592d 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -20,12 +20,12 @@ - diff --git a/templates/de/html/guest/guest_sponsor_infos.tpl b/templates/de/html/guest/guest_sponsor_infos.tpl index 465f7245ce..a6fc7ee7e8 100644 --- a/templates/de/html/guest/guest_sponsor_infos.tpl +++ b/templates/de/html/guest/guest_sponsor_infos.tpl @@ -10,7 +10,7 @@ @@ -23,7 +23,7 @@ {--GUEST_SPONSOR_ACTIONS_HEADER--} -{--__SPONSOR_ACTIONS--} +{!__SPONSOR_ACTIONS!}
    - {--GUEST_SEX--}{!MUST_SEX!}:  
    {--GUEST_SPONSOR_PRICING_HEADER--}
    -{--__SPONSOR_PAYTYPES--} +{!__SPONSOR_PAYTYPES!}
     
     
    diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index d8ab59724b..b50c4aa28a 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -1,4 +1,4 @@ -{--__SPONSOR_FORM_ERRORS--} +{!__SPONSOR_FORM_ERRORS!}
    {--GUEST_SPONSOR_TITLE--}

    {--GUEST_SPONSOR_TEASER_1--}
    @@ -31,7 +31,7 @@   - +   @@ -43,7 +43,7 @@   - +   @@ -55,7 +55,7 @@   - +   @@ -71,14 +71,14 @@   - {--GUEST_SEX--}:  + {--GUEST_GENDER--}:    - + + +   @@ -91,7 +91,7 @@   - +   @@ -103,7 +103,7 @@   - +   @@ -123,7 +123,7 @@   - +   @@ -135,7 +135,7 @@   - +   @@ -147,8 +147,8 @@   - - - + - +   @@ -160,7 +160,7 @@   - +   @@ -172,7 +172,7 @@   - +   @@ -184,7 +184,7 @@   - +   @@ -196,7 +196,7 @@   - +   @@ -208,7 +208,7 @@   - +   @@ -249,7 +249,7 @@   - {--__SPONSOR_REFID--} + {!__SPONSOR_REFID!}   @@ -270,8 +270,8 @@     @@ -312,7 +312,7 @@   - {--__PAYMENT_LIST--} + {!__PAYMENT_LIST!}   @@ -340,7 +340,7 @@   - +  * diff --git a/templates/de/html/member/member_beg.tpl b/templates/de/html/member/member_beg.tpl index 89d8903ce8..d337544daa 100644 --- a/templates/de/html/member/member_beg.tpl +++ b/templates/de/html/member/member_beg.tpl @@ -17,7 +17,7 @@ {--BEG_MEMBER_CLICKS_TOTAL--}:
    - {--__BEG_CLICKS--} + {!__BEG_CLICKS!}   diff --git a/templates/de/html/member/member_doubler.tpl b/templates/de/html/member/member_doubler.tpl index bcf4049cef..fa17aff5a4 100644 --- a/templates/de/html/member/member_doubler.tpl +++ b/templates/de/html/member/member_doubler.tpl @@ -1,5 +1,5 @@
    {--DOUBLER_MEMBER_YOUR_LINK--}:
    -{!URL!}/doubler.php?refid={--__USERID--}
    +{!URL!}/doubler.php?refid={!__USERID!}

    {--DOUBLER_MEMBER_LINK_NOTE--}
    @@ -13,7 +13,7 @@
    {--DOUBLER_MEMBER_REF_PAYOUT--}:

    -{--__DOUBLER_PAYOUT_REF--}
    +{!__DOUBLER_PAYOUT_REF!}
    - + @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/templates/de/html/member/member_holiday_form.tpl b/templates/de/html/member/member_holiday_form.tpl index 4b9ed33359..2051fa8b7e 100644 --- a/templates/de/html/member/member_holiday_form.tpl +++ b/templates/de/html/member/member_holiday_form.tpl @@ -30,7 +30,7 @@ diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 24f4857f19..e94d17510b 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -16,12 +16,12 @@ - + - diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index 4ed625054a..75d6d46131 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -20,7 +20,7 @@ - + diff --git a/templates/de/html/member/member_nickname_form.tpl b/templates/de/html/member/member_nickname_form.tpl index 56a5822545..61a31e9f8d 100644 --- a/templates/de/html/member/member_nickname_form.tpl +++ b/templates/de/html/member/member_nickname_form.tpl @@ -21,8 +21,9 @@ - + diff --git a/templates/de/html/member/member_themes.tpl b/templates/de/html/member/member_themes.tpl index acab691a18..9890e6f2bc 100644 --- a/templates/de/html/member/member_themes.tpl +++ b/templates/de/html/member/member_themes.tpl @@ -13,7 +13,7 @@ - {--__THEME_LIST--} + {!__THEME_LIST!} + {!-__TRANSFER_IN_LINK!} + {!__TRANSFER_OUT_LINK!} + {!__TRANSFER_ALL_LINK!} - + + {!__TRANSFER_SETTINGS_CONTENT!} diff --git a/templates/de/html/member/member_transfer_settings.tpl b/templates/de/html/member/member_transfer_settings.tpl index f3805c4362..f472bb8928 100644 --- a/templates/de/html/member/member_transfer_settings.tpl +++ b/templates/de/html/member/member_transfer_settings.tpl @@ -7,9 +7,9 @@ {--TRANSFER_ALLOW_OPT_IN--} + value="N"{!__TRANSFER_ALLOW_N!}> - + - + - +
    {--HOLIDAY_MEMBER_TSTART--}:  {--__HOLIDAY_START--}{!__HOLIDAY_START!}
     
    {--HOLIDAY_MEMBER_TEND--}:  {--__HOLIDAY_END--}{!__HOLIDAY_END!}
     
    {--HOLIDAY_MEMBER_TLOCK--}:  {--__HOLIDAY_LOCK--}{!__HOLIDAY_LOCK!}
     
    - {--HOLIDAY_MAX_DAYS_1--}{--__HOLIDAY_MAX--}{--HOLIDAY_MAX_DAYS_2--} + {--HOLIDAY_MAX_DAYS_1--}{!__HOLIDAY_MAX!}{--HOLIDAY_MAX_DAYS_2--}
     
    {--SEX--}:{--GENDER--}:  
     
    {--SEX--}:{--GENDER--}:   $DATA[10]
      {--NICKNAME_ENTER_NICKNAME--}:   + +  
    {--THEME_URL--} {--THEME_VERSION--}
     * diff --git a/templates/de/html/member/member_transfer_list.tpl b/templates/de/html/member/member_transfer_list.tpl index e7bfb046cd..00c0b8b40c 100644 --- a/templates/de/html/member/member_transfer_list.tpl +++ b/templates/de/html/member/member_transfer_list.tpl @@ -1,9 +1,8 @@
    - +
    + height="30">{!__TRANSFER_TITLE!} - +
    {--__TRANSFER_TITLE--}
    @@ -20,9 +19,9 @@ {!__TRANSFER_ROWS!}
    - {--__TRANSFER_SUM--} ({!POINTS!}): {--__TRANSFER_TOTAL_VALUE!} + {!__TRANSFER_SUM!} ({!POINTS!}): {!__TRANSFER_TOTAL_VALUE!}
    -
    \ No newline at end of file + diff --git a/templates/de/html/member/member_transfer_new.tpl b/templates/de/html/member/member_transfer_new.tpl index 644df997de..868969345a 100644 --- a/templates/de/html/member/member_transfer_new.tpl +++ b/templates/de/html/member/member_transfer_new.tpl @@ -1,22 +1,19 @@ - - + +
    + {!__TRANSFER_USERID_SELECTION!} - + @@ -35,7 +32,7 @@ @@ -43,7 +40,7 @@ - + + value="{--TRANSFER_ADD_NEW--}"{!__TRANSFER_TO_DISABLED!}>
    {--TRANSFER_SELECT_TARGET_UID--}:     - {--__TRANSFER_USERID_SELECTION--}
    {--TRANSFER_POINTS_MAXIMUM--}:    {--__TRANSFER_MAX_VALUE!} {!POINTS!}{!__TRANSFER_MAX_VALUE!} {!POINTS!}
    {--TRANSFER_POINTS_AMOUNT--}: @@ -25,7 +22,7 @@   + value="{!__TRANSFER_POINTS_VALUE!}"{!__TRANSFER_TO_DISABLED!}> {!POINTS!}
      + value="{!__TRANSFER_REASON_VALUE!}"{!__TRANSFER_TO_DISABLED!}>
       {--__TRANSFER_IMAGE_INPUT--}{!__TRANSFER_IMAGE_INPUT!}
    {--TRANSFER_ENTER_PASSWORD--}: @@ -51,14 +48,14 @@     + class="member_normal" size="10" maxlength="255"{!__TRANSFER_TO_DISABLED!}>
     * + type="reset" class="member_reset" value="{--CLEAR_FORM--}"{!__TRANSFER_TO_DISABLED!}> *
    diff --git a/templates/de/html/member/member_transfer_overview.tpl b/templates/de/html/member/member_transfer_overview.tpl index 69b9e65d88..191941ae62 100644 --- a/templates/de/html/member/member_transfer_overview.tpl +++ b/templates/de/html/member/member_transfer_overview.tpl @@ -4,26 +4,28 @@
    {--TRANSFER_LIST_INCOMING--}:
    - {--__TRANSFER_IN_LINK--}    		 {--TRANSFER_LIST_OUTGOING--}:
    - {--__TRANSFER_OUT_LINK--}
    {--TRANSFER_LIST_ALL--}:
    - {--__TRANSFER_ALL_LINK--}
    {--TRANSFER_TO_MEMBER_NOW--}:
    - {--__TRANSFER_NEW_LINK--}    		 + {--TRANSFER_TO_MEMBER_NOW--}:
    + {!__TRANSFER_NEW_LINK!} +
     
    - {--__TRANSFER_SETTINGS_CONTENT--}
      {--YES--}:  + class="member_normal" value="Y"{!__TRANSFER_ALLOW_Y!}> {--NO--}: 
    {--__BONUS_HEADER--}{!__BONUS_HEADER!}
    {--__BONUS_MSG--}{!__BONUS_MSG!}
    {--__BONUS_FOOTER--}{!__BONUS_FOOTER!}
    \ No newline at end of file diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl index e14fde0204..933ce8fde1 100644 --- a/templates/de/html/show_bonus_msg.tpl +++ b/templates/de/html/show_bonus_msg.tpl @@ -1,4 +1,4 @@ -{--HELLO--} {!__SALUT!} {!__SNAME!} {!__FNAME!}! +{--HELLO--} {!__GENDER!} {!__SNAME!} {!__FNAME!}!

    {--BONUS_SHOW_HEADER_LINE_1--} diff --git a/templates/de/html/show_bonus_yr.tpl b/templates/de/html/show_bonus_yr.tpl index 48c01fa98d..8245f64809 100644 --- a/templates/de/html/show_bonus_yr.tpl +++ b/templates/de/html/show_bonus_yr.tpl @@ -1,9 +1,8 @@ - - - - +
    {--BONUS_SHOW_YOU_HAVE_CONFIRMED--} {--__YR_TMARK--} {--_ON--} {--__YR_LEVEL--}. - {--BONUS_SHOW_CONFIRMED_BONUS_IS--}: {--__YR_POINTS--} - {!POINTS!}
    + + +
    {--BONUS_SHOW_YOU_HAVE_CONFIRMED--} {!__YR_TMARK!} {--_ON--} {!__YR_LEVEL!}. + {--BONUS_SHOW_CONFIRMED_BONUS_IS--}: {!__YR_POINTS!} + {!POINTS!}
    diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl index b003b7fbc4..1f2f5d10c4 100644 --- a/templates/de/html/sponsor/sponsor_account_form.tpl +++ b/templates/de/html/sponsor/sponsor_account_form.tpl @@ -37,13 +37,13 @@ - {--GUEST_SEX--}:  + {--GUEST_GENDER--}:  -   + + + diff --git a/templates/de/html/sponsor/sponsor_main.tpl b/templates/de/html/sponsor/sponsor_main.tpl index f9df75c964..597ab6b717 100644 --- a/templates/de/html/sponsor/sponsor_main.tpl +++ b/templates/de/html/sponsor/sponsor_main.tpl @@ -2,21 +2,21 @@ diff --git a/templates/de/html/sponsor/sponsor_settings_form.tpl b/templates/de/html/sponsor/sponsor_settings_form.tpl index c537f8e3de..6af0d020a9 100644 --- a/templates/de/html/sponsor/sponsor_settings_form.tpl +++ b/templates/de/html/sponsor/sponsor_settings_form.tpl @@ -11,8 +11,8 @@ {--GUEST_SPONSOR_RECEIVE_WARNINGS--} - {--YES--} - {--NO--} + {--YES--} + {--NO--} @@ -21,7 +21,7 @@