From: Roland Häder Date: Mon, 9 Sep 2024 04:32:53 +0000 (+0200) Subject: Continued: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=11d6ecea254136e717edcd076443a276cbf25af3;p=mailer.git Continued: - started to remove deprecated (super-old) ?> within PHP scripts. You should entirely ommit them inside pure PHP scripts and mixing HTML/CSS with PHP is discouraged regardless - removed braces () from [_once] keywords as they aren't functions and braces may let them look like functions Signed-off-by: Roland Häder --- diff --git a/DOCS/tpl-validator.php b/DOCS/tpl-validator.php index 7921b08b04..9e9b65e3c0 100644 --- a/DOCS/tpl-validator.php +++ b/DOCS/tpl-validator.php @@ -76,4 +76,3 @@ if ((isset($_SERVER['arv'][2])) && (strtolower($_SERVER['arv'][2]) == '--write') } // END - if // [EOF] -?> diff --git a/admin.php b/admin.php index d9deaec77f..bee9bbb4d0 100644 --- a/admin.php +++ b/admin.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'] = 'admin'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -56,4 +56,3 @@ if ((isAdmin()) && (!isExtensionActive('sql_patches'))) { } // [EOF] -?> diff --git a/agb.php b/agb.php index 5cadca9b3c..2aa31846e9 100644 --- a/agb.php +++ b/agb.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'] = 'agb'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -50,4 +50,3 @@ setContentType('text/html'); redirectToUrl('modules.php?module=index&what=agb'); // [EOF] -?> diff --git a/ajax.php b/ajax.php index 73b3d8f191..60800ab14e 100644 --- a/ajax.php +++ b/ajax.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 special AJAX library loadIncludeOnce('inc/ajax-functions.php'); @@ -82,4 +82,3 @@ if ((getHttpRequestMethod() == 'POST') && (isPostRequestElementSet('level'))) { loadPageFooter(); // [EOF] -?> diff --git a/api.php b/api.php index 1b60bfc89a..c60d3530be 100644 --- a/api.php +++ b/api.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); @@ -52,7 +52,7 @@ $GLOBALS['__footer_sent'] = 2; setHttpStatus('404 Not Found'); // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Load special API library //loadIncludeOnce('inc/api-functions.php'); @@ -69,4 +69,3 @@ loadPageHeader(); loadPageFooter(); // [EOF] -?> diff --git a/autoreg.php b/autoreg.php index f843365074..b1c160536f 100644 --- a/autoreg.php +++ b/autoreg.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); @@ -46,7 +46,7 @@ $GLOBALS['__header_sent'] = 2; $GLOBALS['__footer_sent'] = 2; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/plain'); @@ -60,4 +60,3 @@ loadPageHeader(); loadPageFooter(); // [EOF] -?> diff --git a/beg.php b/beg.php index 5114836eb1..5bed95f1d9 100644 --- a/beg.php +++ b/beg.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); @@ -42,7 +42,7 @@ $GLOBALS['__output_mode'] = '0'; $errorCode = NULL; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -166,8 +166,7 @@ if (isGetRequestElementSet('userid')) { if ((getBegPayMode() != 'NONE') && ($isPayed === TRUE)) { // Prepare content for template // @TODO Opps, what is missing here??? - $content = array( - ); + $content = []; // Include config-depending template loadTemplate('beg_pay_code_' . strtolower(getBegPayMode()), FALSE, $content); @@ -208,4 +207,3 @@ if (isGetRequestElementSet('userid')) { doShutdown(); // [EOF] -?> diff --git a/birthday_confirm.php b/birthday_confirm.php index 4039b7cb66..fbf41dfa5a 100644 --- a/birthday_confirm.php +++ b/birthday_confirm.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'] = 'birthday_confirm'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -125,4 +125,3 @@ loadTemplate('birthday_confirm', FALSE, $content); loadPageFooter(); // [EOF] -?> diff --git a/click.php b/click.php index 0ef848cee5..21dbdf9a14 100644 --- a/click.php +++ b/click.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'] = 'click'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type, this is required for search engines setContentType('text/html'); @@ -56,4 +56,3 @@ redirectToUrl('modules.php?module=index'); doShutdown(); // [EOF] -?> diff --git a/confirm.php b/confirm.php index 7974397447..6ae8904729 100644 --- a/confirm.php +++ b/confirm.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'] = 'confirm'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -59,4 +59,3 @@ if (isGetRequestElementSet('hash')) { redirectToUrl($url); // [EOF] -?> diff --git a/contrib/mt_konverter/mt_mxchange_converter.php b/contrib/mt_konverter/mt_mxchange_converter.php index bdd947d137..e8e48a0a10 100644 --- a/contrib/mt_konverter/mt_mxchange_converter.php +++ b/contrib/mt_konverter/mt_mxchange_converter.php @@ -32,7 +32,7 @@ ************************************************************************/ // Verbindung oeffnen... -require("config/config.php"); +require "config/config.php"; // Header ausgeben echo "
Datenkonverter nach MXChange-Datenbank

\n"; @@ -213,5 +213,4 @@ echo "Datei tmp/mxchange-db.sql mit ".filesize("tmp/mxchange-db.sql").
Bevor Sie jedoch den Dump einspielen, müssen Sie unbedingt die 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/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/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/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/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/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/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/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/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/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-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/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/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/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 3f9be64120..edf8be94aa 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -2302,7 +2302,7 @@ function doTemplateMemberFooterExtras ($templateName, $clear) { } // END - if // Init filter data - $filterData = array( + $filterData = [ // Current user's id number 'userid' => getMemberId(), // Name of used template @@ -2311,7 +2311,7 @@ function doTemplateMemberFooterExtras ($templateName, $clear) { '__data' => [], // Where the HTML output will go '__output' => '', - ); + ]; // Run the filter chain $filterData = runFilterChain('member_footer_extras', $filterData); @@ -2364,10 +2364,10 @@ function doTemplateGetTermsConditionsLink ($templateName, $clear) { // Template helper function to create selection box for "locked points mode" function doTemplatePointsLockedModeSelectionBox ($templateName, $clear = FALSE, $default = NULL) { // Init array - $lockedModes = array( - 0 => array('mode' => 'LOCKED'), - 1 => array('mode' => 'UNLOCKED'), - ); + $lockedModes = [ + 0 => ['mode' => 'LOCKED'], + 1 => ['mode' => 'UNLOCKED'], + ]; // Handle it over to generateSelectionBoxFromArray() $content = generateSelectionBoxFromArray($lockedModes, 'points_locked_mode', 'mode', '', '', '', $default); @@ -2379,10 +2379,10 @@ function doTemplatePointsLockedModeSelectionBox ($templateName, $clear = FALSE, // Template helper function to create selection box for payment method function doTemplatePointsPaymentMethodSelectionBox ($templateName, $clear = FALSE, $default = NULL) { // Init array - $paymentMethods = array( - 0 => array('method' => 'DIRECT'), - 1 => array('method' => 'REFERRAL'), - ); + $paymentMethods = [ + 0 => ['method' => 'DIRECT'], + 1 => ['method' => 'REFERRAL'], + ]; // Handle it over to generateSelectionBoxFromArray() $content = generateSelectionBoxFromArray($paymentMethods, 'points_payment_method', 'method', '', '', '', $default); @@ -2415,7 +2415,7 @@ function doTemplateMetaFavIcon ($templateName, $clear = FALSE) { $out = ''; // Check all common extensions - foreach (array('ico', 'gif', 'png') as $extension) { + foreach (['ico', 'gif', 'png'] as $extension) { // Is the file there? if (isFileReadable(getPath() . 'favicon.' . $extension)) { // Then use this and abort @@ -2547,4 +2547,3 @@ function loadPageFooter () { } // [EOF] -?> diff --git a/inc/weekly/weekly_ b/inc/weekly/weekly_ index df224031e4..43fe07ef16 100644 --- a/inc/weekly/weekly_ +++ b/inc/weekly/weekly_ @@ -50,4 +50,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Weekly reset ended.'); // [EOF] -?> diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 9cbbf6faf1..960c723826 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -3625,4 +3625,3 @@ function doNormalBootstrap () { } // [EOF] -?> diff --git a/inc/xml-functions.php b/inc/xml-functions.php index 3302f8ab0c..7d95d59710 100644 --- a/inc/xml-functions.php +++ b/inc/xml-functions.php @@ -469,4 +469,3 @@ function searchXmlArray ($value, $columns, $childKey) { } // [EOF] -?> diff --git a/inc/yearly/yearly_ b/inc/yearly/yearly_ index 06b869115b..495215cccf 100644 --- a/inc/yearly/yearly_ +++ b/inc/yearly/yearly_ @@ -50,4 +50,3 @@ if (!defined('__SECURITY')) { //* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Yearly reset ended.'); // [EOF] -?> diff --git a/index.php b/index.php index 0422155a35..6be6e74f95 100644 --- a/index.php +++ b/index.php @@ -35,7 +35,7 @@ //* DEBUG: */ xdebug_start_trace(); // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -46,7 +46,7 @@ $GLOBALS['__what'] = 'welcome'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Fix what to 'home' setWhat(getIndexHome()); @@ -99,4 +99,3 @@ if ((isSessionVariableSet('visited')) || (getIndexDelay() > -1)) { } // [EOF] -?> diff --git a/install.php b/install.php index 23fc61f58a..74f8d46b21 100644 --- a/install.php +++ b/install.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); @@ -47,7 +47,7 @@ $GLOBALS['__module'] = 'install'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -86,9 +86,9 @@ if (isGetRequestElementSet('installer')) { addTemplateToInstallContent('install_page_init'); // Prepare content - $content = array( + $content = [ 'install_page' => getRequestElement('install_page') - ); + ]; // Load main installation table loadTemplate('install_main_ajax', FALSE, $content); @@ -108,4 +108,3 @@ if (isGetRequestElementSet('installer')) { loadPageFooter(); // [EOF] -?> diff --git a/js.php b/js.php index 7fae050e4d..c15220a09e 100644 --- a/js.php +++ b/js.php @@ -34,7 +34,7 @@ //* DEBUG: */ xdebug_start_trace(); // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -52,7 +52,7 @@ $GLOBALS['__module'] = 'js'; $GLOBALS['__output_mode'] = 1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set header and HTTP status setContentType('text/javascript'); @@ -83,4 +83,3 @@ if (isGetRequestElementSet('js')) { doShutdown(); // [EOF] -?> diff --git a/lead-confirm.php b/lead-confirm.php index 69125767d8..163842d896 100644 --- a/lead-confirm.php +++ b/lead-confirm.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'] = 'lead-confirm'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -53,10 +53,10 @@ redirectOnUninstalledExtension('lead'); loadPageHeader(); // Initialize the array for the template -$content = array( +$content = [ 'lead_userid' => '0', 'lead_email' => '{?WEBMASTER?}' -); +]; // Is the cookie set? if ((isSessionVariableSet('lead_userid')) && (fetchUserData(getSession('lead_userid')))) { @@ -74,4 +74,3 @@ loadTemplate('lead_code', FALSE, $content); loadPageFooter(); // [EOF] -?> diff --git a/login.php b/login.php index fa30f29771..b1564cb4a5 100644 --- a/login.php +++ b/login.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'] = 'login'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Is this a member? if (isMember()) { @@ -53,4 +53,3 @@ if (isMember()) { } // [EOF] -?> diff --git a/mailid.php b/mailid.php index cebf439e9a..de0a51292d 100644 --- a/mailid.php +++ b/mailid.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); @@ -44,7 +44,7 @@ $GLOBALS['__output_mode'] = '0'; $GLOBALS['__copyright_enabled'] = 'N'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type and HTTP status setContentType('text/html'); @@ -57,14 +57,14 @@ redirectOnUninstalledExtension('mailid'); redirectOnUninstalledExtension('other'); // Init data -$data = array( +$data = [ 'error_code' => '0', 'userid' => '0', 'id' => '0', 'code' => '0', 'do' => 'frames', 'type' => '', -); +]; // Secure all data if (isGetRequestElementSet('userid')) $data['userid'] = bigintval(getRequestElement('userid')); @@ -256,4 +256,3 @@ if ($data['do'] != 'img') { doShutdown(); // [EOF] -?> diff --git a/modules.php b/modules.php index 2a2440708a..461d3c9b29 100644 --- a/modules.php +++ b/modules.php @@ -34,7 +34,7 @@ //* DEBUG: */ xdebug_start_trace(); // Load security stuff here -require('inc/libs/security_functions.php'); +require 'inc/libs/security_functions.php'; // Init start time $GLOBALS['__start_time'] = microtime(TRUE); @@ -44,10 +44,9 @@ $GLOBALS['__module'] = 'unknown'; $GLOBALS['__output_mode'] = '0'; // Needed include files -require('inc/init.php'); +require 'inc/init.php'; // Include module doIncludeModule(); // [EOF] -?> diff --git a/network-delurl.php b/network-delurl.php index ff4cbeec0c..dcc4170e3c 100644 --- a/network-delurl.php +++ b/network-delurl.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'] = 'network-delurl'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set HTTP status to 500 (if ext-network is not found, but this script is called) setHttpStatus('500 Internal Server Error'); @@ -62,4 +62,3 @@ if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) { loadPageFooter(); // [EOF] -?> diff --git a/network-vcheck.php b/network-vcheck.php index a21f50ea99..065a47ecbd 100644 --- a/network-vcheck.php +++ b/network-vcheck.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'] = 'network-vcheck'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set HTTP status to 500 (if ext-network is not found, but this script is called) setHttpStatus('500 Internal Server Error'); @@ -62,4 +62,3 @@ if ((isExtensionInstalled('network')) && (countRequestGet() > 0)) { loadPageFooter(); // [EOF] -?> diff --git a/ref.php b/ref.php index 80850e2f81..e995833ee0 100644 --- a/ref.php +++ b/ref.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'] = 'ref'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -74,4 +74,3 @@ if ((isExtensionActive('user')) && (isValidReferralId()) && (isValidId(determine redirectToUrl($url); // [EOF] -?> diff --git a/show_bonus.php b/show_bonus.php index 1b8dec3d3b..7dedef5108 100644 --- a/show_bonus.php +++ b/show_bonus.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'] = 'show_bonus'; $GLOBALS['__output_mode'] = '0'; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -130,4 +130,3 @@ loadTemplate('show_bonus', FALSE, $content); loadPageFooter(); // [EOF] -?> diff --git a/sponsor_confirm.php b/sponsor_confirm.php index 589db853d7..4f8bf17f76 100644 --- a/sponsor_confirm.php +++ b/sponsor_confirm.php @@ -30,7 +30,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); @@ -40,7 +40,7 @@ $GLOBALS['__module'] = 'sponsor_confirm'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -58,4 +58,3 @@ if (isGetRequestElementSet('hash')) { redirectToUrl($url); // [EOF] -?> diff --git a/sponsor_ref.php b/sponsor_ref.php index eed2e8315c..f63c263b88 100644 --- a/sponsor_ref.php +++ b/sponsor_ref.php @@ -30,7 +30,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); @@ -40,7 +40,7 @@ $GLOBALS['__module'] = 'sponsor_ref'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type for e.g. search engines setContentType('text/html'); @@ -58,4 +58,3 @@ if (isValidReferralId()) { redirectToUrl($url); // [EOF] -?> diff --git a/surfbar.php b/surfbar.php index d33ab6b78c..5f4f514e9d 100644 --- a/surfbar.php +++ b/surfbar.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); @@ -42,7 +42,7 @@ $GLOBALS['__output_mode'] = '0'; $GLOBALS['__header_sent'] = 3; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Set content type setContentType('text/html'); @@ -116,27 +116,27 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement(' unsetGetRequestElement('frame'); } elseif ((!isFullPage()) && (getRequestElement('frame') == 'stats')) { // Prepare content - $content = array( + $content = [ 'points' => getTotalPoints(getMemberId()), 'reload' => (getSurfbarStatsReload() * 1000) - ); + ]; // Load template for "stats" page loadTemplate('surfbar_frame_stats', FALSE, $content); } elseif ((!isFullPage()) && (getRequestElement('frame') == 'textlinks')) { // Prepare content - $content = array( + $content = [ 'reload' => (getSurfbarStatsReload() * 1000) - ); + ]; // Load template for "stats" page loadTemplate('surfbar_frame_textlinks', FALSE, $content); } else { // Prepare content - $content = array( + $content = [ 'start' => str_repeat('X', strlen(getSurfbarRestartTime())), 'autostart' => (isSurfbarAutoStartEnabled()) ? 'true' : 'false' - ); + ]; // Load template for stopped surfbar loadTemplate('surfbar_stopped', FALSE, $content); @@ -181,10 +181,10 @@ if ((isSurfbarReloadFull()) || ((!isFullPage()) && (in_array(getRequestElement(' // Is there a valid id? if (isValidId($nextId)) { // Then prepare other content - $content = array( + $content = [ 'url_id' => $nextId, 'xxx' => str_repeat('X', strlen(getSurfbarWaitingTime($nextId))), - ); + ]; // Update salt (double-call lock!) and statistics updateSurfbarSaltStatistics(); @@ -213,4 +213,3 @@ $GLOBALS['__footer_sent'] = 3; loadPageFooter(); // [EOF] -?> diff --git a/view.php b/view.php index 3d1d70fc4e..47b18360bc 100644 --- a/view.php +++ b/view.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'] = 'view'; $GLOBALS['__output_mode'] = -1; // Initialize application -require('inc/init.php'); +require 'inc/init.php'; // Run filter chain runFilterChain('handle_view_php'); @@ -50,4 +50,3 @@ runFilterChain('handle_view_php'); doShutdown(); // [EOF] -?>