https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102178
Revision: 102178
Author: ashley
Date: 2011-11-06 15:06:09 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
SocialProfile: as per Markus' in-depth review:
*move inline CSS to the CSS file
*remove unused class member variables
*mark UserBoard's constructor as public
*uncomment the part of getNewMessageCountDB() that actually gets the new
message count from the database
*use DB_SLAVE for reads
Modified Paths:
--------------
trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
trunk/extensions/SocialProfile/UserBoard/UserBoard.css
trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
Modified: trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
===================================================================
--- trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
2011-11-06 15:02:31 UTC (rev 102177)
+++ trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
2011-11-06 15:06:09 UTC (rev 102178)
@@ -144,8 +144,8 @@
if ( $total ) {
$output .= '<div class="user-page-message-top">
- <span class="user-page-message-count"
style="font-size:11px;color:#666666;">'
- . wfMsg( 'userboard_showingmessages', $total,
$start, $end, $end - $start + 1 ) .
+ <span class="user-page-message-count">' .
+ wfMsg( 'userboard_showingmessages', $total,
$start, $end, $end - $start + 1 ) .
"</span> {$board_to_board}
</div>";
}
@@ -221,7 +221,7 @@
$output .= '<div class="user-page-message-form">
<input type="hidden" id="user_name_to"
name="user_name_to" value="' . $user_name_to . '"/>
<input type="hidden"
id="user_name_from" name="user_name_from" value="' . $user_name_from . '"/>
- <span style="color:#797979;">' . wfMsg(
'userboard_messagetype' ) . ' </span>
+ <span class="user-board-message-type">'
. wfMsg( 'userboard_messagetype' ) . ' </span>
<select id="message_type">
<option value="0">' . wfMsg(
'userboard_public' ) . '</option>
<option value="1">' . wfMsg(
'userboard_private' ) . '</option>
@@ -285,7 +285,7 @@
// $ub_message_text = preg_replace_callback(
"/(<a[^>]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
$ub_message_text = $ub_message['message_text'];
- $output .= "<div class=\"user-board-message\"
style=\"width:550px\">
+ $output .= "<div class=\"user-board-message\">
<div class=\"user-board-message-from\">
<a
href=\"{$user->escapeFullURL()}\"
title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']} </a>
{$ub_message_type_label}
</div>
Modified: trunk/extensions/SocialProfile/UserBoard/UserBoard.css
===================================================================
--- trunk/extensions/SocialProfile/UserBoard/UserBoard.css 2011-11-06
15:02:31 UTC (rev 102177)
+++ trunk/extensions/SocialProfile/UserBoard/UserBoard.css 2011-11-06
15:06:09 UTC (rev 102178)
@@ -37,6 +37,7 @@
.user-board-message {
border: 1px solid #D4DFD7;
margin: 0px 0px 15px 0px;
+ width: 550px;
}
.user-board-message-from {
@@ -102,3 +103,12 @@
.user-page-message-form textarea {
width: 80%;
}
+
+.user-page-message-count {
+ color: #666666;
+ font-size: 11px;
+}
+
+.user-board-message-type {
+ color: #797979;
+}
\ No newline at end of file
Modified: trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
===================================================================
--- trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2011-11-06
15:02:31 UTC (rev 102177)
+++ trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2011-11-06
15:06:09 UTC (rev 102178)
@@ -3,18 +3,11 @@
* Functions for managing user board data
*/
class UserBoard {
- /**#@+
- * @private
- */
- var $user_id;
- var $user_name;
/**
* Constructor
- * @private
*/
- /* private */ function __construct() {
- }
+ public function __construct() {}
/**
* Sends a user board message to another user.
@@ -155,9 +148,6 @@
$key = wfMemcKey( 'user', 'newboardmessage', $user_id );
$newCount = 0;
- /* @todo FIXME: why is this commented out? This obviously
should be
- enabled, because without this, this function is basically
identical
- to clearNewMessagesCount...
$dbw = wfGetDB( DB_MASTER );
$s = $dbw->selectRow(
'user_board',
@@ -168,7 +158,6 @@
if ( $s !== false ) {
$newCount = $s->count;
}
- */
$wgMemc->set( $key, $newCount );
@@ -205,8 +194,8 @@
* @return Boolean: true if user owns the message, otherwise false
*/
public function doesUserOwnMessage( $user_id, $ub_id ) {
- $dbw = wfGetDB( DB_MASTER );
- $s = $dbw->selectRow(
+ $dbr = wfGetDB( DB_SLAVE );
+ $s = $dbr->selectRow(
'user_board',
array( 'ub_user_id' ),
array( 'ub_id' => $ub_id ),
@@ -391,8 +380,8 @@
<div class=\"user-board-message-from\">
<a href=\"{$user->escapeFullURL()}\"
title=\"{$message['user_name_from']}\">{$message['user_name_from']}</a>
{$message_type_label}
</div>
- <div class=\"user-board-message-time\">"
- . wfMsgHtml(
'userboard_posted_ago', $this->getTimeAgo( $message['timestamp'] ) ) .
+ <div
class=\"user-board-message-time\">" .
+ wfMsgHtml(
'userboard_posted_ago', $this->getTimeAgo( $message['timestamp'] ) ) .
"</div>
<div
class=\"user-board-message-content\">
<div
class=\"user-board-message-image\">
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
