- Cron Command:
- Create a cron job with the command above.
- Read the documentation if you're not sure what to do. ";
+
Cron Command:
+
+
Create a cron job with the command above.
+ Read the documentation if you're not sure what to do.
+
URL:
+
";
+
$install_html = "
This cron uploader is fairly easy to use but has to be configured first.
@@ -76,12 +101,10 @@ class CronUploaderTheme extends Themelet
If an import is already running, another cannot start until it is done.
Each time it runs it will import for up to ".number_format($max_time)." seconds. This is controlled by the PHP max execution time.
Uploaded images will be moved to the 'uploaded' directory into a subfolder named after the time the import started. It's recommended that you remove everything out of this directory from time to time. If you have admin controls enabled, this can be done from Board Admin.
-
If you enable the db logging extension, you can view the log output on this screen. Otherwise the log will be written to a file at ".CronUploaderConfig::get_dir().DIRECTORY_SEPARATOR."uploads.log
+
If you enable the db logging extension, you can view the log output on this screen. Otherwise the log will be written to a file at ".$user_config->get_string(CronUploaderConfig::DIR).DIRECTORY_SEPARATOR."uploads.log
";
- $page->set_title("Cron Uploader");
- $page->set_heading("Cron Uploader");
$block = new Block("Cron Uploader", $info_html, "main", 10);
$block_install = new Block("Setup Guide", $install_html, "main", 30);
@@ -101,6 +124,40 @@ class CronUploaderTheme extends Themelet
}
}
+ public function get_user_options(string $dir, bool $stop_on_error, int $log_level, bool $all_logs): string
+ {
+ $form = SHM_SIMPLE_FORM(
+ "user_admin/cron_uploader",
+ TABLE(
+ ["class"=>"form"],
+ TBODY(
+ TR(
+ TH("Cron Uploader")
+ ),
+ TR(
+ TH("Root dir"),
+ TD(INPUT(["type"=>'text', "name"=>'name', "required"=>true]))
+ ),
+ TR(
+ TH(),
+ TD(
+ LABEL(INPUT(["type"=>'checkbox', "name"=>'stop_on_error']), "Stop On Error")
+ )
+ ),
+ TR(
+ TH(rawHTML("Repeat Password")),
+ TD(INPUT(["type"=>'password', "name"=>'pass2', "required"=>true]))
+ )
+ ),
+ TFOOT(
+ TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Save Settings"])))
+ )
+ )
+ );
+ $html = emptyHTML($form);
+ return (string)$html;
+ }
+
public function display_form(array $failed_dirs)
{
global $page;
diff --git a/ext/custom_html_headers/main.php b/ext/custom_html_headers/main.php
index 52a09687..3fa6e665 100644
--- a/ext/custom_html_headers/main.php
+++ b/ext/custom_html_headers/main.php
@@ -5,7 +5,7 @@ class CustomHtmlHeaders extends Extension
# Adds setup block for custom content
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Custom HTML Headers");
+ $sb = $event->panel->create_new_block("Custom HTML Headers");
// custom headers
$sb->add_longtext_option(
@@ -19,8 +19,6 @@ class CustomHtmlHeaders extends Extension
"as prefix" => "prefix",
"as suffix" => "suffix"
], " Add website name in title");
-
- $event->panel->add_block($sb);
}
public function onInitExt(InitExtEvent $event)
diff --git a/ext/downtime/main.php b/ext/downtime/main.php
index 29507e69..6bc823aa 100644
--- a/ext/downtime/main.php
+++ b/ext/downtime/main.php
@@ -12,10 +12,9 @@ class Downtime extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Downtime");
+ $sb = $event->panel->create_new_block("Downtime");
$sb->add_bool_option("downtime", "Disable non-admin access: ");
$sb->add_longtext_option("downtime_message", " ");
- $event->panel->add_block($sb);
}
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/eokm/main.php b/ext/eokm/main.php
index 83e43633..45b0f32f 100644
--- a/ext/eokm/main.php
+++ b/ext/eokm/main.php
@@ -38,13 +38,11 @@ class Eokm extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("EOKM Filter");
+ $sb = $event->panel->create_new_block("EOKM Filter");
$sb->start_table();
$sb->add_text_option("eokm_username", "Username", true);
$sb->add_text_option("eokm_password", "Password", true);
$sb->end_table();
-
- $event->panel->add_block($sb);
}
}
diff --git a/ext/forum/main.php b/ext/forum/main.php
index b2aac68f..f4d941a2 100644
--- a/ext/forum/main.php
+++ b/ext/forum/main.php
@@ -62,13 +62,12 @@ class Forum extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Forum");
+ $sb = $event->panel->create_new_block("Forum");
$sb->add_int_option("forumTitleSubString", "Title max long: ");
$sb->add_int_option("forumThreadsPerPage", " Threads per page: ");
$sb->add_int_option("forumPostsPerPage", " Posts per page: ");
$sb->add_int_option("forumMaxCharsPerPost", " Max chars per post: ");
- $event->panel->add_block($sb);
}
public function onUserPageBuilding(UserPageBuildingEvent $event)
diff --git a/ext/google_analytics/main.php b/ext/google_analytics/main.php
index c38f8100..72c0f4e9 100644
--- a/ext/google_analytics/main.php
+++ b/ext/google_analytics/main.php
@@ -5,10 +5,9 @@ class GoogleAnalytics extends Extension
# Add analytics to config
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Google Analytics");
+ $sb = $event->panel->create_new_block("Google Analytics");
$sb->add_text_option("google_analytics_id", "Analytics ID: ");
$sb->add_label(" (eg. UA-xxxxxxxx-x)");
- $event->panel->add_block($sb);
}
# Load Analytics tracking code on page request
diff --git a/ext/handle_archive/main.php b/ext/handle_archive/main.php
index d6a57098..55c7b686 100644
--- a/ext/handle_archive/main.php
+++ b/ext/handle_archive/main.php
@@ -12,11 +12,10 @@ class ArchiveFileHandler extends DataHandlerExtension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Archive Handler Options");
+ $sb = $event->panel->create_new_block("Archive Handler Options");
$sb->add_text_option("archive_tmp_dir", "Temporary folder: ");
$sb->add_text_option("archive_extract_command", " Extraction command: ");
$sb->add_label(" %f for archive, %d for temporary directory");
- $event->panel->add_block($sb);
}
public function onDataUpload(DataUploadEvent $event)
diff --git a/ext/handle_pixel/theme.php b/ext/handle_pixel/theme.php
index 485b6b5a..10dc2c24 100644
--- a/ext/handle_pixel/theme.php
+++ b/ext/handle_pixel/theme.php
@@ -30,7 +30,7 @@ class PixelFileHandlerTheme extends Themelet
}
$html = "";
+ "data-width='{$image->width}' data-height='{$image->height} data-mime='{$image->get_mime()}'>";
$page->add_block(new Block("Image", $html, "main", 10));
}
}
diff --git a/ext/handle_video/main.php b/ext/handle_video/main.php
index e0134103..11d3a356 100644
--- a/ext/handle_video/main.php
+++ b/ext/handle_video/main.php
@@ -46,14 +46,13 @@ class VideoFileHandler extends DataHandlerExtension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Video Options");
+ $sb = $event->panel->create_new_block("Video Options");
$sb->start_table();
$sb->add_bool_option(VideoFileHandlerConfig::PLAYBACK_AUTOPLAY, "Autoplay", true);
$sb->add_bool_option(VideoFileHandlerConfig::PLAYBACK_LOOP, "Loop", true);
$sb->add_bool_option(VideoFileHandlerConfig::PLAYBACK_MUTE, "Mute", true);
$sb->add_multichoice_option(VideoFileHandlerConfig::ENABLED_FORMATS, $this->get_options(), "Enabled Formats", true);
$sb->end_table();
- $event->panel->add_block($sb);
}
protected function media_check_properties(MediaCheckPropertiesEvent $event): void
diff --git a/ext/holiday/main.php b/ext/holiday/main.php
index 9c722fd9..7d911c36 100644
--- a/ext/holiday/main.php
+++ b/ext/holiday/main.php
@@ -13,9 +13,8 @@ class Holiday extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Holiday Theme");
+ $sb = $event->panel->create_new_block("Holiday Theme");
$sb->add_bool_option("holiday_aprilfools", "Enable April Fools");
- $event->panel->add_block($sb);
}
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/home/main.php b/ext/home/main.php
index 4da456ed..6dbcfbf4 100644
--- a/ext/home/main.php
+++ b/ext/home/main.php
@@ -27,11 +27,10 @@ class Home extends Extension
$counters[ucfirst($name)] = $name;
}
- $sb = new SetupBlock("Home Page");
+ $sb = $event->panel->create_new_block("Home Page");
$sb->add_longtext_option("home_links", 'Page Links (Use BBCode, leave blank for defaults)');
$sb->add_longtext_option("home_text", " Page Text: ");
$sb->add_choice_option("home_counter", $counters, " Counter: ");
- $event->panel->add_block($sb);
}
diff --git a/ext/image/main.php b/ext/image/main.php
index 0c568c65..80a03391 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -256,7 +256,7 @@ class ImageIO extends Extension
{
global $config;
- $sb = new SetupBlock("Post Options");
+ $sb = $event->panel->create_new_block("Post Options");
$sb->start_table();
$sb->position = 30;
// advanced only
@@ -270,9 +270,8 @@ class ImageIO extends Extension
$sb->add_bool_option(ImageConfig::SHOW_META, "Show metadata", true);
}
$sb->end_table();
- $event->panel->add_block($sb);
- $sb = new SetupBlock("Thumbnailing");
+ $sb = $event->panel->create_new_block("Thumbnailing");
$sb->start_table();
$sb->add_choice_option(ImageConfig::THUMB_ENGINE, self::THUMBNAIL_ENGINES, "Engine", true);
$sb->add_choice_option(ImageConfig::THUMB_MIME, self::THUMBNAIL_TYPES, "Filetype", true);
@@ -294,8 +293,6 @@ class ImageIO extends Extension
}
$sb->end_table();
-
- $event->panel->add_block($sb);
}
public function onParseLinkTemplate(ParseLinkTemplateEvent $event)
diff --git a/ext/image/theme.php b/ext/image/theme.php
index 26c268d7..d85a7cb5 100644
--- a/ext/image/theme.php
+++ b/ext/image/theme.php
@@ -9,11 +9,11 @@ class ImageIOTheme extends Themelet
*/
public function get_deleter_html(int $image_id): string
{
- return (string)SHM_SIMPLE_FORM(
+ return (string)"".SHM_SIMPLE_FORM(
"image/delete",
INPUT(["type"=>'hidden', "name"=>'image_id', "value"=>$image_id]),
- INPUT(["type"=>'submit', "value"=>'Delete', "onclick"=>'return confirm("Delete the image?");']),
- );
+ INPUT(["type"=>'submit', "value"=>'Delete', "onclick"=>'return confirm("Delete the image?");', "id"=>"image_delete_button"]),
+ )."";
}
/**
diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php
index 77f67f94..d4b4b682 100644
--- a/ext/image_view_counter/main.php
+++ b/ext/image_view_counter/main.php
@@ -5,6 +5,14 @@ class ImageViewCounter extends Extension
protected $theme;
private $view_interval = 3600; # allows views to be added each hour
+ # Add Setup Block with options for view counter
+ public function onSetupBuilding(SetupBuildingEvent $event)
+ {
+ $sb = $event->panel->create_new_block("Post View Counter");
+ $sb->add_bool_option("image_viewcounter_adminonly", "Display view counter only to admin");
+ }
+
+ # Adds view to database if needed
public function onDisplayingImage(DisplayingImageEvent $event)
{
global $database, $user;
diff --git a/ext/index/main.php b/ext/index/main.php
index cd73aa16..20e7793e 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -120,14 +120,12 @@ class Index extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Index Options");
+ $sb = $event->panel->create_new_block("Index Options");
$sb->position = 20;
$sb->add_label("Show ");
$sb->add_int_option(IndexConfig::IMAGES);
$sb->add_label(" images on the post list");
-
- $event->panel->add_block($sb);
}
public function onPageNavBuilding(PageNavBuildingEvent $event)
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index 7c7da3be..99b36e78 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -209,7 +209,7 @@ class IPBan extends Extension
{
global $config;
- $sb = new SetupBlock("IP Ban");
+ $sb = $event->panel->create_new_block("IP Ban");
$sb->add_longtext_option("ipban_message", 'Message to show to banned users: (with $IP, $DATE, $ADMIN, $REASON, and $CONTACT)');
if ($config->get_string("ipban_message_ghost")) {
$sb->add_longtext_option("ipban_message_ghost", 'Message to show to ghost users:');
@@ -217,7 +217,6 @@ class IPBan extends Extension
if ($config->get_string("ipban_message_anon-ghost")) {
$sb->add_longtext_option("ipban_message_anon-ghost", 'Message to show to ghost anons:');
}
- $event->panel->add_block($sb);
}
public function onPageSubNavBuilding(PageSubNavBuildingEvent $event)
diff --git a/ext/link_image/main.php b/ext/link_image/main.php
index 11e70cb5..d0fe036c 100644
--- a/ext/link_image/main.php
+++ b/ext/link_image/main.php
@@ -13,9 +13,8 @@ class LinkImage extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Link to Post");
+ $sb = $event->panel->create_new_block("Link to Post");
$sb->add_text_option("ext_link-img_text-link_format", "Text Link Format: ");
- $event->panel->add_block($sb);
}
public function onInitExt(InitExtEvent $event)
diff --git a/ext/livefeed/main.php b/ext/livefeed/main.php
index 730881c3..259be290 100644
--- a/ext/livefeed/main.php
+++ b/ext/livefeed/main.php
@@ -4,9 +4,8 @@ class LiveFeed extends Extension
{
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Live Feed");
+ $sb = $event->panel->create_new_block("Live Feed");
$sb->add_text_option("livefeed_host", "IP:port to send events to: ");
- $event->panel->add_block($sb);
}
public function onUserCreation(UserCreationEvent $event)
diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index f290fc5a..71ad422c 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -235,7 +235,7 @@ class LogDatabase extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Logging (Database)");
+ $sb = $event->panel->create_new_block("Logging (Database)");
$sb->add_choice_option("log_db_priority", [
LOGGING_LEVEL_NAMES[SCORE_LOG_DEBUG] => SCORE_LOG_DEBUG,
LOGGING_LEVEL_NAMES[SCORE_LOG_INFO] => SCORE_LOG_INFO,
@@ -243,7 +243,6 @@ class LogDatabase extends Extension
LOGGING_LEVEL_NAMES[SCORE_LOG_ERROR] => SCORE_LOG_ERROR,
LOGGING_LEVEL_NAMES[SCORE_LOG_CRITICAL] => SCORE_LOG_CRITICAL,
], "Debug Level: ");
- $event->panel->add_block($sb);
}
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/media/main.php b/ext/media/main.php
index b9371965..a636814e 100644
--- a/ext/media/main.php
+++ b/ext/media/main.php
@@ -79,7 +79,7 @@ class Media extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Media Engines");
+ $sb = $event->panel->create_new_block("Media Engines");
// if (self::imagick_available()) {
// try {
@@ -101,8 +101,6 @@ class Media extends Extension
$sb->add_shorthand_int_option(MediaConfig::MEM_LIMIT, "Mem limit", true);
$sb->end_table();
-
- $event->panel->add_block($sb);
}
public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event)
diff --git a/ext/media/media_engine.php b/ext/media/media_engine.php
index bb10ae1e..2adcf926 100644
--- a/ext/media/media_engine.php
+++ b/ext/media/media_engine.php
@@ -47,6 +47,7 @@ abstract class MediaEngine
MimeType::GIF,
MimeType::JPEG,
MimeType::PNG,
+ MimeType::TGA,
MimeType::WEBP,
MimeType::WEBP_LOSSLESS,
],
@@ -57,6 +58,7 @@ abstract class MediaEngine
MimeType::PNG,
MimeType::PPM,
MimeType::PSD,
+ MimeType::TGA,
MimeType::TIFF,
MimeType::WEBP,
MimeType::WEBP_LOSSLESS,
diff --git a/ext/mime/file_extension.php b/ext/mime/file_extension.php
index e570ae4d..8f7ace92 100644
--- a/ext/mime/file_extension.php
+++ b/ext/mime/file_extension.php
@@ -51,6 +51,7 @@ class FileExtension
public const RSS = 'rss';
public const SVG = 'svg';
public const TAR = 'tar';
+ public const TGA = 'tga';
public const TEXT = 'txt';
public const TIFF = 'tiff';
public const TIF = 'tif';
diff --git a/ext/mime/mime_map.php b/ext/mime/mime_map.php
index 23245ae4..9f2bf8cd 100644
--- a/ext/mime/mime_map.php
+++ b/ext/mime/mime_map.php
@@ -184,6 +184,11 @@ class MimeMap
self::MAP_EXT => [FileExtension::TAR],
self::MAP_MIME => [MimeType::TAR],
],
+ MimeType::TGA => [
+ self::MAP_NAME => "TGA",
+ self::MAP_EXT => [FileExtension::TGA],
+ self::MAP_MIME => [MimeType::TGA, 'image/x-targa'],
+ ],
MimeType::TEXT => [
self::MAP_NAME => "Text",
self::MAP_EXT => [FileExtension::TEXT, FileExtension::ASC],
diff --git a/ext/mime/mime_type.php b/ext/mime/mime_type.php
index 418f427a..a879dfc1 100644
--- a/ext/mime/mime_type.php
+++ b/ext/mime/mime_type.php
@@ -44,6 +44,7 @@ class MimeType
public const RSS = 'application/rss+xml';
public const SVG = 'image/svg+xml';
public const TAR = 'application/x-tar';
+ public const TGA = 'image/x-tga';
public const TEXT = 'text/plain';
public const TIFF = 'image/tiff';
public const WAV = 'audio/x-wav';
diff --git a/ext/pools/main.php b/ext/pools/main.php
index 86ec0484..c4d4366e 100644
--- a/ext/pools/main.php
+++ b/ext/pools/main.php
@@ -177,7 +177,7 @@ class Pools extends Extension
// Add a block to the Board Config / Setup
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Pools");
+ $sb = $event->panel->create_new_block("Pools");
$sb->add_int_option(PoolsConfig::MAX_IMPORT_RESULTS, "Max results on import: ");
$sb->add_int_option(PoolsConfig::IMAGES_PER_PAGE, " Posts per page: ");
$sb->add_int_option(PoolsConfig::LISTS_PER_PAGE, " Index list items per page: ");
@@ -186,8 +186,6 @@ class Pools extends Extension
$sb->add_bool_option(PoolsConfig::SHOW_NAV_LINKS, " Show 'Prev' & 'Next' links when viewing pool images: ");
$sb->add_bool_option(PoolsConfig::AUTO_INCREMENT_ORDER, " Autoincrement order when post is added to pool:");
//$sb->add_bool_option(PoolsConfig::ADDER_ON_VIEW_IMAGE, " Show pool adder on image: ");
-
- $event->panel->add_block($sb);
}
public function onPageNavBuilding(PageNavBuildingEvent $event)
diff --git a/ext/post_peek/info.php b/ext/post_peek/info.php
new file mode 100644
index 00000000..a6072544
--- /dev/null
+++ b/ext/post_peek/info.php
@@ -0,0 +1,12 @@
+candidateSize) {
+ candidateSize = newCandidateSize;
+ candidate = newCandidate;
+ }
+ }
+
+ peekerElement.style.left = candidate[0];
+ peekerElement.style.right = candidate[1];
+ peekerElement.style.top =candidate[2];
+ peekerElement.style.bottom = candidate[3];
+
+ peekerElement.style.width = candidate[4][0] + "px";
+ peekerElement.style.height = candidate[4][1] + "px";
+
+
+ peekerElement.appendChild(imgElement);
+
+ if(!peekerOpen) {
+ document.body.appendChild(peekerElement);
+ }
+
+ peekerOpen = true;
+ }
+ linkElement.onmouseleave = function (e) {
+ if(peekerOpen) {
+ document.body.removeChild(peekerElement);
+ peekerOpen = false;
+ }
+ }
+
+ parent.appendChild(linkElement);
+
+
+ //
+ // var offsetX = (item.offsetWidth - newWidth)/2;
+ // var offsetY = (item.offsetHeight - newHeight)/2;
+ //
+ // var scaleX = newWidth / frameWidth;
+ // var scaleY = newHeight / frameHeight;
+ // var scale = scaleX;
+ // if(scaleY
" + inWidth + ":" + inHeight + "
");
+ // $(parent).append(frame);
+ }
+ });
+}
+
+
+document.addEventListener('DOMContentLoaded', () => {
+ postPeekAddPeeker();
+});
diff --git a/ext/post_peek/theme.php b/ext/post_peek/theme.php
new file mode 100644
index 00000000..79efa1af
--- /dev/null
+++ b/ext/post_peek/theme.php
@@ -0,0 +1,5 @@
+panel->create_new_block("Post Titles");
$sb->start_table();
$sb->add_bool_option(PostTitlesConfig::DEFAULT_TO_FILENAME, "Default to filename", true);
$sb->add_bool_option(PostTitlesConfig::SHOW_IN_WINDOW_TITLE, "Show in window title", true);
$sb->end_table();
-
- $event->panel->add_block($sb);
}
public function onBulkExport(BulkExportEvent $event)
diff --git a/ext/private_image/main.php b/ext/private_image/main.php
index fcb17dd8..08786317 100644
--- a/ext/private_image/main.php
+++ b/ext/private_image/main.php
@@ -25,15 +25,11 @@ class PrivateImage extends Extension
public function onUserOptionsBuilding(UserOptionsBuildingEvent $event)
{
- global $user, $user_config;
-
- $event->add_html(
- $this->theme->get_user_options(
- $user,
- $user_config->get_bool(PrivateImageConfig::USER_SET_DEFAULT),
- $user_config->get_bool(PrivateImageConfig::USER_VIEW_DEFAULT),
- )
- );
+ $sb = $event->panel->create_new_block("Private Posts");
+ $sb->start_table();
+ $sb->add_bool_option(PrivateImageConfig::USER_SET_DEFAULT, "Mark posts private by default", true);
+ $sb->add_bool_option(PrivateImageConfig::USER_VIEW_DEFAULT, "View private posts by default", true);
+ $sb->end_table();
}
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/private_image/theme.php b/ext/private_image/theme.php
index b937c924..dac0d9dd 100644
--- a/ext/private_image/theme.php
+++ b/ext/private_image/theme.php
@@ -36,31 +36,4 @@ class PrivateImageTheme extends Themelet
';
}
-
- public function get_user_options(User $user, bool $set_by_default, bool $view_by_default): string
- {
- $html = "
-
-
- ";
- return $html;
- }
}
diff --git a/ext/random_image/main.php b/ext/random_image/main.php
index e0e59355..b9092f49 100644
--- a/ext/random_image/main.php
+++ b/ext/random_image/main.php
@@ -43,9 +43,8 @@ class RandomImage extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Random Post");
+ $sb = $event->panel->create_new_block("Random Post");
$sb->add_bool_option("show_random_block", "Show Random Block: ");
- $event->panel->add_block($sb);
}
public function onPostListBuilding(PostListBuildingEvent $event)
diff --git a/ext/random_list/main.php b/ext/random_list/main.php
index 95a43ee0..17d47267 100644
--- a/ext/random_list/main.php
+++ b/ext/random_list/main.php
@@ -57,15 +57,13 @@ class RandomList extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Random Posts List");
+ $sb = $event->panel->create_new_block("Random Posts List");
// custom headers
$sb->add_int_option(
"random_images_list_count",
"Amount of Random posts to display "
);
-
- $event->panel->add_block($sb);
}
public function onPageSubNavBuilding(PageSubNavBuildingEvent $event)
diff --git a/ext/rating/main.php b/ext/rating/main.php
index 661831e2..42ed72d6 100644
--- a/ext/rating/main.php
+++ b/ext/rating/main.php
@@ -143,15 +143,19 @@ class Ratings extends Extension
public function onUserOptionsBuilding(UserOptionsBuildingEvent $event)
{
- global $user;
+ global $user, $_shm_ratings;
- $event->add_html(
- $this->theme->get_user_options(
- $user,
- self::get_user_default_ratings($user),
- self::get_user_class_privs($user)
- )
- );
+ $levels = self::get_user_class_privs($user);
+ $options = [];
+ foreach ($levels as $level) {
+ $options[$_shm_ratings[$level]->name] = $level;
+ }
+
+ $sb = $event->panel->create_new_block("Default Rating Filter");
+ $sb->start_table();
+ $sb->add_multichoice_option(RatingsConfig::USER_DEFAULTS, $options, "Output Log Level: ", true);
+ $sb->end_table();
+ $sb->add_label("This controls the default rating search results will be filtered by, and nothing else. To override in your search results, add rating:* to your search.");
}
public function onSetupBuilding(SetupBuildingEvent $event)
@@ -165,7 +169,7 @@ class Ratings extends Extension
$options[$rating->name] = $rating->code;
}
- $sb = new SetupBlock("Post Ratings");
+ $sb = $event->panel->create_new_block("Post Ratings");
$sb->start_table();
foreach (array_keys($_shm_user_classes) as $key) {
if ($key == "base" || $key == "hellbanned") {
@@ -174,8 +178,6 @@ class Ratings extends Extension
$sb->add_multichoice_option("ext_rating_" . $key . "_privs", $options, $key, true);
}
$sb->end_table();
-
- $event->panel->add_block($sb);
}
public function onDisplayingImage(DisplayingImageEvent $event)
@@ -417,33 +419,6 @@ class Ratings extends Extension
$page->set_redirect(make_link("post/list"));
}
}
-
- if ($event->page_matches("user_admin")) {
- if (!$user->check_auth_token()) {
- return;
- }
- switch ($event->get_arg(0)) {
- case "default_ratings":
- if (!array_key_exists("id", $_POST) || empty($_POST["id"])) {
- return;
- }
- if (!array_key_exists("rating", $_POST) || empty($_POST["rating"])) {
- return;
- }
- $id = intval($_POST["id"]);
- if ($id != $user->id) {
- throw new SCoreException("Cannot change another user's settings");
- }
- $ratings = $_POST["rating"];
-
- $user_config->set_array(RatingsConfig::USER_DEFAULTS, $ratings);
-
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("user"));
-
- break;
- }
- }
}
public static function get_sorted_ratings(): array
@@ -464,9 +439,9 @@ class Ratings extends Extension
return $config->get_array("ext_rating_".$user->class->name."_privs");
}
- public static function get_user_default_ratings(User $user): array
+ public static function get_user_default_ratings(): array
{
- global $user_config;
+ global $user_config, $user;
$available = self::get_user_class_privs($user);
$selected = $user_config->get_array(RatingsConfig::USER_DEFAULTS);
diff --git a/ext/rating/theme.php b/ext/rating/theme.php
index 52317ea1..7ff8393e 100644
--- a/ext/rating/theme.php
+++ b/ext/rating/theme.php
@@ -96,7 +96,7 @@ class RatingsTheme extends Themelet
-
Default Rating Filter
+
This controls the default rating search results will be filtered by, and nothing else. To override in your search results, add rating:* to your search.
diff --git a/ext/report_image/main.php b/ext/report_image/main.php
index 65580cbf..e1547706 100644
--- a/ext/report_image/main.php
+++ b/ext/report_image/main.php
@@ -157,7 +157,7 @@ class ReportImage extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Post Reports");
+ $sb = $event->panel->create_new_block("Post Reports");
$opts = [
"Reporter Only" => "user",
@@ -166,8 +166,6 @@ class ReportImage extends Extension
"None" => "none",
];
$sb->add_choice_option("report_image_publicity", $opts, "Show publicly: ");
-
- $event->panel->add_block($sb);
}
public function delete_reports_by(int $user_id)
diff --git a/ext/res_limit/main.php b/ext/res_limit/main.php
index e5df6be9..700e7f1e 100644
--- a/ext/res_limit/main.php
+++ b/ext/res_limit/main.php
@@ -58,7 +58,7 @@ class ResolutionLimit extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Resolution Limits");
+ $sb = $event->panel->create_new_block("Resolution Limits");
$sb->add_label("Min ");
$sb->add_int_option("upload_min_width");
@@ -77,7 +77,5 @@ class ResolutionLimit extends Extension
$sb->add_label(" Ratios ");
$sb->add_text_option("upload_ratios");
$sb->add_label(" (eg. '4:3 16:9', blank for no limit)");
-
- $event->panel->add_block($sb);
}
}
diff --git a/ext/resize/main.php b/ext/resize/main.php
index 234fb232..f3a7af4c 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -50,7 +50,7 @@ class ResizeImage extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Image Resize");
+ $sb = $event->panel->create_new_block("Image Resize");
$sb->start_table();
$sb->add_choice_option(ResizeConfig::ENGINE, MediaEngine::IMAGE_ENGINES, "Engine", true);
$sb->add_bool_option(ResizeConfig::ENABLED, "Allow resizing images", true);
@@ -67,7 +67,6 @@ class ResizeImage extends Extension
$sb->add_label("
px
");
$sb->add_label("
(enter 0 for no default)
");
$sb->end_table();
- $event->panel->add_block($sb);
}
public function onDataUpload(DataUploadEvent $event)
diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index b947ce0d..c0b3d8a6 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -38,12 +38,11 @@ class RotateImage extends Extension
public function onSetupBuilding(SetupBuildingEvent $event)
{
- $sb = new SetupBlock("Image Rotate");
+ $sb = $event->panel->create_new_block("Image Rotate");
$sb->add_bool_option("rotate_enabled", "Allow rotating images: ");
$sb->add_label(" Default Orientation: ");
$sb->add_int_option("rotate_default_deg");
$sb->add_label(" deg");
- $event->panel->add_block($sb);
}
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/setup/main.php b/ext/setup/main.php
index 430b3695..305d71fd 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -40,10 +40,19 @@ class SetupPanel
{
/** @var SetupBlock[] */
public $blocks = [];
+ /** @var BaseConfig */
+ public $config;
- public function add_block(SetupBlock $block)
+ public function __construct(BaseConfig $config)
{
+ $this->config = $config;
+ }
+
+ public function create_new_block(string $title): SetupBlock
+ {
+ $block = new SetupBlock($title, $this->config);
$this->blocks[] = $block;
+ return $block;
}
}
@@ -53,10 +62,13 @@ class SetupBlock extends Block
public $header;
/** @var string */
public $body;
+ /** @var BaseConfig */
+ public $config;
- public function __construct(string $title)
+ public function __construct(string $title, BaseConfig $config)
{
parent::__construct($title, "", "main", 50);
+ $this->config = $config;
}
public function add_label(string $text)
@@ -166,8 +178,7 @@ class SetupBlock extends Block
public function add_text_option(string $name, string $label=null, bool $table_row = false)
{
- global $config;
- $val = html_escape($config->get_string($name));
+ $val = html_escape($this->config->get_string($name));
$html = "\n";
$html .= "\n";
@@ -177,8 +188,7 @@ class SetupBlock extends Block
public function add_longtext_option(string $name, string $label=null, bool $table_row = false)
{
- global $config;
- $val = html_escape($config->get_string($name));
+ $val = html_escape($this->config->get_string($name));
$rows = max(3, min(10, count(explode("\n", $val))));
$html = "\n";
@@ -189,8 +199,7 @@ class SetupBlock extends Block
public function add_bool_option(string $name, string $label=null, bool $table_row = false)
{
- global $config;
- $checked = $config->get_bool($name) ? " checked" : "";
+ $checked = $this->config->get_bool($name) ? " checked" : "";
$html = "";
if (!$table_row&&!is_null($label)) {
@@ -215,8 +224,7 @@ class SetupBlock extends Block
public function add_int_option(string $name, string $label=null, bool $table_row = false)
{
- global $config;
- $val = $config->get_int($name);
+ $val = $this->config->get_int($name);
$html = "\n";
$html .= "\n";
@@ -226,8 +234,7 @@ class SetupBlock extends Block
public function add_shorthand_int_option(string $name, string $label=null, bool $table_row = false)
{
- global $config;
- $val = to_shorthand_int($config->get_int($name));
+ $val = to_shorthand_int($this->config->get_int($name));
$html = "\n";
$html .= "\n";
@@ -236,11 +243,10 @@ class SetupBlock extends Block
public function add_choice_option(string $name, array $options, string $label=null, bool $table_row = false)
{
- global $config;
if (is_int(array_values($options)[0])) {
- $current = $config->get_int($name);
+ $current = $this->config->get_int($name);
} else {
- $current = $config->get_string($name);
+ $current = $this->config->get_string($name);
}
$html = "