This commit was manufactured by cvs2svn to create tag1.3.0beta4a

'REL1_3_0beta4a'.

1 files changed, 156 insertions, 135 deletions

diff --git a/includes/SkinPHPTal.php b/includes/SkinPHPTal.php
index bf39da259933..f56360f60f3a 100644
--- a/includes/SkinPHPTal.php
+++ b/includes/SkinPHPTal.php
@@ -27,6 +27,7 @@
 # http://www.gnu.org/copyleft/gpl.html
 
 	require_once "GlobalFunctions.php";
+	global $IP;
 	require_once $IP."/PHPTAL-NP-0.7.0/libs/PHPTAL.php";
 
 	class MediaWiki_I18N extends PHPTAL_I18N
@@ -62,7 +63,7 @@
 			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;
 			
 			extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
@@ -83,20 +84,27 @@
 			$this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
 			
 			$this->usercss =  $this->userjs = $this->userjsprev = false;
-			if( $this->loggedin ) { $this->setupUserCssJs(); }
+			$this->setupUserCssJs();
 
 			$this->titletxt = $wgTitle->getPrefixedText();
 			
 			$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( 
 				"subtitle",  !empty($subpagestr)?
 				'<span class="subpages">'.$subpagestr.'</span>'.$out->getSubtitle():
 				$out->getSubtitle()  
 			);
+			$undelete = $this->getUndeleteLink();
+			$tpl->set(
+				"undelete", !empty($undelete)?
+				'<span class="subpages">'.$undelete.'</span>':
+				''
+			);
+
 			$tpl->set( 'catlinks', $this->getCategories());
 			if( $wgOut->isSyndicated() ) {
 				$feeds = array();
@@ -107,13 +115,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 );
@@ -123,18 +132,23 @@
 			$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->userpageUrlDetails['href']);
-			$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&gen=js&smaxage=0') );
+			} else {
+				$tpl->set( "jsvarurl", $this->makeUrl('-','action=raw&gen=js') );
+			}
 			if( $wgUser->getNewtalk() ) {
 				$usertitle = Title::newFromText( $this->userpage );
 				$usertalktitle = $usertitle->getTalkPage();
@@ -151,8 +165,8 @@
 				$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 ) {
@@ -163,16 +177,20 @@
 				}
 				$tpl->set('lastmod', $this->lastModified());
 			        $tpl->set('copyright',$this->getCopyright());
+			} 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->setRef( "bodytext", &$out->mBodytext );
+			$tpl->set( "sitenotice", $wgSiteNotice );
+			
+			$tpl->setRef( "bodytext", $out->mBodytext );
 
 			$language_urls = array();
 			foreach( $wgOut->getLanguageLinks() as $l ) {
@@ -182,13 +200,13 @@
 				'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") ) 
 			{
@@ -218,72 +236,52 @@
 				$personal_urls['userpage'] = array(
 					'text' => $this->username,
 					'href' => &$this->userpageUrlDetails['href'],
-					'class' => $this->userpageUrlDetails['exists']?false:'new',
-					'ttip' => wfMsg('tooltip-userpage'),
-					'akey' => wfMsg('accesskey-userpage')
+					'class' => $this->userpageUrlDetails['exists']?false:'new'
 				);
 				$usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
 				$personal_urls['mytalk'] = array(
 					'text' => wfMsg('mytalk'),
 					'href' => &$usertalkUrlDetails['href'],
-					'class' => $usertalkUrlDetails['exists']?false:'new',
-					'ttip' => wfMsg('tooltip-mytalk'),
-					'akey' => wfMsg('accesskey-mytalk')
+					'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->userpageUrlDetails['href'],
-						'class' => $this->userpageUrlDetails['exists']?false:'new',
-						'ttip' => wfMsg('tooltip-anonuserpage'),
-						'akey' => wfMsg('accesskey-anonuserpage')
+						'class' => $this->userpageUrlDetails['exists']?false:'new'			
 					);
 					$usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
 					$personal_urls['anontalk'] = array(
 						'text' => wfMsg('anontalk'),
 						'href' => &$usertalkUrlDetails['href'],
-						'class' => $usertalkUrlDetails['exists']?false:'new',
-						'ttip' => wfMsg('tooltip-anontalk'),
-						'akey' => wfMsg('accesskey-anontalk')
+						'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 )
 					);
 				}
 			}
@@ -302,32 +300,27 @@
 			
 			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();
+				$content_actions[$nskey] = array('class' => (!Namespace::isTalk( $wgTitle->getNamespace())) ? '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);				
 				$talktitle = Title::newFromText( $this->titletxt );
 				$talktitle = $talktitle->getTalkPage();
-				$this->checkTitle(&$talktitle, &$this->titletxt);	
+				$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')
 					);
 				}
 
@@ -338,35 +331,27 @@
 					$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),
-						'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&section=new'),
-							'ttip' => wfMsg('tooltip-addsection'),
-							'akey' => wfMsg('accesskey-addsection')
+							'href' => $this->makeUrl($this->thispage, 'action=edit&section=new')
 						);
 					}
 				} else {
 				        $oid = ( $oldid && ! isset( $diff ) ) ? "&oldid={$oldid}" : '';
-					$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),
-					'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...
@@ -383,41 +368,32 @@
 							$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);
 
 						}
 					}
@@ -428,9 +404,7 @@
 							$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)
 							);
 						}
 					}
@@ -440,16 +414,11 @@
 					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,
 						'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'));
 					}
 				}
 			} else {
@@ -457,9 +426,7 @@
 
 				$content_actions['article'] = array('class' => 'selected',
 				'text' => wfMsg('specialpage'),
-				'href' => false,
-				'ttip' => wfMsg('tooltip-specialpage'),
-				'akey' => false);
+				'href' => false);
 			}
 
 			return $content_actions;
@@ -478,10 +445,10 @@
 			$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));
@@ -489,9 +456,13 @@
 			$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(
@@ -510,58 +481,101 @@
 			return $nav_urls;
 		}
 
-		function getNameSpaceWord () {
+		function getNameSpaceKey () {
 			global $wgTitle;
 			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&gen=css&smaxage=0&maxage=0').');'."\n";
+					// css preview
+					$this->usercss .= $wgRequest->getText('wpTextbox1');
+				} else {
+					# generated css
+					$this->usercss .= '@import "'.$this->makeUrl('-','action=raw&gen=css&smaxage=0').'";'."\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');
+				}
 			}
-			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 {
@@ -584,5 +598,12 @@
 			$this->skinname = "monobook";
 		}
 	}
+
+	class SkinMySkin extends SkinPHPTal {
+		function initPage( &$out ) {
+			SkinPHPTal::initPage( $out );
+			$this->skinname = "myskin";
+		}
+	}
 	
 ?>