r15384 - Code Review

From MediaWiki.org

Jump to: navigation, search
Repository:MediaWiki
Revision:r15383 | r15384 (on ViewVC) | r15385 >
Date:17:33, 6 July 2006
Author:robchurch
Status:new
Tags:
Comment:* Implicit group "emailconfirmed" for all users whose email addresses are confirmed
Modified paths:

Diff [purge]

Index: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php	(revision 15383)
+++ trunk/phase3/includes/User.php	(revision 15384)
@@ -773,6 +773,17 @@
 			if( $accountAge >= $wgAutoConfirmAge ) {
 				$implicitGroups[] = 'autoconfirmed';
 			}
+			
+			# Implicit group for users whose email addresses are confirmed
+			global $wgEmailAuthentication;
+			if( $this->isValidEmailAddr( $this->mEmail ) ) {
+				if( $wgEmailAuthentication ) {
+					if( $this->mEmailAuthenticated )
+						$implicitGroups[] = 'emailconfirmed';
+				} else {
+					$implicitGroups[] = 'emailconfirmed';
+				}
+			}
 
 			$effectiveGroups = array_merge( $implicitGroups, $this->mGroups );
 			$this->mRights = $this->getGroupPermissions( $effectiveGroups );
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php	(revision 15383)
+++ trunk/phase3/includes/DefaultSettings.php	(revision 15384)
@@ -882,6 +882,10 @@
 // Implicit group for accounts that pass $wgAutoConfirmAge
 $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
 
+// Implicit group for accounts with confirmed email addresses
+// This has little use when email address confirmation is off
+$wgGroupPermissions['emailconfirmed']['emailconfirmed'] = true;
+
 // Users with bot privilege can have their edits hidden
 // from various log pages by default
 $wgGroupPermissions['bot'  ]['bot']             = true;
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	(revision 15383)
+++ trunk/phase3/RELEASE-NOTES	(revision 15384)
@@ -652,8 +652,8 @@
 * (bug 6560) Avoid PHP notice when trimming ISBN whitespace
 * Added namespace translation to Kannada (ka)
 * (bug 6566) Improve input validation on timestamp conversion
+* Implicit group "emailconfirmed" for all users whose email addresses are confirmed
 
-
 == Compatibility ==
 
 MediaWiki 1.7 requires PHP 5 (5.1 recommended). PHP 4 is no longer supported.
Views
Toolbox