aaron at svn
Apr 25, 2012, 4:28 AM
Post #1 of 1
(36 views)
Permalink
|
|
SVN: [115051] trunk/extensions/ConfirmAccount/frontend
|
|
https://www.mediawiki.org/wiki/Special:Code/MediaWiki/115051
Revision: 115051
Author: aaron
Date: 2012-04-25 11:28:21 +0000 (Wed, 25 Apr 2012)
Log Message:
-----------
Mark account requests in the queue that have CVs, similar to how email-confirmed ones are marked
Modified Paths:
--------------
trunk/extensions/ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php
trunk/extensions/ConfirmAccount/frontend/specialpages/actions/ConfirmAccount_body.php
Modified: trunk/extensions/ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php
===================================================================
--- trunk/extensions/ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php 2012-04-25 11:27:49 UTC (rev 115050)
+++ trunk/extensions/ConfirmAccount/frontend/language/ConfirmAccountPage.i18n.php 2012-04-25 11:28:21 UTC (rev 115051)
@@ -76,6 +76,7 @@
'confirmaccount-none-p' => '(not provided)',
'confirmaccount-confirm' => 'Use the options below to accept, reject, or hold this request:',
'confirmaccount-econf' => '(confirmed)',
+ 'confirmaccount-withcv' => '(CV attached)',
'confirmaccount-reject' => '(rejected by [[User:$1|$1]] on $2)',
'confirmaccount-rational' => 'Rationale given to applicant:',
'confirmaccount-noreason' => '(none)',
Modified: trunk/extensions/ConfirmAccount/frontend/specialpages/actions/ConfirmAccount_body.php
===================================================================
--- trunk/extensions/ConfirmAccount/frontend/specialpages/actions/ConfirmAccount_body.php 2012-04-25 11:27:49 UTC (rev 115050)
+++ trunk/extensions/ConfirmAccount/frontend/specialpages/actions/ConfirmAccount_body.php 2012-04-25 11:28:21 UTC (rev 115051)
@@ -680,10 +680,15 @@
htmlspecialchars($row->acr_name) . '</td></tr>';
}
if( $this->hasItem( 'RealName' ) ) {
+ $hasCV = $row->acr_filename
+ ? ' <strong>'.wfMsg('confirmaccount-withcv').'</strong>'
+ : '';
$r .= '<tr><td><strong>'.wfMsgHtml('confirmaccount-real-q').'</strong></td><td width=\'100%\'>' .
- htmlspecialchars($row->acr_real_name) . '</td></tr>';
+ htmlspecialchars($row->acr_real_name) . $hasCV . '</td></tr>';
}
- $econf = $row->acr_email_authenticated ? ' <strong>'.wfMsg('confirmaccount-econf').'</strong>' : '';
+ $econf = $row->acr_email_authenticated
+ ? ' <strong>'.wfMsg('confirmaccount-econf').'</strong>'
+ : '';
$r .= '<tr><td><strong>'.wfMsgHtml('confirmaccount-email-q').'</strong></td><td width=\'100%\'>' .
htmlspecialchars($row->acr_email) . $econf.'</td></tr>';
# Truncate this, blah blah...
@@ -779,8 +784,9 @@
function getQueryInfo() {
$conds = $this->mConds;
$tables = array( 'account_requests' );
- $fields = array( 'acr_id','acr_name','acr_real_name','acr_registration','acr_held','acr_user',
- 'acr_email','acr_email_authenticated','acr_bio','acr_notes','acr_urls','acr_type','acr_rejected' );
+ $fields = array( 'acr_id','acr_name','acr_real_name','acr_registration','acr_held',
+ 'acr_user','acr_email','acr_email_authenticated','acr_bio','acr_notes',
+ 'acr_urls','acr_filename', 'acr_type','acr_rejected' );
# Stale requests have a user ID of zero
if( $this->stale ) {
$conds[] = 'acr_user = 0';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
