Home Explore Help
Register Sign In
Omnimaga
/
SMF2.1
mirror of [email protected]:Omnimaga/SMF2.1.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Add a nice response from the server

Signed-off-by: Suki <[email protected]>
Suki 10 years ago
parent
a381d1aeaa
commit
4c512d97fb
4 changed files with 31 additions and 2 deletions
Split View Show Diff Stats
  1. 13 0
      Sources/ModerationCenter.php
  2. 3 1
      Sources/RemoveTopic.php
  3. 10 1
      Themes/default/ModerationCenter.template.php
  4. 5 0
      Themes/default/languages/ModerationCenter.english.php

+ 13 - 0
Sources/ModerationCenter.php
View File 

@@ -548,6 +548,9 @@ function ReportedPosts()
 
 
 	loadTemplate('ModerationCenter');
 
 
+	// Set an empty var for the server response.
 
+	$context['report_post_action'] = '';
 
+
 
 	// Put the open and closed options into tabs, because we can...
 
 	$context[$context['moderation_menu_name']]['tab_data'] = array(
 
 		'title' => $txt['mc_reported_posts'],
 
@@ -589,6 +592,9 @@ function ReportedPosts()
 
 			)
 
 		);
 
 
+		// Tell the user about it.
 
+		$context['report_post_action'] = isset($_GET['ignore']) ? 'ignore' : (isset($_GET['close']) ? 'close' : 'open');
 
+
 
 		// Time to update.
 
 		updateSettings(array('last_mod_report_action' => time()));
 
 		recountOpenReports();
 
@@ -619,6 +625,9 @@ function ReportedPosts()
 
 			updateSettings(array('last_mod_report_action' => time()));
 
 			recountOpenReports();
 
 		}
 
+
 
+		// Go on and tell the result.
 
+		$context['report_post_action'] = 'close_all';
 
 	}
 
 
 	// How many entries are we viewing?
 
@@ -721,6 +730,10 @@ function ReportedPosts()
 
 	// Get the boards where the current user can remove any message.
 
 	$context['report_remove_any_boards'] = $user_info['is_admin'] ? $report_boards_ids : array_intersect($report_boards_ids, boardsAllowedTo('remove_any'));
 
 	$context['report_manage_bans'] = allowedTo('manage_bans');
 
+
 
+	// Do we deleted a message?
 
+	if (isset($_REQUEST['done']))
 
+		$context['report_post_action'] = 'message_deleted';
 
 }
 
 
 /**

+ 3 - 1
Sources/RemoveTopic.php
View File 

@@ -136,7 +136,9 @@ function DeleteMessage()
 
 		logAction('delete', array('topic' => $topic, 'subject' => $subject, 'member' => $poster, 'board' => $board));
 
 
 	// We want to redirect back to recent action.
 
-	if (isset($_REQUEST['recent']))
 
+	if (isset($_REQUEST['modcenter']))
 
+		redirectexit('action=moderate;area=reports;done');
 
+	elseif (isset($_REQUEST['recent']))
 
 		redirectexit('action=recent');
 
 	elseif (isset($_REQUEST['profile'], $_REQUEST['start'], $_REQUEST['u']))
 
 		redirectexit('action=profile;u=' . $_REQUEST['u'] . ';area=showposts;start=' . $_REQUEST['start']);

+ 10 - 1
Themes/default/ModerationCenter.template.php
View File 

@@ -190,6 +190,15 @@ function template_reported_posts()
 
 {
 
 	global $settings, $options, $context, $txt, $scripturl;
 
 
+	// Let them know the action was a success.
 
+	if (!empty($context['report_post_action']) && !empty($txt['report_action_'. $context['report_post_action']]))
 
+	{
 
+		echo '
 
+			<div class="infobox">
 
+				', $txt['report_action_'. $context['report_post_action']], '
 
+			</div>';
 
+	}
 
+
 
 	echo '
 
 	<form id="reported_posts" action="', $scripturl, '?action=moderate;area=reports', $context['view_closed'] ? ';sa=closed' : '', ';start=', $context['start'], '" method="post" accept-charset="', $context['character_set'], '">
 
 		<div class="cat_bar">
 
@@ -239,7 +248,7 @@ function template_reported_posts()
 
 		// Delete message button.
 
 		if (!$report['closed'] && (is_array($context['report_remove_any_boards']) && in_array($report['topic']['id_board'], $context['report_remove_any_boards'])))
 
 			echo '
 
-					<li><a href="', $scripturl, '?action=deletemsg;topic=', $report['topic']['id'] ,'.0;msg=', $report['topic']['id_msg'] ,';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'' , $txt['mc_reportedp_delete_confirm'] , '\');">', $delete_button, '</a></li>';
 
+					<li><a href="', $scripturl, '?action=deletemsg;topic=', $report['topic']['id'] ,'.0;msg=', $report['topic']['id_msg'] ,';modcenter;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'' , $txt['mc_reportedp_delete_confirm'] , '\');">', $delete_button, '</a></li>';
 
 
 		// Ban this user button.
 
 		if (!$report['closed'] && !empty($context['report_manage_bans']))

+ 5 - 0
Themes/default/languages/ModerationCenter.english.php
View File 

@@ -121,6 +121,11 @@ $txt['mc_warning_template_add'] = 'Add Template';
 
 $txt['mc_warning_template_modify'] = 'Edit Template';
 
 $txt['mc_warning_template_delete'] = 'Delete Selected';
 
 $txt['mc_warning_template_delete_confirm'] = 'Are you sure you want to delete the selected templates?';
 
+$txt['report_action_message_deleted'] = 'The message was successfully deleted.';
 
+$txt['report_action_ignore'] = 'The report was successfully ignored.';
 
+$txt['report_action_close'] = 'The report was successfully closed.';
 
+$txt['report_action_open'] = 'The report was successfully open.';
 
+$txt['report_action_close_all'] = 'You successfully closed all selected reports.';
 
 
 $txt['mc_warning_template_desc'] = 'Use this page to fill in the details of the template. Note that the subject for the email is not part of the template. Note that as the notification is sent by PM you can use BBC within the template. Note if you use the {MESSAGE} variable then this template will not be available when issuing a generic warning (i.e. A warning not linked to a post).';
 
 $txt['mc_warning_template_title'] = 'Template Title';