diff --git a/ext/admin/main.php b/ext/admin/main.php index bc97347e..9c0f96f0 100644 --- a/ext/admin/main.php +++ b/ext/admin/main.php @@ -272,9 +272,9 @@ class AdminPage extends Extension } $database->execute("ALTER TABLE images AUTO_INCREMENT=".(count($ids) + 1)); } elseif ($matches['proto'] == DatabaseDriver::PGSQL) { - //TODO: Make this work with PostgreSQL + throw new SCoreException("TODO: Make this work with PostgreSQL"); } elseif ($matches['proto'] == DatabaseDriver::SQLITE) { - //TODO: Make this work with SQLite + throw new SCoreException("TODO: Make this work with SQLite"); } return true; } diff --git a/ext/artists/main.php b/ext/artists/main.php index e38edd23..d2b49bb9 100644 --- a/ext/artists/main.php +++ b/ext/artists/main.php @@ -207,11 +207,13 @@ class Artists extends Extension $images = Image::find_images(0, 4, Tag::explode($artist['name'])); $this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin); + /* if ($userIsLogged) { - //$this->theme->show_new_alias_composer($artistID); - //$this->theme->show_new_member_composer($artistID); - //$this->theme->show_new_url_composer($artistID); + $this->theme->show_new_alias_composer($artistID); + $this->theme->show_new_member_composer($artistID); + $this->theme->show_new_url_composer($artistID); } + */ $this->theme->sidebar_options("editor", $artistID, $userIsAdmin); diff --git a/ext/bulk_actions/main.php b/ext/bulk_actions/main.php index 9ab66c0a..c8f999d4 100644 --- a/ext/bulk_actions/main.php +++ b/ext/bulk_actions/main.php @@ -109,7 +109,7 @@ class BulkActions extends Extension $query = $event->args[0]; $items = $this->yield_search_results($event->args[1]); $newEvent = new BulkActionEvent($event->args[0], $event, $items); - print($newEvent); + var_dump($newEvent); # send_event($newEvent); } } diff --git a/ext/cron_uploader/config.php b/ext/cron_uploader/config.php index aa6637dc..631c94f7 100644 --- a/ext/cron_uploader/config.php +++ b/ext/cron_uploader/config.php @@ -36,7 +36,6 @@ abstract class CronUploaderConfig $config->set_int(self::USER, $value); } - public static function get_key(): string { global $config; @@ -55,10 +54,10 @@ abstract class CronUploaderConfig return $config->get_int(self::COUNT); } - public static function set_count(int $value): int + public static function set_count(int $value): void { global $config; - $config->get_int(self::COUNT, $value); + $config->set_int(self::COUNT, $value); } public static function get_dir(): string diff --git a/ext/index/theme.php b/ext/index/theme.php index 8c881afd..7db963ea 100644 --- a/ext/index/theme.php +++ b/ext/index/theme.php @@ -118,9 +118,11 @@ and of course start organising your images :-) $page->set_subheading("Page {$this->page_number} / {$this->total_pages}"); } } + /* if ($this->page_number > 1 || count($this->search_terms) > 0) { - // $page_title .= " / $page_number"; + $page_title .= " / $page_number"; } + */ $page->set_title($page_title); $page->set_heading($page_title); diff --git a/ext/pm/main.php b/ext/pm/main.php index f55bcd63..6a01b527 100644 --- a/ext/pm/main.php +++ b/ext/pm/main.php @@ -139,7 +139,7 @@ class PrivMsg extends Extension } $this->theme->display_message($page, $from_user, $user, new PM($pm)); } else { - // permission denied + $this->theme->display_permission_denied(); } break; case "delete": diff --git a/ext/transcode/main.php b/ext/transcode/main.php index 0511b876..214b5816 100644 --- a/ext/transcode/main.php +++ b/ext/transcode/main.php @@ -331,13 +331,13 @@ class TranscodeImage extends Extension } break; } - if ($result===false) { - throw new ImageTranscodeException("Error while transcoding ".$source_name." to ".$target_format); - } - return $tmp_name; } finally { imagedestroy($image); } + if ($result===false) { + throw new ImageTranscodeException("Error while transcoding ".$source_name." to ".$target_format); + } + return $tmp_name; } private function transcode_image_convert(String $source_name, String $source_format, string $target_format): string diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php index 1b3f6111..51c77ac5 100644 --- a/ext/upgrade/main.php +++ b/ext/upgrade/main.php @@ -28,10 +28,6 @@ class Upgrade extends Extension $this->set_version("db_version", 2); } - if ($this->get_version("db_version") < 6) { - // cry :S - } - // v7 is convert to innodb with adodb // now done again as v9 with PDO diff --git a/themes/danbooru2/ext_manager.theme.php b/themes/danbooru2/ext_manager.theme.php index 270ec929..247406c8 100644 --- a/themes/danbooru2/ext_manager.theme.php +++ b/themes/danbooru2/ext_manager.theme.php @@ -8,7 +8,7 @@ class CustomExtManagerTheme extends ExtManagerTheme parent::display_table($page, $extensions, $editable); } - public function display_doc(Page $page, ExtensionManagerInfo $info) + public function display_doc(Page $page, ExtensionInfo $info) { $page->disable_left(); parent::display_doc($page, $info);