http://www.mediawiki.org/wiki/Special:Code/MediaWiki/68260
Revision: 68260
Author: ashley
Date: 2010-06-19 03:11:55 +0000 (Sat, 19 Jun 2010)
Log Message:
-----------
SocialProfile: cleanup to UserBoard
Modified Paths:
--------------
trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
Modified: trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
===================================================================
--- trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
2010-06-18 23:31:39 UTC (rev 68259)
+++ trunk/extensions/SocialProfile/UserBoard/SpecialUserBoard.php
2010-06-19 03:11:55 UTC (rev 68260)
@@ -251,7 +251,7 @@
<option value="1">' . wfMsg(
'userboard_private' ) . '</option>
</select>
<p>
- <textarea name="message" id="message"
cols="63" rows="4"/></textarea>
+ <textarea name="message" id="message"
cols="63" rows="4"></textarea>
<div
class="user-page-message-box-button">
<input type="button" value="' .
wfMsg( 'userboard_sendbutton' ) . '" class="site-button"
onclick="javascript:send_message();" />
@@ -260,9 +260,9 @@
</div>';
} else {
$login_link = SpecialPage::getTitleFor(
'Userlogin' );
- $output .= '<div class="user-page-message-form">
- ' . wfMsg(
'userboard_loggedout', $login_link->escapeFullURL() ) . '
- </div>';
+ $output .= '<div
class="user-page-message-form">'
+ . wfMsg( 'userboard_loggedout',
$login_link->escapeFullURL() ) .
+ '</div>';
}
}
$output .= '<div id="user-page-board">';
@@ -284,14 +284,12 @@
}
if ( $wgUser->getName() ==
$ub_message['user_name'] || $wgUser->isAllowed( 'userboard-delete' ) ) {
$delete_link = "<span
class=\"user-board-red\">
- <a href=\"javascript:void(0);\"
onclick=\"javascript:delete_message({$ub_message["id"]})\">" . wfMsg(
'userboard_delete' ) . "</a>
- </span>";
+ <a href=\"javascript:void(0);\"
onclick=\"javascript:delete_message({$ub_message['id']})\">" . wfMsg(
'userboard_delete' ) . '</a>
+ </span>';
}
if ( $ub_message['type'] == 1 ) {
$ub_message_type_label = '(' . wfMsg(
'userboard_private' ) . ')';
}
- // global $max_link_text_length;
- // $max_link_text_length = 75;
// had global function to cut link text if too
long and no breaks
// $ub_message_text = preg_replace_callback(
"/(<a[^>]*>)(.*?)(<\/a>)/i", 'cut_link_text', $ub_message['message_text'] );
@@ -299,16 +297,16 @@
$output .= "<div class=\"user-board-message\"
style=\"width:550px\">
<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}
+ <a
href=\"{$user->escapeFullURL()}\"
title=\"{$ub_message['user_name_from']}}\">{$ub_message['user_name_from']} </a>
{$ub_message_type_label}
</div>
- <div class=\"user-board-message-time\">
- " . wfMsgHtml(
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) ) . "
- </div>
+ <div class=\"user-board-message-time\">"
+ . wfMsgHtml(
'userboard_posted_ago', $b->getTimeAgo( $ub_message['timestamp'] ) ) .
+ "</div>
<div
class=\"user-board-message-content\">
<div
class=\"user-board-message-image\">
- <a
href=\"{$user->escapeFullURL()}\"
title=\"{$ub_message["user_name_from"]}\">{$avatar->getAvatarURL()}</a>
+ <a
href=\"{$user->escapeFullURL()}\"
title=\"{$ub_message['user_name_from']}\">{$avatar->getAvatarURL()}</a>
</div>
- <div
class=\"user-board-message-body\" >
+ <div
class=\"user-board-message-body\">
{$ub_message_text}
</div>
<div class=\"cleared\"></div>
Modified: trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php
===================================================================
--- trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2010-06-18
23:31:39 UTC (rev 68259)
+++ trunk/extensions/SocialProfile/UserBoard/UserBoardClass.php 2010-06-19
03:11:55 UTC (rev 68260)
@@ -47,7 +47,7 @@
__METHOD__
);
- // Send Email (if user is not writing on own board)
+ // Send e-mail notification (if user is not writing on own
board)
if ( $user_id_from != $user_id_to ) {
$this->sendBoardNotificationEmail( $user_id_to,
$user_name_from );
$this->incNewMessageCount( $user_id_to );
@@ -234,7 +234,7 @@
$res = $dbr->query( $sql, __METHOD__ );
$messages = array();
- while ( $row = $dbr->fetchObject( $res ) ) {
+ foreach ( $res as $row ) {
$parser = new Parser();
$message_text = $parser->parse( $row->ub_message,
$wgTitle, $wgOut->parserOptions(), true );
$message_text = $message_text->getText();
@@ -298,29 +298,28 @@
}
if ( $wgUser->getName() ==
$message['user_name'] || $wgUser->isAllowed( 'userboard-delete' ) ) {
$delete_link = "<span
class=\"user-board-red\">
- <a
href=\"javascript:void(0);\"
onclick=\"javascript:delete_message({$message["id"]})\">" . wfMsgHtml(
'userboard_delete' ) . "</a>
- </span>";
+ <a
href=\"javascript:void(0);\"
onclick=\"javascript:delete_message({$message['id']})\">" . wfMsgHtml(
'userboard_delete' ) . '</a>
+ </span>';
}
if ( $message['type'] == 1 ) {
$message_type_label = '(' . wfMsgHtml(
'userboard_private' ) . ')';
}
- # $max_link_text_length = 50;
$message_text = $message['message_text'];
# $message_text = preg_replace_callback(
"/(<a[^>]*>)(.*?)(<\/a>)/i", 'cut_link_text', $message['message_text'] );
- $output .= "<div class=\"user-board-message\" >
+ $output .= "<div class=\"user-board-message\">
<div class=\"user-board-message-from\">
- <a href=\"{$user->escapeFullURL()}\"
title=\"{$message["user_name_from"]}\">{$message["user_name_from"]}</a>
{$message_type_label}
+ <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>
+ <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\">
- <a
href=\"{$user->escapeFullURL()}\"
title=\"{$message["user_name_from"]}\">{$avatar->getAvatarURL()}</a>
+ <a
href=\"{$user->escapeFullURL()}\"
title=\"{$message['user_name_from']}\">{$avatar->getAvatarURL()}</a>
</div>
- <div
class=\"user-board-message-body\" >
+ <div
class=\"user-board-message-body\">
{$message_text}
</div>
<div class=\"cleared\"></div>
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
