james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Image to Post - upload

Browse Source
This commit is contained in:
Matthew Barbour 2020-10-26 10:19:02 -05:00
parent 886d7cfd99
commit 3aa1926f72
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/upload/main.php
View File

@ -194,7 +194,7 @@ class Upload extends Extension
$this->theme->display_permission_denied(); $this->theme->display_permission_denied();
} else { } else {
if ($this->is_full) { if ($this->is_full) {
throw new UploadException("Can not replace Image: disk nearly full"); throw new UploadException("Can not replace Post: disk nearly full");
} }
// Try to get the image ID // Try to get the image ID
@ -203,12 +203,12 @@ class Upload extends Extension
} elseif (isset($_POST['image_id'])) { } elseif (isset($_POST['image_id'])) {
$image_id = int_escape($_POST['image_id']); $image_id = int_escape($_POST['image_id']);
} else { } else {
throw new UploadException("Can not replace Image: No valid Image ID given."); throw new UploadException("Can not replace Post: No valid Post ID given.");
} }
$image_old = Image::by_id($image_id); $image_old = Image::by_id($image_id);
if (is_null($image_old)) { if (is_null($image_old)) {
throw new UploadException("Can not replace Image: No image with ID $image_id"); throw new UploadException("Can not replace Post: No post with ID $image_id");
} }
$source = $_POST['source'] ?? null; $source = $_POST['source'] ?? null;
@ -370,7 +370,7 @@ class Upload extends Extension
if ($event->image_id == -1) { if ($event->image_id == -1) {
throw new UploadException("MIME type not supported: " . $metadata['mime']); throw new UploadException("MIME type not supported: " . $metadata['mime']);
} }
$page->add_http_header("X-Shimmie-Image-ID: " . $event->image_id); $page->add_http_header("X-Shimmie-Post-ID: " . $event->image_id);
} catch (UploadException $ex) { } catch (UploadException $ex) {
$this->theme->display_upload_error( $this->theme->display_upload_error(
$page, $page,

16
ext/upload/theme.php
View File

@ -56,7 +56,7 @@ class UploadTheme extends Themelet
<tr> <tr>
<td colspan='2'>Files</td> <td colspan='2'>Files</td>
<td colspan='2'>URLs</td> <td colspan='2'>URLs</td>
<td colspan='2'>Image-Specific Tags</td> <td colspan='2'>Post-Specific Tags</td>
</tr> </tr>
"; ";
@ -73,7 +73,7 @@ class UploadTheme extends Themelet
$upload_list .= " $upload_list .= "
<tr> <tr>
<td colspan='4'>Files</td> <td colspan='4'>Files</td>
<td colspan='2'>Image-Specific Tags</td> <td colspan='2'>Post-Specific Tags</td>
</tr> </tr>
"; ";
@ -122,7 +122,7 @@ class UploadTheme extends Themelet
} }
)();'; )();';
$html .= '<a href=\''.$js.'\'>Upload to '.$title.'</a>'; $html .= '<a href=\''.$js.'\'>Upload to '.$title.'</a>';
$html .= ' (Drag &amp; drop onto your bookmarks toolbar, then click when looking at an image)'; $html .= ' (Drag &amp; drop onto your bookmarks toolbar, then click when looking at a post)';
// Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported. // Bookmarklet checks if shimmie supports ext. If not, won't upload to site/shows alert saying not supported.
$supported_ext = join(" ", DataHandlerExtension::get_all_supported_exts()); $supported_ext = join(" ", DataHandlerExtension::get_all_supported_exts());
@ -135,7 +135,7 @@ class UploadTheme extends Themelet
var maxsize=&quot;'.$max_kb.'&quot;; var maxsize=&quot;'.$max_kb.'&quot;;
var CA=0; var CA=0;
void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'&quot;) void(document.body.appendChild(document.createElement(&quot;script&quot;)).src=&quot;'.make_http(get_base_href())."/ext/upload/bookmarklet.js".'&quot;)
">'. $title . '</a> (Click when looking at an image page. Works on sites running Shimmie / Danbooru / Gelbooru. (This also grabs the tags / rating / source!))'; ">'. $title . '</a> (Click when looking at a post page. Works on sites running Shimmie / Danbooru / Gelbooru. (This also grabs the tags / rating / source!))';
return $html; return $html;
} }
@ -171,7 +171,7 @@ class UploadTheme extends Themelet
$thumbnail = $this->build_thumb_html($image); $thumbnail = $this->build_thumb_html($image);
$html = " $html = "
<p>Replacing Image ID ".$image_id."<br>Please note: You will have to refresh the image page, or empty your browser cache.</p>" <p>Replacing Post ID ".$image_id."<br>Please note: You will have to refresh the post page, or empty your browser cache.</p>"
.$thumbnail."<br>" .$thumbnail."<br>"
.make_form(make_link("upload/replace/".$image_id), "POST", $multipart=true)." .make_form(make_link("upload/replace/".$image_id), "POST", $multipart=true)."
<input type='hidden' name='image_id' value='$image_id'> <input type='hidden' name='image_id' value='$image_id'>
@ -184,10 +184,10 @@ class UploadTheme extends Themelet
<small>(Max file size is $max_kb)</small> <small>(Max file size is $max_kb)</small>
"; ";
$page->set_title("Replace Image"); $page->set_title("Replace Post");
$page->set_heading("Replace Image"); $page->set_heading("Replace Post");
$page->add_block(new NavBlock()); $page->add_block(new NavBlock());
$page->add_block(new Block("Upload Replacement Image", $html, "main", 20)); $page->add_block(new Block("Upload Replacement Post", $html, "main", 20));
} }
public function display_upload_status(Page $page, bool $ok) public function display_upload_status(Page $page, bool $ok)