From: Roland Häder Date: Mon, 7 Aug 2023 11:46:37 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=refs%2Fheads%2F0.2.1-FINAL;ds=sidebyside Continued: - 'gender' is only a social construct, let's support the 2-sexes reality here and not some woke ideology about "millions of genders" --- diff --git a/DOCS/TODOs.txt b/DOCS/TODOs.txt index 0137eca427..6df0d75add 100644 --- a/DOCS/TODOs.txt +++ b/DOCS/TODOs.txt @@ -13,7 +13,7 @@ ./inc/database-functions.php:1521: // @TODO Rewrite these lines to a filter ./inc/database-functions.php:1545: // @TODO Rewrite this to a filter ./inc/database-functions.php:1861: // @TODO Rewrite this to a filter -./inc/database-functions.php:2029: // @TODO If the EL sub-system can support more than one parameter, this call_user_func_array() can be avoided +./inc/database-functions.php:2029: // @TODO If the EL sub-system can support more than one parameter, this call_user_func_[] can be avoided ./inc/database-functions.php:2161: // @TODO Used generic 'userid' here ./inc/database-functions.php:2379:// @TODO cacheFiles is not yet supported ./inc/database-functions.php:39:// @TODO Can we cache this? @@ -22,11 +22,6 @@ ./inc/email-functions.php:204:// @TODO $rawUserId is currently unused ./inc/expression-functions.php:168:// @TODO FILTER_COMPILE_CONFIG does not handle call-back functions so we handle it here again ./inc/expression-functions.php:41: // @TODO is escapeQuotes() enough for strings with single/double quotes? -./inc/extensions-functions.php:2234: // @TODO Is this really neccessary? -./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' -./inc/extensions-functions.php:434: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it -./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) -./inc/extensions-functions.php:590: // @TODO Extension is loaded, what next? ./inc/extensions/admins/mode-update.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/autopurge/mode-update.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/beg/mode-update.php:38:// @TODO Remove double tabs from all lines @@ -43,6 +38,11 @@ ./inc/extensions/ext-yoomedia.php:120: // @TODO Can this be moved into a database table? ./inc/extensions/ext-yoomedia.php:54:// @TODO Only deprecated when 'ext-network' is ready: setExtensionDeprecated('Y'); ./inc/extensions/forced/mode-setup.php:38:// @TODO Remove double tabs from all lines +./inc/extensions-functions.php:2234: // @TODO Is this really neccessary? +./inc/extensions-functions.php:2291:// @TODO This should be rewrittten to allow, more development states, e.g. 'planing','alpha','beta','beta2','stable' +./inc/extensions-functions.php:434: // @TODO This redirect is still needed to register sql_patches! Please try to avoid it +./inc/extensions-functions.php:450:// @TODO Change from ext_id to ext_name (not just even the variable! ;-) ) +./inc/extensions-functions.php:590: // @TODO Extension is loaded, what next? ./inc/extensions/grade/mode-setup.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/html_mail/mode-update.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/network/mode-setup.php:13: * @TODO ADCocktail: All request parameters, BIDausKAS, WIDausKAS??? * @@ -91,13 +91,14 @@ ./inc/extensions/transfer/mode-update.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/user/mode-update.php:38:// @TODO Remove double tabs from all lines ./inc/extensions/user/mode-update.php:548: // @TODO Make configurable through web interface -./inc/filter-functions.php:115: // @TODO Remove this forced removal after a year or so ./inc/filter/blacklist_filter.php:105: // @TODO Insert log entry ./inc/filter/blacklist_filter.php:116: // @TODO Insert log entry ./inc/filter/blacklist_filter.php:127: // @TODO Insert log entry ./inc/filter/bonus_filter.php:56: // @TODO This query isn't right, it will only update if the user was for a longer time away! ./inc/filter/forced_filter.php:75: // @TODO This part is unfinished +./inc/filter-functions.php:115: // @TODO Remove this forced removal after a year or so ./inc/filter/order_filter.php:132: // @TODO 200 is hard-coded here, swap it out to config + admin_config_order.tpl +./inc/filters.php:1379: // @TODO No banner found, output some default banner ./inc/filter/user_filter.php:279:// @TODO 0% done ./inc/filter/user_filter.php:289:// @TODO 0% done ./inc/filter/wernis_filter.php:137:// @TODO 0% done @@ -105,8 +106,6 @@ ./inc/filter/wernis_filter.php:62:// @TODO 10% done ./inc/filter/wernis_filter.php:80:// @TODO 10% done ./inc/filter/wernis_filter.php:98:// @TODO 10% done -./inc/filters.php:1379: // @TODO No banner found, output some default banner -./inc/gen_sql_patches.php:93:// @TODO Rewrite this to a filter ./inc/general-functions.php:1351: // @TODO Are these convertions still required? ./inc/general-functions.php:1372:// @TODO Rewrite this function to use readFromFile() and writeToFile() ./inc/general-functions.php:1676: // @TODO This should be rewritten not to load the cache file for just checking if it is there for save removal. @@ -115,12 +114,13 @@ ./inc/general-functions.php:2335: // @TODO Rename column data_type to e.g. mail_status ./inc/general-functions.php:2685:// @TODO cacheFiles is not yet supported ./inc/general-functions.php:549:// @TODO $allowSpider is unused +./inc/gen_sql_patches.php:93:// @TODO Rewrite this to a filter ./inc/install-functions.php:166: // @TODO DEACTIVATED: changeDataInLocalConfigurationFile('OUTPUT-MODE', "setConfigEntry('OUTPUT_MODE', '", "');", postRequestElement('omode'), 0); ./inc/install-functions.php:561: // @TODO Comparing with DEFAULT_MAIN_TITLE doesn't work -./inc/language-functions.php:249: // @TODO These are all valid languages, again hard-coded ./inc/language/de.php:1150: // @TODO Rewrite these two constants ./inc/language/de.php:1166: // @TODO Rewrite these three constants ./inc/language/de.php:46: // @TODO Please sort these language elements +./inc/language-functions.php:249: // @TODO These are all valid languages, again hard-coded ./inc/language/install_de.php:155: // @TODO Move this to e.g. ext-smtp ./inc/language/newsletter_de.php:13: * @TODO This language file is completely out-dated, please do no * ./inc/language/order_de.php:71: // @TODO Find better text @@ -199,12 +199,12 @@ ./inc/modules/admin/what-list_rallye_prices.php:222: // @TODO Rewrite these two constants ./inc/modules/admin/what-list_refs.php:101: // @TODO Try to rewrite some to EL ./inc/modules/admin/what-list_unconfirmed.php:115: // @TODO "Please do not call me directly." Should be rewritten to a nice selection depending on ext-bonus +./inc/modules/admin/what-list_user_cats.php:54: // @TODO No longer needed? define('__CATEGORIES_BASE' , ' not working here -./inc/template-functions.php:1128: // @TODO Deprecate this thing -./inc/template-functions.php:1139: // @TODO Deprecate this thing -./inc/template-functions.php:1261: // @TODO This can be easily moved out after the merge from EL branch to this is complete -./inc/template-functions.php:1316: // @TODO Add a little more infos here -./inc/template-functions.php:1715:// @TODO Lame description for this function -./inc/template-functions.php:1737: // @TODO Move this in a filter +./inc/template-functions.php:1079: // @TODO
  • {--ADMIN_ASSIGNED_USERID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; + $add = '
  • {--ADMIN_ASSIGNED_USERID--}: ' . generateUserProfileLink($taskData['userid'], 'user_data') . ' ({%pipe,translateSex=' . $content['sex'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ')
    • '; } else { // Invalid userid, so log and zero it logDebugMessage(__FUNCTION__, __LINE__, 'fetchUserData() failed: userid=' . $taskData['userid'] . ' not found.'); diff --git a/inc/modules/admin/what-config_user.php b/inc/modules/admin/what-config_user.php index 2aab492b3e..ea85a65978 100644 --- a/inc/modules/admin/what-config_user.php +++ b/inc/modules/admin/what-config_user.php @@ -47,8 +47,8 @@ if (isFormSent('save_config')) { // Save settings adminSaveSettingsFromPostData(); } else { - // Prepare gender selection box - $content['tester_user_gender_selection'] = generateGenderSelectionBox(getTesterUserGender(), 'tester_user_gender'); + // Prepare sex selection box + $content['tester_user_sex_selection'] = generateSexSelectionBox(getTesterUserSex(), 'tester_user_sex'); // Load form template loadTemplate('admin_config_user', FALSE, $content); diff --git a/inc/modules/admin/what-del_sponsor.php b/inc/modules/admin/what-del_sponsor.php index 5c45bbe94b..9f42b0e584 100644 --- a/inc/modules/admin/what-del_sponsor.php +++ b/inc/modules/admin/what-del_sponsor.php @@ -45,7 +45,7 @@ addYouAreHereLink('admin', __FILE__); if (isGetRequestElementSet('id')) { // Check for selected sponsor - $result = sqlQueryEscaped("SELECT `id`, `email`, `gender`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1", + $result = sqlQueryEscaped("SELECT `id`, `email`, `sex`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1", array(bigintval(getRequestElement('id'))), __FILE__, __LINE__); if (sqlNumRows($result) == 1) { // Remove sponsor diff --git a/inc/modules/admin/what-edit_sponsor.php b/inc/modules/admin/what-edit_sponsor.php index 88a4e1000c..455d3c7fa6 100644 --- a/inc/modules/admin/what-edit_sponsor.php +++ b/inc/modules/admin/what-edit_sponsor.php @@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__); if ((isGetRequestElementSet('id')) && (isGetRequestElementSet('do'))) { // Check for selected sponsor $result_main = sqlQueryEscaped("SELECT - `id`, `company`, `position`, `gender`, `surname`, `family`, + `id`, `company`, `position`, `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`, `receive_warnings`, `warning_interval` @@ -138,7 +138,7 @@ LIMIT 1", handleSponsorRequest(postRequestArray()); // Convert some data for the email template - postRequestElement('gender' , '{%pipe,translateGender=' . postRequestElement('gender') . '%}'); + postRequestElement('sex' , '{%pipe,translateSex=' . postRequestElement('sex') . '%}'); postRequestElement('warning_interval', '{%pipe,createFancyTime=' . postRequestElement('warning_interval') . '%}'); if ($PASS === FALSE) setPostRequestElement('password1', '{--SPONSOR_PASS_UNCHANGED--}'); diff --git a/inc/modules/admin/what-edit_user.php b/inc/modules/admin/what-edit_user.php index b0f65e09eb..2d5128f9e3 100644 --- a/inc/modules/admin/what-edit_user.php +++ b/inc/modules/admin/what-edit_user.php @@ -50,7 +50,7 @@ $result_main = FALSE; if (isGetRequestElementSet('userid')) { // Load user entry $result_main = sqlQueryEscaped("SELECT - `userid`, `gender`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`, + `userid`, `sex`, `surname`, `family`, `street_nr`, `zip`, `city`, `country`, `email`, `birth_day`, `birth_month`, `birth_year`, `max_mails` @@ -86,7 +86,7 @@ if ((!isGetRequestElementSet('userid')) || (sqlNumRows($result_main) == 1)) { sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', + `sex`='%s', `surname`='%s', `family`='%s', `street_nr`='%s', @@ -99,7 +99,7 @@ WHERE `userid`=%s LIMIT 1", array( - substr(postRequestElement('gender'), 0, 1), + substr(postRequestElement('sex'), 0, 1), postRequestElement('surname'), postRequestElement('family'), postRequestElement('street_nr'), diff --git a/inc/modules/admin/what-list_autopurge.php b/inc/modules/admin/what-list_autopurge.php index 966e58b751..2aec94b120 100644 --- a/inc/modules/admin/what-list_autopurge.php +++ b/inc/modules/admin/what-list_autopurge.php @@ -54,7 +54,7 @@ if (isFilledArray($excludedUserids)) { // Check for all accounts $result = sqlQuery("SELECT `d`.`userid`, - `d`.`gender`, + `d`.`sex`, `d`.`surname`, `d`.`family`, `d`.`email`, @@ -79,7 +79,7 @@ if (!ifSqlHasZeroNumRows($result)) { // Prepare data for the row template $content = array( 'userid' => $content['userid'], - 'gender' => $content['gender'], + 'sex' => $content['sex'], 'surname' => $content['surname'], 'family' => $content['family'], 'email' => '' . $content['email'] . '', diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php index 82d1bb9aef..931d2ea2d2 100644 --- a/inc/modules/admin/what-list_payouts.php +++ b/inc/modules/admin/what-list_payouts.php @@ -171,7 +171,7 @@ LIMIT 1", $content = array( 'task' => $taskId, 'pid' => bigintval(getRequestElement('pid')), - 'user' => '{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '', + 'user' => '{%pipe,translateSex=' . getUserData('sex') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '', ); // Load template @@ -202,7 +202,7 @@ LIMIT 1", $content = array( 'task' => $taskId, 'pid' => bigintval(getRequestElement('pid')), - 'user' => '{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '', + 'user' => '{%pipe,translateSex=' . getUserData('sex') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '', ); // Load template diff --git a/inc/modules/admin/what-list_sponsor.php b/inc/modules/admin/what-list_sponsor.php index 3184a790f7..ca64887436 100644 --- a/inc/modules/admin/what-list_sponsor.php +++ b/inc/modules/admin/what-list_sponsor.php @@ -46,7 +46,7 @@ addYouAreHereLink('admin', __FILE__); if (isGetRequestElementSet('id')) { // Show detailed informations to a sponsor $result = sqlQueryEscaped("SELECT - `company`, `position`, `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, + `company`, `position`, `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, `phone`, `fax`, `cell`, `email`, `url`, `tax_ident`, `status`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`, @@ -101,7 +101,7 @@ WHERE // Sponsor found so let's list all his referrals $result = sqlQueryEscaped("SELECT `id`, - `gender`, + `sex`, `surname`, `family`, `email`, @@ -135,7 +135,7 @@ ORDER BY } else { // List all sponsors $result_main = sqlQuery("SELECT - `id`, `gender`, `surname`, `family`, `email`, `status`, + `id`, `sex`, `surname`, `family`, `email`, `status`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`, UNIX_TIMESTAMP(`last_online`) AS `last_online`, `points_amount`, `points_used`, diff --git a/inc/modules/admin/what-list_unconfirmed.php b/inc/modules/admin/what-list_unconfirmed.php index 13a29cc9f5..5e4f9f5db0 100644 --- a/inc/modules/admin/what-list_unconfirmed.php +++ b/inc/modules/admin/what-list_unconfirmed.php @@ -144,7 +144,7 @@ if (($listed === TRUE) && (!empty($sql))) { `u`.`status`, `u`.`surname`, `u`.`family`, - `u`.`gender`, + `u`.`sex`, `u`.`email` FROM `{?_MYSQL_PREFIX?}_user_links` AS `l` @@ -175,7 +175,7 @@ LIMIT %s", 'userid' => $row['userid'], 'type' => getRequestElement('type'), 'id' => $ID, - 'email' => '{%pipe,translateGender=' . $row['gender'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '', + 'email' => '{%pipe,translateSex=' . $row['sex'] . '%} ' . $row['surname'] . ' ' . $row['family'] . '', 'status' => $row['status'], ); diff --git a/inc/modules/admin/what-list_user_cats.php b/inc/modules/admin/what-list_user_cats.php index a6d6ad3efd..cb254c1c54 100644 --- a/inc/modules/admin/what-list_user_cats.php +++ b/inc/modules/admin/what-list_user_cats.php @@ -52,7 +52,7 @@ if (isGetRequestElementSet('userid')) { // Prepare constants // @TODO No longer needed? define('__CATEGORIES_BASE' , '{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ''; + $content['email'] = '{%pipe,translateSex=' . $content['sex'] . '%} ' . $content['surname'] . ' ' . $content['family'] . ''; // Ok, list categories of this user $result_cats = sqlQuery("SELECT diff --git a/inc/modules/admin/what-lock_sponsor.php b/inc/modules/admin/what-lock_sponsor.php index d5aa03d51a..d037477d15 100644 --- a/inc/modules/admin/what-lock_sponsor.php +++ b/inc/modules/admin/what-lock_sponsor.php @@ -46,7 +46,7 @@ $message = ''; if (isGetRequestElementSet('id')) { // Check for selected sponsor - $result_sponsor = sqlQueryEscaped("SELECT `gender`, `surname`, `family`, `email`, `status` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1", + $result_sponsor = sqlQueryEscaped("SELECT `sex`, `surname`, `family`, `email`, `status` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `id`=%s LIMIT 1", array(bigintval(getRequestElement('id'))), __FILE__, __LINE__); if (sqlNumRows($result_sponsor) == 1) { // Get sponsor's current status and let only confirmed and locked status pass @@ -96,7 +96,7 @@ if (isGetRequestElementSet('id')) { } // Create email link - $content['email_link'] = '' . $content['gender'] . ' ' . $content['surname'] . ' ' . $content['family'] . ''; + $content['email_link'] = '' . $content['sex'] . ' ' . $content['surname'] . ' ' . $content['family'] . ''; // Display form loadTemplate('admin_lock_sponsor', FALSE, $content); diff --git a/inc/modules/admin/what-unlock_sponsor.php b/inc/modules/admin/what-unlock_sponsor.php index 428c46824a..5e811f1e8c 100644 --- a/inc/modules/admin/what-unlock_sponsor.php +++ b/inc/modules/admin/what-unlock_sponsor.php @@ -57,7 +57,7 @@ if (isFormSent()) { // Load his personal data $result_main = sqlQueryEscaped("SELECT - `id`, `gender`, `surname`, `family`, `email`, `remote_addr`, + `id`, `sex`, `surname`, `family`, `email`, `remote_addr`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created`, `points_amount`, `points_used`, (`points_amount` + `points_used`) AS `points`, @@ -164,7 +164,7 @@ LIMIT 1", // Load referral's data $result = sqlQueryEscaped("SELECT `id`, - `gender`, + `sex`, `surname`, `family`, `email`, @@ -203,7 +203,7 @@ LIMIT 1", // Begin listing of all pending sponsor accounts $result = sqlQuery("SELECT - `id`, `gender`, `surname`, `family`, `email`, `remote_addr`, + `id`, `sex`, `surname`, `family`, `email`, `remote_addr`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created` FROM `{?_MYSQL_PREFIX?}_sponsor_data` diff --git a/inc/modules/guest/what-sponsor_login.php b/inc/modules/guest/what-sponsor_login.php index 4228bd3cf0..feb51ef794 100644 --- a/inc/modules/guest/what-sponsor_login.php +++ b/inc/modules/guest/what-sponsor_login.php @@ -59,7 +59,7 @@ if (isGetRequestElementSet('do')) { if (isGetRequestElementSet('hash')) { // Lookup sponsor $result = sqlQueryEscaped("SELECT - `id`, `status`, `gender`, `surname`, `family`, + `id`, `status`, `sex`, `surname`, `family`, `company`, `position`, `tax_ident`, `street_nr1`, `street_nr2`, `country`, `zip`, `city`, `email`, `phone`, `fax`, `cell`, `points_amount` AS `points`, `last_payment`, `last_currency` @@ -155,7 +155,7 @@ LIMIT 1", `hash`, `status`, `remote_addr`, - `gender`, + `sex`, `surname`, `family`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created` @@ -211,7 +211,7 @@ LIMIT 1", `id`, `hash`, `remote_addr`, - `gender`, + `sex`, `surname`, `family`, UNIX_TIMESTAMP(`sponsor_created`) AS `sponsor_created` diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index 3c3313ee7a..ba371e625b 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -51,9 +51,9 @@ if (isFormSent()) { // Check submitted form data // // 1. Salutation / Surname / family name - if (!isPostRequestElementSet('gender')) { + if (!isPostRequestElementSet('sex')) { // Surname is empty - array_push($formErrors, '{--SPONSOR_NO_GENDER_SELECTED--}'); + array_push($formErrors, '{--SPONSOR_NO_SEX_SELECTED--}'); } // END - if if (!isPostRequestElementSet('surname')) { @@ -254,7 +254,7 @@ ORDER BY $content['payment_list'] = loadTemplate('guest_sponsor_payment', TRUE, $OUT); // Init a lot array elements - foreach (array('company','position','tax_ident','gender_m','gender_f','gender_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) { + foreach (array('company','position','tax_ident','sex_m','sex_f','sex_c','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url','receive_warnings_y','receive_warnings_n','form_errors','refid') as $entry) { $content[$entry] = ''; } // END - foreach diff --git a/inc/modules/guest/what-stats.php b/inc/modules/guest/what-stats.php index 33a31d53ff..87faedd8a9 100644 --- a/inc/modules/guest/what-stats.php +++ b/inc/modules/guest/what-stats.php @@ -79,8 +79,8 @@ $ltitle = '{--GUEST_STATS_' . $lmode . '--}'; switch (strtoupper($do)) { case 'MEMBERS': // Statistics about your members // Only males / females - $male = countSumTotalData('M', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'")); - $female = countSumTotalData('F', 'user_data', 'userid', 'gender', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'")); + $male = countSumTotalData('M', 'user_data', 'userid', 'sex', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'")); + $female = countSumTotalData('F', 'user_data', 'userid', 'sex', TRUE, runFilterChain('user_exclusion_sql', " AND `status`='CONFIRMED'")); // List every month $months = []; diff --git a/inc/modules/member/what-mydata.php b/inc/modules/member/what-mydata.php index 1cacc010b5..0e88c99e52 100644 --- a/inc/modules/member/what-mydata.php +++ b/inc/modules/member/what-mydata.php @@ -108,7 +108,7 @@ switch ($mode) { `birth_day`, `birth_month`, `birth_year`, - `gender`, + `sex`, `max_mails`, `receive_mails`, `last_update` @@ -131,7 +131,7 @@ LIMIT 1', `birth_day`, `birth_month`, `birth_year`, - `gender`, + `sex`, `max_mails`, `receive_mails`, `last_update` @@ -274,7 +274,7 @@ LIMIT 1', sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', + `sex`='%s', `surname`='%s', `family`='%s', `street_nr`='%s', @@ -293,7 +293,7 @@ WHERE `userid`=%s LIMIT 1", array( - postRequestElement('gender'), + postRequestElement('sex'), postRequestElement('surname'), postRequestElement('family'), postRequestElement('street_nr'), @@ -312,7 +312,7 @@ LIMIT 1", sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET - `gender`='%s', + `sex`='%s', `surname`='%s', `family`='%s', `street_nr`='%s', @@ -331,7 +331,7 @@ WHERE `userid`=%s LIMIT 1", array( - postRequestElement('gender'), + postRequestElement('sex'), postRequestElement('surname'), postRequestElement('family'), postRequestElement('street_nr'), diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index d640317465..a83d17fea2 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -94,7 +94,7 @@ switch ($mode) { $valid_recipient = isValidId(postRequestElement('to_userid')); // Re-check receivers and own personal data - $result = sqlQueryEscaped("SELECT `userid`, `gender`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2", + $result = sqlQueryEscaped("SELECT `userid`, `sex`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid` IN ('%s','%s') AND `status`='CONFIRMED'" . runFilterChain('user_exclusion_sql', ' ') . " LIMIT 2", array( getMemberId(), bigintval(postRequestElement('to_userid')) diff --git a/inc/modules/sponsor/account.php b/inc/modules/sponsor/account.php index d7c7d8f8b6..f541d3b068 100644 --- a/inc/modules/sponsor/account.php +++ b/inc/modules/sponsor/account.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { // Data for the formular $result = sqlQueryEscaped("SELECT `id`, `company`, `position`, `tax_ident`, - `gender`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, + `sex`, `surname`, `family`, `street_nr1`, `street_nr2`, `zip`, `city`, `country`, `phone`, `fax`, `cell`, `email`, `url`, `status`, `receive_warnings` FROM diff --git a/inc/modules/sponsor/settings.php b/inc/modules/sponsor/settings.php index 69935673a6..eb893f5a6b 100644 --- a/inc/modules/sponsor/settings.php +++ b/inc/modules/sponsor/settings.php @@ -53,7 +53,7 @@ $result = sqlQueryEscaped("SELECT `email`, `surname`, `family`, - `gender` + `sex` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE @@ -81,7 +81,7 @@ if (sqlNumRows($result) == 1) { } else { // Unsecure data which we don't want here $UNSAFE = array( - 'company', 'position', 'tax_ident', 'gender', 'surname', 'family', + 'company', 'position', 'tax_ident', 'sex', 'surname', 'family', 'street_nr1', 'street_nr2', 'zip', 'city', 'country', 'phone', 'fax', 'cell', 'email', 'url' ); diff --git a/inc/modules/sponsor/welcome.php b/inc/modules/sponsor/welcome.php index 96799a7f20..f199c7ab39 100644 --- a/inc/modules/sponsor/welcome.php +++ b/inc/modules/sponsor/welcome.php @@ -45,7 +45,7 @@ if (!defined('__SECURITY')) { // Load some data $result = sqlQueryEscaped('SELECT `id`, - `gender`, + `sex`, `surname`, `family`, (`points_amount` - `points_used`) AS `points` diff --git a/inc/template-functions.php b/inc/template-functions.php index c0bb014ea8..3f9be64120 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -2034,24 +2034,24 @@ function returnErrorMessage ($message) { return loadTemplate('admin_settings_unsaved', TRUE, $message); } -// Generates a selection box for (maybe) given gender -function generateGenderSelectionBox ($selectedGender = '', $fieldName = 'gender') { +// Generates a selection box for (maybe) given sex +function generateSexSelectionBox ($selectedSex = '', $fieldName = 'sex') { // Start the HTML code $out = ' - {%pipe,translateGender=$content[gender]%} $content[surname] $content[family] + {%pipe,translateSex=$content[sex]%} $content[surname] $content[family] $content[remote_addr] diff --git a/templates/de/html/admin/admin_user_details.tpl b/templates/de/html/admin/admin_user_details.tpl index 5bbbb29eb8..3f59a60f9d 100644 --- a/templates/de/html/admin/admin_user_details.tpl +++ b/templates/de/html/admin/admin_user_details.tpl @@ -7,8 +7,8 @@ - {--GENDER--}:
    - {%user,gender,translateGender=$content[userid]%} + {--SEX--}:
    + {%user,sex,translateSex=$content[userid]%} {--SURNAME--}:
    diff --git a/templates/de/html/birthday/birthday_msg.tpl b/templates/de/html/birthday/birthday_msg.tpl index 2f606ca6eb..1786db1e58 100644 --- a/templates/de/html/birthday/birthday_msg.tpl +++ b/templates/de/html/birthday/birthday_msg.tpl @@ -3,7 +3,7 @@
    - Hallo {%pipe,translateGender=$content[gender]%} $content[surname] $content[family]! + Hallo {%pipe,translateSex=$content[sex]%} $content[surname] $content[family]!
    diff --git a/templates/de/html/ext/ext_rallye.tpl b/templates/de/html/ext/ext_rallye.tpl index f98dfafa05..c66a44c37f 100644 --- a/templates/de/html/ext/ext_rallye.tpl +++ b/templates/de/html/ext/ext_rallye.tpl @@ -1,6 +1,6 @@ Starten Sie mit dieser Erweiterung vollautomatisierte Rallyes! Nun können Sie auch eine mindestens zu erreichende Mitgliederanzahl und -Minimum zu belegender Plätze angeben. Nur noch Einrichten und +Minimum zu belesex Plätze angeben. Nur noch Einrichten und Freigeben müssen Sie die Rallye. Den Rest erledigt das Script für Sie. Vorsicht! diff --git a/templates/de/html/guest/guest_register.tpl b/templates/de/html/guest/guest_register.tpl index 1deb8760a4..ae1eaa5f0b 100644 --- a/templates/de/html/guest/guest_register.tpl +++ b/templates/de/html/guest/guest_register.tpl @@ -19,10 +19,10 @@ diff --git a/templates/de/html/guest/guest_sponsor_reg.tpl b/templates/de/html/guest/guest_sponsor_reg.tpl index 075005eb24..58b0d02b14 100644 --- a/templates/de/html/guest/guest_sponsor_reg.tpl +++ b/templates/de/html/guest/guest_sponsor_reg.tpl @@ -56,10 +56,10 @@ diff --git a/templates/de/html/guest/guest_wernis_registration_form.tpl b/templates/de/html/guest/guest_wernis_registration_form.tpl index 2494f4e1ec..7c5a5037ee 100644 --- a/templates/de/html/guest/guest_wernis_registration_form.tpl +++ b/templates/de/html/guest/guest_wernis_registration_form.tpl @@ -19,10 +19,10 @@
    - {--GENDER--}$content[must_fillout_gender]: + {--SEX--}$content[must_fillout_sex]: - {%pipe,generateGenderSelectionBox=$content[gender]%} + {%pipe,generateSexSelectionBox=$content[sex]%}
    - {--GENDER--}: + {--SEX--}: - {%pipe,generateGenderSelectionBox=$content[gender]%} + {%pipe,generateSexSelectionBox=$content[sex]%}
    diff --git a/templates/de/html/member/member_mydata_edit.tpl b/templates/de/html/member/member_mydata_edit.tpl index 5766e7f926..381b461374 100644 --- a/templates/de/html/member/member_mydata_edit.tpl +++ b/templates/de/html/member/member_mydata_edit.tpl @@ -8,9 +8,9 @@ - + diff --git a/templates/de/html/member/member_mydata_overview.tpl b/templates/de/html/member/member_mydata_overview.tpl index ff70d16689..86c3ecc381 100644 --- a/templates/de/html/member/member_mydata_overview.tpl +++ b/templates/de/html/member/member_mydata_overview.tpl @@ -10,8 +10,8 @@ - - + + diff --git a/templates/de/html/show_bonus_msg.tpl b/templates/de/html/show_bonus_msg.tpl index 4885608fbc..3eb68462b1 100644 --- a/templates/de/html/show_bonus_msg.tpl +++ b/templates/de/html/show_bonus_msg.tpl @@ -1,7 +1,7 @@
    - Hallo {%user,gender,translateGender=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}! + Hallo {%user,sex,translateSex=$content[userid]%} {%user,surname=$content[userid]%} {%user,family=$content[userid]%}!
    diff --git a/templates/de/html/sponsor/sponsor_account_form.tpl b/templates/de/html/sponsor/sponsor_account_form.tpl index f61b5544ae..66bb37d107 100644 --- a/templates/de/html/sponsor/sponsor_account_form.tpl +++ b/templates/de/html/sponsor/sponsor_account_form.tpl @@ -37,10 +37,10 @@
    diff --git a/templates/de/html/sponsor/sponsor_welcome.tpl b/templates/de/html/sponsor/sponsor_welcome.tpl index 365a5c00b1..c5b00f34b9 100644 --- a/templates/de/html/sponsor/sponsor_welcome.tpl +++ b/templates/de/html/sponsor/sponsor_welcome.tpl @@ -1,5 +1,5 @@
    - Hallo {%sponsor,gender,translateGender=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}! + Hallo {%sponsor,sex,translateSex=$content[id]%} {%sponsor,surname=$content[id]%} {%sponsor,family=$content[id]%}!
    diff --git a/templates/xml/admin_list_data_template.xml b/templates/xml/admin_list_data_template.xml index 5e5be8661d..57f7deca84 100644 --- a/templates/xml/admin_list_data_template.xml +++ b/templates/xml/admin_list_data_template.xml @@ -99,7 +99,7 @@ MA 02110-1301 USA always be set), alias (again can be left empty) and SQL function (can also be left empty) which shall be applied on the column. //--> - + @@ -143,13 +143,13 @@ MA 02110-1301 USA - +
    - {--GENDER--}$content[must_fillout_gender]: + {--SEX--}$content[must_fillout_sex]: - {%pipe,generateGenderSelectionBox=$content[gender]%} + {%pipe,generateSexSelectionBox=$content[sex]%}
    {--GENDER--}:{--SEX--}: - {%pipe,generateGenderSelectionBox=$content[gender]%} + {%pipe,generateSexSelectionBox=$content[sex]%}
    {%pipe,getMemberId%}
    {--GENDER--}:{%user,gender,translateGender%}{--SEX--}:{%user,sex,translateSex%}
    {--SURNAME--}:
    - {--GENDER--}: + {--SEX--}: - {%pipe,generateGenderSelectionBox=$content[gender]%} + {%pipe,generateSexSelectionBox=$content[sex]%}