From: Roland Häder Date: Thu, 26 Dec 2024 03:05:57 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=refs%2Fheads%2F0.2.1-FINAL;p=mailer.git Continued: - converted more old array() to "new" [] way --- diff --git a/inc/ajax/ajax_installer.php b/inc/ajax/ajax_installer.php index bb418ea129..a285345fc0 100644 --- a/inc/ajax/ajax_installer.php +++ b/inc/ajax/ajax_installer.php @@ -294,7 +294,7 @@ function doAjaxInstallerSaveChanges () { $currentTab = postRequestElement('tab'); // Remove some elements which should not be saved - foreach (array('tab', 'do', 'level') as $removedElement) { + foreach (['tab', 'do', 'level'] as $removedElement) { // Remove this element from POST data unsetPostRequestElement($removedElement); } // END - foreach @@ -749,7 +749,7 @@ function doAjaxInstallerStepWriteLocalConfig () { // Call-back function to register first admin function doAjaxInstallerStepRegisterFirstAdmin () { // Is all set? - if (!isSessionDataSet(array('admin_login', 'admin_email', 'admin_password1', 'admin_password2'))) { + if (!isSessionDataSet(['admin_login', 'admin_email', 'admin_password1', 'admin_password2'])) { // Some required session data is not set reportBug(__FUNCTION__, __LINE__, 'Required session data for this step not found.'); } elseif (isAdminRegistered()) { diff --git a/inc/config-functions.php b/inc/config-functions.php index 467ab1f2b1..389ba1b9aa 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -44,12 +44,13 @@ function initConfig () { } // END - if // Set a minimum of configuration, required to by-pass some error triggers in getConfig() - $GLOBALS['config'] = array( + $GLOBALS['config'] = [ 'sql_time' => 0, 'sql_count' => 0, 'num_templates' => 0, + 'DEBUG_MODE' => 'N', + 'verbose_sql' => 'N', // 'DEFAULT_SALT_LENGTH' => 40, - // 'DEBUG_MODE' => 'N', // 'DEBUG_HOURLY' => 'N', // 'DEBUG_DAILY' => 'N', // 'DEBUG_MONTHLY' => 'N', @@ -57,13 +58,12 @@ function initConfig () { // 'DEBUG_WEEKLY' => 'N', // 'DEBUG_REGEX' => 'N', // 'ADMIN_REGISTERED' => 'N', - // 'verbose_sql' => 'Y', // For installation phase: 'SMTP_HOSTNAME' => '', 'SMTP_USER' => '', 'SMTP_PASSWORD' => '', 'MT_WORD' => '{--DEFAULT_MT_WORD--}', - ); + ]; } // Getter for $GLOBALS['config'] entries @@ -144,7 +144,7 @@ function getConfigArray () { function updateOldConfigFile () { // Watch out for these lines and execute them as single command // @TODO Make this all better... :-/ - $watchLines = array( + $watchLines = [ 'SITE_KEY' => 'SITE_KEY', 'DEFAULT_LANG' => 'DEFAULT_LANG', 'warn_no_pass' => 'WARN_NO_PASS', @@ -167,13 +167,13 @@ function updateOldConfigFile () { 'WEBMASTER' => 'WEBMASTER', 'PATH' => 'PATH', 'URL' => 'URL', - ); + ]; // Make these lower-case! (damn stupid code...) - $lowerCase = array('WARN_NO_PASS', 'MAILER_INSTALLED', 'ADMIN_REGISTERED'); + $lowerCase = ['WARN_NO_PASS', 'MAILER_INSTALLED', 'ADMIN_REGISTERED']; // Special comments... - $comments = array( + $comments = [ 'WARN_NO_PASS' => 'NULLPASS-WARNING', 'MAILER_INSTALLED ' => 'INSTALLED', 'ADMIN_REGISTERED' => 'ADMIN-SETUP', @@ -185,7 +185,7 @@ function updateOldConfigFile () { 'dbase' => 'MYSQL-DBASE', 'login' => 'MYSQL-LOGIN', 'password' => 'MYSQL-PASSWORD' - ); + ]; // Copy template to new file destionation copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644); diff --git a/inc/config-local.php.dist b/inc/config-local.php.dist index 76f994b2ea..344a3e303a 100644 --- a/inc/config-local.php.dist +++ b/inc/config-local.php.dist @@ -109,7 +109,7 @@ setConfigEntry('DEBUG_TEMPLATE_CACHE', 'N'); //setConfigEntry('ALLOW_TESTER_ACCOUNTS', 'Y'); // Your MySQL data (we don't like M$ SQL ;-) ) -$GLOBALS['mysql'] = array( +$GLOBALS['mysql'] = [ // CFG: MYSQL-HOST 'host' => 'localhost', // CFG: MYSQL-DBASE @@ -118,7 +118,7 @@ $GLOBALS['mysql'] = array( 'login' => 'user', // CFG: MYSQL-PASSWORD 'password' => 'pass', -); +]; // SMTP-Subsystem (keep all empty to use legacy mail() command!) // CFG: SMTP-HOSTNAME diff --git a/inc/encryption-functions.php b/inc/encryption-functions.php index fdd29ac563..d2c2037d2b 100644 --- a/inc/encryption-functions.php +++ b/inc/encryption-functions.php @@ -193,7 +193,7 @@ function getSupportedEncryptionAlgorithms () { $algos = mcrypt_list_algorithms(); // Remove any unsecure (e.g. DES/3DES) - foreach (array('des', 'tripledes') as $unsecure) { + foreach (['des', 'tripledes'] as $unsecure) { // Search for it $id = array_search($unsecure, $algos, TRUE); diff --git a/inc/expression-functions.php b/inc/expression-functions.php index 6b7711efff..3889586e40 100644 --- a/inc/expression-functions.php +++ b/inc/expression-functions.php @@ -428,7 +428,7 @@ function doExpressionForm ($data) { $data['__server'] = ''; // Check which method/target is set - foreach (array('callback', 'extra_func', 'extra_func2') as $key) { + foreach (['callback', 'extra_func', 'extra_func2'] as $key) { // Make lower-case $value = strtolower($data[$key]); @@ -474,7 +474,7 @@ function doExpressionForm ($data) { } // END - if // Add rest elements - foreach (array('method', 'target', 'name', 'id') as $key) { + foreach (['method', 'target', 'name', 'id'] as $key) { $data['__replacer'] .= ' ' . $key . '=\"' . $data['__form_' . $key] . '\"'; } // END - foreach diff --git a/inc/filter-functions.php b/inc/filter-functions.php index b3d70a7eb5..ac4a6520cd 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -365,11 +365,11 @@ function prepareFilterArray () { } // END - if // Init dummy array - $filterArray = array( + $filterArray = [ 'chains' => [], 'loaded' => [], 'counter' => [] - ); + ]; // Found in cache so rewrite the array foreach ($GLOBALS['cache_array']['filter']['filter_name'] as $idx => $filterName) { diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php index 41549df5fa..dc47a0362f 100644 --- a/inc/filter/cache_filter.php +++ b/inc/filter/cache_filter.php @@ -49,7 +49,7 @@ function FILTER_CACHE_DESTROY_ON_EXT_CHANGE ($filterData) { } // END - if // Remove cache - foreach (array('config', 'extension', 'filter', 'modules', 'earning', 'points_data') as $cache) { + foreach (['config', 'extension', 'filter', 'modules', 'earning', 'points_data'] as $cache) { // Rebuild cache rebuildCache($cache); } // END - foreach @@ -84,7 +84,7 @@ function FILTER_CACHE_DESTROY_ALL ($filterData) { } // END - if // Remove cache files - foreach (array('admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'payments', 'points_data', 'refdepths', 'refsystem', 'themes') as $cache) { + foreach (['admin', 'admin_acls', 'config', 'extension', 'earning', 'filter', 'imprint', 'modules', 'payments', 'points_data', 'refdepths', 'refsystem', 'themes'] as $cache) { // Rebuild it rebuildCache($cache); } // END - foreach diff --git a/inc/filters.php b/inc/filters.php index 7c418903a3..dc861739c3 100644 --- a/inc/filters.php +++ b/inc/filters.php @@ -880,7 +880,7 @@ function FILTER_RUN_YEARLY_RESET () { // Filter for loading more runtime includes (not for installation) function FILTER_LOAD_RUNTIME_INCLUDES () { // Load more includes - foreach (array('databases') as $inc) { + foreach (['databases'] as $inc) { // Load the include loadIncludeOnce('inc/' . $inc . '.php'); } // END - foreach diff --git a/inc/fixes/fix_menu.php b/inc/fixes/fix_menu.php index 006f856b2c..4059f1c005 100644 --- a/inc/fixes/fix_menu.php +++ b/inc/fixes/fix_menu.php @@ -36,7 +36,7 @@ if (!defined('__SECURITY')) { } // END - if // Get all menus -foreach (array('guest','member','admin') as $menu) { +foreach (['guest','member','admin'] as $menu) { // Query it $result = sqlQueryEscaped("SELECT `action`, `what` FROM `{?_MYSQL_PREFIX?}_%s_menu` ORDER BY `action` ASC,`what` ASC", array($menu), __FILE__, __LINE__); diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php index 846faa1e67..ae187b3640 100644 --- a/inc/gen_sql_patches.php +++ b/inc/gen_sql_patches.php @@ -93,7 +93,7 @@ if ((getFileHash() == '') || (!isFileReadable(getGenericHashFileName()))) { // @TODO Rewrite this to a filter if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance())) { // Destroy some cache files - foreach (array('config', 'extension', 'filter', 'modules') as $cache) { + foreach (array['config', 'extension', 'filter', 'modules'] as $cache) { // Use rebuildCache() rebuildCache($cache); } // END - foreach diff --git a/inc/general-functions.php b/inc/general-functions.php index 8508acc6c1..c86ffa3ac9 100644 --- a/inc/general-functions.php +++ b/inc/general-functions.php @@ -1595,7 +1595,7 @@ function convertSelectionsToEpocheTime (array &$postData, array &$content, &$id, $GLOBALS['skip_config'][$test] = TRUE; // Remove data from array - foreach (array('ye', 'mo', 'mn', 'we', 'da', 'ho', 'mi', 'se') as $rem) { + foreach (['ye', 'mo', 'mn', 'we', 'da', 'ho', 'mi', 'se'] as $rem) { unset($postData[$test . '_' . $rem]); } // END - foreach @@ -2239,7 +2239,7 @@ function handleFieldWithBraces ($field) { * Try to find one and replace it. I do it this way to allow easy * extending of this code. */ - foreach (array('admin_list_builder_id_value') as $key) { + foreach (['admin_list_builder_id_value'] as $key) { /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'key=' . $key); // Is the cache entry set? if (isset($GLOBALS[$key])) { diff --git a/inc/init.php b/inc/init.php index c46410b0c2..f6710b8fa7 100644 --- a/inc/init.php +++ b/inc/init.php @@ -58,8 +58,8 @@ if (function_exists('import_request_variables')) { $path = str_replace(chr(92), '/', substr(dirname(__FILE__), 0, -3)); // Some very important function includes -foreach (array('config', 'wrapper', 'template', 'module', 'inc', 'http', 'general') as $inc) { - include($path . 'inc/' . $inc . '-functions.php'); +foreach (['config', 'wrapper', 'template', 'module', 'inc', 'http', 'general'] as $inc) { + include sprintf('%sinc/%s-functions.php', $path, $inc); } // END - foreach // Initialize application diff --git a/inc/install-functions.php b/inc/install-functions.php index ef4a75edcc..9d9db66774 100644 --- a/inc/install-functions.php +++ b/inc/install-functions.php @@ -38,7 +38,7 @@ if ((!defined('__SECURITY')) || (!isInstaller())) { // Init installer function initInstaller () { // Initialize installer group array - $GLOBALS['installer_groups'] = array( + $GLOBALS['installer_groups'] = [ // base_data 'base_path' => 'base_data', 'base_url' => 'base_data', @@ -68,7 +68,7 @@ function initInstaller () { 'admin_email' => 'first_admin', 'admin_password1' => 'first_admin', 'admin_password2' => 'first_admin', - ); + ]; // Set mininmum password length/score and other config entries setConfigEntry('min_password_length', 5); @@ -125,7 +125,7 @@ function doInstallerBootstrap () { initSession(); // Include more - foreach (array('databases', 'install-functions', 'load_config', 'load_cache') as $inc) { + foreach (['databases', 'install-functions', 'load_config', 'load_cache'] as $inc) { // Load include file loadIncludeOnce('inc/' . $inc . '.php'); } // END - foreach diff --git a/inc/libs/network_functions.php b/inc/libs/network_functions.php index 236c7ea2ff..a8f0d3f877 100644 --- a/inc/libs/network_functions.php +++ b/inc/libs/network_functions.php @@ -78,7 +78,7 @@ function detectNetworkProcessForm () { setNetworkFormName('invalid'); // Now search all valid - foreach (array('save_config', 'add', 'edit', 'delete', 'do_edit', 'do_delete') as $formName) { + foreach (['save_config', 'add', 'edit', 'delete', 'do_edit', 'do_delete'] as $formName) { // Is it detected if (isFormSent($formName)) { // Use this form name @@ -2493,7 +2493,7 @@ function doAdminNetworkProcessNetworkApiConfig () { setPostRequestElement('network_id', bigintval(getRequestElement('network_id'))); // NULL empty values - foreach (array('network_api_site_id', 'network_api_referral_button', 'network_api_visual_pay_check') as $key) { + foreach (['network_api_site_id', 'network_api_referral_button', 'network_api_visual_pay_check'] as $key) { // Is it set? if (!isPostRequestElementSet($key)) { // Remove empty value to get a NULL for an optional entry @@ -2541,7 +2541,7 @@ function doAdminNetworkProcessAddHandlerTypesConfig ($displayMessage = TRUE, $co * Some parameters are optional, at least one must be given so check a bunch * of parameters. */ - foreach (array('network_min_waiting_time', 'network_max_waiting_time', 'network_min_remain_budget', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic', 'network_media_size', 'network_media_output') as $element) { + foreach (['network_min_waiting_time', 'network_max_waiting_time', 'network_min_remain_budget', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic', 'network_media_size', 'network_media_output'] as $element) { // Is this element empty? if (!isPostRequestElementSet($element)) { // Then unset it to get a NULL for optional parameter @@ -2637,7 +2637,7 @@ function doAdminNetworkProcessEditHandlerTypesConfig ($displayMessage = TRUE, $c * Some parameters are optional, at least one must be given so check a bunch * of parameters. */ - foreach (array('network_min_waiting_time', 'network_max_waiting_time', 'network_min_remain_budget', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic', 'network_media_size', 'network_media_output') as $element) { + foreach (['network_min_waiting_time', 'network_max_waiting_time', 'network_min_remain_budget', 'network_min_remain_clicks', 'network_min_payment', 'network_allow_erotic', 'network_media_size', 'network_media_output'] as $element) { // Is this element empty? if (!isPostRequestElementSet($element)) { // Then unset it to get a NULL for optional parameter diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 99b5770f32..9c69efafde 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -43,7 +43,7 @@ if (!defined('__SECURITY')) { // Add links for selecting some users function addAlphabeticalSorting ($sortby) { $add = ''; - foreach (array('page', 'offset', 'do', 'status') as $param) { + foreach (['page', 'offset', 'do', 'status'] as $param) { if (isGetRequestElementSet($param)) { $add .= '&' . $param . '=' . getRequestElement($param); } // END - if @@ -93,7 +93,7 @@ function addSortLinks ($letter, $sortby) { $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset'); // Add status/ mode - foreach (array('do','status') as $param) { + foreach (['do','status'] as $param) { if (isGetRequestElementSet($param)) { $add .= '&' . $param . '=' . getRequestElement($param); } // END - if @@ -154,7 +154,7 @@ function addPageNavigation ($numPages) { $OUT .= ' createConfigurationTimeSelections('surfbar_static_time' , 'ms' , 'left'), 'surfbar_static_lock' => createConfigurationTimeSelections('surfbar_static_lock' , 'hm' , 'left'), 'surfbar_restart_time' => createConfigurationTimeSelections('surfbar_restart_time' , 'ms' , 'left'), @@ -60,10 +60,10 @@ if (isFormSent('save_config')) { 'surfbar_purge_deleted' => createConfigurationTimeSelections('surfbar_purge_deleted' , 'WDh', 'left'), 'surfbar_purge_migrated' => createConfigurationTimeSelections('surfbar_purge_migrated', 'WDh', 'left'), 'surfbar_low_interval' => createConfigurationTimeSelections('surfbar_low_interval' , 'WDh', 'left'), - ); + ]; // Even some more... - foreach (array('surfbar_payment_model_static','surfbar_payment_model_dynamic','surfbar_pause_mode_internal','surfbar_pause_mode_external','surfbar_notification_mode_instant','surfbar_notification_mode_reset') as $entry) { + foreach (['surfbar_payment_model_static','surfbar_payment_model_dynamic','surfbar_pause_mode_internal','surfbar_pause_mode_external','surfbar_notification_mode_instant','surfbar_notification_mode_reset'] as $entry) { $content[$entry] = ''; } // END - foreach diff --git a/inc/modules/admin/what-config_wernis.php b/inc/modules/admin/what-config_wernis.php index 95b848394f..9db3e4d06e 100644 --- a/inc/modules/admin/what-config_wernis.php +++ b/inc/modules/admin/what-config_wernis.php @@ -56,7 +56,7 @@ if (isFormSent('save_config')) { // Let's test the API first (hold your horses here, cowboy! Thank you. :) ) if (doAdminTestWernisApi()) { // Revert german commata - foreach (array('payout_factor', 'withdraw_factor', 'payout_fee_percent', 'withdraw_fee_percent') as $revert) { + foreach (['payout_factor', 'withdraw_factor', 'payout_fee_percent', 'withdraw_fee_percent'] as $revert) { setPostRequestElement('wernis_' . $revert, postRequestElement('wernis_' . $revert)); } // END - if diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php index 79861ba740..9b095c1f24 100644 --- a/inc/modules/admin/what-extensions.php +++ b/inc/modules/admin/what-extensions.php @@ -366,7 +366,7 @@ ORDER BY // @TODO Rewrite this to a filter if (isExtensionActive('cache')) { // Remove cache file (will be auto-created again!) - foreach (array('config', 'extension', 'filter', 'modules') as $cache) { + foreach (['config', 'extension', 'filter', 'modules'] as $cache) { // Rebuild cache file rebuildCache($cache); } // END - foreach diff --git a/inc/modules/admin/what-list_doubler.php b/inc/modules/admin/what-list_doubler.php index deec39ab55..467a334058 100644 --- a/inc/modules/admin/what-list_doubler.php +++ b/inc/modules/admin/what-list_doubler.php @@ -63,7 +63,7 @@ switch (getRequestElement('do')) { case 'overview': // General overview page // Prepare links - foreach (array('already_direct','already_ref','waiting_direct','waiting_ref') as $entry) { + foreach (['already_direct', 'already_ref', 'waiting_direct', 'waiting_ref'] as $entry) { $content[$entry . '_link'] = '0'; } // END - switch diff --git a/inc/modules/guest/what-sponsor_reg.php b/inc/modules/guest/what-sponsor_reg.php index ba371e625b..d9fdcc2e10 100644 --- a/inc/modules/guest/what-sponsor_reg.php +++ b/inc/modules/guest/what-sponsor_reg.php @@ -254,14 +254,14 @@ ORDER BY $content['payment_list'] = loadTemplate('guest_sponsor_payment', TRUE, $OUT); // Init a lot array elements - 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) { + foreach (['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 // Check for invalid entries if (isFilledArray($formErrors)) { // Some found... :-( - foreach (array('company','position','tax_ident','surname','family','street_nr1','street_nr2','country','zip','city','phone','fax','cell','email','url') as $entry) { + foreach (['company', 'position', 'tax_ident', 'surname', 'family', 'street_nr1', 'street_nr2', 'country', 'zip', 'city', 'phone', 'fax', 'cell', 'email', 'url'] as $entry) { $content[$entry] = postRequestElement($entry); } // END - foreach diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php index a83d17fea2..46052988e8 100644 --- a/inc/modules/member/what-transfer.php +++ b/inc/modules/member/what-transfer.php @@ -473,7 +473,7 @@ INDEX (`party_userid`) } // END - if // Init entries - foreach (array('allow_y','allow_n') as $entry) { + foreach (['allow_y','allow_n'] as $entry) { $content[$entry] = ''; } // END - foreach diff --git a/inc/template-functions.php b/inc/template-functions.php index c081c43a6c..159456c0bd 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -1026,7 +1026,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = } // END - if // Put all calculated values in array - $data = array( + $data = [ 'Y' => $year, 'M' => $month, 'W' => $week, @@ -1034,7 +1034,7 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'h' => $hour, 'm' => $minute, 's' => $second - ); + ]; // // Now we convert them in seconds... @@ -1044,9 +1044,9 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = $OUT = $data; } else { // Init array - $units = array( + $units = [ // Time unit -> field name - 'unit_field' => array( + 'unit_field' => [ 'Y' => 'ye', 'M' => 'mn', 'W' => 'we', @@ -1054,9 +1054,9 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'h' => 'ho', 'm' => 'mi', 's' => 'se' - ), + ], // Time unit -> label - 'unit_label' => array( + 'unit_label' => [ 'Y' => 'YEAR', 'M' => 'MONTH', 'W' => 'WEEK', @@ -1064,8 +1064,8 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align = 'h' => 'HOUR', 'm' => 'MINUTE', 's' => 'SECOND' - ) - ); + ] + ]; // Generate table $OUT = '
'; @@ -1265,10 +1265,10 @@ function displayParsingTime () { // Prepare output // @TODO This can be easily moved out after the merge from EL branch to this is complete - $content = array( + $content = [ 'run_time' => $runTime, 'sql_time' => (getConfig('sql_time') * 1000), - ); + ]; // Load the template $GLOBALS['__page_footer'] .= loadTemplate('show_timings', TRUE, $content); @@ -1333,10 +1333,10 @@ function reportBug ($file, $line, $message = '', $sendEmail = TRUE) { // Send an email? (e.g. not wanted for evaluation errors) if (($sendEmail === TRUE) && (!isInstaller()) && (isAdminRegistered())) { // Prepare content - $content = array( + $content = [ 'message' => trim($message), 'backtrace' => trim(debug_get_mailable_backtrace()) - ); + ]; // Send email to webmaster sendAdminNotification('{--REPORT_BUG_SUBJECT--}', 'admin_report_bug', $content); @@ -1382,8 +1382,8 @@ function compileUriCode ($code, $simple = TRUE) { } // END - if // Compile these by default - $charsCompile = array( - 'from' => array( + $charsCompile = [ + 'from' => [ '{DOT}', '{SLASH}', '{QUOT}', @@ -1393,8 +1393,8 @@ function compileUriCode ($code, $simple = TRUE) { '{OPEN_SQR}', '{CLOSE_SQR}', '{PER}' - ), - 'to' => array( + ], + 'to' => [ '.', '/', chr(39), @@ -1404,8 +1404,8 @@ function compileUriCode ($code, $simple = TRUE) { '[', ']', '%' - ) - ); + ] + ]; // Compile constants if ($simple === FALSE) { diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 3359e772da..43fd4de29b 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -2884,10 +2884,10 @@ function getTotalPoints ($userid) { // Is there cache? if (!isset($GLOBALS[__FUNCTION__][$userid])) { // Init array for filter chain - $data = array( + $data = [ 'userid' => $userid, 'points' => 0 - ); + ]; // Run filter chain for getting more point values $data = runFilterChain('get_total_points', $data); @@ -3260,11 +3260,11 @@ function getUserLastWhatName () { // "Getter" for all columns for given alias and separator function getAllPointColumns ($alias = NULL, $separator = ',') { // Prepare the filter array - $filterData = array( + $filterData = [ 'columns' => '', 'alias' => $alias, 'separator' => $separator - ); + ]; // Run the filter $filterData = runFilterChain('get_all_point_columns', $filterData);