Keep support for portal old setup

NamelessMC · Mar 9, 2024 · 1ca7592 · 1ca7592
1 parent 4489221
commit 1ca7592
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/custom/panel_templates/Default/core/general_settings.tpl b/custom/panel_templates/Default/core/general_settings.tpl
@@ -99,7 +99,7 @@
                                             <label for="inputHomepage">{$HOMEPAGE_TYPE}</label>
                                             <select name="homepage" class="form-control" id="inputHomepage">
                                                 {foreach from=$HOMEPAGE_PAGES item=page}
-                                                    <option value="{$page.value}" {if $HOMEPAGE_VALUE eq {$page.value} } selected{/if}>{$page.module} - {$page.value}</option>
+                                                    <option value="{$page.value}" {if $HOMEPAGE_VALUE eq {$page.value} } selected{/if}>{$page.module} - {$page.name}</option>
                                                 {/foreach}
                                             </select>
                                         </div>

diff --git a/index.php b/index.php
@@ -89,7 +89,7 @@
         require(ROOT_PATH . '/404.php');
     } else {
         // Homepage
-        $homepage = $pages->getPageByURL(Settings::get('default_homepage'));
+        $homepage = $pages->getPageByURL(Settings::get('home_type'));
         if ($homepage != null) {
             $pages->setActivePage($homepage);
             require(implode(DIRECTORY_SEPARATOR, [ROOT_PATH, 'modules', $homepage['module'], $homepage['file']]));
@@ -98,7 +98,7 @@
             require(ROOT_PATH . '/modules/Core/pages/index.php');
         }
 
-        Settings::get('default_homepage');
+        Settings::get('home_type');
     }
     die();
 }

diff --git a/modules/Core/pages/custom.php b/modules/Core/pages/custom.php
@@ -10,7 +10,7 @@
  */
 
 // Check whenever route is homepage or not
-$page_route = empty($route) ? Settings::get('default_homepage') : rtrim($route, '/');
+$page_route = empty($route) ? Settings::get('home_type') : rtrim($route, '/');
 
 // Get page info from URL
 $custom_page = DB::getInstance()->get('custom_pages', ['url', $page_route]);

diff --git a/modules/Core/pages/home.php b/modules/Core/pages/home.php
@@ -32,6 +32,9 @@
 }
 
 $home_type = Settings::get('home_type');
+if ($home_type === '/') {
+    $home_type = 'news';
+}
 
 $smarty->assign('HOME_TYPE', $home_type);
 

diff --git a/modules/Core/pages/panel/general_settings.php b/modules/Core/pages/panel/general_settings.php
@@ -111,7 +111,7 @@
             }
 
             // Default Homepage
-            Settings::set('default_homepage', $_POST['homepage']);
+            Settings::set('home_type', $_POST['homepage']);
 
             // Private profile
             Settings::set('private_profile', $_POST['privateProfile'] ? '1' : '0');
@@ -219,14 +219,28 @@
 $displaynames = Settings::get('displaynames');
 $method = Settings::get('login_method');
 
-$homepage_pages = [];
+$homepage_pages = [[
+    'value' => 'news',
+    'name' => $language->get('admin', 'homepage_news'),
+    'module' => 'Core'
+], [
+    'value' => 'portal',
+    'name' => $language->get('admin', 'portal'),
+    'module' => 'Core'
+], [
+    'value' => 'custom',
+    'name' => $language->get('admin', 'custom_content'),
+    'module' => 'Core'
+]];
+
 foreach ($pages->returnPages() as $key => $page) {
     if (str_contains($key, '/panel/') || str_contains($key, '/queries/') || str_contains($key, '/user/')) {
         continue;
     }
 
     $homepage_pages[] = [
         'value' => $key,
+        'name' => $key,
         'module' => $page['module']
     ];
 }
@@ -262,7 +276,7 @@
     'DEFAULT_TIMEZONE_VALUE' => $timezone,
     'HOMEPAGE_TYPE' => $language->get('admin', 'default_homepage'),
     'HOMEPAGE_PAGES' => $homepage_pages,
-    'HOMEPAGE_VALUE' => Settings::get('default_homepage'),
+    'HOMEPAGE_VALUE' => Settings::get('home_type'),
     'USE_FRIENDLY_URLS' => $language->get('admin', 'use_friendly_urls'),
     'USE_FRIENDLY_URLS_VALUE' => Config::get('core.friendly'),
     'USE_FRIENDLY_URLS_HELP' => $language->get('admin', 'use_friendly_urls_help', [