Fix double-escaping on login/logout return page
[lhc/web/wiklou.git] / includes / SkinPHPTal.php
index de2c51a..cd28f43 100644 (file)
        {
                var $_context = array();
 
-               function set($varName, $value)
-               {
+               function set($varName, $value) {
                        $this->_context[$varName] = $value;
                }
 
-               function translate($value)
-               {
+               function translate($value) {
                        $value = wfMsg( $value );
-
                        // interpolate variables
                        while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
                                list($src, $var) = $m;
-                               $varValue = $this->_context[$var];
+                               $varValue = @$this->_context[$var];
                                $value = str_replace($src, $varValue, $value);
                        }
                        return $value;
 
                function outputPage( &$out ) {
                        global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgOut;
-                       global $wgScript, $wgStyleSheetPath, $wgLanguageCode, $wgUseNewInterlanguage;
+                       global $wgScript, $wgStylePath, $wgLanguageCode, $wgUseNewInterlanguage;
                        global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
-                       global $wgDisableCounters;
+                       global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
                        
                        extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
+                       $this->initPage( $out );
+                       $tpl = new PHPTAL($this->template . '.pt', 'templates');
+                       
+                       #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
+                       $tpl->setTranslator(new MediaWiki_I18N());
+                       #}
+                       
                        $this->thispage = $wgTitle->getPrefixedDbKey();
+                       $this->thisurl = $wgTitle->getPrefixedURL();
                        $this->loggedin = $wgUser->getID() != 0;
                        $this->username = $wgUser->getName();
                        $this->userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
+                       $this->userpageurl = $this->makeUrl($this->userpage);
+                       
+                       if( $this->loggedin ) {
+                               $this->usercss = $this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css');
+                               $this->usercsse = htmlspecialchars($this->usercss);
+                               $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript');
+                               $this->userjse = htmlspecialchars($this->userjs);
+                       } else {
+                               $this->usercss = $this->usercsse =  $this->userjs = $this->userjse = false;
+                       }
                        $this->titletxt = $wgTitle->getPrefixedText();
                        
-                       $this->initPage( $out );
-                       $tpl = new PHPTAL($this->template . '.pt', 'templates');
+                       $tpl->set( "title", $wgOut->getPageTitle() );
+                       $tpl->set( "pagetitle", $wgOut->getHTMLTitle() );
                        
-                       #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
-                       $tpl->setTranslator(new MediaWiki_I18N());
-                       #}
-
-                       $tpl->setRef( "title", &$this->titletxt ); // ?
-                       $tpl->set( "pagetitle", wfMsg( "pagetitle", $this->titletxt ) );
                        $tpl->setRef( "thispage", &$this->thispage );
-                       $tpl->set( "subtitle", $out->getSubtitle() );
+                       $subpagestr = $this->subPageSubtitle();
+                       $tpl->set( 
+                               "subtitle",  !empty($subpagestr)?
+                               '<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle():
+                               $out->getSubtitle()  
+                       );
+                       $tpl->set( 'catlinks', $this->getCategories());
+                       if( $wgOut->isSyndicated() ) {
+                               $feeds = array();
+                               foreach( $wgFeedClasses as $format => $class ) {
+                                       $feeds[$format] = array(
+                                               'text' => $format,
+                                               'href' => $wgRequest->appendQuery( "feed=$format" ),
+                                               'ttip' => wfMsg('tooltip-'.$format)
+                                       );
+                               }
+                               $tpl->setRef( 'feeds', &$feeds );
+                       }
                        $tpl->setRef( 'mimetype', &$wgMimeType );
                        $tpl->setRef( 'charset', &$wgOutputEncoding );
                        $tpl->set( 'headlinks', $out->getHeadLinks() );
                        $tpl->set( "helppage", wfMsg('helppage'));
                        $tpl->set( "sysop", $wgUser->isSysop() );
                        */
-                       $tpl->setRef( "searchaction", &$wgScript );
-                       $tpl->setRef( "stylepath", &$wgStyleSheetPath );
+                       $tpl->set( "searchaction", $this->escapeSearchLink() );
+                       $tpl->setRef( "stylepath", &$wgStylePath );
+                       $tpl->setRef( "logopath", &$wgLogo );
                        $tpl->setRef( "lang", &$wgLanguageCode );
+                       $tpl->set( "dir", $wgLang->isRTL() ? "rtl" : "ltr" );
+                       $tpl->set( "rtl", $wgLang->isRTL() );
                        $tpl->set( "langname", $wgLang->getLanguageName( $wgLanguageCode ) );
                        $tpl->setRef( "username", &$this->username );
                        $tpl->setRef( "userpage", &$this->userpage);
+                       $tpl->setRef( "userpageurl", &$this->userpageurl);
+                       $tpl->setRef( "usercss", &$this->usercss);
+                       $tpl->setRef( "usercsse", &$this->usercsse);
+                       $tpl->setRef( "userjs", &$this->userjs);
+                       $tpl->setRef( "userjse", &$this->userjse);
                        if( $wgUser->getNewtalk() ) {
                                $usertitle = Title::newFromText( $this->userpage );
                                $usertalktitle = $usertitle->getTalkPage();
                                        $ntl = wfMsg( "newmessages",
                                        $this->makeKnownLink( 
                                                $wgLang->getNsText( Namespace::getTalk( Namespace::getUser() ) )
-                                               . ":" . $wgUser->getName(),
+                                               . ":" . $this->username,
                                                wfMsg("newmessageslink") ) 
                                        );
                                }
                                'text' => ($wgLang->getLanguageName( $nt->getInterwiki()) != ''?$wgLang->getLanguageName( $nt->getInterwiki()) : $l),
                                'class' => $wgLang->isRTL() ? 'rtl' : 'ltr');
                        }
-                       if(count($language_urls) != 0 ) {
+                       if(count($language_urls)) {
                                $tpl->setRef( 'language_urls', &$language_urls);
                        } else {
                                $tpl->set('language_urls', false);
                # build array of urls for personal toolbar
                function buildPersonalUrls() {
                        /* set up the default links for the personal toolbar */
+                       global $wgShowIPinHeader;
                        $personal_urls = array();
                        if ($this->loggedin) {
-                               $personal_urls['userpage'] = array('text' => $this->username,
-                                       'href' => $this->makeUrl($this->userpage),
+                               $personal_urls['userpage'] = array(
+                                       'text' => $this->username,
+                                       'href' => &$this->userpageurl,
                                        'ttip' => wfMsg('tooltip-userpage'),
-                                       'akey' => wfMsg('accesskey-userpage'));
-                               $personal_urls['mytalk'] = array('text' => wfMsg('mytalk'),
+                                       'akey' => wfMsg('accesskey-userpage')
+                               );
+                               $personal_urls['mytalk'] = array(
+                                       'text' => wfMsg('mytalk'),
                                        'href' => $this->makeTalkUrl($this->userpage),
                                        'ttip' => wfMsg('tooltip-mytalk'),
-                                       'akey' => wfMsg('accesskey-mytalk'));
-                               $personal_urls['preferences'] = array('text' => wfMsg('preferences'),
+                                       'akey' => wfMsg('accesskey-mytalk')
+                               );
+                               $personal_urls['preferences'] = array(
+                                       'text' => wfMsg('preferences'),
                                        'href' => $this->makeSpecialUrl('Preferences'),
                                        'ttip' => wfMsg('tooltip-preferences'),
-                                       'akey' => wfMsg('accesskey-preferences'));
-                               $personal_urls['watchlist'] = array('text' => wfMsg('watchlist'),
+                                       'akey' => wfMsg('accesskey-preferences')
+                               );
+                               $personal_urls['watchlist'] = array(
+                                       'text' => wfMsg('watchlist'),
                                        'href' => $this->makeSpecialUrl('Watchlist'),
                                        'ttip' => wfMsg('tooltip-watchlist'),
-                                       'akey' => wfMsg('accesskey-watchlist'));
-                               $personal_urls['mycontris'] = array('text' => wfMsg('mycontris'),
+                                       'akey' => wfMsg('accesskey-watchlist')
+                               );
+                               $personal_urls['mycontris'] = array(
+                                       'text' => wfMsg('mycontris'),
                                        'href' => $this->makeSpecialUrl('Contributions','target=' . $this->username),
                                        'ttip' => wfMsg('tooltip-mycontris'),
-                                       'akey' => wfMsg('accesskey-mycontris'));
-                               $personal_urls['logout'] = array('text' => wfMsg('userlogout'),
-                                       'href' => $this->makeSpecialUrl('Userlogout','returnpage=' . $this->thispage),
+                                       'akey' => wfMsg('accesskey-mycontris')
+                               );
+                               $personal_urls['logout'] = array(
+                                       'text' => wfMsg('userlogout'),
+                                       'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurl),
                                        'ttip' => wfMsg('tooltip-logout'),
-                                       'akey' => wfMsg('accesskey-logout'));
+                                       'akey' => wfMsg('accesskey-logout')
+                               );
                        } else {
-                               $personal_urls['login'] = array('text' => wfMsg('userlogin'),
-                                       'href' => $this->makeSpecialUrl('Userlogin'),
-                                       'ttip' => wfMsg('tooltip-login'),
-                                       'akey' => wfMsg('accesskey-login'));
+                               if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                                       $personal_urls['anonuserpage'] = array(
+                                               'text' => $this->username,
+                                               'href' => $this->makeUrl($this->userpage),
+                                               'ttip' => wfMsg('tooltip-anonuserpage'),
+                                               'akey' => wfMsg('accesskey-anonuserpage')
+                                       );
+                                       $personal_urls['anontalk'] = array(
+                                               'text' => wfMsg('anontalk'),
+                                               'href' => $this->makeTalkUrl($this->userpage),
+                                               'ttip' => wfMsg('tooltip-anontalk'),
+                                               'akey' => wfMsg('accesskey-anontalk')
+                                       );
+                                       $personal_urls['anonlogin'] = array(
+                                               'text' => wfMsg('userlogin'),
+                                               'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurl),
+                                               'ttip' => wfMsg('tooltip-login'),
+                                               'akey' => wfMsg('accesskey-login')
+                                       );
+                               } else {
+
+                                       $personal_urls['login'] = array(
+                                               'text' => wfMsg('userlogin'),
+                                               'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurl),
+                                               'ttip' => wfMsg('tooltip-login'),
+                                               'akey' => wfMsg('accesskey-login')
+                                       );
+                               }
                        }
+
                        return $personal_urls;
                }
                
                                        );
                                } else {
                                        $content_actions['talk'] = array(
-                                               'class' => $talk_class.' new',
+                                               'class' => $talk_class?$talk_class.' new':'new',
                                                'text' => wfMsg('talk'),
                                                'href' => $this->makeTalkUrl($this->titletxt,'action=edit'),
                                                'ttip' => wfMsg('tooltip-talk'),
 
                                        if($wgUser->isSysop()){
                                                if(!$wgTitle->isProtected()){
-                                                       $content_actions['protect'] = array('class' => ($action == 'protect') ? 'selected' : '',
-                                                       'text' => wfMsg('protect'),
-                                                       'href' => $this->makeUrl($this->thispage, 'action=protect'),
-                                                       'ttip' => wfMsg('tooltip-protect'),
-                                                       'akey' => wfMsg('accesskey-protect'));
+                                                       $content_actions['protect'] = array(
+                                                               'class' => ($action == 'protect') ? 'selected' : '',
+                                                               'text' => wfMsg('protect'),
+                                                               'href' => $this->makeUrl($this->thispage, 'action=protect'),
+                                                               'ttip' => wfMsg('tooltip-protect'),
+                                                               'akey' => wfMsg('accesskey-protect')
+                                                       );
 
                                                } else {
-                                                       $content_actions['unprotect'] = array('class' => ($action == 'unprotect') ? 'selected' : '',
-                                                       'text' => wfMsg('unprotect'),
-                                                       'href' => $this->makeUrl($this->thispage, 'action=unprotect'),
-                                                       'ttip' => wfMsg('tooltip-protect'),
-                                                       'akey' => wfMsg('accesskey-protect'));
+                                                       $content_actions['unprotect'] = array(
+                                                               'class' => ($action == 'unprotect') ? 'selected' : '',
+                                                               'text' => wfMsg('unprotect'),
+                                                               'href' => $this->makeUrl($this->thispage, 'action=unprotect'),
+                                                               'ttip' => wfMsg('tooltip-protect'),
+                                                               'akey' => wfMsg('accesskey-protect')
+                                                       );
                                                }
-                                               $content_actions['delete'] = array('class' => ($action == 'delete') ? 'selected' : '',
-                                               'text' => wfMsg('delete'),
-                                               'href' => $this->makeUrl($this->thispage, 'action=delete'),
-                                               'ttip' => wfMsg('tooltip-delete'),
-                                               'akey' => wfMsg('accesskey-delete'));
+                                               $content_actions['delete'] = array(
+                                                       'class' => ($action == 'delete') ? 'selected' : '',
+                                                       'text' => wfMsg('delete'),
+                                                       'href' => $this->makeUrl($this->thispage, 'action=delete'),
+                                                       'ttip' => wfMsg('tooltip-delete'),
+                                                       'akey' => wfMsg('accesskey-delete')
+                                               );
                                        }
                                        if ( $wgUser->getID() != 0 ) {
                                                if ( $wgTitle->userCanEdit()) {
 
                                                }
                                        }
+                               } else { 
+                                       //article doesn't exist or is deleted
+                                       if($wgUser->isSysop()){
+                                               if( $n = $wgTitle->isDeleted() ) {
+                                                       $content_actions['delete'] = array(
+                                                               'class' => '',
+                                                               'text' => wfMsg( "undelete_short", $n ),
+                                                               'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage),
+                                                               'ttip' => wfMsg('tooltip-undelete', $n),
+                                                               'akey' => wfMsg('accesskey-undelete')
+                                                       );
+                                               }
+                                       }
                                }
 
                                if ( $wgUser->getID() != 0 and $action != 'edit' and $action != 'submit' ) {
                        $nav_urls['randompage'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Randompage')));
                        $nav_urls['recentchanges'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchanges')));
                        $nav_urls['whatlinkshere'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Whatlinkshere', 'target='.$this->thispage)));
-                       $nav_urls['currentevents'] = (wfMsg('currentevents') != '') ? array('href' => htmlspecialchars( $this->makeI18nUrl('currentevents'))) : '';
-                       $nav_urls['portal'] = (wfMsg('portal') != '') ? array('href' => htmlspecialchars( $this->makeI18nUrl('portal-url'))) : '';
+                       $nav_urls['currentevents'] = (wfMsg('currentevents') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('currentevents'))) : '';
+                       $nav_urls['portal'] = (wfMsg('portal') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('portal-url'))) : '';
                        $nav_urls['recentchangeslinked'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchangeslinked', 'target='.$this->thispage)));
                        $nav_urls['bugreports'] = array('href' => htmlspecialchars( $this->makeI18nUrl('bugreportspage')));
                        // $nav_urls['sitesupport'] = array('href' => htmlspecialchars( $this->makeI18nUrl('sitesupportpage')));
                        $nav_urls['help'] = array('href' => htmlspecialchars( $this->makeI18nUrl('helppage')));
                        $nav_urls['upload'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Upload')));
                        $nav_urls['specialpages'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Specialpages')));
+                       
+                       
+                       $id=User::idFromName($wgTitle->getText());
+                       $ip=User::isIP($wgTitle->getText());
+
+                       if($id || $ip) { # both anons and non-anons have contri list
+                               $nav_urls['contributions'] = array(
+                                       'href' => htmlspecialchars( $this->makeSpecialUrl('Contributions', "target=" . $wgTitle->getPartialURL() ) )
+                               );
+                       }
+                       if ( 0 != $wgUser->getID() ) { # show only to signed in users
+                               if($id) {       # can only email non-anons
+                                       $nav_urls['emailuser'] = array(
+                                               'href' => htmlspecialchars( $this->makeSpecialUrl('Emailuser', "target=" . $wgTitle->getPartialURL() ) )
+                                       );
+                               }
+                       }
+
 
                        return $nav_urls;
                }