From: Roland Häder Date: Mon, 9 Sep 2024 04:39:17 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=refs%2Fheads%2F0.2.1-FINAL;hp=0add0a5cce78a505a9b59da20f73509a4644f49d;p=mailer.git Continued: - removed discouraged ?> at the end of pure PHP scripts Signed-off-by: Roland Häder --- diff --git a/.gitattributes b/.gitattributes index c322e6e905..983348db6d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,9 @@ # Autodetect text files * text=auto +# Force the following filetypes to have unix eols, so Windows does not break them +*.* text eol=lf + # Force images/fonts to be handled as binaries *.jpg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text @@ -28,6 +31,3 @@ *.otf filter=lfs diff=lfs merge=lfs -text *.z filter=lfs diff=lfs merge=lfs -text *.docx filter=lfs diff=lfs merge=lfs -text - -# Force the following filetypes to have unix eols, so Windows does not break them -*.* text eol=lf 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 nickname-Erweiterung meines Scriptes eingerichtet haben! Anderfalls kommt es zu Fehlermeldungen und die User-Daten konnten nicht importiert werden.\n"; -// -?> +// [EOF] diff --git a/cron.php b/cron.php index b6863e5d69..2e4ac39d3f 100644 --- a/cron.php +++ b/cron.php @@ -34,7 +34,7 @@ //* DEBUG: */ xdebug_start_trace(); // Load security system -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -49,7 +49,7 @@ $GLOBALS['__header_sent'] = 2; $GLOBALS['__footer_sent'] = 2; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Load header here loadPageHeader(); @@ -60,4 +60,3 @@ loadPageHeader(); loadPageFooter(); // [EOF] -?> diff --git a/css.php b/css.php index 5178b29a0f..3d144ad297 100644 --- a/css.php +++ b/css.php @@ -31,7 +31,7 @@ ************************************************************************/ // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Footer is disabled in CSS mode $GLOBALS['__footer_sent'] = -1; @@ -44,7 +44,7 @@ $GLOBALS['__module'] = 'css'; $GLOBALS['__output_mode'] = 1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set header setContentType('text/css'); @@ -59,4 +59,3 @@ loadStyleSheets(); loadPageFooter(); // [EOF] -?> diff --git a/debug.php b/debug.php index 50c800f0da..d2ea43f655 100644 --- a/debug.php +++ b/debug.php @@ -31,7 +31,7 @@ ************************************************************************/ // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -41,7 +41,7 @@ $GLOBALS['__module'] = 'debug'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Redirect only to registration page when this script is installed if ((isExtensionActive('debug')) && (!ifFatalErrorsDetected())) { @@ -80,4 +80,3 @@ if ((isExtensionActive('debug')) && (!ifFatalErrorsDetected())) { doShutdown(); // [EOF] -?> diff --git a/doubler.php b/doubler.php index c1b3b91a6e..145f3ad86e 100644 --- a/doubler.php +++ b/doubler.php @@ -31,7 +31,7 @@ ************************************************************************/ // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -41,7 +41,7 @@ $GLOBALS['__module'] = 'doubler'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -50,9 +50,9 @@ setContentType('text/html'); redirectOnUninstalledExtension('doubler'); // Init content array -$content = array( +$content = [ 'message' => '', -); +]; // Begin with doubler script... if (isFormSent()) { @@ -204,4 +204,3 @@ loadTemplate('doubler_index', FALSE, $content); loadPageFooter(); // [EOF] -?> diff --git a/img.php b/img.php index 27722067f1..a883396929 100644 --- a/img.php +++ b/img.php @@ -31,7 +31,7 @@ ************************************************************************/ // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -41,7 +41,7 @@ $GLOBALS['__module'] = 'img'; $GLOBALS['__output_mode'] = -3; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Load header loadPageHeader(); @@ -65,4 +65,3 @@ if (isGetRequestElementSet('code')) { loadPageFooter(); // [EOF] -?> diff --git a/img/politician-stop/politiker-stopp-print-kopf.png b/img/politician-stop/politiker-stopp-print-kopf.png deleted file mode 100644 index aefc5ff641..0000000000 Binary files a/img/politician-stop/politiker-stopp-print-kopf.png and /dev/null differ diff --git a/img/politician-stop/politiker-stopp_150x24.png b/img/politician-stop/politiker-stopp_150x24.png deleted file mode 100644 index 35c1ddcf94..0000000000 Binary files a/img/politician-stop/politiker-stopp_150x24.png and /dev/null differ diff --git a/inc/ajax/ajax_ b/inc/ajax/ajax_ index cc7114c25e..0bc357cc8c 100644 --- a/inc/ajax/ajax_ +++ b/inc/ajax/ajax_ @@ -39,4 +39,3 @@ if (!defined('__SECURITY')) { } // END - if // [EOF] -?> diff --git a/inc/autopurge/purge- b/inc/autopurge/purge- index f551ef47b7..7d6dceec92 100644 --- a/inc/autopurge/purge- +++ b/inc/autopurge/purge- @@ -1,3 +1,2 @@ diff --git a/inc/classes/cachesystem.class.php b/inc/classes/cachesystem.class.php index deeba2fc8e..d931838d66 100644 --- a/inc/classes/cachesystem.class.php +++ b/inc/classes/cachesystem.class.php @@ -579,4 +579,3 @@ class CacheSystem { } // END - class // [EOF] -?> diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php index 5133d37a6d..56131219d6 100644 --- a/inc/classes/rdf.class.php +++ b/inc/classes/rdf.class.php @@ -1437,4 +1437,3 @@ class fase4_rdf { } // END class // [EOF] -?> diff --git a/inc/classes/resolver.class.php b/inc/classes/resolver.class.php index 59833f025e..81ef03cc69 100644 --- a/inc/classes/resolver.class.php +++ b/inc/classes/resolver.class.php @@ -139,4 +139,3 @@ class HostnameResolver { } // [EOF] -?> diff --git a/inc/code-functions.php b/inc/code-functions.php index 81a3e85331..bd7bcb2a89 100644 --- a/inc/code-functions.php +++ b/inc/code-functions.php @@ -72,4 +72,3 @@ function getHexErrorCode ($errorCode) { } // [EOF] -?> diff --git a/inc/config-functions.php b/inc/config-functions.php index fd11c3e024..467ab1f2b1 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -458,4 +458,3 @@ function getConfigEntries ($configEntries, $value) { } // [EOF] -?> diff --git a/inc/config-global.php b/inc/config-global.php index 94cb2c867a..e11979e52b 100644 --- a/inc/config-global.php +++ b/inc/config-global.php @@ -86,4 +86,3 @@ setConfigEntry('minium_admin_pass_length', 4); unset($URL); // [EOF] -?> diff --git a/inc/daily/daily_ b/inc/daily/daily_ index f853df3719..875cfb4a30 100644 --- a/inc/daily/daily_ +++ b/inc/daily/daily_ @@ -48,4 +48,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Daily reset ended.'); // [EOF] -?> diff --git a/inc/database-functions.php b/inc/database-functions.php index a9f000fd5a..a2bb4ece45 100644 --- a/inc/database-functions.php +++ b/inc/database-functions.php @@ -2554,4 +2554,3 @@ ORDER BY } // [EOF] -?> diff --git a/inc/debug/request_ b/inc/debug/request_ index a980dc5a25..80a2b380a9 100644 --- a/inc/debug/request_ +++ b/inc/debug/request_ @@ -40,5 +40,4 @@ if (!defined('__SECURITY')) { die(); } // END - if -// -?> +// [EOF] diff --git a/inc/email-functions.php b/inc/email-functions.php index 87eab21d5c..197f016de7 100644 --- a/inc/email-functions.php +++ b/inc/email-functions.php @@ -271,4 +271,3 @@ function doTemplateAddExtraHtmlMailHeaders ($templateName, $clear, $extraHeaders } // [EOF] -?> diff --git a/inc/error-functions.php b/inc/error-functions.php index 9c36418b71..1d32d27a0a 100644 --- a/inc/error-functions.php +++ b/inc/error-functions.php @@ -67,4 +67,3 @@ function enableExitOnError ($enable = TRUE) { } // [EOF] -?> diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 65a8acdbd6..6b7711efff 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -526,7 +526,7 @@ function doExpressionJquery ($data) { } // END - if // Is there a value? - if ($data['callback'] == 'js') { + if (!empty($data['value'])) { // Then load special library $scriptName .= '-' . $data['value']; } // END - if diff --git a/inc/extensions-functions.php b/inc/extensions-functions.php index fb579c1ec1..acb65c929a 100644 --- a/inc/extensions-functions.php +++ b/inc/extensions-functions.php @@ -2394,4 +2394,3 @@ function getExtensionSelectedFromSession ($ext_name, $sessionName, $separator = } // [EOF] -?> diff --git a/inc/extensions/bonus/mode-update.php b/inc/extensions/bonus/mode-update.php index 2b5e6f6654..b0c476e232 100644 --- a/inc/extensions/bonus/mode-update.php +++ b/inc/extensions/bonus/mode-update.php @@ -586,6 +586,3 @@ ORDER BY setExtensionUpdateNotes("Filter zum Ausschließen des konfigurierten Mitgliedaccounts."); break; } // END - switch - -// [EOF] -?> diff --git a/inc/extensions/ext- b/inc/extensions/ext- index 518df8756d..2658d86ecd 100644 --- a/inc/extensions/ext- +++ b/inc/extensions/ext- @@ -97,4 +97,3 @@ switch (getExtensionMode()) { } // END - switch // [EOF] -?> diff --git a/inc/extensions/ext-politician-stop.php b/inc/extensions/ext-politician-stop.php index 110de16c51..7d6dceec92 100644 --- a/inc/extensions/ext-politician-stop.php +++ b/inc/extensions/ext-politician-stop.php @@ -1,96 +1,2 @@ Bitte unbedingt die Erweiterung neuinstallieren, damit das Snippet an die richtige Stelle geladen wird.'); - break; - } // END - switch - break; - - case 'modify': // When the extension got modified - break; - - case 'test': // For testing purposes - break; - - case 'init': // Do stuff when extension is initialized - break; - - default: // Unknown extension mode - reportBug(__FILE__, __LINE__, sprintf('Unknown extension mode %s in extension %s detected.', getExtensionMode(), getCurrentExtensionName())); - break; -} // END - switch - -// [EOF] -?> +// @DEPRECATED diff --git a/inc/extensions/ext-register.php b/inc/extensions/ext-register.php index cda5aca543..e01541a422 100644 --- a/inc/extensions/ext-register.php +++ b/inc/extensions/ext-register.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.6.0'); +setThisExtensionVersion('0.6.1'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0')); +setExtensionVersionHistory(array('0.0.0', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1')); switch (getExtensionMode()) { case 'setup': // Do stuff when installation is running diff --git a/inc/extensions/ext-support.php b/inc/extensions/ext-support.php index beb6a219cb..2c1a8b815e 100644 --- a/inc/extensions/ext-support.php +++ b/inc/extensions/ext-support.php @@ -109,7 +109,7 @@ switch (getExtensionMode()) { setExtensionUpdateNotes("Dateiamenskonflikt zwischen den Erweiterungen support und order behoben."); break; - case '0.1.0': // SQL queries for v0.2.1 + case '0.1.0': // SQL queries for v0.1.0 // Update notes (these will be set as task text!) setExtensionUpdateNotes("Sicherheitsupdate vom 27.08.2005."); break; diff --git a/inc/extensions/ext-user.php b/inc/extensions/ext-user.php index 1d74c88cf3..da137506f0 100644 --- a/inc/extensions/ext-user.php +++ b/inc/extensions/ext-user.php @@ -41,10 +41,10 @@ if (!defined('__SECURITY')) { } // END - if // Version number -setThisExtensionVersion('0.6.3'); +setThisExtensionVersion('0.6.4'); // Version history array (add more with , '0.0.1' and so on) -setExtensionVersionHistory(array('0.0.0', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3')); +setExtensionVersionHistory(array('0.0.0', '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', '0.4.7', '0.4.8', '0.4.9', '0.5.0', '0.5.1', '0.5.2', '0.5.3', '0.5.4', '0.5.5', '0.5.6', '0.5.7', '0.5.8', '0.5.9', '0.6.0', '0.6.1', '0.6.2', '0.6.3', '0.6.4')); // Keep this extension always active! setExtensionAlwaysActive('Y'); diff --git a/inc/extensions/register/mode-update.php b/inc/extensions/register/mode-update.php index be600f8ee4..9146ade029 100644 --- a/inc/extensions/register/mode-update.php +++ b/inc/extensions/register/mode-update.php @@ -368,7 +368,16 @@ PRIMARY KEY (`provider_id`)", // Update notes (these will be set as task text!) setExtensionUpdateNotes("Filter für das Handling der Anmeldeanfragen hinzugeügt."); break; - } // END - switch -// [EOF] -?> + case '0.6.1': // SQL queries for v0.6.1 + // Register a filter + registerFilter(__FILE__, __LINE__, 'register_must_fillout', 'REGISTER_MUST_FILLOUT', FALSE, TRUE, isExtensionDryRun()); + + // Run these SQLs + addExtensionSql("DELETE FROM `{?_MYSQL_PREFIX?}_must_register` WHERE `field_name` = 'gender'"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_must_register` (`field_name`, `field_required`) VALUES ('sex','Y')"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("gender gegen sex ausgetauscht."); + break; + } // END - switch diff --git a/inc/extensions/sponsor/mode-setup.php b/inc/extensions/sponsor/mode-setup.php index f2fe64195c..f0ff641c1d 100644 --- a/inc/extensions/sponsor/mode-setup.php +++ b/inc/extensions/sponsor/mode-setup.php @@ -48,7 +48,7 @@ if (!defined('__SECURITY')) { `company` VARCHAR(255) NOT NULL DEFAULT '', `position` VARCHAR(255) NOT NULL DEFAULT '', `tax_ident` VARCHAR(255) NOT NULL DEFAULT '', -`gender` ENUM('M','F','C') NOT NULL DEFAULT 'M', +`sex` 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 '', @@ -253,7 +253,7 @@ INDEX (`sponsor_id`)", addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('company','Y')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('position','N')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('tax_ident','N')"); - addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('gender','N')"); + addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('sex','N')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('surname','N')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('family','N')"); addExtensionSql("INSERT INTO `{?_MYSQL_PREFIX?}_sponsor_admin_data` (`data_row`, `display`) VALUES ('street_nr1','Y')"); diff --git a/inc/extensions/user/mode-setup.php b/inc/extensions/user/mode-setup.php index d00733f5c6..c3f7a3d0be 100644 --- a/inc/extensions/user/mode-setup.php +++ b/inc/extensions/user/mode-setup.php @@ -70,7 +70,7 @@ addCreateTableSql('user_data', " `last_module` VARCHAR(255) NULL DEFAULT NULL, `ref_clicks` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `total_logins` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, -`gender` ENUM('M','F') NOT NULL DEFAULT 'M', +`sex` ENUM('M','F') NOT NULL DEFAULT 'M', `used_points` FLOAT(20,5) UNSIGNED NOT NULL DEFAULT 0.00000, `emails_sent` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0, `joined` VARCHAR(10) NOT NULL DEFAULT 0, diff --git a/inc/extensions/user/mode-update.php b/inc/extensions/user/mode-update.php index 3b10d9d3bc..c6ec30534e 100644 --- a/inc/extensions/user/mode-update.php +++ b/inc/extensions/user/mode-update.php @@ -106,13 +106,6 @@ if (!defined('__SECURITY')) { setExtensionUpdateNotes("User-Liste ist konfigurierbar: Anzahl Mitglieder pro Seite und Anzahl Buchstaben pro Zeile; Template-Fehler beseitigt."); break; - case '0.2.2': // SQL queries for v0.2.2 - addExtensionChangeTableColumnSql('user_data', 'gender', 'gender', "ENUM('M','F','C') NOT NULL DEFAULT 'M'"); - - // Update notes (these will be set as task text!) - setExtensionUpdateNotes("Anrede "Firma" hinzugefügt."); - break; - case '0.2.3': // SQL queries for v0.2.3 // Update notes (these will be set as task text!) setExtensionUpdateNotes("Datumsformat festgelegt auf ausführlich."); @@ -357,7 +350,7 @@ INDEX (`refid`)", case '0.5.0': // SQL queries for v0.5.0 // Prefix for all test accounts addConfigAddSql('tester_user_maximum', 'INT(5) UNSIGNED ZEROFILL NOT NULL DEFAULT 00999'); - addConfigAddSql('tester_user_gender', "ENUM('M','F') NOT NULL DEFAULT 'M'"); + addConfigAddSql('tester_user_sex', "ENUM('M','F') NOT NULL DEFAULT 'M'"); addConfigAddSql('tester_user_surname_prefix', "VARCHAR(255) NOT NULL DEFAULT 'tester_'"); addConfigAddSql('tester_user_family', "VARCHAR(255) NOT NULL DEFAULT 'Testbenutzer'"); addConfigAddSql('tester_user_street_nr', "VARCHAR(255) NOT NULL DEFAULT 'Teststraße 123'"); @@ -559,6 +552,13 @@ PRIMARY KEY (`provider_id`)", // Update notes (these will be set as task text!) setExtensionUpdateNotes("Spalten für Bestätigungszeitpunkt und IP-Adresse hinzugefügt."); break; + + case '0.6.4': // SQL queries for v0.6.4 + addExtensionChangeTableColumnSql('user_data', 'gender', 'sex', "ENUM('M','F','C') NOT NULL DEFAULT 'M'"); + + // Update notes (these will be set as task text!) + setExtensionUpdateNotes("Spalte gender nach sex umbenannt."); + break; } // END - switch // [EOF] diff --git a/inc/filter/politician-stop_filter.php b/inc/filter/politician-stop_filter.php index 3aeb62f2d0..7d6dceec92 100644 --- a/inc/filter/politician-stop_filter.php +++ b/inc/filter/politician-stop_filter.php @@ -1,61 +1,2 @@ +// @DEPRECATED diff --git a/inc/filters.php b/inc/filters.php index 12e10ec5c1..7c418903a3 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -1428,4 +1428,3 @@ function FILTER_EXCLUDE_DEFAULT_REFID ($filterData = []) { } // [EOF] -?> diff --git a/inc/fixes/fix_ b/inc/fixes/fix_ index 9f2df726c7..5520be2965 100644 --- a/inc/fixes/fix_ +++ b/inc/fixes/fix_ @@ -36,4 +36,3 @@ if (!defined('__SECURITY')) { } // END - if // [EOF] -?> diff --git a/inc/fixes/fix_filters.php b/inc/fixes/fix_filters.php index 040333fda9..b704fa71f9 100644 --- a/inc/fixes/fix_filters.php +++ b/inc/fixes/fix_filters.php @@ -72,4 +72,3 @@ addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` DROP KEY `name_function addExtensionSql('ALTER TABLE `{?_MYSQL_PREFIX?}_filters` ADD UNIQUE INDEX `name_function` (`filter_name`, `filter_function`)'); // [EOF] -?> diff --git a/inc/fixes/fix_menu.php b/inc/fixes/fix_menu.php index 1f968b60ad..006f856b2c 100644 --- a/inc/fixes/fix_menu.php +++ b/inc/fixes/fix_menu.php @@ -105,4 +105,3 @@ foreach (array('guest','member','admin') as $menu) { } // END - foreach // [EOF] -?> diff --git a/inc/fixes/fix_refsystem.php b/inc/fixes/fix_refsystem.php index 566f03f92a..b2a76b7c49 100644 --- a/inc/fixes/fix_refsystem.php +++ b/inc/fixes/fix_refsystem.php @@ -83,4 +83,3 @@ if (!ifSqlHasZeroNumRows($result_direct)) { sqlFreeResult($result_direct); // [EOF] -?> diff --git a/inc/fixes/fix_user_points.php b/inc/fixes/fix_user_points.php index a070afaeab..77819f82d4 100644 --- a/inc/fixes/fix_user_points.php +++ b/inc/fixes/fix_user_points.php @@ -88,4 +88,3 @@ sqlFreeResult($result); sqlQuery('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `ref_depth`=0', __FILE__, __LINE__); // [EOF] -?> diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php index acfbd8084b..846faa1e67 100644 --- a/inc/gen_sql_patches.php +++ b/inc/gen_sql_patches.php @@ -100,4 +100,3 @@ if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance()) } // END - if // [EOF] -?> diff --git a/inc/general-functions.php b/inc/general-functions.php index 3520086ad3..8ede164135 100644 --- a/inc/general-functions.php +++ b/inc/general-functions.php @@ -372,27 +372,27 @@ function translateComma ($dotted, $cut = TRUE, $max = '0') { return $translated; } -// Translate Uni*-like gender to human-readable -function translateGender ($gender) { +// Translate Uni*-like sex to human-readable +function translateSex ($sex) { // Default - $ret = '!' . $gender . '!'; + $ret = '!' . $sex . '!'; // Male/female or company? - switch ($gender) { + switch ($sex) { case 'M': // Male case 'F': // Female case 'C': // Company // Use generic function - $ret = translateGeneric('GENDER', $gender); + $ret = translateGeneric('SEX', $sex); break; default: - // Please report bugs on unknown genders - reportBug(__FUNCTION__, __LINE__, sprintf('Unknown gender %s detected.', $gender)); + // Please report bugs on unknown sexs + reportBug(__FUNCTION__, __LINE__, sprintf('Unknown sex %s detected.', $sex)); break; } // END - switch - // Return translated gender + // Return translated sex return $ret; } diff --git a/inc/hourly/hourly_ b/inc/hourly/hourly_ index 262d6a3b21..8ee442e872 100644 --- a/inc/hourly/hourly_ +++ b/inc/hourly/hourly_ @@ -55,4 +55,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'hourly reset ended.'); // [EOF] -?> diff --git a/inc/img/img- b/inc/img/img- index f551ef47b7..7d6dceec92 100644 --- a/inc/img/img- +++ b/inc/img/img- @@ -1,3 +1,2 @@ diff --git a/inc/img/img_ b/inc/img/img_ index c3ff4a7bd0..4e1296370a 100644 --- a/inc/img/img_ +++ b/inc/img/img_ @@ -43,4 +43,3 @@ if (!defined('__SECURITY')) { } // [EOF] -?> diff --git a/inc/inc-functions.php b/inc/inc-functions.php index bd6403d7f7..d6e5ada32a 100644 --- a/inc/inc-functions.php +++ b/inc/inc-functions.php @@ -165,4 +165,3 @@ function isIncludeReadable ($inc) { } // [EOF] -?> diff --git a/inc/install/install-inc_ b/inc/install/install-inc_ index f551ef47b7..7d6dceec92 100644 --- a/inc/install/install-inc_ +++ b/inc/install/install-inc_ @@ -1,3 +1,2 @@ diff --git a/inc/install/install_page_ b/inc/install/install_page_ index dc402162ae..a9f76a0240 100644 --- a/inc/install/install_page_ +++ b/inc/install/install_page_ @@ -41,4 +41,3 @@ if ((!defined('__SECURITY')) || (!isInstaller())) { } // END - if // [EOF] -?> diff --git a/inc/jobs/job_ b/inc/jobs/job_ index 81022ea9f8..676967de76 100644 --- a/inc/jobs/job_ +++ b/inc/jobs/job_ @@ -53,4 +53,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Cron job ended.'); // [EOF] -?> diff --git a/inc/js/js- b/inc/js/js- index 68b7a3a110..eb3f3f28a4 100644 --- a/inc/js/js- +++ b/inc/js/js- @@ -43,4 +43,3 @@ if (!defined('__SECURITY')) { } // [EOF] -?> diff --git a/inc/language-functions.php b/inc/language-functions.php index 2878de0514..b19311c350 100644 --- a/inc/language-functions.php +++ b/inc/language-functions.php @@ -358,4 +358,3 @@ function isMessageMasked ($messageId, $strict = TRUE) { } // [EOF] -?> diff --git a/inc/language/de.php b/inc/language/de.php index 4a0ad9c8ce..2121aa1d83 100644 --- a/inc/language/de.php +++ b/inc/language/de.php @@ -460,7 +460,7 @@ addMessages(array( 'ADMIN_WELCOME_BACK' => "Bitte beachten Sie beim nächsten Mal auf unsere AGBs, damit Ihnen diese Unangenehmlichkeiten erspart bleiben.", 'ADMIN_DELETE_ACCOUNT' => "Löschung Ihres Accounts.", 'ADMIN_DELETED_YOUR_ACCOUNT' => "Einer unserer Administratoren hat soeben Ihren Account gelöscht.", - 'REASON_DELETE' => "Grund der Löschung war folgender", + 'REASON_DELETE' => "Grund der Löschung war folsex", 'ADMIN_BYE_BYE' => "Wir wünschen Ihnen weiterhin noch alles Gute und können Sie vielleicht irgentwann einmal wieder begruessen.", 'ADMIN_ALL_CONFIRMED_EMAIL' => "Alle Ihre Mitglieder haben ihre Email-Adresse bestätigt! Keine Neuanmeldungen vorhanden.", 'MEMBER_ORDER_ACCEPTED' => "Ihre Mailbuchung wurde freigeschaltet", @@ -908,7 +908,7 @@ addMessages(array( '_UNUSED' => "Ungenutzt", 'ADMIN_DELETED_MAILS_COUNT' => "Es wurden %s Einträge gelöscht.", 'EMAIL_DELETE_COUNT' => "Buchungseinträge gelöscht", - 'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion %s, Zeile %s mit folgender Meldung abgebrochen: %s", + 'MAILER_HAS_DIED' => "{?TITLE?} ist in Script/Funktion %s, Zeile %s mit folsex Meldung abgebrochen: %s", 'ADMIN_MAIL_NOTHING_DELETED' => "Die Mail mit der Id %s weisst keine Mitglieder auf.", 'ENTRY_ADDED' => "Eintrag hinzugefügt", 'UNLIMITED' => "Unbegrenzt", @@ -1102,12 +1102,12 @@ addMessages(array( 'TIME_UNIT_MINUTE' => "Minute(n)", 'TIME_UNIT_SECOND' => "Sekunde(n)", - // Genders - 'GENDER' => "Anrede", - 'GENDER_UNKNOWN' => "Unbekannte Anrede %s erkannt.", - 'GENDER_M' => "Herr", - 'GENDER_F' => "Frau", - 'GENDER_C' => ""Firma"", + // Sexes + 'SEX' => "Anrede", + 'SEX_UNKNOWN' => "Unbekannte Anrede %s erkannt.", + 'SEX_M' => "Herr", + 'SEX_F' => "Frau", + 'SEX_C' => ""Firma"", // Login error messages 'LOGIN_UNKNOWN_CODE' => "Unbekannter Rückgabewert.", @@ -1295,7 +1295,7 @@ addMessages(array( 'ADMIN_ADD_POINTS_DATA_NOTICE' => "Achten Sie bei der Verwendung dieses Formulars darauf, dass der Verwendungszweck nicht mehrfach aufgeführt ist, sollte die eingegebene Tabellenspalte nicht existieren, wird sie automatisch angelegt. Sollte das Guthabenkonto wieder gelöscht werden, werden die dort angesammelten {?POINTS?} auf das eingestellbare Guthabenkonto (aktuell: {OPEN_TEMPLATE}config,translatePointsAccountType=points_remove_account{CLOSE_TEMPLATE} umgebucht. Es können mit diesem Formular nur benutzerdefinierte Guthabenkonten angelegt oder gelöscht werden, die Konten durch Erweiterungen angelegt sind dieses nicht.", 'ADMIN_ADD_POINTS_DATA_SUBJECT_NOTICE' => "Der Verwendungszweck ist stets klein zu schreiben und sollte auch im Programmcode verwendet werden und muss mit dem ersten Parameter von den Funktionen addPointsThroughReferralSystem(), subtractPoints() und somit auch addBookingRecord() übereinstimmen.", 'ADMIN_ADD_POINTS_DATA_COLUMN_NAME_NOTICE' => "Die Tabellenspalte ist stets klein zu schreiben, ist diese in der Tabelle {?_MYSQL_PREFIX?}_user_points nicht vorhanden, wird diese plus der selbe Spaltenname mit dem Präfix locked_ automatisch dort erzeugt. Der Spaltenname sollte das Stichwort points enthalten und darf NIEMALS id, userid oder ref_depth heissen oder locked enthalten oder mit _ref enden.", - 'ADMIN_ADD_POINTS_DATA_LOCKED_MODE_NOTICE' => "Bei der {?POINTS?}-Sperre werden dem Mitglied die {?POINTS?} auf sein so genanntes "gesperrtes Guthaben" gutgeschrieben. Auf dieses hat das Mitglied solange keinen Zugriff, bis es die Mindestanzahl zu bestätigender Mails erreicht hat. Die Einstellung {--POINTS_LOCKED_MODE_LOCKED--} bewirkt, dass das Mitglied ebenfalls auf dieses Guthaben hinarbeiten muss. {--POINTS_LOCKED_MODE_UNLOCKED--} bewirkt hingegen, dass das Mitglied die Gutschrift sofort erhält, ohne Mails bestätigen zu müssen.", + 'ADMIN_ADD_POINTS_DATA_LOCKED_MODE_NOTICE' => "Bei der {?POINTS?}-Sperre werden dem Mitglied die {?POINTS?} auf sein so genanntes "gesperrtes Guthaben" gutgeschrieben. Auf dieses hat das Mitglied solange keinen Zugriff, bis es die Mindestanzahl zu bestätisex Mails erreicht hat. Die Einstellung {--POINTS_LOCKED_MODE_LOCKED--} bewirkt, dass das Mitglied ebenfalls auf dieses Guthaben hinarbeiten muss. {--POINTS_LOCKED_MODE_UNLOCKED--} bewirkt hingegen, dass das Mitglied die Gutschrift sofort erhält, ohne Mails bestätigen zu müssen.", 'ADMIN_ADD_POINTS_DATA_PAYMENT_METHOD_NOTICE' => "Mit der Vergütungsmethode können Sie beeinflussen, ob Ihre Mitglieder Referral-Gutschriften erhalten oder nur das eigentliche Mitglied (also das, was die Gutschrift erhalten soll) diese "direkt" gutgeschrieben werden soll. Stellen Sie dies z.B. beim Verwendungszweck mailid_okay auf "{--POINTS_PAYMENT_METHOD_DIRECT--}" um, erhält das werbende Mitglied (das als Referral-Id eingetragen ist) keine Gutschriften bei der Mailbestätigung mehr. Seien Sie also auch mit dieser Einstellung nicht leichtsinnig.", 'ADMIN_POINT_ACCOUNT_ADDED' => "Das Guthabenkonto wurde soeben angelegt. Bitte bauen Sie dies nun in Ihren PHP-Code ein.", 'ADMIN_POINT_ACCOUNT_NOT_ADDED' => "Das Guthabenkonto konnte nicht angelegt werden. Vielleicht ist es bereits vorhanden oder von einer Erweiterung bereits angelegt?", diff --git a/inc/language/user_de.php b/inc/language/user_de.php index f3ec07e556..3c58a8e507 100644 --- a/inc/language/user_de.php +++ b/inc/language/user_de.php @@ -83,7 +83,7 @@ addMessages(array( // Tester user accounts: // - Configuration 'ADMIN_CONFIG_TESTER_USER_MAXIMUM' => "Grösster Suffix für Testbenutzer:", - 'ADMIN_CONFIG_TESTER_USER_GENDER' => "Anrede:", + 'ADMIN_CONFIG_TESTER_USER_SEX' => "Anrede:", 'ADMIN_CONFIG_TESTER_USER_SURNAME_PREFIX' => "Präfix für Testbenutzer:", 'ADMIN_CONFIG_TESTER_USER_FAMILY' => "Nachname:", 'ADMIN_CONFIG_TESTER_USER_STREET_NR' => "Straße + Hausnummer:", @@ -99,7 +99,7 @@ addMessages(array( 'ADMIN_ADD_TESTER_USER_NOTICE' => "Es sind bereits {OPEN_TEMPLATE}pipe,getTotalTesterUsers,translateComma{CLOSE_TEMPLATE} von maximal {OPEN_TEMPLATE}config,translateComma=tester_user_maximum{CLOSE_TEMPLATE} Testbenutzern angelegt.", 'ADMIN_ADD_TESTER_USER_TITLE' => "Neuen Testbenutzer anlegen", 'ADMIN_ADD_TESTER_USER_SUBMIT' => "Testbenutzer anlegen", - 'ADMIN_ADD_TESTER_USER_GENDER' => "Anrede auswählen:", + 'ADMIN_ADD_TESTER_USER_SEX' => "Anrede auswählen:", 'ADMIN_ADD_TESTER_USER_SURNAME' => "Vorname (NICHT SPÄTER ÄNDERN!):", 'ADMIN_ADD_TESTER_USER_FAMILY' => "Nachname eingeben:", 'ADMIN_ADD_TESTER_USER_STREET_NR' => "Straße + Hausnummer eingeben:", diff --git a/inc/libs/politician-stop_functions.php b/inc/libs/politician-stop_functions.php index ba5b638331..7d6dceec92 100644 --- a/inc/libs/politician-stop_functions.php +++ b/inc/libs/politician-stop_functions.php @@ -1,44 +1,2 @@ +// @DEPRECATED diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php index 8a6ef504c3..7135f90ac2 100644 --- a/inc/libs/rallye_functions.php +++ b/inc/libs/rallye_functions.php @@ -610,7 +610,7 @@ function getReferralRallyeUserDataFromArray ($userIds) { // Load users $result = sqlQueryEscaped("SELECT - `userid`, `gender`, `surname`, `family`, `email` + `userid`, `sex`, `surname`, `family`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE @@ -626,8 +626,8 @@ LIMIT %s", ), __FUNCTION__, __LINE__); while ($content = sqlFetchArray($result)) { // Construct the message masked and add it - $ret .= sprintf("{%%pipe,translateGender=%s%} %s %s (%s) - %s\n", - $content['gender'], + $ret .= sprintf("{%%pipe,translateSex=%s%} %s %s (%s) - %s\n", + $content['sex'], $content['surname'], $content['family'], $content['email'], @@ -642,11 +642,11 @@ LIMIT %s", // function getArrayFromReferralRallyePrices ($rallye) { // Init multi array - $prices = array( + $prices = [ 'level' => [], 'points' => [], - 'info' => [] - ); + 'info' => [], + ]; // Load prices $result = sqlQueryEscaped("SELECT diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index 3c9d42810c..215cf54410 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -340,7 +340,7 @@ function doGenericUserRegistration () { sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_user_data` ( - `gender`, + `sex`, `surname`, `family`, `street_nr`, @@ -388,7 +388,7 @@ function doGenericUserRegistration () { )", array( $GLOBALS['register_country_row'], - substr(postRequestElement('gender'), 0, 1), + substr(postRequestElement('sex'), 0, 1), postRequestElement('surname'), postRequestElement('family'), postRequestElement('street_nr'), @@ -479,7 +479,7 @@ function doGenericUserRegistration () { $content = array( 'hash' => $GLOBALS['register_confirm_hash'], 'userid' => $filterData['register_insert_id'], - 'gender' => sqlEscapeString(postRequestElement('gender')), + 'sex' => sqlEscapeString(postRequestElement('sex')), 'surname' => sqlEscapeString(postRequestElement('surname')), 'family' => sqlEscapeString(postRequestElement('family')), 'email' => sqlEscapeString(postRequestElement('email')), @@ -495,7 +495,7 @@ function doGenericUserRegistration () { $content = array( 'hash' => $GLOBALS['register_confirm_hash'], 'userid' => $filterData['register_insert_id'], - 'gender' => sqlEscapeString(postRequestElement('gender')), + 'sex' => sqlEscapeString(postRequestElement('sex')), 'surname' => sqlEscapeString(postRequestElement('surname')), 'family' => sqlEscapeString(postRequestElement('family')), 'email' => sqlEscapeString(postRequestElement('email')), diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 07c71ce741..99b5770f32 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -1004,7 +1004,7 @@ function doDisplayGenericUserRegistrationForm () { } // END - if // Other values - foreach (array('gender', 'surname', 'family', 'street_nr', 'city', 'email') as $entry) { + foreach (['sex', 'surname', 'family', 'street_nr', 'city', 'email'] as $entry) { $content[$entry] = sqlEscapeString(postRequestElement($entry)); } // END - foreach @@ -1177,12 +1177,12 @@ function getTesterUserCheckCat () { return $GLOBALS[__FUNCTION__]; } -// Getter for tester_user_gender -function getTesterUserGender () { +// Getter for tester_user_sex +function getTesterUserSex () { // Is there cache? if (!isset($GLOBALS[__FUNCTION__])) { // Determine it - $GLOBALS[__FUNCTION__] = getConfig('tester_user_gender'); + $GLOBALS[__FUNCTION__] = getConfig('tester_user_sex'); } // END - if // Return cache diff --git a/inc/libs/wernis_functions.php b/inc/libs/wernis_functions.php index aa3c207613..c9fe0da434 100644 --- a/inc/libs/wernis_functions.php +++ b/inc/libs/wernis_functions.php @@ -650,7 +650,7 @@ function doWernisFinishUserRegistration ($challenge, $challengeResponse, $status $return['mapped_data'] = runFilterChain('register_must_fillout', $return['mapped_data']); // Add missing elements - $return['mapped_data']['gender'] = NULL; + $return['mapped_data']['sex'] = NULL; $return['mapped_data']['birthday_selection'] = generateDayMonthYearSelectionBox($return['mapped_data']['birth_day'], $return['mapped_data']['birth_month'], $return['mapped_data']['birth_year']); $return['mapped_data']['challenge'] = getRequestElement('challenge'); $return['mapped_data']['__challenge_response'] = getRequestElement('__challenge_response'); diff --git a/inc/loader/load- b/inc/loader/load- index 41a0f716c9..79bbe72276 100644 --- a/inc/loader/load- +++ b/inc/loader/load- @@ -63,4 +63,3 @@ if (($GLOBALS['cache_instance']->loadCacheFile('foo')) && ($GLOBALS['cache_insta } // [EOF] -?> diff --git a/inc/loader/load_cache- b/inc/loader/load_cache- index f551ef47b7..7d6dceec92 100644 --- a/inc/loader/load_cache- +++ b/inc/loader/load_cache- @@ -1,3 +1,2 @@ diff --git a/inc/modules/admin/action- b/inc/modules/admin/action- index dfc84f942c..d3e7830932 100644 --- a/inc/modules/admin/action- +++ b/inc/modules/admin/action- @@ -53,4 +53,3 @@ if (isIncludeReadable($inc)) { } // [EOF] -?> diff --git a/inc/modules/admin/overview-inc.php b/inc/modules/admin/overview-inc.php index 560b2fa459..6841761fa3 100644 --- a/inc/modules/admin/overview-inc.php +++ b/inc/modules/admin/overview-inc.php @@ -188,7 +188,7 @@ LIMIT 1", $content = getUserDataArray(); // Generate HTML list entry - $add = '
  • {--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/subid- b/inc/modules/admin/subid- index 7525c640e7..41e85df952 100644 --- a/inc/modules/admin/subid- +++ b/inc/modules/admin/subid- @@ -43,4 +43,3 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // [EOF] -?> diff --git a/inc/modules/admin/what- b/inc/modules/admin/what- index f74788d31a..fdf1db71f9 100644 --- a/inc/modules/admin/what- +++ b/inc/modules/admin/what- @@ -44,4 +44,3 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { addYouAreHereLink('admin', __FILE__); // [EOF] -?> diff --git a/inc/modules/admin/what-config_ b/inc/modules/admin/what-config_ index 6166f2bf30..7f0266a783 100644 --- a/inc/modules/admin/what-config_ +++ b/inc/modules/admin/what-config_ @@ -52,4 +52,3 @@ if (isFormSent('save_config')) { } // [EOF] -?> 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_ b/inc/modules/admin/what-list_ index 9182b442d2..2fd6a4381f 100644 --- a/inc/modules/admin/what-list_ +++ b/inc/modules/admin/what-list_ @@ -104,4 +104,3 @@ if ($show === FALSE) { doGenericXmlTemplateCallback('admin_list_!!!'); // [EOF] -?> 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/action- b/inc/modules/guest/action- index a20fb33f27..eaf73d1420 100644 --- a/inc/modules/guest/action- +++ b/inc/modules/guest/action- @@ -56,4 +56,3 @@ if (isIncludeReadable($inc)) { } // [EOF] -?> diff --git a/inc/modules/guest/what- b/inc/modules/guest/what- index ef9c4b27ea..a6d04b055c 100644 --- a/inc/modules/guest/what- +++ b/inc/modules/guest/what- @@ -42,4 +42,3 @@ addYouAreHereLink('guest', __FILE__); loadTemplate(substr(basename(__FILE__), 5, -4)); // [EOF] -?> 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/action- b/inc/modules/member/action- index d7386e462d..e3bd1851d9 100644 --- a/inc/modules/member/action- +++ b/inc/modules/member/action- @@ -63,4 +63,3 @@ if (isIncludeReadable($inc)) { } // [EOF] -?> diff --git a/inc/modules/member/subid- b/inc/modules/member/subid- index 88834b3eaf..948d4f9044 100644 --- a/inc/modules/member/subid- +++ b/inc/modules/member/subid- @@ -45,4 +45,3 @@ if (!defined('__SECURITY')) { } // [EOF] -?> diff --git a/inc/modules/member/what- b/inc/modules/member/what- index ba42719d01..c8b7ee6cd1 100644 --- a/inc/modules/member/what- +++ b/inc/modules/member/what- @@ -55,4 +55,3 @@ if ((!isExtensionActive('')) && (!isAdmin())) { loadTemplate(substr(basename(__FILE__), 5, -4)); // [EOF] -?> 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/monthly/monthly_ b/inc/monthly/monthly_ index 8c2d68bd79..df992587e0 100644 --- a/inc/monthly/monthly_ +++ b/inc/monthly/monthly_ @@ -50,4 +50,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.'); // [EOF] -?> diff --git a/inc/pool/pool- b/inc/pool/pool- index 0610fd88c8..1d878ba6a3 100644 --- a/inc/pool/pool- +++ b/inc/pool/pool- @@ -50,4 +50,3 @@ if ((isResetModeEnabled()) || (!isHtmlOutputMode())) { } // [EOF] -?> diff --git a/inc/purge/purge- b/inc/purge/purge- index 254ae8dde5..9fb2bc05a4 100644 --- a/inc/purge/purge- +++ b/inc/purge/purge- @@ -47,4 +47,3 @@ if ((!isExtensionActive('autopurge')) || (!isAutoPurgingActive())) { } // END - if // [EOF] -?> diff --git a/inc/request-functions.php b/inc/request-functions.php index d90c41bb91..aa70af2c55 100644 --- a/inc/request-functions.php +++ b/inc/request-functions.php @@ -279,4 +279,3 @@ function addAllGetRequestParameters () { } // [EOF] -?> diff --git a/inc/reset/reset_ b/inc/reset/reset_ index f551ef47b7..7d6dceec92 100644 --- a/inc/reset/reset_ +++ b/inc/reset/reset_ @@ -1,3 +1,2 @@ diff --git a/inc/sql-functions.php b/inc/sql-functions.php index ecd6fb1cff..a53994b89d 100644 --- a/inc/sql-functions.php +++ b/inc/sql-functions.php @@ -814,4 +814,3 @@ function logSqlError ($file, $line, $message) { } // [EOF] -?> diff --git a/inc/template-functions.php b/inc/template-functions.php index c0bb014ea8..edf8be94aa 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_politician-stop.tpl b/templates/de/html/ext/ext_politician-stop.tpl index e6c8f16252..11f5d85d80 100644 --- a/templates/de/html/ext/ext_politician-stop.tpl +++ b/templates/de/html/ext/ext_politician-stop.tpl @@ -1,16 +1 @@ -
    -Diese Erweiterung schliesst sich der Protestseite www.politiker-stopp.de an. Dabei wird ein kleines HTML-Schnipsel -(Widget) in Ihren {OPEN_CONFIG}mt_word{CLOSE_CONFIG} eingebunden, dass beim -Ausdrucksversuch Ihrer Seite nicht die eigentliche Seite, sondern eine -Protestseite zum Drucker sendet. Dies gilt gegen Politiker, die versuchen, das -Internet gegen die Kinderpornorgraphie "abzusichern" (eher das -Internet zu zensieren). -
    - -
    -Und wer es nicht bemerkt hat: Das ist Satire. -
    + 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/politician_stop/.htaccess b/templates/de/html/politician_stop/.htaccess deleted file mode 100644 index 3a42882788..0000000000 --- a/templates/de/html/politician_stop/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/templates/de/html/politician_stop_snippet.tpl b/templates/de/html/politician_stop_snippet.tpl index 44805441ec..11f5d85d80 100644 --- a/templates/de/html/politician_stop_snippet.tpl +++ b/templates/de/html/politician_stop_snippet.tpl @@ -1,41 +1 @@ -
    -
    - -
    - -
    - Ihr Browser versucht gerade eine Seite aus dem sogenannten Internet - auszudrucken. Das Internet ist ein weltweites Netzwerk von Computern, - das den Menschen ganz neue Möglichkeiten der Kommunikation bietet. -
    - -
    - Da Politiker im Regelfall von neuen Dingen nichts verstehen, halten wir - es für notwendig, sie davor zu schützen. Dies ist im - beidseitigen Interesse, da unnötige Angstzustände bei Ihnen - verhindert werden, ebenso wie es uns vor profilierungs- und - machtsüchtigen Politikern schützt. -
    - -
    - Sollten Sie der Meinung sein, dass Sie diese Internetseite dennoch sehen - sollten, so können Sie jederzeit durch normalen Gebrauch eines - Internetbrowsers darauf zugreifen. Dazu sind aber minimale - Computerkenntnisse erforderlich. Sollten Sie diese nicht haben, - vergessen Sie einfach dieses Internet und lassen uns in Ruhe. -
    - -
    - Die Umgehung dieser Ausdrucksperre ist nach §95a UrhG verboten. -
    - -
    - Mehr Informationen unter www.politiker-stopp.de. -
    - -
    - Dies ist Satire. -
    -
    + 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]%}