Search for images with a particular artist.
+ return 'Search for posts with a particular artist.
artist=leonardo-
Returns images with the artist "leonardo".
-Returns posts with the artist "leonardo".
+ '; } } diff --git a/ext/auto_tagger/test.php b/ext/auto_tagger/test.php index 9d1e096d..d4e9a6eb 100644 --- a/ext/auto_tagger/test.php +++ b/ext/auto_tagger/test.php @@ -37,14 +37,14 @@ class AutoTaggerTest extends ShimmiePHPUnitTestCase $image_id = $this->post_image("tests/pbx_screenshot.jpg", "test1"); $this->get_page("post/view/$image_id"); # check that the tag has been replaced - $this->assert_title("Image $image_id: test1 test2"); + $this->assert_title("Post $image_id: test1 test2"); $this->delete_image($image_id); send_event(new AddAutoTagEvent("test2", "test3")); $image_id = $this->post_image("tests/pbx_screenshot.jpg", "test1"); $this->get_page("post/view/$image_id"); # check that the tag has been replaced - $this->assert_title("Image $image_id: test1 test2 test3"); + $this->assert_title("Post $image_id: test1 test2 test3"); $this->delete_image($image_id); send_event(new DeleteAutoTagEvent("test1")); diff --git a/ext/bbcode/info.php b/ext/bbcode/info.php index d01ac5b5..5ee10f5a 100644 --- a/ext/bbcode/info.php +++ b/ext/bbcode/info.php @@ -27,6 +27,6 @@ class BBCodeInfo extends ExtensionInfo|
"velocity37@gmail.com"];
public $license = self::LICENSE_GPLV2;
- public $description = "Bulk add server-side images with metadata from CSV file";
+ public $description = "Bulk add server-side posts with metadata from CSV file";
public $documentation =
"Modification of \"Bulk Add\" by Shish. -Adds images from a CSV with the five following values: +Adds posts from a CSV with the five following values: \"/path/to/image.jpg\",\"spaced tags\",\"source\",\"rating s/q/e\",\"/path/thumbnail.jpg\" e.g. \"/tmp/cat.png\",\"shish oekaki\",\"shimmie.shishnet.org\",\"s\",\"tmp/custom.jpg\" Any value but the first may be omitted, but there must be five values per line. e.g. \"/why/not/try/bulk_add.jpg\",\"\",\"\",\"\",\"\" -Image thumbnails will be displayed at the AR of the full image. Thumbnails that are +Post thumbnails will be displayed at the AR of the full post. Thumbnails that are normally static (e.g. SWF) will be displayed at the board's max thumbnail size -Useful for importing tagged images without having to do database manipulation. - Note: requires \"Admin Controls\" and optionally \"Image Ratings\" to be enabled Note: requires \"Admin Controls\" and optionally \"Post Ratings\" to be enabled ".make_form(make_link("bulk_add_csv"))." diff --git a/ext/bulk_import_export/main.php b/ext/bulk_import_export/main.php index afe30984..f5f76374 100644 --- a/ext/bulk_import_export/main.php +++ b/ext/bulk_import_export/main.php @@ -36,7 +36,7 @@ class BulkImportExport extends DataHandlerExtension $image = Image::by_hash($item->hash); if ($image!=null) { $skipped++; - log_info(BulkImportExportInfo::KEY, "Image $item->hash already present, skipping"); + log_info(BulkImportExportInfo::KEY, "Post $item->hash already present, skipping"); $database->commit(); continue; } diff --git a/ext/comment/info.php b/ext/comment/info.php index acec497f..1a8ced0f 100644 --- a/ext/comment/info.php +++ b/ext/comment/info.php @@ -5,7 +5,7 @@ class CommentListInfo extends ExtensionInfo public const KEY = "comment"; public $key = self::KEY; - public $name = "Image Comments"; + public $name = "Post Comments"; public $url = self::SHIMMIE_URL; public $authors = self::SHISH_AUTHOR; public $license = self::LICENSE_GPLV2; diff --git a/ext/comment/theme.php b/ext/comment/theme.php index d33aa134..f9ef115d 100644 --- a/ext/comment/theme.php +++ b/ext/comment/theme.php @@ -289,23 +289,23 @@ class CommentListTheme extends Themelet public function get_help_html() { - return ' Search for images containing a certain number of comments, or comments by a particular individual. + return 'Search for posts containing a certain number of comments, or comments by a particular individual. comments=1- Returns images with exactly 1 comment. +Returns posts with exactly 1 comment. comments>0- Returns images with 1 or more comments. +Returns posts with 1 or more comments. Can use <, <=, >, >=, or =. commented_by:username- Returns images that have been commented on by "username". +Returns posts that have been commented on by "username". commented_by_userno:123- Returns images that have been commented on by user 123. +Returns posts that have been commented on by user 123. cron is a service that runs commands over and over again on a a schedule. You can set up cron (or any similar tool) to run the command above to trigger the import on whatever schedule you desire. If you're not sure how to do this, you can give the command to your web host and you can ask them to create the cron job for you. - When you create the cron job, you choose when to upload new images. When you create the cron job, you choose when to upload new posts. "; diff --git a/ext/eokm/main.php b/ext/eokm/main.php index 2cde369f..83e43633 100644 --- a/ext/eokm/main.php +++ b/ext/eokm/main.php @@ -29,7 +29,7 @@ class Eokm extends Extension // all ok } elseif ($return == "true") { log_warning("eokm", "User tried to upload banned image {$event->image->hash}"); - throw new UploadException("Image banned"); + throw new UploadException("Post banned"); } else { log_warning("eokm", "Unexpected return from EOKM: $return"); } diff --git a/ext/favorites/info.php b/ext/favorites/info.php index baab8e90..5a6e2591 100644 --- a/ext/favorites/info.php +++ b/ext/favorites/info.php @@ -13,5 +13,5 @@ class FavoritesInfo extends ExtensionInfo "Gives users a \"favorite this image\" button that they can press Favorites for a user can then be retrieved by searching for \"favorited_by=UserName\" Popular images can be searched for by eg. \"favorites>5\" - Favorite info can be added to an image's filename or tooltip using the \$favorites placeholder"; + Favorite info can be added to a post's filename or tooltip using the \$favorites placeholder"; } diff --git a/ext/favorites/main.php b/ext/favorites/main.php index f19311b6..e1c66a1f 100644 --- a/ext/favorites/main.php +++ b/ext/favorites/main.php @@ -75,7 +75,7 @@ class Favorites extends Extension $i_days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1; $h_favorites_rate = sprintf("%.1f", ($i_favorites_count / $i_days_old)); $favorites_link = make_link("post/list/favorited_by={$event->display_user->name}/1"); - $event->add_stats("Images favorited: $i_favorites_count, $h_favorites_rate per day"); + $event->add_stats("Posts favorited: $i_favorites_count, $h_favorites_rate per day"); } public function onImageInfoSet(ImageInfoSetEvent $event) diff --git a/ext/favorites/test.php b/ext/favorites/test.php index 7df3e0eb..933180eb 100644 --- a/ext/favorites/test.php +++ b/ext/favorites/test.php @@ -9,7 +9,7 @@ class FavoritesTest extends ShimmiePHPUnitTestCase # No favourites $this->get_page("post/view/$image_id"); - $this->assert_title("Image $image_id: test"); + $this->assert_title("Post $image_id: test"); $this->assert_no_text("Favorited By"); # Add a favourite @@ -17,7 +17,7 @@ class FavoritesTest extends ShimmiePHPUnitTestCase # Favourite shown on page $this->get_page("post/view/$image_id"); - $this->assert_title("Image $image_id: test"); + $this->assert_title("Post $image_id: test"); $this->assert_text("Favorited By"); # Favourite shown on index @@ -26,14 +26,14 @@ class FavoritesTest extends ShimmiePHPUnitTestCase # Favourite shown on user page $this->get_page("user/test"); - $this->assert_text("Images favorited: 1"); + $this->assert_text("Posts favorited: 1"); # Delete a favourite send_event(new FavoriteSetEvent($image_id, $user, false)); # No favourites $this->get_page("post/view/$image_id"); - $this->assert_title("Image $image_id: test"); + $this->assert_title("Post $image_id: test"); $this->assert_no_text("Favorited By"); } } diff --git a/ext/favorites/theme.php b/ext/favorites/theme.php index b2c3ca23..b6e06e5a 100644 --- a/ext/favorites/theme.php +++ b/ext/favorites/theme.php @@ -34,23 +34,23 @@ class FavoritesTheme extends Themelet public function get_help_html() { - return ' Search for images that have been favorited a certain number of times, or favorited by a particular individual. + return 'Search for posts that have been favorited a certain number of times, or favorited by a particular individual. favorites=1- Returns images that have been favorited once. +Returns posts that have been favorited once. favorites>0- Returns images that have been favorited 1 or more times +Returns posts that have been favorited 1 or more times Can use <, <=, >, >=, or =. favorited_by:username- Returns images that have been favorited by "username". +Returns posts that have been favorited by "username". favorited_by_userno:123- Returns images that have been favorited by user 123. +Returns posts that have been favorited by user 123. Viewing a featured post
Downloading a featured post
".$this->theme->build_thumb_html($existing); throw new ImageAdditionException($error); } @@ -205,12 +205,12 @@ class ImageIO extends Extension $existing = Image::by_id($id); if (is_null($existing)) { - throw new ImageReplaceException("Image to replace does not exist!"); + throw new ImageReplaceException("Post to replace does not exist!"); } $duplicate = Image::by_hash($image->hash); if (!is_null($duplicate) && $duplicate->id!=$id) { - $error = "Image {$duplicate->id} " . + $error = "Post {$duplicate->id} " . "already has hash {$image->hash}: " . $this->theme->build_thumb_html($duplicate);
throw new ImageReplaceException($error);
}
@@ -249,21 +249,21 @@ class ImageIO extends Extension
$i_days_old = ((time() - strtotime($event->display_user->join_date)) / 86400) + 1;
$h_image_rate = sprintf("%.1f", ($i_image_count / $i_days_old));
$images_link = make_link("post/list/user=$u_name/1");
- $event->add_stats("Images uploaded: $i_image_count, $h_image_rate per day");
+ $event->add_stats("Posts uploaded: $i_image_count, $h_image_rate per day");
}
public function onSetupBuilding(SetupBuildingEvent $event)
{
global $config;
- $sb = new SetupBlock("Image Options");
+ $sb = new SetupBlock("Post Options");
$sb->start_table();
$sb->position = 30;
// advanced only
//$sb->add_text_option(ImageConfig::ILINK, "Image link: ");
//$sb->add_text_option(ImageConfig::TLINK, " Search for images that have received views by users. '; + return 'Search for posts that have received views by users. '; } } diff --git a/ext/index/info.php b/ext/index/info.php index 67e453a3..9c7377fe 100644 --- a/ext/index/info.php +++ b/ext/index/info.php @@ -5,11 +5,11 @@ class IndexInfo extends ExtensionInfo public const KEY = "index"; public $key = self::KEY; - public $name = "Image List"; + public $name = "Post List"; public $url = self::SHIMMIE_URL; public $authors = self::SHISH_AUTHOR; public $license = self::LICENSE_GPLV2; - public $description = "Show a list of uploaded images"; + public $description = "Show a list of uploaded posts"; public $core = true; public $documentation = "Here is a list of the search methods available out of the box; Shimmie extensions may provide other filters: @@ -24,40 +24,40 @@ Shimmie extensions may provide other filters:
Search items can be combined to search for images which match both, + Search items can be combined to search for posts which match both, or you can stick \"-\" in front of an item to search for things that don't match it. Metatags can be followed by \":\" rather than \"=\" if you prefer. @@ -129,43 +129,43 @@ match it.
hash=0D3512CAA964B2BA5D7851AF5951F33B- Returns image with an MD5 hash 0D3512CAA964B2BA5D7851AF5951F33B. +Returns post with an MD5 hash 0D3512CAA964B2BA5D7851AF5951F33B. diff --git a/ext/link_image/info.php b/ext/link_image/info.php index cbd937bb..57c9de6b 100644 --- a/ext/link_image/info.php +++ b/ext/link_image/info.php @@ -5,7 +5,7 @@ class LinkImageInfo extends ExtensionInfo public const KEY = "link_image"; public $key = self::KEY; - public $name = "Link to Image"; + public $name = "Link to Post"; public $authors = ["Artanis"=>"artanis.00@gmail.com"]; public $description = "Show various forms of link to each image, for copy & paste"; public $license = self::LICENSE_GPLV2; @@ -25,9 +25,9 @@ It takes the following arguments as well as plain text. || \$title || The site title as set in Config. || - Link to Image will default this option to '\$title - \$id (\$ext \$size \$filesize)'. + Link to Post will default this option to '\$title - \$id (\$ext \$size \$filesize)'. - To reset to the default, simply clear the current setting. Link to Image + To reset to the default, simply clear the current setting. Link to Post will then fill in the default value after the save. To leave the setting blank for any reason, leave a space (' ') in it."; diff --git a/ext/link_image/main.php b/ext/link_image/main.php index b3b93ddd..11e70cb5 100644 --- a/ext/link_image/main.php +++ b/ext/link_image/main.php @@ -13,7 +13,7 @@ class LinkImage extends Extension public function onSetupBuilding(SetupBuildingEvent $event) { - $sb = new SetupBlock("Link to Image"); + $sb = new SetupBlock("Link to Post"); $sb->add_text_option("ext_link-img_text-link_format", "Text Link Format: "); $event->panel->add_block($sb); } diff --git a/ext/link_image/test.php b/ext/link_image/test.php index 6ddf7c89..c99f792f 100644 --- a/ext/link_image/test.php +++ b/ext/link_image/test.php @@ -11,6 +11,6 @@ class LinkImageTest extends ShimmiePHPUnitTestCase preg_match("#value='https?://.*/(post/view/[0-9]+)'#", $this->page_to_text(), $matches); $this->assertTrue(count($matches) > 0); $page = $this->get_page($matches[1]); - $this->assertEquals("Image $image_id: pie", $page->title); + $this->assertEquals("Post $image_id: pie", $page->title); } } diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php index 4806e71e..a8c15a5b 100644 --- a/ext/link_image/theme.php +++ b/ext/link_image/theme.php @@ -10,7 +10,7 @@ class LinkImageTheme extends Themelet $page->add_block(new Block( - "Link to Image", + "Link to Post", " |
@@ -31,7 +31,7 @@ class LinkImageTheme extends Themelet
".
$this->link_code("Link", $this->url($post_link, $text_link, "html"), "html_text-link").
$this->link_code("Thumb", $this->url($post_link, $this->img($thumb_src, "html"), "html"), "html_thumb-link").
- $this->link_code("Image", $this->img($image_src, "html"), "html_full-image").
+ $this->link_code("File", $this->img($image_src, "html"), "html_full-image").
"
Search for items based on the type of media.
+ return 'Search for posts based on the type of media.
content:audio-
Returns items that contain audio, including videos and audio files.
+Returns posts that contain audio, including videos and audio files.
content:video-
Returns items that contain video, including animated GIFs.
+Returns posts that contain video, including animated GIFs.
These search terms depend on the items being scanned for media content. Automatic scanning was implemented in mid-2019, so items uploaded before, or items uploaded on a system without ffmpeg, will require additional scanning before this will work.
+These search terms depend on the posts being scanned for media content. Automatic scanning was implemented in mid-2019, so posts uploaded before, or posts uploaded on a system without ffmpeg, will require additional scanning before this will work.
'; } } diff --git a/ext/mime/theme.php b/ext/mime/theme.php index 024fbf69..5da350a7 100644 --- a/ext/mime/theme.php +++ b/ext/mime/theme.php @@ -14,11 +14,11 @@ class MimeSystemTheme extends Themelet sort($exts); $exts = join("Search for images by extension
+ return 'Search for posts by extension
ext=jpg-
Returns images with the extension "jpg".
+Returns posts with the extension "jpg".
-
Search for images by MIME type
+Search for posts by MIME type
mime=image/jpeg-
Returns images that have the MIME type "image/jpeg".
+Returns posts that have the MIME type "image/jpeg".
| Image | ". + "Post | ". "Note | ". "Body | ". "Updater | ". @@ -250,23 +250,23 @@ class NotesTheme extends Themelet public function get_help_html() { - return '|||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Image | Reason | Action | +Post | Reason | Action | $h_reportedimages
Search for images containing a certain number of tags with the specified tag category.
+ return 'Search for posts containing a certain number of tags with the specified tag category.
persontags=1-
Returns images with exactly 1 tag with the tag category "person".
+Returns posts with exactly 1 tag with the tag category "person".
cattags>0-
Returns images with 1 or more tags with the tag category "cat".
+Returns posts with 1 or more tags with the tag category "cat".
Can use <, <=, >, >=, or =.
Category name is not case sensitive, category must exist for search to work.
diff --git a/ext/tag_edit/info.php b/ext/tag_edit/info.php index 87af3743..c3396597 100644 --- a/ext/tag_edit/info.php +++ b/ext/tag_edit/info.php @@ -26,7 +26,7 @@ class TagEditInfo extends ExtensionInfo- Numeric Score
-
-
- vote=(up, down, remove) -- vote, or remove your vote on an image +
- vote=(up, down, remove) -- vote, or remove your vote on a post
- Pools
-
diff --git a/ext/tag_edit/test.php b/ext/tag_edit/test.php
index 31112a6f..b055c098 100644
--- a/ext/tag_edit/test.php
+++ b/ext/tag_edit/test.php
@@ -9,12 +9,12 @@ class TagEditTest extends ShimmiePHPUnitTestCase
// Original
$this->get_page("post/view/$image_id");
- $this->assert_title("Image $image_id: pbx");
+ $this->assert_title("Post $image_id: pbx");
// Modified
send_event(new TagSetEvent($image, ["new"]));
$this->get_page("post/view/$image_id");
- $this->assert_title("Image $image_id: new");
+ $this->assert_title("Post $image_id: new");
}
public function testInvalidChange()
@@ -36,7 +36,7 @@ class TagEditTest extends ShimmiePHPUnitTestCase
$this->log_in_as_user();
$image_id = $this->post_image("tests/pbx_screenshot.jpg", str_repeat("a", 500));
$this->get_page("post/view/$image_id");
- $this->assert_title("Image $image_id: tagme");
+ $this->assert_title("Post $image_id: tagme");
}
public function testSourceEdit()
diff --git a/ext/tag_edit/theme.php b/ext/tag_edit/theme.php
index 4283507d..954faf74 100644
--- a/ext/tag_edit/theme.php
+++ b/ext/tag_edit/theme.php
@@ -68,7 +68,7 @@ class TagEditTheme extends Themelet
$h_owner = html_escape($image->get_owner()->name);
$h_av = $image->get_owner()->get_avatar_html();
$h_date = autodate($image->posted);
- $h_ip = $user->can(Permissions::VIEW_IP) ? " (".show_ip($image->owner_ip, "Image posted {$image->posted}").")" : "";
+ $h_ip = $user->can(Permissions::VIEW_IP) ? " (".show_ip($image->owner_ip, "Post posted {$image->posted}").")" : "";
return "
Uploader diff --git a/ext/tag_history/test.php b/ext/tag_history/test.php index fc441aff..7786a9f3 100644 --- a/ext/tag_history/test.php +++ b/ext/tag_history/test.php @@ -9,7 +9,7 @@ class TagHistoryTest extends ShimmiePHPUnitTestCase // Original $this->get_page("post/view/$image_id"); - $this->assert_title("Image $image_id: old_tag"); + $this->assert_title("Post $image_id: old_tag"); // Modified send_event(new TagSetEvent($image, ["new_tag"])); diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php index df3bef0c..892f19e7 100644 --- a/ext/tag_history/theme.php +++ b/ext/tag_history/theme.php @@ -19,7 +19,7 @@ class TagHistoryTheme extends Themelet { $history_html = $this->history_list($history, true); - $page->set_title('Image '.$image_id.' Tag History'); + $page->set_title('Post '.$image_id.' Tag History'); $page->set_heading('Tag History: '.$image_id); $page->add_block(new NavBlock()); $page->add_block(new Block("Tag History", $history_html, "main", 10)); diff --git a/ext/tag_list/config.php b/ext/tag_list/config.php index 8a80cdbd..dc4560d6 100644 --- a/ext/tag_list/config.php +++ b/ext/tag_list/config.php @@ -17,7 +17,7 @@ class TagListConfig public const TYPE_TAGS= "tags"; public const TYPE_CHOICES = [ - "Image's tags only" => TagListConfig::TYPE_TAGS, + "Post's tags only" => TagListConfig::TYPE_TAGS, "Show related" => TagListConfig::TYPE_RELATED ]; diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php index 7ff990c5..06b4b463 100644 --- a/ext/tag_list/main.php +++ b/ext/tag_list/main.php @@ -143,7 +143,7 @@ class TagList extends Extension $sb->add_choice_option( TagListConfig::IMAGE_TYPE, TagListConfig::TYPE_CHOICES, - "Image tag list", + "Post tag list", true ); $sb->add_choice_option( diff --git a/ext/tips/test.php b/ext/tips/test.php index 1feaceb5..40529e08 100644 --- a/ext/tips/test.php +++ b/ext/tips/test.php @@ -17,14 +17,14 @@ class TipsTest extends ShimmiePHPUnitTestCase $this->get_page("tips/list"); $this->assert_title("Tips List"); - send_event(new CreateTipEvent(true, "", "an imageless tip")); + send_event(new CreateTipEvent(true, "", "a postless tip")); $this->get_page("post/list"); - $this->assert_text("an imageless tip"); + $this->assert_text("a postless tip"); $tip_id = (int)$database->get_one("SELECT id FROM tips"); send_event(new DeleteTipEvent($tip_id)); $this->get_page("post/list"); - $this->assert_no_text("an imageless tip"); + $this->assert_no_text("a postless tip"); } public function testImaged() @@ -35,14 +35,14 @@ class TipsTest extends ShimmiePHPUnitTestCase $this->get_page("tips/list"); $this->assert_title("Tips List"); - send_event(new CreateTipEvent(true, "coins.png", "an imageless tip")); + send_event(new CreateTipEvent(true, "coins.png", "a postless tip")); $this->get_page("post/list"); - $this->assert_text("an imageless tip"); + $this->assert_text("a postless tip"); $tip_id = (int)$database->get_one("SELECT id FROM tips"); send_event(new DeleteTipEvent($tip_id)); $this->get_page("post/list"); - $this->assert_no_text("an imageless tip"); + $this->assert_no_text("a postless tip"); } public function testDisabled() @@ -53,13 +53,13 @@ class TipsTest extends ShimmiePHPUnitTestCase $this->get_page("tips/list"); $this->assert_title("Tips List"); - send_event(new CreateTipEvent(false, "", "an imageless tip")); + send_event(new CreateTipEvent(false, "", "a postless tip")); $this->get_page("post/list"); - $this->assert_no_text("an imageless tip"); + $this->assert_no_text("a postless tip"); $tip_id = (int)$database->get_one("SELECT id FROM tips"); send_event(new DeleteTipEvent($tip_id)); $this->get_page("post/list"); - $this->assert_no_text("an imageless tip"); + $this->assert_no_text("a postless tip"); } } diff --git a/ext/tips/theme.php b/ext/tips/theme.php index 7c49a9d9..8f70030d 100644 --- a/ext/tips/theme.php +++ b/ext/tips/theme.php @@ -4,7 +4,7 @@ class TipsTheme extends Themelet public function manageTips($url, $images) { global $page; - $select = "- Image: +Post: {$select} @@ -60,7 +60,7 @@ class TipsTheme extends Themelet " ". " ID ". "Enabled ". - "Image ". + "Post ". "Text "; if ($user->can(Permissions::TIPS_ADMIN)) { diff --git a/ext/transcode/main.php b/ext/transcode/main.php index 7fb9b92d..1b0f427f 100644 --- a/ext/transcode/main.php +++ b/ext/transcode/main.php @@ -201,11 +201,11 @@ class TranscodeImage extends Extension } elseif (isset($_POST['image_id'])) { $image_id = int_escape($_POST['image_id']); } else { - throw new ImageTranscodeException("Can not resize Image: No valid Image ID given."); + throw new ImageTranscodeException("Can not resize Image: No valid Post ID given."); } $image_obj = Image::by_id($image_id); if (is_null($image_obj)) { - $this->theme->display_error(404, "Image not found", "No image in the database has the ID #$image_id"); + $this->theme->display_error(404, "Post not found", "No image in the database has the ID #$image_id"); } else { if (isset($_POST['transcode_mime'])) { try { diff --git a/ext/transcode_video/main.php b/ext/transcode_video/main.php index 57faef4b..9cd2a717 100644 --- a/ext/transcode_video/main.php +++ b/ext/transcode_video/main.php @@ -111,7 +111,7 @@ class TranscodeVideo extends Extension } $image_obj = Image::by_id($image_id); if (is_null($image_obj)) { - $this->theme->display_error(404, "Image not found", "No image in the database has the ID #$image_id"); + $this->theme->display_error(404, "Post not found", "No post in the database has the ID #$image_id"); } else { if (isset($_POST['transcode_format'])) { try { @@ -231,7 +231,7 @@ class TranscodeVideo extends Extension /* Move the new image into the main storage location */ $target = warehouse_path(Image::IMAGE_DIR, $new_image->hash); if (!@copy($tmp_filename, $target)) { - throw new VideoTranscodeException("Failed to copy new image file from temporary location ({$tmp_filename}) to archive ($target)"); + throw new VideoTranscodeException("Failed to copy new post file from temporary location ({$tmp_filename}) to archive ($target)"); } send_event(new ImageReplaceEvent($image->id, $new_image)); diff --git a/ext/trash/main.php b/ext/trash/main.php index 91dcf985..3d473101 100644 --- a/ext/trash/main.php +++ b/ext/trash/main.php @@ -32,7 +32,7 @@ class Trash extends Extension } elseif (isset($_POST['image_id'])) { $image_id = $_POST['image_id']; } else { - throw new SCoreException("Can not restore image: No valid Image ID given."); + throw new SCoreException("Can not restore post: No valid Post ID given."); } self::set_trash($image_id, false); diff --git a/ext/trash/theme.php b/ext/trash/theme.php index 21733295..74c9bf96 100644 --- a/ext/trash/theme.php +++ b/ext/trash/theme.php @@ -15,10 +15,10 @@ class TrashTheme extends Themelet public function get_help_html() { - return 'Search for images in the trash.
+ return 'Search for posts in the trash.
'; } diff --git a/ext/upload/main.php b/ext/upload/main.php index ab693109..a7715752 100644 --- a/ext/upload/main.php +++ b/ext/upload/main.php @@ -194,7 +194,7 @@ class Upload extends Extension $this->theme->display_permission_denied(); } else { 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 @@ -203,12 +203,12 @@ class Upload extends Extension } elseif (isset($_POST['image_id'])) { $image_id = int_escape($_POST['image_id']); } 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); 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; @@ -370,7 +370,7 @@ class Upload extends Extension if ($event->image_id == -1) { 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) { $this->theme->display_upload_error( $page, diff --git a/ext/upload/theme.php b/ext/upload/theme.php index 8f476bd1..b2c9fb33 100644 --- a/ext/upload/theme.php +++ b/ext/upload/theme.php @@ -56,7 +56,7 @@ class UploadTheme extends Themeletin:trash
-Returns images that are in the trash.
+Returns posts that are in the trash.
Files URLs -Image-Specific Tags +Post-Specific Tags Files -Image-Specific Tags +Post-Specific Tags Replacing Image ID ".$image_id."
" +
Please note: You will have to refresh the image page, or empty your browser cache.Replacing Post ID ".$image_id."
" .$thumbnail."
Please note: You will have to refresh the post page, or empty your browser cache.
" .make_form(make_link("upload/replace/".$image_id), "POST", $multipart=true)." @@ -184,10 +184,10 @@ class UploadTheme extends Themelet (Max file size is $max_kb) "; - $page->set_title("Replace Image"); - $page->set_heading("Replace Image"); + $page->set_title("Replace Post"); + $page->set_heading("Replace Post"); $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) diff --git a/ext/user/theme.php b/ext/user/theme.php index aff6c1dc..0add94ad 100644 --- a/ext/user/theme.php +++ b/ext/user/theme.php @@ -320,20 +320,20 @@ class UserPageTheme extends Themelet public function get_help_html() { global $user; - $output = emptyHTML(P("Search for images posted by particular individuals.")); + $output = emptyHTML(P("Search for posts posted by particular individuals.")); $output->appendChild(SHM_COMMAND_EXAMPLE( "poster=username", - 'Returns images posted by "username".' + 'Returns posts posted by "username".' )); $output->appendChild(SHM_COMMAND_EXAMPLE( "poster_id=123", - 'Returns images posted by user 123.' + 'Returns posts posted by user 123.' )); if ($user->can(Permissions::VIEW_IP)) { $output->appendChild(SHM_COMMAND_EXAMPLE( "poster_ip=127.0.0.1", - "Returns images posted from IP 127.0.0.1." + "Returns posts posted from IP 127.0.0.1." )); } return $output; diff --git a/ext/view/info.php b/ext/view/info.php index 69846117..8e8dd0ae 100644 --- a/ext/view/info.php +++ b/ext/view/info.php @@ -5,10 +5,10 @@ class ViewImageInfo extends ExtensionInfo public const KEY = "view"; public $key = self::KEY; - public $name = "Image Viewer"; + public $name = "Post Viewer"; public $url = self::SHIMMIE_URL; public $authors = self::SHISH_AUTHOR; - public $description = "Allows users to see uploaded images"; + public $description = "Allows users to see uploaded posts"; public $core = true; public $visibility = self::VISIBLE_HIDDEN; } diff --git a/ext/view/main.php b/ext/view/main.php index 3431574d..e6a4f79a 100644 --- a/ext/view/main.php +++ b/ext/view/main.php @@ -31,7 +31,7 @@ class ViewImage extends Extension $image = Image::by_id($image_id); if (is_null($image)) { - $this->theme->display_error(404, "Image not found", "Image $image_id could not be found"); + $this->theme->display_error(404, "Post not found", "Post $image_id could not be found"); return; } @@ -42,7 +42,7 @@ class ViewImage extends Extension } if (is_null($image)) { - $this->theme->display_error(404, "Image not found", "No more images"); + $this->theme->display_error(404, "Post not found", "No more posts"); return; } @@ -54,7 +54,7 @@ class ViewImage extends Extension // who follows up every request to '/post/view/123' with // '/post/view/12300000000000Image 123: tags' which spams the // database log with 'integer out of range' - $this->theme->display_error(404, "Image not found", "Invalid image ID"); + $this->theme->display_error(404, "Post not found", "Invalid post ID"); return; } @@ -65,7 +65,7 @@ class ViewImage extends Extension if (!is_null($image)) { send_event(new DisplayingImageEvent($image)); } else { - $this->theme->display_error(404, "Image not found", "No image in the database has the ID #$image_id"); + $this->theme->display_error(404, "Post not found", "No post in the database has the ID #$image_id"); } } elseif ($event->page_matches("post/set")) { if (!isset($_POST['image_id'])) { @@ -79,7 +79,7 @@ class ViewImage extends Extension $page->set_mode(PageMode::REDIRECT); $page->set_redirect(make_link("post/view/$image_id", url_escape(@$_POST['query']))); } else { - $this->theme->display_error(403, "Image Locked", "An admin has locked this image"); + $this->theme->display_error(403, "Post Locked", "An admin has locked this post"); } } } diff --git a/ext/view/test.php b/ext/view/test.php index 9087b0f9..06e07fd7 100644 --- a/ext/view/test.php +++ b/ext/view/test.php @@ -13,7 +13,7 @@ class ViewImageTest extends ShimmiePHPUnitTestCase $image_id_1 = $this->post_image("tests/pbx_screenshot.jpg", "test"); $this->get_page("post/view/$image_id_1"); - $this->assert_title("Image $image_id_1: test"); + $this->assert_title("Post $image_id_1: test"); } public function testViewInfo() @@ -68,9 +68,9 @@ class ViewImageTest extends ShimmiePHPUnitTestCase $idp1 = $image_id_1 + 1; $this->get_page("post/view/$idp1"); - $this->assert_title('Image not found'); + $this->assert_title('Post not found'); $this->get_page('post/view/-1'); - $this->assert_title('Image not found'); + $this->assert_title('Post not found'); } } diff --git a/ext/view/theme.php b/ext/view/theme.php index d02338ae..41e5715f 100644 --- a/ext/view/theme.php +++ b/ext/view/theme.php @@ -20,7 +20,7 @@ class ViewImageTheme extends Themelet public function display_page(Image $image, $editor_parts) { global $page; - $page->set_title("Image {$image->id}: ".$image->get_tag_list()); + $page->set_title("Post {$image->id}: ".$image->get_tag_list()); $page->set_heading(html_escape($image->get_tag_list())); $page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0)); $page->add_block(new Block(null, $this->build_info($image, $editor_parts), "main", 20)); @@ -34,7 +34,7 @@ class ViewImageTheme extends Themelet public function display_admin_block(Page $page, $parts) { if (count($parts) > 0) { - $page->add_block(new Block("Image Controls", join("
", $parts), "left", 50)); + $page->add_block(new Block("Post Controls", join("
", $parts), "left", 50)); } } @@ -77,7 +77,7 @@ class ViewImageTheme extends Themelet global $user; if (count($editor_parts) == 0) { - return ($image->is_locked() ? "
[Image Locked]" : ""); + return ($image->is_locked() ? "
[Post Locked]" : ""); } $html = make_form(make_link("post/set"))." diff --git a/themes/danbooru/index.theme.php b/themes/danbooru/index.theme.php index 7b72857b..65855620 100644 --- a/themes/danbooru/index.theme.php +++ b/themes/danbooru/index.theme.php @@ -26,14 +26,14 @@ class CustomIndexTheme extends IndexTheme $page->add_block(new Block("Search", $nav, "left", 0)); if (count($images) > 0) { if ($query) { - $page->add_block(new Block("Images", $this->build_table($images, "search=$query"), "main", 10)); + $page->add_block(new Block("Posts", $this->build_table($images, "search=$query"), "main", 10)); $this->display_paginator($page, "post/list/$query", null, $this->page_number, $this->total_pages); } else { - $page->add_block(new Block("Images", $this->build_table($images, null), "main", 10)); + $page->add_block(new Block("Posts", $this->build_table($images, null), "main", 10)); $this->display_paginator($page, "post/list", null, $this->page_number, $this->total_pages); } } else { - $page->add_block(new Block("No Images Found", "No images were found to match the search criteria")); + $page->add_block(new Block("No Posts Found", "No images were found to match the search criteria")); } } diff --git a/themes/danbooru/page.class.php b/themes/danbooru/page.class.php index beb9ca93..5b593d63 100644 --- a/themes/danbooru/page.class.php +++ b/themes/danbooru/page.class.php @@ -74,7 +74,7 @@ class Page extends BasePage $sub_block_html .= $block->body; // $this->block_to_html($block, true); break; case "main": - if ($block->header == "Images") { + if ($block->header == "Posts") { $block->header = " "; } $main_block_html .= $block->get_html(false); diff --git a/themes/danbooru2/index.theme.php b/themes/danbooru2/index.theme.php index 73a2da10..72d7aa57 100644 --- a/themes/danbooru2/index.theme.php +++ b/themes/danbooru2/index.theme.php @@ -17,7 +17,7 @@ class CustomIndexTheme extends IndexTheme if (count($images) > 0) { $this->display_page_images($page, $images); } else { - $this->display_error(404, "No Images Found", "No images were found to match the search criteria"); + $this->display_error(404, "No Posts Found", "No images were found to match the search criteria"); } } diff --git a/themes/danbooru2/page.class.php b/themes/danbooru2/page.class.php index 32e96a39..26eec382 100644 --- a/themes/danbooru2/page.class.php +++ b/themes/danbooru2/page.class.php @@ -73,7 +73,7 @@ class Page extends BasePage $sub_block_html .= $block->body; // $this->block_to_html($block, true); break; case "main": - if ($block->header == "Images") { + if ($block->header == "Posts") { $block->header = " "; } $main_block_html .= $block->get_html(false); diff --git a/themes/lite/view.theme.php b/themes/lite/view.theme.php index 6b417887..1ab5f27d 100644 --- a/themes/lite/view.theme.php +++ b/themes/lite/view.theme.php @@ -5,7 +5,7 @@ class CustomViewImageTheme extends ViewImageTheme public function display_page(Image $image, $editor_parts) { global $page; - $page->set_title("Image {$image->id}: ".$image->get_tag_list()); + $page->set_title("Post {$image->id}: ".$image->get_tag_list()); $page->set_heading(html_escape($image->get_tag_list())); $page->add_block(new Block("Navigation", $this->build_navigation($image), "left", 0)); $page->add_block(new Block("Statistics", $this->build_stats($image), "left", 15)); diff --git a/themes/material/view.theme.php b/themes/material/view.theme.php index f81b56e0..f82ababc 100644 --- a/themes/material/view.theme.php +++ b/themes/material/view.theme.php @@ -16,7 +16,7 @@ class CustomViewImageTheme extends ViewImageTheme public function display_admin_block(Page $page, $parts) { if (count($parts) > 0) { - $page->add_block(new Block("Image Controls", join("
", $parts), "drawer", 50)); + $page->add_block(new Block("Post Controls", join("
", $parts), "drawer", 50)); } } @@ -41,7 +41,7 @@ class CustomViewImageTheme extends ViewImageTheme global $user; if (count($editor_parts) == 0) { - return ($image->is_locked() ? "
[Image Locked]" : ""); + return ($image->is_locked() ? "
[Post Locked]" : ""); } $html = make_form(make_link("post/set"))." diff --git a/themes/rule34v2/index.theme.php b/themes/rule34v2/index.theme.php index 04aab4fe..cae9dafa 100644 --- a/themes/rule34v2/index.theme.php +++ b/themes/rule34v2/index.theme.php @@ -31,7 +31,7 @@ class CustomIndexTheme extends IndexTheme } else { $this->display_error( 404, - "No Images Found", + "No Posts Found", "No images were found to match the search criteria. Try looking up a character/series/artist by another name if they go by more than one. Remember to use underscores in place of spaces and not to use commas. If you came to this page by following a link, try using the search box directly instead. See the FAQ for more information." ); } diff --git a/themes/rule34v2/themelet.class.php b/themes/rule34v2/themelet.class.php index e8a5efc6..345b015a 100644 --- a/themes/rule34v2/themelet.class.php +++ b/themes/rule34v2/themelet.class.php @@ -27,7 +27,7 @@ class Themelet extends BaseThemelet $html = "\n";