from:"Robert Vogel $Code Review$"

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Remove remaining sub-extensions

2018-01-23 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405853 )

Change subject: Remove remaining sub-extensions
..

Remove remaining sub-extensions

T184583

Change-Id: If61098635df6a444c403410bf0869b199108be61
---
D BlueSpiceExtensions.class.php
D BlueSpiceExtensions.default.php
M BlueSpiceExtensions.php
D Flexiskin/.gitignore
D Flexiskin/COPYING
D Flexiskin/Flexiskin.class.php
D Flexiskin/Flexiskin.setup.php
D Flexiskin/doc/Hooks.txt
D Flexiskin/doc/TODO
D Flexiskin/extension.json
D Flexiskin/i18n/ar.json
D Flexiskin/i18n/ast.json
D Flexiskin/i18n/atj.json
D Flexiskin/i18n/av.json
D Flexiskin/i18n/ba.json
D Flexiskin/i18n/bcc.json
D Flexiskin/i18n/be.json
D Flexiskin/i18n/bg.json
D Flexiskin/i18n/bgn.json
D Flexiskin/i18n/bn.json
D Flexiskin/i18n/br.json
D Flexiskin/i18n/bs.json
D Flexiskin/i18n/ce.json
D Flexiskin/i18n/ckb.json
D Flexiskin/i18n/cs.json
D Flexiskin/i18n/cv.json
D Flexiskin/i18n/de-formal.json
D Flexiskin/i18n/de.json
D Flexiskin/i18n/diq.json
D Flexiskin/i18n/el.json
D Flexiskin/i18n/en-gb.json
D Flexiskin/i18n/en.json
D Flexiskin/i18n/eo.json
D Flexiskin/i18n/es.json
D Flexiskin/i18n/eu.json
D Flexiskin/i18n/fa.json
D Flexiskin/i18n/fr.json
D Flexiskin/i18n/fy.json
D Flexiskin/i18n/gl.json
D Flexiskin/i18n/he.json
D Flexiskin/i18n/hi.json
D Flexiskin/i18n/hu.json
D Flexiskin/i18n/inh.json
D Flexiskin/i18n/it.json
D Flexiskin/i18n/ja.json
D Flexiskin/i18n/ko.json
D Flexiskin/i18n/ksh.json
D Flexiskin/i18n/ku-latn.json
D Flexiskin/i18n/lb.json
D Flexiskin/i18n/lki.json
D Flexiskin/i18n/lt.json
D Flexiskin/i18n/lv.json
D Flexiskin/i18n/lzh.json
D Flexiskin/i18n/mk.json
D Flexiskin/i18n/mwl.json
D Flexiskin/i18n/my.json
D Flexiskin/i18n/nl.json
D Flexiskin/i18n/oc.json
D Flexiskin/i18n/pa.json
D Flexiskin/i18n/pam.json
D Flexiskin/i18n/pl.json
D Flexiskin/i18n/pt-br.json
D Flexiskin/i18n/pt.json
D Flexiskin/i18n/qqq.json
D Flexiskin/i18n/roa-tara.json
D Flexiskin/i18n/ru.json
D Flexiskin/i18n/sco.json
D Flexiskin/i18n/sd.json
D Flexiskin/i18n/sl.json
D Flexiskin/i18n/sr-ec.json
D Flexiskin/i18n/sr-el.json
D Flexiskin/i18n/sv.json
D Flexiskin/i18n/ta.json
D Flexiskin/i18n/tcy.json
D Flexiskin/i18n/tg-cyrl.json
D Flexiskin/i18n/tr.json
D Flexiskin/i18n/uk.json
D Flexiskin/i18n/zh-hans.json
D Flexiskin/i18n/zh-hant.json
D Flexiskin/includes/FlexiskinFormatter.class.php
D Flexiskin/includes/api/BSApiFlexiskinStore.php
D Flexiskin/includes/api/BSApiFlexiskinTasks.php
D Flexiskin/includes/api/BSApiFlexiskinUpload.php
D Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
D Flexiskin/includes/resourceloader/ResourceLoaderFlexiskinModule.php
D Flexiskin/includes/resourceloader/ResourceLoaderFlexiskinPreviewModule.php
D Flexiskin/includes/specials/SpecialFlexiskin.alias.php
D Flexiskin/includes/specials/SpecialFlexiskin.class.php
D Flexiskin/languages/Flexiskin.alias.php
D Flexiskin/resources/BS.Flexiskin/AddSkin.js
D Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
D Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js
D Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js
D Flexiskin/resources/BS.Flexiskin/Panel.js
D Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
D Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
D Flexiskin/resources/BS.Flexiskin/UploadFile.js
D Flexiskin/resources/bluespice.flexiskin.js
D Flexiskin/resources/bluespice.flexiskin.less
D Flexiskin/src/Data/AvailableConfigs.php
D Flexiskin/src/PreviewResourceModuleRegistrant.php
D Flexiskin/tests/phpunit/BSApiFlexiskinStoreTest.php
D Flexiskin/tests/phpunit/BSApiFlexiskinTasksTest.php
D Flexiskin/tests/phpunit/BSApiFlexiskinUploadStoreTest.php
D Flexiskin/tests/phpunit/BSApiFlexiskinUploadTest.php
D Flexiskin/tests/phpunit/data/dummy.PNG
D Flexiskin/tests/phpunit/data/test.PNG
A README.md
D examples/BoilerPlate/BoilerPlate.class.php
D examples/BoilerPlate/BoilerPlate.setup.php
D examples/BoilerPlate/README.md
D examples/BoilerPlate/doc/hooks.txt
D examples/BoilerPlate/i18n/README.md
D examples/BoilerPlate/i18n/en.json
D examples/BoilerPlate/i18n/qqq.json
D examples/BoilerPlate/includes/README.md
D examples/BoilerPlate/resources/README.md
D examples/BoilerPlate/resources/bluespice.boilerPlate.js
D examples/BoilerPlate/resources/bluespice.boilerPlate.less
D examples/COPYING
D examples/README.md
121 files changed, 12 insertions(+), 6,628 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/53/405853/1


-- 
To view, visit https://gerrit.wikimedia.org/r/405853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If61098635df6a444c403410bf0869b199108be61
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405852 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I0600c4cd341377ac576ff79034d7a5820dc5bdff
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUserManager 
refs/changes/52/405852/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index eea1cbd..8057229 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0600c4cd341377ac576ff79034d7a5820dc5bdff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405851 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I6830e35cbf4de1847ad0c3334d44d8a9e899aab5
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePermissionManager
 refs/changes/51/405851/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index 73e8899..f9e452f 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6830e35cbf4de1847ad0c3334d44d8a9e899aab5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceGroupManager[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405850 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I98669162490deb9c54efd9453ed49d144eb4f585
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceGroupManager 
refs/changes/50/405850/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index 4b5c9d0..438ac41 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405850
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98669162490deb9c54efd9453ed49d144eb4f585
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceGroupManager
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405849 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: Ibdd5231603371630d647d4512a82343d9063cfc0
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageTemplates 
refs/changes/49/405849/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index eb099e4..f734020 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibdd5231603371630d647d4512a82343d9063cfc0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageAssignments[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405848 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I10fce59d937e0a400fa529f3aae8c1700d7a4ce3
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageAssignments 
refs/changes/48/405848/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index d302116..3631d2d 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I10fce59d937e0a400fa529f3aae8c1700d7a4ce3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageAssignments
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405847 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I198d62274204d03d2d41b462a625d9334ea927c5
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceNamespaceManager 
refs/changes/47/405847/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index b92348e..f8665b1 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I198d62274204d03d2d41b462a625d9334ea927c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405846 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: I426ac93679b141c530267dabdddec5dba41592f6
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceInterWikiLinks 
refs/changes/46/405846/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index fd27cc0..07bc2e8 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I426ac93679b141c530267dabdddec5dba41592f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Fix IAdminTool return value

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405845 )

Change subject: Fix IAdminTool return value
..

Fix IAdminTool return value

Change-Id: Idc1b6a4b74d50b2ec4fbf0d9683d19bcd69a32af
---
M src/AdminTool.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedSearch 
refs/changes/45/405845/1

diff --git a/src/AdminTool.php b/src/AdminTool.php
index b82f889..d6b9e3c 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -28,6 +28,7 @@
}
 
public function getDataAttributes() {
+   return [];
}
 
public function getPermissions() {

-- 
To view, visit https://gerrit.wikimedia.org/r/405845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc1b6a4b74d50b2ec4fbf0d9683d19bcd69a32af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAbout[master]: Fix namespace issue and IAdminTool interface return values

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405844 )

Change subject: Fix namespace issue and IAdminTool interface return values
..

Fix namespace issue and IAdminTool interface return values

Change-Id: I0843bf2dd21adae50d67f983894eb7d44e995650
---
M extension.json
M src/AdminTool.php
2 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAbout 
refs/changes/44/405844/1

diff --git a/extension.json b/extension.json
index fa7bbd4..69e9789 100644
--- a/extension.json
+++ b/extension.json
@@ -18,10 +18,10 @@
"BlueSpiceAboutAlias": 
"includes/specials/SpecialBlueSpiceAbout.alias.php"
},
"BlueSpiceFoundationAdminToolRegistry": {
-   "bs-bluespiceabout": "BlueSpice\\BlueSpiceAbout\\AdminTool"
+   "bs-bluespiceabout": "BlueSpice\\About\\AdminTool"
},
"AutoloadNamespaces": {
-   "BlueSpice\\BlueSpiceAbout\\" : "src/"
+   "BlueSpice\\About\\" : "src/"
},
"AutoloadClasses": {
"BlueSpiceAbout": "BlueSpiceAbout.class.php",
diff --git a/src/AdminTool.php b/src/AdminTool.php
index 9da1641..9d4e9b0 100644
--- a/src/AdminTool.php
+++ b/src/AdminTool.php
@@ -1,6 +1,6 @@
 https://gerrit.wikimedia.org/r/405844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0843bf2dd21adae50d67f983894eb7d44e995650
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAbout
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceConfigManager[master]: Fix dependency to "WikiAdmin" class

2018-01-22 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405843 )

Change subject: Fix dependency to "WikiAdmin" class
..

Fix dependency to "WikiAdmin" class

WikiAdmin extension is no longer part of BlueSpice distribution.
Dependencies must be removed.

T184583

Change-Id: Ib974d5e434f84ab3bbcfc7ed8bfc117f44a62edc
---
M Preferences.class.php
M extension.json
A src/AdminTool.php
3 files changed, 64 insertions(+), 26 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceConfigManager 
refs/changes/43/405843/1

diff --git a/Preferences.class.php b/Preferences.class.php
index 87bce6b..31b68dd 100644
--- a/Preferences.class.php
+++ b/Preferences.class.php
@@ -30,31 +30,12 @@
  * @filesource
  */
 
-// Last review MRG (01.07.11 13:56)
-
 /**
  * the Preferences class
  * @package BlueSpice_Extensions
  * @subpackage Preferences
  */
 class BsPreferences extends BsExtensionMW {
-
-   public function __construct() {
-   wfProfileIn( 'BS::' . __METHOD__ );
-   // Base settings
-   $this->mExtensionFile = __FILE__;
-   $this->mExtensionType = EXTTYPE::SPECIALPAGE;
-
-   WikiAdmin::registerModule( 'BlueSpicePreferences', [
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_einstellungen_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-bluespicepreferences-label',
-   'iconCls' => 'bs-icon-wrench',
-   'permissions' => [ 
'bluespicepreferences-viewspecialpage' ],
-   ]);
-
-   wfProfileOut( 'BS::' . __METHOD__ );
-   }
 
protected function initExt() {
$this->mCore->registerPermission( 
'bluespicepreferences-viewspecialpage', array( 'sysop' ), array( 'type' => 
'global' ) );
diff --git a/extension.json b/extension.json
index da38667..2c25937 100644
--- a/extension.json
+++ b/extension.json
@@ -7,22 +7,38 @@
"Stephan Muggli"
],
"descriptionmsg": "bs-preferences-desc",
-   "license-name": "GPL-2.0-or-later",
+   "license-name": "GPL-3.0-only",
"type": "bluespice",
-   "bsgExtensions": {
-   "BlueSpiceConfigManager": {
-   "className": "BsPreferences",
-   "extPath": "/BlueSpiceConfigManager"
+   "attributes": {
+   "BlueSpiceFoundation": {
+   "Extensions": {
+   "BlueSpiceConfigManager": {
+   "className": "BsPreferences",
+   "extPath": "/BlueSpiceConfigManager"
+   }
+   },
+   "AdminToolRegistry": {
+   "bs-config-manager": 
"BlueSpice\\ConfigManager\\AdminTool"
+   }
+   }
+   },
+   "requires": {
+   "MediaWiki": ">= 1.31.0",
+   "extensions": {
+   "BlueSpiceFoundation": "*"
}
},
"MessagesDirs": {
-   "Preferences": [
+   "BlueSpiceConfigManager": [
"i18n"
]
},
"AutoloadClasses": {
"BsPreferences": "Preferences.class.php",
"SpecialBlueSpicePreferences": 
"includes/specials/SpecialBlueSpicePreferences.php"
+   },
+   "AutoloadNamespaces": {
+   "BlueSpice\\ConfigManager\\" : "src/"
},
"ExtensionMessagesFiles": {
"BlueSpicePreferencesAlias": 
"includes/specials/SpecialBlueSpicePreferences.alias.php"
@@ -45,6 +61,6 @@
"Hooks": {
"BeforePageDisplay": "BsPreferences::onBeforePageDisplay"
},
-   "manifest_version": 1,
+   "manifest_version": 2,
"load_composer_autoloader" : true
 }
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..13c74c1
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,41 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-bluespicepreferences-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-bluespicepreferences-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-wrench'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   return [];
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'bluespicepreferences-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[master]: Merge "Fix 'Adding translation overrides exisiting ones'" fr...

2018-01-21 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405677 )

Change subject: Merge "Fix 'Adding translation overrides exisiting ones'" from 
REL1_27
..

Merge "Fix 'Adding translation overrides exisiting ones'" from REL1_27

Change-Id: I5298b76ac2534c311bbd73245908a31a02233275
---
M resources/ext.mlm.js
M src/Api/Tasks.php
2 files changed, 81 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager 
refs/changes/77/405677/1

diff --git a/resources/ext.mlm.js b/resources/ext.mlm.js
index d6e456e..094138a 100644
--- a/resources/ext.mlm.js
+++ b/resources/ext.mlm.js
@@ -53,7 +53,8 @@
mw.mlm.dialog.static.actions = [{
action: 'save',
label: mw.message( 'mlm-input-label-save' ).plain(),
-   flags: [ 'primary', 'progressive' ]
+   flags: [ 'primary', 'constructive' ],
+   disabled: true
}, {
action: 'cancel',
label: mw.message( 'mlm-input-label-cancel' ).plain(),
@@ -108,6 +109,7 @@
label: mw.message( 
'mlm-input-label-sourcetitle' ).plain(),
disabled: mw.mlm.srcTitle === '' ? false : true
});
+   this.srcText.on( 'change', this.onSrcTextChange.bind( 
this ) );
 
this.srcSection = new OO.ui.HorizontalLayout( {
items: [
@@ -260,10 +262,44 @@
);
};
 
+   mw.mlm.dialog.prototype.onSrcTextChange = function( value ){
+   var me = this;
+
+   var api = new mw.Api();
+   api.postWithToken( 'csrf', {
+   action: 'mlm-tasks',
+   task: 'get',
+   format: 'json',
+   taskData: JSON.stringify( {
+   srcText: value
+   } )
+   })
+   .done( function( response, jqXHR ) {
+   if( !response.success ) {
+   return;
+   }
+
+   for( var i = 0; i < response.payload.length; 
i++ ) {
+   var translation = response.payload[i];
+   me.updateTranslations( {
+   'lang': translation.lang,
+   'text': translation.text
+   });
+   }
+
+   me.getActions().setAbilities( {
+   save: true
+   });
+   });
+   };
+
mw.mlm.dialog.prototype.onTranslationAdd = function(){
this.updateTranslations( {
'lang': this.translationLang.value,
'text': this.translationText.value
+   });
+   this.getActions().setAbilities( {
+   save: true
});
};
 
@@ -272,6 +308,9 @@
'lang': lang,
'text': ''
}, true);
+   this.getActions().setAbilities( {
+   save: true
+   });
};
 
mw.mlm.dialog.prototype.updateTranslations = function ( 
translation, removeOnly ) {
@@ -345,4 +384,4 @@
 
mw.mlm.factory.register( mw.mlm.dialog );
});
-})( mediaWiki, jQuery );
\ No newline at end of file
+})( mediaWiki, jQuery );
diff --git a/src/Api/Tasks.php b/src/Api/Tasks.php
index 767b923..7ba8666 100644
--- a/src/Api/Tasks.php
+++ b/src/Api/Tasks.php
@@ -22,6 +22,10 @@
'read',
Helper::getConfig()->get( Config::PERMISSION )
],
+   'get' => [
+   'read',
+   Helper::getConfig()->get( Config::PERMISSION )
+   ],
];
}
 
@@ -148,6 +152,37 @@
return $result;
}
 
+   protected function task_get( $taskData, $params ) {
+   $result = $this->makeStandardReturn();
+   $sysLang = Helper::getSystemLanguageCode();
+   $result->message = [];
+   if( empty( $taskData->srcText ) ) {
+

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_23]: VisualEditor: Fix for mail links

2018-01-21 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398855 )

Change subject: VisualEditor: Fix for mail links
..


VisualEditor: Fix for mail links

mailto: links were missed in VisualEditor

Needs cherry-picking to REL1_27

Change-Id: Ieca826365a9a199b165bec7eedca25dd1ac01e77
ERM: #8322
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve



diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js 
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 5ec482a..ad54562 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -586,7 +586,7 @@
}
 
//Also find protocol independent links
-   links = text.match(/\[([^\]]*)(:)?\/\/([^\]]*?)\]/gi);
+   links = text.match(/\[(([^\]]+:)?\/\/|mailto:)[^\]]*\]/gi);
 
if (links) {
for (i = 0; i < links.length; i++) {

-- 
To view, visit https://gerrit.wikimedia.org/r/398855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieca826365a9a199b165bec7eedca25dd1ac01e77
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: ItSpiderman 
Gerrit-Reviewer: ItSpiderman 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Set used tables in unit test

2018-01-21 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405579 )

Change subject: Set used tables in unit test
..


Set used tables in unit test

1) BSApiTasksInterWikiLinksManagerTest::testEditInterWikiLink
MWException: When testing database state, the test cases's needDB()
method should return true. Use @group Database or $this->tablesUsed.

Change-Id: I2d35ccf2c4b6f3373ffc2e223a9dc336f2d46b09
---
M tests/phpunit/BSApiTasksInterWikiLinksManagerTest.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  Thiemo Kreuz (WMDE): Looks good to me, but someone else must approve



diff --git a/tests/phpunit/BSApiTasksInterWikiLinksManagerTest.php 
b/tests/phpunit/BSApiTasksInterWikiLinksManagerTest.php
index 374d599..2b0c00b 100644
--- a/tests/phpunit/BSApiTasksInterWikiLinksManagerTest.php
+++ b/tests/phpunit/BSApiTasksInterWikiLinksManagerTest.php
@@ -8,6 +8,11 @@
  * @group BlueSpiceInterWikiLnksManager
  */
 class BSApiTasksInterWikiLinksManagerTest extends BSApiTasksTestBase {
+   protected function setUp() {
+   parent::setUp();
+   $this->tablesUsed[] = 'interwiki';
+   }
+
protected function getModuleName( ) {
return 'bs-interwikilinks-tasks';
}
@@ -75,4 +80,3 @@
return false;
}
 }
-

-- 
To view, visit https://gerrit.wikimedia.org/r/405579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d35ccf2c4b6f3373ffc2e223a9dc336f2d46b09
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: Fix user blocking

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405304 )

Change subject: Fix user blocking
..

Fix user blocking

It seems the token for 'indefinite' has changed. Or somebody at WMF forgot
so use 'wfIsInfinity'.

Change-Id: Ie16234316f2f9c7cd5f64e476377fcaa749859ff
---
M UserManager.class.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceUserManager 
refs/changes/04/405304/1

diff --git a/UserManager.class.php b/UserManager.class.php
index af3c860..7b6f4c1 100644
--- a/UserManager.class.php
+++ b/UserManager.class.php
@@ -322,7 +322,7 @@
$block->setTarget( $oUser );
$block->setBlocker( $oPerformer );
$block->mReason = wfMessage( 
'bs-usermanager-log-user-disabled', $oUser->getName() )->text();
-   $block->mExpiry = 'indefinite';
+   $block->mExpiry = 'infinity';
$block->prevents( 'createaccount', false );
$block->prevents( 'editownusertalk', false );
$block->prevents( 'sendemail', true );

-- 
To view, visit https://gerrit.wikimedia.org/r/405304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie16234316f2f9c7cd5f64e476377fcaa749859ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Fix "Error code 0" issue

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405299 )

Change subject: Fix "Error code 0" issue
..

Fix "Error code 0" issue

In some cases the returned code is integer "0". Adding the message to the
errors-array then collieds with this index.

Change-Id: I42ba94963208c749c8e82c68c121bbc3271b44ac
---
M includes/api/BSApiTasksBase.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/99/405299/1

diff --git a/includes/api/BSApiTasksBase.php b/includes/api/BSApiTasksBase.php
index 4cfd37a..93e8be5 100644
--- a/includes/api/BSApiTasksBase.php
+++ b/includes/api/BSApiTasksBase.php
@@ -158,6 +158,9 @@
if( $e instanceof DBError ) {
$mCode = 'dberror'; 
//TODO: error code for subtypes like DBQueryError or DBReadOnlyError?
}
+   if ( $mCode === 0 ) {
+   $mCode = 'error-0';
+   }
$oResult->errors[$mCode] = 
$e->getMessage();
$oResult->errors[0]['code'] = 
'unknown error';
}

-- 
To view, visit https://gerrit.wikimedia.org/r/405299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42ba94963208c749c8e82c68c121bbc3271b44ac
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add 'wikiadmin' permission

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405294 )

Change subject: Add 'wikiadmin' permission
..

Add 'wikiadmin' permission

This permission formerly was added by 'BlueSpiceExtensions/WikiAdmin'.
In version 3.0 this extension is no longer available. Still a lot of other
extensions use this permissions, e.g. within the TaskAPIs.

T185199

Change-Id: Iedc3f25e5c1537d280f6c8678a05762a06e81791
---
M extension.json
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/94/405294/1

diff --git a/extension.json b/extension.json
index ad7cb17..59e7dc2 100644
--- a/extension.json
+++ b/extension.json
@@ -56,6 +56,11 @@
"bs-category-treestore": "BSApiCategoryTreeStore",
"bs-watchlist-store": "BlueSpice\\Api\\WatchlistStore"
},
+   "GroupPermissions": {
+   "sysop": {
+   "wikiadmin": true
+   }
+   },
"ResourceModules": {
"ext.bluespice": {
"localBasePath": "resources",

-- 
To view, visit https://gerrit.wikimedia.org/r/405294
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedc3f25e5c1537d280f6c8678a05762a06e81791
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add new ExtensionAttributeBasedRegistry and IRegistry

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405289 )

Change subject: Add new ExtensionAttributeBasedRegistry and IRegistry
..

Add new ExtensionAttributeBasedRegistry and IRegistry

Change-Id: Iff270ba3104a548c91c24fa2ff1ee7f862d7748d
---
A src/ExtensionAttributeBasedRegistry.php
A src/IRegistry.php
2 files changed, 66 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/89/405289/1

diff --git a/src/ExtensionAttributeBasedRegistry.php 
b/src/ExtensionAttributeBasedRegistry.php
new file mode 100644
index 000..c02f30e
--- /dev/null
+++ b/src/ExtensionAttributeBasedRegistry.php
@@ -0,0 +1,52 @@
+attribName = $attribName;
+   $this->extensionRegistry = $extensionRegistry;
+   if( $this->extensionRegistry === null ) {
+   $this->extensionRegistry = 
\ExtensionRegistry::getInstance();
+   }
+   }
+
+   /**
+*
+* @param string $key
+* @param string $default
+* @return string
+*/
+   public function getValue( $key, $default = '' ) {
+   $registry = $this->extensionRegistry->getAttribute( 
$this->attribName );
+   $value = isset( $registry[$key] ) ? $registry[$key] : $default;
+
+   if( is_array( $value ) ) {
+   //Attributes get merged together instead of being 
overwritten,
+   //so just take the last one
+   $value = end( $value );
+   }
+
+   return (string)$value;
+   }
+}
\ No newline at end of file
diff --git a/src/IRegistry.php b/src/IRegistry.php
new file mode 100644
index 000..c92da46
--- /dev/null
+++ b/src/IRegistry.php
@@ -0,0 +1,14 @@
+https://gerrit.wikimedia.org/r/405289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff270ba3104a548c91c24fa2ff1ee7f862d7748d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePagesVisited[master]: Fix hook callback

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405288 )

Change subject: Fix hook callback
..

Fix hook callback

Change-Id: I0ce66690791631dbb051dbbe25880c9be180805a
---
R src/Hook/GetPreferences/AddWidgetSortOdr.php
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePagesVisited 
refs/changes/88/405288/1

diff --git a/src/Hook/GetPreferences/WidgetSortOdr.php 
b/src/Hook/GetPreferences/AddWidgetSortOdr.php
similarity index 100%
rename from src/Hook/GetPreferences/WidgetSortOdr.php
rename to src/Hook/GetPreferences/AddWidgetSortOdr.php

-- 
To view, visit https://gerrit.wikimedia.org/r/405288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ce66690791631dbb051dbbe25880c9be180805a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePagesVisited
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: Add minus-x to composer.json

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403321 )

Change subject: Add minus-x to composer.json
..


Add minus-x to composer.json

Bug: T175794
Change-Id: I9245ecc850e930a80c5c64d123a52ab3e7b54e8e
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 938247c..4e71bc2 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.3.0"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/403321
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9245ecc850e930a80c5c64d123a52ab3e7b54e8e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Phantom42 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: FlexiSkin: Update Path Build on Logo directory interator to ...

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405269 )

Change subject: FlexiSkin: Update Path Build on Logo directory interator to 
prevent lookup error on special data and image paths (non default config)
..

FlexiSkin: Update Path Build on Logo directory interator to prevent lookup 
error on special data and image paths (non default config)

Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
---
M Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/69/405269/1

diff --git a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php 
b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
index bcc2705..68f7f9e 100644
--- a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
+++ b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
@@ -39,7 +39,7 @@
 
$flexiskinFiles = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator(
-   $wgUploadDirectory.'/bluespice/flexiskin/' . 
$sQuery . '/images/',
+   BsFileSystemHelper::getDataDirectory( 
'flexiskin/' . $sQuery . '/images/' ),
( RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS )
)
);
@@ -55,4 +55,4 @@
 
return $aData;
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/405269
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27_dev]: FlexiSkin: Update Path Build on Logo directory interator to ...

2018-01-19 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405268 )

Change subject: FlexiSkin: Update Path Build on Logo directory interator to 
prevent lookup error on special data and image paths (non default config)
..

FlexiSkin: Update Path Build on Logo directory interator to prevent lookup 
error on special data and image paths (non default config)

Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
---
M Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/68/405268/1

diff --git a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php 
b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
index 20b16ec..40b203f 100644
--- a/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
+++ b/Flexiskin/includes/api/BSApiFlexiskinUploadStore.php
@@ -40,7 +40,7 @@
 
$flexiskinFiles = new RecursiveIteratorIterator(
new RecursiveDirectoryIterator(
-   $wgUploadDirectory.'/bluespice/flexiskin/' . 
$sQuery . '/images/',
+   BsFileSystemHelper::getDataDirectory( 
'flexiskin/' . $sQuery . '/images/' ),
( RecursiveIteratorIterator::SELF_FIRST | 
RecursiveDirectoryIterator::SKIP_DOTS )
)
);
@@ -56,4 +56,4 @@
 
return $aData;
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/405268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If0df06552975e481ba79498f5cfee0383286acfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceDashboards[master]: Hook getPrferences: fixed filename and path in extension.json

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404960 )

Change subject: Hook getPrferences: fixed filename and path in extension.json
..


Hook getPrferences: fixed filename and path in extension.json

patch set 2: renamed file

Change-Id: I636b263ea52df4acb70b1ffc6f1ad0592d54c07d
---
M src/Hook/GetPreferences/AddUserDashboardOnLogo.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/src/Hook/GetPreferences/AddUserDashboardOnLogo.php 
b/src/Hook/GetPreferences/AddUserDashboardOnLogo.php
index e65e20c..cd5850b 100644
--- a/src/Hook/GetPreferences/AddUserDashboardOnLogo.php
+++ b/src/Hook/GetPreferences/AddUserDashboardOnLogo.php
@@ -4,7 +4,7 @@
 
 use BlueSpice\Hook\GetPreferences;
 
-class AddModus extends GetPreferences {
+class AddUserDashboardOnLogo extends GetPreferences {
protected function doProcess() {
$this->preferences['bs-dashboards-pref-userdashboardonlogo'] = 
array(
'type' => 'toggle',

-- 
To view, visit https://gerrit.wikimedia.org/r/404960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I636b263ea52df4acb70b1ffc6f1ad0592d54c07d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePagesVisited[master]: Correction for preset DefaultUserOption values in extension....

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404971 )

Change subject: Correction for preset DefaultUserOption values in extension.json
..


Correction for preset DefaultUserOption values in extension.json

Change-Id: I3d8ffd5521fe5d4ae840c5bd1d8c58415c80989b
---
M extension.json
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 21a4548..3d7f768 100644
--- a/extension.json
+++ b/extension.json
@@ -21,9 +21,9 @@
]
},
"DefaultUserOptions": {
-   "bs-pagesvisited-pref-widgetlimit": "int",
-   "bs-pagesvisited-pref-widgetns": "multiselectex",
-   "bs-pagesvisited-pref-widgetsortodr": "select"
+   "bs-pagesvisited-pref-widgetlimit": 5,
+   "bs-pagesvisited-pref-widgetns": [ 0 ],
+   "bs-pagesvisited-pref-widgetsortodr": "time"
},
"AutoloadClasses": {
"PagesVisited": "PagesVisited.class.php"

-- 
To view, visit https://gerrit.wikimedia.org/r/404971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d8ffd5521fe5d4ae840c5bd1d8c58415c80989b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePagesVisited
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageAssignments[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404966 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools.

runPreferencePlugin:
use getConfig()->get( 'UIPermissionBlacklist' ) instead of
WikiAdmin::get( 'ExcludeRights' )

Change-Id: Icf42f3dbf1c02d7b635b577650d7d2ecfabdc282
---
M PageAssignments.class.php
M extension.json
M includes/PageAssignmentsHooks.php
A src/AdminTool.php
4 files changed, 44 insertions(+), 19 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/PageAssignments.class.php b/PageAssignments.class.php
index 853c74a..8eafcab 100644
--- a/PageAssignments.class.php
+++ b/PageAssignments.class.php
@@ -138,7 +138,7 @@
public function runPreferencePlugin( $sAdapterName, $oVariable ) {
$aPermissions = array_diff(
User::getAllRights(),
-   WikiAdmin::get( 'ExcludeRights' )
+   $this->getConfig()->get( 'UIPermissionBlacklist' )
);
return array(
'type' => 'multiselectex',
diff --git a/extension.json b/extension.json
index 7497f58..a93369b 100644
--- a/extension.json
+++ b/extension.json
@@ -16,6 +16,9 @@
}
},
"callback": "PageAssignments::onRegistration",
+   "BlueSpiceFoundationAdminToolRegistry": {
+   "bs-pageassignments-manager": "BS\\PageAssignments\\AdminTool"
+   },
"DefaultUserOptions": {
"echo-subscriptions-web-bs-pageassignments-action-cat": true,
"echo-subscriptions-email-bs-pageassignments-action-cat": true
@@ -175,7 +178,6 @@
"BSStateBarBeforeBodyViewAdd": 
"PageAssignmentsStateBarHooks::onStateBarBeforeBodyViewAdd",
"BSStatebarAddSortTopVars": 
"PageAssignmentsStateBarHooks::onStatebarAddSortTopVars",
"BSStatebarAddSortBodyVars": 
"PageAssignmentsStateBarHooks::onStatebarAddSortBodyVars",
-   "BSWikiAdminMenuItems": 
"PageAssignmentsHooks::onBSWikiAdminMenuItems",
"PageContentSaveComplete": 
"PageAssignmentsNotificationHooks::onPageContentSaveComplete",
"BSUserManagerAfterSetGroups": 
"PageAssignmentsNotificationHooks::onBSUserManagerAfterSetGroups",
"UserAddGroup": 
"PageAssignmentsUsersAdditionalPermissionsHooks::onUserAddGroup",
diff --git a/includes/PageAssignmentsHooks.php 
b/includes/PageAssignmentsHooks.php
index 6cacf87..aedc662 100644
--- a/includes/PageAssignmentsHooks.php
+++ b/includes/PageAssignmentsHooks.php
@@ -37,23 +37,6 @@
return true;
}
 
-   /**
-*
-* @param array $aOut
-* @param \User The user in which context the menu is rendered
-* @return boolean
-*/
-   public static function onBSWikiAdminMenuItems( &$aOut, $oUser ){
-   if( !$oUser->isAllowed( 'pageassignments' ) ) {
-   return true;
-   }
-   $sLabel = wfMessage( 'managepageassignments' )->plain();
-   $aOut[$sLabel] = Html::rawElement( 'li', array(),
-   Linker::link( SpecialPage::getTitleFor( 
'ManagePageAssignments' ), $sLabel, array( 'class' => 'bs-admin-link 
bs-icon-profile' )  )
-   );
-   return true;
-   }
-
public static function onPersonalUrls( &$aPersonal_urls, &$oTitle ) {
$oUser = RequestContext::getMain()->getUser();
if ( $oUser->isLoggedIn() ) {
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..d302116
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-pageassignments-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'managepageassignments' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-admin-link bs-icon-profile'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'pageassignments'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404966
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf42f3dbf1c02d7b635b577650d7d2ecfabdc282
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageAssignments
Gerrit-Branch: master

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSmartlist[master]: Add AutoloadNamespaces to extension.json

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404961 )

Change subject: Add AutoloadNamespaces to extension.json
..


Add AutoloadNamespaces to extension.json

Change-Id: I2e0dc86ee7c83aae864f6f8f32541973d26ac6a7
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 498b906..b39a5bb 100644
--- a/extension.json
+++ b/extension.json
@@ -34,6 +34,9 @@
"bs-smartlist-pref-count": 5,
"bs-smartlist-pref-comments": false
},
+   "AutoloadNamespaces": {
+   "BlueSpice\\SmartList\\" : "src/"
+   },
"AutoloadClasses": {
"SmartList": "SmartList.class.php",
"BSApiTasksSmartList": "includes/api/BSApiTasksSmartList.php"

-- 
To view, visit https://gerrit.wikimedia.org/r/404961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0dc86ee7c83aae864f6f8f32541973d26ac6a7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSmartlist
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceContextMenu[master]: Hook GetPreferences: fixed path in extension.json

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404958 )

Change subject: Hook GetPreferences: fixed path in extension.json
..


Hook GetPreferences: fixed path in extension.json

Change-Id: I0801d686965351f28875b9b3c3f5166317a99a0c
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 068e423..6a8e188 100644
--- a/extension.json
+++ b/extension.json
@@ -28,7 +28,7 @@
"BSApiContextMenuTasks": 
"includes/api/BSApiContextMenuTasks.php"
},
"Hooks": {
-   "GetPreferences": 
"\\BlueSpice\\ContextMenu\\Hook\\GetPreferences\\AddModule::callback",
+   "GetPreferences": 
"\\BlueSpice\\ContextMenu\\Hook\\GetPreferences\\AddModus::callback",
"UnitTestsList": "ContextMenu::onUnitTestsList"
},
"APIModules": {

-- 
To view, visit https://gerrit.wikimedia.org/r/404958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0801d686965351f28875b9b3c3f5166317a99a0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceContextMenu
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401949 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Ia5200600948311b16fabb87a17f7e38d7c9be24b
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index a260955..e9b6b18 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceUserManager",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://www.mediawiki.org/wiki/Extension:UserManager;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5200600948311b16fabb87a17f7e38d7c9be24b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSmartlist[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401944 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I1b4f56d64c702f18dd5297bc10e25c39d6e3523b
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 6b3a2fb..498b906 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceSmartlist",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/SmartList;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b4f56d64c702f18dd5297bc10e25c39d6e3523b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceSmartlist
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401888 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I0a4a1af4cc58c8369d8fe24ec385f9d6833ed012
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index c04280a..3f2eb51 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceNamespaceManager",
-   "license-name":"GPL-3.0",
+   "license-name":"GPL-3.0-only",
"version": "3.0.0",
"url": "https://help.bluespice.com/index.php/Namespacemanager;,
"author":   [

-- 
To view, visit https://gerrit.wikimedia.org/r/401888
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0a4a1af4cc58c8369d8fe24ec385f9d6833ed012
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401890 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I2d412fc9130a8242756db4f4182da08ac9057f88
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 76a3d5d..22b31b0 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpicePageTemplates",
-   "license-name" : "GPL-3.0",
+   "license-name" : "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/PageTemplates;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2d412fc9130a8242756db4f4182da08ac9057f88
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceReaders[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401940 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I3358ffd0166027ae5ba21a8578e2c565ed505f3d
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 2fc62ca..9ba66e8 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceReaders",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Readers;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3358ffd0166027ae5ba21a8578e2c565ed505f3d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceReaders
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401886 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: Iad35824d6695300aeb4c0da26b9684966603381d
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 185ae1a..73e405b 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpiceInterWikiLinks",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/Interwikilinks;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad35824d6695300aeb4c0da26b9684966603381d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: Add minus-x to composer.json

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403320 )

Change subject: Add minus-x to composer.json
..


Add minus-x to composer.json

Bug: T175794
Change-Id: If650a30daeabf09d13a734cd143337625efa1e20
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  D3r1ck01: Looks good to me, but someone else must approve



diff --git a/composer.json b/composer.json
index f0bb5f6..a0e5a25 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.3.0"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/403320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If650a30daeabf09d13a734cd143337625efa1e20
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Phantom42 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: Zppix 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401939 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I5f1b47fc5a5e775dcf12e46e27d5e792760f991c
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 60ffdfb..2d1a0c7 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
"name": "BlueSpicePermissionManager",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"version": "3.0.0-alpha",
"url": "https://help.bluespice.com/index.php/PermissionManager;,
"author": [

-- 
To view, visit https://gerrit.wikimedia.org/r/401939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f1b47fc5a5e775dcf12e46e27d5e792760f991c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAbout[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404947 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: I35a944b03d7a0280fcedfeabd78de7936d4d5f84
---
M BlueSpiceAbout.class.php
M extension.json
A src/AdminTool.php
3 files changed, 44 insertions(+), 29 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/BlueSpiceAbout.class.php b/BlueSpiceAbout.class.php
index ece73b7..c2ce6ab 100644
--- a/BlueSpiceAbout.class.php
+++ b/BlueSpiceAbout.class.php
@@ -35,7 +35,6 @@
wfProfileIn( 'BS::'.__METHOD__ );
// Hooks
$this->setHook( 'BeforePageDisplay' );
-   $this->setHook( 'BSWikiAdminMenuItems' );
$this->setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites' 
);
$this->setHook( 'SkinBuildSidebar' );
 
@@ -56,34 +55,6 @@
if ( BsConfig::get( 'MW::BlueSpiceAbout::ShowMenuLinks' )) {
$out->addModules( 'ext.bluespice.bluespiceabout' );
}
-   return true;
-   }
-
-   /**
-* Returns a list item with a link to the "BlueSpice About" special page
-* @param array $aOutSortable Indexed list of menu items. Add item in 
HTML form.
-* @param \User The user in which context the menu is rendered
-* @return string Link to the "BlueSpice About" special page
-*/
-   public static function onBSWikiAdminMenuItems( &$aOutSortable, $oUser ) 
{
-   if ( !BsConfig::get( 'MW::BlueSpiceAbout::ShowMenuLinks' )) {
-   return true;
-   }
-   if( !$oUser->isAllowed( 'bluespiceabout-viewspecialpage' ) ) {
-   return true;
-   }
-   $oSpecialPage = SpecialPage::getTitleFor( 'BlueSpiceAbout' );
-   $sLink = Html::element(
-   'a',
-   array (
-   'id' => 'bs-admin-bluespiceabout',
-   'href' => $oSpecialPage->getLocalURL(),
-   'title' => wfMessage( 
'bs-bluespiceabout-about-bluespice' )->plain(),
-   'class' => 'bs-admin-link'
-   ),
-   wfMessage( 'bs-bluespiceabout-about-bluespice' 
)->plain()
-   );
-   $aOutSortable[wfMessage( 'bs-bluespiceabout-about-bluespice' 
)->escaped()] = '' . $sLink . '';
return true;
}
 
diff --git a/extension.json b/extension.json
index fa7d31d..fa7bbd4 100644
--- a/extension.json
+++ b/extension.json
@@ -17,6 +17,12 @@
"ExtensionMessagesFiles": {
"BlueSpiceAboutAlias": 
"includes/specials/SpecialBlueSpiceAbout.alias.php"
},
+   "BlueSpiceFoundationAdminToolRegistry": {
+   "bs-bluespiceabout": "BlueSpice\\BlueSpiceAbout\\AdminTool"
+   },
+   "AutoloadNamespaces": {
+   "BlueSpice\\BlueSpiceAbout\\" : "src/"
+   },
"AutoloadClasses": {
"BlueSpiceAbout": "BlueSpiceAbout.class.php",
"SpecialBlueSpiceAbout": 
"includes/specials/SpecialBlueSpiceAbout.class.php"
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..9da1641
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,38 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-bluespiceabout-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-bluespiceabout-about-bluespice' );
+   }
+
+   public function getClasses() {
+   $classes = array();
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'bluespiceabout-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I35a944b03d7a0280fcedfeabd78de7936d4d5f84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAbout
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404951 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: Iaf947eac2ed2595c67959b1d1bb392408e20a259
---
M PageTemplates.class.php
M extension.json
A src/AdminTool.php
3 files changed, 43 insertions(+), 11 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/PageTemplates.class.php b/PageTemplates.class.php
index 39013da..bcbdecf 100644
--- a/PageTemplates.class.php
+++ b/PageTemplates.class.php
@@ -36,17 +36,6 @@
  */
 class PageTemplates extends BsExtensionMW {
 
-   public function __construct() {
-   wfProfileIn( 'BS::'.__METHOD__ );
-   WikiAdmin::registerModuleClass( 'PageTemplatesAdmin', array(
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_templates_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-pagetemplatesadmin-label',
-   'iconCls' => 'bs-icon-clipboard-checked',
-   'permissions' => [ 'pagetemplatesadmin-viewspecialpage' 
],
-   ) );
-   wfProfileOut( 'BS::'.__METHOD__ );
-   }
/**
 * Initialization of PageTemplates extension
 */
diff --git a/extension.json b/extension.json
index 76a3d5d..7914cf4 100644
--- a/extension.json
+++ b/extension.json
@@ -22,6 +22,9 @@

"PageTemplateHideIfNotInTargetNs": 
"\\BlueSpice\\PageTemplates\\ConfigDefinition\\PageTemplatesHideIfNotInTargetNS::getInstance"
}
}
+   },
+   "AdminToolRegistry": {
+   "bs-pagetemplates": 
"BlueSpice\\PageTemplates\\AdminTool"
}
}
},
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..eb099e4
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-pagetemplates-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-pagetemplatesadmin-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-clipboard-checked'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'pagetemplatesadmin-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaf947eac2ed2595c67959b1d1bb392408e20a259
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceUserManager[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404949 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: Id355087830f0d1f92dc23b2e941429daba7b6ff6
---
M UserManager.class.php
M extension.json
A src/AdminTool.php
3 files changed, 43 insertions(+), 8 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/UserManager.class.php b/UserManager.class.php
index af3c860..6aac30a 100644
--- a/UserManager.class.php
+++ b/UserManager.class.php
@@ -44,14 +44,6 @@
$this->mExtensionFile = __FILE__;
$this->mExtensionType = EXTTYPE::VARIABLE;
 
-   WikiAdmin::registerModule( 'UserManager', array(
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_usermanagement_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-usermanager-label',
-   'iconCls' => 'bs-icon-user-add',
-   'permissions' => [ 'usermanager-viewspecialpage' ],
-   ) );
-
wfProfileOut( 'BS::'.__METHOD__ );
}
 
diff --git a/extension.json b/extension.json
index a260955..359b2f3 100644
--- a/extension.json
+++ b/extension.json
@@ -17,6 +17,9 @@
"extPath": "/BlueSpiceUserManager"
}
},
+   "BlueSpiceFoundationAdminToolRegistry": {
+   "bs-usermanager-manager": "BlueSpice\\UserManager\\AdminTool"
+   },
"SpecialPages": {
"UserManager": "SpecialUserManager"
},
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..eea1cbd
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-usermanager-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-usermanager-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-user-add'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'usermanager-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id355087830f0d1f92dc23b2e941429daba7b6ff6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceUserManager
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404937 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: I74cb472f2d8065f24ec3664618a80030df6bbeef
---
M PermissionManager.class.php
M extension.json
A src/AdminTool.php
3 files changed, 46 insertions(+), 15 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/PermissionManager.class.php b/PermissionManager.class.php
index c1a17bb..cccd139 100644
--- a/PermissionManager.class.php
+++ b/PermissionManager.class.php
@@ -88,21 +88,6 @@
 */
public static $aInvisibleGroups = array( 'sysop' );
 
-   /**
-* Constructor of PermissionManager
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::' . __METHOD__);
-   WikiAdmin::registerModule( 'PermissionManager', [
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_rechteverwaltung_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-permissionmanager-label',
-   'iconCls' => 'bs-icon-key',
-   'permissions' => [ 'permissionmanager-viewspecialpage' 
],
-   ]);
-   wfProfileOut( 'BS::' . __METHOD__ );
-   }
-
protected function initExt() {
$this->setHook( 'BSGroupManagerGroupNameChanged' );
$this->setHook( 'BSGroupManagerGroupDeleted' );
diff --git a/extension.json b/extension.json
index 676accb..60ffdfb 100644
--- a/extension.json
+++ b/extension.json
@@ -19,9 +19,15 @@
"PermissionManagerMaxBackups": 
"\\BlueSpice\\PermissionManager\\ConfigDefinition\\PermissionManagerMaxBackups::getInstance"
}
}
+   },
+   "AdminToolRegistry": {
+   "bs-permission-manager": 
"BlueSpice\\PermissionManager\\AdminTool"
}
}
},
+   "AutoloadNamespaces": {
+   "BlueSpice\\PermissionManager\\" : "src/"
+   },
"SpecialPages": {
"PermissionManager": "SpecialPermissionManager"
},
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..73e8899
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-permissionmanager-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-permissionmanager-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-key'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'permissionmanager-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I74cb472f2d8065f24ec3664618a80030df6bbeef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceInterWikiLinks[master]: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404939 )

Change subject: WikiAdmin is not part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: Ie461dd8c595b96963b5d59e89993efabbd9811cf
---
M InterWikiLinks.class.php
M extension.json
A src/AdminTool.php
3 files changed, 46 insertions(+), 15 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/InterWikiLinks.class.php b/InterWikiLinks.class.php
index d1a1b74..e4f1671 100644
--- a/InterWikiLinks.class.php
+++ b/InterWikiLinks.class.php
@@ -37,21 +37,6 @@
  */
 class InterWikiLinks extends BsExtensionMW {
 
-   /**
-* Constructor of InterWikiLinks class
-*/
-   public function __construct() {
-   wfProfileIn( 'BS::'.__METHOD__ );
-   WikiAdmin::registerModule( 'InterWikiLinks', [
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_interwikilinks_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-interwikilinks-label',
-   'iconCls' => 'bs-icon-chain',
-   'permissions' => [ 'interwikilinks-viewspecialpage' ],
-   ]);
-   wfProfileOut( 'BS::'.__METHOD__ );
-   }
-
protected function initExt() {
wfProfileIn('BS::InterWikiLinks::initExt');
 
diff --git a/extension.json b/extension.json
index 89e085b..185ae1a 100644
--- a/extension.json
+++ b/extension.json
@@ -16,6 +16,12 @@
"extPath": "/BlueSpiceInterWikiLinks"
}
},
+   "BlueSpiceFoundationAdminToolRegistry": {
+   "bs-interwikilinks-manager": 
"BlueSpice\\InterWikiLinks\\AdminTool"
+   },
+   "AutoloadNamespaces": {
+   "BlueSpice\\InterWikiLinks\\" : "src/"
+   },
"SpecialPages": {
"InterWikiLinks": "SpecialInterWikiLinks"
},
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..fd27cc0
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-interwikilinks-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-interwikilinks-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-chain'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'interwikilinks-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie461dd8c595b96963b5d59e89993efabbd9811cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceInterWikiLinks
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: WikiAdmin is not Part of BlueSpice 3. Removed unneeded code and

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404938 )

Change subject: WikiAdmin is not Part of BlueSpice 3. Removed unneeded code and
..


WikiAdmin is not Part of BlueSpice 3. Removed unneeded code and

used new registry for admin tools

Change-Id: Iedf18c172f0441fd3ab3bc01c5dedd7e12985476
---
M NamespaceManager.class.php
M extension.json
A src/AdminTool.php
3 files changed, 43 insertions(+), 12 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/NamespaceManager.class.php b/NamespaceManager.class.php
index c6d4c3c..77652ad 100644
--- a/NamespaceManager.class.php
+++ b/NamespaceManager.class.php
@@ -49,18 +49,6 @@
'dir' => ''
);
 
-   public function __construct() {
-   wfProfileIn( 'BS::NamespaceManager::__construct' );
-   WikiAdmin::registerModule( 'NamespaceManager', [
-   'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_namespaces_v1.png',
-   'level' => 'wikiadmin',
-   'message' => 'bs-namespacemanager-label',
-   'iconCls' => 'bs-icon-register-box',
-   'permissions' => [ 'namespacemanager-viewspecialpage' ],
-   ]);
-   wfProfileOut( 'BS::NamespaceManager::__construct' );
-   }
-
/**
 * Initialization of NamespaceManager extension
 */
diff --git a/extension.json b/extension.json
index ce50fef..c04280a 100644
--- a/extension.json
+++ b/extension.json
@@ -17,6 +17,9 @@
"className": "NamespaceManager",
"extPath": "/BlueSpiceNamespaceManager"
}
+   },
+   "AdminToolRegistry": {
+   "bs-namespace-manager": 
"BlueSpice\\NamespaceManager\\AdminTool"
}
}
},
diff --git a/src/AdminTool.php b/src/AdminTool.php
new file mode 100644
index 000..b92348e
--- /dev/null
+++ b/src/AdminTool.php
@@ -0,0 +1,40 @@
+getLocalURL();
+   }
+
+   public function getDescription() {
+   return wfMessage( 'bs-namespacemanager-desc' );
+   }
+
+   public function getName() {
+   return wfMessage( 'bs-namespacemanager-label' );
+   }
+
+   public function getClasses() {
+   $classes = array(
+   'bs-icon-register-box'
+   );
+
+   return $classes;
+   }
+
+   public function getDataAttributes() {
+   }
+
+   public function getPermissions() {
+   $permissions = array(
+   'namespacemanager-viewspecialpage'
+   );
+   return $permissions;
+   }
+
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf18c172f0441fd3ab3bc01c5dedd7e12985476
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceWhoIsOnline[master]: Use SPDX 3.0 license identifier

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401952 )

Change subject: Use SPDX 3.0 license identifier
..


Use SPDX 3.0 license identifier

SPDX released version 3 of their license list (),
which changed the FSF licenses to explicitly end in -only or -or-later
instead of relying on an easy to miss + symbol.

Bug: T183858
Change-Id: I435fd3aa12ea8b64c3aca81b2c7c79a59ea8dee3
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index 0f05b3f..c85fbbd 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
 {
"name": "BlueSpiceWhoIsOnline",
"version": "3.0.0-alpha",
-   "license-name": "GPL-3.0",
+   "license-name": "GPL-3.0-only",
"url": "https://help.bluespice.com/index.php/WhoIsOnline;,
"author": "Markus Glaser",
"descriptionmsg": "bs-whoisonline-desc",

-- 
To view, visit https://gerrit.wikimedia.org/r/401952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I435fd3aa12ea8b64c3aca81b2c7c79a59ea8dee3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceWhoIsOnline
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: Add minus-x to composer.json

2018-01-18 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403363 )

Change subject: Add minus-x to composer.json
..


Add minus-x to composer.json

Bug: T175794
Change-Id: Ifeba8b52453ea591713ec1779ec7e230f6ad6ced
---
M composer.json
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  D3r1ck01: Looks good to me, but someone else must approve



diff --git a/composer.json b/composer.json
index a153136..dce2ae3 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,14 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.3.0"
},
"scripts": {
+   "fix": "minus-x fix .",
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/403363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifeba8b52453ea591713ec1779ec7e230f6ad6ced
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Divadsn 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Divadsn 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27_dev]: TitleCombo.js: Added redlink visualization

2018-01-17 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404678 )

Change subject: TitleCombo.js: Added redlink visualization
..


TitleCombo.js: Added redlink visualization

Improved styling for the TitleCombo for better UX.

NEEDS CHERRY-PICK TO REL1_27 and REL1_27_dev

Change-Id: I2ff6a8558343642ad5a2047c3677b322b2aee404
---
M resources/bluespice.extjs/BS/form/field/TitleCombo.js
M resources/bluespice.extjs/bluespice.extjs.overrides.less
2 files changed, 28 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/resources/bluespice.extjs/BS/form/field/TitleCombo.js 
b/resources/bluespice.extjs/BS/form/field/TitleCombo.js
index 457d452..64b003b 100644
--- a/resources/bluespice.extjs/BS/form/field/TitleCombo.js
+++ b/resources/bluespice.extjs/BS/form/field/TitleCombo.js
@@ -2,7 +2,7 @@
extend: 'Ext.ux.form.field.GridPicker',
requires:[ 'BS.model.Title', 'BS.store.BSApi' ],
 
-   //This is necessary to make the ComboBox retrun a Model
+   //This is necessary to make the ComboBox return a Model
//instance if input is less then 4 chars
minChars: 1,
 
@@ -30,7 +30,20 @@
columns: [{
dataIndex: 'displayText',
flex: 1
-   }]
+   }],
+   viewConfig: {
+   getRowClass: function(record, rowIndex, rowParams, store){
+   var cssClass = 'bs-model-title-type-namespace';
+   if( record.get( 'type' ) === 'namespace' ) {
+   return cssClass;
+   }
+   cssClass = 'bs-model-title-type-title';
+   if( record.get( 'page_id' ) === 0 ) {
+   cssClass += ' new';
+   }
+   return cssClass;
+   }
+   }
},
 
excludeIds: [],
diff --git a/resources/bluespice.extjs/bluespice.extjs.overrides.less 
b/resources/bluespice.extjs/bluespice.extjs.overrides.less
index 093e449..d010cb5 100644
--- a/resources/bluespice.extjs/bluespice.extjs.overrides.less
+++ b/resources/bluespice.extjs/bluespice.extjs.overrides.less
@@ -73,4 +73,16 @@
 
 .bs-typeicon {
margin-right: 0.5em;
-}
\ No newline at end of file
+}
+
+.bs-model-title-type-namespace .x-grid-cell {
+   font-style: oblique;
+}
+
+.bs-model-title-type-title .x-grid-cell {
+   color: #3e5389; //MediaWiki default
+}
+
+.bs-model-title-type-title.new .x-grid-cell {
+   color: #ba; //MediaWiki default
+   }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/404678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ff6a8558343642ad5a2047c3677b322b2aee404
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Fix "Adding translation overrides exisiting ones"

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404468 )

Change subject: Fix "Adding translation overrides exisiting ones"
..

Fix "Adding translation overrides exisiting ones"

* Added API to fetch existing translations
* If not set by client-side config (that's the case when the dialog gets opened
on a page that has no translations yet) the API get's queried to see if there
are other translations available for the given source page

ERM7001

NEEDS CHERRY-PICK TO master!

Change-Id: Ia13881dbba5ff1c0de5020b4b663346b2875895a
---
M resources/ext.mlm.js
M src/Api/Tasks.php
2 files changed, 74 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager 
refs/changes/68/404468/1

diff --git a/resources/ext.mlm.js b/resources/ext.mlm.js
index ef59c91..1f0a2fa 100644
--- a/resources/ext.mlm.js
+++ b/resources/ext.mlm.js
@@ -53,7 +53,8 @@
mw.mlm.dialog.static.actions = [{
action: 'save',
label: mw.message( 'mlm-input-label-save' ).plain(),
-   flags: [ 'primary', 'constructive' ]
+   flags: [ 'primary', 'constructive' ],
+   disabled: true
}, {
action: 'cancel',
label: mw.message( 'mlm-input-label-cancel' ).plain(),
@@ -108,6 +109,7 @@
label: mw.message( 
'mlm-input-label-sourcetitle' ).plain(),
disabled: mw.mlm.srcTitle === '' ? false : true
});
+   this.srcText.on( 'change', this.onSrcTextChange.bind( 
this ) );
 
this.srcSection = new OO.ui.HorizontalLayout( {
items: [
@@ -260,6 +262,37 @@
);
};
 
+   mw.mlm.dialog.prototype.onSrcTextChange = function( value ){
+   var me = this;
+
+   var api = new mw.Api();
+   api.postWithToken( 'csrf', {
+   action: 'mlm-tasks',
+   task: 'get',
+   format: 'json',
+   taskData: JSON.stringify( {
+   srcText: value
+   } )
+   })
+   .done( function( response, jqXHR ) {
+   if( !response.success ) {
+   return;
+   }
+
+   for( var i = 0; i < response.payload.length; 
i++ ) {
+   var translation = response.payload[i];
+   me.updateTranslations( {
+   'lang': translation.lang,
+   'text': translation.text
+   });
+   }
+
+   me.getActions().setAbilities( {
+   save: true
+   });
+   });
+   };
+
mw.mlm.dialog.prototype.onTranslationAdd = function(){
this.updateTranslations( {
'lang': this.translationLang.value,
diff --git a/src/Api/Tasks.php b/src/Api/Tasks.php
index 767b923..7ba8666 100644
--- a/src/Api/Tasks.php
+++ b/src/Api/Tasks.php
@@ -22,6 +22,10 @@
'read',
Helper::getConfig()->get( Config::PERMISSION )
],
+   'get' => [
+   'read',
+   Helper::getConfig()->get( Config::PERMISSION )
+   ],
];
}
 
@@ -148,6 +152,37 @@
return $result;
}
 
+   protected function task_get( $taskData, $params ) {
+   $result = $this->makeStandardReturn();
+   $sysLang = Helper::getSystemLanguageCode();
+   $result->message = [];
+   if( empty( $taskData->srcText ) ) {
+   $taskData->srcText = '';
+   }
+   $oSourceTitle = \Title::newFromText( $taskData->srcText );
+   $status = Helper::isValidTitle(
+   $oSourceTitle
+   );
+   if( !$status->isOK() ) {
+   $result->message[$sysLang] = $status->getHTML();
+   return $result;
+   }
+
+   $mlmTranslation = MultiLanguageTranslation::newFromTitle(
+   $oSourceTitle
+   );
+
+   $translations =

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Switch back to manifest v1 for REL1_27

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404467 )

Change subject: Switch back to manifest v1 for REL1_27
..

Switch back to manifest v1 for REL1_27

Change-Id: If2d777b29fdb06e93d90defd11431d46fa67cdd5
---
M extension.json
1 file changed, 7 insertions(+), 17 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager 
refs/changes/67/404467/1

diff --git a/extension.json b/extension.json
index e290295..584134e 100644
--- a/extension.json
+++ b/extension.json
@@ -83,24 +83,14 @@
]
}
},
-   "config_prefix": "mg",
"config": {
-   "AvailableLanguages": {
-   "value": [ "en", "cn", "fr", "it", "nl", "de" ]
-   },
-   "Permission": {
-   "value": "language"
-   },
-   "LanguageTableName": {
-   "value": "page_language"
-   },
-   "TranslationTableName": {
-   "value": "page_translation"
-   },
-   "SpecialPageName": {
-   "value": "MultiLanguageManager"
-   }
+   "_prefix": "mg",
+   "AvailableLanguages": [ "en", "cn", "fr", "it", "nl", "de" ],
+   "Permission": "language",
+   "LanguageTableName": "page_language",
+   "TranslationTableName": "page_translation",
+   "SpecialPageName": "MultiLanguageManager"
},
"load_composer_autoloader" : true,
-   "manifest_version": 2
+   "manifest_version": 1
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/404467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If2d777b29fdb06e93d90defd11431d46fa67cdd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Use composer autoloader on REL1_27

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404419 )

Change subject: Use composer autoloader on REL1_27
..


Use composer autoloader on REL1_27

... as AutoloadNamespaces is only available from REL1_31

Change-Id: If1b901ac5f057e02aff68cc9160765e849821bec
---
M composer.json
M extension.json
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 6197711..4fefbef 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,12 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "MultiLanguageManager\\Tests\\": "tests/phpunit",
+   "MultiLanguageManager\\": "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
diff --git a/extension.json b/extension.json
index 6b8510f..e290295 100644
--- a/extension.json
+++ b/extension.json
@@ -10,9 +10,6 @@
"descriptionmsg": "mlm-desc",
"license-name": "GPL-2.0",
"type": "other",
-   "requires": {
-   "MediaWiki": ">= 1.31.0"
-   },
"MessagesDirs": {
"MultiLanguageManager": [
"i18n"
@@ -104,9 +101,6 @@
"value": "MultiLanguageManager"
}
},
-   "AutoloadNamespaces": {
-   "MultiLanguageManager\\Tests\\": "tests/phpunit/",
-   "MultiLanguageManager\\": "src/"
-   },
+   "load_composer_autoloader" : true,
"manifest_version": 2
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/404419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If1b901ac5f057e02aff68cc9160765e849821bec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Use composer autoloader on REL1_27

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404419 )

Change subject: Use composer autoloader on REL1_27
..

Use composer autoloader on REL1_27

... as AutoloadNamespaces is only available from REL1_31

Change-Id: If1b901ac5f057e02aff68cc9160765e849821bec
---
M composer.json
M extension.json
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager 
refs/changes/19/404419/1

diff --git a/composer.json b/composer.json
index 6197711..4fefbef 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,12 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "MultiLanguageManager\\Tests\\": "tests/phpunit",
+   "MultiLanguageManager\\": "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
diff --git a/extension.json b/extension.json
index 6b8510f..e290295 100644
--- a/extension.json
+++ b/extension.json
@@ -10,9 +10,6 @@
"descriptionmsg": "mlm-desc",
"license-name": "GPL-2.0",
"type": "other",
-   "requires": {
-   "MediaWiki": ">= 1.31.0"
-   },
"MessagesDirs": {
"MultiLanguageManager": [
"i18n"
@@ -104,9 +101,6 @@
"value": "MultiLanguageManager"
}
},
-   "AutoloadNamespaces": {
-   "MultiLanguageManager\\Tests\\": "tests/phpunit/",
-   "MultiLanguageManager\\": "src/"
-   },
+   "load_composer_autoloader" : true,
"manifest_version": 2
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/404419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1b901ac5f057e02aff68cc9160765e849821bec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Modify gitreview for REL1_27

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404417 )

Change subject: Modify gitreview for REL1_27
..

Modify gitreview for REL1_27

Change-Id: I1a461feb9cee61f44b611e636cc86bf50ed2613c
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager 
refs/changes/17/404417/1

diff --git a/.gitreview b/.gitreview
index 7df6967..d660bc1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,6 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/MultiLanguageManager.git
+defaultbranch=REL1_27
 track=1
 defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/404417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a461feb9cee61f44b611e636cc86bf50ed2613c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[REL1_27]: Modify gitreview for REL1_27

2018-01-16 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404417 )

Change subject: Modify gitreview for REL1_27
..


Modify gitreview for REL1_27

Change-Id: I1a461feb9cee61f44b611e636cc86bf50ed2613c
---
M .gitreview
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.gitreview b/.gitreview
index 7df6967..d660bc1 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,5 +2,6 @@
 host=gerrit.wikimedia.org
 port=29418
 project=mediawiki/extensions/MultiLanguageManager.git
+defaultbranch=REL1_27
 track=1
 defaultrebase=0

-- 
To view, visit https://gerrit.wikimedia.org/r/404417
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a461feb9cee61f44b611e636cc86bf50ed2613c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSMWConnector[master]: Disable auto activation when installed by composer

2018-01-15 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404267 )

Change subject: Disable auto activation when installed by composer
..

Disable auto activation when installed by composer

This is due to a new policy in the BlueSpice team. We do not auto-activate
extensions, when installed by composer.

Change-Id: I08214f4eb40d84f15a67d0ec1d768be73ad7a427
---
M composer.json
1 file changed, 0 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSMWConnector 
refs/changes/67/404267/1

diff --git a/composer.json b/composer.json
index cf7abf5..dace622 100644
--- a/composer.json
+++ b/composer.json
@@ -25,11 +25,6 @@
"php": ">=5.3.0",
"composer/installers": "1.*,>=1.0.1"
},
-   "autoload": {
-   "files": [
-   "BlueSpiceSMWConnector.php"
-   ]
-   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",

-- 
To view, visit https://gerrit.wikimedia.org/r/404267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08214f4eb40d84f15a67d0ec1d768be73ad7a427
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSMWConnector[master]: Remove composer requirement to SMW extensions

2018-01-15 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404266 )

Change subject: Remove composer requirement to SMW extensions
..

Remove composer requirement to SMW extensions

This is due to a new policy within the BlueSpice team. We do not use composer
as manager for inter-extension dependencies.

Also should fix issues like in T172927 (also see P6481)

Change-Id: I3bd999710f98b08863a854aed2cca51b76b31536
---
M composer.json
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceSMWConnector 
refs/changes/66/404266/1

diff --git a/composer.json b/composer.json
index d7f93c1..cf7abf5 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,7 @@
],
"require": {
"php": ">=5.3.0",
-   "composer/installers": "1.*,>=1.0.1",
-   "mediawiki/semantic-media-wiki": "~2.4",
-   "mediawiki/semantic-extra-special-properties": ">=1.3.1",
-   "mediawiki/semantic-forms": ">=3.7",
-   "mediawiki/semantic-result-formats": ">=2.3"
+   "composer/installers": "1.*,>=1.0.1"
},
"autoload": {
"files": [

-- 
To view, visit https://gerrit.wikimedia.org/r/404266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3bd999710f98b08863a854aed2cca51b76b31536
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceSMWConnector
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: TitleCombo.js: Added redlink visualization

2018-01-11 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/403718 )

Change subject: TitleCombo.js: Added redlink visualization
..

TitleCombo.js: Added redlink visualization

Improved styling for the TitleCombo for better UX.

NEEDS CHERRY-PICK TO REL1_27 and REL1_27_dev

Change-Id: I2ff6a8558343642ad5a2047c3677b322b2aee404
---
M resources/bluespice.extjs/BS/form/field/TitleCombo.js
M resources/bluespice.extjs/bluespice.extjs.overrides.less
2 files changed, 28 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/18/403718/1

diff --git a/resources/bluespice.extjs/BS/form/field/TitleCombo.js 
b/resources/bluespice.extjs/BS/form/field/TitleCombo.js
index 457d452..4ad4b4b 100644
--- a/resources/bluespice.extjs/BS/form/field/TitleCombo.js
+++ b/resources/bluespice.extjs/BS/form/field/TitleCombo.js
@@ -2,7 +2,7 @@
extend: 'Ext.ux.form.field.GridPicker',
requires:[ 'BS.model.Title', 'BS.store.BSApi' ],
 
-   //This is necessary to make the ComboBox retrun a Model
+   //This is necessary to make the ComboBox return a Model
//instance if input is less then 4 chars
minChars: 1,
 
@@ -30,7 +30,20 @@
columns: [{
dataIndex: 'displayText',
flex: 1
-   }]
+   }],
+   viewConfig: {
+   getRowClass: function(record, rowIndex, rowParams, store){
+   var cssClass = 'bs-model-title-type-namespace';
+   if( record.get('type') === 'namespace' ) {
+   return cssClass;
+   }
+   cssClass = 'bs-model-title-type-title';
+   if( record.get('page_id') === 0 ) {
+   cssClass += ' new';
+   }
+   return cssClass;
+   }
+   }
},
 
excludeIds: [],
diff --git a/resources/bluespice.extjs/bluespice.extjs.overrides.less 
b/resources/bluespice.extjs/bluespice.extjs.overrides.less
index 093e449..d010cb5 100644
--- a/resources/bluespice.extjs/bluespice.extjs.overrides.less
+++ b/resources/bluespice.extjs/bluespice.extjs.overrides.less
@@ -73,4 +73,16 @@
 
 .bs-typeicon {
margin-right: 0.5em;
-}
\ No newline at end of file
+}
+
+.bs-model-title-type-namespace .x-grid-cell {
+   font-style: oblique;
+}
+
+.bs-model-title-type-title .x-grid-cell {
+   color: #3e5389; //MediaWiki default
+}
+
+.bs-model-title-type-title.new .x-grid-cell {
+   color: #ba; //MediaWiki default
+   }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/403718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ff6a8558343642ad5a2047c3677b322b2aee404
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Add dependencies to BlueSpice* extensions

2018-01-08 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402826 )

Change subject: Add dependencies to BlueSpice* extensions
..

Add dependencies to BlueSpice* extensions

See T130811

Change-Id: I2778bf0b12156bc05694495f46165d3ac75f4db1
---
M zuul/parameter_functions.py
1 file changed, 40 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/26/402826/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index bca730f..20bec7b 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -150,18 +150,57 @@
 'Arrays': ['Loops', 'ParserFunctions', 'Variables'],
 'ArticlePlaceholder': ['Wikibase', 'Scribunto'],
 'BlogPage': ['Comments', 'SocialProfile', 'VoteNY'],
+'BlueSpiceAbout': ['BlueSpiceFoundation'],
+'BlueSpiceArticleInfo': ['BlueSpiceFoundation'],
+'BlueSpiceAuthors': ['BlueSpiceFoundation'],
+'BlueSpiceAvatars': ['BlueSpiceFoundation'],
+'BlueSpiceBlog': ['BlueSpiceFoundation'],
 'BlueSpiceCategoryManager': ['BlueSpiceFoundation'],
+'BlueSpiceChecklist': ['BlueSpiceFoundation'],
+'BlueSpiceConfigManager': ['BlueSpiceFoundation'],
+'BlueSpiceContextMenu': ['BlueSpiceFoundation'],
+'BlueSpiceCountThings': ['BlueSpiceFoundation'],
+'BlueSpiceDashboards': ['BlueSpiceFoundation'],
 'BlueSpiceEditNotifyConnector': ['BlueSpiceFoundation'],
+'BlueSpiceEmoticons': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedFilelist': ['BlueSpiceFoundation'],
 'BlueSpiceExtendedSearch': ['BlueSpiceFoundation'],
+'BlueSpiceExtendedStatistics': ['BlueSpiceFoundation'],
 'BlueSpiceExtensions': ['BlueSpiceFoundation'],
+'BlueSpiceFoundation': ['ExtJSBase'],
+'BlueSpiceGroupManager': ['BlueSpiceFoundation'],
+'BlueSpiceHideTitle': ['BlueSpiceFoundation'],
+'BlueSpiceInsertCategory': ['BlueSpiceFoundation'],
+'BlueSpiceInsertFile': ['BlueSpiceFoundation'],
+'BlueSpiceInsertLink': ['BlueSpiceFoundation'],
+'BlueSpiceInsertMagic': ['BlueSpiceFoundation'],
 'BlueSpiceInsertTemplate': ['BlueSpiceFoundation'],
+'BlueSpiceInterWikiLinks': ['BlueSpiceFoundation'],
+'BlueSpiceMenues': ['BlueSpiceFoundation'],
 'BlueSpiceMultiUpload': ['BlueSpiceFoundation'],
+'BlueSpiceNamespaceCSS': ['BlueSpiceFoundation'],
+'BlueSpiceNamespaceManager': ['BlueSpiceFoundation'],
+'BlueSpicePageAccess': ['BlueSpiceFoundation'],
 'BlueSpicePageAssignments': ['BlueSpiceFoundation'],
+'BlueSpicePageTemplates': ['BlueSpiceFoundation'],
 'BlueSpicePageVersion': ['BlueSpiceFoundation'],
-'BlueSpiceSignHere': ['BlueSpiceFoundation'],
+'BlueSpicePagesVisited': ['BlueSpiceFoundation'],
+'BlueSpicePermissionManager': ['BlueSpiceFoundation'],
+'BlueSpiceRSSFeeder': ['BlueSpiceFoundation'],
+'BlueSpiceReaders': ['BlueSpiceFoundation'],
 'BlueSpiceSMWConnector': ['BlueSpiceFoundation'],
+'BlueSpiceSaferEdit': ['BlueSpiceFoundation'],
+'BlueSpiceSignHere': ['BlueSpiceFoundation'],
+'BlueSpiceSmartlist': ['BlueSpiceFoundation'],
 'BlueSpiceSubPageTree': ['BlueSpiceFoundation'],
+'BlueSpiceTagCloud': ['BlueSpiceFoundation'],
+'BlueSpiceUEModulePDF': ['BlueSpiceFoundation'],
+'BlueSpiceUniversalExport': ['BlueSpiceFoundation'],
+'BlueSpiceUsageTracker': ['BlueSpiceFoundation'],
+'BlueSpiceUserManager': ['BlueSpiceFoundation'],
+'BlueSpiceUserPreferences': ['BlueSpiceFoundation'],
+'BlueSpiceWatchList': ['BlueSpiceFoundation'],
+'BlueSpiceWhoIsOnline': ['BlueSpiceFoundation'],
 'Capiunto': ['Scribunto'],
 'Challenge': ['SocialProfile'],
 'Cite': ['VisualEditor'],

-- 
To view, visit https://gerrit.wikimedia.org/r/402826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2778bf0b12156bc05694495f46165d3ac75f4db1
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add return value to hook handler

2017-12-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398664 )

Change subject: Add return value to hook handler
..

Add return value to hook handler

Change-Id: I594f80f133e98124fa021e024063d0a0e3c4b28f
---
M src/Hook/LinkEnd/AddDataUserName.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/64/398664/1

diff --git a/src/Hook/LinkEnd/AddDataUserName.php 
b/src/Hook/LinkEnd/AddDataUserName.php
index f8a0546..92ee3e8 100644
--- a/src/Hook/LinkEnd/AddDataUserName.php
+++ b/src/Hook/LinkEnd/AddDataUserName.php
@@ -22,5 +22,6 @@
}
 
$this->attribs['data-bs-username'] = $user->getName();
+   return true;
}
 }
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/398664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I594f80f133e98124fa021e024063d0a0e3c4b28f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAvatars[master]: Use of DFD module and some new features

2017-12-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398663 )

Change subject: Use of DFD module and some new features
..

Use of DFD module and some new features

* Now usind DFD module
* Added new tag  that allows to have user images in wikitext
* Added user option (with preview) for profile image (formerly in BSF)
* Added profile image to every user-page link (this is probably a bad idea;
maybe just add it to history view, using a different hook)
* Removed obsolete setting "DefaultSize"

TODO:
* Use a mustache template for the image
* Handle width/height properly
* Add config var for LinkEnd feature

Change-Id: I39523a2dceaeb17a5e26aa705bc579665e264528
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A src/Config.php
D src/ConfigDefinition/AvatarsDefaultSize.php
A src/DynamicFileDispatcher/Image.php
A src/DynamicFileDispatcher/ImageExternal.php
A src/DynamicFileDispatcher/UserProfileImage.php
M src/Generator.php
D src/Hook/BSCoreGetUserMiniProfileBeforeInit/SetAvatar.php
A src/Hook/GetPreferences/AddProfileImage.php
A src/Hook/LinkEnd/AddUserImage.php
A src/Hook/ParserFirstCallInit/AddUserImageTag.php
A src/Html/FormField/UserImage.php
A src/Html/ProfileImage.php
A src/Tag/UserImage.php
16 files changed, 426 insertions(+), 67 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAvatars 
refs/changes/63/398663/1

diff --git a/extension.json b/extension.json
index 1136107..9de7bdd 100644
--- a/extension.json
+++ b/extension.json
@@ -16,10 +16,12 @@
"className": "Avatars",
"extPath": "/BlueSpiceAvatars",
"configDefinitions": {
-   "AvatarsDefaultSize": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsDefaultSize::getInstance",
"AvatarsGenerator": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsGenerator::getInstance"
}
}
+   },
+   "DynamicFileRegistry": {
+   "userprofileimage": 
"\\BlueSpice\\Avatars\\DynamicFileDispatcher\\UserProfileImage"
}
}
},
@@ -66,17 +68,19 @@
},
"config_prefix": "bsg",
"config": {
-   "AvatarsDefaultSize": {
-   "value": 40
-   },
"AvatarsGenerator": {
"value": "InstantAvatar"
}
},
+   "DefaultUserOptions": {
+   "bs-avatars-profileimage": ""
+   },
"Hooks": {
"BeforePageDisplay": 
"\\BlueSpice\\Avatars\\Hook\\BeforePageDisplay\\AddModules::callback",
-   "UnitTestsList": "Avatars::onUnitTestsList",
-   "BSCoreGetUserMiniProfileBeforeInit": 
"\\BlueSpice\\Avatars\\Hook\\BSCoreGetUserMiniProfileBeforeInit\\SetAvatar::callback"
+   "GetPreferences": 
"\\BlueSpice\\Avatars\\Hook\\GetPreferences\\AddProfileImage::callback",
+   "ParserFirstCallInit": 
"\\BlueSpice\\Avatars\\Hook\\ParserFirstCallInit\\AddUserImageTag::callback",
+   "LinkEnd": 
"\\BlueSpice\\Avatars\\Hook\\LinkEnd\\AddUserImage::callback",
+   "UnitTestsList": "Avatars::onUnitTestsList"
},
"load_composer_autoloader": true,
"manifest_version": 2
diff --git a/i18n/en.json b/i18n/en.json
index 88f1ac2..f0e16a1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,6 +9,8 @@
"bs-avatars-desc": "Provides generic and individual user pictures",
"bs-avatars-pref-generator": "Generator:",
"bs-avatars-pref-defaultsize": "Default size in pixel:",
+   "bs-avatars-pref-userimage": "User image:",
+   "bs-avatars-pref-userimage-img-alt": "Your current user image",
"bs-avatars-upload-complete": "The picture was uploaded.",
"bs-avatars-generate-complete": "A new avatar was generated.",
"bs-avatars-upload-title": "Change profile picture",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 556ca64..b2aa81a 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,6 +9,8 @@
"bs-avatars-desc": "Used in 
[{{canonicalurl:Special:WikiAdmin|mode=ExtensionInfo}} 
Special:WikiAdmin?mode=ExtensionInfo], description of avatars extension",
"bs-avatars-pref-generator": "Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], label for avatar 
generator:\n{{Identical|Generator}}",
"bs-avatars-pref-defaultsize": "Option in 
[{{canonicalurl:Special:WikiAdmin|mode=Preferences}} 
Special:WikiAdmin?mode=Preferences], label for default size of avatar in 
pixel:",
+   "bs-avatars-pref-userimage": "Option in

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Refactored UserMiniProfile and UserProfileImage DFD-Module

2017-12-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398659 )

Change subject: Refactored UserMiniProfile and UserProfileImage DFD-Module
..

Refactored UserMiniProfile and UserProfileImage DFD-Module

* Moved user setting to Extension:BlueSpiceAvatars
* Therefore BSF only handles "anon" and "default"

Change-Id: I4958c75cc66b5c9c863e0471ca3c5fe511dad0b1
---
M includes/outputhandler/views/view.UserMiniProfile.php
M src/DynamicFileDispatcher/UserProfileImage.php
A src/DynamicFileDispatcher/UserProfileImage/AnonImage.php
A src/DynamicFileDispatcher/UserProfileImage/DefaultImage.php
D src/DynamicFileDispatcher/UserProfileImage/Image.php
D src/DynamicFileDispatcher/UserProfileImage/ImageExternal.php
6 files changed, 72 insertions(+), 209 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/59/398659/1

diff --git a/includes/outputhandler/views/view.UserMiniProfile.php 
b/includes/outputhandler/views/view.UserMiniProfile.php
index 5bc65b1..5c67d6b 100644
--- a/includes/outputhandler/views/view.UserMiniProfile.php
+++ b/includes/outputhandler/views/view.UserMiniProfile.php
@@ -1,7 +1,8 @@
 aDefaultClasses;
 
$params = array_merge( $this->mOptions, [
-   Params::MODULE => 'userprofileimage',
-   'username' => $this->mOptions['user']->getName(),
+   Params::MODULE => UserProfileImage::MODULE_NAME,
+   UserProfileImage::USERNAME => 
$this->mOptions['user']->getName(),
+   UserProfileImage::WIDTH => 
(int)$this->mOptions['width'],
+   UserProfileImage::HEIGHT => 
(int)$this->mOptions['height']
]);
-   $dfdUrlBuilder = MediaWikiServices::getInstance()->getService(
-   'BSDynamicFileDispatcherUrlBuilder'
-   );
-   $url = $dfdUrlBuilder->build(
-   new Params( $params )
-   );
+
+   $dfdUrlBuilder = 
Services::getInstance()->getBSDynamicFileDispatcherUrlBuilder();
+   $url = $dfdUrlBuilder->build( new Params( $params ) );
 
$aOut = array();
$aOut[] = '';
@@ -101,69 +101,6 @@
);
}
 
-   if( empty( $this->mOptions['userimagesrc'] ) ) {
-   $this->mOptions['userimagesrc'] = 
$GLOBALS['wgScriptPath']
-   
."/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-user-default-image.png";
-   }
-
-   if ( $oUser->isAnon() ) {
-   $this->mOptions['userimagesrc'] = 
$GLOBALS['wgScriptPath']
-   
."/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-user-anon-image.png";
-   $this->mOptions['linktargethref'] = '';
-   } else {
-   $sUserImageName = BsConfig::getVarForUser( 
'MW::UserImage', $oUser );
-   if ( !empty( $sUserImageName ) ) { //Image given as a 
url
-
-   if ( $sUserImageName{0} == '/' ) {
-   //relative url from own system given
-   $this->mOptions['userimagesrc'] = 
$sUserImageName;
-   } elseif ( $this->isExternalUrl( 
$sUserImageName ) ) {
-   $aParsedUrl = wfParseUrl( 
$sUserImageName );
-   //external url
-   //TODO: Fix, when system is call via 
https:// and the given
-   //url is http:// the browser will block 
the image
-   $bAllowedProtocoll = in_array(
-   
$aParsedUrl['scheme'].$aParsedUrl['delimiter'],
-   $wgUrlProtocols
-   );
-   if( $bAllowedProtocoll ) {
-   $sQuery = isset( 
$aParsedUrl['query'] ) ?
-   
"?{$aParsedUrl['query']}"
-   : ''
-   ;
-   $this->mOptions['userimagesrc'] 
=
-   $aParsedUrl['scheme']
-   
.$aParsedUrl['delimiter']
-   .$aParsedUrl['host']
-   .$aParsedUrl['path']
-   .$sQuery
-

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Change BlueSpice\Services to be decorator

2017-12-16 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/398654 )

Change subject: Change BlueSpice\Services to be decorator
..

Change BlueSpice\Services to be decorator

... of MediaWikiServices

Change-Id: I1d4b1eb462e9942a2f63b53087c38ba188e93ee1
---
M src/Services.php
A src/ServicesDecorator.php
2 files changed, 388 insertions(+), 9 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/54/398654/1

diff --git a/src/Services.php b/src/Services.php
index 5f8f51d..5ce168e 100644
--- a/src/Services.php
+++ b/src/Services.php
@@ -4,14 +4,14 @@
 
 use MediaWiki\MediaWikiServices;
 
-class Services extends MediaWikiServices {
+class Services extends ServicesDecorator {
 
/**
 *
 * @return ExtensionRegistry
 */
public function getBSExtensionRegistry() {
-   return $this->getService( 'BSExtensionRegistry' );
+   return $this->decoratedServices->getService( 
'BSExtensionRegistry' );
}
 
/**
@@ -19,7 +19,7 @@
 * @return ExtensionFactory
 */
public function getBSExtensionFactory() {
-   return $this->getService( 'BSExtensionFactory' );
+   return $this->decoratedServices->getService( 
'BSExtensionFactory' );
}
 
/**
@@ -27,7 +27,7 @@
 * @return ConfigDefinitionFactory
 */
public function getBSConfigDefinitionFactory() {
-   return $this->getService( 'BSConfigDefinitionFactory' );
+   return $this->decoratedServices->getService( 
'BSConfigDefinitionFactory' );
}
 
/**
@@ -35,7 +35,7 @@
 * @return DynamicFileDispatcher\Factory
 */
public function getBSDynamicFileDispatcherFactory() {
-   return $this->getService( 'BSDynamicFileDispatcherFactory' );
+   return $this->decoratedServices->getService( 
'BSDynamicFileDispatcherFactory' );
}
 
/**
@@ -43,7 +43,7 @@
 * @return DynamicFileDispatcher\UrlBuilder
 */
public function getBSDynamicFileDispatcherUrlBuilder() {
-   return $this->getService( 'BSDynamicFileDispatcherUrlBuilder' );
+   return $this->decoratedServices->getService( 
'BSDynamicFileDispatcherUrlBuilder' );
}
 
/**
@@ -51,7 +51,7 @@
 * @return EntityRegistry
 */
public function getBSEntityRegistry() {
-   return $this->getService( 'BSEntityRegistry' );
+   return $this->decoratedServices->getService( 'BSEntityRegistry' 
);
}
 
/**
@@ -59,7 +59,7 @@
 * @return EntityConfigFactory
 */
public function getBSEntityConfigFactory() {
-   return $this->getService( 'BSEntityConfigFactory' );
+   return $this->decoratedServices->getService( 
'BSEntityConfigFactory' );
}
 
/**
@@ -67,6 +67,6 @@
 * @return EntityFactory
 */
public function getBSEntityFactory() {
-   return $this->getService( 'BSEntityFactory' );
+   return $this->decoratedServices->getService( 'BSEntityFactory' 
);
}
 }
\ No newline at end of file
diff --git a/src/ServicesDecorator.php b/src/ServicesDecorator.php
new file mode 100644
index 000..83c0cdf
--- /dev/null
+++ b/src/ServicesDecorator.php
@@ -0,0 +1,379 @@
+decoratedServices = $services;
+   }
+
+   /**
+* @params MediaWikiServices
+* @return Services
+* @throws MWException
+* @throws \FatalError
+*/
+   private static function newInstance( $services ) {
+   $instance = new static( $services );
+
+   \Hooks::run( 'BlueSpiceServices', [ $instance ] );
+
+   return $instance;
+   }
+
+   /*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/**
+* Returns the Config object containing the bootstrap configuration.
+* Bootstrap configuration would typically include database credentials
+* and other information that may be needed before the ConfigFactory
+* service can be instantiated.
+*
+* @note This should only be used during bootstrapping, in particular
+* when creating the MainConfig service. Application logic should
+* use getMainConfig() to get a Config instances.
+*
+* @since 1.27
+* @return Config
+*/
+   public function getBootstrapConfig() {
+   return $this->decoratedServices->getService( 'BootstrapConfig' 
);
+   }
+
+   /**
+* @since 1.27
+* @return ConfigFactory
+*/
+   public function getConfigFactory() {
+   return

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAvatars[master]: Fix namespace on thrown exception

2017-12-11 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397482 )

Change subject: Fix namespace on thrown exception
..

Fix namespace on thrown exception

Change-Id: I7ecfd0720597831d254b03df54c6b76fcc9896f5
---
M src/Generator.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceAvatars 
refs/changes/82/397482/1

diff --git a/src/Generator.php b/src/Generator.php
index 01dbfdb..8ceef44 100644
--- a/src/Generator.php
+++ b/src/Generator.php
@@ -51,7 +51,7 @@
);
break;
default:
-   throw new MWException(
+   throw new \MWException(
'FATAL: Avatar generator not 
found!'
);
}

-- 
To view, visit https://gerrit.wikimedia.org/r/397482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ecfd0720597831d254b03df54c6b76fcc9896f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceAvatars
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: [WIP] Add RenderFactory

2017-12-11 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397471 )

Change subject: [WIP] Add RenderFactory
..

[WIP] Add RenderFactory

Extensions should only add array-data to the SkinTemplate::data field.
The skin then decides where to render it and uses a Renderer from the factory.
The registry allows skins to override default rendering.

Change-Id: Ie151494d3624fe5c27a68458d4f34a29c1582a23
---
M extension.json
M includes/ServiceWiring.php
A src/ExtensionAttributeBasedRegistry.php
A src/IRegistry.php
A src/IRenderer.php
A src/Renderer/SimpleList.php
A src/RendererFactory.php
M src/Services.php
8 files changed, 176 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/71/397471/1

diff --git a/extension.json b/extension.json
index d1d1ed8..a327f0c 100644
--- a/extension.json
+++ b/extension.json
@@ -25,7 +25,19 @@
"userprofileimage": 
"\\BlueSpice\\DynamicFileDispatcher\\UserProfileImage",
"articlepreviewimage": 
"\\BlueSpice\\DynamicFileDispatcher\\ArticlePreviewImage"
},
-   "EntityRegistry": {}
+   "EntityRegistry": {},
+   "RendererRegistry": {
+   "form": "\\BlueSpice\\Renderer\\Form",
+   "SimpleList": 
"\\BlueSpice\\Renderer\\SimpleList",
+   "panel": "\\BlueSpice\\Renderer\\Panel",
+   "table": "\\BlueSpice\\Renderer\\Table",
+   "treenavigation": 
"\\BlueSpice\\Renderer\\TreeNavigation"
+   },
+   "SkinDataRendererRegistry": {
+   "bs_navigation_site": 
"\\BlueSpice\\Renderer\\TreeNavigation",
+   "bs_navigation_globalactions_general": 
"\\BlueSpice\\Renderer\\SimpleList",
+   "bs_navigation_globalactions_admin": 
"\\BlueSpice\\Renderer\\SimpleList"
+   }
}
},
"ExtensionFunctions": [
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index cc15ae4..ca5bb73 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -2,6 +2,8 @@
 
 use MediaWiki\MediaWikiServices;
 
+use BlueSpice\ExtensionAttributeBasedRegistry;
+
 return [
 
'BSExtensionRegistry' => function ( MediaWikiServices $services ) {
@@ -57,4 +59,26 @@
$services->getConfigFactory()->makeConfig( 'bsg' )
);
},
+
+   'BSRendererFactory' => function ( MediaWikiServices $services ) {
+   $registry = new ExtensionAttributeBasedRegistry(
+   'BlueSpiceFoundationRendererRegistry'
+   );
+
+   return new \BlueSpice\RendererFactory(
+   $registry,
+   $services->getConfigFactory()->makeConfig( 'bsg' )
+   );
+   },
+
+   'BSSkinDataRendererFactory' => function ( MediaWikiServices $services ) 
{
+   $registry = new ExtensionAttributeBasedRegistry(
+   'BlueSpiceFoundationSkinDataRendererRegistry'
+   );
+
+   return new \BlueSpice\SkinDataRendererFactory(
+   $registry,
+   $services->getConfigFactory()->makeConfig( 'bsg' )
+   );
+   }
 ];
diff --git a/src/ExtensionAttributeBasedRegistry.php 
b/src/ExtensionAttributeBasedRegistry.php
new file mode 100644
index 000..c02f30e
--- /dev/null
+++ b/src/ExtensionAttributeBasedRegistry.php
@@ -0,0 +1,52 @@
+attribName = $attribName;
+   $this->extensionRegistry = $extensionRegistry;
+   if( $this->extensionRegistry === null ) {
+   $this->extensionRegistry = 
\ExtensionRegistry::getInstance();
+   }
+   }
+
+   /**
+*
+* @param string $key
+* @param string $default
+* @return string
+*/
+   public function getValue( $key, $default = '' ) {
+   $registry = $this->extensionRegistry->getAttribute( 
$this->attribName );
+   $value = isset( $registry[$key] ) ? $registry[$key] : $default;
+
+   if( is_array( $value ) ) {
+   //Attributes get merged together instead of being 
overwritten,
+   //so just take the last one
+   $value = end( $value );
+   }
+
+   return (string)$value;
+   }
+}
\ No newline at end of file
diff --git a/src/IRegistry.php b/src/IRegistry.php
new file mode 100644
index 000..c92da46
--- /dev/null
+++ b/src/IRegistry.php
@@ -0,0 +1,14 @@
+registry = $registry;
+   $this->config = $config;
+   }

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add ExtensionRegitry and ExtensionFactory

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397330 )

Change subject: Add ExtensionRegitry and ExtensionFactory
..

Add ExtensionRegitry and ExtensionFactory

... to Services

Change-Id: I535f2ffa03ce4631279925ddaab4c35726274cdb
---
M src/Services.php
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/30/397330/1

diff --git a/src/Services.php b/src/Services.php
index 9d6e369..5f8f51d 100644
--- a/src/Services.php
+++ b/src/Services.php
@@ -8,6 +8,22 @@
 
/**
 *
+* @return ExtensionRegistry
+*/
+   public function getBSExtensionRegistry() {
+   return $this->getService( 'BSExtensionRegistry' );
+   }
+
+   /**
+*
+* @return ExtensionFactory
+*/
+   public function getBSExtensionFactory() {
+   return $this->getService( 'BSExtensionFactory' );
+   }
+
+   /**
+*
 * @return ConfigDefinitionFactory
 */
public function getBSConfigDefinitionFactory() {

-- 
To view, visit https://gerrit.wikimedia.org/r/397330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I535f2ffa03ce4631279925ddaab4c35726274cdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27_dev]: PageContentProvider: Add additional wrapper classes

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395959 )

Change subject: PageContentProvider: Add additional wrapper classes
..


PageContentProvider: Add additional wrapper classes

Allows better CSS styling in PDF Export.
This is required for ERM8101.

NEEDS CHERRY-PICK TO REL1_27 AND REL1_27_dev

Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
---
M includes/utility/PageContentProvider.class.php
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/includes/utility/PageContentProvider.class.php 
b/includes/utility/PageContentProvider.class.php
index d2d3ff3..f8951c6 100644
--- a/includes/utility/PageContentProvider.class.php
+++ b/includes/utility/PageContentProvider.class.php
@@ -26,7 +26,7 @@
 
//Default Template
$sTemplate = array();
-   $sTemplate[] = '';
+   $sTemplate[] = '';
$sTemplate[] = ''; //jump-anchor
$sTemplate[] = '%s';
$sTemplate[] = '';
@@ -349,6 +349,7 @@
if( $this->bEncapsulateContent ) {
$sHTML = sprintf(
$this->getTemplate(),
+   $this->getWrapperAttributes( $oTitle ),
'bs-ue-jumpmark-'.
md5( 
$oTitle->getPrefixedText().$aParams['oldid'] ),
empty( $sTitle ) ? $oTitle->getPrefixedText( ) 
: $sTitle,
@@ -364,6 +365,15 @@
}
 
/**
+   * @param \Title $oTitle
+   * @return string
+   */
+   protected function getWrapperAttributes( $oTitle ) {
+   $cssClass = Sanitizer::escapeClass( 
'page-'.$oTitle->getPrefixedDBKey() );
+   return "class=\"bs-page-content $cssClass\"";
+   }
+
+   /**
 * This method returns the WikiText of a Wiki page as seen in the edit 
view. Currently, it supports Title objects of normal Articles.
 * @param Title $oTitle The MediaWiki Title object from which the html 
output should be extracted
 * @param Array $aParams Contains processing information, like the 
requested revision id (oldid) and wether to follow redirects or not.

-- 
To view, visit https://gerrit.wikimedia.org/r/395959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[REL1_27]: PageContentProvider: Add additional wrapper classes

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395960 )

Change subject: PageContentProvider: Add additional wrapper classes
..


PageContentProvider: Add additional wrapper classes

Allows better CSS styling in PDF Export.
This is required for ERM8101.

NEEDS CHERRY-PICK TO REL1_27 AND REL1_27_dev

Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
---
M includes/utility/PageContentProvider.class.php
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/utility/PageContentProvider.class.php 
b/includes/utility/PageContentProvider.class.php
index d2d3ff3..f8951c6 100644
--- a/includes/utility/PageContentProvider.class.php
+++ b/includes/utility/PageContentProvider.class.php
@@ -26,7 +26,7 @@
 
//Default Template
$sTemplate = array();
-   $sTemplate[] = '';
+   $sTemplate[] = '';
$sTemplate[] = ''; //jump-anchor
$sTemplate[] = '%s';
$sTemplate[] = '';
@@ -349,6 +349,7 @@
if( $this->bEncapsulateContent ) {
$sHTML = sprintf(
$this->getTemplate(),
+   $this->getWrapperAttributes( $oTitle ),
'bs-ue-jumpmark-'.
md5( 
$oTitle->getPrefixedText().$aParams['oldid'] ),
empty( $sTitle ) ? $oTitle->getPrefixedText( ) 
: $sTitle,
@@ -364,6 +365,15 @@
}
 
/**
+   * @param \Title $oTitle
+   * @return string
+   */
+   protected function getWrapperAttributes( $oTitle ) {
+   $cssClass = Sanitizer::escapeClass( 
'page-'.$oTitle->getPrefixedDBKey() );
+   return "class=\"bs-page-content $cssClass\"";
+   }
+
+   /**
 * This method returns the WikiText of a Wiki page as seen in the edit 
view. Currently, it supports Title objects of normal Articles.
 * @param Title $oTitle The MediaWiki Title object from which the html 
output should be extracted
 * @param Array $aParams Contains processing information, like the 
requested revision id (oldid) and wether to follow redirects or not.

-- 
To view, visit https://gerrit.wikimedia.org/r/395960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_27
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Added applied status to filter

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396330 )

Change subject: BSFoundation: Added applied status to filter
..


BSFoundation: Added applied status to filter

* applied can be set by any pre-filter functionality. So the filters do not 
match already filtered datasets
* Also fixed missing comparission in ListFilter

Change-Id: I437e235f4b3ef8496769d9260122022d50bc9ce1
---
M src/Data/Filter.php
M src/Data/Filter/ListValue.php
2 files changed, 29 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/Data/Filter.php b/src/Data/Filter.php
index ea87ceb..fb05e53 100644
--- a/src/Data/Filter.php
+++ b/src/Data/Filter.php
@@ -31,6 +31,12 @@
 
/**
 *
+* @var boolean
+*/
+   protected $applied = false;
+
+   /**
+*
 * @param array $params
 */
public function __construct( $params ) {
@@ -69,9 +75,19 @@
 * @return boolean
 */
public function matches( $dataSet ) {
+   if( $this->applied ) {
+   return true;
+   }
return $this->doesMatch( $dataSet );
}
 
+   /**
+*
+* @param boolean $applied
+*/
+   public function setAppied( $applied = true ) {
+   $this->applied = $applied;
+   }
 
/**
 *
diff --git a/src/Data/Filter/ListValue.php b/src/Data/Filter/ListValue.php
index 00bc7ca..c01040b 100644
--- a/src/Data/Filter/ListValue.php
+++ b/src/Data/Filter/ListValue.php
@@ -5,6 +5,18 @@
 use BlueSpice\Data\Filter;
 
 class ListValue extends Filter {
+   const COMPARISON_CONTAINS = 'ct';
+
+   /**
+*
+* @param array $params
+*/
+   public function __construct( $params ) {
+   if( !isset( $params[self::KEY_COMPARISON] ) ) {
+   $params[self::KEY_COMPARISON] = 
static::COMPARISON_CONTAINS;
+   }
+   parent::__construct( $params );
+   }
 
/**
 * Performs list filtering based on given filter of type array on a 
dataset
@@ -27,3 +39,4 @@
return true;
}
 }
+

-- 
To view, visit https://gerrit.wikimedia.org/r/396330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I437e235f4b3ef8496769d9260122022d50bc9ce1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: BlueSpicePageTemplates: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393764 )

Change subject: BlueSpicePageTemplates: Change config
..


BlueSpicePageTemplates: Change config

Added config-data to extension.js.

Removed BsConfig::registerVar-methods on main-class.

Altered get-methdos on main-class.

Added config-classes.

Removed unsused code.

Added Config-Definitions.

Changed datatype of config-class.

Updated to manifest-version 2.

Fixed wrong Namepace in config-classes.

Change-Id: I673aef4db4ff2b057a9d9f9f1aa79d492aabc3ff
---
M PageTemplates.class.php
M extension.json
A src/configDefinition/PageTemplatesExcludeNs.php
A src/configDefinition/PageTemplatesForceNamespace.php
A src/configDefinition/PageTemplatesHideDefaults.php
A src/configDefinition/PageTemplatesHideIfNotInTargetNs.php
6 files changed, 91 insertions(+), 33 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/PageTemplates.class.php b/PageTemplates.class.php
index 09ba6c4..39013da 100644
--- a/PageTemplates.class.php
+++ b/PageTemplates.class.php
@@ -58,14 +58,6 @@
$this->setHook( 'MessagesPreLoad' );
$this->setHook( 'ParserFirstCallInit' );
 
-   // Do not use page template mechanism for these pages
-   BsConfig::registerVar( 'MW::PageTemplates::ExcludeNs', array( 
-2,-1,6,7,8,9,10,11,14,15 ), 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_ARRAY_INT|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagetemplates-pref-excludens', 'multiselectex' );
-   // Force page to be created in target namespace
-   BsConfig::registerVar( 'MW::PageTemplates::ForceNamespace', 
false, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-pagetemplates-pref-forcenamespace', 'toggle' );
-   // Hide template if page is not in target namespace
-   BsConfig::registerVar( 
'MW::PageTemplates::HideIfNotInTargetNs', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-pagetemplates-pref-hideifnotintargetns', 'toggle' );
-   BsConfig::registerVar( 'MW::PageTemplates::HideDefaults', 
false, BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 
'bs-pagetemplates-pref-hidedefaults', 'toggle' );
-
$this->mCore->registerPermission( 
'pagetemplatesadmin-viewspecialpage', array( 'sysop' ), array( 'type' => 
'global' ) );
 
wfProfileOut( 'BS::'.__METHOD__ );
@@ -82,22 +74,6 @@
__DIR__.'/'.'db'.'/'.'PageTemplates.sql'
);
return true;
-   }
-
-   public function runPreferencePlugin( $sAdapterName, $oVariable ) {
-   $aNamespaces = array();
-   global $wgContLang;
-
-   foreach ( $wgContLang->getNamespaces() as $ns ) {
-   $nsIndex = $wgContLang->getNsIndex( $ns );
-   $aNamespaces[$nsIndex] = 
BsNamespaceHelper::getNamespaceName( $nsIndex );
-   }
-
-   $aPrefs = array(
-   'type' => 'multiselectex',
-   'options' => $aNamespaces,
-   );
-   return $aPrefs;
}
 
/**
@@ -172,10 +148,12 @@
// if we are not on a wiki page, return. This is important when 
calling import scripts that try to create nonexistent pages, e.g. importImages
if ( !is_object( $oTitle ) ) return true;
 
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
+
$oPageTemplateList = new BSPageTemplateList( $oTitle, array(
-   BSPageTemplateList::HIDE_IF_NOT_IN_TARGET_NS => 
BsConfig::get( 'MW::PageTemplates::HideIfNotInTargetNs' ),
-   BSPageTemplateList::FORCE_NAMESPACE => BsConfig::get( 
'MW::PageTemplates::ForceNamespace' ),
-   BSPageTemplateList::HIDE_DEFAULTS => BsConfig::get( 
'MW::PageTemplates::HideDefaults' )
+   BSPageTemplateList::HIDE_IF_NOT_IN_TARGET_NS => 
$config->get( 'PageTemplatesHideIfNotInTargetNs' ),
+   BSPageTemplateList::FORCE_NAMESPACE => $config->get( 
'PageTemplatesForceNamespace' ),
+   BSPageTemplateList::HIDE_DEFAULTS => $config->get( 
'PageTemplatesHideDefaults' )
) );
 
$oPageTemplateListRenderer = new BSPageTemplateListRenderer();
@@ -200,7 +178,8 @@
if ( $oTarget->isKnown() ) return true;
}
 
-   $aExNs = BsConfig::get( 'MW::PageTemplates::ExcludeNs' );
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
+   $aExNs = $config->get( 'PageTemplatesExcludeNs' );
if ( in_array( $oTarget->getNamespace(), $aExNs ) ) {
return true;
}
diff --git a/extension.json

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceBlog[master]: BlueSpiceBlog: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393767 )

Change subject: BlueSpiceBlog: Change config
..


BlueSpiceBlog: Change config

Removed config-data on main-class.

Added config-data on JSON.

Added config-classes.

Added "Blog"-Prefixes.

Removed private config.

Updated to manifest version 2.

Changed BsConfig-get-method.

Change-Id: I2d9f4f50528a3e456c49a5c0e322fc8adf46cdc5
---
M Blog.class.php
M extension.json
A src/configDefinition/BlogImageRenderMode.php
A src/configDefinition/BlogMaxEntryCharacters.php
A src/configDefinition/BlogMoreInNewWindow.php
A src/configDefinition/BlogNewEntryFieldPosition.php
A src/configDefinition/BlogShowAll.php
A src/configDefinition/BlogShowInfo.php
A src/configDefinition/BlogShowLimit.php
A src/configDefinition/BlogShowNewEntryField.php
A src/configDefinition/BlogShowPermalink.php
A src/configDefinition/BlogThumbFloatDirection.php
M views/view.Blog.php
13 files changed, 215 insertions(+), 50 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/Blog.class.php b/Blog.class.php
index 6953652..67e3934 100644
--- a/Blog.class.php
+++ b/Blog.class.php
@@ -53,35 +53,6 @@
$this->setHook( 'BSTopMenuBarCustomizerRegisterNavigationSites' 
);
$this->setHook( 'BSUsageTrackerRegisterCollectors' );
 
-   // Trackback is not fully functional in MW and thus disabled.
-   BsConfig::registerVar( 'MW::Blog::ShowTrackback', false, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL );
-   // Show permalink link at end of a blog entry
-   BsConfig::registerVar( 'MW::Blog::ShowPermalink', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-showpermalink', 
'toggle' );
-   // Show info line below blog entry heading
-   BsConfig::registerVar( 'MW::Blog::ShowInfo', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-showinfo', 'toggle');
-   // Open more link in new window
-   BsConfig::registerVar( 'MW::Blog::MoreInNewWindow', false, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-moreinnewwindow', 
'toggle' );
-   // Should a link to complete list of blog entries be rendered?
-   BsConfig::registerVar( 'MW::Blog::ShowAll', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-showall', 'toggle' );
-   // Place more link at end of blog entry instead of next line
-   BsConfig::registerVar( 'MW::Blog::MoreAtEndOfEntry', true, 
BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL, 'toggle' );
-   // Possible values are "creation" and "title"
-   BsConfig::registerVar( 'MW::Blog::SortBy', 'creation', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-blog-pref-sortby', 'select' );
-   // Number of blog entries that shall be displayed initially
-   BsConfig::registerVar( 'MW::Blog::ShowLimit', 10, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-showlimit', 'int' );
-   // Show form that allows to create a new blog entry
-   BsConfig::registerVar( 'MW::Blog::ShowNewEntryField', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-blog-pref-shownewentryfield', 
'toggle' );
-   // Position of new entry field. Possible values are "top" and 
"bottom"
-   BsConfig::registerVar( 'MW::Blog::NewEntryFieldPosition', 
'top', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-blog-pref-newentryfieldposition', 'select' );
-   // Maximum number of characters befor an entry is automatically 
cut
-   BsConfig::registerVar( 'MW::Blog::MaxEntryCharacters', 1000, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_INT, 'bs-blog-pref-maxentrycharacters', 
'int' );
-   // Defines how images should be rendered. Possible values: 
full|thumb|none
-   BsConfig::registerVar( 'MW::Blog::ImageRenderMode', 'thumb', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-blog-pref-imagerendermode', 'select' );
-   // Defines float direction of images when ImageRenderMode is 
thumb. Possible values: left|right|none
-   BsConfig::registerVar( 'MW::Blog::ThumbFloatDirection', 
'right', 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-blog-pref-imagefloatdirection', 'select' );
-
-   BsConfig::registerVar( 'MW::Blog::ShowTagFormWhenNotLoggedIn', 
false, BsConfig::LEVEL_PRIVATE|BsConfig::TYPE_BOOL, 'toggle' );
-
$this->mCore->registerPermission( 'blog-viewspecialpage', 
array('user'), array( 'type' => 'global' ) );
 
wfProfileOut( 'BS::'.__METHOD__ );
@@ -382,20 +353,20 @@
// initialize local variables

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceDashboards[master]: BlueSpiceDashboards: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394052 )

Change subject: BlueSpiceDashboards: Change config
..


BlueSpiceDashboards: Change config

Added config-data in extension.json.

Removed BsConfig-Registration in main-classes.

Added Hook AddUserDashboardOnLogo.php

Fixed namespace on config-class.

Fixed path of hook.

Change-Id: I88a1749a62eb9a27b67109271cc11d372cd87db0
---
M Dashboards.class.php
M extension.json
M resources/bluespice.dashboards.main.js
A src/Hook/GetPreferences/AddUserDashboardOnLogo.php
4 files changed, 21 insertions(+), 3 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/Dashboards.class.php b/Dashboards.class.php
index 1c04df0..9f7eebf 100644
--- a/Dashboards.class.php
+++ b/Dashboards.class.php
@@ -41,8 +41,6 @@
public function  initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
 
-   BsConfig::registerVar('MW::Dashboards::UserDashboardOnLogo', 
false, BsConfig::LEVEL_USER|BsConfig::TYPE_BOOL, 
'bs-dashboards-pref-userdashboardonlogo', 'toggle');
-
$this->setHook( 'BeforePageDisplay' );
$this->setHook( 'ParserFirstCallInit' );
$this->setHook( 'PersonalUrls' );
diff --git a/extension.json b/extension.json
index 7b9fed9..05be913 100644
--- a/extension.json
+++ b/extension.json
@@ -29,6 +29,9 @@
"i18n"
]
},
+   "DefaultUserOptions": {
+   "bs-dashboards-userdashboardonlogo" : false
+   },
"ExtensionMessagesFiles": {
"DashboardsAlias": "languages/Dashboards.alias.php"
},
@@ -96,6 +99,7 @@
"remoteExtPath": "BlueSpiceDashboards/resources"
},
"Hooks": {
+   "GetPreferences": 
"\\BlueSpice\\Dashboards\\Hook\\GetPreferences\\AddUserDashboardOnLogo::callback",
"LoadExtensionSchemaUpdates": "Dashboards::getSchemaUpdates",
"UnitTestsList": "Dashboards::onUnitTestsList"
},
diff --git a/resources/bluespice.dashboards.main.js 
b/resources/bluespice.dashboards.main.js
index cc32c63..a452f38 100644
--- a/resources/bluespice.dashboards.main.js
+++ b/resources/bluespice.dashboards.main.js
@@ -1,5 +1,5 @@
 $(function(){
-   if ( mw.user.options.get( 'MW::Dashboards::UserDashboardOnLogo', false 
) == true ) {
+   if ( mw.user.options.get( 'bs-dashboards-pref-userdashboardonlogo', 
false ) == true ) {
 
var $logoAnchor = $('#p-logo a').first(); //MediaWiki Skin
if( $logoAnchor.length == 0 ) {
diff --git a/src/Hook/GetPreferences/AddUserDashboardOnLogo.php 
b/src/Hook/GetPreferences/AddUserDashboardOnLogo.php
new file mode 100644
index 000..e65e20c
--- /dev/null
+++ b/src/Hook/GetPreferences/AddUserDashboardOnLogo.php
@@ -0,0 +1,16 @@
+preferences['bs-dashboards-pref-userdashboardonlogo'] = 
array(
+   'type' => 'toggle',
+   'label-message' => 
'bs-dashboards-pref-userdashboardonlogo',
+   'section' => 'bluespice/dashboards',
+   );
+   return true;
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/394052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I88a1749a62eb9a27b67109271cc11d372cd87db0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: BlueSpiceNamespaceManager: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394030 )

Change subject: BlueSpiceNamespaceManager: Change config
..


BlueSpiceNamespaceManager: Change config

Added config-data in extension.json.

Removed BsConfig::registerVar-methods in main-class.

Corrected get-methods.

Changed manifest-version to version 2.

Corrected get-methods

Change-Id: I39d65b93f1afb9efb2b07f90162b360cb6134a0c
---
M NamespaceManager.class.php
M extension.json
M includes/api/BSApiNamespaceTasks.php
3 files changed, 19 insertions(+), 9 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/NamespaceManager.class.php b/NamespaceManager.class.php
index 2ef82c3..c6d4c3c 100644
--- a/NamespaceManager.class.php
+++ b/NamespaceManager.class.php
@@ -67,8 +67,6 @@
public function initExt() {
wfProfileIn( 'BS::'.__METHOD__ );
 
-   BsConfig::registerVar( 'MW::NamespaceManager::NsOffset', 2999, 
BsConfig::TYPE_INT, BsConfig::LEVEL_PRIVATE );
-
$this->mCore->registerPermission( 
'namespacemanager-viewspecialpage', array( 'sysop' ), array( 'type' => 'global' 
) );
 
$this->setHook( 'NamespaceManager::editNamespace', 
'onEditNamespace', true );
diff --git a/extension.json b/extension.json
index f521382..c399168 100644
--- a/extension.json
+++ b/extension.json
@@ -10,10 +10,14 @@
],
"descriptionmsg": "bs-namespacemanager-desc",
"type": "bluespice",
-   "bsgExtensions": {
-   "BlueSpiceNamespaceManager": {
-   "className": "NamespaceManager",
-   "extPath": "/BlueSpiceNamespaceManager"
+   "attributes": {
+   "BlueSpiceFoundation": {
+   "Extensions": {
+   "BlueSpiceNamespaceManager": {
+   "className": "NamespaceManager",
+   "extPath": "/BlueSpiceNamespaceManager"
+   }
+   }
}
},
"callback": "NamespaceManager::onRegistration",
@@ -40,6 +44,12 @@
},
"ExtensionMessagesFiles": {
"NamespaceManagerAlias": 
"includes/specials/SpecialNamespaceManager.alias.php"
+   },
+   "config-prefix": "bsg",
+   "config": {
+   "NamespaceManagerNsOffset": {
+   "value": 2999
+   }
},
"AutoloadClasses": {
"NamespaceManager": "NamespaceManager.class.php",
@@ -80,5 +90,5 @@
"remoteExtPath": "BlueSpiceNamespaceManager"
},
"load_composer_autoloader" : true,
-   "manifest_version": 1
+   "manifest_version": 2
 }
diff --git a/includes/api/BSApiNamespaceTasks.php 
b/includes/api/BSApiNamespaceTasks.php
index 7ec9db0..4cc7a85 100644
--- a/includes/api/BSApiNamespaceTasks.php
+++ b/includes/api/BSApiNamespaceTasks.php
@@ -111,8 +111,10 @@
$iNS = key( $aNamespaces ) + 1;
reset( $aNamespaces );
 
-   if ( $iNS < BsConfig::get( 'MW::NamespaceManager::NsOffset' ) ) 
{
-   $iNS = BsConfig::get( 'MW::NamespaceManager::NsOffset' 
) + 1;
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
+
+   if ( $iNS < $config->get( 'MW::NamespaceManager::NsOffset' ) ) {
+   $iNS = $config->get( 'MW::NamespaceManager::NsOffset' ) 
+ 1;
}
 
$sResult = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/394030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I39d65b93f1afb9efb2b07f90162b360cb6134a0c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceContextMenu[master]: BlueSpiceContextMenu: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393778 )

Change subject: BlueSpiceContextMenu: Change config
..


BlueSpiceContextMenu: Change config

Added config-data in extension.json.

Removed BsConfig::registerVar-methods in main-classes.

Added config-class.

Added Hook-path.

Change-Id: Iedb4ed355b37fd4961abc24e3bb4df3daf058711
---
M ContextMenu.class.php
M extension.json
M resources/bluespice.contextmenu.js
A src/Hook/GetPreferences/AddModus.php
4 files changed, 26 insertions(+), 18 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/ContextMenu.class.php b/ContextMenu.class.php
index 35b8281..b808e86 100644
--- a/ContextMenu.class.php
+++ b/ContextMenu.class.php
@@ -39,23 +39,6 @@
 */
protected function initExt() {
$this->setHook('BeforePageDisplay');
-
-   BsConfig::registerVar( 'MW::ContextMenu::Modus', 'ctrl', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-contextmenu-pref-modus', 'radio' );
-   }
-
-   /**
-* Called by Preferences and UserPreferences
-* @param string $sAdapterName Name of the adapter. Probably MW.
-* @param BsConfig $oVariable The variable that is to be specified.
-* @return array Option array of specifications.
-*/
-   public function runPreferencePlugin( $sAdapterName, $oVariable ) {
-   return array(
-   'options' => array(
-   wfMessage( 
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )->text() => 'ctrl',
-   wfMessage( 
'bs-contextmenu-pref-modus-just-right-mouse' )->text() => 'no-ctrl'
-   ),
-   );
}
 
/**
diff --git a/extension.json b/extension.json
index ae0c70d..1e3f272 100644
--- a/extension.json
+++ b/extension.json
@@ -20,11 +20,15 @@
"i18n"
]
},
+   "DefaultUserOptions": {
+   "bs-contextmenu-modus" : "ctrl"
+   },
"AutoloadClasses": {
"ContextMenu": "ContextMenu.class.php",
"BSApiContextMenuTasks": 
"includes/api/BSApiContextMenuTasks.php"
},
"Hooks": {
+   "GetPreferences": 
"\\BlueSpice\\ContextMenu\\Hook\\GetPreferences\\AddModule::callback",
"UnitTestsList": "ContextMenu::onUnitTestsList"
},
"APIModules": {
diff --git a/resources/bluespice.contextmenu.js 
b/resources/bluespice.contextmenu.js
index f957589..1fb6721 100644
--- a/resources/bluespice.contextmenu.js
+++ b/resources/bluespice.contextmenu.js
@@ -23,7 +23,7 @@
return false;
};
 
-   var modus = mw.user.options.get('MW::ContextMenu::Modus', 'ctrl');
+   var modus = mw.user.options.get( 'bs-contextmenu-modus', 'ctrl' );
 
$(document).on( 'contextmenu', 'a', function( e ) {
if( (modus === 'no-ctrl' && e.ctrlKey) || (modus === 'ctrl' && 
!e.ctrlKey) ) {
diff --git a/src/Hook/GetPreferences/AddModus.php 
b/src/Hook/GetPreferences/AddModus.php
new file mode 100644
index 000..9cb51c0
--- /dev/null
+++ b/src/Hook/GetPreferences/AddModus.php
@@ -0,0 +1,21 @@
+preferences['bs-contextmenu-modus'] = array(
+   'type' => 'radio',
+   'label-message' => 'bs-contextmenu-pref-modus',
+   'section' => 'bluespice/contextmenu',
+   'options' => array(
+   wfMessage( 
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )->text() => 'ctrl',
+   wfMessage( 
'bs-contextmenu-pref-modus-just-right-mouse' )->text() => 'no-ctrl'
+   ),
+   'default' => 'ctrl',
+   );
+   return true;
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/393778
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedb4ed355b37fd4961abc24e3bb4df3daf058711
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceContextMenu
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePagesVisited[master]: BlueSpicePagesVisited: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394061 )

Change subject: BlueSpicePagesVisited: Change config
..


BlueSpicePagesVisited: Change config

Added config-data in extension.json.

Removed BsConfig-registration methods in main-class.

Altered config-get methods.

Added config-classes.

Fixed callbacks on Hooks.

Fixed namespace on config-classes.

Added params to config-classes.

Corrected callback-methods on hook.

Corrected options on config-class.

Change-Id: If3a540ad70e926a16a0b7690c129e1eebe03dff1
---
M PagesVisited.class.php
M extension.json
A src/Hook/GetPreferences/AddWidgetLimit.php
A src/Hook/GetPreferences/AddWidgetNS.php
A src/Hook/GetPreferences/WidgetSortOdr.php
5 files changed, 71 insertions(+), 36 deletions(-)

Approvals:
  Pwirth: Looks good to me, approved
  Robert Vogel: Verified



diff --git a/PagesVisited.class.php b/PagesVisited.class.php
index 5c1c2ab..e26d067 100644
--- a/PagesVisited.class.php
+++ b/PagesVisited.class.php
@@ -52,40 +52,7 @@
$this->setHook( 'BSInsertMagicAjaxGetData' );
$this->setHook( 'BSUsageTrackerRegisterCollectors' );
 
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetLimit', 10, 
BsConfig::LEVEL_USER|BsConfig::TYPE_INT, 'bs-pagesvisited-pref-widgetlimit', 
'int' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetNS', array( 0 
), 
BsConfig::LEVEL_USER|BsConfig::TYPE_ARRAY_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
 'bs-pagesvisited-pref-widgetns', 'multiselectex' );
-   BsConfig::registerVar( 'MW::PagesVisited::WidgetSortOdr', 
'time', 
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS, 
'bs-pagesvisited-pref-widgetsortodr', 'select' );
-
wfProfileOut( 'BS::'.__METHOD__ );
-   }
-
-   /**
-* The preferences plugin callback
-* @param string $sAdapterName
-* @param BsConfig $oVariable
-* @return array MediaWiki preferences options array
-*/
-   public function runPreferencePlugin( $sAdapterName, $oVariable ) {
-   $aPrefs = array();
-   switch( $oVariable->getName() ) {
-   case 'WidgetNS':
-   $aPrefs = array(
-   'type' => 'multiselectex',
-   'options' => 
BsNamespaceHelper::getNamespacesForSelectOptions( array( -2, NS_MEDIA, 
NS_MEDIAWIKI, NS_MEDIAWIKI_TALK, NS_SPECIAL ) )
-   );
-   break;
-   case 'WidgetSortOdr':
-   $aPrefs = array(
-   'options' => array(
-   wfMessage( 
'bs-pagesvisited-pref-sort-time' )->plain() => 'time',
-   wfMessage( 
'bs-pagesvisited-pref-sort-pagename' )->plain() => 'pagename'
-   )
-   );
-   break;
-   default:
-   break;
-   }
-   return $aPrefs;
}
 
/**
@@ -211,9 +178,11 @@
 * @param array &$aViews List of Widget view objects from the BlueSpice 
Skin.
 */
private function addWidgetView( &$aViews ) {
-   $iCount = BsConfig::get( 'MW::PagesVisited::WidgetLimit' );
-   $aNamespaces = BsConfig::get( 'MW::PagesVisited::WidgetNS' );
-   $sSortOrder = BsConfig::get( 'MW::PagesVisited::WidgetSortOdr' 
);
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
+
+   $iCount = $config->get( 'PagesVisitedWidgetLimit' );
+   $aNamespaces = $config->get( 'PagesVisitedWidgetNS' );
+   $sSortOrder = $config->get( 'PagesVisitedWidgetSortOdr' );
 
//Validation
$oValidationICount = BsValidator::isValid( 'IntegerRange', 
$iCount, array( 'fullResponse' => true, 'lowerBoundary' => 1, 'upperBoundary' 
=> 30 ) );
diff --git a/extension.json b/extension.json
index 307a955..3984fdb 100644
--- a/extension.json
+++ b/extension.json
@@ -20,9 +20,22 @@
"i18n"
]
},
+   "DefaultUserOptions": {
+   "bs-pagesvisited-pref-widgetlimit": "int",
+   "bs-pagesvisited-pref-widgetns": "multiselectex",
+   "bs-pagesvisited-pref-widgetsortodr": "select"
+   },
"AutoloadClasses": {
"PagesVisited": "PagesVisited.class.php"
},
+   "Hooks": {
+   "GetPreferences": [
+   
"\\BlueSpice\\PagesVisited\\Hook\\GetPreferences\\AddWidgetLimit::callback",
+

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePermissionManager[master]: BlueSpicePermissionManager: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393763 )

Change subject: BlueSpicePermissionManager: Change config
..


BlueSpicePermissionManager: Change config

Added config-data in extension.json.

Removed BsConfig::registerVar-methods in main-class.

Added config-class.

Removed old config registration

Removed unused code.

Removed PermissionManagerRealityCheck.php

Added config-definition.

Set return-value of 'isStored' to 'true'.

Removed isStored-method.

Updated to manifest version 2.

Fixed namespace on config-class.

Change-Id: If4378466db1aa457ce3dda0c448465ff90d79bb4
---
M PermissionManager.class.php
M extension.json
A src/ConfigDefinition/PermissionManagerMaxBackups.php
3 files changed, 33 insertions(+), 9 deletions(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/PermissionManager.class.php b/PermissionManager.class.php
index d603933..c1a17bb 100644
--- a/PermissionManager.class.php
+++ b/PermissionManager.class.php
@@ -104,9 +104,6 @@
}
 
protected function initExt() {
-   BsConfig::registerVar( 'MW::PermissionManager::RealityCheck', 
false, BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_BOOL | 
BsConfig::RENDER_AS_JAVASCRIPT, 'bs-permissionmanager-pref-enablerealitycheck', 
'toggle' );
-   BsConfig::registerVar( 'MW::PermissionManager::MaxBackups', 5, 
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_INT, 
'bs-permissionmanager-pref-max-backups' );
-
$this->setHook( 'BSGroupManagerGroupNameChanged' );
$this->setHook( 'BSGroupManagerGroupDeleted' );
 
@@ -613,8 +610,9 @@
return ( strpos( $elem, "pm-settings-backup-" ) !== 
FALSE ) ? true : false;
} );
 
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
//default limit to 5 backups, remove all backup files until 
"maxbackups" files left
-   while ( count( $arrBackupFiles ) > BsConfig::get( 
"MW::PermissionManager::MaxBackups" ) ) {
+   while ( count( $arrBackupFiles ) > $config->get( 
"PermissionManagerMaxBackups" ) ) {
$oldBackupFile = dirname( $bsgConfigFiles[ 
'PermissionManager' ] ) . "/" . array_shift( $arrBackupFiles );
unlink( $oldBackupFile );
}
diff --git a/extension.json b/extension.json
index 22e19ba..676accb 100644
--- a/extension.json
+++ b/extension.json
@@ -9,10 +9,17 @@
],
"descriptionmsg": "bs-permissionmanager-desc",
"type": "bluespice",
-   "bsgExtensions": {
-   "BlueSpicePermissionManager": {
-   "className": "PermissionManager",
-   "extPath": "/BlueSpicePermissionManager"
+   "attributes": {
+   "BlueSpiceFoundation": {
+   "Extensions": {
+   "BlueSpicePermissionManager": {
+   "className": "PermissionManager",
+   "extPath": 
"/BlueSpicePermissionManager",
+   "configDefinitions": {
+   "PermissionManagerMaxBackups": 
"\\BlueSpice\\PermissionManager\\ConfigDefinition\\PermissionManagerMaxBackups::getInstance"
+   }
+   }
+   }
}
},
"SpecialPages": {
@@ -37,6 +44,14 @@
},
"ExtensionMessagesFiles": {
"PermissionManagerAlias": 
"includes/specials/SpecialPermissionManager.alias.php"
+   },
+   "config_prefix": "bsg",
+   "config": {
+   "PermissionManagerMaxBackups": {
+   "value": 5,
+   "descriptionmsg": 
"bs-permissionmanager-pref-max-backups",
+   "public": true
+   }
},
"AutoloadClasses": {
"PermissionManager": "PermissionManager.class.php",
@@ -99,5 +114,5 @@
},
"callback": "PermissionManagerHooks::onCallback",
"load_composer_autoloader": true,
-   "manifest_version": 1
+   "manifest_version": 2
 }
diff --git a/src/ConfigDefinition/PermissionManagerMaxBackups.php 
b/src/ConfigDefinition/PermissionManagerMaxBackups.php
new file mode 100644
index 000..2b61f5a
--- /dev/null
+++ b/src/ConfigDefinition/PermissionManagerMaxBackups.php
@@ -0,0 +1,11 @@
+https://gerrit.wikimedia.org/r/393763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If4378466db1aa457ce3dda0c448465ff90d79bb4
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/extensions/BlueSpicePermissionManager
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer 
Gerrit-Reviewer: Ljonka

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Added bsg config to BsSpecialpage base class

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396577 )

Change subject: BSFoundation: Added bsg config to BsSpecialpage base class
..


BSFoundation: Added bsg config to BsSpecialpage base class

Change-Id: I36d704030ebc91dc7e18879284b8035f286c13e0
---
M includes/SpecialPage.class.php
1 file changed, 11 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/includes/SpecialPage.class.php b/includes/SpecialPage.class.php
index a7495c7..b2c987a 100644
--- a/includes/SpecialPage.class.php
+++ b/includes/SpecialPage.class.php
@@ -36,4 +36,14 @@
protected function getGroupName() {
return 'bluespice';
}
-}
\ No newline at end of file
+
+   /**
+* Shortcut to get main config object
+* @return \Config
+* @since 1.24
+*/
+   public function getConfig() {
+   return \MediaWiki\MediaWikiServices::getInstance()
+   ->getConfigFactory()->makeConfig( 'bsg' );
+   }
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/396577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36d704030ebc91dc7e18879284b8035f286c13e0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceReaders[master]: BlueSpiceReaders: Change config

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394036 )

Change subject: BlueSpiceReaders: Change config
..


BlueSpiceReaders: Change config

Added config-data in extension.json.

Removed BsConfig::registerVar-methods in main-class.

Added config-classes.

Removed old config registration.

Updated config-get methods.

Changed manifest-version to version 2.

Corrected namespac on config-classes.

Removed config "ReadersActive".

Corrected configDefinition-path

Change-Id: Ib94fb1a9dd9819129081086bda8c6e0db4828a44
---
M Readers.class.php
M extension.json
A src/ConfigDefinition/ReadersNumOfReaders.php
3 files changed, 32 insertions(+), 10 deletions(-)

Approvals:
  Pwirth: Looks good to me, approved
  Robert Vogel: Verified



diff --git a/Readers.class.php b/Readers.class.php
index c12be0f..2d95949 100644
--- a/Readers.class.php
+++ b/Readers.class.php
@@ -42,9 +42,6 @@
 
$this->mCore->registerPermission( 'viewreaders', array(), 
array( 'type' => 'global' ) );
 
-   BsConfig::registerVar( 'MW::Readers::Active', true, 
BsConfig::LEVEL_PUBLIC|BsConfig::TYPE_BOOL, 'bs-readers-pref-active', 'toggle' 
);
-   BsConfig::registerVar( 'MW::Readers::NumOfReaders', 10, 
BsConfig::TYPE_INT|BsConfig::LEVEL_PUBLIC, 'bs-readers-pref-numofreaders', 
'int' );
-
wfProfileOut( 'BS::'.__METHOD__ );
}
 
@@ -189,6 +186,7 @@
private function getReadersViewForAfterContent( $oTitle ) {
$oViewReaders = null;
$oDbr = wfGetDB( DB_REPLICA );
+   $config = 
\MediaWiki\MediaWikiServices::getInstance()->getConfigFactory()->makeConfig( 
'bsg' );
$res = $oDbr->select(
array( 'bs_readers' ),
array( 'readers_user_id', 'MAX(readers_ts) as 
readers_ts' ),
@@ -197,7 +195,7 @@
array(
'GROUP BY' => 'readers_user_id',
'ORDER BY' => 'MAX(readers_ts) DESC',
-   'LIMIT' => BsConfig::get( 
'MW::Readers::NumOfReaders' )
+   'LIMIT' => $config->get( 
'ReadersNumOfReaders' )
)
);
 
@@ -224,8 +222,6 @@
$oUser = $this->getUser();
 
if ( wfReadOnly() ) return false;
-
-   if ( BsConfig::get( 'MW::Readers::Active' ) == false ) return 
false;
 
if ( is_null( $oTitle ) ) return false;
 
diff --git a/extension.json b/extension.json
index 6d3eb95..a56f55c 100644
--- a/extension.json
+++ b/extension.json
@@ -9,10 +9,17 @@
],
"descriptionmsg": "bs-readers-desc",
"type": "bluespice",
-   "bsgExtensions": {
-   "BlueSpiceReaders": {
-   "className": "Readers",
-   "extPath": "/BlueSpiceReaders"
+   "attributes": {
+   "BlueSpiceFoundation": {
+   "Extensions": {
+   "BlueSpiceReaders": {
+   "className": "Readers",
+   "extPath": "/BlueSpiceReaders",
+   "configDefinition": {
+   "ReadersNumOfReaders": 
"\\BlueSpice\\Readers\\ConfigDefinition\\ReadersNumOfReaders::getInstance"
+   }
+   }
+   }
}
},
"SpecialPages": {
@@ -30,6 +37,14 @@
"ExtensionMessagesFiles": {
"ReadersAlias": "languages/SpecialReaders.alias.php"
},
+   "config-prefix": "bsg",
+   "config": {
+   "ReadersNumOfReaders": {
+   "value": 10,
+   "descriptionmsg": "bs-readers-pref-numofreaders",
+   "public": true
+   }
+   },
"AutoloadClasses": {
"Readers": "Readers.class.php",
"ViewReaders": "views/view.Readers.php",
diff --git a/src/ConfigDefinition/ReadersNumOfReaders.php 
b/src/ConfigDefinition/ReadersNumOfReaders.php
new file mode 100644
index 000..69e6a40
--- /dev/null
+++ b/src/ConfigDefinition/ReadersNumOfReaders.php
@@ -0,0 +1,11 @@
+https://gerrit.wikimedia.org/r/394036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib94fb1a9dd9819129081086bda8c6e0db4828a44
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/BlueSpiceReaders
Gerrit-Branch: master
Gerrit-Owner: Pmiguelpirzer 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add BlueSpice\Services

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397317 )

Change subject: Add BlueSpice\Services
..


Add BlueSpice\Services

Provides convenient accessor methods for services

HINT: It would probably be better to use the decorator pattern here instead of
just extending MediaWiki\MediaWikiServices to prevent double instantiation of
services

Change-Id: Ibbf5163a035f67cf471934e821efaea4f836271c
---
M src/Hook.php
A src/Services.php
2 files changed, 58 insertions(+), 2 deletions(-)

Approvals:
  Pwirth: Looks good to me, approved
  Robert Vogel: Verified



diff --git a/src/Hook.php b/src/Hook.php
index e221aa3..c822f59 100644
--- a/src/Hook.php
+++ b/src/Hook.php
@@ -87,10 +87,10 @@
 
/**
 *
-* @return MediaWikiServices
+* @return Services
 */
protected function getServices() {
-   return MediaWikiServices::getInstance();
+   return Services::getInstance();
}
 
public function process() {
diff --git a/src/Services.php b/src/Services.php
new file mode 100644
index 000..9d6e369
--- /dev/null
+++ b/src/Services.php
@@ -0,0 +1,56 @@
+getService( 'BSConfigDefinitionFactory' );
+   }
+
+   /**
+*
+* @return DynamicFileDispatcher\Factory
+*/
+   public function getBSDynamicFileDispatcherFactory() {
+   return $this->getService( 'BSDynamicFileDispatcherFactory' );
+   }
+
+   /**
+*
+* @return DynamicFileDispatcher\UrlBuilder
+*/
+   public function getBSDynamicFileDispatcherUrlBuilder() {
+   return $this->getService( 'BSDynamicFileDispatcherUrlBuilder' );
+   }
+
+   /**
+*
+* @return EntityRegistry
+*/
+   public function getBSEntityRegistry() {
+   return $this->getService( 'BSEntityRegistry' );
+   }
+
+   /**
+*
+* @return EntityConfigFactory
+*/
+   public function getBSEntityConfigFactory() {
+   return $this->getService( 'BSEntityConfigFactory' );
+   }
+
+   /**
+*
+* @return EntityFactory
+*/
+   public function getBSEntityFactory() {
+   return $this->getService( 'BSEntityFactory' );
+   }
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/397317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbf5163a035f67cf471934e821efaea4f836271c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Reworked BsExtensionManager into registry / fa...

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/396312 )

Change subject: BSFoundation: Reworked BsExtensionManager into registry / 
factory services
..


BSFoundation: Reworked BsExtensionManager into registry / factory services

* Added ExtensinRegistry
* Added ExtensionFactory
* Removed deprecated SecureFileStore usage
* Removed deprecated methods in BsExtensionManager
* Marked the left over methods in BsExtensionManager as deprecated
* Replaced usage of BsExtensionManager methods
* Used ResouceLoader to set client configs: assets paths, version

Beware, that all the workarounds for wrong BlueSpice extension registry
is removed by this commit. Now it is made clear, when something is wrong

Change-Id: I57ac9698b385c08e6dd087b85b0aa59697197392
---
M extension.json
M includes/Core.class.php
M includes/CoreHooks.php
M includes/ExtensionManager.class.php
M includes/ServiceWiring.php
M includes/TemplateHelper.php
M includes/api/BSApiFileBackendStore.php
M includes/skins/BsBaseTemplate.php
M includes/utility/FileSystemHelper.class.php
A src/ExtensionFactory.php
A src/ExtensionRegistry.php
A src/Hook/ResourceLoaderGetConfigVars/AddAssetsPaths.php
A src/Hook/ResourceLoaderGetConfigVars/AddVersion.php
13 files changed, 488 insertions(+), 378 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index aca2f07..bc4ed39 100644
--- a/extension.json
+++ b/extension.json
@@ -12,6 +12,7 @@
"BlueSpiceFoundation": {
"Extensions": {
"BlueSpiceFoundation": {
+   "extPath": "/BlueSpiceFoundation",
"configDefinitions": {
"Logo": 
"\\BlueSpice\\ConfigDefinition\\Logo::getInstance",
"FileExtensions": 
"\\BlueSpice\\ConfigDefinition\\FileExtensions::getInstance",
@@ -456,8 +457,9 @@
],
"UnitTestsList": "BsCoreHooks::onUnitTestsList",
"ResourceLoaderGetConfigVars": [
-   "BsExtensionManager::onResourceLoaderGetConfigVars",
-   
"BlueSpice\\Hook\\ResourceLoaderGetConfigVars\\AddBSGConfig::callback"
+   
"\\BlueSpice\\Hook\\ResourceLoaderGetConfigVars\\AddVersion::callback",
+   
"\\BlueSpice\\Hook\\ResourceLoaderGetConfigVars\\AddBSGConfig::callback",
+   
"\\BlueSpice\\Hook\\ResourceLoaderGetConfigVars\\AddAssetsPaths::callback"
]
},
"config_prefix": "bsg",
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 5ede68b..37a61ba 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -30,6 +30,7 @@
  * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v3
  * @filesource
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * The BsCore
@@ -300,7 +301,10 @@
BSNotifications::init();
 
wfProfileIn('Performance: ' . __METHOD__ . ' - Load and 
initialize all Extensions');
-   BsExtensionManager::initialiseExtensions( self::$oInstance );
+   $factory = MediaWikiServices::getInstance()->getService(
+   'BSExtensionFactory'
+   );
+   $factory->getExtensions();
wfProfileOut('Performance: ' . __METHOD__ . ' - Load and 
initialize all Extensions');
 
global $wgHooks;
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 0a9489b..9aea743 100644
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -1,4 +1,6 @@
 getConfigFactory()->makeConfig( 'bsg' );
@@ -112,15 +114,6 @@
$out->addJsConfigVars( 'bsImageExtensions', $aImageExtensions );
$out->addJsConfigVars( 'bsIsWindows', wfIsWindows() );
 
-   $aExtensionConfs = 
BsExtensionManager::getRegisteredExtensions();
-   $aAssetsPaths = array(
-   'BlueSpiceFoundation' => 
$wgExtensionAssetsPath.'/BlueSpiceFoundation'
-   );
-
-   foreach( $aExtensionConfs as $sName => $aConf ) {
-   $aAssetsPaths[$sName] = 
$wgExtensionAssetsPath.$aConf['extPath'];
-   }
-
//provide task permission data for current user to be used in 
js ui elements, eg show / hide elements
//get all registered api modules
global $wgAPIModules;
@@ -132,8 +125,6 @@
}
}
 
-   //TODO: Implement as RL Module: see 
ResourceLoaderUserOptionsModule
-   $out->addJsConfigVars('bsExtensionManagerAssetsPaths', 
$aAssetsPaths);
self::addTestSystem( $out );
return true;
}
@@

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Added basic ArticlePreviewImage module

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394306 )

Change subject: BSFoundation: Added basic ArticlePreviewImage module
..


BSFoundation: Added basic ArticlePreviewImage module

Change-Id: I92b35f29d753a35907a5e949d08de7f9a6ba4f84
---
M extension.json
A resources/assets/article-preview-images/dummy.png
A src/DynamicFileDispatcher/ArticlePreviewImage.php
A src/DynamicFileDispatcher/ArticlePreviewImage/Image.php
M src/DynamicFileDispatcher/Factory.php
5 files changed, 109 insertions(+), 1 deletion(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index aca2f07..e800179 100644
--- a/extension.json
+++ b/extension.json
@@ -21,7 +21,8 @@
}
},
"DynamicFileRegistry": {
-   "userprofileimage": 
"\\BlueSpice\\DynamicFileDispatcher\\UserProfileImage"
+   "userprofileimage": 
"\\BlueSpice\\DynamicFileDispatcher\\UserProfileImage",
+   "articlepreviewimage": 
"\\BlueSpice\\DynamicFileDispatcher\\ArticlePreviewImage"
},
"EntityRegistry": {}
}
diff --git a/resources/assets/article-preview-images/dummy.png 
b/resources/assets/article-preview-images/dummy.png
new file mode 100644
index 000..048b952
--- /dev/null
+++ b/resources/assets/article-preview-images/dummy.png
Binary files differ
diff --git a/src/DynamicFileDispatcher/ArticlePreviewImage.php 
b/src/DynamicFileDispatcher/ArticlePreviewImage.php
new file mode 100644
index 000..192a6d5
--- /dev/null
+++ b/src/DynamicFileDispatcher/ArticlePreviewImage.php
@@ -0,0 +1,49 @@
+ [
+   Params::PARAM_TYPE => Params::TYPE_STRING,
+   Params::PARAM_DEFAULT => '',
+   ],
+   static::WIDTH => [
+   Params::PARAM_TYPE => Params::TYPE_INT,
+   Params::PARAM_DEFAULT => 40, //TODO: config
+   ],
+   static::HEIGHT => [
+   Params::PARAM_TYPE => Params::TYPE_INT,
+   Params::PARAM_DEFAULT => 40, //TODO: config
+   ],
+   ]);
+   }
+
+   /**
+*
+* @param Params $params
+*/
+   protected function extractParams( $params ) {
+   parent::extractParams( $params );
+   if( !\Title::newFromText( $this->params[static::TITLETEXT] ) ) {
+   throw new \MWException(
+   "Invalid titletext: 
{$this->params[static::TITLETEXT]}"
+   );
+   }
+   }
+
+   /**
+* @return File
+*/
+   public function getFile() {
+   return new 
\BlueSpice\DynamicFileDispatcher\ArticlePreviewImage\Image(
+   $this,
+   \Title::newFromText( $this->params[static::TITLETEXT] )
+   );
+   }
+}
\ No newline at end of file
diff --git a/src/DynamicFileDispatcher/ArticlePreviewImage/Image.php 
b/src/DynamicFileDispatcher/ArticlePreviewImage/Image.php
new file mode 100644
index 000..85e0dc5
--- /dev/null
+++ b/src/DynamicFileDispatcher/ArticlePreviewImage/Image.php
@@ -0,0 +1,50 @@
+title = $title;
+   }
+
+   protected function getSourcePath() {
+   return $GLOBALS['wgExtensionDirectory']
+   
."/BlueSpiceFoundation/resources/assets/article-preview-images/dummy.png";
+   }
+
+   /**
+* Sets the headers for given \WebResponse
+* @param \WebResponse $response
+* @return void
+*/
+   public function setHeaders( \WebResponse $response ) {
+   $response->header(
+   'Content-type: '.$this->getMimeType(),
+   true
+   );
+
+   $path = \BsFileSystemHelper::normalizePath(
+   $this->getSourcePath()
+   );
+
+   readfile( $path );
+   }
+
+   public function getMimeType() {
+   return 'image/png';
+   }
+}
\ No newline at end of file
diff --git a/src/DynamicFileDispatcher/Factory.php 
b/src/DynamicFileDispatcher/Factory.php
index fc054a5..5b64577 100644
--- a/src/DynamicFileDispatcher/Factory.php
+++ b/src/DynamicFileDispatcher/Factory.php
@@ -77,6 +77,14 @@
$this->modules = $extRegistry->getAttribute(
'BlueSpiceFoundationDynamicFileRegistry'
);
+   foreach( $this->modules as $key => $module ) {
+   if( !is_array( $module ) ) {
+   continue;
+   }
+

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceBlog[master]: removed BSDebug::logVar()

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395932 )

Change subject: removed BSDebug::logVar()
..


removed BSDebug::logVar()

Change-Id: Ie82140d0d0ba173bf20d5c81eb9680acc31689be
---
M Blog.class.php
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  Pwirth: Verified; Looks good to me, approved



diff --git a/Blog.class.php b/Blog.class.php
index 6953652..76fbe12 100644
--- a/Blog.class.php
+++ b/Blog.class.php
@@ -749,7 +749,6 @@
$oTitle = Title::newFromText( 'Blog', $iNS );
if( $oTitle && $oTitle instanceof Title ) {
$aSubpages = $oTitle->getSubpages();
-   BSDebug::logVar($aSubpages);
}
 
}

-- 
To view, visit https://gerrit.wikimedia.org/r/395932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie82140d0d0ba173bf20d5c81eb9680acc31689be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceBlog
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: Add BlueSpice\Services

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397317 )

Change subject: Add BlueSpice\Services
..

Add BlueSpice\Services

Provides convenient accessor methods for services

HINT: It would probably be better to use the decorator pattern here instead of
just extending MediaWiki\MediaWikiServices to prevent double instantiation of
services

Change-Id: Ibbf5163a035f67cf471934e821efaea4f836271c
---
M src/Hook.php
A src/Services.php
2 files changed, 58 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/17/397317/1

diff --git a/src/Hook.php b/src/Hook.php
index e221aa3..c822f59 100644
--- a/src/Hook.php
+++ b/src/Hook.php
@@ -87,10 +87,10 @@
 
/**
 *
-* @return MediaWikiServices
+* @return Services
 */
protected function getServices() {
-   return MediaWikiServices::getInstance();
+   return Services::getInstance();
}
 
public function process() {
diff --git a/src/Services.php b/src/Services.php
new file mode 100644
index 000..9d6e369
--- /dev/null
+++ b/src/Services.php
@@ -0,0 +1,56 @@
+getService( 'BSConfigDefinitionFactory' );
+   }
+
+   /**
+*
+* @return DynamicFileDispatcher\Factory
+*/
+   public function getBSDynamicFileDispatcherFactory() {
+   return $this->getService( 'BSDynamicFileDispatcherFactory' );
+   }
+
+   /**
+*
+* @return DynamicFileDispatcher\UrlBuilder
+*/
+   public function getBSDynamicFileDispatcherUrlBuilder() {
+   return $this->getService( 'BSDynamicFileDispatcherUrlBuilder' );
+   }
+
+   /**
+*
+* @return EntityRegistry
+*/
+   public function getBSEntityRegistry() {
+   return $this->getService( 'BSEntityRegistry' );
+   }
+
+   /**
+*
+* @return EntityConfigFactory
+*/
+   public function getBSEntityConfigFactory() {
+   return $this->getService( 'BSEntityConfigFactory' );
+   }
+
+   /**
+*
+* @return EntityFactory
+*/
+   public function getBSEntityFactory() {
+   return $this->getService( 'BSEntityFactory' );
+   }
+}
\ No newline at end of file

-- 
To view, visit https://gerrit.wikimedia.org/r/397317
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbf5163a035f67cf471934e821efaea4f836271c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Remove &$this occurences

2017-12-10 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/397268 )

Change subject: Remove &$this occurences
..

Remove &$this occurences

See T153505 for details.

Change-Id: I1f403daeb143f34e579842bcd9e5b36fa2a0f508
---
M src/Lookup.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedSearch 
refs/changes/68/397268/1

diff --git a/src/Lookup.php b/src/Lookup.php
index f1156de..79b08f4 100644
--- a/src/Lookup.php
+++ b/src/Lookup.php
@@ -342,7 +342,7 @@
 */
public function setBucketTermsAggregation( $sFieldName ) {
$aFieldNames = explode( '/', $sFieldName );
-   $aBase = &$this;
+   $aBase = $this;
foreach( $aFieldNames as $sFieldNamePart ) {
if( !isset( $aBase['aggs'] ) ) {
$aBase['aggs'] = [];
@@ -368,7 +368,7 @@
public function removeBucketTermsAggregation( $sFieldName ) {
$aFieldNames = explode( '/', $sFieldName );
 
-   $aBase = &$this;
+   $aBase = $this;
$aNode = [];
$sLeafFieldName = '';
foreach( $aFieldNames as $sFieldNamePart ) {
@@ -390,4 +390,4 @@
 
return $this;
}
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/397268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f403daeb143f34e579842bcd9e5b36fa2a0f508
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...NSFileRepo[REL1_27]: Fix for lowercased file names

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395803 )

Change subject: Fix for lowercased file names
..

Fix for lowercased file names

Applies only to reupload or red-link upload:
Even if lowecased name is passed in wpDestFile, NSFR creates a Title
object from it, and that title has some namespace if file is in namespace
of NS_MAIN by default, but in no case NS_FILE. Because of that setting
fase to capitalizing links in NS_FILE ns doesnt matter, because file can
never be in NS_FILE.

Needs cherry-picking to REL1_27

Change-Id: I165d665a31c6c7ef21017d10b8655abd0fe6721e
ERM: #8057
---
M src/Hooks/UploadFormInitDescriptor.php
1 file changed, 12 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo 
refs/changes/03/395803/1

diff --git a/src/Hooks/UploadFormInitDescriptor.php 
b/src/Hooks/UploadFormInitDescriptor.php
index 6761529..7a89949 100644
--- a/src/Hooks/UploadFormInitDescriptor.php
+++ b/src/Hooks/UploadFormInitDescriptor.php
@@ -64,9 +64,18 @@
$this->selectedNamespace = '';
//"wpDestFile" is set on query string. e.g after click on 
redlink or on re-upload
if( !empty( $this->descriptor['DestFile']['default'] ) ) {
-   $target = \Title::newFromText( 
$this->descriptor['DestFile']['default'] );
-   $this->descriptor['DestFile']['default'] = 
$target->getText();
-   $this->selectedNamespace = str_replace(  ' ', '_', 
$target->getNsText() );
+   $target = $this->descriptor['DestFile']['default'];
+   $target = str_replace( '_', ' ', $target );
+   $targetPieces = explode( ':', $target );
+
+   $nsText = '';
+   if( count( $targetPieces) > 1 ) {
+   $nsText = str_replace( ' ', '_', 
$targetPieces[0] );
+   $target = $targetPieces[1];
+   }
+
+   $this->descriptor['DestFile']['default'] = $target;
+   $this->selectedNamespace = $nsText;
}
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/395803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I165d665a31c6c7ef21017d10b8655abd0fe6721e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27_dev]: Fix for NSFR files

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395802 )

Change subject: Fix for NSFR files
..

Fix for NSFR files

When moving file, old file should be removed from index. This File object
is created by calling LocalFile::newFromTitle which always returns
LocalFile, and not NSLocalFile in case NSFR is installed.
This causes getPath() to return filename with NS prefix, making it
impossible to remove from index.

It causes old files to remain in index as redlinks

Change-Id: I08a99a9d0ef0c2181e4a5fcddb1d06e5df448a8f
ERM: #8146
---
M ExtendedSearch/ExtendedSearch.class.php
1 file changed, 2 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/02/395802/1

diff --git a/ExtendedSearch/ExtendedSearch.class.php 
b/ExtendedSearch/ExtendedSearch.class.php
index ab0caa7..8d1d842 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -616,9 +616,8 @@
protected function getFileByTitle( $oTitle ) {
$oFile = RepoGroup::singleton()->findFile( $oTitle );
if( !$oFile ) {
-   $oFile = LocalFile::newFromTitle(
-   $oTitle, RepoGroup::singleton()->getLocalRepo()
-   );
+   $oRepo = RepoGroup::singleton()->getLocalRepo();
+   $oFile = $oRepo->newFile( $oTitle );
}
return $oFile;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/395802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08a99a9d0ef0c2181e4a5fcddb1d06e5df448a8f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Add option to set source attribute for PDF export

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395801 )

Change subject: Add option to set source attribute for PDF export
..

Add option to set source attribute for PDF export

When file is retrieved to be exported in PDF, only its "src" attribute is
evaluated. This works perfectly for images, but in case of PDF (and
other) attachements, it wont work.
Added option where caller can set which attribute to look as a source
attribute

Change-Id: I8de7fbf37e7fd71d446e4607ca40786425cb75df
ERM: #8100
---
M UEModulePDF/includes/PDFFileResolver.php
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/01/395801/1

diff --git a/UEModulePDF/includes/PDFFileResolver.php 
b/UEModulePDF/includes/PDFFileResolver.php
index 55a13ac..63631aa 100644
--- a/UEModulePDF/includes/PDFFileResolver.php
+++ b/UEModulePDF/includes/PDFFileResolver.php
@@ -15,6 +15,11 @@
/**
 * @var string
 */
+   protected $sSourceAttribute;
+
+   /**
+* @var string
+*/
protected $sFileName = '';
 
/**
@@ -46,9 +51,10 @@
 *
 * @param DOMElement $imgEl
 */
-   public function __construct ( $oImgEl, $sWebrootFileSystemPath ) {
+   public function __construct ( $oImgEl, $sWebrootFileSystemPath, 
$sSourceAttribute = 'src' ) {
$this->oImgNode= $oImgEl;
$this->sWebrootFileSystemPath = $sWebrootFileSystemPath;
+   $this->sSourceAttribute = $sSourceAttribute;
 
$this->init();
}
@@ -72,7 +78,7 @@
$wgScriptPath
);
 
-   $sOrigUrl = $this->oImgNode->getAttribute( 'src' );
+   $sOrigUrl = $this->oImgNode->getAttribute( 
$this->sSourceAttribute );
if( strpos( $sOrigUrl, '?' ) ) {
$sOrigUrl = substr( $sOrigUrl, 0, strpos( $sOrigUrl, 
'?'  ) );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/395801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de7fbf37e7fd71d446e4607ca40786425cb75df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27_dev]: Add option to set source attribute for PDF export

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395800 )

Change subject: Add option to set source attribute for PDF export
..

Add option to set source attribute for PDF export

When file is retrieved to be exported in PDF, only its "src" attribute is
evaluated. This works perfectly for images, but in case of PDF (and
other) attachements, it wont work.
Added option where caller can set which attribute to look as a source
attribute

Change-Id: I8de7fbf37e7fd71d446e4607ca40786425cb75df
ERM: #8100
---
M UEModulePDF/includes/PDFFileResolver.php
1 file changed, 8 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/00/395800/1

diff --git a/UEModulePDF/includes/PDFFileResolver.php 
b/UEModulePDF/includes/PDFFileResolver.php
index 55a13ac..63631aa 100644
--- a/UEModulePDF/includes/PDFFileResolver.php
+++ b/UEModulePDF/includes/PDFFileResolver.php
@@ -15,6 +15,11 @@
/**
 * @var string
 */
+   protected $sSourceAttribute;
+
+   /**
+* @var string
+*/
protected $sFileName = '';
 
/**
@@ -46,9 +51,10 @@
 *
 * @param DOMElement $imgEl
 */
-   public function __construct ( $oImgEl, $sWebrootFileSystemPath ) {
+   public function __construct ( $oImgEl, $sWebrootFileSystemPath, 
$sSourceAttribute = 'src' ) {
$this->oImgNode= $oImgEl;
$this->sWebrootFileSystemPath = $sWebrootFileSystemPath;
+   $this->sSourceAttribute = $sSourceAttribute;
 
$this->init();
}
@@ -72,7 +78,7 @@
$wgScriptPath
);
 
-   $sOrigUrl = $this->oImgNode->getAttribute( 'src' );
+   $sOrigUrl = $this->oImgNode->getAttribute( 
$this->sSourceAttribute );
if( strpos( $sOrigUrl, '?' ) ) {
$sOrigUrl = substr( $sOrigUrl, 0, strpos( $sOrigUrl, 
'?'  ) );
}

-- 
To view, visit https://gerrit.wikimedia.org/r/395800
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8de7fbf37e7fd71d446e4607ca40786425cb75df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: ItSpiderman 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27_dev]: PageAccess: Added test group

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395799 )

Change subject: PageAccess: Added test group
..

PageAccess: Added test group

Added extension specific test group

Change-Id: Id24ca641aee44489eef4d9238bc600396f8b1ac2
---
M PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/99/395799/1

diff --git a/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php 
b/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
index 666f7af..db50ae4 100644
--- a/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
+++ b/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
@@ -5,6 +5,7 @@
  * @group api
  * @group Database
  * @group BlueSpice
+ * @group BlueSpicePageAccess
  * @group BlueSpiceExtensions
  */
 class BSApiPageAccessStoreTest extends BSApiExtJSStoreTestBase {

-- 
To view, visit https://gerrit.wikimedia.org/r/395799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id24ca641aee44489eef4d9238bc600396f8b1ac2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: PageAccess: Added test group

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395798 )

Change subject: PageAccess: Added test group
..

PageAccess: Added test group

Added extension specific test group

Change-Id: Id24ca641aee44489eef4d9238bc600396f8b1ac2
---
M PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/98/395798/1

diff --git a/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php 
b/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
index 666f7af..db50ae4 100644
--- a/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
+++ b/PageAccess/tests/phpunit/BSApiPageAccessStoreTest.php
@@ -5,6 +5,7 @@
  * @group api
  * @group Database
  * @group BlueSpice
+ * @group BlueSpicePageAccess
  * @group BlueSpiceExtensions
  */
 class BSApiPageAccessStoreTest extends BSApiExtJSStoreTestBase {

-- 
To view, visit https://gerrit.wikimedia.org/r/395798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id24ca641aee44489eef4d9238bc600396f8b1ac2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27_dev]: Handle DISPLAYTITLE with "&"

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395797 )

Change subject: Handle DISPLAYTITLE with "&"
..

Handle DISPLAYTITLE with "&"

Title got lost when using "&" because it was interpreted as html

Change-Id: Iab784f78fc51ba9b8d324ee2146715d43632933f
---
M UEModulePDF/includes/PDFPageProvider.class.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/97/395797/1

diff --git a/UEModulePDF/includes/PDFPageProvider.class.php 
b/UEModulePDF/includes/PDFPageProvider.class.php
index d65e4d1..781ef37 100644
--- a/UEModulePDF/includes/PDFPageProvider.class.php
+++ b/UEModulePDF/includes/PDFPageProvider.class.php
@@ -68,7 +68,9 @@
 
if( isset($aParams['display-title'] ) ) {
$oBookmarkNode->setAttribute( 'name', 
$aParams['display-title'] );
-   $oFirstHeading->nodeValue = $aParams['display-title'];
+   $oTitleText = 
$oFirstHeading->ownerDocument->createTextNode( $aParams['display-title'] );
+   $oFirstHeading->nodeValue = '';
+   $oFirstHeading->replaceChild( $oTitleText, 
$oFirstHeading->firstChild );
$aData['meta']['title']   = $aParams['display-title'];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/395797
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab784f78fc51ba9b8d324ee2146715d43632933f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Handle DISPLAYTITLE with "&"

2017-12-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395796 )

Change subject: Handle DISPLAYTITLE with "&"
..

Handle DISPLAYTITLE with "&"

Title got lost when using "&" because it was interpreted as html

Change-Id: Iab784f78fc51ba9b8d324ee2146715d43632933f
---
M UEModulePDF/includes/PDFPageProvider.class.php
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/96/395796/1

diff --git a/UEModulePDF/includes/PDFPageProvider.class.php 
b/UEModulePDF/includes/PDFPageProvider.class.php
index d65e4d1..781ef37 100644
--- a/UEModulePDF/includes/PDFPageProvider.class.php
+++ b/UEModulePDF/includes/PDFPageProvider.class.php
@@ -68,7 +68,9 @@
 
if( isset($aParams['display-title'] ) ) {
$oBookmarkNode->setAttribute( 'name', 
$aParams['display-title'] );
-   $oFirstHeading->nodeValue = $aParams['display-title'];
+   $oTitleText = 
$oFirstHeading->ownerDocument->createTextNode( $aParams['display-title'] );
+   $oFirstHeading->nodeValue = '';
+   $oFirstHeading->replaceChild( $oTitleText, 
$oFirstHeading->firstChild );
$aData['meta']['title']   = $aParams['display-title'];
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/395796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab784f78fc51ba9b8d324ee2146715d43632933f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: PageContentProvider: Add additional wrapper classes

2017-12-05 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395492 )

Change subject: PageContentProvider: Add additional wrapper classes
..

PageContentProvider: Add additional wrapper classes

Allows better CSS styling in PDF Export.
This is required for ERM8101.

NEEDS CHERRY-PICK TO REL1_27 AND REL1_27_dev

Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
---
M includes/utility/PageContentProvider.class.php
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/92/395492/1

diff --git a/includes/utility/PageContentProvider.class.php 
b/includes/utility/PageContentProvider.class.php
index d2d3ff3..f8951c6 100644
--- a/includes/utility/PageContentProvider.class.php
+++ b/includes/utility/PageContentProvider.class.php
@@ -26,7 +26,7 @@
 
//Default Template
$sTemplate = array();
-   $sTemplate[] = '';
+   $sTemplate[] = '';
$sTemplate[] = ''; //jump-anchor
$sTemplate[] = '%s';
$sTemplate[] = '';
@@ -349,6 +349,7 @@
if( $this->bEncapsulateContent ) {
$sHTML = sprintf(
$this->getTemplate(),
+   $this->getWrapperAttributes( $oTitle ),
'bs-ue-jumpmark-'.
md5( 
$oTitle->getPrefixedText().$aParams['oldid'] ),
empty( $sTitle ) ? $oTitle->getPrefixedText( ) 
: $sTitle,
@@ -364,6 +365,15 @@
}
 
/**
+   * @param \Title $oTitle
+   * @return string
+   */
+   protected function getWrapperAttributes( $oTitle ) {
+   $cssClass = Sanitizer::escapeClass( 
'page-'.$oTitle->getPrefixedDBKey() );
+   return "class=\"bs-page-content $cssClass\"";
+   }
+
+   /**
 * This method returns the WikiText of a Wiki page as seen in the edit 
view. Currently, it supports Title objects of normal Articles.
 * @param Title $oTitle The MediaWiki Title object from which the html 
output should be extracted
 * @param Array $aParams Contains processing information, like the 
requested revision id (oldid) and wether to follow redirects or not.

-- 
To view, visit https://gerrit.wikimedia.org/r/395492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50614d7fde1a17391baac1330287e9e5ebaed791
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PluggableAuth[master]: Added PluggableAuth::authorize

2017-12-04 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394969 )

Change subject: Added PluggableAuth::authorize
..

Added PluggableAuth::authorize

This way a PluggableAuth-Plugin can implement authorozation without
having to bind to "PluggableAuthUserAuthorization" hook.

Change-Id: I004ee621375442ca323b6d4316a3a2d8b1292b68
---
M includes/PluggableAuth.php
M includes/PluggableAuthLogin.php
2 files changed, 15 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PluggableAuth 
refs/changes/69/394969/1

diff --git a/includes/PluggableAuth.php b/includes/PluggableAuth.php
index b85d8d1..06cc2e1 100644
--- a/includes/PluggableAuth.php
+++ b/includes/PluggableAuth.php
@@ -32,6 +32,7 @@
 
/**
 * @since 2.0
+* @return PluggableAuth
 */
public static function singleton() {
if ( !is_null( self::$instance ) ) {
@@ -46,4 +47,13 @@
wfDebug( 'Could not get authentication plugin instance.' );
return false;
}
+
+   /**
+* Can be overridden by subclasses
+* @param User $user
+* @return boolean
+*/
+   public function authorize( $user ) {
+   return true;
+   }
 }
diff --git a/includes/PluggableAuthLogin.php b/includes/PluggableAuthLogin.php
index 8cf5f94..003832e 100644
--- a/includes/PluggableAuthLogin.php
+++ b/includes/PluggableAuthLogin.php
@@ -21,6 +21,10 @@
$authManager = AuthManager::singleton();
$user = $this->getUser();
$pluggableauth = PluggableAuth::singleton();
+   $id = null;
+   $username = '';
+   $realname = '';
+   $email = '';
$error = null;
if ( $pluggableauth ) {
if ( $pluggableauth->authenticate( $id, $username, 
$realname, $email,
@@ -39,7 +43,7 @@
wfDebug( 'Authenticated existing user: 
' . $user->mName );
}
Hooks::run( 'PluggableAuthPopulateGroups', [ 
$user ] );
-   $authorized = true;
+   $authorized = $pluggableauth->authorize( $user 
);
Hooks::run( 'PluggableAuthUserAuthorization', [ 
$user, &$authorized ] );
if ( $authorized ) {

$authManager->setAuthenticationSessionData(

-- 
To view, visit https://gerrit.wikimedia.org/r/394969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I004ee621375442ca323b6d4316a3a2d8b1292b68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PluggableAuth
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Changed settings for BlueSpice-repos

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/394578 )

Change subject: Changed settings for BlueSpice-repos
..

Changed settings for BlueSpice-repos

* Added new ones
* Removed unused ones
* See T130811

Change-Id: I67d89ac3d1a373d1634e442e8387e7228e093d34
---
M zuul/layout.yaml
1 file changed, 113 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/394578/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index df51f7a..db4f8f7 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4328,12 +4328,62 @@
   - name: extension-unittests-generic
   - name: mwgate-npm
 
+  - name: mediawiki/extensions/BlueSpiceArticleInfo
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceAuthors
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceAvatars
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceBlog
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/BlueSpiceCategoryManager
 template:
   - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
+  - name: mediawiki/extensions/BlueSpiceChecklist
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceConfigManager
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceContextMenu
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceCountThings
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceDashboards
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/BlueSpiceEditNotifyConnector
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceEmoticons
 template:
   - name: extension-unittests-composer
   - name: mwgate-npm
@@ -4348,11 +4398,8 @@
   - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
-  # meta repo containing a bunch of extensions. Would need one day a proper job
-  # that loads all of them and run test suite.
-  - name: mediawiki/extensions/BlueSpiceExtensions
+- name: mediawiki/extensions/BlueSpiceExtendedStatistics
 template:
-  - name: mwgate-composer
   - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
@@ -4361,7 +4408,17 @@
   - name: extension-unittests-composer
   - name: mwgate-npm
 
+- name: mediawiki/extensions/BlueSpiceGroupManager
+template:
+  - name: extension-unittests-composer-non-voting
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/BlueSpiceInsertTemplate
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceInterWikiLinks
 template:
   - name: extension-unittests-composer
   - name: mwgate-npm
@@ -4371,7 +4428,17 @@
   - name: extension-unittests-composer
   - name: mwgate-npm
 
+  - name: mediawiki/extensions/BlueSpiceNamespaceManager
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
   - name: mediawiki/extensions/BlueSpicePageAssignments
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpicePageTemplates
 template:
   - name: extension-unittests-composer
   - name: mwgate-npm
@@ -4381,12 +4448,17 @@
   - name: extension-unittests-composer
   - name: mwgate-npm
 
-  - name: mediawiki/extensions/BSSMWConnector
+  - name: mediawiki/extensions/BlueSpicePagesVisited
 template:
   - name: extension-unittests-composer
   - name: mwgate-npm
 
-  - name: mediawiki/extensions/BlueSpiceSignHere
+  - name: mediawiki/extensions/BlueSpicePermissionManager
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceReaders
 template:
   - name: extension-unittests-composer
   - name: mwgate-npm
@@ -4396,11 +4468,46 @@
   - name: extension-unittests-composer-non-voting
   - name: mwgate-npm
 
+  - name: mediawiki/extensions/BlueSpiceSignHere
+template:
+  - name: extension-unittests-composer
+  - name: mwgate-npm
+
+  - name: mediawiki/extensions/BlueSpiceSmartlist
+template:
+  - name:

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceNamespaceManager[master]: BSNamespaceManager: Added missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394265 )

Change subject: BSNamespaceManager: Added missing psr-4 autoloader path
..


BSNamespaceManager: Added missing psr-4 autoloader path

Change-Id: I9da00ba6c9d47849132c2360630f73464ac6a562
---
M composer.json
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 855b9c5..938247c 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,11 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "BlueSpice\\NamespaceManager\\" : "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"

-- 
To view, visit https://gerrit.wikimedia.org/r/394265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9da00ba6c9d47849132c2360630f73464ac6a562
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceReaders[master]: BSReaders: Fixed missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394264 )

Change subject: BSReaders: Fixed missing psr-4 autoloader path
..


BSReaders: Fixed missing psr-4 autoloader path

Change-Id: Ie350bed9a05b392a88b674c8663d0d73fb9b70e1
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 9c6a3c4..63e0b2c 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
},
"autoload": {
"psr-4": {
+   "BlueSpice\\Readers\\" : "src"
}
},
"require-dev": {

-- 
To view, visit https://gerrit.wikimedia.org/r/394264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie350bed9a05b392a88b674c8663d0d73fb9b70e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceReaders
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: BSPageTemplates: Fixed missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394261 )

Change subject: BSPageTemplates: Fixed missing psr-4 autoloader path
..


BSPageTemplates: Fixed missing psr-4 autoloader path

Change-Id: Ifd9f8cfdf0c07472ba6f51b6b073df13cfb79a94
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 682a0c1..05828d6 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
},
"autoload": {
"psr-4": {
+   "BlueSpice\\PageTemplates\\" : "src"
}
},
"require-dev": {

-- 
To view, visit https://gerrit.wikimedia.org/r/394261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd9f8cfdf0c07472ba6f51b6b073df13cfb79a94
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceDashboards[master]: BSDashboards: Added missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394263 )

Change subject: BSDashboards: Added missing psr-4 autoloader path
..


BSDashboards: Added missing psr-4 autoloader path

Change-Id: I595d51e33bb1947f1eb53c23d550f4ab03bcdf43
---
M composer.json
M extension.json
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index ec5ebab..2ac5931 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,11 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "BlueSpice\\Dashboards\\" : "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"
diff --git a/extension.json b/extension.json
index 7b9fed9..38b653e 100644
--- a/extension.json
+++ b/extension.json
@@ -99,5 +99,6 @@
"LoadExtensionSchemaUpdates": "Dashboards::getSchemaUpdates",
"UnitTestsList": "Dashboards::onUnitTestsList"
},
+   "load_composer_autoloader": true,
"manifest_version": 1
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/394263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I595d51e33bb1947f1eb53c23d550f4ab03bcdf43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceDashboards
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceBlog[master]: BSBlog: Fixed missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394281 )

Change subject: BSBlog: Fixed missing psr-4 autoloader path
..


BSBlog: Fixed missing psr-4 autoloader path

Change-Id: If2ee648ef8d398a152aee11b187196e49818eff9
---
M composer.json
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 7f9f698..a17f212 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,11 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "BlueSpice\\Blog\\" : "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"

-- 
To view, visit https://gerrit.wikimedia.org/r/394281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If2ee648ef8d398a152aee11b187196e49818eff9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceBlog
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoundation: Removed isStored from ConfigDefinitions, as ev...

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394258 )

Change subject: BSFoundation: Removed isStored from ConfigDefinitions, as every 
config with a definition is stored
..


BSFoundation: Removed isStored from ConfigDefinitions, as every config with a 
definition is stored

Change-Id: I04f56e2d3211f0c20fcaa07eb1c41c41ae29ebd7
---
M src/ConfigDefinition.php
M src/ConfigDefinition/Favicon.php
M src/ConfigDefinition/FileExtensions.php
M src/ConfigDefinition/ImageExtensions.php
M src/ConfigDefinition/Logo.php
M src/ISetting.php
6 files changed, 0 insertions(+), 30 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ConfigDefinition.php b/src/ConfigDefinition.php
index ad10069..7d79ddc 100644
--- a/src/ConfigDefinition.php
+++ b/src/ConfigDefinition.php
@@ -92,14 +92,6 @@
}
 
/**
-* Returns if the config is stored in the database
-* @return boolean
-*/
-   public function isStored() {
-   return false;
-   }
-
-   /**
 * Returns if the config is a ResourceLoader variable
 * @return boolean
 */
diff --git a/src/ConfigDefinition/Favicon.php b/src/ConfigDefinition/Favicon.php
index 6cb75c5..b1e54a0 100644
--- a/src/ConfigDefinition/Favicon.php
+++ b/src/ConfigDefinition/Favicon.php
@@ -11,8 +11,4 @@
public function getVariableName() {
return 'wg' . $this->getName();
}
-
-   public function isStored() {
-   return true;
-   }
 }
diff --git a/src/ConfigDefinition/FileExtensions.php 
b/src/ConfigDefinition/FileExtensions.php
index f599125..cb60f7c 100644
--- a/src/ConfigDefinition/FileExtensions.php
+++ b/src/ConfigDefinition/FileExtensions.php
@@ -8,10 +8,6 @@
return 'bs-pref-imageextensions';
}
 
-   public function isStored() {
-   return true;
-   }
-
public function isRLConfigVar() {
return true;
}
diff --git a/src/ConfigDefinition/ImageExtensions.php 
b/src/ConfigDefinition/ImageExtensions.php
index 2b51452..c8e5f3f 100644
--- a/src/ConfigDefinition/ImageExtensions.php
+++ b/src/ConfigDefinition/ImageExtensions.php
@@ -8,10 +8,6 @@
return 'bs-pref-fileextensions';
}
 
-   public function isStored() {
-   return true;
-   }
-
public function isRLConfigVar() {
return true;
}
diff --git a/src/ConfigDefinition/Logo.php b/src/ConfigDefinition/Logo.php
index 05a1e5a..31c72e5 100644
--- a/src/ConfigDefinition/Logo.php
+++ b/src/ConfigDefinition/Logo.php
@@ -11,8 +11,4 @@
public function getVariableName() {
return 'wg' . $this->getName();
}
-
-   public function isStored() {
-   return true;
-   }
 }
diff --git a/src/ISetting.php b/src/ISetting.php
index e872199..083abb4 100644
--- a/src/ISetting.php
+++ b/src/ISetting.php
@@ -37,12 +37,6 @@
 
/**
 *
-* @return boolean, If this variable is stored in the database
-*/
-   public function isStored();
-
-   /**
-*
 * @return string, the message key for the label
 */
public function getLabelMessageKey();

-- 
To view, visit https://gerrit.wikimedia.org/r/394258
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I04f56e2d3211f0c20fcaa07eb1c41c41ae29ebd7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: BSFoudation: Client side config rendering

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394083 )

Change subject: BSFoudation: Client side config rendering
..


BSFoudation: Client side config rendering

* used MediaWikiServices for the new ConfigDefinitionFactory
* added a getter for services to the hook handler base class
* fixed reference for ResourceLoaderGetConfigVars base class
* added method isRLConfigVar to config definition to decide wich config gets 
handed over to the resourceLoader

Change-Id: Icb809c8397d7dc1abe2544ac8f20c77c021240ad
---
M includes/ServiceWiring.php
M src/ConfigDefinition.php
M src/ConfigDefinition/FileExtensions.php
M src/ConfigDefinition/ImageExtensions.php
A src/ConfigDefinitionFactory.php
M src/Hook.php
M src/Hook/ResourceLoaderGetConfigVars.php
M src/Hook/ResourceLoaderGetConfigVars/AddBSGConfig.php
8 files changed, 130 insertions(+), 52 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 865a084..653b764 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -4,6 +4,12 @@
 
 return [
 
+   'BSConfigDefinitionFactory' => function ( MediaWikiServices $services ) 
{
+   return new \BlueSpice\ConfigDefinitionFactory(
+   $services->getConfigFactory()->makeConfig( 'bsg' )
+   );
+   },
+
'BSDynamicFileDispatcherFactory' => function ( MediaWikiServices 
$services ) {
return new \BlueSpice\DynamicFileDispatcher\Factory(
$services->getConfigFactory()->makeConfig( 'bsg' )
diff --git a/src/ConfigDefinition.php b/src/ConfigDefinition.php
index 41d7002..ad10069 100644
--- a/src/ConfigDefinition.php
+++ b/src/ConfigDefinition.php
@@ -4,8 +4,6 @@
 
 abstract class ConfigDefinition implements ISetting {
 
-   protected static $configDefinitions = null;
-
/**
 *
 * @var \IContextSource
@@ -30,55 +28,10 @@
 * @param \Config $config
 * @param string $name
 */
-   protected function __construct( $context, $config, $name ) {
+   public function __construct( $context, $config, $name ) {
$this->context = $context;
$this->config = $config;
$this->name = $name;
-   }
-
-   /**
-*
-* @param string $name
-* @param \Config $config
-* @return ConfigDefinition | false
-*/
-   public static function factory( $name, \Config $config = null ) {
-   if( !$config ) {
-   $config = \MediaWiki\MediaWikiServices::getInstance()
-   ->getConfigFactory()->makeConfig( 'bsg' );
-   }
-   if( empty( $name ) || !$config->has( $name ) ) {
-   return false;
-   }
-   $definitions = static::getConfigDefinitions();
-   if( !isset( $definitions[$name] ) ) {
-   return false;
-   }
-   if( !is_callable( $definitions[$name] ) ) {
-   return false;
-   }
-   return call_user_func_array( $definitions[$name], [
-   \RequestContext::getMain(),
-   $config,
-   $name,
-   ]);
-   }
-
-   protected static function getConfigDefinitions() {
-   if( static::$configDefinitions ) {
-   return static::$configDefinitions;
-   }
-   static::$configDefinitions = [];
-   foreach( $GLOBALS['bsgExtensions'] as $extName => 
$extDefinition ) {
-   if( empty( $extDefinition['configDefinitions'] ) ) {
-   continue;
-   }
-   static::$configDefinitions = array_merge(
-   static::$configDefinitions,
-   $extDefinition['configDefinitions']
-   );
-   }
-   return static::$configDefinitions;
}
 
/**
@@ -138,10 +91,22 @@
];
}
 
+   /**
+* Returns if the config is stored in the database
+* @return boolean
+*/
public function isStored() {
return false;
}
 
+   /**
+* Returns if the config is a ResourceLoader variable
+* @return boolean
+*/
+   public function isRLConfigVar() {
+   return false;
+   }
+
protected function makeFormFieldParams() {
return [
'name' => $this->getName(),
diff --git a/src/ConfigDefinition/FileExtensions.php 
b/src/ConfigDefinition/FileExtensions.php
index be65e21..f599125 100644
---

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAvatars[master]: BSAvatars: Switched to manifest version 2 as an example

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393565 )

Change subject: BSAvatars: Switched to manifest version 2 as an example
..


BSAvatars: Switched to manifest version 2 as an example

=> requires: https://gerrit.wikimedia.org/r/#/c/393564/

Change-Id: If910bdee955305cbc63b32066d5d846e52d9168e
---
M extension.json
1 file changed, 12 insertions(+), 8 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/extension.json b/extension.json
index a7b5c4c..1136107 100644
--- a/extension.json
+++ b/extension.json
@@ -9,13 +9,17 @@
],
"descriptionmsg": "bs-avatars-desc",
"type": "bluespice",
-   "bsgExtensions": {
-   "BlueSpiceAvatars": {
-   "className": "Avatars",
-   "extPath": "/BlueSpiceAvatars",
-   "configDefinitions": {
-   "AvatarsDefaultSize": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsDefaultSize::getInstance",
-   "AvatarsGenerator": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsGenerator::getInstance"
+   "attributes": {
+   "BlueSpiceFoundation": {
+   "Extensions": {
+   "BlueSpiceAvatars": {
+   "className": "Avatars",
+   "extPath": "/BlueSpiceAvatars",
+   "configDefinitions": {
+   "AvatarsDefaultSize": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsDefaultSize::getInstance",
+   "AvatarsGenerator": 
"\\BlueSpice\\Avatars\\ConfigDefinition\\AvatarsGenerator::getInstance"
+   }
+   }
}
}
},
@@ -75,5 +79,5 @@
"BSCoreGetUserMiniProfileBeforeInit": 
"\\BlueSpice\\Avatars\\Hook\\BSCoreGetUserMiniProfileBeforeInit\\SetAvatar::callback"
},
"load_composer_autoloader": true,
-   "manifest_version": 1
+   "manifest_version": 2
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/393565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If910bdee955305cbc63b32066d5d846e52d9168e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceAvatars
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceContextMenu[master]: BSContextMenu: Fixed missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394289 )

Change subject: BSContextMenu: Fixed missing psr-4 autoloader path
..


BSContextMenu: Fixed missing psr-4 autoloader path

Change-Id: I53e4a2701e542847f0474836198f202a2f930dd8
---
M composer.json
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 8852834..1d0e8a6 100644
--- a/composer.json
+++ b/composer.json
@@ -6,6 +6,11 @@
"require": {
"composer/installers": "~1.0"
},
+   "autoload": {
+   "psr-4": {
+   "BlueSpice\\ContextMenu\\" : "src"
+   }
+   },
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2"

-- 
To view, visit https://gerrit.wikimedia.org/r/394289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I53e4a2701e542847f0474836198f202a2f930dd8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceContextMenu
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePagesVisited[master]: BSPagesVisited: Fixed missing psr-4 autoloader path

2017-12-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394260 )

Change subject: BSPagesVisited: Fixed missing psr-4 autoloader path
..


BSPagesVisited: Fixed missing psr-4 autoloader path

Change-Id: I9f5c04e8a9a610fc0d37a68bd64e20069aa1ee67
---
M composer.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/composer.json b/composer.json
index 09453f4..093251e 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
},
"autoload": {
"psr-4": {
+   "BlueSpice\\PagesVisited\\" : "src"
}
},
"require-dev": {

-- 
To view, visit https://gerrit.wikimedia.org/r/394260
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9f5c04e8a9a610fc0d37a68bd64e20069aa1ee67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePagesVisited
Gerrit-Branch: master
Gerrit-Owner: Pwirth 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1679 matches

Mail list logo