" . $middle . "
" . $this->theme->build_thumb_html($duplicate); throw new ImageReplaceException($error); @@ -306,7 +306,7 @@ public function onSetupBuilding(SetupBuildingEvent $event) $sb->add_int_option(ImageConfig::THUMB_QUALITY, "Quality", true); $sb->add_int_option(ImageConfig::THUMB_SCALING, "High-DPI Scale %", true); - if ($config->get_string(ImageConfig::THUMB_MIME)===MimeType::JPEG) { + if ($config->get_string(ImageConfig::THUMB_MIME) === MimeType::JPEG) { $sb->add_color_option(ImageConfig::THUMB_ALPHA_COLOR, "Alpha Conversion Color", true); } diff --git a/ext/image/theme.php b/ext/image/theme.php index 3a016fc72..9d8fd9d47 100644 --- a/ext/image/theme.php +++ b/ext/image/theme.php @@ -16,8 +16,8 @@ public function get_deleter_html(int $image_id): string { 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?");', "id"=>"image_delete_button"]), + INPUT(["type" => 'hidden', "name" => 'image_id', "value" => $image_id]), + INPUT(["type" => 'submit', "value" => 'Delete', "onclick" => 'return confirm("Delete the image?");', "id" => "image_delete_button"]), ).""; } @@ -28,8 +28,8 @@ public function get_replace_html(int $image_id): string { return (string)SHM_SIMPLE_FORM( "image/replace", - INPUT(["type"=>'hidden', "name"=>'image_id', "value"=>$image_id]), - INPUT(["type"=>'submit', "value"=>'Replace']), + INPUT(["type" => 'hidden', "name" => 'image_id', "value" => $image_id]), + INPUT(["type" => 'submit', "value" => 'Replace']), ); } } diff --git a/ext/image_hash_ban/info.php b/ext/image_hash_ban/info.php index 339fa5ce2..1feefb557 100644 --- a/ext/image_hash_ban/info.php +++ b/ext/image_hash_ban/info.php @@ -11,7 +11,7 @@ class ImageBanInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Post Hash Ban"; public string $url = "http://atravelinggeek.com/"; - public array $authors = ["ATravelingGeek"=>"atg@atravelinggeek.com"]; + public array $authors = ["ATravelingGeek" => "atg@atravelinggeek.com"]; public string $license = self::LICENSE_GPLV2; public string $description = "Ban images based on their hash"; public ?string $version = "0.1, October 21, 2007"; diff --git a/ext/image_hash_ban/main.php b/ext/image_hash_ban/main.php index c50604cf1..810b3a8e2 100644 --- a/ext/image_hash_ban/main.php +++ b/ext/image_hash_ban/main.php @@ -79,7 +79,7 @@ public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) public function onDataUpload(DataUploadEvent $event) { global $database; - $row = $database->get_row("SELECT * FROM image_bans WHERE hash = :hash", ["hash"=>$event->hash]); + $row = $database->get_row("SELECT * FROM image_bans WHERE hash = :hash", ["hash" => $event->hash]); if ($row) { log_info("image_hash_ban", "Attempted to upload a blocked image ({$event->hash} - {$row['reason']})"); throw new UploadException("Post ".html_escape($row["hash"])." has been banned, reason: ".format_text($row["reason"])); @@ -94,7 +94,7 @@ public function onPageRequest(PageRequestEvent $event) if ($user->can(Permissions::BAN_IMAGE)) { if ($event->get_arg(0) == "add") { $user->ensure_authed(); - $input = validate_input(["c_hash"=>"optional,string", "c_reason"=>"string", "c_image_id"=>"optional,int"]); + $input = validate_input(["c_hash" => "optional,string", "c_reason" => "string", "c_image_id" => "optional,int"]); $image = isset($input['c_image_id']) ? Image::by_id($input['c_image_id']) : null; $hash = isset($input["c_hash"]) ? $input["c_hash"] : $image->hash; $reason = isset($input['c_reason']) ? $input['c_reason'] : "DNP"; @@ -113,7 +113,7 @@ public function onPageRequest(PageRequestEvent $event) } } elseif ($event->get_arg(0) == "remove") { $user->ensure_authed(); - $input = validate_input(["d_hash"=>"string"]); + $input = validate_input(["d_hash" => "string"]); send_event(new RemoveImageHashBanEvent($input['d_hash'])); $page->flash("Post ban removed"); $page->set_mode(PageMode::REDIRECT); @@ -131,7 +131,7 @@ public function onPageRequest(PageRequestEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent==="system") { + if ($event->parent === "system") { if ($user->can(Permissions::BAN_IMAGE)) { $event->add_nav_link("image_bans", new Link('image_hash_ban/list/1'), "Post Bans", NavLink::is_active(["image_hash_ban"])); } @@ -151,7 +151,7 @@ public function onAddImageHashBan(AddImageHashBanEvent $event) global $database; $database->execute( "INSERT INTO image_bans (hash, reason, date) VALUES (:hash, :reason, now())", - ["hash"=>$event->hash, "reason"=>$event->reason] + ["hash" => $event->hash, "reason" => $event->reason] ); log_info("image_hash_ban", "Banned hash {$event->hash} because '{$event->reason}'"); } @@ -159,7 +159,7 @@ public function onAddImageHashBan(AddImageHashBanEvent $event) public function onRemoveImageHashBan(RemoveImageHashBanEvent $event) { global $database; - $database->execute("DELETE FROM image_bans WHERE hash = :hash", ["hash"=>$event->hash]); + $database->execute("DELETE FROM image_bans WHERE hash = :hash", ["hash" => $event->hash]); } public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) diff --git a/ext/image_hash_ban/theme.php b/ext/image_hash_ban/theme.php index 723d197a1..7d347d38a 100644 --- a/ext/image_hash_ban/theme.php +++ b/ext/image_hash_ban/theme.php @@ -26,10 +26,10 @@ public function get_buttons_html(Image $image): string { return (string)SHM_SIMPLE_FORM( "image_hash_ban/add", - INPUT(["type"=>'hidden', "name"=>'c_hash', "value"=>$image->hash]), - INPUT(["type"=>'hidden', "name"=>'c_image_id', "value"=>$image->id]), - INPUT(["type"=>'text', "name"=>'c_reason']), - INPUT(["type"=>'submit', "value"=>'Ban Hash and Delete Post']), + INPUT(["type" => 'hidden', "name" => 'c_hash', "value" => $image->hash]), + INPUT(["type" => 'hidden', "name" => 'c_image_id', "value" => $image->id]), + INPUT(["type" => 'text', "name" => 'c_reason']), + INPUT(["type" => 'submit', "value" => 'Ban Hash and Delete Post']), ); } } diff --git a/ext/image_view_counter/info.php b/ext/image_view_counter/info.php index 7a4a42f4f..48558ac3d 100644 --- a/ext/image_view_counter/info.php +++ b/ext/image_view_counter/info.php @@ -11,7 +11,7 @@ class ImageViewCounterInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Post View Counter"; public string $url = "http://www.drudexsoftware.com/"; - public array $authors = ["Drudex Software"=>"support@drudexsoftware.com"]; + public array $authors = ["Drudex Software" => "support@drudexsoftware.com"]; public string $license = self::LICENSE_GPLV2; public string $description = "Tracks & displays how many times a post is viewed"; public ?string $documentation = diff --git a/ext/image_view_counter/main.php b/ext/image_view_counter/main.php index 667d74490..269bd0950 100644 --- a/ext/image_view_counter/main.php +++ b/ext/image_view_counter/main.php @@ -113,7 +113,7 @@ public function onPageRequest(PageRequestEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { - if ($event->parent=="posts") { + if ($event->parent == "posts") { $event->add_nav_link("sort_by_visits", new Link('popular_images'), "Popular Posts"); } } diff --git a/ext/index/events.php b/ext/index/events.php index 235cfc4e5..f89f1eb75 100644 --- a/ext/index/events.php +++ b/ext/index/events.php @@ -21,7 +21,7 @@ class SearchTermParseEvent extends Event public array $tag_conditions = []; public ?string $order = null; - public function __construct(int $id, string $term=null, array $context=[]) + public function __construct(int $id, string $term = null, array $context = []) { parent::__construct(); @@ -75,7 +75,7 @@ public function __construct(array $search) $this->search_terms = $search; } - public function add_control(string $html, int $position=50) + public function add_control(string $html, int $position = 50) { while (isset($this->parts[$position])) { $position++; diff --git a/ext/index/main.php b/ext/index/main.php index 3f6582737..d8c57900a 100644 --- a/ext/index/main.php +++ b/ext/index/main.php @@ -79,14 +79,14 @@ public function onPageRequest(PageRequestEvent $event) // extra caching for the first few post/list pages $images = $cache->get("post-list:$page_number"); if (is_null($images)) { - $images = Image::find_images(($page_number-1)*$page_size, $page_size, $search_terms); + $images = Image::find_images(($page_number - 1) * $page_size, $page_size, $search_terms); $cache->set("post-list:$page_number", $images, 60); } } } if (!$images) { - $images = Image::find_images(($page_number-1)*$page_size, $page_size, $search_terms); + $images = Image::find_images(($page_number - 1) * $page_size, $page_size, $search_terms); } } catch (PermissionDeniedException $pde) { $this->theme->display_error(403, "Permission denied", $pde->error); @@ -135,14 +135,14 @@ public function onPageNavBuilding(PageNavBuildingEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { - if ($event->parent=="posts") { + if ($event->parent == "posts") { $event->add_nav_link("posts_all", new Link('post/list'), "All"); } } public function onHelpPageBuilding(HelpPageBuildingEvent $event) { - if ($event->key===HelpPages::SEARCH) { + if ($event->key === HelpPages::SEARCH) { $event->add_block(new Block("General", $this->theme->get_help_html()), 0); } } @@ -186,13 +186,13 @@ public function onSearchTermParse(SearchTermParseEvent $event) ); } elseif (preg_match("/^ratio([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+):(\d+)$/i", $event->term, $matches)) { $cmp = preg_replace('/^:/', '=', $matches[1]); - $args = ["width{$event->id}"=>int_escape($matches[2]), "height{$event->id}"=>int_escape($matches[3])]; + $args = ["width{$event->id}" => int_escape($matches[2]), "height{$event->id}" => int_escape($matches[3])]; $event->add_querylet(new Querylet("width / :width{$event->id} $cmp height / :height{$event->id}", $args)); } elseif (preg_match("/^(filesize|id)([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+[kmg]?b?)$/i", $event->term, $matches)) { $col = $matches[1]; $cmp = ltrim($matches[2], ":") ?: "="; $val = parse_shorthand_int($matches[3]); - $event->add_querylet(new Querylet("images.$col $cmp :val{$event->id}", ["val{$event->id}"=>$val])); + $event->add_querylet(new Querylet("images.$col $cmp :val{$event->id}", ["val{$event->id}" => $val])); } elseif (preg_match("/^(hash|md5)[=|:]([0-9a-fA-F]*)$/i", $event->term, $matches)) { $hash = strtolower($matches[2]); $event->add_querylet(new Querylet('images.hash = :hash', ["hash" => $hash])); @@ -201,7 +201,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) $event->add_querylet(new Querylet('images.phash = :phash', ["phash" => $phash])); } elseif (preg_match("/^(filename|name)[=|:](.+)$/i", $event->term, $matches)) { $filename = strtolower($matches[2]); - $event->add_querylet(new Querylet("lower(images.filename) LIKE :filename{$event->id}", ["filename{$event->id}"=>"%$filename%"])); + $event->add_querylet(new Querylet("lower(images.filename) LIKE :filename{$event->id}", ["filename{$event->id}" => "%$filename%"])); } elseif (preg_match("/^(source)[=|:](.*)$/i", $event->term, $matches)) { $source = strtolower($matches[2]); @@ -209,27 +209,27 @@ public function onSearchTermParse(SearchTermParseEvent $event) $not = ($source == "any" ? "NOT" : ""); $event->add_querylet(new Querylet("images.source IS $not NULL")); } else { - $event->add_querylet(new Querylet('images.source LIKE :src', ["src"=>"%$source%"])); + $event->add_querylet(new Querylet('images.source LIKE :src', ["src" => "%$source%"])); } } elseif (preg_match("/^posted([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])([0-9-]*)$/i", $event->term, $matches)) { // TODO Make this able to search = without needing a time component. $cmp = ltrim($matches[1], ":") ?: "="; $val = $matches[2]; - $event->add_querylet(new Querylet("images.posted $cmp :posted{$event->id}", ["posted{$event->id}"=>$val])); + $event->add_querylet(new Querylet("images.posted $cmp :posted{$event->id}", ["posted{$event->id}" => $val])); } elseif (preg_match("/^size([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+)x(\d+)$/i", $event->term, $matches)) { $cmp = ltrim($matches[1], ":") ?: "="; - $args = ["width{$event->id}"=>int_escape($matches[2]), "height{$event->id}"=>int_escape($matches[3])]; + $args = ["width{$event->id}" => int_escape($matches[2]), "height{$event->id}" => int_escape($matches[3])]; $event->add_querylet(new Querylet("width $cmp :width{$event->id} AND height $cmp :height{$event->id}", $args)); } elseif (preg_match("/^width([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+)$/i", $event->term, $matches)) { $cmp = ltrim($matches[1], ":") ?: "="; - $event->add_querylet(new Querylet("width $cmp :width{$event->id}", ["width{$event->id}"=>int_escape($matches[2])])); + $event->add_querylet(new Querylet("width $cmp :width{$event->id}", ["width{$event->id}" => int_escape($matches[2])])); } elseif (preg_match("/^height([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(\d+)$/i", $event->term, $matches)) { $cmp = ltrim($matches[1], ":") ?: "="; - $event->add_querylet(new Querylet("height $cmp :height{$event->id}", ["height{$event->id}"=>int_escape($matches[2])])); + $event->add_querylet(new Querylet("height $cmp :height{$event->id}", ["height{$event->id}" => int_escape($matches[2])])); } elseif (preg_match("/^length([:]?<|[:]?>|[:]?<=|[:]?>=|[:|=])(.+)$/i", $event->term, $matches)) { $value = parse_to_milliseconds($matches[2]); $cmp = ltrim($matches[1], ":") ?: "="; - $event->add_querylet(new Querylet("length $cmp :length{$event->id}", ["length{$event->id}"=>$value])); + $event->add_querylet(new Querylet("length $cmp :length{$event->id}", ["length{$event->id}" => $value])); } elseif (preg_match("/^order[=|:](id|width|height|length|filesize|filename)[_]?(desc|asc)?$/i", $event->term, $matches)) { $ord = strtolower($matches[1]); $default_order_for_column = preg_match("/^(id|filename)$/", $matches[1]) ? "ASC" : "DESC"; diff --git a/ext/ipban/main.php b/ext/ipban/main.php index ce97c6afb..6174d02f7 100644 --- a/ext/ipban/main.php +++ b/ext/ipban/main.php @@ -29,10 +29,10 @@ public function __construct(\FFSPHP\PDO $db) $this->set_columns([ new InetColumn("ip", "IP"), new EnumColumn("mode", "Mode", [ - "Block"=>"block", - "Firewall"=>"firewall", - "Ghost"=>"ghost", - "Anon Ghost"=>"anon-ghost" + "Block" => "block", + "Firewall" => "firewall", + "Ghost" => "ghost", + "Anon Ghost" => "anon-ghost" ]), new TextColumn("reason", "Reason"), new StringColumn("banner", "Banner"), @@ -135,7 +135,7 @@ public function onUserLogin(UserLoginEvent $event) // If an active ban is found, act on it if (!is_null($active_ban_id)) { - $row = $database->get_row("SELECT * FROM bans WHERE id=:id", ["id"=>$active_ban_id]); + $row = $database->get_row("SELECT * FROM bans WHERE id=:id", ["id" => $active_ban_id]); if (empty($row)) { return; } @@ -159,14 +159,14 @@ public function onUserLogin(UserLoginEvent $event) $b = new Block(null, $msg, "main", 0); $b->is_content = false; $page->add_block($b); - $page->add_cookie("nocache", "Ghost Banned", time()+60*60*2, "/"); + $page->add_cookie("nocache", "Ghost Banned", time() + 60 * 60 * 2, "/"); $event->user->class = $_shm_user_classes["ghost"]; } elseif ($row["mode"] == "anon-ghost") { if ($event->user->is_anonymous()) { $b = new Block(null, $msg, "main", 0); $b->is_content = false; $page->add_block($b); - $page->add_cookie("nocache", "Ghost Banned", time()+60*60*2, "/"); + $page->add_cookie("nocache", "Ghost Banned", time() + 60 * 60 * 2, "/"); $event->user->class = $_shm_user_classes["ghost"]; } } else { @@ -184,14 +184,14 @@ public function onPageRequest(PageRequestEvent $event) if ($user->can(Permissions::BAN_IP)) { if ($event->get_arg(0) == "create") { $user->ensure_authed(); - $input = validate_input(["c_ip"=>"string", "c_mode"=>"string", "c_reason"=>"string", "c_expires"=>"optional,date"]); + $input = validate_input(["c_ip" => "string", "c_mode" => "string", "c_reason" => "string", "c_expires" => "optional,date"]); send_event(new AddIPBanEvent($input['c_ip'], $input['c_mode'], $input['c_reason'], $input['c_expires'])); $page->flash("Ban for {$input['c_ip']} added"); $page->set_mode(PageMode::REDIRECT); $page->set_redirect(make_link("ip_ban/list")); } elseif ($event->get_arg(0) == "delete") { $user->ensure_authed(); - $input = validate_input(["d_id"=>"int"]); + $input = validate_input(["d_id" => "int"]); send_event(new RemoveIPBanEvent($input['d_id'])); $page->flash("Ban removed"); $page->set_mode(PageMode::REDIRECT); @@ -227,7 +227,7 @@ public function onSetupBuilding(SetupBuildingEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent==="system") { + if ($event->parent === "system") { if ($user->can(Permissions::BAN_IP)) { $event->add_nav_link("ip_bans", new Link('ip_ban/list'), "IP Bans", NavLink::is_active(["ip_ban"])); } @@ -246,7 +246,7 @@ public function onAddIPBan(AddIPBanEvent $event) { global $cache, $user, $database; $sql = "INSERT INTO bans (ip, mode, reason, expires, banner_id) VALUES (:ip, :mode, :reason, :expires, :admin_id)"; - $database->execute($sql, ["ip"=>$event->ip, "mode"=>$event->mode, "reason"=>$event->reason, "expires"=>$event->expires, "admin_id"=>$user->id]); + $database->execute($sql, ["ip" => $event->ip, "mode" => $event->mode, "reason" => $event->reason, "expires" => $event->expires, "admin_id" => $user->id]); $cache->delete("ip_bans"); $cache->delete("network_bans"); log_info("ipban", "Banned ({$event->mode}) {$event->ip} because '{$event->reason}' until {$event->expires}"); @@ -255,9 +255,9 @@ public function onAddIPBan(AddIPBanEvent $event) public function onRemoveIPBan(RemoveIPBanEvent $event) { global $cache, $database; - $ban = $database->get_row("SELECT * FROM bans WHERE id = :id", ["id"=>$event->id]); + $ban = $database->get_row("SELECT * FROM bans WHERE id = :id", ["id" => $event->id]); if ($ban) { - $database->execute("DELETE FROM bans WHERE id = :id", ["id"=>$event->id]); + $database->execute("DELETE FROM bans WHERE id = :id", ["id" => $event->id]); $cache->delete("ip_bans"); $cache->delete("network_bans"); log_info("ipban", "Removed {$ban['ip']}'s ban"); diff --git a/ext/ipban/test.php b/ext/ipban/test.php index 4dbb9f1ee..6beb6edec 100644 --- a/ext/ipban/test.php +++ b/ext/ipban/test.php @@ -56,7 +56,7 @@ public function test_all() { // just test it doesn't crash for now $this->log_in_as_admin(); - $page = $this->get_page('ip_ban/list', ['r_all'=>'on']); + $page = $this->get_page('ip_ban/list', ['r_all' => 'on']); $this->assertEquals(200, $page->code); } } diff --git a/ext/link_image/info.php b/ext/link_image/info.php index c0cedfe52..c735b5243 100644 --- a/ext/link_image/info.php +++ b/ext/link_image/info.php @@ -10,7 +10,7 @@ class LinkImageInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Link to Post"; - public array $authors = ["Artanis"=>"artanis.00@gmail.com"]; + public array $authors = ["Artanis" => "artanis.00@gmail.com"]; public string $description = "Show various forms of link to each image, for copy & paste"; public string $license = self::LICENSE_GPLV2; public ?string $documentation = "There is one option in Board Config: Text Link Format. diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php index fe4a7b68a..dfe9e4c77 100644 --- a/ext/link_image/theme.php +++ b/ext/link_image/theme.php @@ -62,7 +62,7 @@ public function links_block(Page $page, $data) protected function url(string $url, string $content, string $type): string { if (empty($content)) { - $content=$url; + $content = $url; } switch ($type) { @@ -93,7 +93,7 @@ protected function img(string $src, string $type): string return $text; } - protected function link_code(string $label, string $content, $id=null): string + protected function link_code(string $label, string $content, $id = null): string { return "
$h_lastLetter"; } @@ -395,7 +395,7 @@ private function build_tag_popularity(): string FROM tags WHERE count >= :tags_min ORDER BY count DESC, tag ASC - ", ["tags_min"=>$tags_min]); + ", ["tags_min" => $tags_min]); $html = "Results grouped by log10(n)"; $lastLog = ""; @@ -464,7 +464,7 @@ private function add_split_tags_block(Page $page, Image $image) AND image_tags.image_id = :image_id ORDER BY tags.count DESC "; - $args = ["image_id"=>$image->id]; + $args = ["image_id" => $image->id]; $tags = $database->get_all($query, $args); if (count($tags) > 0) { @@ -483,7 +483,7 @@ private function add_tags_block(Page $page, Image $image) AND image_tags.image_id = :image_id ORDER BY tags.count DESC "; - $args = ["image_id"=>$image->id]; + $args = ["image_id" => $image->id]; $tags = $database->get_all($query, $args); if (count($tags) > 0) { @@ -518,7 +518,7 @@ private function add_popular_block(Page $page) "; } - $args = ["popular_tag_list_length"=>$config->get_int(TagListConfig::POPULAR_TAG_LIST_LENGTH)]; + $args = ["popular_tag_list_length" => $config->get_int(TagListConfig::POPULAR_TAG_LIST_LENGTH)]; $tags = $database->get_all($query, $args); diff --git a/ext/tag_list/test.php b/ext/tag_list/test.php index f054a72eb..1f04f98a9 100644 --- a/ext/tag_list/test.php +++ b/ext/tag_list/test.php @@ -28,16 +28,16 @@ public function testTagList() public function testMinCount() { foreach ($this->pages as $page) { - $this->get_page("tags/$page", ["mincount"=>999999]); + $this->get_page("tags/$page", ["mincount" => 999999]); $this->assert_title("Tag List"); - $this->get_page("tags/$page", ["mincount"=>1]); + $this->get_page("tags/$page", ["mincount" => 1]); $this->assert_title("Tag List"); - $this->get_page("tags/$page", ["mincount"=>0]); + $this->get_page("tags/$page", ["mincount" => 0]); $this->assert_title("Tag List"); - $this->get_page("tags/$page", ["mincount"=>-1]); + $this->get_page("tags/$page", ["mincount" => -1]); $this->assert_title("Tag List"); } } diff --git a/ext/tag_tools/test.php b/ext/tag_tools/test.php index e99acbf41..8d7cc5057 100644 --- a/ext/tag_tools/test.php +++ b/ext/tag_tools/test.php @@ -43,7 +43,7 @@ public function testRecount() send_event(new UserLoginEvent(User::by_name(self::$admin_name))); $database->execute( "INSERT INTO tags(tag, count) VALUES(:tag, :count)", - ["tag"=>"tes$ts", "count"=>42] + ["tag" => "tes$ts", "count" => 42] ); // Fix @@ -54,7 +54,7 @@ public function testRecount() 0, $database->get_one( "SELECT count FROM tags WHERE tag = :tag", - ["tag"=>"tes$ts"] + ["tag" => "tes$ts"] ) ); } diff --git a/ext/tag_tools/theme.php b/ext/tag_tools/theme.php index 2f52c6b45..7cf2ea727 100644 --- a/ext/tag_tools/theme.php +++ b/ext/tag_tools/theme.php @@ -8,7 +8,7 @@ class TagToolsTheme extends Themelet { - protected function button(string $name, string $action, bool $protected=false): string + protected function button(string $name, string $action, bool $protected = false): string { $c_protected = $protected ? " protected" : ""; $html = make_form(make_link("admin/$action"), "POST", false, "admin$c_protected"); @@ -39,7 +39,7 @@ public function display_form() $html = (string)SHM_SIMPLE_FORM( "admin/set_tag_case", - INPUT(["type"=>'text', "name"=>'tag', "placeholder"=>'Enter tag with correct case', "autocomplete"=>'off']), + INPUT(["type" => 'text', "name" => 'tag', "placeholder" => 'Enter tag with correct case', "autocomplete" => 'off']), SHM_SUBMIT('Set Tag Case'), ); $page->add_block(new Block("Set Tag Case", $html)); diff --git a/ext/tagger_xml/info.php b/ext/tagger_xml/info.php index c7754babb..3de7720d0 100644 --- a/ext/tagger_xml/info.php +++ b/ext/tagger_xml/info.php @@ -10,7 +10,7 @@ class TaggerXMLInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Tagger AJAX backend"; - public array $authors = ["Artanis (Erik Youngren)"=>"artanis.00@gmail.com"]; + public array $authors = ["Artanis (Erik Youngren)" => "artanis.00@gmail.com"]; public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN; public string $description = "Advanced Tagging v2 AJAX backend"; } diff --git a/ext/tagger_xml/main.php b/ext/tagger_xml/main.php index e945e2eb2..6e577d553 100644 --- a/ext/tagger_xml/main.php +++ b/ext/tagger_xml/main.php @@ -19,7 +19,7 @@ public function onPageRequest(PageRequestEvent $event) //$match_tags = null; //$image_tags = null; - $tags=null; + $tags = null; if (isset($_GET['s'])) { // tagger/tags[/...]?s=$string // return matching tags in XML form $tags = $this->match_tag_list($_GET['s']); @@ -58,7 +58,7 @@ private function match_tag_list(string $s): string // $exclude = $event->get_arg(1)? "AND NOT IN ".$this->image_tags($event->get_arg(1)) : null; // Hidden Tags - $hidden = $config->get_string('ext-tagger_show-hidden', 'N')=='N' ? + $hidden = $config->get_string('ext-tagger_show-hidden', 'N') == 'N' ? "AND substring(tag,1,1) != '.'" : null; $q_where = "WHERE {$match} {$hidden} AND count > 0"; @@ -69,7 +69,7 @@ private function match_tag_list(string $s): string $q_from = "FROM (SELECT * FROM `tags` {$q_where} ". "ORDER BY count DESC LIMIT {$limit_rows} OFFSET 0) AS `c_tags`"; $q_where = null; - $count = ["max"=>$count]; + $count = ["max" => $count]; } else { $q_from = "FROM `tags`"; $count = []; @@ -93,17 +93,17 @@ private function image_tag_list(int $image_id): string $tags = $database->execute(" SELECT tags.* FROM image_tags JOIN tags ON image_tags.tag_id = tags.id - WHERE image_id=:image_id ORDER BY tag", ['image_id'=>$image_id]); + WHERE image_id=:image_id ORDER BY tag", ['image_id' => $image_id]); return $this->list_to_xml($tags, "image", (string)$image_id); } - private function list_to_xml(\FFSPHP\PDOStatement $tags, string $type, string $query, ?array $misc=[]): string + private function list_to_xml(\FFSPHP\PDOStatement $tags, string $type, string $query, ?array $misc = []): string { $props = [ - "id"=>$type, - "query"=>$query, + "id" => $type, + "query" => $query, // @phpstan-ignore-next-line - "rows"=>$tags->_numOfRows + "rows" => $tags->_numOfRows ]; if (!is_null($misc)) { foreach ($misc as $attr => $val) { @@ -113,7 +113,7 @@ private function list_to_xml(\FFSPHP\PDOStatement $tags, string $type, string $q $list = new \MicroHTML\HTMLElement("list", [$props]); foreach ($tags as $tag) { - $list->appendChild(new \MicroHTML\HTMLElement("tag", [["id"=>$tag["id"], "count"=>$tag["count"]], $tag["tag"]])); + $list->appendChild(new \MicroHTML\HTMLElement("tag", [["id" => $tag["id"], "count" => $tag["count"]], $tag["tag"]])); } return (string)($list); diff --git a/ext/tips/info.php b/ext/tips/info.php index d8dd65cd3..01fd91aa0 100644 --- a/ext/tips/info.php +++ b/ext/tips/info.php @@ -10,7 +10,7 @@ class TipsInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Random Tip"; - public array $authors = ["Sein Kraft"=>"mail@seinkraft.info"]; + public array $authors = ["Sein Kraft" => "mail@seinkraft.info"]; public string $license = "GPLv2"; public string $description = "Show a random line of text in the subheader space"; public ?string $documentation = "Formatting is done with HTML"; diff --git a/ext/tips/main.php b/ext/tips/main.php index 172184a64..14281ec05 100644 --- a/ext/tips/main.php +++ b/ext/tips/main.php @@ -50,7 +50,7 @@ public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) " INSERT INTO tips (enable, image, text) VALUES (:enable, :image, :text)", - ["enable"=>true, "image"=>"coins.png", "text"=>"Do you like this extension? Please support us for developing new ones. Donate through paypal."] + ["enable" => true, "image" => "coins.png", "text" => "Do you like this extension? Please support us for developing new ones. Donate through paypal."] ); $this->set_version("ext_tips_version", 2); @@ -101,7 +101,7 @@ public function onPageRequest(PageRequestEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent==="system") { + if ($event->parent === "system") { if ($user->can(Permissions::TIPS_ADMIN)) { $event->add_nav_link("tips", new Link('tips/list'), "Tips Editor"); } @@ -141,7 +141,7 @@ public function onCreateTip(CreateTipEvent $event) " INSERT INTO tips (enable, image, text) VALUES (:enable, :image, :text)", - ["enable"=>$event->enable, "image"=>$event->image, "text"=>$event->text] + ["enable" => $event->enable, "image" => $event->image, "text" => $event->text] ); } @@ -158,7 +158,7 @@ private function getTip() WHERE enable = :true ORDER BY RAND() LIMIT 1 - ", ["true"=>true]); + ", ["true" => true]); if ($tip) { $this->theme->showTip($url, $tip); @@ -181,16 +181,16 @@ private function setStatus(int $tipID) { global $database; - $tip = $database->get_row("SELECT * FROM tips WHERE id = :id ", ["id"=>$tipID]); + $tip = $database->get_row("SELECT * FROM tips WHERE id = :id ", ["id" => $tipID]); $enable = bool_escape($tip['enable']); - $database->execute("UPDATE tips SET enable = :enable WHERE id = :id", ["enable"=>$enable, "id"=>$tipID]); + $database->execute("UPDATE tips SET enable = :enable WHERE id = :id", ["enable" => $enable, "id" => $tipID]); } public function onDeleteTip(DeleteTipEvent $event) { global $database; - $database->execute("DELETE FROM tips WHERE id = :id", ["id"=>$event->tip_id]); + $database->execute("DELETE FROM tips WHERE id = :id", ["id" => $event->tip_id]); } } diff --git a/ext/transcode/info.php b/ext/transcode/info.php index f79529e27..7ec5c88f9 100644 --- a/ext/transcode/info.php +++ b/ext/transcode/info.php @@ -10,7 +10,7 @@ class TranscodeImageInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Transcode Image"; - public array $authors = ["Matthew Barbour"=>"matthew@darkholme.net"]; + public array $authors = ["Matthew Barbour" => "matthew@darkholme.net"]; public string $license = self::LICENSE_WTFPL; public string $description = "Allows admins to automatically and manually transcode images."; public ?string $documentation = diff --git a/ext/transcode/main.php b/ext/transcode/main.php index 29ee67850..304ede255 100644 --- a/ext/transcode/main.php +++ b/ext/transcode/main.php @@ -98,7 +98,7 @@ public static function get_enabled_mimes(): array public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) { if ($this->get_version(TranscodeConfig::VERSION) < 1) { - $old_extensions =[]; + $old_extensions = []; foreach (array_values(self::INPUT_MIMES) as $mime) { $old_extensions = array_merge($old_extensions, FileExtension::get_all_for_mime($mime)); } @@ -152,7 +152,7 @@ public function onSetupBuilding(SetupBuildingEvent $event) $sb->add_bool_option(TranscodeConfig::GET_ENABLED, "Enable GET args", true); $sb->add_bool_option(TranscodeConfig::UPLOAD, "Transcode on upload", true); $sb->add_choice_option(TranscodeConfig::ENGINE, MediaEngine::IMAGE_ENGINES, "Engine", true); - foreach (self::INPUT_MIMES as $display=> $mime) { + foreach (self::INPUT_MIMES as $display => $mime) { if (MediaEngine::is_input_supported($engine, $mime)) { $outputs = $this->get_supported_output_mimes($engine, $mime); $sb->add_choice_option(self::get_mapping_name($mime), $outputs, "$display", true); @@ -180,7 +180,7 @@ public function onDataUpload(DataUploadEvent $event) } if ($config->get_bool(TranscodeConfig::UPLOAD) == true) { - if ($event->mime === MimeType::GIF&&MimeType::is_animated_gif($event->tmpname)) { + if ($event->mime === MimeType::GIF && MimeType::is_animated_gif($event->tmpname)) { return; } @@ -253,10 +253,10 @@ public function onImageDownloading(ImageDownloadingEvent $event) $source_mime = $event->image->get_mime(); - if ($source_mime!=$target_mime) { + if ($source_mime != $target_mime) { $tmp_filename = $this->transcode_image($event->path, $source_mime, $target_mime); - if ($event->file_modified===true&&$event->path!=$event->image->get_image_filename()) { + if ($event->file_modified === true && $event->path != $event->image->get_image_filename()) { // This means that we're dealing with a temp file that will need cleaned up unlink($event->path); } @@ -314,10 +314,10 @@ public function onBulkAction(BulkActionEvent $event) } } } - if ($size_difference>0) { + if ($size_difference > 0) { $page->flash("Transcoded $total items, reduced size by ".human_filesize($size_difference)); - } elseif ($size_difference<0) { - $page->flash("Transcoded $total items, increased size by ".human_filesize(-1*$size_difference)); + } elseif ($size_difference < 0) { + $page->flash("Transcoded $total items, increased size by ".human_filesize(-1 * $size_difference)); } else { $page->flash("Transcoded $total items, no size difference"); } @@ -338,13 +338,13 @@ private function get_supported_output_mimes($engine, ?string $omit_mime = null): $output = []; - foreach (self::OUTPUT_MIMES as $key=> $value) { - if ($value=="") { + foreach (self::OUTPUT_MIMES as $key => $value) { + if ($value == "") { $output[$key] = $value; continue; } if (MediaEngine::is_output_supported($engine, $value) - &&(empty($omit_mime)||$omit_mime!=$value)) { + && (empty($omit_mime) || $omit_mime != $value)) { $output[$key] = $value; } } @@ -385,7 +385,7 @@ private function transcode_image(string $source_name, string $source_mime, strin { global $config; - if ($source_mime==$target_mime) { + if ($source_mime == $target_mime) { throw new ImageTranscodeException("Source and target MIMEs are the same: ".$source_mime); } @@ -433,18 +433,18 @@ private function transcode_image_gd(string $source_name, string $source_mime, st $width = imagesx($image); $height = imagesy($image); $new_image = imagecreatetruecolor($width, $height); - if ($new_image===false) { + if ($new_image === false) { throw new ImageTranscodeException("Could not create image with dimensions $width x $height"); } try { $background_color = Media::hex_color_allocate($new_image, $config->get_string(TranscodeConfig::ALPHA_COLOR)); - if ($background_color===false) { + if ($background_color === false) { throw new ImageTranscodeException("Could not allocate background color"); } - if (imagefilledrectangle($new_image, 0, 0, $width, $height, $background_color)===false) { + if (imagefilledrectangle($new_image, 0, 0, $width, $height, $background_color) === false) { throw new ImageTranscodeException("Could not fill background color"); } - if (imagecopy($new_image, $image, 0, 0, 0, 0, $width, $height)===false) { + if (imagecopy($new_image, $image, 0, 0, 0, 0, $width, $height) === false) { throw new ImageTranscodeException("Could not copy source image to new image"); } $result = imagejpeg($new_image, $tmp_name, $q); @@ -456,7 +456,7 @@ private function transcode_image_gd(string $source_name, string $source_mime, st } finally { imagedestroy($image); } - if ($result===false) { + if ($result === false) { throw new ImageTranscodeException("Error while transcoding ".$source_name." to ".$target_mime); } return $tmp_name; @@ -507,7 +507,7 @@ private function transcode_image_convert(string $source_name, string $source_mim log_debug('transcode', "Transcoding with command `$cmd`, returns $ret"); - if ($ret!==0) { + if ($ret !== 0) { throw new ImageTranscodeException("Transcoding failed with command ".$cmd.", returning ".implode("\r\n", $output)); } diff --git a/ext/transcode/theme.php b/ext/transcode/theme.php index 55c1f61a0..171df779d 100644 --- a/ext/transcode/theme.php +++ b/ext/transcode/theme.php @@ -32,7 +32,7 @@ public function get_transcode_html(Image $image, array $options): string public function get_transcode_picker_html(array $options): string { $html = ""; - foreach ($options as $display=>$value) { + foreach ($options as $display => $value) { $html .= "$display"; } diff --git a/ext/transcode_video/info.php b/ext/transcode_video/info.php index 4dd7877c5..81f7f7fc7 100644 --- a/ext/transcode_video/info.php +++ b/ext/transcode_video/info.php @@ -10,8 +10,8 @@ class TranscodeVideoInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Transcode Video"; - public array $authors = ["Matthew Barbour"=>"matthew@darkholme.net"]; + public array $authors = ["Matthew Barbour" => "matthew@darkholme.net"]; public string $license = self::LICENSE_WTFPL; public string $description = "Allows admins to automatically and manually transcode videos."; - public ?string $documentation ="Requires ffmpeg"; + public ?string $documentation = "Requires ffmpeg"; } diff --git a/ext/transcode_video/main.php b/ext/transcode_video/main.php index 8235afea9..ca0c03044 100644 --- a/ext/transcode_video/main.php +++ b/ext/transcode_video/main.php @@ -48,9 +48,9 @@ public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) { global $user; - if ($event->image->video===true && $user->can(Permissions::EDIT_FILES)) { + if ($event->image->video === true && $user->can(Permissions::EDIT_FILES)) { $options = self::get_output_options($event->image->get_mime(), $event->image->video_codec); - if (!empty($options)&&sizeof($options)>1) { + if (!empty($options) && sizeof($options) > 1) { $event->add_part($this->theme->get_transcode_html($event->image, $options)); } } @@ -65,37 +65,37 @@ public function onSetupBuilding(SetupBuildingEvent $event) $sb->end_table(); } -/* - public function onDataUpload(DataUploadEvent $event) - { - global $config; + /* + public function onDataUpload(DataUploadEvent $event) + { + global $config; - if ($config->get_bool(TranscodeVideoConfig::UPLOAD) == true) { - $ext = strtolower($event->type); + if ($config->get_bool(TranscodeVideoConfig::UPLOAD) == true) { + $ext = strtolower($event->type); - $ext = Media::normalize_format($ext); + $ext = Media::normalize_format($ext); - if ($event->type=="gif"&&Media::is_animated_gif($event->tmpname)) { - return; - } - - if (in_array($ext, array_values(self::INPUT_FORMATS))) { - $target_format = $config->get_string(TranscodeVideoConfig::UPLOAD_PREFIX.$ext); - if (empty($target_format)) { + if ($event->type=="gif"&&Media::is_animated_gif($event->tmpname)) { return; } - try { - $new_image = $this->transcode_image($event->tmpname, $ext, $target_format); - $event->set_tmpname($new_image, Media::determine_ext($target_format)); - } catch (Exception $e) { - log_error("transcode_video", "Error while performing upload transcode: ".$e->getMessage()); - // We don't want to interfere with the upload process, - // so if something goes wrong the untranscoded image jsut continues + + if (in_array($ext, array_values(self::INPUT_FORMATS))) { + $target_format = $config->get_string(TranscodeVideoConfig::UPLOAD_PREFIX.$ext); + if (empty($target_format)) { + return; + } + try { + $new_image = $this->transcode_image($event->tmpname, $ext, $target_format); + $event->set_tmpname($new_image, Media::determine_ext($target_format)); + } catch (Exception $e) { + log_error("transcode_video", "Error while performing upload transcode: ".$e->getMessage()); + // We don't want to interfere with the upload process, + // so if something goes wrong the untranscoded image jsut continues + } } } } - } -*/ + */ public function onPageRequest(PageRequestEvent $event) { @@ -162,7 +162,7 @@ public function onBulkAction(BulkActionEvent $event) // transcodes recorded already, otherwise the image entries will be stuck pointing to // missing image files $database->commit(); - if ($output_image!=$image) { + if ($output_image != $image) { $total++; } } catch (\Exception $e) { @@ -186,10 +186,10 @@ private static function get_output_options(?string $starting_container = null, ? foreach (VideoContainers::ALL as $container) { - if ($starting_container==$container) { + if ($starting_container == $container) { continue; } - if (!empty($starting_codec)&& + if (!empty($starting_codec) && !VideoContainers::is_video_codec_supported($container, $starting_codec)) { continue; } @@ -201,11 +201,11 @@ private static function get_output_options(?string $starting_container = null, ? private function transcode_and_replace_video(Image $image, string $target_mime): Image { - if ($image->get_mime()==$target_mime) { + if ($image->get_mime() == $target_mime) { return $image; } - if ($image->video==null||($image->video===true && empty($image->video_codec))) { + if ($image->video == null || ($image->video === true && empty($image->video_codec))) { // If image predates the media system, or the video codec support, run a media check send_event(new MediaCheckPropertiesEvent($image)); $image->save_to_db(); diff --git a/ext/transcode_video/theme.php b/ext/transcode_video/theme.php index 244730b23..29c8c1dee 100644 --- a/ext/transcode_video/theme.php +++ b/ext/transcode_video/theme.php @@ -32,7 +32,7 @@ public function get_transcode_html(Image $image, array $options): string public function get_transcode_picker_html(array $options): string { $html = ""; - foreach ($options as $display=>$value) { + foreach ($options as $display => $value) { $html .= "$display"; } diff --git a/ext/trash/info.php b/ext/trash/info.php index 13b643d63..d0d9a2bbe 100644 --- a/ext/trash/info.php +++ b/ext/trash/info.php @@ -10,7 +10,7 @@ class TrashInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Trash"; - public array $authors = ["Matthew Barbour"=>"matthew@darkholme.net"]; + public array $authors = ["Matthew Barbour" => "matthew@darkholme.net"]; public string $license = self::LICENSE_WTFPL; public string $description = "Provides \"Trash\" or \"Recycle Bin\"-type functionality, storing deleted images for later recovery"; } diff --git a/ext/trash/main.php b/ext/trash/main.php index 5fc70a50f..f71fff19b 100644 --- a/ext/trash/main.php +++ b/ext/trash/main.php @@ -49,7 +49,7 @@ private function check_permissions(Image $image): bool { global $user; - if ($image->trash===true && !$user->can(Permissions::VIEW_TRASH)) { + if ($image->trash === true && !$user->can(Permissions::VIEW_TRASH)) { return false; } return true; @@ -77,7 +77,7 @@ public function onDisplayingImage(DisplayingImageEvent $event) public function onImageDeletion(ImageDeletionEvent $event) { - if ($event->force!==true && $event->image->trash!==true) { + if ($event->force !== true && $event->image->trash !== true) { self::set_trash($event->image->id, true); $event->stop_processing = true; } @@ -86,7 +86,7 @@ public function onImageDeletion(ImageDeletionEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent=="posts") { + if ($event->parent == "posts") { if ($user->can(Permissions::VIEW_TRASH)) { $event->add_nav_link("posts_trash", new Link('/post/list/in%3Atrash/1'), "Trash", null, 60); } @@ -109,7 +109,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) $matches = []; if (is_null($event->term) && $this->no_trash_query($event->context)) { - $event->add_querylet(new Querylet("trash != :true", ["true"=>true])); + $event->add_querylet(new Querylet("trash != :true", ["true" => true])); } if (is_null($event->term)) { @@ -117,7 +117,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) } if (preg_match(self::SEARCH_REGEXP, strtolower($event->term), $matches)) { if ($user->can(Permissions::VIEW_TRASH)) { - $event->add_querylet(new Querylet("trash = :true", ["true"=>true])); + $event->add_querylet(new Querylet("trash = :true", ["true" => true])); } } } @@ -125,7 +125,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) public function onHelpPageBuilding(HelpPageBuildingEvent $event) { global $user; - if ($event->key===HelpPages::SEARCH) { + if ($event->key === HelpPages::SEARCH) { if ($user->can(Permissions::VIEW_TRASH)) { $block = new Block(); $block->header = "Trash"; @@ -151,13 +151,13 @@ public static function set_trash(int $image_id, bool $trash) $database->execute( "UPDATE images SET trash = :trash WHERE id = :id", - ["trash"=>$trash,"id"=>$image_id] + ["trash" => $trash,"id" => $image_id] ); } public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event) { global $user; - if ($event->image->trash===true && $user->can(Permissions::VIEW_TRASH)) { + if ($event->image->trash === true && $user->can(Permissions::VIEW_TRASH)) { $event->add_part($this->theme->get_image_admin_html($event->image->id)); } } @@ -166,7 +166,7 @@ public function onBulkActionBlockBuilding(BulkActionBlockBuildingEvent $event) { global $user; - if ($user->can(Permissions::VIEW_TRASH)&&in_array("in:trash", $event->search_terms)) { + if ($user->can(Permissions::VIEW_TRASH) && in_array("in:trash", $event->search_terms)) { $event->add_action("bulk_trash_restore", "(U)ndelete", "u"); } } diff --git a/ext/trash/theme.php b/ext/trash/theme.php index 9a5553a87..9c65c1385 100644 --- a/ext/trash/theme.php +++ b/ext/trash/theme.php @@ -12,8 +12,8 @@ public function get_image_admin_html(int $image_id): string { return (string)SHM_SIMPLE_FORM( 'trash_restore/'.$image_id, - INPUT(["type"=>'hidden', "name"=>'image_id', "value"=>$image_id]), - INPUT(["type"=>'submit', "value"=>'Restore From Trash']), + INPUT(["type" => 'hidden', "name" => 'image_id', "value" => $image_id]), + INPUT(["type" => 'submit', "value" => 'Restore From Trash']), ); } diff --git a/ext/update/info.php b/ext/update/info.php index 7941141ca..a7e8ae8fa 100644 --- a/ext/update/info.php +++ b/ext/update/info.php @@ -11,7 +11,7 @@ class UpdateInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Update"; public string $url = "http://www.codeanimu.net"; - public array $authors = ["DakuTree"=>"dakutree@codeanimu.net"]; + public array $authors = ["DakuTree" => "dakutree@codeanimu.net"]; public string $license = self::LICENSE_GPLV2; public string $description = "Shimmie updater! (Requires admin panel extension & transload engine (cURL/fopen/Wget))"; } diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php index 648e95772..8fb3b6556 100644 --- a/ext/upgrade/main.php +++ b/ext/upgrade/main.php @@ -65,8 +65,8 @@ public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) if ($this->get_version("db_version") < 11) { log_info("upgrade", "Converting user flags to classes"); $database->execute("ALTER TABLE users ADD COLUMN class VARCHAR(32) NOT NULL default :user", ["user" => "user"]); - $database->execute("UPDATE users SET class = :name WHERE id=:id", ["name"=>"anonymous", "id"=>$config->get_int('anon_id')]); - $database->execute("UPDATE users SET class = :name WHERE admin=:admin", ["name"=>"admin", "admin"=>'Y']); + $database->execute("UPDATE users SET class = :name WHERE id=:id", ["name" => "anonymous", "id" => $config->get_int('anon_id')]); + $database->execute("UPDATE users SET class = :name WHERE admin=:admin", ["name" => "admin", "admin" => 'Y']); $this->set_version("db_version", 11); } @@ -195,13 +195,13 @@ public function onDatabaseUpgrade(DatabaseUpgradeEvent $event) // them into one big transaction would not be a good idea. $database->commit(); } - $database->execute("UPDATE images SET lossless = :t, video = :t WHERE ext IN ('swf')", ["t"=>true]); - $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :t WHERE ext IN ('mp3')", ["t"=>true, "f"=>false]); - $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :f WHERE ext IN ('jpg','jpeg')", ["f"=>false]); - $database->execute("UPDATE images SET lossless = :t, video = :f, audio = :f WHERE ext IN ('ico','ani','cur','png','svg')", ["t"=>true, "f"=>false]); - $database->execute("UPDATE images SET lossless = :t, audio = :f WHERE ext IN ('gif')", ["t"=>true, "f"=>false]); - $database->execute("UPDATE images SET audio = :f WHERE ext IN ('webp')", ["f"=>false]); - $database->execute("UPDATE images SET lossless = :f, video = :t WHERE ext IN ('flv','mp4','m4v','ogv','webm')", ["t"=>true, "f"=>false]); + $database->execute("UPDATE images SET lossless = :t, video = :t WHERE ext IN ('swf')", ["t" => true]); + $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :t WHERE ext IN ('mp3')", ["t" => true, "f" => false]); + $database->execute("UPDATE images SET lossless = :f, video = :f, audio = :f WHERE ext IN ('jpg','jpeg')", ["f" => false]); + $database->execute("UPDATE images SET lossless = :t, video = :f, audio = :f WHERE ext IN ('ico','ani','cur','png','svg')", ["t" => true, "f" => false]); + $database->execute("UPDATE images SET lossless = :t, audio = :f WHERE ext IN ('gif')", ["t" => true, "f" => false]); + $database->execute("UPDATE images SET audio = :f WHERE ext IN ('webp')", ["f" => false]); + $database->execute("UPDATE images SET lossless = :f, video = :t WHERE ext IN ('flv','mp4','m4v','ogv','webm')", ["t" => true, "f" => false]); $this->set_version("db_version", 21); } } diff --git a/ext/upload/main.php b/ext/upload/main.php index ffb9192c9..f22d55c41 100644 --- a/ext/upload/main.php +++ b/ext/upload/main.php @@ -39,7 +39,7 @@ public function __construct( $metadata['filename'] = substr($metadata['filename'], 0, 255); } - public function set_tmpname(string $tmpname, ?string $mime=null) + public function set_tmpname(string $tmpname, ?string $mime = null) { assert(is_readable($tmpname)); $this->tmpname = $tmpname; @@ -151,7 +151,7 @@ public function onPageNavBuilding(PageNavBuildingEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { - if ($event->parent=="upload") { + if ($event->parent == "upload") { if (class_exists("Shimmie2\Wiki")) { $event->add_nav_link("upload_guidelines", new Link('wiki/upload_guidelines'), "Guidelines"); } diff --git a/ext/upload/test.php b/ext/upload/test.php index a45bb445d..9e12f99e0 100644 --- a/ext/upload/test.php +++ b/ext/upload/test.php @@ -43,7 +43,7 @@ public function testRawUpload() 'size' => [0], ] ]; - $page = $this->post_page("upload", ["tags0"=>"foo bar"]); + $page = $this->post_page("upload", ["tags0" => "foo bar"]); $this->assert_response(302); $this->assertStringStartsWith("/test/post/list/poster%3Dtest/1", $page->redirect); @@ -67,7 +67,7 @@ public function testRawReplace() ] ]; - $page = $this->post_page("upload/replace", ["image_id"=>$image_id]); + $page = $this->post_page("upload/replace", ["image_id" => $image_id]); $this->assert_response(302); $this->assertEquals("/test/post/view/$image_id", $page->redirect); @@ -104,7 +104,7 @@ public function testRejectUnknownFiletype() public function testRejectHuge() { // FIXME: huge.dat is rejected for other reasons; manual testing shows that this works - file_put_contents("data/huge.jpg", file_get_contents("tests/pbx_screenshot.jpg") . str_repeat("U", 1024*1024*3)); + file_put_contents("data/huge.jpg", file_get_contents("tests/pbx_screenshot.jpg") . str_repeat("U", 1024 * 1024 * 3)); try { $this->post_image("data/huge.jpg", "test"); $this->fail("Uploading huge.jpg didn't fail..."); diff --git a/ext/upload/theme.php b/ext/upload/theme.php index 2d3c770f2..77ba47c0b 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -50,22 +50,22 @@ public function display_page(Page $page): void $form = SHM_FORM("upload", "POST", true, "file_upload"); $form->appendChild( TABLE( - ["id"=>"large_upload_form", "class"=>"vert"], + ["id" => "large_upload_form", "class" => "vert"], TR( - TD(["width"=>"20"], rawHTML("Common Tags")), - TD(["colspan"=>"5"], INPUT(["name"=>"tags", "type"=>"text", "placeholder"=>"tagme", "class"=>"autocomplete_tags", "autocomplete"=>"off"])) + TD(["width" => "20"], rawHTML("Common Tags")), + TD(["colspan" => "5"], INPUT(["name" => "tags", "type" => "text", "placeholder" => "tagme", "class" => "autocomplete_tags", "autocomplete" => "off"])) ), TR( - TD(["width"=>"20"], rawHTML("Common Source")), - TD(["colspan"=>"5"], INPUT(["name"=>"source", "type"=>"text"])) + TD(["width" => "20"], rawHTML("Common Source")), + TD(["colspan" => "5"], INPUT(["name" => "source", "type" => "text"])) ), $upload_list, TR( - TD(["colspan"=>$tl_enabled ? 2 : 4,"id"=>"upload_size_tracker"], ""), - TD(["colspan"=>2], ""), + TD(["colspan" => $tl_enabled ? 2 : 4,"id" => "upload_size_tracker"], ""), + TD(["colspan" => 2], ""), ), TR( - TD(["colspan"=>"6"], INPUT(["id"=>"uploadbutton", "type"=>"submit", "value"=>"Post"])) + TD(["colspan" => "6"], INPUT(["id" => "uploadbutton", "type" => "submit", "value" => "Post"])) ), ) ); @@ -148,18 +148,18 @@ protected function h_upload_list_1(): HTMLElement $upload_list->appendChild( TR( - TD(["colspan"=>$tl_enabled ? 2 : 4], "Files"), - $tl_enabled ? TD(["colspan"=>"2"], "URLs") : emptyHTML(), - TD(["colspan"=>"2"], "Post-Specific Tags"), + TD(["colspan" => $tl_enabled ? 2 : 4], "Files"), + $tl_enabled ? TD(["colspan" => "2"], "URLs") : emptyHTML(), + TD(["colspan" => "2"], "Post-Specific Tags"), ) ); - for ($i=0; $i<$upload_count; $i++) { + for ($i = 0; $i < $upload_count; $i++) { $upload_list->appendChild( TR( - TD(["colspan"=>$tl_enabled ? 2 : 4], DIV(["name"=>"canceldata{$i}[]","style"=>"display:inline;margin-right:5px;font-size:15px;visibility:hidden;","onclick"=>"$(\"input[name='data{$i}[]']\")[0].value='';updateTracker();"], "✖"), INPUT(["type"=>"file", "name"=>"data{$i}[]", "accept"=>$accept, "multiple"=>true])), - $tl_enabled ? TD(["colspan"=>"2"], INPUT(["type"=>"text", "name"=>"url{$i}"])) : emptyHTML(), - TD(["colspan"=>"2"], INPUT(["type"=>"text", "name"=>"tags{$i}", "class"=>"autocomplete_tags", "autocomplete"=>"off"])), + TD(["colspan" => $tl_enabled ? 2 : 4], DIV(["name" => "canceldata{$i}[]","style" => "display:inline;margin-right:5px;font-size:15px;visibility:hidden;","onclick" => "$(\"input[name='data{$i}[]']\")[0].value='';updateTracker();"], "✖"), INPUT(["type" => "file", "name" => "data{$i}[]", "accept" => $accept, "multiple" => true])), + $tl_enabled ? TD(["colspan" => "2"], INPUT(["type" => "text", "name" => "url{$i}"])) : emptyHTML(), + TD(["colspan" => "2"], INPUT(["type" => "text", "name" => "tags{$i}", "class" => "autocomplete_tags", "autocomplete" => "off"])), ) ); } @@ -177,7 +177,7 @@ protected function h_bookmarklets(): HTMLElement $max_kb = to_shorthand_int($max_size); $delimiter = $config->get_bool('nice_urls') ? '?' : '&'; - $js='javascript:( + $js = 'javascript:( function() { if(typeof window=="undefined" || !window.location || window.location.href=="about:blank") { window.location = "'. $main_page .'"; @@ -198,7 +198,7 @@ function() { } )();'; $html1 = P( - A(["href"=>$js], "Upload to $title"), + A(["href" => $js], "Upload to $title"), rawHTML(' (Drag & drop onto your bookmarks toolbar, then click when looking at a post)') ); @@ -216,7 +216,7 @@ function() { void(document.body.appendChild(document.createElement("script")).src="'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'") '; $html2 = P( - A(["href"=>$js], $title), + A(["href" => $js], $title), rawHTML("(Click when looking at a post page. Works on sites running Shimmie / Danbooru / Gelbooru. (This also grabs the tags / rating / source!))"), ); @@ -235,14 +235,14 @@ public function display_replace_page(Page $page, int $image_id) $upload_list = emptyHTML( TR( TD("File"), - TD(INPUT(["name"=>"data[]", "type"=>"file", "accept"=>$accept])) + TD(INPUT(["name" => "data[]", "type" => "file", "accept" => $accept])) ) ); if ($tl_enabled) { $upload_list->appendChild( TR( TD("or URL"), - TD(INPUT(["name"=>"url", "type"=>"text"])) + TD(INPUT(["name" => "url", "type" => "text"])) ) ); } @@ -255,12 +255,12 @@ public function display_replace_page(Page $page, int $image_id) $form = SHM_FORM("upload/replace/".$image_id, "POST", true); $form->appendChild(emptyHTML( - INPUT(["type"=>"hidden", "name"=>"image_id", "value"=>$image_id]), + INPUT(["type" => "hidden", "name" => "image_id", "value" => $image_id]), TABLE( - ["id"=>"large_upload_form", "class"=>"vert"], + ["id" => "large_upload_form", "class" => "vert"], $upload_list, - TR(TD("Source"), TD(["colspan"=>3], INPUT(["name"=>"source", "type"=>"text"]))), - TR(TD(["colspan"=>4], INPUT(["id"=>"uploadbutton", "type"=>"submit", "value"=>"Post"]))), + TR(TD("Source"), TD(["colspan" => 3], INPUT(["name" => "source", "type" => "text"]))), + TR(TD(["colspan" => 4], INPUT(["id" => "uploadbutton", "type" => "submit", "value" => "Post"]))), ) )); @@ -328,18 +328,18 @@ protected function build_upload_block(): HTMLElement $form = SHM_FORM("upload", "POST", true); $form->appendChild( emptyHTML( - INPUT(["id"=>"data[]", "name"=>"data[]", "size"=>"16", "type"=>"file", "accept"=>$accept, "multiple"=>true]), - INPUT(["name"=>"tags", "type"=>"text", "placeholder"=>"tagme", "class"=>"autocomplete_tags", "required"=>true, "autocomplete"=>"off"]), - INPUT(["type"=>"submit", "value"=>"Post"]), + INPUT(["id" => "data[]", "name" => "data[]", "size" => "16", "type" => "file", "accept" => $accept, "multiple" => true]), + INPUT(["name" => "tags", "type" => "text", "placeholder" => "tagme", "class" => "autocomplete_tags", "required" => true, "autocomplete" => "off"]), + INPUT(["type" => "submit", "value" => "Post"]), ) ); return DIV( - ["class"=>'mini_upload'], + ["class" => 'mini_upload'], $form, SMALL("(Max file size is $max_kb)"), SMALL(BR(), "(Max total size is $max_total_kb)"), - NOSCRIPT(BR(), A(["href"=>make_link("upload")], "Larger Form")) + NOSCRIPT(BR(), A(["href" => make_link("upload")], "Larger Form")) ); } diff --git a/ext/user/events.php b/ext/user/events.php index aacf7fa1c..d4a75de83 100644 --- a/ext/user/events.php +++ b/ext/user/events.php @@ -10,7 +10,7 @@ class UserBlockBuildingEvent extends Event { public array $parts = []; - public function add_link(string|HTMLElement $name, string $link, int $position=50): void + public function add_link(string|HTMLElement $name, string $link, int $position = 50): void { while (isset($this->parts[$position])) { $position++; @@ -43,7 +43,7 @@ public function __construct(public User $display_user) parent::__construct(); } - public function add_stats(string $html, int $position=50) + public function add_stats(string $html, int $position = 50) { while (isset($this->stats[$position])) { $position++; diff --git a/ext/user/main.php b/ext/user/main.php index a3a923242..ce2c97334 100644 --- a/ext/user/main.php +++ b/ext/user/main.php @@ -24,7 +24,7 @@ class UserNameColumn extends TextColumn { public function display(array $row): HTMLElement { - return A(["href"=>make_link("user/{$row[$this->name]}")], $row[$this->name]); + return A(["href" => make_link("user/{$row[$this->name]}")], $row[$this->name]); } } @@ -38,7 +38,7 @@ public function __construct() public function display(array $row): HTMLElement { - return A(["href"=>search_link(["user={$row['name']}"])], "Posts"); + return A(["href" => search_link(["user={$row['name']}"])], "Posts"); } } @@ -368,17 +368,17 @@ public function onSetupBuilding(SetupBuildingEvent $event) $sb->add_choice_option( "avatar_gravatar_type", [ - 'Default'=>'default', - 'Wavatar'=>'wavatar', - 'Monster ID'=>'monsterid', - 'Identicon'=>'identicon' + 'Default' => 'default', + 'Wavatar' => 'wavatar', + 'Monster ID' => 'monsterid', + 'Identicon' => 'identicon' ], "Type", true ); $sb->add_choice_option( "avatar_gravatar_rating", - ['G'=>'g', 'PG'=>'pg', 'R'=>'r', 'X'=>'x'], + ['G' => 'g', 'PG' => 'pg', 'R' => 'r', 'X' => 'x'], "Rating", true ); @@ -389,13 +389,13 @@ public function onSetupBuilding(SetupBuildingEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent==="system") { + if ($event->parent === "system") { if ($user->can(Permissions::EDIT_USER_PASSWORD)) { $event->add_nav_link("user_admin", new Link('user_admin/list'), "User List", NavLink::is_active(["user_admin"])); } } - if ($event->parent==="user" && !$user->is_anonymous()) { + if ($event->parent === "user" && !$user->is_anonymous()) { $event->add_nav_link("logout", new Link('user_admin/logout'), "Log Out", false, 90); } } @@ -465,7 +465,7 @@ public function onUserCreation(UserCreationEvent $event) public static function has_user_query(array $context): bool { foreach ($context as $term) { - if (preg_match(self::USER_SEARCH_REGEX, $term)|| + if (preg_match(self::USER_SEARCH_REGEX, $term) || preg_match(self::USER_ID_SEARCH_REGEX, $term)) { return true; } @@ -501,7 +501,7 @@ public function onSearchTermParse(SearchTermParseEvent $event) public function onHelpPageBuilding(HelpPageBuildingEvent $event) { - if ($event->key===HelpPages::SEARCH) { + if ($event->key === HelpPages::SEARCH) { $block = new Block(); $block->header = "Users"; $block->body = (string)$this->theme->get_help_html(); @@ -616,7 +616,7 @@ private function create_user(UserCreationEvent $event): User $database->execute( "INSERT INTO users (name, pass, joindate, email, class) VALUES (:username, :hash, now(), :email, :class)", - ["username"=>$event->username, "hash"=>'', "email"=>$email, "class"=>$class] + ["username" => $event->username, "hash" => '', "email" => $email, "class" => $class] ); $uid = $database->get_last_insert_id('users_id_seq'); $new_user = User::by_name($event->username); @@ -643,13 +643,13 @@ private function set_login_cookie(string $name): void $page->add_cookie( "user", $name, - time()+60*60*24*365, + time() + 60 * 60 * 24 * 365, '/' ); $page->add_cookie( "session", $this->get_session_id($name), - time()+60*60*24*$config->get_int('login_memory'), + time() + 60 * 60 * 24 * $config->get_int('login_memory'), '/' ); } @@ -754,7 +754,7 @@ private function count_upload_ips(User $duser): array FROM images WHERE owner_id=:id GROUP BY owner_ip - ORDER BY max(posted) DESC", ["id"=>$duser->id]); + ORDER BY max(posted) DESC", ["id" => $duser->id]); } private function count_comment_ips(User $duser): array @@ -767,7 +767,7 @@ private function count_comment_ips(User $duser): array FROM comments WHERE owner_id=:id GROUP BY owner_ip - ORDER BY max(posted) DESC", ["id"=>$duser->id]); + ORDER BY max(posted) DESC", ["id" => $duser->id]); } private function count_log_ips(User $duser): array @@ -783,10 +783,10 @@ private function count_log_ips(User $duser): array FROM score_log WHERE username=:username GROUP BY address - ORDER BY MAX(date_sent) DESC", ["username"=>$duser->name]); + ORDER BY MAX(date_sent) DESC", ["username" => $duser->name]); } - private function delete_user(Page $page, bool $with_images=false, bool $with_comments=false): void + private function delete_user(Page $page, bool $with_images = false, bool $with_comments = false): void { global $user, $config, $database; diff --git a/ext/user/theme.php b/ext/user/theme.php index 33d8a5fb5..786dafbd2 100644 --- a/ext/user/theme.php +++ b/ext/user/theme.php @@ -54,7 +54,7 @@ public function display_user_block(Page $page, User $user, $parts) $html = emptyHTML('Logged in as ', $user->name); foreach ($parts as $part) { $html->appendChild(BR()); - $html->appendChild(A(["href"=>$part["link"]], $part["name"])); + $html->appendChild(A(["href" => $part["link"]], $part["name"])); } $b = new Block("User Links", $html, "left", 90); $b->is_content = false; @@ -74,30 +74,30 @@ public function display_signup_page(Page $page) $form = SHM_SIMPLE_FORM( "user_admin/create", TABLE( - ["class"=>"form"], + ["class" => "form"], TBODY( TR( TH("Name"), - TD(INPUT(["type"=>'text', "name"=>'name', "required"=>true])) + TD(INPUT(["type" => 'text', "name" => 'name', "required" => true])) ), TR( TH("Password"), - TD(INPUT(["type"=>'password', "name"=>'pass1', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass1', "required" => true])) ), TR( TH(rawHTML("Repeat Password")), - TD(INPUT(["type"=>'password', "name"=>'pass2', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass2', "required" => true])) ), TR( TH(rawHTML("Email (Optional)")), - TD(INPUT(["type"=>'email', "name"=>'email'])) + TD(INPUT(["type" => 'email', "name" => 'email'])) ), TR( - TD(["colspan"=>"2"], rawHTML(captcha_get_html())) + TD(["colspan" => "2"], rawHTML(captcha_get_html())) ), ), TFOOT( - TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Create Account"]))) + TR(TD(["colspan" => "2"], INPUT(["type" => "submit", "value" => "Create Account"]))) ) ) ); @@ -120,27 +120,27 @@ public function display_user_creator() $form = SHM_SIMPLE_FORM( "user_admin/create_other", TABLE( - ["class"=>"form"], + ["class" => "form"], TBODY( TR( TH("Name"), - TD(INPUT(["type"=>'text', "name"=>'name', "required"=>true])) + TD(INPUT(["type" => 'text', "name" => 'name', "required" => true])) ), TR( TH("Password"), - TD(INPUT(["type"=>'password', "name"=>'pass1', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass1', "required" => true])) ), TR( TH(rawHTML("Repeat Password")), - TD(INPUT(["type"=>'password', "name"=>'pass2', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass2', "required" => true])) ), TR( TH(rawHTML("Email (Optional)")), - TD(INPUT(["type"=>'email', "name"=>'email'])) + TD(INPUT(["type" => 'email', "name" => 'email'])) ), ), TFOOT( - TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Create Account"]))) + TR(TD(["colspan" => "2"], INPUT(["type" => "submit", "value" => "Create Account"]))) ) ) ); @@ -164,19 +164,19 @@ public function display_login_block(Page $page) $form = SHM_SIMPLE_FORM( "user_admin/login", TABLE( - ["style"=>"width: 100%", "class"=>"form"], + ["style" => "width: 100%", "class" => "form"], TBODY( TR( - TH(LABEL(["for"=>"user"], "Name")), - TD(INPUT(["id"=>"user", "type"=>"text", "name"=>"user", "autocomplete"=>"username"])) + TH(LABEL(["for" => "user"], "Name")), + TD(INPUT(["id" => "user", "type" => "text", "name" => "user", "autocomplete" => "username"])) ), TR( - TH(LABEL(["for"=>"pass"], "Password")), - TD(INPUT(["id"=>"pass", "type"=>"password", "name"=>"pass", "autocomplete"=>"current-password"])) + TH(LABEL(["for" => "pass"], "Password")), + TD(INPUT(["id" => "pass", "type" => "password", "name" => "pass", "autocomplete" => "current-password"])) ) ), TFOOT( - TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Log In"]))) + TR(TD(["colspan" => "2"], INPUT(["type" => "submit", "value" => "Log In"]))) ) ) ); @@ -184,7 +184,7 @@ public function display_login_block(Page $page) $html = emptyHTML(); $html->appendChild($form); if ($config->get_bool("login_signup_enabled") && $user->can(Permissions::CREATE_USER)) { - $html->appendChild(SMALL(A(["href"=>make_link("user_admin/create")], "Create Account"))); + $html->appendChild(SMALL(A(["href" => make_link("user_admin/create")], "Create Account"))); } $page->add_block(new Block("Login", $html, "left", 90)); @@ -209,14 +209,14 @@ private function _ip_list(string $name, array $ips): HTMLElement public function display_ip_list(Page $page, array $uploads, array $comments, array $events) { $html = TABLE( - ["id"=>"ip-history"], + ["id" => "ip-history"], TR( $this->_ip_list("Uploaded from", $uploads), $this->_ip_list("Commented from", $comments), $this->_ip_list("Logged Events", $events) ), TR( - TD(["colspan"=>"3"], "(Most recent at top)") + TD(["colspan" => "3"], "(Most recent at top)") ) ); @@ -250,7 +250,7 @@ public function build_operations(User $duser, UserOperationsBuildingEvent $event "Change Name", TBODY(TR( TH("New name"), - TD(INPUT(["type"=>'text', "name"=>'name', "value"=>$duser->name])) + TD(INPUT(["type" => 'text', "name" => 'name', "value" => $duser->name])) )), "Set" )); @@ -263,11 +263,11 @@ public function build_operations(User $duser, UserOperationsBuildingEvent $event TBODY( TR( TH("Password"), - TD(INPUT(["type"=>'password', "name"=>'pass1', "autocomplete"=>'new-password'])) + TD(INPUT(["type" => 'password', "name" => 'pass1', "autocomplete" => 'new-password'])) ), TR( TH("Repeat Password"), - TD(INPUT(["type"=>'password', "name"=>'pass2', "autocomplete"=>'new-password'])) + TD(INPUT(["type" => 'password', "name" => 'pass2', "autocomplete" => 'new-password'])) ), ), "Set" @@ -279,17 +279,17 @@ public function build_operations(User $duser, UserOperationsBuildingEvent $event "Change Email", TBODY(TR( TH("Address"), - TD(INPUT(["type"=>'text', "name"=>'address', "value"=>$duser->email, "autocomplete"=>'email', "inputmode"=>'email'])) + TD(INPUT(["type" => 'text', "name" => 'address', "value" => $duser->email, "autocomplete" => 'email', "inputmode" => 'email'])) )), "Set" )); if ($user->can(Permissions::EDIT_USER_CLASS)) { global $_shm_user_classes; - $select = SELECT(["name"=>"class"]); + $select = SELECT(["name" => "class"]); foreach ($_shm_user_classes as $name => $values) { $select->appendChild( - OPTION(["value"=>$name, "selected"=>$name == $duser->class->name], ucwords($name)) + OPTION(["value" => $name, "selected" => $name == $duser->class->name], ucwords($name)) ); } $html->appendChild(SHM_USER_FORM( @@ -307,12 +307,12 @@ public function build_operations(User $duser, UserOperationsBuildingEvent $event "user_admin/delete_user", "Delete User", TBODY( - TR(TD(LABEL(INPUT(["type"=>'checkbox', "name"=>'with_images']), "Delete images"))), - TR(TD(LABEL(INPUT(["type"=>'checkbox', "name"=>'with_comments']), "Delete comments"))), + TR(TD(LABEL(INPUT(["type" => 'checkbox', "name" => 'with_images']), "Delete images"))), + TR(TD(LABEL(INPUT(["type" => 'checkbox', "name" => 'with_comments']), "Delete comments"))), ), TFOOT( - TR(TD(INPUT(["type"=>'button', "class"=>'shm-unlocker', "data-unlock-sel"=>'.deluser', "value"=>'Unlock']))), - TR(TD(INPUT(["type"=>'submit', "class"=>'deluser', "value"=>'Delete User', "disabled"=>'true']))), + TR(TD(INPUT(["type" => 'button', "class" => 'shm-unlocker', "data-unlock-sel" => '.deluser', "value" => 'Unlock']))), + TR(TD(INPUT(["type" => 'submit', "class" => 'deluser', "value" => 'Delete User', "disabled" => 'true']))), ) )); } @@ -353,7 +353,7 @@ public function get_help_html(): HTMLElement */ public function display_user_classes(Page $page, array $classes, array $permissions): void { - $table = TABLE(["class"=>"zebra"]); + $table = TABLE(["class" => "zebra"]); $row = TR(); $row->appendChild(TH("Permission")); @@ -374,9 +374,9 @@ public function display_user_classes(Page $page, array $classes, array $permissi foreach ($classes as $class) { $opacity = array_key_exists($perm->getValue(), $class->abilities) ? 1 : 0.2; if ($class->can($perm->getValue())) { - $cell = TD(["style"=>"color: green; opacity: $opacity;"], "✔"); + $cell = TD(["style" => "color: green; opacity: $opacity;"], "✔"); } else { - $cell = TD(["style"=>"color: red; opacity: $opacity;"], "✘"); + $cell = TD(["style" => "color: red; opacity: $opacity;"], "✘"); } $row->appendChild($cell); } @@ -384,7 +384,7 @@ public function display_user_classes(Page $page, array $classes, array $permissi $doc = $perm->getDocComment(); if ($doc) { $doc = preg_replace('/\/\*\*|\n\s*\*\s*|\*\//', '', $doc); - $row->appendChild(TD(["style"=>"text-align: left;"], $doc)); + $row->appendChild(TD(["style" => "text-align: left;"], $doc)); } else { $row->appendChild(TD("")); } diff --git a/ext/user_config/info.php b/ext/user_config/info.php index a6495dbd9..d546352a4 100644 --- a/ext/user_config/info.php +++ b/ext/user_config/info.php @@ -10,7 +10,7 @@ class UserConfigInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "User-specific settings"; - public array $authors = ["Matthew Barbour"=>"matthew@darkholme.net"]; + public array $authors = ["Matthew Barbour" => "matthew@darkholme.net"]; public string $license = self::LICENSE_WTFPL; public string $description = "Provides system-wide support for user-specific settings"; public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN; diff --git a/ext/user_config/main.php b/ext/user_config/main.php index cf53dbb0a..2a729732f 100644 --- a/ext/user_config/main.php +++ b/ext/user_config/main.php @@ -93,7 +93,7 @@ public function onDatabaseUpgrade(DatabaseUpgradeEvent $event): void public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { global $user; - if ($event->parent==="user" && !$user->is_anonymous()) { + if ($event->parent === "user" && !$user->is_anonymous()) { $event->add_nav_link("user_config", new Link('user_config'), "User Options", false, 40); } } @@ -154,7 +154,7 @@ public function onPageRequest(PageRequestEvent $event) ]); $duser = User::by_id($input['id']); - if ($user->id!=$duser->id && !$user->can(Permissions::CHANGE_OTHER_USER_SETTING)) { + if ($user->id != $duser->id && !$user->can(Permissions::CHANGE_OTHER_USER_SETTING)) { $this->theme->display_permission_denied(); return; } diff --git a/ext/view/events/image_admin_block_building_event.php b/ext/view/events/image_admin_block_building_event.php index 47cb6a5c1..6a1d458d2 100644 --- a/ext/view/events/image_admin_block_building_event.php +++ b/ext/view/events/image_admin_block_building_event.php @@ -20,7 +20,7 @@ public function __construct(Image $image, User $user, string $context) $this->context = $context; } - public function add_part(string $html, int $position=50) + public function add_part(string $html, int $position = 50) { while (isset($this->parts[$position])) { $position++; diff --git a/ext/view/events/image_info_box_building_event.php b/ext/view/events/image_info_box_building_event.php index 206cbf25f..db9399e6b 100644 --- a/ext/view/events/image_info_box_building_event.php +++ b/ext/view/events/image_info_box_building_event.php @@ -19,7 +19,7 @@ public function __construct(Image $image, User $user) $this->user = $user; } - public function add_part(HTMLElement $html, int $position=50) + public function add_part(HTMLElement $html, int $position = 50) { while (isset($this->parts[$position])) { $position++; diff --git a/ext/view/test.php b/ext/view/test.php index 8faeab77b..320270522 100644 --- a/ext/view/test.php +++ b/ext/view/test.php @@ -47,10 +47,10 @@ public function testPrevNext() $this->assertEquals("/test/post/view/$image_id_2", $page->redirect); // When searching, we skip the middle - $page = $this->get_page("post/prev/$image_id_1", ["search"=>"test"]); + $page = $this->get_page("post/prev/$image_id_1", ["search" => "test"]); $this->assertEquals("/test/post/view/$image_id_3?#search=test", $page->redirect); - $page = $this->get_page("post/next/$image_id_3", ["search"=>"test"]); + $page = $this->get_page("post/next/$image_id_3", ["search" => "test"]); $this->assertEquals("/test/post/view/$image_id_1?#search=test", $page->redirect); // Middle image: has next and prev diff --git a/ext/wiki/info.php b/ext/wiki/info.php index 8c2583a1b..9c28808ae 100644 --- a/ext/wiki/info.php +++ b/ext/wiki/info.php @@ -11,7 +11,7 @@ class WikiInfo extends ExtensionInfo public string $key = self::KEY; public string $name = "Simple Wiki"; public string $url = self::SHIMMIE_URL; - public array $authors = [self::SHISH_NAME=>self::SHISH_EMAIL, "Luana Latte"=>"luana.latte.cat@gmail.com"]; + public array $authors = [self::SHISH_NAME => self::SHISH_EMAIL, "Luana Latte" => "luana.latte.cat@gmail.com"]; public string $license = self::LICENSE_GPLV2; public string $description = "A simple wiki, for those who don't want the hugeness of mediawiki"; public ?string $documentation = "Standard formatting APIs are used (This will be BBCode by default)"; diff --git a/ext/wiki/main.php b/ext/wiki/main.php index c115512ab..179eacfc9 100644 --- a/ext/wiki/main.php +++ b/ext/wiki/main.php @@ -67,7 +67,7 @@ class WikiPage #[Field] public string $body; - public function __construct(array $row=null) + public function __construct(array $row = null) { //assert(!empty($row)); global $database; @@ -80,7 +80,7 @@ public function __construct(array $row=null) $this->title = $row['title']; $this->revision = (int)$row['revision']; $this->locked = bool_escape($row['locked']); - $this->exists = $database->exists("SELECT id FROM wiki_pages WHERE title = :title", ["title"=>$this->title]); + $this->exists = $database->exists("SELECT id FROM wiki_pages WHERE title = :title", ["title" => $this->title]); $this->body = $row['body']; } } @@ -248,7 +248,7 @@ public function onPageNavBuilding(PageNavBuildingEvent $event) public function onPageSubNavBuilding(PageSubNavBuildingEvent $event) { - if ($event->parent=="wiki") { + if ($event->parent == "wiki") { $event->add_nav_link("wiki_rules", new Link('wiki/rules'), "Rules"); $event->add_nav_link("wiki_help", new Link('ext_doc/wiki'), "Help"); } @@ -259,24 +259,24 @@ public function onWikiUpdate(WikiUpdateEvent $event) global $database, $config; $wpage = $event->wikipage; - $exists = $database->exists("SELECT id FROM wiki_pages WHERE title = :title", ["title"=>$wpage->title]); + $exists = $database->exists("SELECT id FROM wiki_pages WHERE title = :title", ["title" => $wpage->title]); try { - if ($config->get_bool(WikiConfig::ENABLE_REVISIONS) || ! $exists) { + if ($config->get_bool(WikiConfig::ENABLE_REVISIONS) || !$exists) { $database->execute( " INSERT INTO wiki_pages(owner_id, owner_ip, date, title, revision, locked, body) VALUES (:owner_id, :owner_ip, now(), :title, :revision, :locked, :body)", - ["owner_id"=>$event->user->id, "owner_ip"=>get_real_ip(), - "title"=>$wpage->title, "revision"=>$wpage->revision, "locked"=>$wpage->locked, "body"=>$wpage->body] + ["owner_id" => $event->user->id, "owner_ip" => get_real_ip(), + "title" => $wpage->title, "revision" => $wpage->revision, "locked" => $wpage->locked, "body" => $wpage->body] ); } else { $database->execute( " UPDATE wiki_pages SET owner_id=:owner_id, owner_ip=:owner_ip, date=now(), locked=:locked, body=:body WHERE title = :title ORDER BY revision DESC LIMIT 1", - ["owner_id"=>$event->user->id, "owner_ip"=>get_real_ip(), - "title"=>$wpage->title, "locked"=>$wpage->locked, "body"=>$wpage->body] + ["owner_id" => $event->user->id, "owner_ip" => get_real_ip(), + "title" => $wpage->title, "locked" => $wpage->locked, "body" => $wpage->body] ); } } catch (\Exception $e) { @@ -289,7 +289,7 @@ public function onWikiDeleteRevision(WikiDeleteRevisionEvent $event) global $database; $database->execute( "DELETE FROM wiki_pages WHERE title=:title AND revision=:rev", - ["title"=>$event->title, "rev"=>$event->revision] + ["title" => $event->title, "rev" => $event->revision] ); } @@ -336,12 +336,12 @@ public static function get_history(string $title): array WHERE LOWER(title) LIKE LOWER(:title) ORDER BY revision DESC ", - ["title"=>$title] + ["title" => $title] ); } #[Query(name: "wiki")] - public static function get_page(string $title, ?int $revision=null): WikiPage + public static function get_page(string $title, ?int $revision = null): WikiPage { global $database; // first try and get the actual page @@ -353,7 +353,7 @@ public static function get_page(string $title, ?int $revision=null): WikiPage AND (:revision = -1 OR revision = :revision) ORDER BY revision DESC ", - ["title"=>$title, "revision"=>$revision ?? -1] + ["title" => $title, "revision" => $revision ?? -1] ); // fall back to wiki:default @@ -363,7 +363,7 @@ public static function get_page(string $title, ?int $revision=null): WikiPage FROM wiki_pages WHERE title LIKE :title ORDER BY revision DESC - ", ["title"=>"wiki:default"]); + ", ["title" => "wiki:default"]); // fall further back to manual if (empty($row)) { @@ -397,7 +397,7 @@ public static function format_tag_wiki_page(WikiPage $page): string SELECT * FROM tags WHERE tag = :title - ", ["title"=>$page->title]); + ", ["title" => $page->title]); if (!empty($row)) { $template = $config->get_string(WikiConfig::TAG_PAGE_TEMPLATE); @@ -414,7 +414,7 @@ public static function format_tag_wiki_page(WikiPage $page): string FROM aliases WHERE newtag = :title ORDER BY oldtag ASC - ", ["title"=>$row["tag"]]); + ", ["title" => $row["tag"]]); if (!empty($aliases)) { $template = str_replace("{aliases}", implode(", ", $aliases), $template); @@ -431,7 +431,7 @@ public static function format_tag_wiki_page(WikiPage $page): string SELECT additional_tags FROM auto_tag WHERE tag = :title - ", ["title"=>$row["tag"]]); + ", ["title" => $row["tag"]]); if (!empty($auto_tags)) { $auto_tags = Tag::explode($auto_tags); @@ -444,7 +444,7 @@ public static function format_tag_wiki_page(WikiPage $page): string SELECT * FROM tags WHERE tag = :title - ", ["title"=>$a_tag]); + ", ["title" => $a_tag]); $tag_html = $tag_list_t->return_tag($a_row, $tag_category_dict ?? []); $f_auto_tags[] = $tag_html[1]; @@ -521,7 +521,7 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string /** * add to output-string, if "show_equal" is enabled */ - $out .= ($show_equal==1) + $out .= ($show_equal == 1) ? $this->formatline(($c1), ($c2), "=", $f1[ $c1 ]) : "" ; /** @@ -535,8 +535,8 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string /** * move the current-pointer in the left and right side */ - $c1 ++; - $c2 ++; + $c1++; + $c2++; } /** @@ -576,7 +576,7 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string * be used, else it will be discarded later */ #hit - if (trim($f1[$c1+$s1]) == trim($f2[$c2])) { + if (trim($f1[$c1 + $s1]) == trim($f2[$c2])) { $found = 1 ; # set flag to stop further search $s2 = 0 ; # reset right side search-pointer $c2-- ; # move back the current right, so next loop hits @@ -593,7 +593,7 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string /** * add current search-line to diffence-buffer */ - $b1 .= $this->formatline(($c1 + $s1), ($c2), "-", $f1[ $c1+$s1 ]); + $b1 .= $this->formatline(($c1 + $s1), ($c2), "-", $f1[ $c1 + $s1 ]); /** * mark this line as 'searched' to prevent doubles. @@ -609,7 +609,7 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string * * comparing current line with the searching line on the right */ - if (trim($f1[$c1]) == trim($f2[$c2+$s2])) { + if (trim($f1[$c1]) == trim($f2[$c2 + $s2])) { $found = 1 ; # flag to stop search $s1 = 0 ; # reset pointer for search $c1-- ; # move current line back, so we hit next loop @@ -622,7 +622,7 @@ private function arr_diff(array $f1, array $f2, int $show_equal = 0): string /** * add current searchline to buffer */ - $b2 .= $this->formatline(($c1), ($c2 + $s2), "+", $f2[ $c2+$s2 ]); + $b2 .= $this->formatline(($c1), ($c2 + $s2), "+", $f2[ $c2 + $s2 ]); /** * mark current line to prevent double-hits diff --git a/ext/wiki/test.php b/ext/wiki/test.php index 8f5551cc2..52da9b008 100644 --- a/ext/wiki/test.php +++ b/ext/wiki/test.php @@ -35,7 +35,7 @@ public function testAccess() $this->assert_text("This is a default page"); if ($allowed || $user == "admin") { - $this->post_page("wiki_admin/edit", ["title"=>"test"]); + $this->post_page("wiki_admin/edit", ["title" => "test"]); $this->assert_text("Editor"); } /* diff --git a/ext/wiki/theme.php b/ext/wiki/theme.php index 66b315a66..2d4dfd024 100644 --- a/ext/wiki/theme.php +++ b/ext/wiki/theme.php @@ -12,7 +12,7 @@ class WikiTheme extends Themelet * $wiki_page The wiki page, has ->title and ->body * $nav_page A wiki page object with navigation, has ->body */ - public function display_page(Page $page, WikiPage $wiki_page, ?WikiPage $nav_page=null) + public function display_page(Page $page, WikiPage $wiki_page, ?WikiPage $nav_page = null) { global $user; diff --git a/index.php b/index.php index 61b176caf..7aebad1c4 100644 --- a/index.php +++ b/index.php @@ -67,9 +67,9 @@ $_tracer->begin( $_SERVER["REQUEST_URI"] ?? "No Request", [ - "user"=>$_COOKIE["shm_user"] ?? "No User", - "ip"=>get_real_ip() ?? "No IP", - "user_agent"=>$_SERVER['HTTP_USER_AGENT'] ?? "No UA", + "user" => $_COOKIE["shm_user"] ?? "No User", + "ip" => get_real_ip() ?? "No IP", + "user_agent" => $_SERVER['HTTP_USER_AGENT'] ?? "No UA", ] ); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 8203ee969..2cd651ef3 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -111,7 +111,7 @@ private static function check_args(?array $args): array if (!$args) { return []; } - foreach ($args as $k=>$v) { + foreach ($args as $k => $v) { if (is_array($v)) { $args[$k] = $v; } else { @@ -121,7 +121,7 @@ private static function check_args(?array $args): array return $args; } - protected static function request($page_name, $get_args=null, $post_args=null): Page + protected static function request($page_name, $get_args = null, $post_args = null): Page { // use a fresh page global $page; @@ -142,12 +142,12 @@ protected static function request($page_name, $get_args=null, $post_args=null): return $page; } - protected static function get_page($page_name, $args=null): Page + protected static function get_page($page_name, $args = null): Page { return self::request($page_name, $args, null); } - protected static function post_page($page_name, $args=null): Page + protected static function post_page($page_name, $args = null): Page { return self::request($page_name, null, $args); } @@ -177,7 +177,7 @@ protected function assert_response(int $code): void $this->assertEquals($code, $page->code); } - protected function page_to_text(string $section=null): string + protected function page_to_text(string $section = null): string { global $page; if ($page->mode == PageMode::PAGE) { @@ -196,12 +196,12 @@ protected function page_to_text(string $section=null): string } } - protected function assert_text(string $text, string $section=null): void + protected function assert_text(string $text, string $section = null): void { $this->assertStringContainsString($text, $this->page_to_text($section)); } - protected function assert_no_text(string $text, string $section=null): void + protected function assert_no_text(string $text, string $section = null): void { $this->assertStringNotContainsString($text, $this->page_to_text($section)); } diff --git a/themes/danbooru/comment.theme.php b/themes/danbooru/comment.theme.php index 525fb2617..935a560c1 100644 --- a/themes/danbooru/comment.theme.php +++ b/themes/danbooru/comment.theme.php @@ -90,7 +90,7 @@ public function display_recent_comments(array $comments) // no recent comments in this theme } - protected function comment_to_html(Comment $comment, bool $trim=false): string + protected function comment_to_html(Comment $comment, bool $trim = false): string { global $user; diff --git a/themes/danbooru/themelet.class.php b/themes/danbooru/themelet.class.php index 96675fa2c..4b7a1a2ae 100644 --- a/themes/danbooru/themelet.class.php +++ b/themes/danbooru/themelet.class.php @@ -40,15 +40,15 @@ private function build_paginator(int $current_page, int $total_pages, string $ba $prev = $current_page - 1; $at_start = ($current_page <= 3 || $total_pages <= 3); - $at_end = ($current_page >= $total_pages -2); + $at_end = ($current_page >= $total_pages - 2); $first_html = $at_start ? "" : $this->gen_page_link($base_url, $query, 1, "1"); $prev_html = $at_start ? "" : $this->gen_page_link($base_url, $query, $prev, "<<"); $next_html = $at_end ? "" : $this->gen_page_link($base_url, $query, $next, ">>"); $last_html = $at_end ? "" : $this->gen_page_link($base_url, $query, $total_pages, "$total_pages"); - $start = $current_page-2 > 1 ? $current_page-2 : 1; - $end = $current_page+2 <= $total_pages ? $current_page+2 : $total_pages; + $start = $current_page - 2 > 1 ? $current_page - 2 : 1; + $end = $current_page + 2 <= $total_pages ? $current_page + 2 : $total_pages; $pages = []; foreach (range($start, $end) as $i) { @@ -68,6 +68,6 @@ private function build_paginator(int $current_page, int $total_pages, string $ba $ndots = ""; } - return DIV(["id"=>'paginator'], joinHTML(" ", [$prev_html, $first_html, $pdots, $pages_html, $ndots, $last_html, $next_html])); + return DIV(["id" => 'paginator'], joinHTML(" ", [$prev_html, $first_html, $pdots, $pages_html, $ndots, $last_html, $next_html])); } } diff --git a/themes/danbooru/view.theme.php b/themes/danbooru/view.theme.php index 7314829e5..28facb934 100644 --- a/themes/danbooru/view.theme.php +++ b/themes/danbooru/view.theme.php @@ -37,7 +37,7 @@ private function build_stats(Image $image): string Filesize: $h_filesize Type: $h_type"; - if ($image->length!=null) { + if ($image->length != null) { $h_length = format_milliseconds($image->length); $html .= "Length: $h_length"; } diff --git a/themes/danbooru2/comment.theme.php b/themes/danbooru2/comment.theme.php index dd43860eb..4ca014e9e 100644 --- a/themes/danbooru2/comment.theme.php +++ b/themes/danbooru2/comment.theme.php @@ -91,7 +91,7 @@ public function display_recent_comments(array $comments) } - protected function comment_to_html(Comment $comment, bool $trim=false): string + protected function comment_to_html(Comment $comment, bool $trim = false): string { global $user; diff --git a/themes/danbooru2/themelet.class.php b/themes/danbooru2/themelet.class.php index 0f1922755..7e619442b 100644 --- a/themes/danbooru2/themelet.class.php +++ b/themes/danbooru2/themelet.class.php @@ -21,7 +21,7 @@ public function display_paginator(Page $page, string $base, ?string $query, int private function gen_page_link(string $base_url, ?string $query, int $page, string $name): HTMLElement { - return A(["href"=>make_link("$base_url/$page", $query)], $name); + return A(["href" => make_link("$base_url/$page", $query)], $name); } private function gen_page_link_block(string $base_url, ?string $query, int $page, int $current_page, string $name): HTMLElement @@ -40,15 +40,15 @@ private function build_paginator(int $current_page, int $total_pages, string $ba $prev = $current_page - 1; $at_start = ($current_page <= 3 || $total_pages <= 3); - $at_end = ($current_page >= $total_pages -2); + $at_end = ($current_page >= $total_pages - 2); $first_html = $at_start ? "" : $this->gen_page_link($base_url, $query, 1, "1"); $prev_html = $at_start ? "" : $this->gen_page_link($base_url, $query, $prev, "<<"); $next_html = $at_end ? "" : $this->gen_page_link($base_url, $query, $next, ">>"); $last_html = $at_end ? "" : $this->gen_page_link($base_url, $query, $total_pages, "$total_pages"); - $start = $current_page-2 > 1 ? $current_page-2 : 1; - $end = $current_page+2 <= $total_pages ? $current_page+2 : $total_pages; + $start = $current_page - 2 > 1 ? $current_page - 2 : 1; + $end = $current_page + 2 <= $total_pages ? $current_page + 2 : $total_pages; $pages = []; foreach (range($start, $end) as $i) { @@ -62,12 +62,12 @@ private function build_paginator(int $current_page, int $total_pages, string $ba $pdots = ""; } - if ($total_pages > $end+1) { + if ($total_pages > $end + 1) { $ndots = "..."; } else { $ndots = ""; } - return DIV(["id"=>"paginator"], joinHTML(" ", [$prev_html, $first_html, $pdots, $pages_html, $ndots, $last_html, $next_html])); + return DIV(["id" => "paginator"], joinHTML(" ", [$prev_html, $first_html, $pdots, $pages_html, $ndots, $last_html, $next_html])); } } diff --git a/themes/danbooru2/view.theme.php b/themes/danbooru2/view.theme.php index 130eb81d0..99e3c8607 100644 --- a/themes/danbooru2/view.theme.php +++ b/themes/danbooru2/view.theme.php @@ -37,7 +37,7 @@ private function build_information(Image $image): string Type: $h_type "; - if ($image->length!=null) { + if ($image->length != null) { $h_length = format_milliseconds($image->length); $html .= "Length: $h_length"; } diff --git a/themes/futaba/comment.theme.php b/themes/futaba/comment.theme.php index ae30fed18..ec39b18e7 100644 --- a/themes/futaba/comment.theme.php +++ b/themes/futaba/comment.theme.php @@ -64,7 +64,7 @@ public function build_upload_box(): string } - protected function comment_to_html(Comment $comment, bool $trim=false): string + protected function comment_to_html(Comment $comment, bool $trim = false): string { $inner_id = $this->inner_id; // because custom themes can't add params, because PHP global $user; diff --git a/themes/futaba/themelet.class.php b/themes/futaba/themelet.class.php index cb2c937d1..e059b3c2b 100644 --- a/themes/futaba/themelet.class.php +++ b/themes/futaba/themelet.class.php @@ -55,8 +55,8 @@ public function futaba_build_paginator(int $current_page, int $total_pages, stri $next_html = $at_end ? "Next" : $this->futaba_gen_page_link($base_url, $query, $next, "Next"); //$last_html = $at_end ? "Last" : $this->futaba_gen_page_link($base_url, $query, $total_pages, "Last"); - $start = $current_page-5 > 1 ? $current_page-5 : 1; - $end = $start+10 < $total_pages ? $start+10 : $total_pages; + $start = $current_page - 5 > 1 ? $current_page - 5 : 1; + $end = $start + 10 < $total_pages ? $start + 10 : $total_pages; $pages = []; foreach (range($start, $end) as $i) { diff --git a/themes/lite/comment.theme.php b/themes/lite/comment.theme.php index ce60276c9..20717a981 100644 --- a/themes/lite/comment.theme.php +++ b/themes/lite/comment.theme.php @@ -6,7 +6,7 @@ class CustomCommentListTheme extends CommentListTheme { - protected function comment_to_html(Comment $comment, bool $trim=false): string + protected function comment_to_html(Comment $comment, bool $trim = false): string { return $this->rr(parent::comment_to_html($comment, $trim)); } diff --git a/themes/lite/page.class.php b/themes/lite/page.class.php index 212c89646..d6d606344 100644 --- a/themes/lite/page.class.php +++ b/themes/lite/page.class.php @@ -112,7 +112,7 @@ public function render() EOD; } /* end of function display_page() */ - public function block_to_html(Block $block, bool $hidable=false): string + public function block_to_html(Block $block, bool $hidable = false): string { $h = $block->header; $b = $block->body; diff --git a/themes/lite/themelet.class.php b/themes/lite/themelet.class.php index 336cefff2..39c61b720 100644 --- a/themes/lite/themelet.class.php +++ b/themes/lite/themelet.class.php @@ -34,7 +34,7 @@ public function display_paginator(Page $page, string $base, ?string $query, int $page->add_block(new Block("Paginator", $body, "main", 90)); } - public function litetheme_gen_page_link(string $base_url, ?string $query, int $page, string $name, ?string $link_class=null): HTMLElement + public function litetheme_gen_page_link(string $base_url, ?string $query, int $page, string $name, ?string $link_class = null): HTMLElement { return A(["href" => make_link("$base_url/$page", $query), "class" => $link_class], $name); } @@ -57,8 +57,8 @@ public function litetheme_build_paginator(int $current_page, int $total_pages, s $at_start = ($current_page <= 1 || $total_pages <= 1); $at_end = ($current_page >= $total_pages); - $first_html = $at_start ? SPAN(["class"=>"tab"], "First") : $this->litetheme_gen_page_link($base_url, $query, 1, "First"); - $prev_html = $at_start ? SPAN(["class"=>"tab"], "Prev") : $this->litetheme_gen_page_link($base_url, $query, $prev, "Prev"); + $first_html = $at_start ? SPAN(["class" => "tab"], "First") : $this->litetheme_gen_page_link($base_url, $query, 1, "First"); + $prev_html = $at_start ? SPAN(["class" => "tab"], "Prev") : $this->litetheme_gen_page_link($base_url, $query, $prev, "Prev"); $random_html = ""; if ($show_random) { @@ -66,11 +66,11 @@ public function litetheme_build_paginator(int $current_page, int $total_pages, s $random_html = $this->litetheme_gen_page_link($base_url, $query, $rand, "Random"); } - $next_html = $at_end ? SPAN(["class"=>"tab"], "Next") : $this->litetheme_gen_page_link($base_url, $query, $next, "Next"); - $last_html = $at_end ? SPAN(["class"=>"tab"], "Last") : $this->litetheme_gen_page_link($base_url, $query, $total_pages, "Last"); + $next_html = $at_end ? SPAN(["class" => "tab"], "Next") : $this->litetheme_gen_page_link($base_url, $query, $next, "Next"); + $last_html = $at_end ? SPAN(["class" => "tab"], "Last") : $this->litetheme_gen_page_link($base_url, $query, $total_pages, "Last"); - $start = $current_page-5 > 1 ? $current_page-5 : 1; - $end = $start+10 < $total_pages ? $start+10 : $total_pages; + $start = $current_page - 5 > 1 ? $current_page - 5 : 1; + $end = $start + 10 < $total_pages ? $start + 10 : $total_pages; $pages = []; foreach (range($start, $end) as $i) { @@ -78,7 +78,7 @@ public function litetheme_build_paginator(int $current_page, int $total_pages, s } return DIV( - ["class"=>"paginator sfoot"], + ["class" => "paginator sfoot"], $first_html, $prev_html, $random_html, diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php index 76f95336b..02d55c963 100644 --- a/themes/lite/view.theme.php +++ b/themes/lite/view.theme.php @@ -38,10 +38,10 @@ private function build_stats(Image $image): string Filesize: $h_filesize Type: ".$h_type." "; - if ($image->video_codec!=null) { + if ($image->video_codec != null) { $html .= "Video Codec: $image->video_codec"; } - if ($image->length!=null) { + if ($image->length != null) { $h_length = format_milliseconds($image->length); $html .= "Length: $h_length"; } diff --git a/themes/rule34v2/themelet.class.php b/themes/rule34v2/themelet.class.php index e9902ad84..e26ff2294 100644 --- a/themes/rule34v2/themelet.class.php +++ b/themes/rule34v2/themelet.class.php @@ -35,14 +35,14 @@ public function build_thumb_html(Image $image): HTMLElement } $html = DIV( - ['class'=>'shm-thumb thumb', 'data-ext'=>$ext, 'data-tags'=>$tags, 'data-post-id'=>$id], + ['class' => 'shm-thumb thumb', 'data-ext' => $ext, 'data-tags' => $tags, 'data-post-id' => $id], A( - ['class'=>'shm-thumb-link', 'href'=>$view_link], - IMG(['id'=>"thumb_$id", 'title'=>$tip, 'alt'=>$tip, 'height'=>$tsize[1], 'width'=>$tsize[0], 'src'=>$thumb_link, 'loading'=>'lazy']) + ['class' => 'shm-thumb-link', 'href' => $view_link], + IMG(['id' => "thumb_$id", 'title' => $tip, 'alt' => $tip, 'height' => $tsize[1], 'width' => $tsize[0], 'src' => $thumb_link, 'loading' => 'lazy']) ), BR(), - A(['href'=>$image_link], 'File Only'), - SPAN(['class'=>'need-del'], ' - ', A(['href'=>'#', 'onclick'=>"image_hash_ban($id); return false;"], 'Ban')) + A(['href' => $image_link], 'File Only'), + SPAN(['class' => 'need-del'], ' - ', A(['href' => '#', 'onclick' => "image_hash_ban($id); return false;"], 'Ban')) ); // cache for ages; will be cleared in ext/index:onImageInfoSet diff --git a/themes/rule34v2/upload.theme.php b/themes/rule34v2/upload.theme.php index 405364e8e..bf4ccb708 100644 --- a/themes/rule34v2/upload.theme.php +++ b/themes/rule34v2/upload.theme.php @@ -44,18 +44,18 @@ public function display_page(Page $page): void $form = SHM_FORM("upload", "POST", true, "file_upload"); $form->appendChild( TABLE( - ["id"=>"large_upload_form", "class"=>"vert"], + ["id" => "large_upload_form", "class" => "vert"], TR( - TD(["width"=>"20"], rawHTML("Common Tags")), - TD(["colspan"=>"5"], INPUT(["name"=>"tags", "type"=>"text", "placeholder"=>"tagme", "autocomplete"=>"off"])) + TD(["width" => "20"], rawHTML("Common Tags")), + TD(["colspan" => "5"], INPUT(["name" => "tags", "type" => "text", "placeholder" => "tagme", "autocomplete" => "off"])) ), TR( - TD(["width"=>"20"], rawHTML("Common Source")), - TD(["colspan"=>"5"], INPUT(["name"=>"source", "type"=>"text"])) + TD(["width" => "20"], rawHTML("Common Source")), + TD(["colspan" => "5"], INPUT(["name" => "source", "type" => "text"])) ), $upload_list, TR( - TD(["colspan"=>"6"], INPUT(["id"=>"uploadbutton", "type"=>"submit", "value"=>"Post"])) + TD(["colspan" => "6"], INPUT(["id" => "uploadbutton", "type" => "submit", "value" => "Post"])) ), ) ); @@ -79,7 +79,7 @@ public function display_page(Page $page): void protected function build_upload_block(): HTMLElement { - return A(["href"=>make_link("upload"), "style"=>'font-size: 2em; display: block;'], "Upload"); + return A(["href" => make_link("upload"), "style" => 'font-size: 2em; display: block;'], "Upload"); } protected function h_upload_list_1(): HTMLElement @@ -92,18 +92,18 @@ protected function h_upload_list_1(): HTMLElement $upload_list->appendChild( TR( - TD(["colspan"=>$tl_enabled ? 2 : 4], "Files"), - $tl_enabled ? TD(["colspan"=>"2"], "URLs") : emptyHTML(), - TD(["colspan"=>"2"], "Post-Specific Tags"), + TD(["colspan" => $tl_enabled ? 2 : 4], "Files"), + $tl_enabled ? TD(["colspan" => "2"], "URLs") : emptyHTML(), + TD(["colspan" => "2"], "Post-Specific Tags"), ) ); - for ($i=0; $i<$upload_count; $i++) { + for ($i = 0; $i < $upload_count; $i++) { $upload_list->appendChild( TR( - TD(["colspan"=>$tl_enabled ? 2 : 4], INPUT(["type"=>"file", "name"=>"data{$i}[]", "accept"=>$accept, "multiple"=>true])), - $tl_enabled ? TD(["colspan"=>"2"], INPUT(["type"=>"text", "name"=>"url{$i}"])) : emptyHTML(), - TD(["colspan"=>"2"], INPUT(["type"=>"text", "name"=>"tags{$i}", "autocomplete"=>"off"])), + TD(["colspan" => $tl_enabled ? 2 : 4], INPUT(["type" => "file", "name" => "data{$i}[]", "accept" => $accept, "multiple" => true])), + $tl_enabled ? TD(["colspan" => "2"], INPUT(["type" => "text", "name" => "url{$i}"])) : emptyHTML(), + TD(["colspan" => "2"], INPUT(["type" => "text", "name" => "tags{$i}", "autocomplete" => "off"])), ) ); } diff --git a/themes/rule34v2/user.theme.php b/themes/rule34v2/user.theme.php index 56e2219fd..f621e1579 100644 --- a/themes/rule34v2/user.theme.php +++ b/themes/rule34v2/user.theme.php @@ -73,30 +73,30 @@ public function display_signup_page(Page $page) $form = SHM_SIMPLE_FORM( "user_admin/create", TABLE( - ["class"=>"form"], + ["class" => "form"], TBODY( TR( TH("Name"), - TD(INPUT(["type"=>'text', "name"=>'name', "required"=>true])) + TD(INPUT(["type" => 'text', "name" => 'name', "required" => true])) ), TR( TH("Password"), - TD(INPUT(["type"=>'password', "name"=>'pass1', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass1', "required" => true])) ), TR( TH(rawHTML("Repeat Password")), - TD(INPUT(["type"=>'password', "name"=>'pass2', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass2', "required" => true])) ), TR( TH(rawHTML("Email")), - TD(INPUT(["type"=>'email', "name"=>'email', "required"=>true])) + TD(INPUT(["type" => 'email', "name" => 'email', "required" => true])) ), TR( - TD(["colspan"=>"2"], rawHTML(captcha_get_html())) + TD(["colspan" => "2"], rawHTML(captcha_get_html())) ), ), TFOOT( - TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Create Account"]))) + TR(TD(["colspan" => "2"], INPUT(["type" => "submit", "value" => "Create Account"]))) ) ) ); @@ -119,30 +119,30 @@ public function display_user_creator() $form = SHM_SIMPLE_FORM( "user_admin/create_other", TABLE( - ["class"=>"form"], + ["class" => "form"], TBODY( TR( TH("Name"), - TD(INPUT(["type"=>'text', "name"=>'name', "required"=>true])) + TD(INPUT(["type" => 'text', "name" => 'name', "required" => true])) ), TR( TH("Password"), - TD(INPUT(["type"=>'password', "name"=>'pass1', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass1', "required" => true])) ), TR( TH(rawHTML("Repeat Password")), - TD(INPUT(["type"=>'password', "name"=>'pass2', "required"=>true])) + TD(INPUT(["type" => 'password', "name" => 'pass2', "required" => true])) ), TR( TH(rawHTML("Email")), - TD(INPUT(["type"=>'email', "name"=>'email'])) + TD(INPUT(["type" => 'email', "name" => 'email'])) ), TR( - TD(["colspan"=>2], rawHTML("(Email is optional for admin-created accounts)")), + TD(["colspan" => 2], rawHTML("(Email is optional for admin-created accounts)")), ), ), TFOOT( - TR(TD(["colspan"=>"2"], INPUT(["type"=>"submit", "value"=>"Create Account"]))) + TR(TD(["colspan" => "2"], INPUT(["type" => "submit", "value" => "Create Account"]))) ) ) );