Added back 'editusercssjs' right for regression and backward compatibility, per Code...
[lhc/web/wiklou.git] / includes / Title.php
index 74cd6f0..41fa944 100644 (file)
@@ -152,6 +152,14 @@ class Title {
        }
 
        /**
+        * THIS IS NOT THE FUNCTION YOU WANT. Use Title::newFromText().
+        *
+        * Example of wrong and broken code:
+        * $title = Title::newFromURL( $wgRequest->getVal( 'title' ) );
+        *
+        * Example of right code:
+        * $title = Title::newFromText( $wgRequest->getVal( 'title' ) );
+        *
         * Create a new Title from URL-encoded text. Ensures that
         * the given title's length does not exceed the maximum.
         * @param $url \type{\string} the title, as might be taken from a URL
@@ -449,7 +457,7 @@ class Title {
                return trim( $t );
        }
 
-       /*
+       /**
         * Make a prefixed DB key from a DB key and a namespace index
         * @param $ns \type{\int} numerical representation of the namespace
         * @param $title \type{\string} the DB key form the title
@@ -854,11 +862,6 @@ class Title {
         */
        public function getLinkUrl( $query = array(), $variant = false ) {
                wfProfileIn( __METHOD__ );
-               if( !is_array( $query ) ) {
-                       wfProfileOut( __METHOD__ );
-                       throw new MWException( 'Title::getLinkUrl passed a non-array for '.
-                       '$query' );
-               }
                if( $this->isExternal() ) {
                        $ret = $this->getFullURL( $query );
                } elseif( $this->getPrefixedText() === '' && $this->getFragment() !== '' ) {
@@ -1171,7 +1174,21 @@ class Title {
                        
                        if( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
-                               $errors[] = array ('movenotallowed');
+                               global $wgGroupPermissions;
+                               $userCanMove = false;
+                               if ( isset( $wgGroupPermissions['user']['move'] ) ) {
+                                       $userCanMove = $wgGroupPermissions['user']['move'];
+                               }
+                               $autoconfirmedCanMove = false;
+                               if ( isset( $wgGroupPermissions['autoconfirmed']['move'] ) ) {
+                                       $autoconfirmedCanMove = $wgGroupPermissions['autoconfirmed']['move'];
+                               }
+                               if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
+                                       // custom message if logged-in users without any special rights can move
+                                       $errors[] = array ( 'movenologintext' );
+                               } else {
+                                       $errors[] = array ('movenotallowed');
+                               }
                        }
                } elseif ( $action == 'create' ) {
                        if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
@@ -1263,8 +1280,16 @@ class Title {
 
                # Protect css/js subpages of user pages
                # XXX: this might be better using restrictions
-               # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
-               if( $this->isCssJsSubpage() && !$user->isAllowed('editusercssjs')
+               # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssSubpage() 
+               #      and $this->userCanEditJsSubpage() from working
+               # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
+               if( $this->isCssSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('editusercss') )
+                       && $action != 'patrol'
+                       && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
+               {
+                       $errors[] = array('customcssjsprotected');
+               } else if( $this->isJsSubpage() && ( !$user->isAllowed('editusercssjs') || !$user->isAllowed('edituserjs') )
+                       && $action != 'patrol'
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
                {
                        $errors[] = array('customcssjsprotected');
@@ -1409,7 +1434,8 @@ class Title {
 
                $expiry_description = '';
                if ( $encodedExpiry != 'infinity' ) {
-                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
+                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring',$wgContLang->timeanddate( $expiry ),
+                               $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
                }
                else {
                        $expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')';
@@ -1418,23 +1444,30 @@ class Title {
                # Update protection table
                if ($create_perm != '' ) {
                        $dbw->replace( 'protected_titles', array(array('pt_namespace', 'pt_title')),
-                               array( 'pt_namespace' => $namespace, 'pt_title' => $title
-                                       , 'pt_create_perm' => $create_perm
-                                       , 'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw)
-                                       , 'pt_expiry' => $encodedExpiry
-                                       , 'pt_user' => $wgUser->getId(), 'pt_reason' => $reason ), __METHOD__  );
+                               array(
+                                       'pt_namespace' => $namespace,
+                                       'pt_title' => $title,
+                                       'pt_create_perm' => $create_perm,
+                                       'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw),
+                                       'pt_expiry' => $encodedExpiry,
+                                       'pt_user' => $wgUser->getId(),
+                                       'pt_reason' => $reason,
+                               ), __METHOD__
+                       );
                } else {
                        $dbw->delete( 'protected_titles', array( 'pt_namespace' => $namespace,
                                'pt_title' => $title ), __METHOD__ );
                }
                # Update the protection log
-               $log = new LogPage( 'protect' );
+               if( $dbw->affectedRows() ) {
+                       $log = new LogPage( 'protect' );
 
-               if( $create_perm ) {
-                       $params = array("[create=$create_perm] $expiry_description",'');
-                       $log->addEntry( $this->mRestrictions['create'] ? 'modify' : 'protect', $this, trim( $reason ), $params );
-               } else {
-                       $log->addEntry( 'unprotect', $this, $reason );
+                       if( $create_perm ) {
+                               $params = array("[create=$create_perm] $expiry_description",'');
+                               $log->addEntry( ( isset( $this->mRestrictions['create'] ) && $this->mRestrictions['create'] ) ? 'modify' : 'protect', $this, trim( $reason ), $params );
+                       } else {
+                               $log->addEntry( 'unprotect', $this, $reason );
+                       }
                }
 
                return true;
@@ -1468,7 +1501,33 @@ class Title {
         */
        public function userCanRead() {
                global $wgUser, $wgGroupPermissions;
-
+               
+               static $useShortcut = null;
+
+               # Initialize the $useShortcut boolean, to determine if we can skip quite a bit of code below
+               if( is_null( $useShortcut ) ) {
+                       global $wgRevokePermissions;
+                       $useShortcut = true;
+                       if( empty( $wgGroupPermissions['*']['read'] ) ) {
+                               # Not a public wiki, so no shortcut
+                               $useShortcut = false;
+                       } elseif( !empty( $wgRevokePermissions ) ) {
+                               /*
+                                * Iterate through each group with permissions being revoked (key not included since we don't care
+                                * what the group name is), then check if the read permission is being revoked. If it is, then
+                                * we don't use the shortcut below since the user might not be able to read, even though anon
+                                * reading is allowed.
+                                */
+                               foreach( $wgRevokePermissions as $perms ) {
+                                       if( !empty( $perms['read'] ) ) {
+                                               # We might be removing the read right from the user, so no shortcut
+                                               $useShortcut = false;
+                                               break;
+                                       }
+                               }
+                       }
+               }
+               
                $result = null;
                wfRunHooks( 'userCan', array( &$this, &$wgUser, 'read', &$result ) );
                if ( $result !== null ) {
@@ -1476,7 +1535,7 @@ class Title {
                }
 
                # Shortcut for public wikis, allows skipping quite a bit of code
-               if ( !empty( $wgGroupPermissions['*']['read'] ) )
+               if ( $useShortcut )
                        return true;
 
                if( $wgUser->isAllowed( 'read' ) ) {
@@ -1661,15 +1720,28 @@ class Title {
                return ( NS_USER == $this->mNamespace && preg_match("/\\/.*\\.js$/", $this->mTextform ) );
        }
        /**
-        * Protect css/js subpages of user pages: can $wgUser edit
+        * Protect css subpages of user pages: can $wgUser edit
         * this page?
         *
         * @return \type{\bool} TRUE or FALSE
         * @todo XXX: this might be better using restrictions
         */
-       public function userCanEditCssJsSubpage() {
+       public function userCanEditCssSubpage() {
                global $wgUser;
-               return ( $wgUser->isAllowed('editusercssjs') || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('editusercss') ) 
+                       || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+       }
+       /**
+        * Protect js subpages of user pages: can $wgUser edit
+        * this page?
+        *
+        * @return \type{\bool} TRUE or FALSE
+        * @todo XXX: this might be better using restrictions
+        */
+       public function userCanEditJsSubpage() {
+               global $wgUser;
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('edituserjs') )
+                       || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
        }
 
        /**
@@ -2769,6 +2841,9 @@ class Title {
                $newid = $nt->getArticleID();
                $oldid = $this->getArticleID();
                $latest = $this->getLatestRevID();
+               $rcts = $dbw->timestamp( $nt->getEarliestRevTime() );
+               $newns = $nt->getNamespace();
+               $newdbk = $nt->getDBkey();
 
                $dbw = wfGetDB( DB_MASTER );
 
@@ -2790,6 +2865,11 @@ class Title {
                        $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
                        $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ );
                }
+               // If the redirect was recently created, it may have an entry in recentchanges still    
+               $dbw->delete( 'recentchanges', 
+                       array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), 
+                       __METHOD__
+               );
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
@@ -3480,40 +3560,29 @@ class Title {
         * Generate strings used for xml 'id' names in monobook tabs
         * @return \type{\string} XML 'id' name
         */
-       public function getNamespaceKey() {
-               global $wgContLang;
-               switch ($this->getNamespace()) {
-                       case NS_MAIN:
-                       case NS_TALK:
-                               return 'nstab-main';
-                       case NS_USER:
-                       case NS_USER_TALK:
-                               return 'nstab-user';
-                       case NS_MEDIA:
-                               return 'nstab-media';
-                       case NS_SPECIAL:
-                               return 'nstab-special';
-                       case NS_PROJECT:
-                       case NS_PROJECT_TALK:
-                               return 'nstab-project';
-                       case NS_FILE:
-                       case NS_FILE_TALK:
-                               return 'nstab-image';
-                       case NS_MEDIAWIKI:
-                       case NS_MEDIAWIKI_TALK:
-                               return 'nstab-mediawiki';
-                       case NS_TEMPLATE:
-                       case NS_TEMPLATE_TALK:
-                               return 'nstab-template';
-                       case NS_HELP:
-                       case NS_HELP_TALK:
-                               return 'nstab-help';
-                       case NS_CATEGORY:
-                       case NS_CATEGORY_TALK:
-                               return 'nstab-category';
-                       default:
-                               return 'nstab-' . $wgContLang->lc( $this->getSubjectNsText() );
+       public function getNamespaceKey( $prepend = 'nstab-' ) {
+               global $wgContLang, $wgCanonicalNamespaceNames;
+               // Gets the subject namespace if this title
+               $namespace = MWNamespace::getSubject( $this->getNamespace() );
+               // Checks if cononical namespace name exists for namespace
+               if ( isset( $wgCanonicalNamespaceNames[$namespace] ) ) {
+                       // Uses canonical namespace name
+                       $namespaceKey = $wgCanonicalNamespaceNames[$namespace];
+               } else {
+                       // Uses text of namespace
+                       $namespaceKey = $this->getSubjectNsText();
+               }
+               // Makes namespace key lowercase
+               $namespaceKey = $wgContLang->lc( $namespaceKey );
+               // Uses main
+               if ( $namespaceKey == '' ) {
+                       $namespaceKey = 'main';
+               }
+               // Changes file to image for backwards compatibility
+               if ( $namespaceKey == 'file' ) {
+                       $namespaceKey = 'image';
                }
+               return $prepend . $namespaceKey;
        }
 
        /**