Remove validate bits
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 4082c67..2e89518 100644 (file)
@@ -148,6 +148,7 @@ class SkinTemplate extends Skin {
                global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
                global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgSiteNotice;
                global $wgMaxCredits, $wgShowCreditsIfMax;
+               global $wgPageShowWatchingUsers;
 
                $fname = 'SkinTemplate::outputPage';
                wfProfileIn( $fname );
@@ -228,6 +229,7 @@ class SkinTemplate extends Skin {
                $tpl->set( "helppage", wfMsg('helppage'));
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
+               $tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) );
                $tpl->setRef( 'stylepath', $wgStylePath );
                $tpl->setRef( 'logopath', $wgLogo );
                $tpl->setRef( "lang", $wgContLanguageCode );
@@ -282,6 +284,25 @@ class SkinTemplate extends Skin {
                                        $tpl->set('viewcount', false);
                                }
                        }
+
+                       if ($wgPageShowWatchingUsers) {
+                               $dbr =& wfGetDB( DB_SLAVE );
+                               extract( $dbr->tableNames( 'watchlist' ) );
+                               $sql = "SELECT COUNT(*) AS n FROM $watchlist
+                                       WHERE wl_title='" . $dbr->strencode($wgTitle->getDBKey()) .
+                                       "' AND  wl_namespace=" . $wgTitle->getNamespace() ;
+                               $res = $dbr->query( $sql, 'SkinPHPTal::outputPage');
+                               $x = $dbr->fetchObject( $res );
+                               $numberofwatchingusers = $x->n;
+                               if ($numberofwatchingusers > 0) {
+                                       $tpl->set('numberofwatchingusers', wfMsg('number_of_watching_users_pageview', $numberofwatchingusers));
+                               } else {
+                                       $tpl->set('numberofwatchingusers', false);
+                               }
+                       } else {
+                               $tpl->set('numberofwatchingusers', false);
+                       }
+
                        $tpl->set('lastmod', $this->lastModified());
                        $tpl->set('copyright',$this->getCopyright());
 
@@ -299,11 +320,13 @@ class SkinTemplate extends Skin {
                        $tpl->set('viewcount', false);
                        $tpl->set('lastmod', false);
                        $tpl->set('credits', false);
+                       $tpl->set('numberofwatchingusers', false);
                } else {
                        $tpl->set('copyright', false);
                        $tpl->set('viewcount', false);
                        $tpl->set('lastmod', false);
                        $tpl->set('credits', false);
+                       $tpl->set('numberofwatchingusers', false);
                }
                wfProfileOut( "$fname-stuff3" );
 
@@ -316,6 +339,7 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'debug', $out->mDebugtext );
                $tpl->set( 'reporttime', $out->reportTime() );
                $tpl->set( 'sitenotice', $wgSiteNotice );
+               $tpl->set( 'tagline', wfMsg('tagline') );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                $out->mBodytext .= $printfooter ;
@@ -386,16 +410,14 @@ class SkinTemplate extends Skin {
                global $wgShowIPinHeader;
                $personal_urls = array();
                if ($this->loggedin) {
+                       /* Logged in users personal toolbar */
                        $personal_urls['userpage'] = array(
-                               'text' => $this->username,
-                               'href' => &$this->userpageUrlDetails['href'],
-                               'class' => $this->userpageUrlDetails['exists']?false:'new'
+                               'text' => wfMsg('mypage'),
+                               'href' => $this->makeSpecialUrl('Mypage')
                        );
-                       $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
                        $personal_urls['mytalk'] = array(
                                'text' => wfMsg('mytalk'),
-                               'href' => &$usertalkUrlDetails['href'],
-                               'class' => $usertalkUrlDetails['exists']?false:'new'
+                               'href' => $this->makeSpecialUrl('Mytalk')
                        );
                        $personal_urls['preferences'] = array(
                                'text' => wfMsg('preferences'),
@@ -407,7 +429,7 @@ class SkinTemplate extends Skin {
                        );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg('mycontris'),
-                               'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
+                               'href' => $this->makeSpecialUrl('Mycontributions')
                        );
                        $personal_urls['logout'] = array(
                                'text' => wfMsg('userlogout'),
@@ -415,23 +437,22 @@ class SkinTemplate extends Skin {
                        );
                } else {
                        if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                               /* Anonymous with session users personal toolbar */
                                $personal_urls['anonuserpage'] = array(
-                                       'text' => $this->username,
-                                       'href' => &$this->userpageUrlDetails['href'],
-                                       'class' => $this->userpageUrlDetails['exists']?false:'new'
+                                       'text' => wfMsg('mypage'),
+                                       'href' => $this->makeSpecialUrl('Mypage')
                                );
-                               $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
-                               $personal_urls['anontalk'] = array(
-                                       'text' => wfMsg('anontalk'),
-                                       'href' => &$usertalkUrlDetails['href'],
-                                       'class' => $usertalkUrlDetails['exists']?false:'new'
+                               $personal_urls['mytalk'] = array(
+                                       'text' => wfMsg('mytalk'),
+                                       'href' => $this->makeSpecialUrl('Mytalk')
                                );
+
                                $personal_urls['anonlogin'] = array(
                                        'text' => wfMsg('userlogin'),
                                        'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
                                );
                        } else {
-
+                               /* Anonymous users personal toolbar */
                                $personal_urls['login'] = array(
                                        'text' => wfMsg('userlogin'),
                                        'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
@@ -448,24 +469,31 @@ class SkinTemplate extends Skin {
         * @access private
         */
        function buildContentActionUrls () {
+               global $wgContLang;
                $fname = 'SkinTemplate::buildContentActionUrls';
                wfProfileIn( $fname );
                
-               global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation;
+               global $wgTitle, $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
                $section = $wgRequest->getText( 'section' );
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
                $content_actions = array();
 
-               if( $this->iscontent and !$wgOut->isQuickbarSuppressed() ) {
+               if( $this->iscontent ) {
 
                        $nskey = $this->getNameSpaceKey();
                        $is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ;
-                       if ( $action == 'validate' ) $is_active = false ; # Show article tab deselected when validating
-                       $content_actions[$nskey] = array('class' => ($is_active) ? 'selected' : false,
-                       'text' => wfMsg($nskey),
-                       'href' => $this->makeArticleUrl($this->thispage));
+
+                       $subjectTitle = $wgTitle->getSubjectPage();
+                       if( $subjectTitle->getArticleId() != 0 ) {
+                               $class = ($is_active) ? 'selected' : false;
+                       } else {
+                               $class = ($is_active) ? 'selected new' : 'new';
+                       }
+                       $content_actions[$nskey] = array('class' => $class,
+                                                        'text' => wfMsg($nskey),
+                                                        'href' => $this->makeArticleUrl($this->thispage));
 
                        /* set up the classes for the talk link */
                        wfProfileIn( "$fname-talk" );
@@ -578,7 +606,7 @@ class SkinTemplate extends Skin {
                                }
                        }
                        wfProfileOut( "$fname-live" );
-                       
+
                        if ( $wgUser->getID() != 0 and $action != 'submit' ) {
                                if( !$wgTitle->userIsWatching()) {
                                        $content_actions['watch'] = array(
@@ -595,16 +623,6 @@ class SkinTemplate extends Skin {
                                }
                        }
 
-                       # Show validate tab
-                       if ( $wgUseValidation && $wgTitle->getArticleId() && $wgTitle->getNamespace() == 0 ) {
-                               global $wgArticle ;
-                               $article_time = "&timestamp=" . $wgArticle->mTimestamp ;
-                               $content_actions['validate'] = array(
-                                       'class' => ($action == 'validate') ? 'selected' : false ,
-                                       'text' => wfMsg('val_tab'),
-                                       'href' => $wgTitle->getLocalUrl( 'action=validate'.$article_time)
-                               );
-                       }
                } else {
                        /* show special page tab */
 
@@ -615,6 +633,29 @@ class SkinTemplate extends Skin {
                        );
                }
 
+               /* show links to different language variants */
+               global $wgDisableLangConversion;
+               $variants = $wgContLang->getVariants();
+               if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
+                       $preferred = $wgContLang->getPreferredVariant();
+                       $actstr = '';
+                       if( $action )
+                               $actstr = 'action=' . $action . '&';
+                       $vcount=0;
+                       foreach( $variants as $code ) {
+                               $varname = $wgContLang->getVariantname( $code );
+                               if( $varname == 'disable' )
+                                       continue;
+                               $selected = ( $code == $preferred )? 'selected' : false;
+                               $content_actions['varlang-' . $vcount] = array(
+                                               'class' => $selected,
+                                               'text' => $varname,
+                                               'href' => $wgTitle->getLocalUrl( $actstr . 'variant=' . $code )
+                                       );
+                               $vcount ++;
+                       }
+               }               
+
                wfProfileOut( $fname );
                return $content_actions;
        }
@@ -760,11 +801,11 @@ class SkinTemplate extends Skin {
                $fname = 'SkinTemplate::setupUserCss';
                wfProfileIn( $fname );
                
-               global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss;
+               global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
-               $sitecss = "";
-               $usercss = "";
-               $siteargs = "";
+               $sitecss = '';
+               $usercss = '';
+               $siteargs = '&maxage=' . $wgSquidMaxage;
 
                # Add user-specific code if this is a user and we allow that kind of thing
                
@@ -772,27 +813,30 @@ class SkinTemplate extends Skin {
                        $action = $wgRequest->getText('action');
                        
                        # if we're previewing the CSS page, use it
-                       if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
-                               $siteargs .= "&smaxage=0&maxage=0";
+                       if( $wgTitle->isCssSubpage() and $this->userCanPreview( $action ) ) {
+                               $siteargs = "&smaxage=0&maxage=0";
                                $usercss = $wgRequest->getText('wpTextbox1');
                        } else {
-                               $siteargs .= "&maxage=0";
                                $usercss = '@import "' .
                                  $this->makeUrl($this->userpage . '/'.$this->skinname.'.css',
                                                                 'action=raw&ctype=text/css') . '";' ."\n";
                        }
+
+                       $siteargs .= '&ts=' . $wgUser->mTouched;
                }
 
-               # If we use the site's dynamic CSS, throw that in, too
+               if ($wgContLang->isRTL()) $sitecss .= '@import "' . $wgStylePath . '/' . $this->stylename . '/rtl.css";' . "\n";
                
+               # If we use the site's dynamic CSS, throw that in, too
                if ( $wgUseSiteCss ) {
-                       $sitecss = '@import "'.$this->makeUrl('-','action=raw&gen=css' . $siteargs).'";'."\n";
+                       $sitecss .= '@import "' . $this->makeNSUrl(ucfirst($this->skinname) . '.css', 'action=raw&ctype=text/css&smaxage=' . $wgSquidMaxage, NS_MEDIAWIKI) . '";' . "\n";
+                       $sitecss .= '@import "' . $this->makeUrl('-','action=raw&gen=css' . $siteargs) . '";' . "\n";
                }
                
                # If we use any dynamic CSS, make a little CDATA block out of it.
                
                if ( !empty($sitecss) || !empty($usercss) ) {
-                       $this->usercss = '/*<![CDATA[*/ ' . $sitecss . ' ' . $usercss . ' /*]]>*/';
+                       $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
                wfProfileOut( $fname );
        }
@@ -808,7 +852,7 @@ class SkinTemplate extends Skin {
                $action = $wgRequest->getText('action');
 
                if( $wgAllowUserJs && $this->loggedin ) {
-                       if($wgTitle->isJsSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
+                       if( $wgTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
                                # XXX: additional security check/prompt?
                                $this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
                        } else {
@@ -826,13 +870,9 @@ class SkinTemplate extends Skin {
                $fname = 'SkinTemplate::getUserStylesheet';
                wfProfileIn( $fname );
                
-               global $wgUser, $wgRequest, $wgTitle, $wgContLang, $wgSquidMaxage, $wgStylePath;
-               $action = $wgRequest->getText('action');
-               $maxage = $wgRequest->getText('maxage');
+               global $wgUser;
                $s = "/* generated user stylesheet */\n";
-               if($wgContLang->isRTL()) $s .= '@import "'.$wgStylePath.'/'.$this->stylename.'/rtl.css";'."\n";
-               $s .= '@import "'.
-               $this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI)."\";\n";
+
                if($wgUser->getID() != 0) {
                        if ( 1 == $wgUser->getOption( "underline" ) ) {
                                $s .= "a { text-decoration: underline; }\n";
@@ -871,6 +911,8 @@ class SkinTemplate extends Skin {
 /**
  * Generic wrapper for template functions, with interface
  * compatible with what we use of PHPTAL 0.7.
+ * @package MediaWiki
+ * @subpackage Skins
  */
 class QuickTemplate {
        /**
@@ -938,6 +980,19 @@ class QuickTemplate {
                echo $this->translator->translate( $str );
        }
        
+       /**
+        * An ugly, ugly hack.
+        * @access private
+        */
+       function msgWiki( $str ) {
+               global $wgParser, $wgTitle, $wgOut, $wgUseTidy;
+
+               $text = $this->translator->translate( $str );
+               $parserOutput = $wgParser->parse( $text, $wgTitle,
+                       $wgOut->mParserOptions, true );
+               echo $parserOutput->getText();
+       }
+       
        /**
         * @access private
         */
@@ -955,4 +1010,4 @@ class QuickTemplate {
 }
 
 } // end of if( defined( 'MEDIAWIKI' ) ) 
-?>
+?>
\ No newline at end of file