X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fsession.php;h=26e296685dcc2fb0cdc2164755e0013bb4149f69;hp=a1405c70812df977fc02df9140c5bf7c4300df86;hb=0307fb2be4c728bed515c8fe6e25a60a26da3811;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594

diff --git a/inc/session.php b/inc/session.php
index a1405c7081..26e296685d 100644
--- a/inc/session.php
+++ b/inc/session.php
@@ -38,20 +38,12 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
-// Check if view.php nor click.php was called
-// If not set variables to default
-if (empty($CLICK)) $CLICK = 0;
-if (empty($VIEW))  $VIEW  = 0;
-
-// Skip updating of cookies when viewing a banner
-if (($VIEW == 1) && ($_SERVER['PHP_SELF'])) return;
-
 // Set session save path if set
-if (getConfig('session_save_path') != "") {
+if (getConfig('session_save_path') != '') {
 	// Please make sure this valid!
 	session_save_path(getConfig('session_save_path'));
 } // END - if
@@ -60,10 +52,10 @@ if (getConfig('session_save_path') != "") {
 session_start();
 
 // Load language system
-LOAD_INC_ONCE("inc/language.php");
+loadIncludeOnce('inc/language.php');
 
 // Load extensions here
-LOAD_INC_ONCE("inc/load_extensions.php");
+loadIncludeOnce('inc/load_extensions.php');
 
 // Determine and set referal id
 DETERMINE_REFID();
@@ -71,30 +63,19 @@ DETERMINE_REFID();
 // Transfer userid from session and validate it
 if (isSessionVariableSet('userid')) {
 	// Get it secured from session
-	setUserId(GET_SESSION('userid'));
+	setUserId(getSession('userid'));
 
 	// Is it valid?
 	if (!IS_MEMBER()) {
 		// Then destroy the user id
-		destroy_user_session();
+		destroyUserSession();
 
 		// Kill userid
 		setUserId(0);
 	} // END - if
 } // END - if
 
-// Test session if index.php or modules.php is loaded
-if ((basename($_SERVER['PHP_SELF']) == "index.php") || (basename($_SERVER['PHP_SELF']) == "modules.php") || (isInstalling())) {
-	if (count($_SESSION) > 0) {
-		// Session variables accepted!
-		define('__COOKIES', true);
-	} else {
-		// Cookies rejected!
-		define('__COOKIES', false);
-	}
-} // END - if
-
-//* DEBUG: */ print("<pre>".print_r($_SESSION, true)."</pre>");
+//* DEBUG: */ print('<pre>'.print_r($_SESSION, true).'</pre>');
 
 //
 ?>