Robert Vogel has submitted this change and it was merged.
Change subject: Fixed autoloader issue with Common Ajax Interface
......................................................................
Fixed autoloader issue with Common Ajax Interface
Renamed some files
Added mapping to autoloader
Change-Id: Ib19b2fb216b0a01f7f697506a578ff342c5f2356
---
M includes/AutoLoader.php
R includes/CAContext.php
M includes/CAResponse.php
3 files changed, 49 insertions(+), 43 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 7c32e12..84196fb 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -36,7 +36,9 @@
$GLOBALS['wgAutoloadClasses']['BsCommonAJAXInterface'] =
__DIR__."/CommonAJAXInterface.php";
$GLOBALS['wgAutoloadClasses']['BsCAI'] = __DIR__."/CommonAJAXInterface.php";
$GLOBALS['wgAutoloadClasses']['BsCAContext'] = __DIR__."/CAContext.php";
+$GLOBALS['wgAutoloadClasses']['BsCAIContext'] = __DIR__."/CAContext.php";
$GLOBALS['wgAutoloadClasses']['BsCAResponse'] = __DIR__."/CAResponse.php";
+$GLOBALS['wgAutoloadClasses']['BsCAIResponse'] = __DIR__."/CAResponse.php";
$GLOBALS['wgAutoloadClasses']['BsExtJSStoreParams'] =
__DIR__."/ExtJSStoreParams.php";
//adapter
diff --git a/includes/CAIContext.php b/includes/CAContext.php
similarity index 89%
rename from includes/CAIContext.php
rename to includes/CAContext.php
index 2d991e4..8bd3dc7 100644
--- a/includes/CAIContext.php
+++ b/includes/CAContext.php
@@ -1,38 +1,38 @@
<?php
-class BsCAContext {
-
+class BsCAIContext {
+
/**
*
- * @var Title
+ * @var Title
*/
protected $oTitle = null;
-
+
/**
*
- * @var Revision
+ * @var Revision
*/
protected $oRevision = null;
-
+
/**
*
- * @var SpecialPage
+ * @var SpecialPage
*/
protected $oSpecialPage = null;
-
+
/**
*
- * @var Title
+ * @var Title
*/
protected $oRelevantPage = null;
-
+
/**
- *
- * @return \self
+ *
+ * @return BsCAContext
*/
public static function newFromRequest(){
$oRequest = RequestContext::getMain()->getRequest();
-
+
//TODO: Lazy init?
$aRequestParams = array(
'wgAction' =>
$oRequest->getVal('wgAction'),
@@ -47,7 +47,7 @@
'wgRelevantPageName' =>
$oRequest->getVal('wgRelevantPageName'),
'wgTitle' => $oRequest->getVal('wgTitle')
);
-
+
$aParams = array(
'title' =>
Title::newFromID($aRequestParams['wgArticleId']),
'revision' =>
Revision::newFromId($aRequestParams['wgCurRevisionId']),
@@ -57,43 +57,45 @@
return new self( $aParams );
}
-
+
private function __construct( $aParams ) {
$this->oTitle = $aParams['title'];
$this->oRevision = $aParams['revision'];
$this->oSpecialPage = $aParams['specialpage'];
- $this->oRelevantPage = $aParams['relevantpage '];
+ $this->oRelevantPage = $aParams['relevantpage'];
}
-
+
/**
- *
+ *
* @return Title
*/
public function getTitle() {
return $this->oTitle;
}
-
+
/**
- *
+ *
* @return boolean
*/
public function isSpecialPage() {
return $this->oTitle->isSpecialPage();
}
-
+
/**
- *
+ *
* @return Revision
*/
public function getRevision() {
return $this->oRevision;
}
-
+
/**
- *
+ *
* @return SpecialPage
*/
public function getSpecialPage(){
return $this->oSpecialPage;
}
-}
\ No newline at end of file
+}
+
+class BsCAContext extends BsCAIContext {}
\ No newline at end of file
diff --git a/includes/CAResponse.php b/includes/CAResponse.php
index eb28aac..c91c9a9 100644
--- a/includes/CAResponse.php
+++ b/includes/CAResponse.php
@@ -1,13 +1,13 @@
<?php
-class BsCAResponse extends AjaxResponse {
-
+class BsCAIResponse extends AjaxResponse {
+
protected $mPayload = null;
protected $bSuccess = true;
protected $sMessage = '';
/**
- *
+ *
* @param string $sPermission
* @param BsCAContext $oCAContext
* @return BsCAResponse
@@ -20,37 +20,37 @@
else {
$bUserCan =
RequestContext::getMain()->getTitle()->userCan( $sPermission );
}
-
+
$bSuccess = true;
$sMessage = '';
-
+
if( $bUserCan == false ) {
$bSuccess = false;
$sMessage = 'permissionserrors';
}
-
+
$oResponse = new self();
$oResponse->setSuccess( $bSuccess );
$oResponse->setMessage( $sMessage );
return $oResponse;
}
-
+
public function __construct( $bSuccess = true, $mPayload = '',
$sMessage = '' ) {
parent::__construct( null );
//HINT: http://www.ietf.org/rfc/rfc4627.txt
$this->mContentType = 'application/json';
-
+
$this->bSuccess = $bSuccess;
$this->mPayload = $mPayload;
$this->sMessage = $sMessage;
}
-
+
public function setPayload( $mPayload ) {
$this->mPayload = $mPayload;
}
-
+
public function setSuccess( $bSuccess ) {
if( $bSuccess ) {
$this->setResponseCode( '200 OK' );
@@ -60,29 +60,31 @@
}
$this->bSuccess = $bSuccess;
}
-
+
public function isSuccess() {
return $this->bSuccess;
}
-
+
public function setMessage( $sKeyOrMessage, $bNoKey = false ) {
- if( $bNoKey ) {
+ if( $bNoKey || empty($bNoKey) ) {
$this->sMessage = $sKeyOrMessage;
}
else {
$this->sMessage = wfMessage( $sKeyOrMessage )->plain();
}
}
-
+
public function printText() {
$this->addText( FormatJson::encode(
- array(
- 'success' => $this->bSuccess,
- 'message' => $this->sMessage,
- 'payload' => $this->mPayload,
+ array(
+ 'success' => $this->bSuccess,
+ 'message' => $this->sMessage,
+ 'payload' => $this->mPayload,
)
)
);
parent::printText();
}
}
+
+class BsCAResponse extends BsCAIResponse {}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/143856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib19b2fb216b0a01f7f697506a578ff342c5f2356
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pigpen <reym...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Smuggli <mug...@hallowelt.biz>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
