From 6ec0e602ad2a864cc9339b7b3c3186b1d7cf5f0f Mon Sep 17 00:00:00 2001 From: Jacob G Date: Sun, 11 Jan 2015 20:41:29 -0500 Subject: [PATCH] fixed interface involving password text (fixes #8) --- ConfirmAccount/ConfirmAccount.config.php | 236 +++++++++--------- .../actions/RequestAccount_body.php | 4 +- 2 files changed, 120 insertions(+), 120 deletions(-) diff --git a/ConfirmAccount/ConfirmAccount.config.php b/ConfirmAccount/ConfirmAccount.config.php index e24f254..66a6f7a 100644 --- a/ConfirmAccount/ConfirmAccount.config.php +++ b/ConfirmAccount/ConfirmAccount.config.php @@ -1,118 +1,118 @@ - array( 'enabled' => true ), - # Real name of user - 'RealName' => array( 'enabled' => false ), - # Biographical info - 'Biography' => array( 'enabled' => false, 'minWords' => 0 ), - # Interest checkboxes (defined in MediaWiki:requestaccount-areas) - 'AreasOfInterest' => array( 'enabled' => true ), - # CV/resume attachment option - 'CV' => array( 'enabled' => false ), - # Additional non-public info for reviewer - 'Notes' => array( 'enabled' => true ), - # Option to place web URLs that establish the user - 'Links' => array( 'enabled' => false ), - # Terms of Service checkbox - 'TermsOfService' => array( 'enabled' => true ), -); - -# If files can be attached, what types can be used? (MIME data is checked) -$wgAccountRequestExts = array( 'txt', 'pdf', 'doc', 'latex', 'rtf', 'text', 'wp', 'wpd', 'sxw' ); - -# Prospective account request types. -# Format is an array of (integer => (subpage param,user group,autotext)) pairs. -# The integer keys enumerate the request types. The key for a type should not change. -# Each type has its own request queue at Special:ConfirmAccount/. -# When a request of a certain type is approved, the new user: -# (a) is placed in the group (if not User or *) -# (b) has appended to his or her user page -$wgAccountRequestTypes = array( - 0 => array( 'authors', 'user', null ) -); - -# If set, will add {{DEFAULTSORT:sortkey}} to userpages for auto-categories. -# The sortkey will be made by doing a regex search and replace on the title. -# Set this variable to false to avoid sortkey use. -$wgConfirmAccountSortkey = false; -// For example, the below will do {{DEFAULTSORT:firstname, lastname}} -# $wgConfirmAccountSortkey = array( '/^(.+) ([^ ]+)$/', '$2, $1' ); - -# IMPORTANT: do we store the user's notes and credentials -# for sucessful account request? This will be stored indefinetely -# and will be accessible to users with crediential lookup permissions -$wgConfirmAccountSaveInfo = true; - -# Send an email to this address when account requestors confirm their email. -# Set to false to skip this -$wgConfirmAccountContact = false; - -# If ConfirmEdit is installed and set to trigger for createaccount, -# inject catpchas for requests too? -$wgConfirmAccountCaptchas = true; - -# Storage repos. Has B/C for when this used FileStore. -$wgConfirmAccountFSRepos = array( - 'accountreqs' => array( # Location of attached files for pending requests - 'name' => 'accountreqs', - 'directory' => isset( $wgFileStore['accountreqs'] ) ? - $wgFileStore['accountreqs']['directory'] : "{$IP}/images/accountreqs", - 'url' => isset( $wgFileStore['accountreqs'] ) ? - $wgFileStore['accountreqs']['url'] : null, - 'hashLevels' => isset( $wgFileStore['accountreqs'] ) ? - $wgFileStore['accountreqs']['hash'] : 3 - ), - 'accountcreds' => array( # Location of credential files - 'name' => 'accountcreds', - 'directory' => isset( $wgFileStore['accountcreds'] ) ? - $wgFileStore['accountcreds']['directory'] : "{$IP}/images/accountcreds", - 'url' => isset( $wgFileStore['accountcreds'] ) ? - $wgFileStore['accountcreds']['url'] : null, - 'hashLevels' => isset( $wgFileStore['accountcreds'] ) ? - $wgFileStore['accountcreds']['hash'] : 3 - ) -); - -# Restrict account creation -$wgGroupPermissions['*']['createaccount'] = false; -$wgGroupPermissions['user']['createaccount'] = false; -# Grant account queue rights -$wgGroupPermissions['bureaucrat']['confirmaccount'] = true; -# This right has the request IP show when confirming accounts -$wgGroupPermissions['bureaucrat']['requestips'] = true; - -# If credentials are stored, this right lets users look them up -$wgGroupPermissions['bureaucrat']['lookupcredentials'] = true; - -# Show notice for open requests to admins? -# This is cached, but still can be expensive on sites with thousands of requests. -$wgConfirmAccountNotice = true; - -# End of configuration variables. -# ######## + array( 'enabled' => true ), + # Real name of user + 'RealName' => array( 'enabled' => false ), + # Biographical info + 'Biography' => array( 'enabled' => false, 'minWords' => 0 ), + # Interest checkboxes (defined in MediaWiki:requestaccount-areas) + 'AreasOfInterest' => array( 'enabled' => true ), + # CV/resume attachment option + 'CV' => array( 'enabled' => false ), + # Additional non-public info for reviewer + 'Notes' => array( 'enabled' => true ), + # Option to place web URLs that establish the user + 'Links' => array( 'enabled' => false ), + # Terms of Service checkbox + 'TermsOfService' => array( 'enabled' => true ), +); + +# If files can be attached, what types can be used? (MIME data is checked) +$wgAccountRequestExts = array( 'txt', 'pdf', 'doc', 'latex', 'rtf', 'text', 'wp', 'wpd', 'sxw' ); + +# Prospective account request types. +# Format is an array of (integer => (subpage param,user group,autotext)) pairs. +# The integer keys enumerate the request types. The key for a type should not change. +# Each type has its own request queue at Special:ConfirmAccount/. +# When a request of a certain type is approved, the new user: +# (a) is placed in the group (if not User or *) +# (b) has appended to his or her user page +$wgAccountRequestTypes = array( + 0 => array( 'authors', 'user', null ) +); + +# If set, will add {{DEFAULTSORT:sortkey}} to userpages for auto-categories. +# The sortkey will be made by doing a regex search and replace on the title. +# Set this variable to false to avoid sortkey use. +$wgConfirmAccountSortkey = false; +// For example, the below will do {{DEFAULTSORT:firstname, lastname}} +# $wgConfirmAccountSortkey = array( '/^(.+) ([^ ]+)$/', '$2, $1' ); + +# IMPORTANT: do we store the user's notes and credentials +# for sucessful account request? This will be stored indefinetely +# and will be accessible to users with crediential lookup permissions +$wgConfirmAccountSaveInfo = true; + +# Send an email to this address when account requestors confirm their email. +# Set to false to skip this +$wgConfirmAccountContact = false; + +# If ConfirmEdit is installed and set to trigger for createaccount, +# inject catpchas for requests too? +$wgConfirmAccountCaptchas = true; + +# Storage repos. Has B/C for when this used FileStore. +$wgConfirmAccountFSRepos = array( + 'accountreqs' => array( # Location of attached files for pending requests + 'name' => 'accountreqs', + 'directory' => isset( $wgFileStore['accountreqs'] ) ? + $wgFileStore['accountreqs']['directory'] : "{$IP}/images/accountreqs", + 'url' => isset( $wgFileStore['accountreqs'] ) ? + $wgFileStore['accountreqs']['url'] : null, + 'hashLevels' => isset( $wgFileStore['accountreqs'] ) ? + $wgFileStore['accountreqs']['hash'] : 3 + ), + 'accountcreds' => array( # Location of credential files + 'name' => 'accountcreds', + 'directory' => isset( $wgFileStore['accountcreds'] ) ? + $wgFileStore['accountcreds']['directory'] : "{$IP}/images/accountcreds", + 'url' => isset( $wgFileStore['accountcreds'] ) ? + $wgFileStore['accountcreds']['url'] : null, + 'hashLevels' => isset( $wgFileStore['accountcreds'] ) ? + $wgFileStore['accountcreds']['hash'] : 3 + ) +); + +# Restrict account creation +$wgGroupPermissions['*']['createaccount'] = false; +$wgGroupPermissions['user']['createaccount'] = false; +# Grant account queue rights +$wgGroupPermissions['bureaucrat']['confirmaccount'] = true; +# This right has the request IP show when confirming accounts +$wgGroupPermissions['bureaucrat']['requestips'] = true; + +# If credentials are stored, this right lets users look them up +$wgGroupPermissions['bureaucrat']['lookupcredentials'] = true; + +# Show notice for open requests to admins? +# This is cached, but still can be expensive on sites with thousands of requests. +$wgConfirmAccountNotice = true; + +# End of configuration variables. +# ######## diff --git a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php index baa0fa9..eed848b 100644 --- a/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php +++ b/ConfirmAccount/frontend/specialpages/actions/RequestAccount_body.php @@ -221,11 +221,11 @@ class RequestAccountPage extends SpecialPage { $form .= '' . $this->msg('requestaccount-set-pwd') . ''; $form .= ' - + - +
' . $this->msg('createacct-yourpassword-ph') . '' . $this->msg('yourpassword') . '
' . $this->msg('createacct-yourpasswordagain') . '' . $this->msg('yourpasswordagain') . '
' . "\n";