From 97424fbce6e0b0a02b0f166af432bb9012b593cc Mon Sep 17 00:00:00 2001 From: flatty Date: Fri, 17 Dec 2021 23:40:55 -0600 Subject: [PATCH 1/5] Fix uploader issue with SHM_FORM --- ext/upload/theme.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/upload/theme.php b/ext/upload/theme.php index 6d0c6eff..07bcd08f 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -42,7 +42,7 @@ class UploadTheme extends Themelet $max_kb = to_shorthand_int($max_size); $upload_list = $this->h_upload_list_1(); - $form = SHM_FORM(make_link("upload"), "POST", true, "file_upload"); + $form = SHM_FORM("upload", "POST", true, "file_upload"); $form->appendChild( TABLE( ["id"=>"large_upload_form", "class"=>"vert"], @@ -189,7 +189,7 @@ class UploadTheme extends Themelet $image = Image::by_id($image_id); $thumbnail = $this->build_thumb_html($image); - $form = SHM_FORM(make_link("upload/replace/".$image_id), "POST", true); + $form = SHM_FORM("upload/replace/".$image_id, "POST", true); $form->appendChild(emptyHTML( INPUT(["type"=>"hidden", "name"=>"image_id", "value"=>$image_id]), TABLE( @@ -259,7 +259,7 @@ class UploadTheme extends Themelet $max_kb = to_shorthand_int($max_size); // - $form = SHM_FORM(make_link("upload"), "POST", true); + $form = SHM_FORM("upload", "POST", true); $form->appendChild( emptyHTML( INPUT(["id"=>"data[]", "name"=>"data[]", "size"=>"16", "type"=>"file", "accept"=>$accept, "multiple"=>true]), From db973234ff04f6ae924e8b81bf63029fbc0542f9 Mon Sep 17 00:00:00 2001 From: flatanon Date: Sat, 18 Dec 2021 16:22:40 -0600 Subject: [PATCH 2/5] Fix auto_tagger issue with incorrect data type, expected int --- ext/auto_tagger/main.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php index f6efbb6d..3c6d43dd 100644 --- a/ext/auto_tagger/main.php +++ b/ext/auto_tagger/main.php @@ -269,6 +269,7 @@ class AutoTagger extends Extension if (!empty($tag_id)) { $image_ids = $database->get_col_iterable("SELECT image_id FROM image_tags WHERE tag_id = :tag_id", ["tag_id"=>$tag_id]); foreach ($image_ids as $image_id) { + $image_id = (int)$image_id; $image = Image::by_id($image_id); $event = new TagSetEvent($image, $image->get_tag_array()); send_event($event); From 1a22967b9733f3554580d79901f5c6f933e5a3c3 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 19 Dec 2021 15:38:09 -0600 Subject: [PATCH 3/5] Fixing home page Pools link --- ext/home/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/home/main.php b/ext/home/main.php index 9ff5b9fa..8c00c499 100644 --- a/ext/home/main.php +++ b/ext/home/main.php @@ -65,7 +65,7 @@ class Home extends Extension } else { $main_links = '[url=site://post/list]Posts[/url][url=site://comment/list]Comments[/url][url=site://tags]Tags[/url]'; if (class_exists("Pools")) { - $main_links .= '[url=site://pool]Pools[/url]'; + $main_links .= '[url=site://pool/list]Pools[/url]'; } if (class_exists("Wiki")) { $main_links .= '[url=site://wiki]Wiki[/url]'; From c062e231a88b7cc67c3d73cd7a8f10a4c59f2129 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 19 Dec 2021 16:45:16 -0600 Subject: [PATCH 4/5] Fixing PHP Fixer Format --- ext/auto_tagger/main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php index 3c6d43dd..f07804e9 100644 --- a/ext/auto_tagger/main.php +++ b/ext/auto_tagger/main.php @@ -269,7 +269,7 @@ class AutoTagger extends Extension if (!empty($tag_id)) { $image_ids = $database->get_col_iterable("SELECT image_id FROM image_tags WHERE tag_id = :tag_id", ["tag_id"=>$tag_id]); foreach ($image_ids as $image_id) { - $image_id = (int)$image_id; + $image_id = (int) $image_id; $image = Image::by_id($image_id); $event = new TagSetEvent($image, $image->get_tag_array()); send_event($event); From 0096a0dfa16c48dfa286af3c31464915f7bbc730 Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 19 Dec 2021 18:44:08 -0600 Subject: [PATCH 5/5] Updates css for imgNotes, notes won't show up otherwise --- ext/notes/lib/jquery.imgnotes-1.0.min.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/notes/lib/jquery.imgnotes-1.0.min.css b/ext/notes/lib/jquery.imgnotes-1.0.min.css index e4f193fc..214f3c7a 100644 --- a/ext/notes/lib/jquery.imgnotes-1.0.min.css +++ b/ext/notes/lib/jquery.imgnotes-1.0.min.css @@ -1,2 +1,2 @@ /** imgnotes jQuery plugin v1.0.0 **/ -.notesicon{background:url(notes.png) no-repeat #fff;overflow:hidden;position:absolute;height:27px;width:22px;z-index:1000000;cursor:pointer}.note{display:none;background:url(spacer.gif);border:2px solid #fff;overflow:hidden;position:absolute;z-index:0;cursor:default}.notep{display:none;background:#eee;font-size:8pt;margin-top:0;padding:2px;position:absolute;width:175px;cursor:default}#noteform{display:none;position:absolute;width:250px}#noteform textarea{width:100%} +p{font-family:"Times New Roman";font-size:14px}.ui-widget-content{font-family:"Times New Roman"}.ui-widget-content a{color:blue}.marker{position:absolute;width:27px;height:40px}.marker-text{position:absolute;top:10%;width:100%;margin:0 0 0 0;z-index:1;font-size:12px;font-weight:700;text-align:center;color:#fff}.pin{position:absolute;width:20px;height:30px}.pin-text{position:absolute;top:10%;width:100%;margin:0 0 0 0;font-size:14px;font-weight:700;text-align:center;color:#000}.tooltip{position:relative;display:inline-block}.tooltip .tooltiptext{visibility:visible;width:180px;background-color:#fff;color:#000;text-align:center;padding:5px 0;border-radius:6px;position:absolute;z-index:1;bottom:7px;left:50%;margin-left:-90px}.tooltip .tooltiptext::after{content:"";position:absolute;top:100%;left:50%;margin-left:-7px;border-width:7px;border-style:solid;border-color:#fff transparent transparent transparent}table.gridtable{font-family:verdana,arial,sans-serif;font-size:11px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse}table.gridtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede}table.gridtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#fff} \ No newline at end of file