Tell regexp parser to use extra analysis on external link regexp;
[lhc/web/wiklou.git] / includes / Skin.php
index 9bb6a52..118f90c 100644 (file)
@@ -14,27 +14,6 @@ if( defined( "MEDIAWIKI" ) ) {
 # See skin.doc
 require_once( 'Image.php' );
 
-# These are the INTERNAL names, which get mapped directly to class names and
-# file names in ./skins/. For display purposes, the Language class has
-# internationalized names
-#
-/*
-$wgValidSkinNames = array(
-       'standard'      => 'Standard',
-       'nostalgia'     => 'Nostalgia',
-       'cologneblue'   => 'CologneBlue'
-);
-if( $wgUsePHPTal ) {
-       #$wgValidSkinNames[] = 'PHPTal';
-       #$wgValidSkinNames['davinci'] = 'DaVinci';
-       #$wgValidSkinNames['mono'] = 'Mono';
-       #$wgValidSkinNames['monobookminimal'] = 'MonoBookMinimal';
-       $wgValidSkinNames['monobook'] = 'MonoBook';
-       $wgValidSkinNames['myskin'] = 'MySkin';
-       $wgValidSkinNames['chick'] = 'Chick';
-}
-*/
-
 # Get a list of all skins available in /skins/
 # Build using the regular expression '^(.*).php$'
 # Array keys are all lower case, array value keep the case used by filename
@@ -44,9 +23,9 @@ $skinDir = dir($IP.'/skins');
 
 # while code from www.php.net
 while (false !== ($file = $skinDir->read())) {
-       if(preg_match('/^(.*).php$/',$file, $matches)) {
+       if(preg_match('/^([^.].*)\.php$/',$file, $matches)) {
                $aSkin = $matches[1];
-       $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
+               $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
        }
 }
 $skinDir->close();
@@ -104,7 +83,7 @@ class Skin {
        /**#@-*/
 
        function Skin() {
-               $this->linktrail = wfMsg('linktrail');
+               $this->linktrail = wfMsgForContent('linktrail');
        }
 
        function getSkinNames() {
@@ -472,7 +451,7 @@ class Skin {
                        $s .= '<br/><hr/>';
 
                        # get a big array of the parents tree
-                       $parenttree = $wgTitle->getCategorieBrowser();
+                       $parenttree = $wgTitle->getParentCategoryTree();
 
                        # Render the array as a serie of links
                        function walkThrough ($tree) {
@@ -490,7 +469,7 @@ class Skin {
                                        # add our current element to the list
                                        $eltitle = Title::NewFromText($element);
                                        # FIXME : should be makeLink() [AV]
-                                       $return .= $sk->makeKnownLink($element, $eltitle->getText()).' &gt; ';
+                                       $return .= $sk->makeLink($element, $eltitle->getText()).' &gt; ';
                                }
                                return $return;
                        }
@@ -795,10 +774,8 @@ class Skin {
                                if($id || $ip) { # both anons and non-anons have contri list
                                        $s .= $sep . $this->userContribsLink();
                                }
-                               if ( 0 != $wgUser->getID() ) { # show only to signed in users
-                                       if($id) {       # can only email non-anons
-                                               $s .= $sep . $this->emailUserLink();
-                                       }
+                               if( $this->showEmailUser( $id ) ) {
+                                       $s .= $sep . $this->emailUserLink();
                                }
                        }
                        if ( $wgTitle->getArticleId() ) {
@@ -920,6 +897,10 @@ class Skin {
                return $s;
        }
 
+       /**
+        * show a drop-down box of special pages
+        * @TODO crash bug913. Need to be rewrote completly.
+        */
        function specialPagesList() {
                global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript;
                require_once('SpecialPage.php');
@@ -1077,7 +1058,7 @@ class Skin {
        function moveThisPage() {
                global $wgTitle, $wgContLang;
 
-               if ( $wgTitle->userCanEdit() ) {
+               if ( $wgTitle->userCanMove() ) {
                        $s = $this->makeKnownLink( $wgContLang->specialPage( 'Movepage' ),
                          wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
                } // no message if page is protected - would be redundant
@@ -1108,6 +1089,14 @@ class Skin {
                return $s;
        }
 
+       function showEmailUser( $id ) {
+               global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
+               return $wgEnableEmail &&
+                      $wgEnableUserEmail &&
+                      0 != $wgUser->getID() && # show only to signed in users
+                      0 != $id; # can only email non-anons
+       }
+       
        function emailUserLink() {
                global $wgTitle, $wgContLang;
 
@@ -1426,21 +1415,18 @@ class Skin {
                wfProfileIn( $fname );
 
                if ( !is_object( $nt ) ) {
+                       wfProfileIn( $fname );
                        return $text;
                }
-               $link = $nt->getPrefixedURL();
-#              if ( '' != $section && substr($section,0,1) != "#" ) {
-#                      $section = ''
-
-               if ( '' == $link ) {
-                       $u = '';
-                       if ( '' == $text ) {
-                               $text = htmlspecialchars( $nt->getFragment() );
-                       }
-               } else {
-                       $u = $nt->escapeLocalURL( $query );
-               }
+               
+               $u = $nt->escapeLocalURL( $query );
                if ( '' != $nt->getFragment() ) {
+                       if( $nt->getPrefixedDbkey() == '' ) {
+                               $u = '';
+                               if ( '' == $text ) {
+                                       $text = htmlspecialchars( $nt->getFragment() );
+                               }
+                       }
                        $anchor = urlencode( do_html_entity_decode( str_replace(' ', '_', $nt->getFragment()), ENT_COMPAT, $wgInputEncoding ) );
                        $replacearray = array(
                                '%3A' => ':',
@@ -1927,540 +1913,6 @@ class Skin {
                return '<a href="'.$url.'"'.$style.'>'.$text.'</a>';
        }
 
-       # Called by history lists and recent changes
-       #
-
-       # Returns text for the start of the tabular part of RC
-       function beginRecentChangesList() {
-               $this->rc_cache = array() ;
-               $this->rcMoveIndex = 0;
-               $this->rcCacheIndex = 0 ;
-               $this->lastdate = '';
-               $this->rclistOpen = false;
-               return '';
-       }
-
-       function beginImageHistoryList() {
-               $s = "\n<h2>" . wfMsg( 'imghistory' ) . "</h2>\n" .
-                 "<p>" . wfMsg( 'imghistlegend' ) . "</p>\n".'<ul class="special">';
-               return $s;
-       }
-
-       /**
-        * Returns text for the end of RC
-        * If enhanced RC is in use, returns pretty much all the text
-        */
-       function endRecentChangesList() {
-               $s = $this->recentChangesBlock() ;
-               if( $this->rclistOpen ) {
-                       $s .= "</ul>\n";
-               }
-               return $s;
-       }
-
-       /**
-        * Enhanced RC ungrouped line
-        */
-       function recentChangesBlockLine ( $rcObj ) {
-               global $wgStylePath, $wgContLang ;
-
-               # Get rc_xxxx variables
-               extract( $rcObj->mAttribs ) ;
-               $curIdEq = 'curid='.$rc_cur_id;
-
-               # Spacer image
-               $r = '' ;
-
-               $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" border="0" />' ;
-               $r .= '<tt>' ;
-
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $r .= '&nbsp;&nbsp;';
-               } else {
-                       # M, N and !
-                       $M = wfMsg( 'minoreditletter' );
-                       $N = wfMsg( 'newpageletter' );
-
-                       if ( $rc_type == RC_NEW ) {
-                               $r .= $N ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-                       if ( $rc_minor ) {
-                               $r .= $M ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-                       if ( $rcObj->unpatrolled ) {
-                               $r .= '!';
-                       } else {
-                               $r .= '&nbsp;';
-                       }
-               }
-
-               # Timestamp
-               $r .= ' '.$rcObj->timestamp.' ' ;
-               $r .= '</tt>' ;
-
-               # Article link
-               $link = $rcObj->link ;
-               if ( $rcObj->watched ) $link = '<strong>'.$link.'</strong>' ;
-               $r .= $link ;
-
-               # Diff
-               $r .= ' (' ;
-               $r .= $rcObj->difflink ;
-               $r .= '; ' ;
-
-               # Hist
-               $r .= $this->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
-
-               # User/talk
-               $r .= ') . . '.$rcObj->userlink ;
-               $r .= $rcObj->usertalklink ;
-
-               # Comment
-                if ( $rc_comment != '' && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $rc_comment=$this->formatComment($rc_comment, $rcObj->getTitle());
-                       $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' );
-               }
-
-               $r .= "<br />\n" ;
-               return $r ;
-       }
-
-       /**
-        * Enhanced RC group
-        */
-       function recentChangesBlockGroup ( $block ) {
-               global $wgStylePath, $wgContLang ;
-
-               $r = '' ;
-               $M = wfMsg( 'minoreditletter' );
-               $N = wfMsg( 'newpageletter' );
-
-               # Collate list of users
-               $isnew = false ;
-               $unpatrolled = false;
-               $userlinks = array () ;
-               foreach ( $block AS $rcObj ) {
-                       $oldid = $rcObj->mAttribs['rc_last_oldid'];
-                       if ( $rcObj->mAttribs['rc_new'] ) {
-                               $isnew = true ;
-                       }
-                       $u = $rcObj->userlink ;
-                       if ( !isset ( $userlinks[$u] ) ) {
-                               $userlinks[$u] = 0 ;
-                       }
-                       if ( $rcObj->unpatrolled ) {
-                               $unpatrolled = true;
-                       }
-                       $userlinks[$u]++ ;
-               }
-
-               # Sort the list and convert to text
-               krsort ( $userlinks ) ;
-               asort ( $userlinks ) ;
-               $users = array () ;
-               foreach ( $userlinks as $userlink => $count) {
-                       $text = $userlink ;
-                       if ( $count > 1 ) $text .= " ({$count}&times;)" ;
-                       array_push ( $users , $text ) ;
-               }
-               $users = ' <font size="-1">['.implode('; ',$users).']</font>' ;
-
-               # Arrow
-               $rci = 'RCI'.$this->rcCacheIndex ;
-               $rcl = 'RCL'.$this->rcCacheIndex ;
-               $rcm = 'RCM'.$this->rcCacheIndex ;
-               $toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')" ;
-               $arrowdir = $wgContLang->isRTL() ? 'l' : 'r';
-               $tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_'.$arrowdir.'.png" width="12" height="12" alt="+" /></a></span>' ;
-               $tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_d.png" width="12" height="12" alt="-" /></a></span>' ;
-               $r .= $tl ;
-
-               # Main line
-               # M/N
-               $r .= '<tt>' ;
-               if ( $isnew ) $r .= $N ;
-               else $r .= '&nbsp;' ;
-               $r .= '&nbsp;' ; # Minor
-               if ( $unpatrolled ) {
-                       $r .= "!";
-               } else {
-                       $r .= "&nbsp;";
-               }
-
-               # Timestamp
-               $r .= ' '.$block[0]->timestamp.' ' ;
-               $r .= '</tt>' ;
-
-               # Article link
-               $link = $block[0]->link ;
-               if ( $block[0]->watched ) $link = '<strong>'.$link.'</strong>' ;
-               $r .= $link ;
-
-               $curIdEq = 'curid=' . $block[0]->mAttribs['rc_cur_id'];
-               if ( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
-                       # Changes
-                       $r .= ' ('.count($block).' ' ;
-                       if ( $isnew ) $r .= wfMsg('changes');
-                       else $r .= $this->makeKnownLinkObj( $block[0]->getTitle() , wfMsg('changes') ,
-                               $curIdEq.'&diff=0&oldid='.$oldid ) ;
-                       $r .= '; ' ;
-
-                       # History
-                       $r .= $this->makeKnownLinkObj( $block[0]->getTitle(), wfMsg( 'history' ), $curIdEq.'&action=history' );
-                       $r .= ')' ;
-               }
-
-               $r .= $users ;
-               $r .= "<br />\n" ;
-
-               # Sub-entries
-               $r .= '<div id="'.$rci.'" style="display:none">' ;
-               foreach ( $block AS $rcObj ) {
-                       # Get rc_xxxx variables
-                       extract( $rcObj->mAttribs );
-
-                       $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />';
-                       $r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
-                       if ( $rc_new ) {
-                               $r .= $N ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-
-                       if ( $rc_minor ) {
-                               $r .= $M ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-
-                       if ( $rcObj->unpatrolled ) {
-                               $r .= "!";
-                       } else {
-                               $r .= "&nbsp;";
-                       }
-
-                       $r .= '&nbsp;</tt>' ;
-
-                       $o = '' ;
-                       if ( $rc_last_oldid != 0 ) {
-                               $o = 'oldid='.$rc_last_oldid ;
-                       }
-                       if ( $rc_type == RC_LOG ) {
-                               $link = $rcObj->timestamp ;
-                       } else {
-                               $link = $this->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp , "{$curIdEq}&$o" ) ;
-                       }
-                       $link = '<tt>'.$link.'</tt>' ;
-
-                       $r .= $link ;
-                       $r .= ' (' ;
-                       $r .= $rcObj->curlink ;
-                       $r .= '; ' ;
-                       $r .= $rcObj->lastlink ;
-                       $r .= ') . . '.$rcObj->userlink ;
-                       $r .= $rcObj->usertalklink ;
-                       if ( $rc_comment != '' ) {
-                               $rc_comment=$this->formatComment($rc_comment, $rcObj->getTitle());
-                               $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' ) ;
-                       }
-                       $r .= "<br />\n" ;
-               }
-               $r .= "</div>\n" ;
-
-               $this->rcCacheIndex++ ;
-               return $r ;
-       }
-
-       /**
-        * If enhanced RC is in use, this function takes the previously cached
-        * RC lines, arranges them, and outputs the HTML
-        */
-       function recentChangesBlock () {
-               global $wgStylePath ;
-               if ( count ( $this->rc_cache ) == 0 ) return '' ;
-               $blockOut = '';
-               foreach ( $this->rc_cache AS $secureName => $block ) {
-                       if ( count ( $block ) < 2 ) {
-                               $blockOut .= $this->recentChangesBlockLine ( array_shift ( $block ) ) ;
-                       } else {
-                               $blockOut .= $this->recentChangesBlockGroup ( $block ) ;
-                       }
-               }
-
-               return '<div>'.$blockOut.'</div>' ;
-       }
-
-       /**
-        * Called in a loop over all displayed RC entries
-        * Either returns the line, or caches it for later use
-        */
-       function recentChangesLine( &$rc, $watched = false ) {
-               global $wgUser ;
-               $usenew = $wgUser->getOption( 'usenewrc' );
-               if ( $usenew )
-                       $line = $this->recentChangesLineNew ( $rc, $watched ) ;
-               else
-                       $line = $this->recentChangesLineOld ( $rc, $watched ) ;
-               return $line ;
-       }
-
-       function recentChangesLineOld( &$rc, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser, $wgRCSeconds, $wgUseRCPatrol, $wgOnlySysopsCanPatrol;
-
-               # Extract DB fields into local scope
-               extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
-
-               # Should patrol-related stuff be shown?
-               $unpatrolled = $wgUseRCPatrol && $wgUser->getID() != 0 && 
-                 ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') ) && $rc_patrolled == 0;
-               
-               # Make date header if necessary
-               $date = $wgContLang->date( $rc_timestamp, true);
-               $uidate = $wgLang->date( $rc_timestamp, true);
-               $s = '';
-               if ( $date != $this->lastdate ) {
-                       if ( '' != $this->lastdate ) { $s .= "</ul>\n"; }
-                       $s .= "<h4>{$uidate}</h4>\n<ul class=\"special\">";
-                       $this->lastdate = $date;
-                       $this->rclistOpen = true;
-               }
-
-               $s .= '<li>';
-
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       # Diff
-                       $s .= '(' . wfMsg( 'diff' ) . ') (';
-                       # Hist
-                       $s .= $this->makeKnownLinkObj( $rc->getMovedToTitle(), wfMsg( 'hist' ), 'action=history' ) .
-                               ') . . ';
-
-                       # "[[x]] moved to [[y]]"
-                       $msg = ( $rc_type == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
-                       $s .= wfMsg( $msg, $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
-                               $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $s .= '(' . $this->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-               } else {
-                       # Diff link
-                       if ( $rc_type == RC_NEW || $rc_type == RC_LOG ) {
-                               $diffLink = wfMsg( 'diff' );
-                       } else {
-                               if ( $unpatrolled )
-                                       $rcidparam = "&rcid={$rc_id}";
-                               else
-                                       $rcidparam = "";
-                               $diffLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'diff' ),
-                                 "{$curIdEq}&diff={$rc_this_oldid}&oldid={$rc_last_oldid}{$rcidparam}",
-                                 '', '', ' tabindex="'.$rc->counter.'"');
-                       }
-                       $s .= '('.$diffLink.') (';
-
-                       # History link
-                       $s .= $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
-                       $s .= ') . . ';
-
-                       # M, N and ! (minor, new and unpatrolled)
-                       if ( $rc_minor ) { $s .= ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>'; }
-                       if ( $rc_type == RC_NEW ) { $s .= '<span class="newpage">'.wfMsg( "newpageletter" ).'</span>'; }
-                       if ( !$rc_patrolled ) { $s .= ' <span class="unpatrolled">!</span>'; }
-
-                       # Article link
-                       # If it's a new article, there is no diff link, but if it hasn't been
-                       # patrolled yet, we need to give users a way to do so
-                       if ( $unpatrolled && $rc_type == RC_NEW )
-                               $articleLink = $this->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
-                       else
-                               $articleLink = $this->makeKnownLinkObj( $rc->getTitle(), '' );
-
-                       if ( $watched ) {
-                               $articleLink = '<strong>'.$articleLink.'</strong>';
-                       }
-                       $s .= ' '.$articleLink;
-
-               }
-
-               # Timestamp
-               $s .= '; ' . $wgLang->time( $rc_timestamp, true, $wgRCSeconds ) . ' . . ';
-
-               # User link (or contributions for unregistered users)
-               if ( 0 == $rc_user ) {
-                       $userLink = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                       $rc_user_text, 'target=' . $rc_user_text );
-               } else {
-                       $userLink = $this->makeLink( $wgContLang->getNsText( NS_USER ) . ':'.$rc_user_text, $rc_user_text );
-               }
-               $s .= $userLink;
-
-               # User talk link
-               $talkname=$wgContLang->getNsText(NS_TALK); # use the shorter name
-               global $wgDisableAnonTalk;
-               if( 0 == $rc_user && $wgDisableAnonTalk ) {
-                       $userTalkLink = '';
-               } else {
-                       $utns=$wgContLang->getNsText(NS_USER_TALK);
-                       $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );
-               }
-               # Block link
-               $blockLink='';
-               if ( ( 0 == $rc_user ) && $wgUser->isAllowed('block') ) {
-                       $blockLink = $this->makeKnownLink( $wgContLang->specialPage(
-                         'Blockip' ), wfMsg( 'blocklink' ), 'ip='.$rc_user_text );
-
-               }
-               if($blockLink) {
-                       if($userTalkLink) $userTalkLink .= ' | ';
-                       $userTalkLink .= $blockLink;
-               }
-               if($userTalkLink) $s.=' ('.$userTalkLink.')';
-
-               # Add comment
-               if ( '' != $rc_comment && '*' != $rc_comment && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $rc_comment=$this->formatComment($rc_comment,$rc->getTitle());
-                       $s .= $wgContLang->emphasize(' (' . $rc_comment . ')');
-               }
-               $s .= "</li>\n";
-
-               return $s;
-       }
-
-       function recentChangesLineNew( &$baseRC, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser, $wgRCSeconds;
-               global $wgUseRCPatrol, $wgOnlySysopsCanPatrol;
-               
-               # Create a specialised object
-               $rc = RCCacheEntry::newFromParent( $baseRC ) ;
-
-               # Extract fields from DB into the function scope (rc_xxxx variables)
-               extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
-
-               # If it's a new day, add the headline and flush the cache
-               $date = $wgContLang->date( $rc_timestamp, true);
-               $uidate = $wgLang->date( $rc_timestamp, true);
-               $ret = '';
-               if ( $date != $this->lastdate ) {
-                       # Process current cache
-                       $ret = $this->recentChangesBlock () ;
-                       $this->rc_cache = array() ;
-                       $ret .= "<h4>{$uidate}</h4>\n";
-                       $this->lastdate = $date;
-               }
-               
-               # Should patrol-related stuff be shown?
-               if ( $wgUseRCPatrol && $wgUser->getID() != 0 && 
-                 ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') )) {
-                       $rc->unpatrolled = !$rc_patrolled;
-               } else {
-                       $rc->unpatrolled = false;
-               }
-               
-               # Make article link
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $msg = ( $rc_type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir";
-                       $clink = wfMsg( $msg, $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
-                         $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $clink = '(' . $this->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-               } elseif ( $rc->unpatrolled && $rc_type == RC_NEW ) {
-                       # Unpatrolled new page, give rc_id in query
-                       $clink = $this->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
-               } else {
-                       $clink = $this->makeKnownLinkObj( $rc->getTitle(), '' ) ;
-               }
-
-               $time = $wgContLang->time( $rc_timestamp, true, $wgRCSeconds );
-               $rc->watched = $watched ;
-               $rc->link = $clink ;
-               $rc->timestamp = $time;
-
-               # Make "cur" and "diff" links
-               if ( ( $rc_type == RC_NEW && $rc_this_oldid == 0 ) || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $curLink = wfMsg( 'cur' );
-                       $diffLink = wfMsg( 'diff' );
-               } else {
-                       $query = $curIdEq.'&diff=0&oldid='.$rc_this_oldid;
-                       $aprops = ' tabindex="'.$baseRC->counter.'"';
-                       $curLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'cur' ), $query, '' ,'' , $aprops );
-                       $diffLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'diff'), $query, '' ,'' , $aprops );
-               }
-
-               # Make "last" link
-               $titleObj = $rc->getTitle();
-               if ( $rc->unpatrolled ) {
-                       $rcIdQuery = "&rcid={$rc_id}";
-               } else {
-                       $rcIdQuery = '';
-               }
-               if ( $rc_last_oldid == 0 || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $lastLink = wfMsg( 'last' );
-               } else {
-                       $lastLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'last' ),
-                         $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid . $rcIdQuery );
-               }
-
-               # Make user link (or user contributions for unregistered users)
-               if ( $rc_user == 0 ) {
-                       $userLink = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                       $rc_user_text, 'target=' . $rc_user_text );
-               } else {
-                       $userLink = $this->makeLink( $wgContLang->getNsText(
-                         Namespace::getUser() ) . ':'.$rc_user_text, $rc_user_text );
-               }
-
-               $rc->userlink = $userLink;
-               $rc->lastlink = $lastLink;
-               $rc->curlink  = $curLink;
-               $rc->difflink = $diffLink;
-
-               # Make user talk link
-               $utns=$wgContLang->getNsText(NS_USER_TALK);
-               $talkname=$wgContLang->getNsText(NS_TALK); # use the shorter name
-               $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );
-
-               global $wgDisableAnonTalk;
-               if ( ( 0 == $rc_user ) && $wgUser->isAllowed('block') ) {
-                       $blockLink = $this->makeKnownLink( $wgContLang->specialPage(
-                         'Blockip' ), wfMsg( 'blocklink' ), 'ip='.$rc_user_text );
-                       if( $wgDisableAnonTalk )
-                               $rc->usertalklink = ' ('.$blockLink.')';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.' | '.$blockLink.')';
-               } else {
-                       if( $wgDisableAnonTalk && ($rc_user == 0) )
-                               $rc->usertalklink = '';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.')';
-               }
-
-               # Put accumulated information into the cache, for later display
-               # Page moves go on their own line
-               $title = $rc->getTitle();
-               $secureName = $title->getPrefixedDBkey();
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       # Use an @ character to prevent collision with page names
-                       $this->rc_cache['@@' . ($this->rcMoveIndex++)] = array($rc);
-               } else {
-                       if ( !isset ( $this->rc_cache[$secureName] ) ) $this->rc_cache[$secureName] = array() ;
-                       array_push ( $this->rc_cache[$secureName] , $rc ) ;
-               }
-               return $ret;
-       }
-
-       function endImageHistoryList() {
-               $s = "</ul>\n";
-               return $s;
-       }
 
        /**
         * This function is called by all recent changes variants, by the page history,
@@ -2477,6 +1929,9 @@ class Skin {
         * temporarily to a value pass. Should be adjusted further. --brion
         */
        function formatComment($comment, $title = NULL) {
+               $fname = 'Skin::formatComment';
+               wfProfileIn( $fname );
+               
                global $wgContLang;
                $comment = htmlspecialchars( $comment );
 
@@ -2534,65 +1989,10 @@ class Skin {
                        }
                        $comment = preg_replace( $linkRegexp, $thelink, $comment, 1 );
                }
+               wfProfileOut( $fname );
                return $comment;
        }
-
-       function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
-               global $wgUser, $wgLang, $wgContLang, $wgTitle;
-
-               $datetime = $wgLang->timeanddate( $timestamp, true );
-               $del = wfMsg( 'deleteimg' );
-               $delall = wfMsg( 'deleteimgcompletely' );
-               $cur = wfMsg( 'cur' );
-
-               if ( $iscur ) {
-                       $url = Image::wfImageUrl( $img );
-                       $rlink = $cur;
-                       if ( $wgUser->isAllowed('delete') ) {
-                               $link = $wgTitle->escapeLocalURL( 'image=' . $wgTitle->getPartialURL() .
-                                 '&action=delete' );
-                               $style = $this->getInternalLinkAttributes( $link, $delall );
-
-                               $dlink = '<a href="'.$link.'"'.$style.'>'.$delall.'</a>';
-                       } else {
-                               $dlink = $del;
-                       }
-               } else {
-                       $url = htmlspecialchars( wfImageArchiveUrl( $img ) );
-                       if( $wgUser->getID() != 0 && $wgTitle->userCanEdit() ) {
-                               $rlink = $this->makeKnownLink( $wgTitle->getPrefixedText(),
-                                          wfMsg( 'revertimg' ), 'action=revert&oldimage=' .
-                                          urlencode( $img ) );
-                               $dlink = $this->makeKnownLink( $wgTitle->getPrefixedText(),
-                                          $del, 'action=delete&oldimage=' . urlencode( $img ) );
-                       } else {
-                               # Having live active links for non-logged in users
-                               # means that bots and spiders crawling our site can
-                               # inadvertently change content. Baaaad idea.
-                               $rlink = wfMsg( 'revertimg' );
-                               $dlink = $del;
-                       }
-               }
-               if ( 0 == $user ) {
-                       $userlink = $usertext;
-               } else {
-                       $userlink = $this->makeLink( $wgContLang->getNsText( Namespace::getUser() ) .
-                                      ':'.$usertext, $usertext );
-               }
-               $nbytes = wfMsg( 'nbytes', $size );
-               $style = $this->getInternalLinkAttributes( $url, $datetime );
-
-               $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
-                 . " . . {$userlink} ({$nbytes})";
-
-               if ( '' != $description && '*' != $description ) {
-                       $sk=$wgUser->getSkin();
-                       $s .= $wgContLang->emphasize(' (' . $sk->formatComment($description,$wgTitle) . ')');
-               }
-               $s .= "</li>\n";
-               return $s;
-       }
-
+       
        function tocIndent($level) {
                return str_repeat( '<div class="tocindent">'."\n", $level>0 ? $level : 0 );
        }
@@ -2689,133 +2089,6 @@ class Skin {
 
        }
 
-       /**
-        * This function is called by EditPage.php and shows a bulletin board style
-        * toolbar for common editing functions. It can be disabled in the user
-        * preferences.
-        * The necessary JavaScript code can be found in style/wikibits.js.
-        */
-       function getEditToolbar() {
-               global $wgStylePath, $wgLang, $wgMimeType;
-
-               /**
-                * toolarray an array of arrays which each include the filename of
-                * the button image (without path), the opening tag, the closing tag,
-                * and optionally a sample text that is inserted between the two when no
-                * selection is highlighted.
-                * The tip text is shown when the user moves the mouse over the button.
-                *
-                * Already here are accesskeys (key), which are not used yet until someone
-                * can figure out a way to make them work in IE. However, we should make
-                * sure these keys are not defined on the edit page.
-                */
-               $toolarray=array(
-                       array(  'image'=>'button_bold.png',
-                                       'open'  =>      "\'\'\'",
-                                       'close' =>      "\'\'\'",
-                                       'sample'=>      wfMsg('bold_sample'),
-                                       'tip'   =>      wfMsg('bold_tip'),
-                                       'key'   =>      'B'
-                               ),
-                       array(  'image'=>'button_italic.png',
-                                       'open'  =>      "\'\'",
-                                       'close' =>      "\'\'",
-                                       'sample'=>      wfMsg('italic_sample'),
-                                       'tip'   =>      wfMsg('italic_tip'),
-                                       'key'   =>      'I'
-                               ),
-                       array(  'image'=>'button_link.png',
-                                       'open'  =>      '[[',
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('link_sample'),
-                                       'tip'   =>      wfMsg('link_tip'),
-                                       'key'   =>      'L'
-                               ),
-                       array(  'image'=>'button_extlink.png',
-                                       'open'  =>      '[',
-                                       'close' =>      ']',
-                                       'sample'=>      wfMsg('extlink_sample'),
-                                       'tip'   =>      wfMsg('extlink_tip'),
-                                       'key'   =>      'X'
-                               ),
-                       array(  'image'=>'button_headline.png',
-                                       'open'  =>      "\\n== ",
-                                       'close' =>      " ==\\n",
-                                       'sample'=>      wfMsg('headline_sample'),
-                                       'tip'   =>      wfMsg('headline_tip'),
-                                       'key'   =>      'H'
-                               ),
-                       array(  'image'=>'button_image.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_IMAGE).":",
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('image_sample'),
-                                       'tip'   =>      wfMsg('image_tip'),
-                                       'key'   =>      'D'
-                               ),
-                       array(  'image' =>      'button_media.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_MEDIA).':',
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('media_sample'),
-                                       'tip'   =>      wfMsg('media_tip'),
-                                       'key'   =>      'M'
-                               ),
-                       array(  'image' =>      'button_math.png',
-                                       'open'  =>      "\\<math\\>",
-                                       'close' =>      "\\</math\\>",
-                                       'sample'=>      wfMsg('math_sample'),
-                                       'tip'   =>      wfMsg('math_tip'),
-                                       'key'   =>      'C'
-                               ),
-                       array(  'image' =>      'button_nowiki.png',
-                                       'open'  =>      "\\<nowiki\\>",
-                                       'close' =>      "\\</nowiki\\>",
-                                       'sample'=>      wfMsg('nowiki_sample'),
-                                       'tip'   =>      wfMsg('nowiki_tip'),
-                                       'key'   =>      'N'
-                               ),
-                       array(  'image' =>      'button_sig.png',
-                                       'open'  =>      '--~~~~',
-                                       'close' =>      '',
-                                       'sample'=>      '',
-                                       'tip'   =>      wfMsg('sig_tip'),
-                                       'key'   =>      'Y'
-                               ),
-                       array(  'image' =>      'button_hr.png',
-                                       'open'  =>      "\\n----\\n",
-                                       'close' =>      '',
-                                       'sample'=>      '',
-                                       'tip'   =>      wfMsg('hr_tip'),
-                                       'key'   =>      'R'
-                               )
-               );
-               $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
-
-               $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
-               foreach($toolarray as $tool) {
-
-                       $image=$wgStylePath.'/common/images/'.$tool['image'];
-                       $open=$tool['open'];
-                       $close=$tool['close'];
-                       $sample = addslashes( $tool['sample'] );
-
-                       // Note that we use the tip both for the ALT tag and the TITLE tag of the image.
-                       // Older browsers show a "speedtip" type message only for ALT.
-                       // Ideally these should be different, realistically they
-                       // probably don't need to be.
-                       $tip = addslashes( $tool['tip'] );
-
-                       #$key = $tool["key"];
-
-                       $toolbar.="addButton('$image','$tip','$open','$close','$sample');\n";
-               }
-
-               $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
-               $toolbar.="document.writeln(\"</div>\");\n";
-
-               $toolbar.="/*]]>*/\n</script>";
-               return $toolbar;
-       }
-
        /**
         * @access public
         */