Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234010
Change subject: Run stylize.php on Newsletter
......................................................................
Run stylize.php on Newsletter
Change-Id: Ia47055927994dda489f4f8177c53d92f7af5f51a
---
M Newsletter.hooks.php
M includes/ApiNewsletterManage.php
M includes/SpecialNewsletterCreate.php
M includes/SpecialNewsletterManage.php
M includes/SpecialNewsletters.php
5 files changed, 33 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/10/234010/1
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index d70c843..5834ebc 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -49,7 +49,7 @@
__METHOD__,
array()
);
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
$recipient = User::newFromId(
$row->subscriber_id );
$id = $row->subscriber_id;
$users[$id] = $recipient;
diff --git a/includes/ApiNewsletterManage.php b/includes/ApiNewsletterManage.php
index ddfdf7a..56a4355 100644
--- a/includes/ApiNewsletterManage.php
+++ b/includes/ApiNewsletterManage.php
@@ -3,13 +3,13 @@
* API to manage newsletters
*
*/
-class ApiNewsletterManage extends ApiBase{
+class ApiNewsletterManage extends ApiBase {
public function execute() {
$dbw = wfGetDB( DB_MASTER );
if ( $this->getMain()->getVal( 'todo' ) === 'removepublisher' )
{
$rowData = array(
'newsletter_id' => $this->getMain()->getVal(
'newsletterId' ),
- 'publisher_id' =>
$this->getMain()->getVal('publisher')
+ 'publisher_id' => $this->getMain()->getVal(
'publisher' )
);
$dbw->delete( 'nl_publishers', $rowData, __METHOD__ );
}
diff --git a/includes/SpecialNewsletterCreate.php
b/includes/SpecialNewsletterCreate.php
index 5b2937a..cb12783 100644
--- a/includes/SpecialNewsletterCreate.php
+++ b/includes/SpecialNewsletterCreate.php
@@ -6,7 +6,7 @@
*/
class SpecialNewsletterCreate extends SpecialPage {
public function __construct() {
- parent::__construct('NewsletterCreate');
+ parent::__construct( 'NewsletterCreate' );
}
public function execute( $par ) {
@@ -84,7 +84,7 @@
}
if ( isset( $formData['name'] ) && isset(
$formData['description'] ) && ( $pageId !== 0 ) &&
isset( $formData['mainpage'] ) && isset(
$formData['frequency'] ) && isset( $formData['publisher'] ) ) {
- //inserting into database
+ // inserting into database
$dbw = wfGetDB( DB_MASTER );
$rowData = array(
'nl_name' => $formData['name'],
@@ -100,7 +100,7 @@
return array( 'newsletter-exist-error' );
}
$this->getOutput()->addWikiMsg(
'newsletter-create-confirmation' );
- //Add newsletter creator as publisher
+ // Add newsletter creator as publisher
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'nl_newsletters',
diff --git a/includes/SpecialNewsletterManage.php
b/includes/SpecialNewsletterManage.php
index 7f7b848..c36da03 100644
--- a/includes/SpecialNewsletterManage.php
+++ b/includes/SpecialNewsletterManage.php
@@ -49,7 +49,7 @@
$newsletterNames = array();
$newsletterIds = array();
$ownedNewsletter = array();
- $defaultOption = array('' => null);
+ $defaultOption = array( '' => null );
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'nl_publishers',
@@ -58,11 +58,11 @@
__METHOD__
);
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
$newsletterIds[$row->newsletter_id] =
$row->newsletter_id;
}
- foreach( $newsletterIds as $value ) {
+ foreach ( $newsletterIds as $value ) {
$resl = $dbr->select(
'nl_newsletters',
array( 'nl_name', 'nl_id' ),
@@ -78,24 +78,24 @@
$newsletters = array();
$result = $dbr->select(
'nl_newsletters',
- array( 'nl_name','nl_id' ),
+ array( 'nl_name', 'nl_id' ),
array( 'nl_owner_id' => $this->getUser()->getId() ),
__METHOD__
);
foreach ( $result as $row ) {
$newsletters[$row->nl_name] = $row->nl_id;
}
- //Get newsletters owned by the logged in user
+ // Get newsletters owned by the logged in user
$dbr = wfGetDB( DB_SLAVE );
$query = $dbr->select(
'nl_newsletters',
- array( 'nl_name', 'nl_id'),
+ array( 'nl_name', 'nl_id' ),
array( 'nl_owner_id' => $this->getUser()->getId() ),
__METHOD__,
array()
);
- foreach ($query as $row) {
+ foreach ( $query as $row ) {
$ownedNewsletter[$row->nl_name] = $row->nl_id;
}
@@ -142,9 +142,9 @@
$issuePage = Title::newFromText(
$formData['issue-page'] );
$pageId = $issuePage->getArticleId();
$pageNamepace = $issuePage->getNamespace();
- //Array index is newsletter-id for selected newsletter
in newsletterNames[] above
+ // Array index is newsletter-id for selected newsletter
in newsletterNames[] above
if ( ( $pageId !== 0 ) && isset( $newsletterId ) &&
isset( $formData['publisher'] ) ) {
- //Find number of existing issues
+ // Find number of existing issues
$dbr = wfGetDB( DB_SLAVE );
$issueCount = $dbr->selectRowCount(
'nl_issues',
@@ -153,7 +153,7 @@
__METHOD__,
array()
);
- //inserting to database
+ // inserting to database
$dbw = wfGetDB( DB_MASTER );
$rowData = array(
'issue_id' => $issueCount + 1,
@@ -163,7 +163,7 @@
);
$dbw->insert( 'nl_issues', $rowData, __METHOD__
);
$this->getOutput()->addWikiMsg(
'newsletter-issue-announce-confirmation' );
- //trigger notifications
+ // trigger notifications
$res = $dbr->select(
'nl_newsletters',
array( 'nl_name' ),
@@ -173,7 +173,7 @@
);
$newsletterName = null;
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
$newsletterName = $row->nl_name;
}
if ( class_exists( 'EchoEvent' ) ) {
@@ -185,7 +185,7 @@
'issuePageTitle' =>
$formData['issue-page'],
'issuePageNamespace' =>
$pageNamepace
),
- ));
+ ) );
}
return true;
@@ -204,7 +204,7 @@
'publisher_id' => $user->getId()
);
try {
- $dbww->insert('nl_publishers',
$rowData, __METHOD__);
+ $dbww->insert( 'nl_publishers',
$rowData, __METHOD__ );
$this->getOutput()->addWikiMsg(
'newsletter-new-publisher-confirmation' );
return true;
@@ -230,7 +230,7 @@
if ( is_null( $header ) ) {
$header = array();
foreach ( SpecialNewsletterManage::$fields as $key =>
$value ) {
- $header[$key]= $this->msg(
"newsletter-manage-header-$value" )->text();
+ $header[$key] = $this->msg(
"newsletter-manage-header-$value" )->text();
}
}
@@ -247,7 +247,7 @@
)
);
- //get user ids of all newsletter owners
+ // get user ids of all newsletter owners
$dbr = wfGetDB( DB_SLAVE );
$res = $dbr->select(
'nl_newsletters',
@@ -256,7 +256,7 @@
__METHOD__,
array( 'DISTINCT' )
);
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
self::$newsletterOwners[$row->nl_id] =
$row->nl_owner_id;
}
@@ -268,7 +268,7 @@
switch( $field ) {
case 'newsletter_id':
- if( $previous === $value ){
+ if ( $previous === $value ) {
return null;
} else {
@@ -281,7 +281,7 @@
array()
);
$newsletterName = null;
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
$newsletterName =
$row->nl_name;
}
$previous = $value;
diff --git a/includes/SpecialNewsletters.php b/includes/SpecialNewsletters.php
index a98796e..1bd6de0 100644
--- a/includes/SpecialNewsletters.php
+++ b/includes/SpecialNewsletters.php
@@ -50,7 +50,7 @@
array( 'subscriber_id' => $id ),
__METHOD__
);
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
self::$subscribedNewsletterId[] = $row->newsletter_id;
}
@@ -61,7 +61,7 @@
__METHOD__
);
- foreach( $resl as $row ){
+ foreach ( $resl as $row ) {
$result = $dbr->selectRowCount(
'nl_subscriptions',
array(),
@@ -83,7 +83,7 @@
static $headers = null;
if ( is_null( $headers ) ) {
$headers = array();
- foreach( SpecialNewsletters::$fields as $field =>
$property ) {
+ foreach ( SpecialNewsletters::$fields as $field =>
$property ) {
$headers[$field] = $this->msg(
"newsletter-header-$property" )->text();
}
}
@@ -116,20 +116,20 @@
);
$mainPageId = '';
- foreach( $res as $row ) {
+ foreach ( $res as $row ) {
$mainPageId = $row->nl_main_page_id;
}
$url = $mainPageId ? Title::newFromID(
$mainPageId )->getFullURL() : "#";
- return '<a href="' . $url . '">'. $value .
'</a>';
+ return '<a href="' . $url . '">' . $value .
'</a>';
case 'nl_desc': return $value;
case 'subscriber_count':
return HTML::element( 'input',
array(
'type' => 'textbox',
'readonly' => 'true',
- 'id' =>
'newsletter-'.$this->mCurrentRow->nl_id,
+ 'id' => 'newsletter-' .
$this->mCurrentRow->nl_id,
'value' => in_array(
$this->mCurrentRow->nl_id, SpecialNewsletters::$allSubscribedNewsletterId ) ?
SpecialNewsletters::$subscriberCount[$this->mCurrentRow->nl_id] : 0,
@@ -144,7 +144,7 @@
'checked' => in_array(
$this->mCurrentRow->nl_id,
SpecialNewsletters::$subscribedNewsletterId ) ? true : false,
)
- ).$this->msg(
'newsletter-subscribe-button-label' );
+ ) . $this->msg(
'newsletter-subscribe-button-label' );
$radioUnSubscribe = Html::element(
'input',
array(
@@ -154,7 +154,7 @@
'checked' => in_array(
$this->mCurrentRow->nl_id,
SpecialNewsletters::$subscribedNewsletterId ) ? false : true,
)
- ).$this->msg(
'newsletter-unsubscribe-button-label' );
+ ) . $this->msg(
'newsletter-unsubscribe-button-label' );
return $radioSubscribe . $radioUnSubscribe;
}
--
To view, visit https://gerrit.wikimedia.org/r/234010
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia47055927994dda489f4f8177c53d92f7af5f51a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
