jenkins-bot has submitted this change and it was merged.
Change subject: UserManager: move to specialpage and add permision
......................................................................
UserManager: move to specialpage and add permision
move extension registry to extension.json
Patch Set 2: rebase
Change-Id: I864bc307937dda47b1d3395e62b7aff606cb0d93
---
M UserManager/UserManager.class.php
M UserManager/UserManager.setup.php
A UserManager/extension.json
M UserManager/i18n/de.json
M UserManager/i18n/en.json
M UserManager/i18n/qqq.json
A UserManager/includes/specials/SpecialUserManager.alias.php
A UserManager/includes/specials/SpecialUserManager.class.php
8 files changed, 120 insertions(+), 50 deletions(-)
Approvals:
Mglaser: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserManager/UserManager.class.php
b/UserManager/UserManager.class.php
index d28d93f..c3f427d 100644
--- a/UserManager/UserManager.class.php
+++ b/UserManager/UserManager.class.php
@@ -45,16 +45,6 @@
// Base settings
$this->mExtensionFile = __FILE__;
$this->mExtensionType = EXTTYPE::VARIABLE;
- $this->mInfo = array(
- EXTINFO::NAME => 'UserManager',
- EXTINFO::DESCRIPTION => 'bs-usermanager-desc',
- EXTINFO::AUTHOR => 'Markus Glaser, Stephan Muggli',
- EXTINFO::VERSION => 'default',
- EXTINFO::STATUS => 'default',
- EXTINFO::PACKAGE => 'default',
- EXTINFO::URL =>
'https://help.bluespice.com/index.php/UserManager',
- EXTINFO::DEPS => array( 'bluespice' => '2.22.0' )
- );
WikiAdmin::registerModule( 'UserManager', array(
'image' =>
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_usermanagement_v1.png',
@@ -65,6 +55,10 @@
wfProfileOut( 'BS::'.__METHOD__ );
}
+ protected function initExt() {
+ $this->mCore->registerPermission(
'usermanager-viewspecialpage', array( 'sysop' ), array( 'type' => 'global' ) );
+ }
+
/**
* Adds an user
* @param string $sUserName
diff --git a/UserManager/UserManager.setup.php
b/UserManager/UserManager.setup.php
index 8d977e1..e8164f9 100644
--- a/UserManager/UserManager.setup.php
+++ b/UserManager/UserManager.setup.php
@@ -1,38 +1,2 @@
<?php
-
-BsExtensionManager::registerExtension('UserManager',
BsRUNLEVEL::FULL|BsRUNLEVEL::REMOTE, BsACTION::LOAD_SPECIALPAGE);
-
-$wgAutoloadClasses['UserManager'] = __DIR__ . '/UserManager.class.php';
-$wgAutoloadClasses['BSApiTasksUserManager'] = __DIR__ .
'/includes/api/BSApiTasksUserManager.php';
-
-$wgMessagesDirs['UserManager'] = __DIR__ . '/i18n';
-
-$wgResourceModules['ext.bluespice.userManager'] = array(
- 'scripts' => 'bluespice.userManager.js',
- 'dependencies' => 'ext.bluespice.extjs',
- 'messages' => array(
- 'bs-usermanager-headerusername',
- 'bs-usermanager-headerrealname',
- 'bs-usermanager-headeremail',
- 'bs-usermanager-headergroups',
- 'bs-usermanager-titleadduser',
- 'bs-usermanager-titleeditdetails',
- 'bs-usermanager-labelnewpassword',
- 'bs-usermanager-labelpasswordcheck',
- 'bs-usermanager-headergroups',
- 'bs-usermanager-titledeleteuser',
- 'bs-usermanager-confirmdeleteuser',
- 'bs-usermanager-groups-more',
- 'bs-usermanager-no-self-desysop',
- 'bs-usermanager-headerenabled',
- 'bs-usermanager-endisable',
- 'bs-usermanager-confirmdisableuser',
- 'bs-usermanager-confirmenableuser',
- 'bs-usermanager-titledisableuser',
- 'bs-usermanager-titleenableuser'
- ),
- 'localBasePath' => __DIR__ . '/resources',
- 'remoteExtPath' => 'BlueSpiceExtensions/UserManager/resources'
-);
-
-$wgAPIModules['bs-usermanager-tasks'] = 'BSApiTasksUserManager';
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/UserManager' );
diff --git a/UserManager/extension.json b/UserManager/extension.json
new file mode 100644
index 0000000..e7d0b20
--- /dev/null
+++ b/UserManager/extension.json
@@ -0,0 +1,73 @@
+{
+ "manifest_version": "0.0.1",
+ "name": "UserManager",
+ "author": [
+ "Sebastian Ulbricht",
+ "Stephan Muggli",
+ "Markus Glaser",
+ "Leonid Verhovskij"
+ ],
+ "version": "2.27.0",
+ "url": "https://www.mediawiki.org/wiki/Extension:UserManager";,
+ "description": "The user manager facilitates the user management",
+ "descriptionmsg": "bs-usermanager-desc",
+ "license-name": "GPL-2.0+",
+ "type": "bluespice",
+ "bsgExtensions": {
+ "UserManager": {
+ "className": "UserManager",
+ "extPath": "/BlueSpiceExtensions/UserManager"
+ }
+ },
+ "SpecialPages": {
+ "UserManager": "SpecialUserManager"
+ },
+ "ExtensionMessagesFiles": {
+ "UserManagerAlias":
"includes/specials/SpecialUserManager.alias.php"
+ },
+ "APIModules": {
+ "bs-usermanager-tasks": "BSApiTasksUserManager"
+ },
+ "MessagesDirs": {
+ "UserManager": [
+ "i18n"
+ ]
+ },
+ "AutoloadClasses": {
+ "UserManager": "UserManager.class.php",
+ "BSApiTasksUserManager":
"includes/api/BSApiTasksUserManager.php",
+ "SpecialUserManager":
"includes/specials/SpecialUserManager.class.php"
+ },
+ "ResourceModules": {
+ "ext.bluespice.userManager": {
+ "scripts": "bluespice.userManager.js",
+ "dependencies": "ext.bluespice.extjs",
+ "messages": [
+ "bs-usermanager-headerusername",
+ "bs-usermanager-headerrealname",
+ "bs-usermanager-headeremail",
+ "bs-usermanager-headergroups",
+ "bs-usermanager-titleadduser",
+ "bs-usermanager-titleeditdetails",
+ "bs-usermanager-labelnewpassword",
+ "bs-usermanager-labelpasswordcheck",
+ "bs-usermanager-headergroups",
+ "bs-usermanager-titledeleteuser",
+ "bs-usermanager-confirmdeleteuser",
+ "bs-usermanager-groups-more",
+ "bs-usermanager-no-self-desysop",
+ "bs-usermanager-headerenabled",
+ "bs-usermanager-endisable",
+ "bs-usermanager-confirmdisableuser",
+ "bs-usermanager-confirmenableuser",
+ "bs-usermanager-titledisableuser",
+ "bs-usermanager-titleenableuser"
+ ]
+ }
+ },
+ "ResourceFileModulePaths": {
+ "localBasePath": "resources",
+ "remoteExtPath": "BlueSpiceExtensions/UserManager/resources"
+ },
+ "manifest_version": 1
+}
diff --git a/UserManager/i18n/de.json b/UserManager/i18n/de.json
index 92f0c99..87eb6ab 100644
--- a/UserManager/i18n/de.json
+++ b/UserManager/i18n/de.json
@@ -44,5 +44,7 @@
"bs-usermanager-confirmdisableuser": "Möchtest du wirklich
{{GENDER:$1|den Benutzer|die Benutzerin}} $1 deaktivieren?",
"bs-usermanager-confirmenableuser": "Möchtest du wirklich
{{GENDER:$1|den Benutzer|die Benutzerin}} $1 aktivieren?",
"bs-usermanager-titledisableuser": "Benutzer deaktivieren",
- "bs-usermanager-titleenableuser": "Benutzer aktivieren"
+ "bs-usermanager-titleenableuser": "Benutzer aktivieren",
+ "usermanager": "Benutzerverwaltung",
+ "action-usermanager-viewspecialpage": "betrachten der Spezialseite
\"Benutzerverwaltung\""
}
diff --git a/UserManager/i18n/en.json b/UserManager/i18n/en.json
index 1cd4ada..16e7716 100644
--- a/UserManager/i18n/en.json
+++ b/UserManager/i18n/en.json
@@ -43,5 +43,7 @@
"bs-usermanager-confirmdisableuser": "Do you really want to disable
{{GENDER:$1|the user}} $1?",
"bs-usermanager-confirmenableuser": "Do you really want to enable
{{GENDER:$1|the user}} $1?",
"bs-usermanager-titledisableuser": "Disable user",
- "bs-usermanager-titleenableuser": "Enable user"
+ "bs-usermanager-titleenableuser": "Enable user",
+ "usermanager": "User manager",
+ "action-usermanager-viewspecialpage": "view specialpage \"User
manager\""
}
diff --git a/UserManager/i18n/qqq.json b/UserManager/i18n/qqq.json
index 02db341..f294e61 100644
--- a/UserManager/i18n/qqq.json
+++ b/UserManager/i18n/qqq.json
@@ -44,5 +44,7 @@
"bs-usermanager-confirmdisableuser": "Text in confirmation dialoge for
disabling user.\n\n* $1 is the username of the user affected by the action -
use for GENDER distinction",
"bs-usermanager-confirmenableuser": "Text in confirmation dialoge for
enabling user.\n\n* $1 is the username of the user affected by the action - use
for GENDER distinction",
"bs-usermanager-titledisableuser": "Window title for disable user",
- "bs-usermanager-titleenableuser": "Window title for enable user"
+ "bs-usermanager-titleenableuser": "Window title for enable user",
+ "usermanager": "Page title for special page of user manager",
+ "action-usermanager-viewspecialpage": "Label for denied page access,
with name of special page"
}
diff --git a/UserManager/includes/specials/SpecialUserManager.alias.php
b/UserManager/includes/specials/SpecialUserManager.alias.php
new file mode 100644
index 0000000..e43e6b0
--- /dev/null
+++ b/UserManager/includes/specials/SpecialUserManager.alias.php
@@ -0,0 +1,12 @@
+<?php
+$specialPageAliases = array();
+
+/** English */
+$specialPageAliases['en'] = array(
+ 'UserManager' => array( 'UserManager', 'User Manager' ),
+);
+
+/** German (Deutsch) */
+$specialPageAliases['de'] = array(
+ 'UserManager' => array( 'UserManager', 'User Manager',
'Benutzerverwaltung', 'Benutzer Verwaltung' ),
+);
diff --git a/UserManager/includes/specials/SpecialUserManager.class.php
b/UserManager/includes/specials/SpecialUserManager.class.php
new file mode 100644
index 0000000..e3bd91a
--- /dev/null
+++ b/UserManager/includes/specials/SpecialUserManager.class.php
@@ -0,0 +1,21 @@
+<?php
+
+class SpecialUserManager extends BsSpecialPage {
+
+ public function __construct() {
+ parent::__construct( 'UserManager',
'usermanager-viewspecialpage' );
+ }
+
+ /**
+ *
+ * @global OutputPage $this->getOutput()
+ * @param type $sParameter
+ * @return type
+ */
+ public function execute( $sParameter ) {
+ parent::execute( $sParameter );
+ $this->getOutput()->addModules( 'ext.bluespice.userManager' );
+ $this->getOutput()->addHTML( '<div
id="bs-usermanager-grid"></div>' );
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/306919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I864bc307937dda47b1d3395e62b7aff606cb0d93
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Ljonka <[email protected]>
Gerrit-Reviewer: Dvogel hallowelt <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
