Skip to content

added thread subject to post reports #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tzdlr wants to merge 4 commits into
base: master
Choose a base branch
from
Open

added thread subject to post reports #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3403d6
added thread subject to post reports
Feb 15, 2024
e59c980
removed quotation marks in language file
Feb 15, 2024
ee80e4b
added thread title, moved post title to pos 4
Feb 15, 2024
ce61e15
splittet report messages for profiles and post from the rest to get a…
Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions UPLOAD/inc/languages/deutsch_du/reporttothread.lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
$l['reporttothread_type_reputation'] = "Bewertung";
$l['reporttothread_type_privatemessage'] = "Private Nachricht";

$l['reporttothread_subject_post'] = "{1} in {3} gemeldet von {2}";
$l['reporttothread_subject_profile'] = "{1} {3} gemeldet von {2}";

$l['reporttothread_subject'] = "{1} gemeldet von {2}";
$l['reporttothread_comment'] = "Nutzer {1} hat dazu kommentiert: {2}";

Expand Down
3 changes: 3 additions & 0 deletions UPLOAD/inc/languages/deutsch_sie/reporttothread.lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
$l['reporttothread_type_reputation'] = "Bewertung";
$l['reporttothread_type_privatemessage'] = "Private Nachricht";

$l['reporttothread_subject_post'] = "{1} in {3} gemeldet von {2}";
$l['reporttothread_subject_profile'] = "{1} {3} gemeldet von {2}";

$l['reporttothread_subject'] = "{1} gemeldet von {2}";
$l['reporttothread_comment'] = "Nutzer {1} hat dazu kommentiert: {2}";

Expand Down
3 changes: 3 additions & 0 deletions UPLOAD/inc/languages/english/reporttothread.lang.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
$l['reporttothread_type_reputation'] = "reputation";
$l['reporttothread_type_privatemessage'] = "private message";

$l['reporttothread_subject_post'] = "Reported {1} in {3} by {2}";
$l['reporttothread_subject_profile'] = "Reported {1} {3} by {2}";

$l['reporttothread_subject'] = "Reported {1} by {2}";
$l['reporttothread_comment'] = "User {1} has commented: {2}";

Expand Down
9 changes: 6 additions & 3 deletions UPLOAD/inc/plugins/reporttothread.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ function reporttothread_install()
'modcp' => array(
'optionscode' => 'yesno',
'value' => 1
)
),
);

$disporder = 0;
Expand Down Expand Up @@ -351,6 +351,7 @@ function reporttothread_run()
}
$pd_reported_post = "[quote=\"" . $post['username'] . "\" pid=\"" . $post['pid'] . "\" dateline=\"" . $post['dateline'] . "\"]" . $post['message'] . "[/quote]";
$message = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_message_post), $mybb->user['username'], $rtype, $pd_thread_link, $pd_forum_link, $reason, $comment, $pd_reported_post);
$subject = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_subject_post), $rtype, $mybb->user['username'], $thread['subject']);
break;
case 'profile':
if (!in_array(2, $reporttothread_type))
Expand All @@ -362,6 +363,7 @@ function reporttothread_run()
$rtype = htmlspecialchars_uni($lang->reporttothread_type_profile);
$userlink = "[url=" . $mybb->settings['bburl'] . "/member.php?action=profile&uid=" . $user['uid'] . "]" . $user['username'] . "[/url]";
$message = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_message_profile), $mybb->user['username'], $rtype, $userlink, $reason, $comment);
$subject = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_subject_profile), $rtype, $mybb->user['username'], $user['username']);
break;
case 'reputation':
if (!in_array(3, $reporttothread_type))
Expand Down Expand Up @@ -391,6 +393,7 @@ function reporttothread_run()
$reputation_comment = "\n[quote=\"" . $adduser['username'] . "\" dateline=\"" . $reputation['dateline'] . "\"]" . htmlspecialchars_uni($reputation['comments']) . "[/quote]";
}
$message = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_message_reputation), $mybb->user['username'], $rtype, $getuserlink, $reason, $comment, $reputation['reputation'], $adduserlink, $reppostlink, $reputation_comment);
$subject = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_subject), $rtype, $mybb->user['username']);
break;
case 'privatemessage':
if (!in_array(4, $reporttothread_type))
Expand All @@ -408,11 +411,11 @@ function reporttothread_run()
$senduserlink = "[url=" . $mybb->settings['bburl'] . "/member.php?action=profile&uid=" . $senduser['uid'] . "]" . $senduser['username'] . "[/url]";
$pm_content = "\n[quote=\"" . $senduser['username'] . "\" dateline=\"" . $pm['dateline'] . "\"][b]" . htmlspecialchars_uni($lang->export_subject) . ":[/b] " . $pm['subject'] . "\n[b]" . htmlspecialchars_uni($lang->export_message) . ":[/b]\n" . $pm['message'] . "[/quote]";
$message = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_message_privatemessage), $mybb->user['username'], $rtype, $senduserlink, $reason, $comment, $pm_content);
$subject = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_subject), $rtype, $mybb->user['username']);
break;
}

$subject = $lang->sprintf(htmlspecialchars_uni($lang->reporttothread_subject), $rtype, $mybb->user['username']);


$find_tid = reporttothread_search_tid($reported_id, $report_type);
if ($find_tid)
{
Expand Down