10 years ago · 5e67d1e33b
--- a/Sources/ModerationCenter.php
+++ b/Sources/ModerationCenter.php
@@ -224,11 +224,12 @@ function ModerationHome()
 
 	$context['page_title'] = $txt['moderation_center'];
 
 	$context['sub_template'] = 'moderation_center';
 
 
 
+	// Handle moderators notes.
 
+	ModBlockNotes();
 
+
 
 	// Load what blocks the user actually can see...
 
-	$valid_blocks = array(
 
-		'n' => 'LatestNews',
 
-		'p' => 'Notes',
 
-	);
 
+	$valid_blocks = array();
 
+
 
 	if ($context['can_moderate_groups'])
 
 		$valid_blocks['g'] = 'GroupRequests';
 
 	if ($context['can_moderate_boards'])
@@ -256,19 +257,6 @@ function ModerationHome()
 
 	}
 
 }
 
 
 
-/**
 
- * Just prepares the time stuff for the simple machines latest news.
 
- */
 
-function ModBlockLatestNews()
 
-{
 
-	global $context, $user_info;
 
-
 
-	$context['time_format'] = urlencode($user_info['time_format']);
 
-
 
-	// Return the template to use.
 
-	return 'latest_news';
 
-}
 
-
 
 /**
 
  * Show a list of the most active watched users.
 
  */
@@ -320,7 +308,7 @@ function ModBlockNotes()
 
 	global $context, $smcFunc, $scripturl, $txt, $user_info;
 
 
 
 	// Are we saving a note?
 
-	if (isset($_POST['makenote']) && isset($_POST['new_note']))
 
+	if (isset($_GET['modnote']) && isset($_POST['makenote']) && isset($_POST['new_note']))
 
 	{
 
 		checkSession();
 
 
@@ -427,7 +415,7 @@ function ModBlockNotes()
 
 		$context['notes'][] = array(
 
 			'author' => array(
 
 				'id' => $note['id_member'],
 
-				'link' => $note['id_member'] ? ('<a href="' . $scripturl . '?action=profile;u=' . $note['id_member'] . '" title="' . $txt['on'] . ' ' . strip_tags(timeformat($note['log_time'])) . '">' . $note['member_name'] . '</a>') : $note['member_name'],
 
+				'link' => $note['id_member'] ? ('<a href="' . $scripturl . '?action=profile;u=' . $note['id_member'] . '">' . $note['member_name'] . '</a>') : $note['member_name'],
 
 			),
 
 			'time' => timeformat($note['log_time']),
 
 			'text' => parse_bbc($note['body']),
@@ -2066,10 +2054,8 @@ function ModerationSettings()
 
 	);
 
 
 
 	// What blocks can this user see?
 
-	$context['homepage_blocks'] = array(
 
-		'n' => $txt['mc_prefs_latest_news'],
 
-		'p' => $txt['mc_notes'],
 
-	);
 
+	$context['homepage_blocks'] = array();
 
+
 
 	if ($context['can_moderate_groups'])
 
 		$context['homepage_blocks']['g'] = $txt['mc_group_requests'];
 
 	if ($context['can_moderate_boards'])
--- a/Themes/default/ModerationCenter.template.php
+++ b/Themes/default/ModerationCenter.template.php
@@ -14,6 +14,9 @@ function template_moderation_center()
 
 {
 
 	global $settings, $options, $context, $txt, $scripturl;
 
 
 
+	// Show moderators notes.
 
+	template_notes();
 
+
 
 	// Show a welcome message to the user.
 
 	echo '
 
 	<div id="modcenter">';
@@ -39,49 +42,6 @@ function template_moderation_center()
 
 	<br class="clear" />';
 
 }
 
 
 
-function template_latest_news()
 
-{
 
-	global $settings, $options, $context, $txt, $scripturl;
 
-
 
-	echo '
 
-		<div class="cat_bar">
 
-			<h3 class="catbg">
 
-				<a href="', $scripturl, '?action=helpadmin;help=live_news" onclick="return reqOverlayDiv(this.href);" class="help"><img src="', $settings['images_url'], '/helptopics_hd.png" alt="', $txt['help'], '" class="icon" /></a> ', $txt['mc_latest_news'], '
 
-			</h3>
 
-		</div>
 
-		<div class="windowbg">
 
-			<div class="content">
 
-				<div id="smfAnnouncements" class="smalltext">', $txt['mc_cannot_connect_sm'], '</div>
 
-			</div>
 
-		</div>';
 
-
 
-	// This requires a lot of javascript...
 
-	// @todo Put this in it's own file!!
 
-	echo '
 
-		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 
-		<script type="text/javascript" src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>
 
-		<script type="text/javascript"><!-- // --><![CDATA[
 
-			var oAdminIndex = new smf_AdminIndex({
 
-				sSelf: \'oAdminCenter\',
 
-
 
-				bLoadAnnouncements: true,
 
-				sAnnouncementTemplate: ', JavaScriptEscape('
 
-					<dl>
 
-						%content%
 
-					</dl>
 
-				'), ',
 
-				sAnnouncementMessageTemplate: ', JavaScriptEscape('
 
-					<dt><a href="%href%">%subject%</a> ' . $txt['on'] . ' %time%</dt>
 
-					<dd>
 
-						%message%
 
-					</dd>
 
-				'), ',
 
-				sAnnouncementContainerId: \'smfAnnouncements\'
 
-			});
 
-		// ]]></script>';
 
-
 
-}
 
-
 
 // Show all the group requests the user can see.
 
 function template_group_requests_block()
 
 {
@@ -189,39 +149,41 @@ function template_notes()
 
 	global $settings, $options, $context, $txt, $scripturl;
 
 
 
 	echo '
 
-		<form action="', $scripturl, '?action=moderate;area=index" method="post">
 
-			<div class="cat_bar">
 
-				<h3 class="catbg">', $txt['mc_notes'], '</h3>
 
-			</div>
 
-			<div class="windowbg">
 
-				<div class="content modbox">';
 
+		<div class="modnotes">
 
+			<form action="', $scripturl, '?action=moderate;area=index;modnote" method="post">
 
+				<div class="cat_bar">
 
+					<h3 class="catbg">', $txt['mc_notes'], '</h3>
 
+				</div>
 
+				<div class="windowbg">
 
+					<div class="content modbox">';
 
 
 
 		if (!empty($context['notes']))
 
 		{
 
 			echo '
 
-					<ul class="reset moderation_notes">';
 
+						<ul class="reset moderation_notes">';
 
 
 
 			// Cycle through the notes.
 
 			foreach ($context['notes'] as $note)
 
 				echo '
 
-						<li class="smalltext"><a href="', $note['delete_href'], '"><img src="', $settings['images_url'], '/pm_recipient_delete.png" alt="" /></a> <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
 
+							<li class="smalltext"><a href="', $note['delete_href'], '"><img src="', $settings['images_url'], '/pm_recipient_delete.png" alt="" /></a>', $note['time'] ,' <strong>', $note['author']['link'], ':</strong> ', $note['text'], '</li>';
 
 
 
 			echo '
 
-					</ul>
 
-					<div class="pagesection notes">
 
-						<span class="smalltext">', $context['page_index'], '</span>
 
-					</div>';
 
+						</ul>
 
+						<div class="pagesection notes">
 
+							<span class="smalltext">', $context['page_index'], '</span>
 
+						</div>';
 
 		}
 
 
 
 		echo '
 
-					<div class="floatleft post_note">
 
+						<div class="floatleft post_note">
 
 						<input type="text" name="new_note" value="', $txt['mc_click_add_note'], '" style="width: 95%;" onclick="if (this.value == \'', $txt['mc_click_add_note'], '\') this.value = \'\';" class="input_text" />
 
+						</div>
 
+						<input type="submit" name="makenote" value="', $txt['mc_add_note'], '" class="button_submit" />
 
 					</div>
 
-					<input type="submit" name="makenote" value="', $txt['mc_add_note'], '" class="button_submit" />
 
 				</div>
 
-			</div>
 
-			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
-		</form>';
 
+				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 
+			</form>
 
+		</div>';
 
 }
 
 
 
 function template_reported_posts()