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

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

index 68fd150..b9b4242 100644 (file)
@@ -53,7 +53,7 @@ if (defined('mxchange_installed') && (isBooleanConstantAndTrue('mxchange_install
        $chk = bigintval($_GET['check'], false);
 
        // Check if link is not clicked so far
-       $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']);
index 7db0047..424bd8c 100644 (file)
@@ -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 = "";
+
 //
 ?>
index 4201cc0..3622ce3 100644 (file)
@@ -66,7 +66,7 @@ id BIGINT(20) NOT NULL AUTO_INCREMENT,
 company VARCHAR(255) NOT NULL DEFAULT '',
 position VARCHAR(255) NOT NULL DEFAULT '',
 tax_ident VARCHAR(255) NOT NULL DEFAULT '',
-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')";
index 5b073ee..2bfb044 100644 (file)
@@ -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&auml;glichen/w&ouml;chentlichen/monatlichen Reset verbessert.";
                break;
+
+       case "0.4.6": // SQL queries for v0.4.6
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'";
+               $SQLs[] = "UPDATE "._MYSQL_PREFIX."_user_data SET gender=sex WHERE sex != 'M'";
+               $SQLs[] = "ALTER TABLE "._MYSQL_PREFIX."_user_data DROP gender";
+
+               // Update notes (these will be set as task text!)
+               $UPDATE_NOTES = "Offensives Wort &quot;Sex&quot; gegen &quot;Gender&quot; ausgetauscht.";
+               break;
        }
        break;
 
index 057d1d3..b93a273 100644 (file)
@@ -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 &quot;Firma&quot; hinzugef&uuml;gt.";
index 7857554..2f1f103 100644 (file)
@@ -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;
 }
 //
index 7bb2a18..cbcff93 100644 (file)
@@ -341,11 +341,11 @@ define('_ADMIN', "Administrator");
 define('LAST_ONLINE', "Sie waren als letztes Online am");
 define('LAST_MODULE', "Ihr zuletzt ausgew&auml;hltes Modul");
 define('MEMBER_EDIT_PROFILE', "Profildaten &auml;ndern");
-define('SEX', "Anrede");
-define('GUEST_SEX', "Anrede");
-define('SEX_M', "Herr");
-define('SEX_F', "Frau");
-define('SEX_C', "Firma");
+define('GENDER', "Geschlecht");
+define('GUEST_GENDER', "Geschlecht");
+define('GENDER_M', "M&auml;nnlich");
+define('GENDER_F', "Weiblich");
+define('GENDER_C', "&quot;Firma&quot;");
 define('SAVE_CHANGES', "&Auml;nderungen speichern");
 define('MYDATA_NOTE', "Geben Sie nur bei <strong>Passwort</strong> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <strong>Passwortbest&auml;tigung</strong> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
index 54a4d8e..261ed21 100644 (file)
@@ -29,11 +29,11 @@ define('_ADMIN', "Administrator");
 define('LAST_ONLINE', "Your last online time was");
 define('LAST_MODULE', "Your last selected module was");
 define('MEMBER_EDIT_PROFILE', "Edit your profile");
-define('SEX', "Salutation");
-define('GUEST_SEX', "Salutation);
-define('SEX_M', "Mr.");
-define('SEX_F', "Mrs.");
-define('SEX_C', "Company");
+define('GENDER', "Gender");
+define('GUEST_GENDER', "Gender);
+define('GENDER_M', "Male");
+define('GENDER_F', "Female");
+define('GENDER_C', "Company");
 define('SAVE_CHANGES', "Save changes");
 define('MYDATA_NOTE', "Geben Sie nur bei <STRONG>Passwort</STRONG> Ihr aktuelles Passwort ein, wenn Sie nur Daten &auml;ndern wollen. Geben Sie bei <STRONG>Passwortbest&auml;tigung</STRONG> das neue Passwort erneut ein, wenn Sie Ihr aktuelles Passwort &auml;ndern wollen.");
 define('MEMBER_UPDATE_PWD_WRONG', "Bitte geben Sie Ihr aktuelles Passwort zum &Auml;ndern Ihrer Einstellungen ein. Wir haben dies zur Sicherheit unserer Mitglieder eingebaut.");
index 0b905a5..e944f4f 100644 (file)
@@ -66,7 +66,7 @@ define('ADD_SPONSOR', "Sponsor hinzuf&uuml;gen");
 define('ADMIN_SPONSOR_COMPANY_NOTE', "Wenn Sie eine Privatperson anmelden wollen, lassen Sie bitte die folgenden drei Felder einfach leer!");
 define('SPONSOR_DATA_NOT_SAVED', "Sponsorendaten wurden <U>nicht</U> gespeichert.");
 define('ADMIN_SPONSOR_REALLY_ADD_SPONSOR', "Sponsor existiert bereits!");
-define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <B>{--__EMAIL--}</B>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
+define('ADMIN_SPONSOR_DO_YOU_REALLY_WANT_ADDING', "Ein Sponsor existiert bereits mit der eingegeben EMail-Adresse <B>{!__EMAIL!}</B>. Wollen Sie ihn dennoch hinzuf&uuml;gen?");
 define('ADMIN_SPONSOR_ADDED', "Sponsor wurde hinzugef&uuml;gt.");
 define('ADMIN_SPONSOR_UPDATED', "Sponsordaten wurden aktualisiert.");
 define('ADMIN_SPONSOR_FAILED', "Konnte Daten nichtn speichern!");
index b7cb9d0..f5e88c4 100644 (file)
@@ -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
index 894e388..4ae9dba 100644 (file)
@@ -54,7 +54,7 @@ function REGISTER_FILL_MUST_CONSTANTS()
        SQL_FREERESULT($result);
 
        // Also fill other constants
-       define('MUST_SEX'   , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
+       define('MUST_GENDER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_ADDY'  , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_BIRTH' , "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
        define('MUST_MARKER', "<FONT class=\"guest_failed\">&nbsp;(*)</FONT>");
index fdf4eb9..7bc398f 100644 (file)
@@ -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']);
 
index 3742b3b..443f8ad 100644 (file)
@@ -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 = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>)</STRONG></LI>";
+                                               $ADD = "<LI>".ADMIN_MEMBER_UID.": <STRONG>".ADMIN_USER_PROFILE_LINK($uid)." (<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>)</STRONG></LI>";
                                        }
                                }
 
index e178a6d..253e3e3 100644 (file)
@@ -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' => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
-                       'ip'    => $IP,
-                       'ref'   => $ref,
-                       'hash'  => $hash,
-                       'link'  => ADMIN_USER_PROFILE_LINK($uid),
+                       'sw'     => $SW,
+                       'gender' => TRANSLATE_GENDER($gender),
+                       'sname'  => $sname,
+                       'fname'  => $fname,
+                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
+                       'ip'     => $IP,
+                       'ref'    => $ref,
+                       'hash'   => $hash,
+                       'link'   => ADMIN_USER_PROFILE_LINK($uid),
                );
 
                // Load row template and switch color
index d0140fc..119fa08 100644 (file)
@@ -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&amp;what=list_sponsor&amp;id=".bigintval($_GET['id']));
                } else {
                        // Load data
-                       list ($email, $salut, $sname, $fname) = SQL_FETCHROW($result);
+                       list ($email, $gender, $sname, $fname) = SQL_FETCHROW($result);
 
                        // Transfer data to constants for the template
                        define('__EMAIL', $email);
                        define('__SNAME', $sname);
                        define('__FNAME', $fname);
-                       define('__SALUT', TRANSLATE_SEX($salut));
+                       define('__GENDER', TRANSLATE_GENDER($gender));
                        define('__UID'  , bigintval($_GET['id']));
 
                        // Display form
index 9081221..7526f95 100644 (file)
@@ -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;
 
index 2feb810..a4be4f6 100644 (file)
@@ -44,7 +44,7 @@ ADD_DESCR("admin", basename(__FILE__));
 $result_main = false;
 if (isset($_GET['u_id'])) {
        //                                    0      1        2         3      4     5      6       7         8          9           10         11
-       $result_main = 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;
                }
 
index a66eff4..d7f47b8 100644 (file)
@@ -50,7 +50,7 @@ if (EXT_IS_ACTIVE("bonus"))   $EXCLUDE_LIST .= " AND d.userid != c.bonus_uid";
 if (EXT_IS_ACTIVE("doubler")) $EXCLUDE_LIST .= " AND d.userid != c.doubler_uid";
 
 // Check for all accounts
-$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'    => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index afc6135..3fbf81c 100644 (file)
@@ -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 = "</STRONG>";
                        }
                        $content = array(
-                               'uid'   => $uid,
-                               'email' => CREATE_EMAIL_LINK($email, "user_data"),
-                               'salut' => TRANSLATE_SEX($sex),
-                               'sname' => $sname,
-                               'fname' => $fname,
-                               'turbo' => TRANSLATE_COMMA($turbo),
-                               'last'  => MAKE_DATETIME($last, "2"),
-                               'sw'    => $SW,
-                               'win1'  => $WIN1,
-                               'win2'  => $WIN2,
-                               'cnt'   => $cnt,
+                               'uid'    => $uid,
+                               'email'  => CREATE_EMAIL_LINK($email, "user_data"),
+                               'gender' => TRANSLATE_GENDER($gender),
+                               'sname'  => $sname,
+                               'fname'  => $fname,
+                               'turbo'  => TRANSLATE_COMMA($turbo),
+                               'last'   => MAKE_DATETIME($last, "2"),
+                               'sw'     => $SW,
+                               'win1'   => $WIN1,
+                               'win2'   => $WIN2,
+                               'cnt'    => $cnt,
                        );
 
                        // Load template and add it
index caefd30..ff59221 100644 (file)
@@ -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
index 60f43bd..e3f2c15 100644 (file)
@@ -61,7 +61,7 @@ if (($_GET['letter'] != _ALL2) && ($_GET['letter'] != _OTHERS) && (!empty($_GET[
        $whereStatement = " WHERE refid='0' AND family LIKE '".$_GET['letter']."%'";
 }
 if ($_GET['sortby'] == "family_name") $_GET['sortby'] = "family";
-$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'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index 5a6df80..e266a79 100644 (file)
@@ -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', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$surname." ".$family."</A>");
+               define('PAYOUT_USERDATA_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$surname." ".$family."</A>");
 
                if (($_GET['do'] == "accept") && (!empty($email)))
                {
index 0d2434a..35b5f3b 100644 (file)
@@ -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."<br /><br />");
@@ -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],
index 498444a..8791734 100644 (file)
@@ -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,
index 7fe2287..729cbe8 100644 (file)
@@ -107,7 +107,7 @@ if ($listed)
                // but it does only show unconfirmed mail links from existing user
                // accounts. So if you have delete one you did not see those links
                //
-               $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'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_SEX($sex)." ".$sname." ".$fname."</A>",
+                                       'email'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".TRANSLATE_GENDER($gender)." ".$sname." ".$fname."</A>",
                                        'status' => TRANSLATE_STATUS($status),
                                );
 
index f8f5982..ccce2b0 100644 (file)
@@ -72,7 +72,7 @@ if (!empty($_GET['u_id']))
        $uid = bigintval($_GET['u_id']);
 
        // Does the account exists?       0      1        2         3      4     5      6       7         8          9          10           11           12         13     14         15           16          17            18           19           20           21        22        23             24              25         26
-       $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'  => "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$email."</A>",
index 433f5be..816878d 100644 (file)
@@ -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', "<A href=\"mailto:".$email."\">".__SALUT." ".__SURNAME." ".__FAMILY."</A>");
+                               define('__EMAIL_LINK', "<A href=\"mailto:".$email."\">".__GENDER." ".__SURNAME." ".__FAMILY."</A>");
 
                                // Display form
                                LOAD_TEMPLATE("admin_lock_sponsor");
index 528ec3c..09f0863 100644 (file)
@@ -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']))
                {
index d11c128..c3894d9 100644 (file)
@@ -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,
index 1a1a632..bb273a7 100644 (file)
@@ -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;
index ecf3887..a060104 100644 (file)
@@ -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);
index 9b5d88c..1223294 100644 (file)
@@ -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']),
index 12584c5..6da3f8a 100644 (file)
@@ -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
index 875a658..ec78893 100644 (file)
@@ -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'  , "");
index e5a89e2..1922538 100644 (file)
@@ -60,8 +60,8 @@ case "MEMBERS": // Statistics about your members
        $treg = SQL_NUMROWS(SQL_QUERY("SELECT userid FROM "._MYSQL_PREFIX."_user_data WHERE joined >= ".START_TDAY, __FILE__, __LINE__));
 
        // Only males / females
-       $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__));
index fd02c9f..5d19989 100644 (file)
@@ -64,20 +64,20 @@ case "show": // Show his data
        if (EXT_IS_ACTIVE("country", true))
        {
                // New way                         0        1         2          3         4     5     6        7           8            9       10      11           12           13
-               $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'],
index eac91e3..baa8aad 100644 (file)
@@ -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);
index 74fbc6a..7362663 100644 (file)
@@ -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);
index ec754c9..f9912e5 100644 (file)
@@ -45,7 +45,7 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 
 // Data for the formular
 $result = SQL_QUERY_ESC("SELECT company, position, tax_ident,
-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;
                        }
 
index c8e7c4b..927d33c 100644 (file)
@@ -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');
 
index e120cc2..4aa7880 100644 (file)
@@ -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));
index e1df712..5d52c25 100644 (file)
@@ -728,7 +728,7 @@ function SEND_MODE_MAILS($mod, $modes)
                $hash = generatePassString($hashDB);
                if (($hash == get_session('u_hash')) || ($_POST['pass1'] == $_POST['pass2'])) {
                        // Load user's data
-                       $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);
index fad2847..a6ef8e1 100644 (file)
@@ -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)."!<br />";
@@ -116,11 +116,11 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // No entry was found, so we add him!
                                                $result_stats = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_user_stats (pool_id , userid, cat_id, payment_id, subject, url , max_rec , timestamp_ordered, timestamp_sstart) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' , UNIX_TIMESTAMP())",
-                                                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)."!<br />";
@@ -131,18 +131,34 @@ if (SQL_NUMROWS($result_main) > 0)
                                                SQL_FREERESULT($result_stats);
 
                                                // Mark this user as "spammed" ;-) And place a line for him...
-                                               //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA[0]."/".$stats_id."?<br />";
-                                               switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA[0]), bigintval($stats_id)))
+                                               //* DEBUG: */ echo "?L:".__LINE__."/".$dummy."/".$key."/".$uid."(".$DATA[1].")/".$DATA['id']."/".$stats_id."?<br />";
+                                               switch (REMOVE_RECEIVER($dummy, $key, bigintval($uid), bigintval($DATA['id']), bigintval($stats_id)))
                                                {
                                                case "done":
                                                        // Prepare the mail
                                                        $DATA[11] = bigintval($stats_id);
                                                        $DATA[12] = $sname;
                                                        $DATA[13] = $fname;
-                                                       $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__."*<br />";
                                                                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]."*<br />";
-                                       if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA[0]))
-                                       {
+                                       //* DEBUG: */ echo "*L:".__LINE__."/".$cnt.">=".$DATA[8]."/".$_CONFIG['max_send'].">=".$cnt."/".$LAST_SENT_ID."!=".$DATA['id']."*<br />";
+                                       if ((($cnt >= $DATA[8])) && ($LAST_SENT_ID != $DATA['id'])) {
+                                               // Prepare content
+                                               $content = array(
+                                                       'sender_uid' => $DATA[1],
+                                                       'category'   => GET_CATEGORY($DATA[9])
+                                               );
+
                                                // Yes we do, so we notify admin and sender about fully sent mail!
-                                               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__."*<br />";
                                                break;
@@ -242,7 +262,7 @@ if (SQL_NUMROWS($result_main) > 0)
                                        {
                                                // List was empty
                                                $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_pool SET data_type='SEND' WHERE id=%s LIMIT 1",
-                                                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."*<br />";
                                $result_user = SQL_QUERY_ESC("SELECT surname, family, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
@@ -377,13 +385,34 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
                                        //* DEBUG: */ echo "OK!/L:".__LINE__."<br />";
 
                                        // Mark this user as "spammed" ;-) And place a line for him...
-                                       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__."*<br />";
 
                                // Update mediadata if version is 0.0.4 or higher
@@ -440,7 +469,7 @@ if ((EXT_IS_ACTIVE("bonus") && ($cnt < $_CONFIG['max_send'])))
                        {
                                // Update bonus pool
                                $result_done = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_bonus SET data_type='NEW', target_send=%s, receivers='%s' WHERE id=%s LIMIT 1",
-                                array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA[0])), __FILE__, __LINE__);
+                                array(SELECTION_COUNT($dummy), implode(";", $dummy), bigintval($DATA['id'])), __FILE__, __LINE__);
                                //* DEBUG: */ echo "*L:".__LINE__."<PRE>";
                                //* DEBUG: */ print_r($dummy);
                                //* DEBUG: */ echo "</PRE>\n!!!<br />";
index 565b24c..17f56d3 100644 (file)
@@ -46,7 +46,7 @@ if (($_CONFIG['send_prof_update'] == "Y") && ($_CONFIG['profile_update'] > 0) &&
        $TIMEOUT2 = bigintval(time() - $_CONFIG['resend_profile_update']);
 
        // Load personal data              0      1     2      3        4          5         6
-       $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__);
index 4fc1f60..cbcca39 100644 (file)
@@ -194,7 +194,7 @@ CREATE TABLE `mxchange_user_data` (
   `last_module` VARCHAR(20) NOT NULL DEFAULT '',\r
   `ref_clicks` BIGINT(20) NOT NULL DEFAULT '0',\r
   `total_logins` BIGINT(20) NOT NULL DEFAULT '0',\r
-  `sex` ENUM('M','F') NOT NULL DEFAULT 'M',\r
+  `gender` ENUM('M','F') NOT NULL DEFAULT 'M',\r
   `used_points` DOUBLE(22,3) NOT NULL DEFAULT '0.000',\r
   `emails_sent` BIGINT(20) NOT NULL DEFAULT '0',\r
   PRIMARY KEY  (`userid`)\r
index 0278981..97f9438 100644 (file)
@@ -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...
index 6810f06..0c54c6f 100644 (file)
@@ -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")
index 861d8ca..6ac941f 100644 (file)
@@ -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);
index 1fcfb55..1dd2bd0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat Ihnen soeben {!__POINTS_VALUE!} {!POINTS!} gutgeschrieben!
 
index 6a5e4e5..f70b75f 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre unbestaetigten Mails geloescht!
 
index dee7db4..58c73e1 100644 (file)
@@ -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
 ------------------------------
index 8ad3d96..72a5d68 100644 (file)
@@ -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
index 26bdd4f..1d83a10 100644 (file)
@@ -5,7 +5,7 @@
 ------------------------------------------
 {--MEMBER_UID--}: $UID
 ------------------------------------------
-{--SEX--}: $DATA[0]
+{--GENDER--}: $DATA[0]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
index 211fa87..1108a46 100644 (file)
@@ -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
 ------------------------------
index 20b9590..b35bd41 100644 (file)
@@ -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
 ------------------------------
index 4cc51d2..db66acd 100644 (file)
@@ -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]
index 62c96d7..a6ea5e8 100644 (file)
@@ -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]
index e11cf06..1ed9227 100644 (file)
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
-{--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])
index d245f66..b1903a3 100644 (file)
@@ -8,7 +8,7 @@ Hier sind alle neuen (und in Klammern alten) Daten:
 {--SPONSOR_ENTER_COMPANY_POSITION--}: $DATA[position] ($content[position])
 {--SPONSOR_ENTER_TAX_IDENT--}: $DATA[tax_ident] ($content[tax_ident])
 ------------------------------
-{--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])
index 7eae163..fbe2800 100644 (file)
@@ -1,7 +1,7 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
-Ihre Sponsor-ID lautet: {--__SPONSOR_ID--}
+Ihre Sponsor-ID lautet: {!__SPONSOR_ID!}
 ------------------------------
 
 Einer unserer Administratoren hat soeben Ihren Sponsorenaccount geaendert.
@@ -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]
index 57276be..3651244 100644 (file)
@@ -12,7 +12,7 @@ Ihre Sponsor-ID lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
index 6f90d4c..efe4f67 100644 (file)
@@ -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.
index d05a9cb..b604a53 100644 (file)
@@ -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
 ------------------------------
index f5efabb..0f53880 100644 (file)
@@ -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
 ------------------------------
index 0331bfb..1b03928 100644 (file)
@@ -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
 ------------------------------
index 28df1c9..b9126e1 100644 (file)
@@ -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
 ------------------------------
index 45c54cc..0ac0204 100644 (file)
@@ -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
index 91c741e..536724e 100644 (file)
@@ -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]
index 66e96a2..7a36778 100644 (file)
@@ -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
index d88599d..5d0194e 100644 (file)
@@ -1,6 +1,6 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
-Eine Buchung von Ihnen konnte nich vollstaendig ausgesendet werden. Wir haben Ihnen $points {!POINTS!} wieder gutgeschrieben!
+Eine Buchung von Ihnen konnte nich vollstaendig ausgesendet werden. Wir haben Ihnen $content[points] {!POINTS!} wieder gutgeschrieben!
 
 Mit freundlichem Gruss,
   Ihr {!MAIN_TITLE!} Team
index 9e5b341..673bbef 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index f89f064..ef0aed6 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index a0c889f..b009cbe 100644 (file)
@@ -1,26 +1,26 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Hier kommt eine Bonus-Mail von uns zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$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&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
-Um Ihre {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{!URL!}/mailid.php?uid=$UID&bonusid=$BONUSID
+Um Ihre $content[points] {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
+{!URL!}/mailid.php?uid=$UID&bonusid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
index a4cf9ea..99ba18d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index dfb3dfa..fd1d653 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 6e50533..a614570 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben Ihre Email-Adresse best&auml;tigt und sind somit f&uuml;r den {!MT_WORD!} {!MAIN_TITLE!} freigeschaltet!
 
@@ -7,7 +7,7 @@ Sie k&ouml;nnen sich nun hier einloggen:
 Ihre Login-ID lautet: $UID
 URL zum Login: {!URL!}/login.php
 
-f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $points {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
+f&uuml;r Ihre Anmeldung werden wir Ihnen als Willkommensgutschrift $content[points] {!POINTS!} gutschreiben, sobald Sie $CONFIG[ref_payout] Mails best&auml;tigt haben. Erst dann k&ouml;nnen Sie Mails an die anderen Mitglieder verschicken!
 
 Wir w&uuml;nschen Ihnen viel Spass und Erfolg beim Mail-Versand!
 
index f858e29..cc4c79b 100644 (file)
@@ -1,12 +1,12 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben heute ein neues Mitglied f&uuml;r unseren {!MT_WORD!} geworben!
 
 Hier sehen Sie genau, in welcher Ebene Sie ihn geworben haben:
 -----------------
-Referral-Ebene ($PERCENT%): $LEVEL
-{!POINTS!}: $points
-ID des Mitgliedes: $REFID
+Referral-Ebene ($content[percent]%): $content[level]
+{!POINTS!}: $content[points]
+ID des Mitgliedes: $content[refid]
 -----------------
 
 Sie werden nun auch weiterhin {!POINTS!} &uuml;ber diese geworbene Person erhalten.
index 8a476f8..4bc5a33 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
index 328c2a4..16eec4b 100644 (file)
@@ -1,4 +1,4 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 Einer unserer Administratoren hat soeben Ihren Account geloescht!
 
index de89e28..6eee5df 100644 (file)
@@ -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.
index 67dbdc7..fcad688 100644 (file)
@@ -1,19 +1,19 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihre gebuchte Mail wurde soeben vollstaendig von unserem System versendet! Wir wuenschen Ihnen viel Erfolg mit Ihrer Werbebuchung!
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$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!
index ede6de5..f35c30e 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten sich zu unserem {!MT_WORD!} {!MAIN_TITLE!} angemeldet und heute Ihren Best&auml;tigungslink erneut angefordert, jedoch bis jetzt noch nicht Ihre eMail-Adresse best&auml;tigt. Diesen Schritt koennen Sie jetzt nachholen, damit Sie sich einloggen koennen.
 
 Hier ist Ihr Best&auml;tigungslink:
-{!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!})
index e04f073..98b6914 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
index 9b8219a..ec07d5c 100644 (file)
@@ -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:
 --------------------------
index 26991f5..e5adfae 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 9e7c451..011456b 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der automatischen Loeschung von Bestaetigungslinks wurden Ihnen $content {!POINTS!} wieder gutgeschrieben!
 
index 8d1019e..8bdf73e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der monatlichen Bettel-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
index 4eb4869..82d419f 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content. Geburtstag!
 
index ac9b629..c6aaef0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir das Team von {!MAIN_TITLE!} wuenschen Ihnen alles Gute und Gesundheit zu Ihrem $content[age]. Geburtstag!
 
index 33ec699..76af1e2 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Bei der monatlichen Aktiv-Rallye haben Sie soeben Ihre $content {!POINTS!} gewonnen!
 
index ed708a7..a2b4c3e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir haben Ihnen soeben $content[points] {!POINTS!} durch eine Verdoppelung vom $content[when] Ihrem Account gutgeschrieben!
 
index 5caae85..81d61dc 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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
 ------------------------------
index e0053a3..64e7cb2 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Wir haben soeben Ihren Urlaub bei uns beendet. Folgende Daten wurden uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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]
 ------------------------------
index b71a3a4..e5ae307 100644 (file)
@@ -1,17 +1,17 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Urlaub beantragt und dabei folgende Daten hinterlassen:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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
index d4fb8ff..c3e0af0 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihr beantragter Urlaub ist hiermit zu Ende. Folgende Daten hatten Sie uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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]
 ------------------------------
index d96c0c9..cfb34f4 100644 (file)
@@ -4,7 +4,7 @@
 
 {--YOUR_NEW_DATA--}:
 ------------------------------------------
-{--SEX--}: $DATA[0]
+{--GENDER--}: $DATA[0]
 {--SURNAME--}: $DATA[1]
 {--FAMILY_NAME--}: $DATA[2]
 {--STREET_NR--}: $DATA[3]
index cc2cfc8..4bce17d 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Diese wurde nun durchgefuehrt. Hier sind nochmals Ihre an uns uebermittelten Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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.
index 8df5147..d6e6509 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Folgende Daten wurden dabei an uns uebermittelt:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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:
index 43185a8..80b17f6 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns die Abbestellung unseres Newsletters beantragt. Die gebuchte Zeitspanne ist nun abgelaufen. Hier sind nochmals Ihre Daten:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-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.
index b7d5c39..4dc2e0e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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:
index b5264a6..877ed1d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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:
index 349dd7b..685a71d 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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.
 
index 402c1d6..33eb138 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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.
 
index e02544f..0b97a49 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 56fe3f0..826f1a2 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 2336e1b..15ec222 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index cdd2680..324306e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 974fb5c..11c8890 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $surname $family,
+Hallo $content[surname] $content[family],
 
 ------------------------------
 Ihre Mitglied-ID lautet: $UID
index 6883b91..e4f8562 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben {!__STATS_BONUS!} {!POINTS!} auf Ihr Aktiv-Konto gutgeschrieben bekommen, da die folgende Werbebuchung 100% Klickrate erreicht hat:
 
index 0949af4..f0af71d 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
index 0949af4..f0af71d 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zur Mailbuchung an uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
index c91ad79..74c14e7 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten eine Frage zu Ihrem Referal-Link uns gestellt. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
index 3208dfd..b1be97b 100644 (file)
@@ -1,13 +1,13 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten uns wegen Ihrer unbestaetigten Mails kontaktiert. Folgendes wurde an den Support weitergeleitet:
 
 ------------------------------
 Ihr Mitglieder-ID ist: $UID
 ------------------------------
-E-Mail Adresse: $email
+E-Mail Adresse: $content[email]
 ------------------------------
-Vor-, Nachname: $salut $surname $family
+Vor-, Nachname: $content[gender] $content[surname] $content[family]
 ------------------------------
 
 $content
index c8e10b5..6ca84e2 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung von einem unserer Mitglieder erhalten!
 
index 7d2a32d..defc6db 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben eine {!POINTS!}-Ueberweisung an eines unserer Mitglieder abgeschlossen!
 
index b7d5c39..4dc2e0e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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:
index 037fcc4..a0f55e5 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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:
index b0e3a59..27427bd 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten an uns {!MAIN_TITLE!} eine Auszahlungsanfrage geschickt.
 
@@ -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]
index 7420649..8b17788 100644 (file)
@@ -1,12 +1,16 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
-Sie oder ein anderes Mitglied ($REMOTE) haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
+Sie oder ein anderes Mitglied haben soben ein neues Passwort angefordert. Hier ist Ihr neues Passwort:
 
-------------------
-Ihre Login-ID lautet: $UID / Nickname: $nick
-Neues Passwort: $PASS
+------------------------------------
+Ihre Login-ID lautet: $UID / Nickname: $content[nick]
+Neues Passwort: $content[new_pass]
 Sie k&ouml;nnen sich nun hier einloggen:: {!URL!}/login.php
-------------------
+------------------------------------
+IP-Nummer: $REMOTE_ADDR
+------------------------------------
+Browser: $HTTP_USER_AGENT
+------------------------------------
 
 Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
index 0be4343..60bbb45 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
index 2c82f29..b49c423 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 --------------
 Ihre User-ID bei uns: $UID
index d8c91e8..b9e14a4 100644 (file)
@@ -1,26 +1,26 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Hier kommt eine weitere Mail von einem unserer Mitglieder zu Ihnen! :-) Weiteres zum Thema SPAM lesen Sie bitte am Ende dieser Mail.
 
 - - - - -  Werbetext-Anfang:  - - - - -
-$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&ouml;nnen versteigert oder verkauft werden, jedoch mu&szlig; der K&auml;ufer bei {!MAIN_TITLE!} Mitglied sein oder werden.
 
-Um Ihre $points {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
-{!URL!}/mailid.php?uid=$UID&mailid=$MAILID
+Um Ihre $content[points] {!POINTS!} gutgeschrieben zu bekommen, klicken Sie bitte auf folgenden Link:
+{!URL!}/mailid.php?uid=$UID&mailid=$content[id]
 
 Wichtig! Achten Sie darauf das Ihr Mailserver immer empfangbereit ist. Sollte Ihr Mailserver nicht empfangbereit sein (z.B. voll usw.), werden wir Ihren Account sperren! Sie haben nun innerhalb von 10 Tagen die m&ouml;glichkeit sich bei uns zu melden zwecks Freischaltung, erfolgt dieses nicht, wird Ihr Account gel&ouml;scht! Bei dieser Sperrung erhalten Sie von uns keine Mitteilung, sollten Sie keine Mails von uns bekommen, pr&uuml;fen Sie Ihren Account!
 ----------------
index 68e5013..5801233 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
index cba60e6..19faec1 100644 (file)
@@ -2,26 +2,27 @@
 
 Ein Mitglied hat soeben eine Mailbuchung durchgef&uuml;hrt!
 
-Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in $BLOCKS-Mail-Bloecken versand.
+Seine Buchung befindet sich nun im Sende-Pool und wird automatisch in $content[blocks] Mail-Bloecken versand.
 
 Hier sind nochmals seine Daten, gebuchter Text und URL zur Verifizierung:
 ------------------------------------------------
-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.
index 359dcf2..7390315 100644 (file)
@@ -1,10 +1,10 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung geloescht. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
 ---------------
-Beworbene URL: $TARGET_URL
-Betreffzeile: $SUBJECT
+Beworbene URL: $content[url]
+Betreffzeile: $content[subject]
 ---------------
 
 Ihre Mailbuchung wurde somit gel&ouml;scht. Sollten Sie Fragen hierzu haben, so wenden Sie sich bitte an unseren Support.
index 44b88ea..7d7675a 100644 (file)
@@ -1,17 +1,18 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Ihre Mailbuchung befindet sich derzeit in Warteschleife und wird bald ausgesendet!
 
 Hier sind nochmals Ihre Daten aus dem Buchungsformular:
 ------------------------------------------------
-Gebuchte Kategorie: $CATEGORY
-Gebuchter Payment-Typ: $PAYMENT
-Betreffzeile in den Mails: $SUBJECT
-Gebuchte URL: $TARGET_URL
+Gebuchte Kategorie: $content[category]
+Gebuchter Payment-Typ: $content[payment]
+Betreffzeile in den Mails: $content[subject]
+Gebuchte URL: $content[url]
 ------------------------------------------------
 
+Werbetext:
 ------------------------------------------------
-$content
+$content[text]
 ------------------------------------------------
 
 Sobald Ihre Mailbuchung vollst&auml;ndig gesendet wurde, erhalten Sie eine zweite Mail! Sie k&ouml;nnen bereits eine weitere Mailbuchung durchf&uuml;hren!
index f332d2a..25ae7c4 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung abgelehnt. Bite beachten Sie unsere AGBs! Bei weiteren Verstoessen gegen unsere AGBs werden wir Ihre URL und ggf. auch Ihren Account sperren. Hier sind nochmals Ihre URL und Betreff Ihrer Mailbuchung:
 
index a879290..bae215b 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname, $family,
+Hallo $content[gender] $content[surname], $content[family],
 
 Einer unserer Administratoren hat soeben Ihre Mailbuchung freigegeben. Sie wird von unserem System automatisch versendet! Bitte beachten Sie, dass dies ggf. zeitversetzt zu dieser Mail versendet wird. Hier sind nochmals URL und Betreff Ihrer Mailbuchung:
 
index b98088e..1e08acf 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $salut $surname $family,
+Hallo $content[gender] $content[surname] $content[family],
 
 Haben Sie Neuigkeiten fuer uns?
 
index ffb386c..6a79a6f 100644 (file)
@@ -4,7 +4,7 @@ Ein Gast hat sich soeben bei uns angemeldet.
 
 Hier sind zur &Uuml;berpr&uuml;fung nochmals seine pers&ouml;nlichen Daten:
 -------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
index e5a6f4e..7b1c99f 100644 (file)
@@ -1,10 +1,10 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 vielen Dank, dass Sie sich f&uuml;r unseren {!MT_WORD!} entschieden haben! Sollten Sie dies nicht gewesen sein, so melden Sie sich bitte bei uns!
 
 Hier sind nochmals zur &Uuml;berpr&uuml;fung Ihre pers&ouml;nlichen Daten:
 -----------------------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 Vorname: $content[surname]
 Nachname: $content[family]
 Stra&szlig;e und Hausnummer: $content[street]
index 66014f5..be536b0 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben Ihren Bestaetigungslink erneut angefordert.
 
index 91001c4..b9d685d 100644 (file)
@@ -1,6 +1,6 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
-Einer unserer Administratoren hat Ihnen soeben {--__POINTS--} {!POINTS!} Ihrem Sponsoren-Account mit der ID {--__ID--} gutgeschrieben!
+Einer unserer Administratoren hat Ihnen soeben {!__POINTS!} {!POINTS!} Ihrem Sponsoren-Account mit der ID {!__ID!} gutgeschrieben!
 
 Grund dazu war folgender:
 ------------------------------
index c3c26a3..9de6679 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $DATA[salut] $DATA[surname] $DATA[family].
+Hallo $DATA[gender] $DATA[surname] $DATA[family].
 
 Sie haben heute Ihre Daten geaendert.
 
@@ -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])
index dc43d87..15041d4 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $DATA[salut] $DATA[surname] $DATA[family].
+Hallo $DATA[gender] $DATA[surname] $DATA[family].
 
 Sie haben heute Ihre Email-Adresse geaendert. Ihr Account wurde somit temporaer gesperrt. Sie koennen es nun mit
 dem folgenden Link wieder freigeben:
index db94379..ea5f607 100644 (file)
@@ -1,4 +1,4 @@
-Hallo {--__SALUT--} {--__SURNAME--} {--__FAMILY--},
+Hallo {!__GENDER!} {!__SURNAME!} {!__FAMILY!},
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben sich soeben als Sponsor zu unserem {!MT_WORD!}
 angemeldet. Sie haben somit den ersten Schritt zu uns getan wofuer wir uns sehr bedanken.
@@ -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,
index caa022f..7d9c9a4 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie hatten bei uns Ihre EMail-Adresse geaendert und den Bestaetigungslink erneut angefordert. Hier sind nun
 alle noetigen Daten dazu.
index 7094c0e..03e1f2a 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie (oder ein anderer mit der IP-Nummer $REMOTE_ADDR) haben soeben ein neues Passwort angefordert.
 
index 23162b4..e056d6a 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 Sie haben soeben Ihre EMail-Adresse bestaetigt. Dies wurde von der IP-Nummer $REMOTE_ADDR aus durchgefuehrt.
 
@@ -18,7 +18,7 @@ Ihre Sponsor-ID lautet: $content[id]
 ------------------------------
 -- Persoenliche Daten:      --
 ------------------------------
-Anrede: $content[salut]
+Anrede: $content[gender]
 ------------------------------
 Vorname: $content[surname]
 ------------------------------
index 29ccf39..5768e2e 100644 (file)
@@ -1,4 +1,4 @@
-Hallo $content[salut] $content[surname] $content[family],
+Hallo $content[gender] $content[surname] $content[family],
 
 ------------------------------
 Ihre Sponsor-ID lautet: $content[id]