X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSkinPHPTal.php;h=3206b5e700e2322f1a5bbe1ce52ffd52fee6e430;hb=b11ce40f4bef7bb415e24ef60517097ca99781c1;hp=40feac6c410891ebacb9912ffe2c16ab69642a8e;hpb=201af52713806c7c850ad7c7c9a6cb35535a09d5;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index 40feac6c41..3206b5e700 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -13,20 +13,22 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License along
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# http://www.gnu.org/copyleft/gpl.html
+if( defined( "MEDIAWIKI" ) ) {
require_once "GlobalFunctions.php";
+ global $IP;
require_once $IP."/PHPTAL-NP-0.7.0/libs/PHPTAL.php";
class MediaWiki_I18N extends PHPTAL_I18N
@@ -42,7 +44,9 @@
// interpolate variables
while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
list($src, $var) = $m;
- $varValue = @$this->_context[$var];
+ wfSuppressWarnings();
+ $varValue = $this->_context[$var];
+ wfRestoreWarnings();
$value = str_replace($src, $varValue, $value);
}
return $value;
@@ -62,17 +66,18 @@
global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgOut;
global $wgScript, $wgStylePath, $wgLanguageCode, $wgUseNewInterlanguage;
global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
- global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
-
+ global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgSiteNotice;
+ global $wgMaxCredits, $wgShowCreditsIfMax;
+
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;
@@ -80,28 +85,30 @@
$this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
$this->username = $wgUser->getName();
$this->userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
- $this->userpageurl = $this->makeUrl($this->userpage);
-
+ $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
+
$this->usercss = $this->userjs = $this->userjsprev = false;
- if( $this->loggedin ) { $this->setupUserCssJs(); }
+ $this->setupUserCssJs();
$this->titletxt = $wgTitle->getPrefixedText();
-
- $title=$wgOut->getPageTitle();
- $section=$wgRequest->getVal('section');
- if ($section && $action=="view") {
- $title .= " " . wfMsg("sectionedit");
- }
- $tpl->set( "title", $title );
+
+ $tpl->set( "title", $wgOut->getPageTitle() );
$tpl->set( "pagetitle", $wgOut->getHTMLTitle() );
-
- $tpl->setRef( "thispage", &$this->thispage );
+
+ $tpl->setRef( "thispage", $this->thispage );
$subpagestr = $this->subPageSubtitle();
- $tpl->set(
+ $tpl->set(
"subtitle", !empty($subpagestr)?
''.$subpagestr.''.$out->getSubtitle():
- $out->getSubtitle()
+ $out->getSubtitle()
+ );
+ $undelete = $this->getUndeleteLink();
+ $tpl->set(
+ "undelete", !empty($undelete)?
+ ''.$undelete.'':
+ ''
);
+
$tpl->set( 'catlinks', $this->getCategories());
if( $wgOut->isSyndicated() ) {
$feeds = array();
@@ -112,13 +119,14 @@
'ttip' => wfMsg('tooltip-'.$format)
);
}
- $tpl->setRef( 'feeds', &$feeds );
+ $tpl->setRef( 'feeds', $feeds );
}
- $tpl->setRef( 'mimetype', &$wgMimeType );
- $tpl->setRef( 'charset', &$wgOutputEncoding );
+ $tpl->setRef( 'mimetype', $wgMimeType );
+ $tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->setRef( 'skinname', &$this->skinname );
- $tpl->setRef( "loggedin", &$this->loggedin );
+ $tpl->setRef( 'skinname', $this->skinname );
+ $tpl->setRef( "loggedin", $this->loggedin );
+ $tpl->set('nsclass', 'ns-'.$wgTitle->getNamespace());
/* XXX currently unused, might get useful later
$tpl->set( "editable", ($wgTitle->getNamespace() != NS_SPECIAL ) );
$tpl->set( "exists", $wgTitle->getArticleID() != 0 );
@@ -128,36 +136,41 @@
$tpl->set( "sysop", $wgUser->isSysop() );
*/
$tpl->set( "searchaction", $this->escapeSearchLink() );
- $tpl->setRef( "stylepath", &$wgStylePath );
- $tpl->setRef( "logopath", &$wgLogo );
- $tpl->setRef( "lang", &$wgLanguageCode );
+ $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( "userjs", &$this->userjs);
- $tpl->setRef( "userjsprev", &$this->userjsprev);
+ $tpl->setRef( "username", $this->username );
+ $tpl->setRef( "userpage", $this->userpage);
+ $tpl->setRef( "userpageurl", $this->userpageUrlDetails['href']);
+ $tpl->setRef( "usercss", $this->usercss);
+ $tpl->setRef( "userjs", $this->userjs);
+ $tpl->setRef( "userjsprev", $this->userjsprev);
+ if($this->loggedin) {
+ $tpl->set( "jsvarurl", $this->makeUrl('-','action=raw&smaxage=0&gen=js') );
+ } else {
+ $tpl->set( "jsvarurl", $this->makeUrl('-','action=raw&gen=js') );
+ }
if( $wgUser->getNewtalk() ) {
$usertitle = Title::newFromText( $this->userpage );
$usertalktitle = $usertitle->getTalkPage();
if($usertalktitle->getPrefixedDbKey() != $this->thispage){
-
+
$ntl = wfMsg( "newmessages",
- $this->makeKnownLink(
+ $this->makeKnownLink(
$wgLang->getNsText( Namespace::getTalk( Namespace::getUser() ) )
. ":" . $this->username,
- wfMsg("newmessageslink") )
+ wfMsg("newmessageslink") )
);
}
} else {
$ntl = "";
}
- $tpl->setRef( "newtalk", &$ntl );
- $tpl->setRef( "skin", &$this);
+ $tpl->setRef( "newtalk", $ntl );
+ $tpl->setRef( "skin", $this);
$tpl->set( "logo", $this->logoText() );
if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and 0 != $wgArticle->getID() ) {
if ( !$wgDisableCounters ) {
@@ -168,16 +181,30 @@
}
$tpl->set('lastmod', $this->lastModified());
$tpl->set('copyright',$this->getCopyright());
+
+ $this->credits = false;
+
+ if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
+ require_once("Credits.php");
+ $this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+ }
+
+ $tpl->setRef( "credits", $this->credits );
+
+ } elseif ( isset( $oldid ) && !isset( $diff ) ) {
+ $tpl->set('copyright', $this->getCopyright());
}
+
$tpl->set( "copyrightico", $this->getCopyrightIcon() );
$tpl->set( "poweredbyico", $this->getPoweredBy() );
$tpl->set( "disclaimer", $this->disclaimerLink() );
$tpl->set( "about", $this->aboutLink() );
- $tpl->setRef( "debug", &$out->mDebugtext );
+ $tpl->setRef( "debug", $out->mDebugtext );
$tpl->set( "reporttime", $out->reportTime() );
+ $tpl->set( "sitenotice", $wgSiteNotice );
- $tpl->setRef( "bodytext", &$out->mBodytext );
+ $tpl->setRef( "bodytext", $out->mBodytext );
$language_urls = array();
foreach( $wgOut->getLanguageLinks() as $l ) {
@@ -187,15 +214,15 @@
'class' => $wgLang->isRTL() ? 'rtl' : 'ltr');
}
if(count($language_urls)) {
- $tpl->setRef( 'language_urls', &$language_urls);
+ $tpl->setRef( 'language_urls', $language_urls);
} else {
$tpl->set('language_urls', false);
}
$tpl->set('personal_urls', $this->buildPersonalUrls());
$content_actions = $this->buildContentActionUrls();
- $tpl->setRef('content_actions', &$content_actions);
+ $tpl->setRef('content_actions', $content_actions);
// XXX: attach this from javascript, same with section editing
- if($this->iseditable && $wgUser->getOption("editondblclick") )
+ if($this->iseditable && $wgUser->getOption("editondblclick") )
{
$tpl->set('body-ondblclick', 'document.location = "' .$content_actions['edit']['href'] .'";');
} else {
@@ -222,160 +249,125 @@
if ($this->loggedin) {
$personal_urls['userpage'] = array(
'text' => $this->username,
- 'href' => &$this->userpageurl,
- 'ttip' => wfMsg('tooltip-userpage'),
- 'akey' => wfMsg('accesskey-userpage')
+ 'href' => &$this->userpageUrlDetails['href'],
+ 'class' => $this->userpageUrlDetails['exists']?false:'new'
);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
$personal_urls['mytalk'] = array(
'text' => wfMsg('mytalk'),
- 'href' => $this->makeTalkUrl($this->userpage),
- 'ttip' => wfMsg('tooltip-mytalk'),
- 'akey' => wfMsg('accesskey-mytalk')
+ 'href' => &$usertalkUrlDetails['href'],
+ 'class' => $usertalkUrlDetails['exists']?false:'new'
);
$personal_urls['preferences'] = array(
'text' => wfMsg('preferences'),
- 'href' => $this->makeSpecialUrl('Preferences'),
- 'ttip' => wfMsg('tooltip-preferences'),
- 'akey' => wfMsg('accesskey-preferences')
+ 'href' => $this->makeSpecialUrl('Preferences')
);
$personal_urls['watchlist'] = array(
'text' => wfMsg('watchlist'),
- 'href' => $this->makeSpecialUrl('Watchlist'),
- 'ttip' => wfMsg('tooltip-watchlist'),
- 'akey' => wfMsg('accesskey-watchlist')
+ 'href' => $this->makeSpecialUrl('Watchlist')
);
$personal_urls['mycontris'] = array(
'text' => wfMsg('mycontris'),
- 'href' => $this->makeSpecialUrl('Contributions','target=' . $this->username),
- 'ttip' => wfMsg('tooltip-mycontris'),
- 'akey' => wfMsg('accesskey-mycontris')
+ 'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
);
$personal_urls['logout'] = array(
'text' => wfMsg('userlogout'),
- 'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurl),
- 'ttip' => wfMsg('tooltip-logout'),
- 'akey' => wfMsg('accesskey-logout')
+ 'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurl )
);
} else {
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')
+ 'href' => &$this->userpageUrlDetails['href'],
+ 'class' => $this->userpageUrlDetails['exists']?false:'new'
);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
$personal_urls['anontalk'] = array(
'text' => wfMsg('anontalk'),
- 'href' => $this->makeTalkUrl($this->userpage),
- 'ttip' => wfMsg('tooltip-anontalk'),
- 'akey' => wfMsg('accesskey-anontalk')
+ 'href' => &$usertalkUrlDetails['href'],
+ 'class' => $usertalkUrlDetails['exists']?false:'new'
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg('userlogin'),
- 'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurl),
- 'ttip' => wfMsg('tooltip-login'),
- 'akey' => wfMsg('accesskey-login')
+ 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
);
} else {
$personal_urls['login'] = array(
'text' => wfMsg('userlogin'),
- 'href' => $this->makeSpecialUrl('Userlogin', 'returnto='.$this->thisurl),
- 'ttip' => wfMsg('tooltip-login'),
- 'akey' => wfMsg('accesskey-login')
+ 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
);
}
}
return $personal_urls;
}
-
+
# an array of edit links by default used for the tabs
function buildContentActionUrls () {
- global $wgTitle, $wgUser, $wgRequest,$wgOut;
+ global $wgTitle, $wgUser, $wgRequest, $wgUseValidation;
$action = $wgRequest->getText( 'action' );
$section = $wgRequest->getText( 'section' );
$oldid = $wgRequest->getVal( 'oldid' );
- $section = $wgRequest->getVal( 'section' );
- $sectiontitle = $wgRequest->getVal( 'sectiontitle' );
- $collapse = $wgOut->getCollapse();
$diff = $wgRequest->getVal( 'diff' );
$content_actions = array();
-
+
if( $this->iscontent ) {
- $content_actions['article'] = array('class' => (!Namespace::isTalk( $wgTitle->getNamespace())) ? 'selected' : false,
- 'text' => $this->getNameSpaceWord(),
- 'href' => $this->makeArticleUrl($this->thispage),
- 'ttip' => wfMsg('tooltip-article'),
- 'akey' => wfMsg('accesskey-article'));
+ $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));
/* set up the classes for the talk link */
- $talk_class = (Namespace::isTalk( $wgTitle->getNamespace()) ? 'selected' : false);
+ $talk_class = (Namespace::isTalk( $wgTitle->getNamespace()) ? 'selected' : false);
$talktitle = Title::newFromText( $this->titletxt );
$talktitle = $talktitle->getTalkPage();
- $this->checkTitle(&$talktitle, &$this->titletxt);
- if($talktitle->getArticleId() != 0) {
+ $this->checkTitle($talktitle, $this->titletxt);
+ if($talktitle->getArticleId() != 0) {
$content_actions['talk'] = array(
'class' => $talk_class,
'text' => wfMsg('talk'),
- 'href' => $this->makeTalkUrl($this->titletxt),
- 'ttip' => wfMsg('tooltip-talk'),
- 'akey' => wfMsg('accesskey-talk')
+ 'href' => $this->makeTalkUrl($this->titletxt)
);
} else {
$content_actions['talk'] = array(
'class' => $talk_class?$talk_class.' new':'new',
'text' => wfMsg('talk'),
- 'href' => $this->makeTalkUrl($this->titletxt,'action=edit'),
- 'ttip' => wfMsg('tooltip-talk'),
- 'akey' => wfMsg('accesskey-talk')
+ 'href' => $this->makeTalkUrl($this->titletxt,'action=edit')
);
}
if ( $wgTitle->userCanEdit() ) {
$oid = ( $oldid && ! isset( $diff ) ) ? "&oldid={$oldid}" : false;
-
- $sid = $section ? "§ion={$section}" : false;
- $stl = $sectiontitle ? "§iontitle={$sectiontitle}" : false;
- if($collapse && !$sid) { $sid="§ion=0";}
$istalk = ( Namespace::isTalk( $wgTitle->getNamespace()) );
$istalkclass = $istalk?' istalk':'';
$content_actions['edit'] = array(
'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
'text' => wfMsg('edit'),
- 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid.$sid.$stl),
- 'ttip' => wfMsg('tooltip-edit'),
- 'akey' => wfMsg('accesskey-edit')
+ 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid)
);
if ( $istalk ) {
$content_actions['addsection'] = array(
'class' => $section == 'new'?'selected':false,
'text' => wfMsg('addsection'),
- 'href' => $this->makeUrl($this->thispage, 'action=edit§ion=new'),
- 'ttip' => wfMsg('tooltip-addsection'),
- 'akey' => wfMsg('accesskey-addsection')
+ 'href' => $this->makeUrl($this->thispage, 'action=edit§ion=new')
);
}
} else {
$oid = ( $oldid && ! isset( $diff ) ) ? "&oldid={$oldid}" : '';
- $sid = $section ? "§ion={$section}" : false;
- $stl = $sectiontitle ? "§iontitle={$sectiontitle}" : false;
- if($collapse && !$sid) { $sid="§ion=0";}
- $content_actions['edit'] = array('class' => ($action == 'edit') ? 'selected' : false,
+ $content_actions['viewsource'] = array('class' => ($action == 'edit') ? 'selected' : false,
'text' => wfMsg('viewsource'),
- 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid.$sid.$stl),
- 'ttip' => wfMsg('tooltip-viewsource'),
- 'akey' => wfMsg('accesskey-viewsource'));
+ 'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid));
}
if ( $wgTitle->getArticleId() ) {
$content_actions['history'] = array('class' => ($action == 'history') ? 'selected' : false,
'text' => wfMsg('history_short'),
- 'href' => $this->makeUrl($this->thispage, 'action=history'),
- 'ttip' => wfMsg('tooltip-history'),
- 'akey' => wfMsg('accesskey-history'));
+ 'href' => $this->makeUrl($this->thispage, 'action=history'));
# XXX: is there a rollback action anywhere or is it planned?
# Don't recall where i got this from...
@@ -392,54 +384,43 @@
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
'text' => wfMsg('protect'),
- 'href' => $this->makeUrl($this->thispage, 'action=protect'),
- 'ttip' => wfMsg('tooltip-protect'),
- 'akey' => wfMsg('accesskey-protect')
+ 'href' => $this->makeUrl($this->thispage, 'action=protect')
);
} else {
$content_actions['unprotect'] = array(
'class' => ($action == 'unprotect') ? 'selected' : false,
'text' => wfMsg('unprotect'),
- 'href' => $this->makeUrl($this->thispage, 'action=unprotect'),
- 'ttip' => wfMsg('tooltip-protect'),
- 'akey' => wfMsg('accesskey-protect')
+ 'href' => $this->makeUrl($this->thispage, 'action=unprotect')
);
}
$content_actions['delete'] = array(
'class' => ($action == 'delete') ? 'selected' : false,
'text' => wfMsg('delete'),
- 'href' => $this->makeUrl($this->thispage, 'action=delete'),
- 'ttip' => wfMsg('tooltip-delete'),
- 'akey' => wfMsg('accesskey-delete')
+ 'href' => $this->makeUrl($this->thispage, 'action=delete')
);
}
if ( $wgUser->getID() != 0 ) {
if ( $wgTitle->userCanEdit()) {
$content_actions['move'] = array('class' => ($wgTitle->getDbKey() == 'Movepage' and $wgTitle->getNamespace == Namespace::getSpecial()) ? 'selected' : false,
'text' => wfMsg('move'),
- 'href' => $this->makeSpecialUrl('Movepage', 'target='.$this->thispage),
- 'ttip' => wfMsg('tooltip-move'),
- 'akey' => wfMsg('accesskey-move'));
+ 'href' => $this->makeSpecialUrl('Movepage', 'target='. urlencode( $this->thispage ))
+ );
} else {
$content_actions['move'] = array('class' => 'inactive',
'text' => wfMsg('move'),
- 'href' => false,
- 'ttip' => wfMsg('tooltip-nomove'),
- 'akey' => false);
+ 'href' => false);
}
}
- } else {
+ } else {
//article doesn't exist or is deleted
if($wgUser->isSysop()){
if( $n = $wgTitle->isDeleted() ) {
$content_actions['delete'] = array(
'class' => false,
'text' => wfMsg( "undelete_short", $n ),
- 'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage),
- 'ttip' => wfMsg('tooltip-undelete', $n),
- 'akey' => wfMsg('accesskey-undelete')
+ 'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage)
);
}
}
@@ -449,26 +430,29 @@
if( !$wgTitle->userIsWatching()) {
$content_actions['watch'] = array('class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
'text' => wfMsg('watch'),
- 'href' => $this->makeUrl($this->thispage, 'action=watch'),
- 'ttip' => wfMsg('tooltip-watch'),
- 'akey' => wfMsg('accesskey-watch'));
+ 'href' => $this->makeUrl($this->thispage, 'action=watch'));
} else {
- $content_actions['watch'] = array('class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
+ $content_actions['unwatch'] = array('class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
'text' => wfMsg('unwatch'),
- 'href' => $this->makeUrl($this->thispage, 'action=unwatch'),
- 'ttip' => wfMsg('tooltip-unwatch'),
- 'akey' => wfMsg('accesskey-unwatch'));
-
+ 'href' => $this->makeUrl($this->thispage, 'action=unwatch'));
}
}
+
+ # Show validate tab
+ if ( $wgUseValidation && $wgTitle->getArticleId() && $wgTitle->getNamespace() == 0 ) {
+ global $wgArticle ;
+ $article_time = "×tamp=" . $wgArticle->mTimestamp ;
+ $content_actions['validate'] = array('class' => ($action == 'validate') ? 'selected' : false ,
+ 'text' => wfMsg('val_tab'),
+ 'href' => $this->makeUrl($this->thispage, "action=validate{$article_time}"));
+ }
+
} else {
/* show special page tab */
$content_actions['article'] = array('class' => 'selected',
'text' => wfMsg('specialpage'),
- 'href' => false,
- 'ttip' => wfMsg('tooltip-specialpage'),
- 'akey' => false);
+ 'href' => false);
}
return $content_actions;
@@ -478,7 +462,7 @@
function buildNavUrls () {
global $wgTitle, $wgUser, $wgRequest;
global $wgSiteSupportPage;
-
+
$action = $wgRequest->getText( 'action' );
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
@@ -487,20 +471,24 @@
$nav_urls['mainpage'] = array('href' => htmlspecialchars( $this->makeI18nUrl('mainpage')));
$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['whatlinkshere'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Whatlinkshere', 'target='.urlencode( $this->thispage ))));
$nav_urls['currentevents'] = (wfMsg('currentevents') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('currentevents'))) : false;
$nav_urls['portal'] = (wfMsg('portal') != '-') ? array('href' => htmlspecialchars( $this->makeI18nUrl('portal-url'))) : false;
- $nav_urls['recentchangeslinked'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchangeslinked', 'target='.$this->thispage)));
+ $nav_urls['recentchangeslinked'] = array('href' => htmlspecialchars( $this->makeSpecialUrl('Recentchangeslinked', 'target='.urlencode( $this->thispage ))));
$nav_urls['bugreports'] = array('href' => htmlspecialchars( $this->makeI18nUrl('bugreportspage')));
// $nav_urls['sitesupport'] = array('href' => htmlspecialchars( $this->makeI18nUrl('sitesupportpage')));
$nav_urls['sitesupport'] = array('href' => htmlspecialchars( $wgSiteSupportPage));
$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( $wgTitle->getNamespace() == NS_USER || $wgTitle->getNamespace() == NS_USER_TALK ) {
+ $id = User::idFromName($wgTitle->getText());
+ $ip = User::isIP($wgTitle->getText());
+ } else {
+ $id = 0;
+ $ip = false;
+ }
if($id || $ip) { # both anons and non-anons have contri list
$nav_urls['contributions'] = array(
@@ -519,58 +507,101 @@
return $nav_urls;
}
- function getNameSpaceWord () {
+ function getNameSpaceKey () {
global $wgTitle;
- switch ($wgTitle->getNamespace()) {
+ switch ($wgTitle->getNamespace()) {
case NS_MAIN:
case NS_TALK:
- return wfMsg('nstab-main');
+ return 'nstab-main';
case NS_USER:
case NS_USER_TALK:
- return wfMsg('nstab-user');
+ return 'nstab-user';
case NS_MEDIA:
- return wfMsg('nstab-media');
+ return 'nstab-media';
case NS_SPECIAL:
- return wfMsg('nstab-special');
+ return 'nstab-special';
case NS_WP:
case NS_WP_TALK:
- return wfMsg('nstab-wp');
+ return 'nstab-wp';
case NS_IMAGE:
case NS_IMAGE_TALK:
- return wfMsg('nstab-image');
+ return 'nstab-image';
case NS_MEDIAWIKI:
case NS_MEDIAWIKI_TALK:
- return wfMsg('nstab-mediawiki');
+ return 'nstab-mediawiki';
case NS_TEMPLATE:
case NS_TEMPLATE_TALK:
- return wfMsg('nstab-template');
+ return 'nstab-template';
case NS_HELP:
case NS_HELP_TALK:
- return wfMsg('nstab-help');
+ return 'nstab-help';
case NS_CATEGORY:
case NS_CATEGORY_TALK:
- return wfMsg('nstab-category');
+ return 'nstab-category';
default:
- return wfMsg('nstab-main');
+ return 'nstab-main';
}
}
/* private */ function setupUserCssJs () {
global $wgRequest, $wgTitle;
$action = $wgRequest->getText('action');
- if($wgTitle->isCssSubpage() and $action == 'submit' and $wgTitle->userCanEditCssJsSubpage()) {
- // css preview
- $this->usercss = $wgRequest->getText('wpTextbox1');
- } else {
- $this->usercss = '@import url('.
- $this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css').');';
+ # generated css
+ $this->usercss = '@import "'.$this->makeUrl('-','action=raw&gen=css').'";'."\n";
+
+ if( $this->loggedin ) {
+ if($wgTitle->isCssSubpage() and $action == 'submit' and $wgTitle->userCanEditCssJsSubpage()) {
+ # generated css
+ $this->usercss = '@import "'.$this->makeUrl('-','action=raw&smaxage=0&maxage=0&gen=css').'";'."\n";
+ // css preview
+ $this->usercss .= $wgRequest->getText('wpTextbox1');
+ } else {
+ # generated css
+ $this->usercss .= '@import "'.$this->makeUrl('-','action=raw&smaxage=0&gen=css').'";'."\n";
+ # import user stylesheet
+ $this->usercss .= '@import "'.
+ $this->makeUrl($this->userpage.'/'.$this->skinname.'.css', 'action=raw&ctype=text/css').'";'."\n";
+ }
+ if($wgTitle->isJsSubpage() and $action == 'submit' and $wgTitle->userCanEditCssJsSubpage()) {
+ # XXX: additional security check/prompt?
+ $this->userjsprev = $wgRequest->getText('wpTextbox1');
+ } else {
+ $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript&dontcountme=s');
+ }
}
- if($wgTitle->isJsSubpage() and $action == 'submit' and $wgTitle->userCanEditCssJsSubpage()) {
- # XXX: additional security check/prompt?
- $this->userjsprev = $wgRequest->getText('wpTextbox1');
- } else {
- $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript');
+ }
+ # returns css with user-specific options
+ function getUserStylesheet() {
+ global $wgUser, $wgRequest, $wgTitle, $wgLang, $wgSquidMaxage, $wgStylePath;
+ $action = $wgRequest->getText('action');
+ $maxage = $wgRequest->getText('maxage');
+ $s = "/* generated user stylesheet */\n";
+ if($wgLang->isRTL()) $s .= '@import "'.$wgStylePath.'/'.$this->skinname.'/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";
+ } else {
+ $s .= "a { text-decoration: none; }\n";
+ }
+ }
+ if ( 1 != $wgUser->getOption( "highlightbroken" ) ) {
+ $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
+ }
+ if ( 1 == $wgUser->getOption( "justify" ) ) {
+ $s .= "#bodyContent { text-align: justify; }\n";
}
+ return $s;
}
+ function getUserJs() {
+ global $wgUser, $wgStylePath;
+ $s = "/* generated javascript */";
+ $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
+ $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n";
+ $s .= wfMsg(ucfirst($this->skinname).'.js');
+ return $s;
+ }
+
}
class SkinDaVinci extends SkinPHPTal {
@@ -579,19 +610,26 @@
$this->skinname = "davinci";
}
}
-
+
class SkinMono extends SkinPHPTal {
function initPage( &$out ) {
SkinPHPTal::initPage( $out );
$this->skinname = "mono";
}
}
-
+
class SkinMonoBook extends SkinPHPTal {
function initPage( &$out ) {
SkinPHPTal::initPage( $out );
$this->skinname = "monobook";
}
}
-
+
+ class SkinMySkin extends SkinPHPTal {
+ function initPage( &$out ) {
+ SkinPHPTal::initPage( $out );
+ $this->skinname = "myskin";
+ }
+ }
+}
?>