jenkins-bot has submitted this change and it was merged. Change subject: Convert SecurePoll to extension registration ......................................................................
Convert SecurePoll to extension registration Change-Id: I3f6d3de2e3562c181cb3a04386d3a683b69b8d85 --- M SecurePoll.php A extension.json M includes/SecurePollHooks.php 3 files changed, 158 insertions(+), 197 deletions(-) Approvals: Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/SecurePoll.php b/SecurePoll.php index 8588743..d6fe054 100644 --- a/SecurePoll.php +++ b/SecurePoll.php @@ -1,198 +1,14 @@ <?php -/** - * @file - * @ingroup Extensions - * @author Tim Starling <[email protected]> - * @link http://www.mediawiki.org/wiki/Extension:SecurePoll Documentation - */ - -# Not a valid entry point, skip unless MEDIAWIKI is defined -if ( !defined( 'MEDIAWIKI' ) ) { - die( "Not a valid entry point\n" ); +if ( function_exists( 'wfLoadExtension' ) ) { + wfLoadExtension( 'SecurePoll' ); + // Keep i18n globals so mergeMessageFileList.php doesn't break + $wgMessagesDirs['SecurePoll'] = __DIR__ . '/i18n'; + $wgExtensionMessagesFiles['SecurePollAlias'] = __DIR__ . '/SecurePoll.alias.php'; + /*wfWarn( + 'Deprecated PHP entry point used for SecurePoll extension. Please use wfLoadExtension instead, ' . + 'see https://www.mediawiki.org/wiki/Extension_registration for more details.' + );*/ + return; +} else { + die( 'This version of the SecurePoll extension requires MediaWiki 1.25+' ); } - -# Extension credits -$wgExtensionCredits['other'][] = array( - 'path' => __FILE__, - 'name' => 'SecurePoll', - 'author' => array( 'Tim Starling', '...' ), - 'url' => 'https://www.mediawiki.org/wiki/Extension:SecurePoll', - 'descriptionmsg' => 'securepoll-desc', - 'license-name' => 'GPL-2.0+', -); - -# Configuration -/** - * The GPG command to run - */ -$wgSecurePollGPGCommand = 'gpg'; - -/** - * The temporary directory to be used for GPG home directories and plaintext files - */ -$wgSecurePollTempDir = '/tmp'; - -/** - * Show detail of GPG errors - */ -$wgSecurePollShowErrorDetail = false; - -/** - * Relative URL path to auth-api.php - */ -$wgSecurePollScript = 'extensions/SecurePoll/auth-api.php'; - -/** - * Time (in days) to keep IP addresses, XFF, UA of voters - */ -$wgSecurePollKeepPrivateInfoDays = 90; - -/** - * Directory holding dblist files for $wgSecurePollCreateWikiGroups. - * The file format is one dbname per line. - */ -$wgSecurePollCreateWikiGroupDir = $IP . '/../'; - -/** - * List of dblist files to read from $wgSecurePollCreateWikiGroupDir. - * Keys are file names without the ".dblist" extension. Values are message - * names. - */ -$wgSecurePollCreateWikiGroups = array(); - -/** - * Value for remote-mw-script-path when creating a multi-wiki poll. - */ -$wgSecurePollCreateRemoteScriptPath = 'https:$wgServer/w'; - -/** - * Whether to register and log to the SecurePoll namespace - */ -$wgSecurePollUseNamespace = false; - -/** - * If set, SecurePoll_GpgCrypt will use this instead of prompting the user for - * a signing key. - */ -$wgSecurePollGpgSignKey = null; - -### END CONFIGURATON ### - - -// Set up the new special page -$dir = __DIR__; -$wgMessagesDirs['SecurePoll'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['SecurePoll'] = "$dir/SecurePoll.i18n.php"; -$wgExtensionMessagesFiles['SecurePollAlias'] = "$dir/SecurePoll.alias.php"; -$wgExtensionMessagesFiles['SecurePollNamespaces'] = $dir . '/SecurePoll.namespaces.php'; - -$wgSpecialPages['SecurePoll'] = 'SecurePoll_SpecialSecurePoll'; - -$wgAutoloadClasses = $wgAutoloadClasses + array( - # api - 'ApiStrikeVote' => "$dir/api/ApiStrikeVote.php", - # ballots - 'SecurePoll_ApprovalBallot' => "$dir/includes/ballots/ApprovalBallot.php", - 'SecurePoll_Ballot' => "$dir/includes/ballots/Ballot.php", - 'SecurePoll_BallotStatus' => "$dir/includes/ballots/Ballot.php", - 'SecurePoll_ChooseBallot' => "$dir/includes/ballots/ChooseBallot.php", - 'SecurePoll_PreferentialBallot' => "$dir/includes/ballots/PreferentialBallot.php", - 'SecurePoll_RadioRangeBallot' => "$dir/includes/ballots/RadioRangeBallot.php", - 'SecurePoll_RadioRangeCommentBallot' => "$dir/includes/ballots/RadioRangeCommentBallot.php", - - # crypt - 'SecurePoll_Crypt' => "$dir/includes/crypt/Crypt.php", - 'SecurePoll_GpgCrypt' => "$dir/includes/crypt/Crypt.php", - 'SecurePoll_Random' => "$dir/includes/crypt/Random.php", - - # entities - 'SecurePoll_Election' => "$dir/includes/entities/Election.php", - 'SecurePoll_Entity' => "$dir/includes/entities/Entity.php", - 'SecurePoll_Option' => "$dir/includes/entities/Option.php", - 'SecurePoll_Question' => "$dir/includes/entities/Question.php", - - # main - 'SecurePoll_SpecialSecurePoll' => "$dir/includes/main/SpecialSecurePoll.php", - 'SecurePoll_Context' => "$dir/includes/main/Context.php", - 'SecurePoll_DBStore' => "$dir/includes/main/Store.php", - 'SecurePoll_MemoryStore' => "$dir/includes/main/Store.php", - 'SecurePoll_Store' => "$dir/includes/main/Store.php", - 'SecurePoll_XMLStore' => "$dir/includes/main/Store.php", - - # pages - 'SecurePoll_CreatePage' => "$dir/includes/pages/CreatePage.php", - 'SecurePoll_FormStore' => "$dir/includes/pages/CreatePage.php", - 'SecurePoll_StatusException' => "$dir/includes/pages/CreatePage.php", - 'SecurePoll_DetailsPage' => "$dir/includes/pages/DetailsPage.php", - 'SecurePoll_StrikePager' => "$dir/includes/pages/DetailsPage.php", - 'SecurePoll_DumpPage' => "$dir/includes/pages/DumpPage.php", - 'SecurePoll_EntryPage' => "$dir/includes/pages/EntryPage.php", - 'SecurePoll_ElectionPager' => "$dir/includes/pages/EntryPage.php", - 'SecurePoll_ListPage' => "$dir/includes/pages/ListPage.php", - 'SecurePoll_ListPager' => "$dir/includes/pages/ListPage.php", - 'SecurePoll_LoginPage' => "$dir/includes/pages/LoginPage.php", - 'SecurePoll_MessageDumpPage' => "$dir/includes/pages/MessageDumpPage.php", - 'SecurePoll_ActionPage' => "$dir/includes/pages/ActionPage.php", - 'SecurePoll_TallyPage' => "$dir/includes/pages/TallyPage.php", - 'SecurePoll_TranslatePage' => "$dir/includes/pages/TranslatePage.php", - 'SecurePoll_VotePage' => "$dir/includes/pages/VotePage.php", - 'SecurePoll_Voter' => "$dir/includes/user/Voter.php", - 'SecurePoll_VoterEligibilityPage' => "$dir/includes/pages/VoterEligibilityPage.php", - - # talliers - 'SecurePoll_ElectionTallier' => "$dir/includes/talliers/ElectionTallier.php", - 'SecurePoll_HistogramRangeTallier' => "$dir/includes/talliers/HistogramRangeTallier.php", - 'SecurePoll_PairwiseTallier' => "$dir/includes/talliers/PairwiseTallier.php", - 'SecurePoll_PluralityTallier' => "$dir/includes/talliers/PluralityTallier.php", - 'SecurePoll_SchulzeTallier' => "$dir/includes/talliers/SchulzeTallier.php", - 'SecurePoll_Tallier' => "$dir/includes/talliers/Tallier.php", - 'SecurePoll_CommentDumper' => "$dir/includes/talliers/CommentDumper.php", - - # user - 'SecurePoll_Auth' => "$dir/includes/user/Auth.php", - 'SecurePoll_LocalAuth' => "$dir/includes/user/Auth.php", - 'SecurePoll_RemoteMWAuth' => "$dir/includes/user/Auth.php", - - # Jobs - 'SecurePoll_PopulateVoterListJob' => "$dir/includes/jobs/PopulateVoterListJob.php", - - # ContentHandler - 'SecurePollContentHandler' => $dir.'/includes/main/SecurePollContentHandler.php', - 'SecurePollContent' => $dir.'/includes/main/SecurePollContent.php', - - # HTMLForm additions - 'SecurePoll_HTMLDateField' => "$dir/includes/htmlform/HTMLDateField.php", - 'SecurePoll_HTMLDateRangeField' => "$dir/includes/htmlform/HTMLDateRangeField.php", - 'SecurePoll_HTMLFormRadioRangeColumnLabels' => "$dir/includes/htmlform/HTMLFormRadioRangeColumnLabels.php", - 'SecurePollHooks' => "$dir/includes/SecurePollHooks.php", -); - -$wgAPIModules['strikevote'] = 'ApiStrikeVote'; - -$wgResourceModules['ext.securepoll.htmlform'] = array( - 'localBasePath' => dirname( __FILE__ ) . '/modules', - 'remoteExtPath' => 'SecurePoll/modules', - 'scripts' => 'ext.securepoll.htmlform.js', -); -$wgResourceModules['ext.securepoll'] = array( - 'localBasePath' => dirname( __FILE__ ) . '/modules', - 'remoteExtPath' => 'SecurePoll/modules', - 'styles' => 'ext.securepoll.css', -); - -$wgHooks['UserLogout'][] = 'SecurePoll::onUserLogout'; -$wgHooks['LoadExtensionSchemaUpdates'][] = 'SecurePollHooks::onLoadExtensionSchemaUpdates'; -$wgHooks['CanonicalNamespaces'][] = 'SecurePollHooks::onCanonicalNamespaces'; -$wgHooks['TitleQuickPermissions'][] = 'SecurePollHooks::onTitleQuickPermissions'; -$wgHooks['ContentHandlerDefaultModelFor'][] = 'SecurePollHooks::onContentHandlerDefaultModelFor'; - -$wgJobClasses['securePollPopulateVoterList'] = 'SecurePoll_PopulateVoterListJob'; - -$wgContentHandlers['SecurePoll'] = 'SecurePollContentHandler'; - -$wgAvailableRights[] = 'securepoll-create-poll'; - -define( 'NS_SECUREPOLL', 830 ); -define( 'NS_SECUREPOLL_TALK', 831 ); -$wgNamespacesWithSubpages[NS_SECUREPOLL] = true; -$wgNamespacesWithSubpages[NS_SECUREPOLL_TALK] = true; diff --git a/extension.json b/extension.json new file mode 100644 index 0000000..47efd5a --- /dev/null +++ b/extension.json @@ -0,0 +1,140 @@ +{ + "name": "SecurePoll", + "author": [ + "Tim Starling", + "..." + ], + "url": "https://www.mediawiki.org/wiki/Extension:SecurePoll";, + "descriptionmsg": "securepoll-desc", + "license-name": "GPL-2.0+", + "type": "other", + "AvailableRights": [ + "securepoll-create-poll" + ], + "ContentHandlers": { + "SecurePoll": "SecurePollContentHandler" + }, + "SpecialPages": { + "SecurePoll": "SecurePoll_SpecialSecurePoll" + }, + "JobClasses": { + "securePollPopulateVoterList": "SecurePoll_PopulateVoterListJob" + }, + "APIModules": { + "strikevote": "ApiStrikeVote" + }, + "MessagesDirs": { + "SecurePoll": [ + "i18n" + ] + }, + "ExtensionMessagesFiles": { + "SecurePollAlias": "SecurePoll.alias.php", + "SecurePollNamespaces": "SecurePoll.namespaces.php" + }, + "AutoloadClasses": { + "ApiStrikeVote": "api/ApiStrikeVote.php", + "SecurePoll_ApprovalBallot": "includes/ballots/ApprovalBallot.php", + "SecurePoll_Ballot": "includes/ballots/Ballot.php", + "SecurePoll_BallotStatus": "includes/ballots/Ballot.php", + "SecurePoll_ChooseBallot": "includes/ballots/ChooseBallot.php", + "SecurePoll_PreferentialBallot": "includes/ballots/PreferentialBallot.php", + "SecurePoll_RadioRangeBallot": "includes/ballots/RadioRangeBallot.php", + "SecurePoll_RadioRangeCommentBallot": "includes/ballots/RadioRangeCommentBallot.php", + "SecurePoll_Crypt": "includes/crypt/Crypt.php", + "SecurePoll_GpgCrypt": "includes/crypt/Crypt.php", + "SecurePoll_Random": "includes/crypt/Random.php", + "SecurePoll_Election": "includes/entities/Election.php", + "SecurePoll_Entity": "includes/entities/Entity.php", + "SecurePoll_Option": "includes/entities/Option.php", + "SecurePoll_Question": "includes/entities/Question.php", + "SecurePoll_SpecialSecurePoll": "includes/main/SpecialSecurePoll.php", + "SecurePoll_Context": "includes/main/Context.php", + "SecurePoll_DBStore": "includes/main/Store.php", + "SecurePoll_MemoryStore": "includes/main/Store.php", + "SecurePoll_Store": "includes/main/Store.php", + "SecurePoll_XMLStore": "includes/main/Store.php", + "SecurePoll_CreatePage": "includes/pages/CreatePage.php", + "SecurePoll_FormStore": "includes/pages/CreatePage.php", + "SecurePoll_StatusException": "includes/pages/CreatePage.php", + "SecurePoll_DetailsPage": "includes/pages/DetailsPage.php", + "SecurePoll_StrikePager": "includes/pages/DetailsPage.php", + "SecurePoll_DumpPage": "includes/pages/DumpPage.php", + "SecurePoll_EntryPage": "includes/pages/EntryPage.php", + "SecurePoll_ElectionPager": "includes/pages/EntryPage.php", + "SecurePoll_ListPage": "includes/pages/ListPage.php", + "SecurePoll_ListPager": "includes/pages/ListPage.php", + "SecurePoll_LoginPage": "includes/pages/LoginPage.php", + "SecurePoll_MessageDumpPage": "includes/pages/MessageDumpPage.php", + "SecurePoll_ActionPage": "includes/pages/ActionPage.php", + "SecurePoll_TallyPage": "includes/pages/TallyPage.php", + "SecurePoll_TranslatePage": "includes/pages/TranslatePage.php", + "SecurePoll_VotePage": "includes/pages/VotePage.php", + "SecurePoll_Voter": "includes/user/Voter.php", + "SecurePoll_VoterEligibilityPage": "includes/pages/VoterEligibilityPage.php", + "SecurePoll_ElectionTallier": "includes/talliers/ElectionTallier.php", + "SecurePoll_HistogramRangeTallier": "includes/talliers/HistogramRangeTallier.php", + "SecurePoll_PairwiseTallier": "includes/talliers/PairwiseTallier.php", + "SecurePoll_PluralityTallier": "includes/talliers/PluralityTallier.php", + "SecurePoll_SchulzeTallier": "includes/talliers/SchulzeTallier.php", + "SecurePoll_Tallier": "includes/talliers/Tallier.php", + "SecurePoll_CommentDumper": "includes/talliers/CommentDumper.php", + "SecurePoll_Auth": "includes/user/Auth.php", + "SecurePoll_LocalAuth": "includes/user/Auth.php", + "SecurePoll_RemoteMWAuth": "includes/user/Auth.php", + "SecurePoll_PopulateVoterListJob": "includes/jobs/PopulateVoterListJob.php", + "SecurePollContentHandler": "includes/main/SecurePollContentHandler.php", + "SecurePollContent": "includes/main/SecurePollContent.php", + "SecurePoll_HTMLDateField": "includes/htmlform/HTMLDateField.php", + "SecurePoll_HTMLDateRangeField": "includes/htmlform/HTMLDateRangeField.php", + "SecurePoll_HTMLFormRadioRangeColumnLabels": "includes/htmlform/HTMLFormRadioRangeColumnLabels.php", + "SecurePollHooks": "includes/SecurePollHooks.php" + }, + "ResourceModules": { + "ext.securepoll.htmlform": { + "scripts": "ext.securepoll.htmlform.js" + }, + "ext.securepoll": { + "styles": "ext.securepoll.css" + } + }, + "ResourceFileModulePaths": { + "localBasePath": "modules", + "remoteExtPath": "SecurePoll/modules" + }, + "Hooks": { + "UserLogout": [ + "SecurePoll::onUserLogout" + ], + "LoadExtensionSchemaUpdates": [ + "SecurePollHooks::onLoadExtensionSchemaUpdates" + ], + "CanonicalNamespaces": [ + "SecurePollHooks::onCanonicalNamespaces" + ], + "TitleQuickPermissions": [ + "SecurePollHooks::onTitleQuickPermissions" + ], + "ContentHandlerDefaultModelFor": [ + "SecurePollHooks::onContentHandlerDefaultModelFor" + ] + }, + "config": { + "SecurePollGPGCommand": "gpg", + "SecurePollTempDir": "/tmp", + "SecurePollShowErrorDetail": false, + "SecurePollScript": "extensions/SecurePoll/auth-api.php", + "SecurePollKeepPrivateInfoDays": 90, + "SecurePollCreateWikiGroupDir": "/../", + "SecurePollCreateWikiGroups": [], + "SecurePollCreateRemoteScriptPath": "https:$wgServer/w", + "SecurePollUseNamespace": false, + "SecurePollGpgSignKey": null, + "NamespacesWithSubpages": { + "830": true, + "831": true + } + }, + "callback": "SecurePollHooks::onRegistration", + "manifest_version": 1 +} diff --git a/includes/SecurePollHooks.php b/includes/SecurePollHooks.php index 8d52744..c58dd54 100644 --- a/includes/SecurePollHooks.php +++ b/includes/SecurePollHooks.php @@ -78,4 +78,9 @@ } return true; } -} + + public static function onRegistration() { + define( 'NS_SECUREPOLL', 830 ); + define( 'NS_SECUREPOLL_TALK', 831 ); + } +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/279723 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f6d3de2e3562c181cb3a04386d3a683b69b8d85 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/SecurePoll Gerrit-Branch: master Gerrit-Owner: Reedy <[email protected]> Gerrit-Reviewer: Florianschmidtwelzow <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
