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

standard post linking - avoid the word "Image"

Browse Source
This commit is contained in:
Shish 2020-10-09 13:47:42 +01:00
parent d00569431b
commit 7b3ab71b1e
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/comment/main.php
View File

@ -604,7 +604,7 @@ class CommentList extends Extension
$snippet = substr($comment, 0, 100); $snippet = substr($comment, 0, 100);
$snippet = str_replace("\n", " ", $snippet); $snippet = str_replace("\n", " ", $snippet);
$snippet = str_replace("\r", " ", $snippet); $snippet = str_replace("\r", " ", $snippet);
log_info("comment", "Comment #$cid added to Image #$image_id: $snippet"); log_info("comment", "Comment #$cid added to >>$image_id: $snippet");
} }
private function comment_checks(int $image_id, User $user, string $comment) private function comment_checks(int $image_id, User $user, string $comment)

2
ext/featured/main.php
View File

@ -20,7 +20,7 @@ class Featured extends Extension
$id = int_escape($_POST['image_id']); $id = int_escape($_POST['image_id']);
if ($id > 0) { if ($id > 0) {
$config->set_int("featured_id", $id); $config->set_int("featured_id", $id);
log_info("featured", "Featured image set to $id", "Featured image set"); log_info("featured", "Featured image set to >>$id", "Featured image set");
$page->set_mode(PageMode::REDIRECT); $page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("post/view/$id")); $page->set_redirect(make_link("post/view/$id"));
} }

6
ext/image/main.php
View File

@ -167,7 +167,7 @@ class ImageIO extends Extension
// actually insert the info // actually insert the info
$image->save_to_db(); $image->save_to_db();
log_info("image", "Uploaded Image #{$image->id} ({$image->hash})"); log_info("image", "Uploaded >>{$image->id} ({$image->hash})");
# at this point in time, the image's tags haven't really been set, # at this point in time, the image's tags haven't really been set,
# and so, having $image->tag_array set to something is a lie (but # and so, having $image->tag_array set to something is a lie (but
@ -179,7 +179,7 @@ class ImageIO extends Extension
send_event(new TagSetEvent($image, $tags_to_set)); send_event(new TagSetEvent($image, $tags_to_set));
if ($image->source !== null) { if ($image->source !== null) {
log_info("core-image", "Source for Image #{$image->id} set to: {$image->source}"); log_info("core-image", "Source for >>{$image->id} set to: {$image->source}");
} }
} catch (ImageAdditionException $e) { } catch (ImageAdditionException $e) {
throw new UploadException($e->error); throw new UploadException($e->error);
@ -236,7 +236,7 @@ class ImageIO extends Extension
/* Generate new thumbnail */ /* Generate new thumbnail */
send_event(new ThumbnailGenerationEvent($image->hash, strtolower($image->get_mime()))); send_event(new ThumbnailGenerationEvent($image->hash, strtolower($image->get_mime())));
log_info("image", "Replaced Image #{$id} with ({$image->hash})"); log_info("image", "Replaced >>{$id} with ({$image->hash})");
} catch (ImageReplaceException $e) { } catch (ImageReplaceException $e) {
throw new UploadException($e->error); throw new UploadException($e->error);
} }

2
ext/numeric_score/main.php
View File

@ -162,7 +162,7 @@ class NumericScore extends Extension
public function onNumericScoreSet(NumericScoreSetEvent $event) public function onNumericScoreSet(NumericScoreSetEvent $event)
{ {
global $user; global $user;
log_debug("numeric_score", "Rated Image #{$event->image_id} as {$event->score}", "Rated Image"); log_debug("numeric_score", "Rated >>{$event->image_id} as {$event->score}", "Rated Image");
$this->add_vote($event->image_id, $user->id, $event->score); $this->add_vote($event->image_id, $user->id, $event->score);
} }

2
ext/post_titles/main.php
View File

@ -88,7 +88,7 @@ class PostTitles extends Extension
{ {
global $database; global $database;
$database->Execute("UPDATE images SET title=:title WHERE id=:id", ['title'=>$title, 'id'=>$image_id]); $database->Execute("UPDATE images SET title=:title WHERE id=:id", ['title'=>$title, 'id'=>$image_id]);
log_info("post_titles", "Title for Image #{$image_id} set to: ".$title); log_info("post_titles", "Title for >>{$image_id} set to: ".$title);
} }
public static function get_title(Image $image): string public static function get_title(Image $image): string

2
ext/rating/main.php
View File

@ -581,7 +581,7 @@ class Ratings extends Extension
global $database; global $database;
if ($old_rating != $rating) { if ($old_rating != $rating) {
$database->Execute("UPDATE images SET rating=:rating WHERE id=:id", ['rating'=>$rating, 'id'=>$image_id]); $database->Execute("UPDATE images SET rating=:rating WHERE id=:id", ['rating'=>$rating, 'id'=>$image_id]);
log_info("rating", "Rating for Image #{$image_id} set to: ".$this->rating_to_human($rating)); log_info("rating", "Rating for >>{$image_id} set to: ".$this->rating_to_human($rating));
} }
} }
} }

2
ext/report_image/main.php
View File

@ -86,7 +86,7 @@ class ReportImage extends Extension
public function onAddReportedImage(AddReportedImageEvent $event) public function onAddReportedImage(AddReportedImageEvent $event)
{ {
global $cache, $database; global $cache, $database;
log_info("report_image", "Adding report of Image #{$event->report->image_id} with reason '{$event->report->reason}'"); log_info("report_image", "Adding report of >>{$event->report->image_id} with reason '{$event->report->reason}'");
$database->Execute( $database->Execute(
"INSERT INTO image_reports(image_id, reporter_id, reason) "INSERT INTO image_reports(image_id, reporter_id, reason)
VALUES (:image_id, :reporter_id, :reason)", VALUES (:image_id, :reporter_id, :reason)",

4
ext/resize/main.php
View File

@ -109,7 +109,7 @@ class ResizeImage extends Extension
$image_obj = Image::by_id($event->image_id); //Must be a better way to grab the new hash than setting this again.. $image_obj = Image::by_id($event->image_id); //Must be a better way to grab the new hash than setting this again..
send_event(new ThumbnailGenerationEvent($image_obj->hash, $image_obj->get_mime(), true)); send_event(new ThumbnailGenerationEvent($image_obj->hash, $image_obj->get_mime(), true));
log_info("resize", "Image #{$event->image_id} has been resized to: ".$width."x".$height); log_info("resize", ">>{$event->image_id} has been resized to: ".$width."x".$height);
//TODO: Notify user that image has been resized. //TODO: Notify user that image has been resized.
} }
} }
@ -288,7 +288,7 @@ class ResizeImage extends Extension
send_event(new ImageReplaceEvent($image_obj->id, $new_image)); send_event(new ImageReplaceEvent($image_obj->id, $new_image));
log_info("resize", "Resized Image #{$image_obj->id} - New hash: {$new_image->hash}"); log_info("resize", "Resized >>{$image_obj->id} - New hash: {$new_image->hash}");
} }
/** /**

2
ext/rotate/main.php
View File

@ -185,6 +185,6 @@ class RotateImage extends Extension
send_event(new ImageReplaceEvent($image_id, $new_image)); send_event(new ImageReplaceEvent($image_id, $new_image));
log_info("rotate", "Rotated Image #{$image_id} - New hash: {$new_image->hash}"); log_info("rotate", "Rotated >>{$image_id} - New hash: {$new_image->hash}");
} }
} }

6
ext/source_history/main.php
View File

@ -154,7 +154,7 @@ class SourceHistory extends Extension
$stored_image_id = (int)$result['image_id']; $stored_image_id = (int)$result['image_id'];
$stored_source = $result['source']; $stored_source = $result['source'];
log_debug("source_history", 'Reverting source of Image #'.$stored_image_id.' to ['.$stored_source.']'); log_debug("source_history", 'Reverting source of >>'.$stored_image_id.' to ['.$stored_source.']');
$image = Image::by_id($stored_image_id); $image = Image::by_id($stored_image_id);
@ -321,7 +321,7 @@ class SourceHistory extends Extension
$stored_image_id = $result['image_id']; $stored_image_id = $result['image_id'];
$stored_source = $result['source']; $stored_source = $result['source'];
log_debug("source_history", 'Reverting source of Image #'.$stored_image_id.' to ['.$stored_source.']'); log_debug("source_history", 'Reverting source of >>'.$stored_image_id.' to ['.$stored_source.']');
$image = Image::by_id($stored_image_id); $image = Image::by_id($stored_image_id);
@ -331,7 +331,7 @@ class SourceHistory extends Extension
// all should be ok so we can revert by firing the SetSources event. // all should be ok so we can revert by firing the SetSources event.
send_event(new SourceSetEvent($image, $stored_source)); send_event(new SourceSetEvent($image, $stored_source));
$this->theme->add_status('Reverted Change', 'Reverted Image #'.$image_id.' to Source History #'.$stored_result_id.' ('.$row['source'].')'); $this->theme->add_status('Reverted Change', 'Reverted >>'.$image_id.' to Source History #'.$stored_result_id.' ('.$row['source'].')');
} }
} }

2
ext/source_history/theme.php
View File

@ -112,7 +112,7 @@ class SourceHistoryTheme extends Themelet
$name = $fields['name']; $name = $fields['name'];
$date_set = rawHTML(autodate($fields['date_set'])); $date_set = rawHTML(autodate($fields['date_set']));
$ip = $user->can(Permissions::VIEW_IP) ? $ip = $user->can(Permissions::VIEW_IP) ?
rawHTML(" " . show_ip($fields['user_ip'], "Sourcing Image #$image_id as '$current_source'")) rawHTML(" " . show_ip($fields['user_ip'], "Sourcing >>$image_id as '$current_source'"))
: null; : null;
$setter = A(["href"=>make_link("user/" . url_escape($name))], $name); $setter = A(["href"=>make_link("user/" . url_escape($name))], $name);

6
ext/tag_history/main.php
View File

@ -159,7 +159,7 @@ class TagHistory extends Extension
throw new ImageDoesNotExist("Error: cannot find any image with the ID = ". $stored_image_id); throw new ImageDoesNotExist("Error: cannot find any image with the ID = ". $stored_image_id);
} }
log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']'); log_debug("tag_history", 'Reverting tags of >>'.$stored_image_id.' to ['.$stored_tags.']');
// all should be ok so we can revert by firing the SetUserTags event. // all should be ok so we can revert by firing the SetUserTags event.
send_event(new TagSetEvent($image, Tag::explode($stored_tags))); send_event(new TagSetEvent($image, Tag::explode($stored_tags)));
@ -325,10 +325,10 @@ class TagHistory extends Extension
//throw new ImageDoesNotExist("Error: cannot find any image with the ID = ". $stored_image_id); //throw new ImageDoesNotExist("Error: cannot find any image with the ID = ". $stored_image_id);
} }
log_debug("tag_history", 'Reverting tags of Image #'.$stored_image_id.' to ['.$stored_tags.']'); log_debug("tag_history", 'Reverting tags of >>'.$stored_image_id.' to ['.$stored_tags.']');
// all should be ok so we can revert by firing the SetTags event. // all should be ok so we can revert by firing the SetTags event.
send_event(new TagSetEvent($image, Tag::explode($stored_tags))); send_event(new TagSetEvent($image, Tag::explode($stored_tags)));
$this->theme->add_status('Reverted Change', 'Reverted Image #'.$image_id.' to Tag History #'.$stored_result_id.' ('.$row['tags'].')'); $this->theme->add_status('Reverted Change', 'Reverted >>'.$image_id.' to Tag History #'.$stored_result_id.' ('.$row['tags'].')');
} }
} }

2
ext/tag_history/theme.php
View File

@ -112,7 +112,7 @@ class TagHistoryTheme extends Themelet
$name = $fields['name']; $name = $fields['name'];
$date_set = rawHTML(autodate($fields['date_set'])); $date_set = rawHTML(autodate($fields['date_set']));
$ip = $user->can(Permissions::VIEW_IP) ? $ip = $user->can(Permissions::VIEW_IP) ?
rawHTML(" " . show_ip($fields['user_ip'], "Tagging Image #$image_id as '$current_tags'")) rawHTML(" " . show_ip($fields['user_ip'], "Tagging >>$image_id as '$current_tags'"))
: null; : null;
$setter = A(["href"=>make_link("user/" . url_escape($name))], $name); $setter = A(["href"=>make_link("user/" . url_escape($name))], $name);