renamed NAMESPACE constant to NAMESPACE_RESTRICTION (and PAGE to PAGE_RESTRICTION...

diff --git a/includes/specials/SpecialListUserRestrictions.php b/includes/specials/SpecialListUserRestrictions.php
index 4a78f4b..e7fc807 100644 (file)
--- a/includes/specials/SpecialListUserRestrictions.php
+++ b/includes/specials/SpecialListUserRestrictions.php
@@ -48,8 +48,8 @@ class SpecialListUserRestrictionsForm {
        public static function typeSelector( $name = 'type', $value = '', $id = false ) {
                $s = new XmlSelect( $name, $id, $value );
                $s->addOption( wfMsg( 'userrestrictiontype-none' ), '' );
-               $s->addOption( wfMsg( 'userrestrictiontype-page' ), UserRestriction::PAGE );
-               $s->addOption( wfMsg( 'userrestrictiontype-namespace' ), UserRestriction::NAMESPACE );
+               $s->addOption( wfMsg( 'userrestrictiontype-page' ), UserRestriction::PAGE_RESTRICTION );
+               $s->addOption( wfMsg( 'userrestrictiontype-namespace' ), UserRestriction::NAMESPACE_RESTRICTION );
                return $s->getHTML();
        }
 
@@ -58,7 +58,7 @@ class SpecialListUserRestrictionsForm {
                $conds = array();
 
                $type = $wgRequest->getVal( 'type' );
-               if( in_array( $type, array( UserRestriction::PAGE, UserRestriction::NAMESPACE ) ) )
+               if( in_array( $type, array( UserRestriction::PAGE_RESTRICTION, UserRestriction::NAMESPACE_RESTRICTION ) ) )
                        $conds['ur_type'] = $type;
 
                $user = $wgRequest->getVal( 'user' );
@@ -105,7 +105,7 @@ class UserRestrictionsPager extends ReverseChronologicalPager {
                        $name = str_replace( ' ', '_', $row->ur_user_text );
                        $lb->add( NS_USER, $name );
                        $lb->add( NS_USER_TALK, $name );
-                       if( $row->ur_type == UserRestriction::PAGE )
+                       if( $row->ur_type == UserRestriction::PAGE_RESTRICTION )
                                $lb->add( $row->ur_page_namespace, $row->ur_page_title );
                }
                $lb->execute();

diff --git a/includes/specials/SpecialRestrictUser.php b/includes/specials/SpecialRestrictUser.php
index 361cd91..8f6be0d 100644 (file)
--- a/includes/specials/SpecialRestrictUser.php
+++ b/includes/specials/SpecialRestrictUser.php
@@ -62,7 +62,7 @@ class RestrictUserForm {
                global $wgOut, $wgRequest, $wgUser;
                $error = '';
                $success = false;
-               if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::PAGE &&
+               if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::PAGE_RESTRICTION &&
                        $wgUser->matchEditToken( $wgRequest->getVal( 'edittoken' ) ) ) {
 
                        $title = Title::newFromText( $wgRequest->getVal( 'page' ) );
@@ -81,14 +81,14 @@ class RestrictUserForm {
                                $success = array('restrictuser-success', $user);
                        }
                }
-               $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::PAGE;
+               $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::PAGE_RESTRICTION;
                $wgOut->addHTML( Xml::fieldset( wfMsg( 'restrictuser-legend-page' ) ) );
 
                self::printSuccessError( $success, $error );
 
                $wgOut->addHTML( Xml::openElement( 'form', array( 'action' => SpecialPage::getTitleFor( 'RestrictUser' )->getLocalUrl(),
                        'method' => 'post' ) ) );
-               $wgOut->addHTML( Xml::hidden( 'type', UserRestriction::PAGE ) );
+               $wgOut->addHTML( Xml::hidden( 'type', UserRestriction::PAGE_RESTRICTION ) );
                $wgOut->addHTML( Xml::hidden( 'edittoken', $wgUser->editToken() ) );
                $wgOut->addHTML( Xml::hidden( 'user', $user ) );
                $form = array();
@@ -113,7 +113,7 @@ class RestrictUserForm {
        public static function doPageRestriction( $uid, $user ) {
                global $wgUser, $wgRequest;
                $r = new UserRestriction();
-               $r->setType( UserRestriction::PAGE );
+               $r->setType( UserRestriction::PAGE_RESTRICTION );
                $r->setPage( Title::newFromText( $wgRequest->getVal( 'page' ) ) );
                $r->setSubjectId( $uid );
                $r->setSubjectText( $user );
@@ -133,7 +133,7 @@ class RestrictUserForm {
                global $wgOut, $wgRequest, $wgUser, $wgContLang;
                $error = '';
                $success = false;
-               if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE &&
+               if( $wgRequest->wasPosted() && $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE_RESTRICTION &&
                        $wgUser->matchEditToken( $wgRequest->getVal( 'edittoken' ) ) ) {
                                $ns = $wgRequest->getVal( 'namespace' );
                                if( $wgContLang->getNsText( $ns ) === false )
@@ -149,14 +149,14 @@ class RestrictUserForm {
                                        $success = array('restrictuser-success', $user);
                                }
                }
-               $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE;
+               $useRequestValues = $wgRequest->getVal( 'type' ) == UserRestriction::NAMESPACE_RESTRICTION;
                $wgOut->addHTML( Xml::fieldset( wfMsg( 'restrictuser-legend-namespace' ) ) );
 
                self::printSuccessError( $success, $error );
 
                $wgOut->addHTML( Xml::openElement( 'form', array( 'action' => SpecialPage::getTitleFor( 'RestrictUser' )->getLocalUrl(),
                        'method' => 'post' ) ) );
-               $wgOut->addHTML( Xml::hidden( 'type', UserRestriction::NAMESPACE ) );
+               $wgOut->addHTML( Xml::hidden( 'type', UserRestriction::NAMESPACE_RESTRICTION ) );
                $wgOut->addHTML( Xml::hidden( 'edittoken', $wgUser->editToken() ) );
                $wgOut->addHTML( Xml::hidden( 'user', $user ) );
                $form = array();
@@ -172,7 +172,7 @@ class RestrictUserForm {
        public static function doNamespaceRestriction( $uid, $user ) {
                global $wgUser, $wgRequest;
                $r = new UserRestriction();
-               $r->setType( UserRestriction::NAMESPACE );
+               $r->setType( UserRestriction::NAMESPACE_RESTRICTION );
                $r->setNamespace( $wgRequest->getVal( 'namespace' ) );
                $r->setSubjectId( $uid );
                $r->setSubjectText( $user );