makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #786 branch 'brunoais/ticket/10845' into develop

Browse source 
* brunoais/ticket/10845:
  [ticket/10845] Removed one empty line that wasn't supposed to be there
  [ticket/10845] Two of the three colouns were missing in the DB update file
  [ticket/10845] Remove censor from text
  [ticket/10845] Now it shows the preview post parsed
  [ticket/10845] Changed the report system. Now it saves posts with the bbcode

Conflicts:
	phpBB/includes/functions_content.php
This commit is contained in:
Oleg Pudeyev 2012-11-06 16:23:33 -05:00
commit 196ed8ef9f
12 changed files with 53 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/develop/create_schema_files.php
View file

@ -1520,16 +1520,18 @@ function get_schema_struct()
$schema_data['phpbb_reports'] = array( $schema_data['phpbb_reports'] = array(
'COLUMNS' => array( 'COLUMNS' => array(
'report_id' => array('UINT', NULL, 'auto_increment'), 'report_id' => array('UINT', NULL, 'auto_increment'),
'reason_id' => array('USINT', 0), 'reason_id' => array('USINT', 0),
'post_id' => array('UINT', 0), 'post_id' => array('UINT', 0),
'pm_id' => array('UINT', 0), 'pm_id' => array('UINT', 0),
'user_id' => array('UINT', 0), 'user_id' => array('UINT', 0),
'user_notify' => array('BOOL', 0), 'user_notify' => array('BOOL', 0),
'report_closed' => array('BOOL', 0), 'report_closed' => array('BOOL', 0),
'report_time' => array('TIMESTAMP', 0), 'report_time' => array('TIMESTAMP', 0),
'report_text' => array('MTEXT_UNI', ''), 'report_text' => array('MTEXT_UNI', ''),
'reported_post_text' => array('MTEXT_UNI', ''), 'reported_post_text' => array('MTEXT_UNI', ''),
'reported_post_uid' => array('VCHAR:8', ''),
'reported_post_bitfield' => array('VCHAR:255', ''),
), ),
'PRIMARY_KEY' => 'report_id', 'PRIMARY_KEY' => 'report_id',
'KEYS' => array( 'KEYS' => array(

4
phpBB/includes/functions_content.php
View file

@ -408,7 +408,7 @@ function strip_bbcode(&$text, $uid = '')
* For display of custom parsed text on user-facing pages * For display of custom parsed text on user-facing pages
* Expects $text to be the value directly from the database (stored value) * Expects $text to be the value directly from the database (stored value)
*/ */
function generate_text_for_display($text, $uid, $bitfield, $flags) function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true)
{ {
static $bbcode; static $bbcode;
global $phpbb_dispatcher; global $phpbb_dispatcher;
@ -418,8 +418,6 @@ function generate_text_for_display($text, $uid, $bitfield, $flags)
return ''; return '';
} }
$censor_text = true;
/** /**
* Use this event to modify the text before it is parsed * Use this event to modify the text before it is parsed
* *

4
phpBB/includes/mcp/mcp_reports.php
View file

@ -71,7 +71,7 @@ class mcp_reports
// closed reports are accessed by report id // closed reports are accessed by report id
$report_id = request_var('r', 0); $report_id = request_var('r', 0);
$sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour $sql = 'SELECT r.post_id, r.user_id, r.report_id, r.report_closed, report_time, r.report_text, r.reported_post_text, r.reported_post_uid, r.reported_post_bitfield, rr.reason_title, rr.reason_description, u.username, u.username_clean, u.user_colour
FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u FROM ' . REPORTS_TABLE . ' r, ' . REPORTS_REASONS_TABLE . ' rr, ' . USERS_TABLE . ' u
WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . ' WHERE ' . (($report_id) ? 'r.report_id = ' . $report_id : "r.post_id = $post_id") . '
AND rr.reason_id = r.reason_id AND rr.reason_id = r.reason_id
@ -227,7 +227,7 @@ class mcp_reports
'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']), 'REPORTER_NAME' => get_username_string('username', $report['user_id'], $report['username'], $report['user_colour']),
'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']), 'U_VIEW_REPORTER_PROFILE' => get_username_string('profile', $report['user_id'], $report['username'], $report['user_colour']),
'POST_PREVIEW' => bbcode_nl2br($report['reported_post_text']), 'POST_PREVIEW' => generate_text_for_display($report['reported_post_text'], $report['reported_post_uid'], $report['reported_post_bitfield'], OPTION_FLAG_BBCODE | OPTION_FLAG_SMILIES, false),
'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'], 'POST_SUBJECT' => ($post_info['post_subject']) ? $post_info['post_subject'] : $user->lang['NO_SUBJECT'],
'POST_DATE' => $user->format_date($post_info['post_time']), 'POST_DATE' => $user->format_date($post_info['post_time']),
'POST_IP' => $post_info['poster_ip'], 'POST_IP' => $post_info['poster_ip'],

4
phpBB/install/database_update.php
View file

@ -1134,7 +1134,9 @@ function database_update_info()
'style_parent_tree' => array('TEXT', ''), 'style_parent_tree' => array('TEXT', ''),
), ),
REPORTS_TABLE => array( REPORTS_TABLE => array(
'reported_post_text' => array('MTEXT_UNI', ''), 'reported_post_text' => array('MTEXT_UNI', ''),
'reported_post_uid' => array('VCHAR:8', ''),
'reported_post_bitfield' => array('VCHAR:255', ''),
), ),
), ),
'change_columns' => array( 'change_columns' => array(

4
phpBB/install/schemas/firebird_schema.sql
View file

@ -911,7 +911,9 @@ CREATE TABLE phpbb_reports (
report_closed INTEGER DEFAULT 0 NOT NULL, report_closed INTEGER DEFAULT 0 NOT NULL,
report_time INTEGER DEFAULT 0 NOT NULL, report_time INTEGER DEFAULT 0 NOT NULL,
report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL, report_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL reported_post_text BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
reported_post_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
reported_post_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL
);; );;
ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);; ALTER TABLE phpbb_reports ADD PRIMARY KEY (report_id);;

4
phpBB/install/schemas/mssql_schema.sql
View file

@ -1110,7 +1110,9 @@ CREATE TABLE [phpbb_reports] (
[report_closed] [int] DEFAULT (0) NOT NULL , [report_closed] [int] DEFAULT (0) NOT NULL ,
[report_time] [int] DEFAULT (0) NOT NULL , [report_time] [int] DEFAULT (0) NOT NULL ,
[report_text] [text] DEFAULT ('') NOT NULL , [report_text] [text] DEFAULT ('') NOT NULL ,
[reported_post_text] [text] DEFAULT ('') NOT NULL [reported_post_text] [text] DEFAULT ('') NOT NULL ,
[reported_post_bitfield] [varchar] (255) DEFAULT ('') NOT NULL ,
[reported_post_uid] [varchar] (8) DEFAULT ('') NOT NULL
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
GO GO

2
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -649,6 +649,8 @@ CREATE TABLE phpbb_reports (
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
report_text mediumblob NOT NULL, report_text mediumblob NOT NULL,
reported_post_text mediumblob NOT NULL, reported_post_text mediumblob NOT NULL,
reported_post_bitfield varbinary(255) DEFAULT '' NOT NULL,
reported_post_uid varbinary(8) DEFAULT '' NOT NULL,
PRIMARY KEY (report_id), PRIMARY KEY (report_id),
KEY post_id (post_id), KEY post_id (post_id),
KEY pm_id (pm_id) KEY pm_id (pm_id)

2
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -649,6 +649,8 @@ CREATE TABLE phpbb_reports (
report_time int(11) UNSIGNED DEFAULT '0' NOT NULL, report_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
report_text mediumtext NOT NULL, report_text mediumtext NOT NULL,
reported_post_text mediumtext NOT NULL, reported_post_text mediumtext NOT NULL,
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
PRIMARY KEY (report_id), PRIMARY KEY (report_id),
KEY post_id (post_id), KEY post_id (post_id),
KEY pm_id (pm_id) KEY pm_id (pm_id)

2
phpBB/install/schemas/oracle_schema.sql
View file

@ -1216,6 +1216,8 @@ CREATE TABLE phpbb_reports (
report_time number(11) DEFAULT '0' NOT NULL, report_time number(11) DEFAULT '0' NOT NULL,
report_text clob DEFAULT '' , report_text clob DEFAULT '' ,
reported_post_text clob DEFAULT '' , reported_post_text clob DEFAULT '' ,
reported_post_bitfield varchar2(255) DEFAULT '' ,
reported_post_uid varchar2(8) DEFAULT '' ,
CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id) CONSTRAINT pk_phpbb_reports PRIMARY KEY (report_id)
) )
/ /

2
phpBB/install/schemas/postgres_schema.sql
View file

@ -855,6 +855,8 @@ CREATE TABLE phpbb_reports (
report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0), report_time INT4 DEFAULT '0' NOT NULL CHECK (report_time >= 0),
report_text TEXT DEFAULT '' NOT NULL, report_text TEXT DEFAULT '' NOT NULL,
reported_post_text TEXT DEFAULT '' NOT NULL, reported_post_text TEXT DEFAULT '' NOT NULL,
reported_post_bitfield varchar(255) DEFAULT '' NOT NULL,
reported_post_uid varchar(8) DEFAULT '' NOT NULL,
PRIMARY KEY (report_id) PRIMARY KEY (report_id)
); );

4
phpBB/install/schemas/sqlite_schema.sql
View file

@ -629,7 +629,9 @@ CREATE TABLE phpbb_reports (
report_closed INTEGER UNSIGNED NOT NULL DEFAULT '0', report_closed INTEGER UNSIGNED NOT NULL DEFAULT '0',
report_time INTEGER UNSIGNED NOT NULL DEFAULT '0', report_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
report_text mediumtext(16777215) NOT NULL DEFAULT '', report_text mediumtext(16777215) NOT NULL DEFAULT '',
reported_post_text mediumtext(16777215) NOT NULL DEFAULT '' reported_post_text mediumtext(16777215) NOT NULL DEFAULT '',
reported_post_bitfield varchar(255) NOT NULL DEFAULT '',
reported_post_uid varchar(8) NOT NULL DEFAULT ''
); );
CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id); CREATE INDEX phpbb_reports_post_id ON phpbb_reports (post_id);

30
phpBB/report.php
View file

@ -71,9 +71,11 @@ if ($post_id)
trigger_error('POST_NOT_EXIST'); trigger_error('POST_NOT_EXIST');
} }
$forum_id = (int) $report_data['forum_id']; $forum_id = (int) $report_data['forum_id'];
$topic_id = (int) $report_data['topic_id']; $topic_id = (int) $report_data['topic_id'];
$reported_post_text = $report_data['post_text']; $reported_post_text = $report_data['post_text'];
$reported_post_bitfield = $report_data['bbcode_bitfield'];
$reported_post_uid = $report_data['bbcode_uid'];
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . FORUMS_TABLE . ' FROM ' . FORUMS_TABLE . '
@ -132,7 +134,9 @@ else
trigger_error($message); trigger_error($message);
} }
$reported_post_text = $report_data['message_text']; $reported_post_text = $report_data['message_text'];
$reported_post_bitfield = $report_data['bbcode_bitfield'];
$reported_post_uid = $report_data['bbcode_uid'];
} }
// Submit report? // Submit report?
@ -151,15 +155,17 @@ if ($submit && $reason_id)
} }
$sql_ary = array( $sql_ary = array(
'reason_id' => (int) $reason_id, 'reason_id' => (int) $reason_id,
'post_id' => $post_id, 'post_id' => $post_id,
'pm_id' => $pm_id, 'pm_id' => $pm_id,
'user_id' => (int) $user->data['user_id'], 'user_id' => (int) $user->data['user_id'],
'user_notify' => (int) $user_notify, 'user_notify' => (int) $user_notify,
'report_closed' => 0, 'report_closed' => 0,
'report_time' => (int) time(), 'report_time' => (int) time(),
'report_text' => (string) $report_text, 'report_text' => (string) $report_text,
'reported_post_text' => $reported_post_text, 'reported_post_text' => $reported_post_text,
'reported_post_uid' => $reported_post_uid,
'reported_post_bitfield'=> $reported_post_bitfield,
); );
$sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $sql = 'INSERT INTO ' . REPORTS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary);