From dba89e9d13ecfc89bcfe1643cd38468c912a15a8 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Mon, 27 Jan 2020 18:35:36 +0000
Subject: [PATCH] make all themes have a Page class, to simplify loading

---
 core/_bootstrap.php                                       | 2 +-
 core/{page.php => basepage.php}                           | 4 +++-
 core/util.php                                             | 4 +---
 themes/danbooru/{custompage.class.php => page.class.php}  | 2 +-
 themes/danbooru2/{custompage.class.php => page.class.php} | 2 +-
 themes/default/page.class.php                             | 2 ++
 themes/futaba/{custompage.class.php => page.class.php}    | 2 +-
 themes/lite/{custompage.class.php => page.class.php}      | 5 +----
 themes/material/page.class.php                            | 2 ++
 themes/warm/page.class.php                                | 2 ++
 10 files changed, 15 insertions(+), 12 deletions(-)
 rename core/{page.php => basepage.php} (99%)
 rename themes/danbooru/{custompage.class.php => page.class.php} (85%)
 rename themes/danbooru2/{custompage.class.php => page.class.php} (83%)
 create mode 100644 themes/default/page.class.php
 rename themes/futaba/{custompage.class.php => page.class.php} (83%)
 rename themes/lite/{custompage.class.php => page.class.php} (75%)
 create mode 100644 themes/material/page.class.php
 create mode 100644 themes/warm/page.class.php

diff --git a/core/_bootstrap.php b/core/_bootstrap.php
index 671abe6b..3588225d 100644
--- a/core/_bootstrap.php
+++ b/core/_bootstrap.php
@@ -38,7 +38,7 @@ require_all(zglob("ext/{".Extension::get_enabled_extensions_as_string()."}/main.
 
 // load the theme parts
 require_all(_get_themelet_files(get_theme()));
-$page = class_exists("CustomPage") ? new CustomPage() : new Page();
+$page = new Page();
 
 // hook up event handlers
 _load_event_listeners();
diff --git a/core/page.php b/core/basepage.php
similarity index 99%
rename from core/page.php
rename to core/basepage.php
index baa9f273..98e48091 100644
--- a/core/page.php
+++ b/core/basepage.php
@@ -1,4 +1,6 @@
 <?php declare(strict_types=1);
+require_once "core/event.php";
+
 /**
  * \page themes Themes
  *
@@ -42,7 +44,7 @@ abstract class PageMode
  * The various extensions all add whatever they want to this structure,
  * then Layout turns it into HTML.
  */
-class Page
+class BasePage
 {
     /** @var string */
     public $mode = PageMode::PAGE;
diff --git a/core/util.php b/core/util.php
index 61cccc97..824530e1 100644
--- a/core/util.php
+++ b/core/util.php
@@ -528,9 +528,7 @@ function _sanitise_environment(): void
 function _get_themelet_files(string $_theme): array
 {
     $base_themelets = [];
-    if (file_exists('themes/'.$_theme.'/custompage.class.php')) {
-        $base_themelets[] = 'themes/'.$_theme.'/custompage.class.php';
-    }
+    $base_themelets[] = 'themes/'.$_theme.'/page.class.php';
     $base_themelets[] = 'themes/'.$_theme.'/layout.class.php';
     $base_themelets[] = 'themes/'.$_theme.'/themelet.class.php';
 
diff --git a/themes/danbooru/custompage.class.php b/themes/danbooru/page.class.php
similarity index 85%
rename from themes/danbooru/custompage.class.php
rename to themes/danbooru/page.class.php
index f4a0ef19..bf0fea42 100644
--- a/themes/danbooru/custompage.class.php
+++ b/themes/danbooru/page.class.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-class CustomPage extends Page
+class Page extends BasePage
 {
     /** @var bool */
     public $left_enabled = true;
diff --git a/themes/danbooru2/custompage.class.php b/themes/danbooru2/page.class.php
similarity index 83%
rename from themes/danbooru2/custompage.class.php
rename to themes/danbooru2/page.class.php
index 723f56fd..ad798d19 100644
--- a/themes/danbooru2/custompage.class.php
+++ b/themes/danbooru2/page.class.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-class CustomPage extends Page
+class Page extends BasePage
 {
     public $left_enabled = true;
     public function disable_left()
diff --git a/themes/default/page.class.php b/themes/default/page.class.php
new file mode 100644
index 00000000..b3b34c2f
--- /dev/null
+++ b/themes/default/page.class.php
@@ -0,0 +1,2 @@
+<?php declare(strict_types=1);
+class Page extends BasePage {}
diff --git a/themes/futaba/custompage.class.php b/themes/futaba/page.class.php
similarity index 83%
rename from themes/futaba/custompage.class.php
rename to themes/futaba/page.class.php
index 723f56fd..ad798d19 100644
--- a/themes/futaba/custompage.class.php
+++ b/themes/futaba/page.class.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-class CustomPage extends Page
+class Page extends BasePage
 {
     public $left_enabled = true;
     public function disable_left()
diff --git a/themes/lite/custompage.class.php b/themes/lite/page.class.php
similarity index 75%
rename from themes/lite/custompage.class.php
rename to themes/lite/page.class.php
index c8e24a00..6960d615 100644
--- a/themes/lite/custompage.class.php
+++ b/themes/lite/page.class.php
@@ -1,9 +1,6 @@
 <?php declare(strict_types=1);
 
-/**
- * Class CustomPage
- */
-class CustomPage extends Page
+class Page extends BasePage
 {
     /** @var bool  */
     public $left_enabled = true;
diff --git a/themes/material/page.class.php b/themes/material/page.class.php
new file mode 100644
index 00000000..b3b34c2f
--- /dev/null
+++ b/themes/material/page.class.php
@@ -0,0 +1,2 @@
+<?php declare(strict_types=1);
+class Page extends BasePage {}
diff --git a/themes/warm/page.class.php b/themes/warm/page.class.php
new file mode 100644
index 00000000..b3b34c2f
--- /dev/null
+++ b/themes/warm/page.class.php
@@ -0,0 +1,2 @@
+<?php declare(strict_types=1);
+class Page extends BasePage {}