From: Roland Haeder Date: Thu, 17 Apr 2014 21:37:30 +0000 (+0200) Subject: More cleanups and small improvements (e.g. usage of wrappers). X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=8ab13d11fc73777dea69e09cd12708b0126552ae More cleanups and small improvements (e.g. usage of wrappers). Signed-off-by: Roland Häder --- diff --git a/inc/classes/rdf.class.php b/inc/classes/rdf.class.php index fd0ff99b1b..a30a4e5b19 100644 --- a/inc/classes/rdf.class.php +++ b/inc/classes/rdf.class.php @@ -42,7 +42,7 @@ * @copyright Copyright (c) 2001 fase4.com. All rights reserved. * @author Stefan Saasen * @author Roland Haeder - * @version 1.7 ($Date$Revision: 856 $ + * @version 1.7 * @access public */ diff --git a/inc/extensions/user/mode-update.php b/inc/extensions/user/mode-update.php index 833e2fd478..ce8703b3da 100644 --- a/inc/extensions/user/mode-update.php +++ b/inc/extensions/user/mode-update.php @@ -401,7 +401,7 @@ INDEX (`refid`)", case '0.5.3': // SQL queries for v0.5.3 // Is the PHP extension 'recode' activated - if (!extension_loaded('recode')) { + if (!isPhpExtensionLoaded('recode')) { // This update requires 'recode' enableExtensionReportingFailure(); } // END - if diff --git a/inc/libs/register_functions.php b/inc/libs/register_functions.php index c6f458a565..5bd7d38425 100644 --- a/inc/libs/register_functions.php +++ b/inc/libs/register_functions.php @@ -334,7 +334,7 @@ function doGenericUserRegistration () { assert(isset($GLOBALS['register_confirm_hash'])); // Only comment this in if you develop - //* DEVELOPER-CODE: */ return TRUE; + //* DEVELOPER-CODE: */ $GLOBALS['register_userid'] = 1; return TRUE; // Create user's account... sqlQueryEscaped("INSERT INTO @@ -419,6 +419,9 @@ function doGenericUserRegistration () { return FALSE; } // END - if + // Set new user id globally + $GLOBALS['register_userid'] = $filterData['register_insert_id']; + // Shall we reset random refid? Only possible with latest ext-user if (isExtensionInstalledAndNewer('user', '0.3.4')) { // Reset all accounts, registration is done diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php index 2c0ca74bff..e2568b5c3c 100644 --- a/inc/libs/security_functions.php +++ b/inc/libs/security_functions.php @@ -163,17 +163,17 @@ if (isPhpVersionEqualNewer('5.0')) { } // END - if // Check if important arrays are found and define them if missing -if (!isset($_SERVER)) { +if ((!isset($_SERVER)) || (!is_array($_SERVER))) { global $_SERVER; $_SERVER = $GLOBALS['_SERVER']; } // END - if -if (!isset($_GET)) { +if ((!isset($_GET)) || (!is_array($_GET))) { global $_GET; $_GET = $GLOBALS['_GET']; } // END - if -if (!isset($_POST)) { +if ((!isset($_POST)) || (!is_array($_POST))) { global $_POST; $_POST = $GLOBALS['_POST']; } // END - if @@ -226,10 +226,10 @@ $GLOBALS['url_chars'] = array( if (is_array($_GET)) { foreach ($_GET as $seckey => $secvalue) { if (is_array($secvalue)) { - // Throw arrays away... + // Throw arrays away ... unset($_GET[$seckey]); } else { - // Only variables are allowed (non-array) but we secure them all! + // Only variables are allowed (non-array) but we secure them all. $_GET[$seckey] = str_replace($GLOBALS['security_chars']['from'], $GLOBALS['security_chars']['to'], $_GET[$seckey]); // Strip all other out