Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/187471
Change subject: [WIP] Convert to use extension registration ...................................................................... [WIP] Convert to use extension registration Bug: T87988 Change-Id: Iedcd7591f6e7bbb78c50cdc1038ddc9c4a8338dc --- M UploadWizard.php A extension.json 2 files changed, 257 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard refs/changes/71/187471/1 diff --git a/UploadWizard.php b/UploadWizard.php index 10fb924..f940190 100644 --- a/UploadWizard.php +++ b/UploadWizard.php @@ -21,6 +21,15 @@ * @version 1.3 */ +if ( function_exists( 'wfLoadExtensions' ) ) { + wfLoadExtension( 'UploadWizard' ); + /*wfWarn( + 'Deprecated PHP entry point used for UploadWizard extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + );*/ + return; +} + /* Configuration */ // Credits @@ -189,8 +198,15 @@ /* Define and configure default namespaces, as defined on Mediawiki.org * https://www.mediawiki.org/wiki/Extension_default_namespaces#UploadWizard */ -define( 'NS_CAMPAIGN', 460 ); -define( 'NS_CAMPAIGN_TALK', 461 ); + +if ( !defined( 'NS_CAMPAIGN' ) ) { + define( 'NS_CAMPAIGN', 460 ); +} + +if ( !defined( 'NS_CAMPAIGN_TALK' ) ) { + define( 'NS_CAMPAIGN_TALK', 461 ); +} + $wgExtraNamespaces[ NS_CAMPAIGN ] = 'Campaign'; $wgExtraNamespaces[ NS_CAMPAIGN_TALK ] = 'Campaign_talk'; diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..642789c --- /dev/null +++ b/extension.json @@ -0,0 +1,239 @@ +{ + "name": "Upload Wizard", + "version": "1.4.0", + "author": [ + "Neil Kandalgaonkar", + "Jeroen De Dauw", + "Mark Holmquist", + "Ryan Kaldari", + "Michael Dale", + "Ankur Anand", + "Nischay Nahata", + "Yuvi Panda" + ], + "url": "https://www.mediawiki.org/wiki/Extension:UploadWizard", + "descriptionmsg": "uploadwizard-desc", + "type": "other", + "DefaultUserOptions": { + "upwiz_deflicense": "default", + "upwiz_def3rdparty": "default", + "upwiz_deflicensetype": "default", + "upwiz_maxsimultaneous": "default" + }, + "GroupPermissions": { + "*": { + "upwizcampaigns": false + }, + "user": { + "upwizcampaigns": false + }, + "autoconfirmed": { + "upwizcampaigns": false + }, + "bot": { + "upwizcampaigns": false + }, + "sysop": { + "upwizcampaigns": true + }, + "upwizcampeditors": { + "upwizcampaigns": true + } + }, + "AddGroups": { + "sysop": [ + "upwizcampeditors" + ] + }, + "RemoveGroups": { + "sysop": [ + "upwizcampeditors" + ] + }, + "AvailableRights": [ + "upwizcampaigns" + ], + "ContentHandlers": { + "Campaign": "CampaignContentHandler" + }, + "SpecialPages": { + "UploadWizard": "SpecialUploadWizard", + "Campaigns": "SpecialCampaigns" + }, + "SpecialPageGroups": { + "UploadWizard": "media", + "Campaigns": "media" + }, + "APIModules": { + "flickrblacklist": "ApiFlickrBlacklist" + }, + "APIListModules": { + "allcampaigns": "ApiQueryAllCampaigns" + }, + "MessagesDirs": { + "UploadWizard": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "UploadWizard": "UploadWizard.i18n.php", + "UploadWizardAlias": "UploadWizard.alias.php" + }, + "AutoloadClasses": { + "UploadWizardHooks": "UploadWizardHooks.php", + "UploadWizardConfig": "includes/UploadWizardConfig.php", + "UploadWizardTutorial": "includes/UploadWizardTutorial.php", + "UploadWizardCampaign": "includes/UploadWizardCampaign.php", + "UploadWizardFlickrBlacklist": "includes/UploadWizardFlickrBlacklist.php", + "CampaignContentHandler": "includes/CampaignContentHandler.php", + "CampaignContent": "includes/CampaignContent.php", + "CampaignPageFormatter": "includes/CampaignPageFormatter.php", + "CampaignHooks": "includes/CampaignHooks.php", + "SpecialUploadWizard": "includes/specials/SpecialUploadWizard.php", + "SpecialCampaigns": "includes/specials/SpecialCampaigns.php", + "ApiQueryAllCampaigns": "includes/ApiQueryAllCampaigns.php", + "ApiFlickrBlacklist": "includes/ApiFlickrBlacklist.php", + "UploadWizardSimpleForm": "includes/specials/SpecialUploadWizard.php" + }, + "ResourceModules": { + "ext.uploadWizard.formDataTransport": { + "scripts": "mw.FormDataTransport.js", + "dependencies": [ + "oojs" + ], + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.iFrameTransport": { + "scripts": "mw.IframeTransport.js", + "dependencies": [ + "oojs" + ], + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.apiUploadHandler": { + "scripts": "mw.ApiUploadHandler.js", + "dependencies": "ext.uploadWizard.iFrameTransport", + "messages": "mwe-upwiz-transport-started", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.apiUploadPostHandler": { + "scripts": "mw.ApiUploadPostHandler.js", + "messages": "mwe-upwiz-transport-started", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.apiUploadFormDataHandler": { + "scripts": "mw.ApiUploadFormDataHandler.js", + "dependencies": "ext.uploadWizard.formDataTransport", + "messages": "mwe-upwiz-transport-started", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.page": { + "scripts": "mw.UploadWizardPage.js", + "dependencies": "ext.uploadWizard", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.uploadCampaign.display": { + "styles": "ext.uploadWizard.uploadCampaign.display.css", + "position": "top", + "dependencies": "mediawiki.ui.button", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + }, + "ext.uploadWizard.uploadCampaign.list": { + "styles": "ext.uploadWizard.uploadCampaign.list.css", + "position": "top", + "localBasePath": "resources", + "remoteExtPath": "UploadWizard/resources" + } + }, + "Hooks": { + "ResourceLoaderRegisterModules": [ + "UploadWizardHooks::resourceLoaderRegisterModules" + ], + "LoadExtensionSchemaUpdates": [ + "UploadWizardHooks::onSchemaUpdate" + ], + "GetPreferences": [ + "UploadWizardHooks::onGetPreferences" + ], + "IsUploadAllowedFromUrl": [ + "UploadWizardHooks::onIsUploadAllowedFromUrl" + ], + "ResourceLoaderTestModules": [ + "UploadWizardHooks::onResourceLoaderTestModules" + ], + "UnitTestsList": [ + "UploadWizardHooks::onUnitTestsList" + ], + "BeforePageDisplay": [ + "CampaignHooks::onBeforePageDisplay" + ], + "EditFilterMerged": [ + "CampaignHooks::onEditFilterMerged" + ], + "CodeEditorGetPageLanguage": [ + "CampaignHooks::onCodeEditorGetPageLanguage" + ], + "PageContentSaveComplete": [ + "CampaignHooks::onPageContentSaveComplete" + ], + "ArticleDeleteComplete": [ + "CampaignHooks::onArticleDeleteComplete" + ], + "TitleMoveComplete": [ + "CampaignHooks::onTitleMoveComplete" + ], + "LinksUpdateComplete": [ + "CampaignHooks::onLinksUpdateComplete" + ] + }, + "config": { + "UpwizDir": "/vagrant/mediawiki/extensions/UploadWizard", + "EventLoggingSchemas": { + "UploadWizardTutorialActions": 5803466, + "UploadWizardUploadActions": 5811620, + "UploadWizardStep": 8851805, + "UploadWizardFlowEvent": 8851807, + "UploadWizardErrorFlowEvent": 9924376, + "UploadWizardUploadFlowEvent": 9651951 + }, + "ExtraNamespaces": { + "460": "Campaign", + "461": "Campaign_talk" + }, + "NamespaceProtection": { + "460": [ + "upwizcampaigns" + ] + }, + "NamespaceContentModels": { + "460": "Campaign" + }, + "CapitalLinkOverrides": { + "460": false, + "461": false + }, + "NamespaceAliases": { + "File": 6, + "File_talk": 7 + } + }, + "namespaces": [ + { + "id": "NS_CAMPAIGN", + "constant": 460, + "name": "Campaign" + }, + { + "id": "NS_CAMPAIGN_TALK", + "constant": 461, + "name": "Campaign_talk" + } + ] +} -- To view, visit https://gerrit.wikimedia.org/r/187471 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iedcd7591f6e7bbb78c50cdc1038ddc9c4a8338dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits