http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71832
Revision: 71832
Author: kaldari
Date: 2010-08-28 00:38:28 +0000 (Sat, 28 Aug 2010)
Log Message:
-----------
moving wasPosted() test inside notice existance test
Modified Paths:
--------------
trunk/extensions/CentralNotice/SpecialCentralNotice.php
Modified: trunk/extensions/CentralNotice/SpecialCentralNotice.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-28
00:37:48 UTC (rev 71831)
+++ trunk/extensions/CentralNotice/SpecialCentralNotice.php 2010-08-28
00:38:28 UTC (rev 71832)
@@ -573,65 +573,61 @@
function listNoticeDetail( $notice ) {
global $wgOut, $wgRequest, $wgUser;
-
- if ( $wgRequest->wasPosted() ) {
+
+ // Make sure notice exists
+ if ( !$this->noticeExists( $notice ) ) {
+ $wgOut->wrapWikiMsg( "<div
class='cn-error'>\n$1\n</div>", 'centralnotice-notice-doesnt-exist' );
+ } else {
+
+ if ( $wgRequest->wasPosted() ) {
+
+ // Check authentication token
+ if ( $wgUser->matchEditToken(
$wgRequest->getVal( 'authtoken' ) ) ) {
+
+ // Handle adding of banners to the
campaign
+ $templatesToAdd = $wgRequest->getArray(
'addTemplates' );
+ if ( $templatesToAdd ) {
+ $weight = $wgRequest->getArray(
'weight' );
+ foreach ( $templatesToAdd as
$templateName ) {
+ $templateId =
$this->getTemplateId( $templateName );
+ $this->addTemplateTo(
$notice, $templateName, $weight[$templateId] );
+ }
+ }
- // Check authentication token
- if ( $wgUser->matchEditToken( $wgRequest->getVal(
'authtoken' ) ) ) {
-
- // Handle adding of banners to the campaign
- $templatesToAdd = $wgRequest->getArray(
'addTemplates' );
- if ( $templatesToAdd ) {
- $weight = $wgRequest->getArray(
'weight' );
- foreach ( $templatesToAdd as
$templateName ) {
- $templateId =
$this->getTemplateId( $templateName );
- $this->addTemplateTo( $notice,
$templateName, $weight[$templateId] );
+ // Handle removing of banners from the
campaign
+ $templateToRemove =
$wgRequest->getArray( 'removeTemplates' );
+ if ( $templateToRemove ) {
+ foreach ( $templateToRemove as
$template ) {
+
$this->removeTemplateFor( $notice, $template );
+ }
}
- }
+
+ // Handle weight changes
+ $updatedWeights = $wgRequest->getArray(
'weight' );
+ if ( $updatedWeights ) {
+ foreach ( $updatedWeights as
$templateId => $weight ) {
+ $this->updateWeight(
$notice, $templateId, $weight );
+ }
+ }
- // Handle removing of banners from the campaign
- $templateToRemove = $wgRequest->getArray(
'removeTemplates' );
- if ( $templateToRemove ) {
- foreach ( $templateToRemove as
$template ) {
- $this->removeTemplateFor(
$notice, $template );
+ // Handle new project name
+ $projectName = $wgRequest->getVal(
'project_name' );
+ if ( $projectName ) {
+ $this->updateProjectName (
$notice, $projectName );
}
- }
-
- // Handle weight changes
- $updatedWeights = $wgRequest->getArray(
'weight' );
- if ( $updatedWeights ) {
- foreach ( $updatedWeights as
$templateId => $weight ) {
- $this->updateWeight( $notice,
$templateId, $weight );
+
+ // Handle new project languages
+ $projectLangs = $wgRequest->getArray(
'project_languages' );
+ if ( $projectLangs ) {
+ $this->updateProjectLanguages(
$notice, $projectLangs );
}
+
+ } else {
+ $wgOut->wrapWikiMsg( "<div
class='cn-error'>\n$1\n</div>", 'sessionfailure' );
}
-
- // Handle new project name
- $projectName = $wgRequest->getVal(
'project_name' );
- if ( $projectName ) {
- $this->updateProjectName ( $notice,
$projectName );
- }
-
- // Handle new project languages
- $projectLangs = $wgRequest->getArray(
'project_languages' );
- if ( $projectLangs ) {
- $this->updateProjectLanguages( $notice,
$projectLangs );
- }
-
- $wgOut->redirect(
$this->getTitle()->getLocalUrl( "method=listNoticeDetail¬ice=$notice" ) );
- return;
- } else {
- $wgOut->wrapWikiMsg( "<div
class='cn-error'>\n$1\n</div>", 'sessionfailure' );
}
-
- }
- $noticeId = $this->getNoticeId( $notice );
-
- // Make sure notice exists
- if ( !$noticeId ) {
- $wgOut->wrapWikiMsg( "<div
class='cn-error'>\n$1\n</div>", 'centralnotice-notice-doesnt-exist' );
- } else {
$htmlOut = '';
// Begin Campaign detail fieldset
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
