session_(un)register are deprecated as of 5.3.1

diff --git a/inc/libs/security_functions.php b/inc/libs/security_functions.php
index da415b965fbf152b4e603e372912d6f786e0d8e4..7309965b5b7b80cd4675122411d3b927afa36333 100644 (file)
--- a/inc/libs/security_functions.php
+++ b/inc/libs/security_functions.php
@@ -41,7 +41,7 @@
 if (defined('__SECURITY')) return;
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (strpos($_SERVER['PHP_SELF'], basename(__FILE__)) !== false) {
        die();
 } // END - if
 

diff --git a/inc/session-functions.php b/inc/session-functions.php
index 8f1669f5a35cea9e09a2c1c2ceddf5d233ef1b4a..735f634194ce190711377aab719df80ceab4a7a5 100644 (file)
--- a/inc/session-functions.php
+++ b/inc/session-functions.php
@@ -55,12 +55,24 @@ function setSession ($var, $value) {
                // Remove the session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UNSET:' . $var . '=' . getSession($var));
                unset($GLOBALS['_SESSION'][$var]);
-               return session_unregister($var);
+               if (phpversion() >= '5.3.1') {
+                       // session_unregister() is deprecated as of 5.3.1
+                       return true;
+               } else {
+                       // PHP version < 5.3.1
+                       return session_unregister($var);
+               }
        } elseif (('' . $value . '' != '') && (!isSessionVariableSet($var))) {
                // Set session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SET:' . $var . '=' . $value);
                $GLOBALS['_SESSION'][$var] =  $value;
-               return session_register($var);
+               if (phpversion() >= '5.3.1') {
+                       // session_unregister() is deprecated as of 5.3.1
+                       return true;
+               } else {
+                       // PHP version < 5.3.1
+                       return session_register($var);
+               }
        } elseif (!empty($value)) {
                // Update session
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'UPDATE:' . $var . '=' . $value);