openrat-cms

commit d43585f4f79373821d4a8684b87219731b54a543
parent 0f4136d4fa7207907b538a892aa142069b3bb812
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 29 Aug 2019 13:40:19 +0200

Cleanup.

Diffstat:
modules/cms-ui/action/IndexAction.class.php
 | 
103
++++++++++++++++++++++++++++++++++++++++++-------------------------------------

1 file changed, 55 insertions(+), 48 deletions(-)
diff --git a/modules/cms-ui/action/IndexAction.class.php b/modules/cms-ui/action/IndexAction.class.php
@@ -34,8 +34,6 @@ class IndexAction extends Action
 	function __construct()
 	{
         parent::__construct();
-
-		//	$this->lastModified( config('config','last_modification_time') );
 	}
 
 
@@ -43,6 +41,11 @@ class IndexAction extends Action
     {
         $user = Session::getUser();
 
+        if   ( is_object($user) )
+            $this->lastModified( config('config','last_modification_time') );
+        else
+            $this->lastModified( time() );
+
         // Theme für den angemeldeten Benuter ermitteln
         if	( is_object($user) && isset(config('style')[$user->style]) )
             $style = $user->style;
@@ -92,57 +95,17 @@ class IndexAction extends Action
 
         $user = Session::getUser();
 
-        // Gewünschten Dialog direkt öffnen.
-        if($this->hasRequestVar('dialogMethod') )
-            $this->setTemplateVar(array('dialogAction'=>$this->request->action,'dialogMethod'=>$this->getRequestVar('dialogMethod')));
-
         // Is a user logged in?
         if	( !is_object($user) )
 		{
 		    // Lets try an auto login.
+            $this->tryAutoLogin();
 
-			// Versuchen, einen Benutzernamen zu ermitteln, der im Eingabeformular vorausgewählt wird.
-			$modules = explode(',',$conf['security']['modules']['autologin']);
-			
-			$username = '';
-			foreach( $modules as $module)
-			{
-				Logger::debug('Auto-Login module: '.$module);
-				$moduleClass = $module.'Auth';
-				$auth = new $moduleClass;
-				/* @type $auth Auth */
-				$username = $auth->username();
-			
-				if	( !empty($username) )
-				{
-					Logger::debug('Auto-Login for User '.$username);
-					break; // Benutzername gefunden.
-				}
-			}
-			
-			if	( !empty( $username ) )
-			{
-				try
-				{
-					$user = User::loadWithName( $username );
-                    $user->setCurrent();
-                    // Do not update the login timestamp, because this is a readonly request.
-                    Logger::info('auto-login for user '.$username);
-				}
-				catch( ObjectNotFoundException $e )
-				{
-					Logger::warn('Username for autologin does not exist: '.$username);
+            $user = Session::getUser();
+        }
 
-                    // Kein Auto-Login moeglich, die Anmeldemaske anzeigen.
-                    $this->setTemplateVars( array('dialogAction'=>'login','dialogMethod'=>'login'));
-				}
-			}
-			else
-			{
-				// Kein Auto-Login moeglich, die Anmeldemaske anzeigen.
-                $this->setTemplateVars( array('dialogAction'=>'login','dialogMethod'=>'login'));
-			}
-		}
+        if	( !is_object($user) )
+            $this->lastModified( config('config','last_modification_time') );
 
         // Theme für den angemeldeten Benuter ermitteln
 		if	( is_object($user) && isset(config('style')[$user->style]) )
@@ -196,7 +159,7 @@ class IndexAction extends Action
             $methodList[] = array('name'=>$method,'open'=>$openByDefault);
         }
         $this->setTemplateVar('methodList', $methodList);
-        $this->setTemplateVar('favicon_url', Conf()->subset('theme')->get('favicon') );
+        $this->setTemplateVar('favicon_url', Conf()->subset('theme')->get('favicon','modules/cms-ui/themes/default/images/openrat-logo.ico') );
 
         // HTML-Datei direkt einbinden.
         $vars = $this->getOutputData();
@@ -849,5 +812,49 @@ class IndexAction extends Action
         $id     = 0;
     }
 
+    private function tryAutoLogin()
+    {
+        $modules = explode(',',config('security','modules','autologin'));
+
+        $username = '';
+        foreach( $modules as $module)
+        {
+            Logger::debug('Auto-Login module: '.$module);
+            $moduleClass = $module.'Auth';
+            $auth = new $moduleClass;
+            /* @type $auth Auth */
+            $username = $auth->username();
+
+            if	( !empty($username) )
+            {
+                Logger::debug('Auto-Login for User '.$username);
+                break; // Benutzername gefunden.
+            }
+        }
+
+        if	( !empty( $username ) )
+        {
+            try
+            {
+                $user = User::loadWithName( $username );
+                $user->setCurrent();
+                // Do not update the login timestamp, because this is a readonly request.
+                Logger::info('auto-login for user '.$username);
+            }
+            catch( ObjectNotFoundException $e )
+            {
+                Logger::warn('Username for autologin does not exist: '.$username);
+
+                // Kein Auto-Login moeglich, die Anmeldemaske anzeigen.
+                $this->setTemplateVars( array('dialogAction'=>'login','dialogMethod'=>'login'));
+            }
+        }
+        else
+        {
+            // Kein Auto-Login moeglich, die Anmeldemaske anzeigen.
+            $this->setTemplateVars( array('dialogAction'=>'login','dialogMethod'=>'login'));
+        }
+    }
+
 }
 ?> 
\ No newline at end of file