openrat-cms

commit a99215609f725a0b957fbdd6a311b7317d4ea282
parent bde24e81c38e3a953892faa6288598885d4efdc0
Author: dankert <openrat@jandankert.de>
Date:   Fri, 15 Apr 2022 12:50:31 +0200

Code cleanup...

Diffstat:
M
modules/cms/Dispatcher.class.php
 | 
14
++++++--------
M
modules/cms/action/login/LoginLicenseAction.class.php
 | 
4
+---
M
modules/configuration/ConfigurationLoader.class.php
 | 
6
+++---

3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/modules/cms/Dispatcher.class.php b/modules/cms/Dispatcher.class.php
@@ -65,22 +65,22 @@ class Dispatcher
      */
     public function doAction()
     {
-        // Start the session. All classes should have been loaded up to now.
-        session_name('or_sid');
+        // Start the session.
+        session_name(getenv('CMS_SESSION_NAME') ?: 'or_sid');
 		session_start();
 
         $this->checkConfiguration();
 
-		define('PRODUCTION', Configuration::Conf()->is('production',true));
+		define('PRODUCTION' , Configuration::Conf()->is('production',true));
         define('DEVELOPMENT', !PRODUCTION);
 
         if( DEVELOPMENT)
         {
-            ini_set('display_errors', 1);
+            ini_set('display_errors'        , 1);
             ini_set('display_startup_errors', 1);
             error_reporting(E_ALL);
         }else {
-            ini_set('display_errors', 0);
+            ini_set('display_errors'        , 0);
             ini_set('display_startup_errors', 0);
             error_reporting(0);
         }
@@ -262,9 +262,7 @@ class Dispatcher
     {
         $conf = Session::getConfig();
 
-		$configFile = getenv( 'CMS_CONFIG_FILE' );
-		if   ( ! $configFile )
-			$configFile = Startup::DEFAULT_CONFIG_FILE;
+		$configFile = getenv( 'CMS_CONFIG_FILE' ) ?: Startup::DEFAULT_CONFIG_FILE;
 
 		// Konfiguration lesen.
 		// Wenn Konfiguration noch nicht in Session vorhanden oder die Konfiguration geändert wurde (erkennbar anhand des Datei-Datums)
diff --git a/modules/cms/action/login/LoginLicenseAction.class.php b/modules/cms/action/login/LoginLicenseAction.class.php
@@ -40,9 +40,7 @@ class LoginLicenseAction extends LoginAction  {
         $this->setTemplateVar('cms_version' , Configuration::Conf()->subset('application')->get('version' ) );
         $this->setTemplateVar('cms_operator', Configuration::Conf()->subset('application')->get('operator') );
 
-        $user = Session::getUser();
-        if   ( ! $user )
-			$user = new User(); // empty user object as default.
+        $user = Session::getUser() ?: new User(); // empty user object as default.
 
 		$this->setTemplateVar('user_login'   , $user->loginDate );
 		$this->setTemplateVar('user_name'    , $user->name      );
diff --git a/modules/configuration/ConfigurationLoader.class.php b/modules/configuration/ConfigurationLoader.class.php
@@ -59,7 +59,7 @@ class ConfigurationLoader
 
 
 	/**
-	 * Loads the configuration file an resolves all include-commands.
+	 * Loads the configuration file and resolves all include-commands.
 	 *
 	 * @return array Configuration
 	 */
@@ -73,7 +73,7 @@ class ConfigurationLoader
 		$customConfig = YAML::parse(file_get_contents($configFile));
 
 		// resolve variables
-		$customConfig = ConfigurationLoader::resolveVariables($customConfig);
+		$customConfig = self::resolveVariables($customConfig);
 
 		// Does we have includes?
 		if (isset($customConfig['include'])) {
@@ -94,7 +94,7 @@ class ConfigurationLoader
 				if (substr($file, -4) == '.yml' ||
 					substr($file, -5) == '.yaml' ||
 					substr($file, -8) == '.yml.php')
-					$customConfig = array_replace_recursive($customConfig, ConfigurationLoader::loadCustomConfig($file));
+					$customConfig = array_replace_recursive($customConfig, self::loadCustomConfig($file));
 				else
 					error_log('Warning: ' . $file . ' is no .yml file - not loaded');