MarcoAurelio has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392021 )

Change subject: Convert AdManager to use extension registration
......................................................................

Convert AdManager to use extension registration

Bug: T180679
Change-Id: I52f1c1440036d2d0df1ad9cb42214bd63323896f
---
M AdManager.php
A extension.json
2 files changed, 76 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdManager 
refs/changes/21/392021/1

diff --git a/AdManager.php b/AdManager.php
index f5db66d..7b535f8 100644
--- a/AdManager.php
+++ b/AdManager.php
@@ -13,51 +13,18 @@
  * @author Ike Hecht
  * @link http://www.mediawiki.org/wiki/Extension:AdManager Documentation
  */
-if ( !defined( 'MEDIAWIKI' ) ) {
-       die( 'Not an entry point.' );
+
+if ( function_exists( 'wfLoadExtension' ) ) {
+       wfLoadExtension( 'AdManager' );
+       // Keep i18n globals so mergeMessageFileList.php doesn't break
+       $wgMessagesDirs['AdManager'] = __DIR__ . '/i18n';
+       $wgExtensionMessagesFiles['AdManagerAlias'] = __DIR__ . 
'/AdManager.alias.php';
+       wfWarn(
+               'Deprecated PHP entry point used for the AdManager extension. ' 
.
+               'Please use wfLoadExtension instead, ' .
+               'see https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
+       );
+       return;
+} else {
+       die( 'This version of the AdManager extension requires MediaWiki 1.25+' 
);
 }
-
-// Extension credits that will show up on Special:Version
-$wgExtensionCredits['specialpage'][] = [
-       'path' => __FILE__,
-       'name' => 'AdManager',
-       'version' => '1.1.0',
-       'author' => 'Ike Hecht for WikiWorks',
-       'url' => 'https://www.mediawiki.org/wiki/Extension:AdManager',
-       'descriptionmsg' => 'admanager-desc',
-];
-
-// Lowercase name of the advertising service. Currently supported values are:
-// openx
-$wgAdManagerService = null;
-// For custom code. Insert $1 anywhere that the ad zone should be inserted.
-$wgAdManagerCode = null;
-// Where should the ads be outputted?
-// Allowed values: 'sidebar', 'content'
-$wgAdManagerPlacement = 'sidebar';
-
-$wgMessagesDirs['AdManager'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['AdManagerAlias'] = __DIR__ . '/AdManager.alias.php';
-
-// This extension uses its own permission type, 'admanager'
-$wgAvailableRights[] = 'admanager';
-$wgGroupPermissions['sysop']['admanager'] = true;
-
-$wgSpecialPages['AdManagerZones'] = 'SpecialAdManagerZones';
-$wgSpecialPages['AdManager'] = 'SpecialAdManager';
-
-$wgAutoloadClasses['SpecialAdManagerZones'] = __DIR__ . 
'/specials/SpecialAdManagerZones.php';
-$wgAutoloadClasses['SpecialAdManager'] = __DIR__ . 
'/specials/SpecialAdManager.php';
-$wgAutoloadClasses['AdManager'] = __DIR__ . '/AdManager.class.php';
-$wgAutoloadClasses['AdManagerZones'] = __DIR__ . '/AdManagerZones.class.php';
-$wgAutoloadClasses['AdManagerHooks'] = __DIR__ . '/AdManager.hooks.php';
-
-$wgHooks['LoadExtensionSchemaUpdates'][] = 'AdManagerHooks::onSchemaUpdate';
-$wgHooks['SkinBuildSidebar'][] = 'AdManagerHooks::SkinBuildSidebar';
-$wgHooks['BeforePageDisplay'][] = 'AdManagerHooks::onBeforePageDisplay';
-
-$wgResourceModules['ext.adManager'] = [
-       'styles' => 'ext.adManager.css',
-       'localBasePath' => __DIR__,
-       'remoteExtPath' => 'AdManager'
-];
diff --git a/extension.json b/extension.json
new file mode 100644
index 0000000..b5da4ca
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,62 @@
+{
+       "name": "AdManager",
+       "version": "1.1.0",
+       "author": "[https://www.mediawiki.org/wiki/User:Tosfos Ike Hecht, for 
WikiWorks]",
+       "url": "https://www.mediawiki.org/wiki/Extension:AdManager";,
+       "descriptionmsg": "admanager-desc",
+       "license-name": "GPL-2.0",
+       "type": "specialpage",
+       "AvailableRights": [
+               "admanager"
+       ],
+       "GroupPermissions": {
+               "sysop": {
+                       "admanager": true
+               }
+       },
+       "SpecialPages": {
+               "AdManagerZones": "SpecialAdManagerZones",
+               "AdManager": "SpecialAdManager"
+       },
+       "MessagesDirs": {
+               "AdManager": [
+                       "i18n"
+               ]
+       },
+       "ExtensionMessagesFiles": {
+               "AdManagerAlias": "AdManager.alias.php"
+       },
+       "AutoloadClasses": {
+               "SpecialAdManagerZones": "specials/SpecialAdManagerZones.php",
+               "SpecialAdManager": "specials/SpecialAdManager.php",
+               "AdManager": "AdManager.class.php",
+               "AdManagerZones": "AdManagerZones.class.php",
+               "AdManagerHooks": "AdManager.hooks.php"
+       },
+       "ResourceModules": {
+               "ext.adManager": {
+                       "styles": "ext.adManager.css"
+               }
+       },
+       "ResourceFileModulePaths": {
+               "localBasePath": "",
+               "remoteExtPath": "AdManager"
+       },
+       "Hooks": {
+               "LoadExtensionSchemaUpdates": "AdManagerHooks::onSchemaUpdate",
+               "SkinBuildSidebar": "AdManagerHooks::SkinBuildSidebar",
+               "BeforePageDisplay": "AdManagerHooks::onBeforePageDisplay"
+       },
+       "config": {
+               "AdManagerService": {
+                       "value": null
+               },
+               "AdManagerCode": {
+                       "value": null
+               },
+               "AdManagerPlacement": {
+                       "value": "sidebar"
+               }
+       },
+       "manifest_version": 2
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I52f1c1440036d2d0df1ad9cb42214bd63323896f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdManager
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to