refactoring

lam/lib/security.inc

@@ -64,7 +64,7 @@ function startSecureSession($redirectToLogin = true, $initSecureData = false) {
 	if (isset($_SESSION)) {
 		unset($_SESSION);
 	}
-	if (strtolower(session_module_name()) == 'files') {
+	if (isFileBasedSession()) {
 		$sessionDir = dirname(__FILE__) . "/../sess";
 		session_save_path($sessionDir);
 		// enable garbage collection (fix for Debian based systems)
@@ -121,6 +121,15 @@ function startSecureSession($redirectToLogin = true, $initSecureData = false) {
 	return true;
 }
 
+/**
+ * Returns if the session uses files storage.
+ *
+ * @return bool file based session
+ */
+function isFileBasedSession(): bool {
+	return ((session_module_name() !== false) && (strtolower(session_module_name()) === 'files'));
+}
+
 /**
  * Checks if the client's IP address is on the list of allowed IPs.
  * The script is stopped if the host is not valid.

lam/templates/config/confImportExport.php

@@ -50,7 +50,7 @@ use ZipArchive;
 include_once('../../lib/persistence.inc');
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/conflogin.php

@@ -48,7 +48,7 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path(dirname(__FILE__) . '/../../sess');
 }
 lam_start_session();

lam/templates/config/confmain.php

@@ -65,7 +65,7 @@ include_once __DIR__ . '/../../lib/2factor.inc';
 include_once __DIR__ . '/../../lib/configPages.inc';
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/confmodules.php

@@ -50,7 +50,7 @@ include_once('../../lib/modules.inc');
 include_once '../../lib/configPages.inc';
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/confsave.php

@@ -42,7 +42,7 @@ include_once(__DIR__ . "/../../lib/config.inc");
 include_once(__DIR__ . "/../../lib/modules.inc");
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/conftypes.php

@@ -49,7 +49,7 @@ include_once '../../lib/types.inc';
 include_once '../../lib/configPages.inc';
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/index.php

@@ -36,7 +36,7 @@ use htmlResponsiveRow;
 include_once('../../lib/config.inc');
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/mainlogin.php

@@ -38,7 +38,7 @@ if (isLAMProVersion()) {
 }
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path(dirname(__FILE__) . '/../../sess');
 }
 lam_start_session();

lam/templates/config/mainmanage.php

@@ -66,7 +66,7 @@ include_once('../../lib/status.inc');
 include_once('../../lib/selfService.inc');
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/moduleSettings.php

@@ -44,7 +44,7 @@ include_once('../../lib/types.inc');
 include_once '../../lib/configPages.inc';
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/config/profmanage.php

@@ -52,7 +52,7 @@ include_once('../../lib/config.inc');
 include_once('../../lib/status.inc');
 
 // start session
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../../sess");
 }
 lam_start_session();

lam/templates/help.php

@@ -46,7 +46,7 @@ if (!empty($_GET['selfService']) && ($_GET['selfService'] === '1')) {
 	session_name('SELFSERVICE');
 }
 
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path("../sess");
 }
 lam_start_session();

lam/templates/lib/141_jquery-validationEngine-lang.php

@@ -25,7 +25,7 @@
 include_once(__DIR__ . "/../../lib/config.inc"); // Include config.inc which provides Config class
 
 // set session save path
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path(dirname(__FILE__) . '/../../sess');
 }
 

lam/templates/login.php

@@ -67,7 +67,7 @@ if (isLAMProVersion()) {
 }
 
 // set session save path
-if (strtolower(session_module_name()) == 'files') {
+if (isFileBasedSession()) {
 	session_save_path(dirname(__FILE__) . '/../sess');
 }
 

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 6
+	level: 7
 	scanDirectories:
 		- lam/lib
 		- lam/templates