clean up theme file

Leantime · Jun 2, 2024 · 095b3fc · 095b3fc
1 parent efab082
commit 095b3fc
Showing 1 changed file with 32 additions and 23 deletions.
diff --git a/app/Core/Theme.php b/app/Core/Theme.php
@@ -143,11 +143,16 @@ public function __construct(
         $this->language = $language;
     }
 
+    /**
+     * Retrieves the available color schemes.
+     *
+     * @return array The available color schemes.
+     */
     public function getAvailableColorSchemes(): array
     {
 
         $this->readIniData();
-        ;
+
         $parsedColorSchemes = $this->colorSchemes;
         $parsedColorSchemes["themeDefault"] = array(
             "name" => "label.themeDefault",
@@ -157,7 +162,8 @@ public function getAvailableColorSchemes(): array
 
         $settingsRepo = app()->make(Setting::class);
         $primaryColor = $settingsRepo->getSetting("companysettings.primarycolor") ? $settingsRepo->getSetting("companysettings.primarycolor") : null;
-        $secondaryColor = $settingsRepo->getSetting("companysettings.secondarycolor") ? $settingsRepo->getSetting("companysettings.secondarycolor") : null; ;
+        $secondaryColor = $settingsRepo->getSetting("companysettings.secondarycolor") ? $settingsRepo->getSetting("companysettings.secondarycolor") : null;
+        ;
         $parsedColorSchemes["companyColors"] = array(
             "name" => "label.companyColors",
             "primaryColor" => $primaryColor ?? $this->config->primarycolor ?? $parsedColorSchemes["themeDefault"]["primaryColor"],
@@ -192,7 +198,7 @@ public function getActive(): string
 
         // Return user specific theme, if active
         //This is an active logged in session.
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             //User is logged in, we don't have a theme yet, check settings
             $settingsRepo = app()->make(Setting::class);
             $theme = $settingsRepo->getSetting("usersettings." . $_SESSION["userdata"]["id"] . ".theme");
@@ -234,7 +240,7 @@ public function getColorMode()
             return $_SESSION['usersettings.colorMode'];
         }
 
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             //User is logged in, we don't have a theme yet, check settings
             $settingsRepo = app()->make(Setting::class);
             $colorMode = $settingsRepo->getSetting("usersettings." . $_SESSION["userdata"]["id"] . ".colorMode");
@@ -272,7 +278,7 @@ public function getColorScheme()
             return $_SESSION['usersettings.colorScheme'];
         }
 
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             //User is logged in, we don't have a theme yet, check settings
             $settingsRepo = app()->make(Setting::class);
             $colorScheme = $settingsRepo->getSetting("usersettings." . $_SESSION["userdata"]["id"] . ".colorScheme");
@@ -307,7 +313,7 @@ public function getFont()
             return $_SESSION['usersettings.themeFont'];
         }
 
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             //User is logged in, we don't have a theme yet, check settings
             $settingsRepo = app()->make(Setting::class);
             $themeFont = $settingsRepo->getSetting("usersettings." . $_SESSION["userdata"]["id"] . ".themeFont");
@@ -350,7 +356,7 @@ public function setActive(string $id): void
         }
 
         //Only set if user is logged in
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             $_SESSION['usersettings.theme'] = $id;
         }
 
@@ -381,7 +387,7 @@ public function setColorMode(string $colorMode): void
         }
 
         //Only store colors in session for logged in users
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             $_SESSION['usersettings.colorMode'] = $colorMode;
         }
 
@@ -412,7 +418,7 @@ public function setFont(string $font): void
             $font = 'roboto';
         }
 
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             $_SESSION['usersettings.themeFont'] = $font;
         }
 
@@ -443,7 +449,7 @@ public function setColorScheme(string $colorScheme): void
             $colorScheme = 'themeDefault';
         }
 
-        if(Auth::isLoggedIn()){
+        if (Auth::isLoggedIn()) {
             $_SESSION['usersettings.colorScheme'] = $colorScheme;
             $this->setAccentColors($colorScheme);
         }
@@ -458,8 +464,6 @@ public function setColorScheme(string $colorScheme): void
                 ->withSameSite('Strict')
             ))
         );
-
-
     }
 
 
@@ -767,7 +771,7 @@ public function setThemeDefaultColors()
     public function setCompanyColors()
     {
 
-        if (! isset($_SESSION["usersettings.colorScheme.primaryColor"]) ) {
+        if (! isset($_SESSION["usersettings.colorScheme.primaryColor"])) {
             $settingsRepo = app()->make(Setting::class);
             $primaryColor = $settingsRepo->getSetting("companysettings.primarycolor");
 
@@ -814,19 +818,22 @@ public function setSchemeColors($colorscheme)
      *
      * @return string The primary color.
      */
-    public function getPrimaryColor() {
+    public function getPrimaryColor()
+    {
 
-        if (isset($_SESSION["usersettings.colorScheme.primaryColor"])
+        if (
+            isset($_SESSION["usersettings.colorScheme.primaryColor"])
             && $_SESSION["usersettings.colorScheme.primaryColor"] != ''
-            &&  Auth::isLoggedIn()) {
+            &&  Auth::isLoggedIn()
+        ) {
             return $_SESSION["usersettings.colorScheme.primaryColor"];
         }
 
         $currentColorScheme = $this->getColorScheme();
 
         $colorSchemes = $this->getAvailableColorSchemes();
 
-        if(Auth::isLoggedIn()) {
+        if (Auth::isLoggedIn()) {
             $_SESSION["usersettings.colorScheme.primaryColor"] = $colorSchemes[$currentColorScheme]['primaryColor'];
         }
 
@@ -845,18 +852,21 @@ public function getPrimaryColor() {
      * @access public
      * @return string The secondary color for the current user's color scheme
      */
-    public function getSecondaryColor() {
+    public function getSecondaryColor()
+    {
 
-        if (isset($_SESSION["usersettings.colorScheme.secondaryColor"])
-        && $_SESSION["usersettings.colorScheme.secondaryColor"] != ''
-        &&  Auth::isLoggedIn()) {
+        if (
+            isset($_SESSION["usersettings.colorScheme.secondaryColor"])
+            && $_SESSION["usersettings.colorScheme.secondaryColor"] != ''
+            &&  Auth::isLoggedIn()
+        ) {
             return $_SESSION["usersettings.colorScheme.secondaryColor"];
         }
 
         $colorSchemes = $this->getAvailableColorSchemes();
         $currentColorScheme = $this->getColorScheme();
 
-        if(Auth::isLoggedIn()) {
+        if (Auth::isLoggedIn()) {
             $_SESSION["usersettings.colorScheme.secondaryColor"] = $colorSchemes[$currentColorScheme]['secondaryColor'];
         }
 
@@ -876,7 +886,6 @@ private function readIniData(): void
             error_log("Configuration file for theme " . $this->getActive() . " not found");
             $this->clearCache();
             $this->setActive("default");
-
         }
         $this->iniData = parse_ini_file(
             ROOT . '/theme/' . $this->getActive() . '/' . static::DEFAULT_INI . '.ini',