Reworked e-mail blocking. To be enabled for a user, it now requires that $wgSysopEmai...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 379faab..5f4d28d 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1061,6 +1061,7 @@ $wgGroupPermissions['sysop']['unwatchedpages']  = true;
 $wgGroupPermissions['sysop']['autoconfirmed']   = true;
 $wgGroupPermissions['sysop']['upload_by_url']   = true;
 $wgGroupPermissions['sysop']['ipblock-exempt'] = true;
+$wgGroupPermissions['sysop']['blockemail']      = true;
 
 // Permission to change users' group assignments
 $wgGroupPermissions['bureaucrat']['userrights'] = true;

diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 1211f3f..c02d3ec 100644 (file)
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -243,7 +243,7 @@ class IPBlockForm {
 
                global $wgSysopEmailBans;
 
-               if ( $wgSysopEmailBans ) {
+               if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
                        $wgOut->addHTML("
                        <tr>
                        <td>&nbsp;</td>