Followup to 50635: Consolidate all of these hacky global checks into a clean method...

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 5c15fee..00c2e18 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -62,7 +62,7 @@ class IPBlockForm {
                $this->BlockCreateAccount = $wgRequest->getBool( 'wpCreateAccount', $byDefault );
                $this->BlockEnableAutoblock = $wgRequest->getBool( 'wpEnableAutoblock', $byDefault );
                $this->BlockEmail = false;
-               if( $wgEnableUserEmail && $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+               if( self::canBlockEmail( $wgUser ) ) {
                        $this->BlockEmail = $wgRequest->getBool( 'wpEmailBan', false );
                }
                $this->BlockWatchUser = $wgRequest->getBool( 'wpWatchUser', false );
@@ -233,8 +233,7 @@ class IPBlockForm {
                        </tr>"
                );
 
-               global $wgSysopEmailBans, $wgBlockAllowsUTEdit, $wgEnableUserEmail;
-               if( $wgEnableUserEmail && $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+               if( self::canBlockEmail( $wgUser ) ) {
                        $wgOut->addHTML("
                                <tr id='wpEnableEmailBan'>
                                        <td>&nbsp;</td>
@@ -272,6 +271,9 @@ class IPBlockForm {
                                </td>
                        </tr>"
                );
+               
+               # Can we explicitly disallow the use of user_talk?
+               global $wgBlockAllowsUTEdit;
                if( $wgBlockAllowsUTEdit ){
                        $wgOut->addHTML("
                                <tr id='wpAllowUsertalkRow'>
@@ -311,6 +313,16 @@ class IPBlockForm {
                        $this->showLogFragment( $wgOut, Title::makeTitle( NS_USER, $this->BlockAddress ) );
                }
        }
+       
+       /**
+        * Can we do an email block?
+        * @param User $user The sysop wanting to make a block
+        * @return boolean
+        */
+       protected function canBlockEmail( $user ) {
+               global $wgEnableUserEmail, $wgSysopEmailBans;
+               return ($wgEnableUserEmail && $wgSysopEmailBans && $user->isAllowed( 'blockemail' ));
+       }
 
        /**
         * Backend block code.