Drop some useless parameters to silly methods on the pretty much broken MediaWiki...
[lhc/web/wiklou.git] / skins / MonoBook.php
index d8ff280..389cb14 100644 (file)
@@ -6,21 +6,16 @@
  * dependency on PHPTAL.
  *
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @addtogroup Skins
  */
 
 if( !defined( 'MEDIAWIKI' ) )
-       die();
-
-/** */
-require_once('includes/SkinTemplate.php');
+       die( -1 );
 
 /**
  * Inherit main code from SkinTemplate, set the CSS and template filter.
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @addtogroup Skins
  */
 class SkinMonoBook extends SkinTemplate {
        /** Using monobook. */
@@ -34,8 +29,7 @@ class SkinMonoBook extends SkinTemplate {
 
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Skins
+ * @addtogroup Skins
  */
 class MonoBookTemplate extends QuickTemplate {
        /**
@@ -47,193 +41,251 @@ class MonoBookTemplate extends QuickTemplate {
         * @access private
         */
        function execute() {
+               global $wgUser;
+               $skin = $wgUser->getSkin();
+
                // Suppress warnings to prevent notices about missing indexes in $this->data
                wfSuppressWarnings();
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
-  <head>
-    <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
-    <?php $this->html('headlinks') ?>
-    <title><?php $this->text('pagetitle') ?></title>
-    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?1"; /*]]>*/</style>
-    <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css" />
-    <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css";</style><![endif]-->
-    <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css";</style><![endif]-->
-    <!--[if gte IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css";</style><![endif]-->
-    <!--[if IE]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js"></script>
-    <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
-    <?php if($this->data['jsvarurl'  ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl'  ) ?>"></script><?php } ?>
-    <script type="<?php $this->text('jsmimetype') ?>" src="<?php                                   $this->text('stylepath' ) ?>/common/wikibits.js"></script>
-    <?php if($this->data['pagecss'   ]) { ?><style type="text/css"><?php              $this->html('pagecss'   ) ?></style><?php    } ?>
-    <?php if($this->data['usercss'   ]) { ?><style type="text/css"><?php              $this->html('usercss'   ) ?></style><?php    } ?>
-    <?php if($this->data['userjs'    ]) { ?><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs'    ) ?>"></script><?php } ?>
-    <?php if($this->data['userjsprev']) { ?><script type="<?php $this->text('jsmimetype') ?>"><?php      $this->html('userjsprev') ?></script><?php   } ?>
-    <?php if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
-  </head>
-  <body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
-        <?php if($this->data['body_onload'    ]) { ?>onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
-        <?php if($this->data['nsclass'        ]) { ?>class="<?php      $this->text('nsclass')         ?>"<?php } ?>>
-    <div id="globalWrapper">
-      <div id="column-content">
+<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php 
+       foreach($this->data['xhtmlnamespaces'] as $tag => $ns) {
+               ?>xmlns:<?php echo "{$tag}=\"{$ns}\" ";
+       } ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>">
+       <head>
+               <meta http-equiv="Content-Type" content="<?php $this->text('mimetype') ?>; charset=<?php $this->text('charset') ?>" />
+               <?php $this->html('headlinks') ?>
+               <title><?php $this->text('pagetitle') ?></title>
+               <style type="text/css" media="screen, projection">/*<![CDATA[*/
+                       @import "<?php $this->text('stylepath') ?>/common/shared.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
+                       @import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/main.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";
+               /*]]>*/</style>
+               <link rel="stylesheet" type="text/css" <?php if(empty($this->data['printable']) ) { ?>media="print"<?php } ?> href="<?php $this->text('stylepath') ?>/common/commonPrint.css?<?php echo $GLOBALS['wgStyleVersion'] ?>" />
+               <!--[if lt IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE50Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
+               <!--[if IE 5.5000]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE55Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
+               <!--[if IE 6]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE60Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
+               <!--[if IE 7]><style type="text/css">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/IE70Fixes.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style><![endif]-->
+               <!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
+               <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+               
+               <?php print Skin::makeGlobalVariablesScript( $this->data ); ?>
+                
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script>
+               <!-- Head Scripts -->
+<?php $this->html('headscripts') ?>
+<?php  if($this->data['jsvarurl']) { ?>
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('jsvarurl') ?>"><!-- site js --></script>
+<?php  } ?>
+<?php  if($this->data['pagecss']) { ?>
+               <style type="text/css"><?php $this->html('pagecss') ?></style>
+<?php  }
+               if($this->data['usercss']) { ?>
+               <style type="text/css"><?php $this->html('usercss') ?></style>
+<?php  }
+               if($this->data['userjs']) { ?>
+               <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('userjs' ) ?>"></script>
+<?php  }
+               if($this->data['userjsprev']) { ?>
+               <script type="<?php $this->text('jsmimetype') ?>"><?php $this->html('userjsprev') ?></script>
+<?php  }
+               if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
+       </head>
+<body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
+<?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
+ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
+       <div id="globalWrapper">
+               <div id="column-content">
        <div id="content">
-         <a name="top" id="top"></a>
-         <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
-         <h1 class="firstHeading"><?php $this->text('title') ?></h1>
-         <div id="bodyContent">
-           <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
-           <div id="contentSub"><?php $this->html('subtitle') ?></div>
-           <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
-           <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
-           <div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div>
-           <!-- start content -->
-           <?php $this->html('bodytext') ?>
-           <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php       $this->html('catlinks') ?></div><?php } ?>
-           <!-- end content -->
-           <div class="visualClear"></div>
-         </div>
+               <a name="top" id="top"></a>
+               <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?>
+               <h1 class="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1>
+               <div id="bodyContent">
+                       <h3 id="siteSub"><?php $this->msg('tagline') ?></h3>
+                       <div id="contentSub"><?php $this->html('subtitle') ?></div>
+                       <?php if($this->data['undelete']) { ?><div id="contentSub2"><?php     $this->html('undelete') ?></div><?php } ?>
+                       <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk')  ?></div><?php } ?>
+                       <?php if($this->data['showjumplinks']) { ?><div id="jump-to-nav"><?php $this->msg('jumpto') ?> <a href="#column-one"><?php $this->msg('jumptonavigation') ?></a>, <a href="#searchInput"><?php $this->msg('jumptosearch') ?></a></div><?php } ?>
+                       <!-- start content -->
+                       <?php $this->html('bodytext') ?>
+                       <?php if($this->data['catlinks']) { $this->html('catlinks'); } ?>
+                       <!-- end content -->
+                       <div class="visualClear"></div>
+               </div>
        </div>
-      </div>
-      <div id="column-one">
+               </div>
+               <div id="column-one">
        <div id="p-cactions" class="portlet">
-         <h5><?php $this->msg('views') ?></h5>
-         <ul>
-           <?php foreach($this->data['content_actions'] as $key => $tab) {
-              ?><li id="ca-<?php echo htmlspecialchars($key) ?>"
-              <?php if($tab['class']) { ?>class="<?php echo htmlspecialchars($tab['class']) ?>"<?php } ?>
-              ><a href="<?php echo htmlspecialchars($tab['href']) ?>"><?php
-              echo htmlspecialchars($tab['text']) ?></a></li><?php
-            } ?>
-         </ul>
+               <h5><?php $this->msg('views') ?></h5>
+               <div class="pBody">
+                       <ul>
+       <?php                   foreach($this->data['content_actions'] as $key => $tab) { ?>
+                                <li id="ca-<?php echo Sanitizer::escapeId($key) ?>"<?php
+                                               if($tab['class']) { ?> class="<?php echo htmlspecialchars($tab['class']) ?>"<?php }
+                                        ?>><a href="<?php echo htmlspecialchars($tab['href']) ?>"<?php echo $skin->tooltipAndAccesskey('ca-'.$key) ?>><?php
+                                        echo htmlspecialchars($tab['text']) ?></a></li>
+       <?php                    } ?>
+                       </ul>
+               </div>
        </div>
        <div class="portlet" id="p-personal">
-         <h5><?php $this->msg('personaltools') ?></h5>
-         <div class="pBody">
-           <ul>
-           <?php foreach($this->data['personal_urls'] as $key => $item) {
-              ?><li id="pt-<?php echo htmlspecialchars($key) ?>"<?php if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
-              echo htmlspecialchars($item['href']) ?>"<?php
-              if(!empty($item['class'])) { ?> class="<?php
-              echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
-              echo htmlspecialchars($item['text']) ?></a></li><?php
-           } ?>
-           </ul>
-         </div>
+               <h5><?php $this->msg('personaltools') ?></h5>
+               <div class="pBody">
+                       <ul>
+<?php                  foreach($this->data['personal_urls'] as $key => $item) { ?>
+                               <li id="pt-<?php echo Sanitizer::escapeId($key) ?>"<?php
+                                       if ($item['active']) { ?> class="active"<?php } ?>><a href="<?php
+                               echo htmlspecialchars($item['href']) ?>"<?php echo $skin->tooltipAndAccesskey('pt-'.$key) ?><?php
+                               if(!empty($item['class'])) { ?> class="<?php
+                               echo htmlspecialchars($item['class']) ?>"<?php } ?>><?php
+                               echo htmlspecialchars($item['text']) ?></a></li>
+<?php                  } ?>
+                       </ul>
+               </div>
        </div>
        <div class="portlet" id="p-logo">
-         <a style="background-image: url(<?php $this->text('logopath') ?>);"
-           href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"
-           title="<?php $this->msg('mainpage') ?>"></a>
+               <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php
+                       ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php
+                       echo $skin->tooltipAndAccesskey('n-mainpage') ?>></a>
        </div>
        <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script>
        <?php foreach ($this->data['sidebar'] as $bar => $cont) { ?>
-       <div class='portlet' id='p-<?php echo htmlspecialchars($bar) ?>'>
-         <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
-         <div class='pBody'>
-           <ul>
-           <?php foreach($cont as $key => $val) { 
-                               echo '<li id="' . htmlspecialchars($val['id']) . '"';
-                               if ( $val['active'] ) echo ' class="active"';
-                               echo '>';
-                               echo '<a href="' . htmlspecialchars($val['href']) . '">' . htmlspecialchars($val['text']) . '</a>'; 
-                               echo '</li>';
-                       } ?>
-           </ul>
-         </div>
+       <div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>>
+               <h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
+               <div class='pBody'>
+                       <ul>
+<?php                  foreach($cont as $key => $val) { ?>
+                               <li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php
+                                       if ( $val['active'] ) { ?> class="active" <?php }
+                               ?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li>
+<?php                  } ?>
+                       </ul>
+               </div>
        </div>
        <?php } ?>
        <div id="p-search" class="portlet">
-         <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
-         <div class="pBody">
-           <form action="<?php $this->text('searchaction') ?>" id="searchform"><div>
-             <input id="searchInput" name="search" type="text"
-               <?php if($this->haveMsg('accesskey-search')) {
-                 ?>accesskey="<?php $this->msg('accesskey-search') ?>"<?php }
-               if( isset( $this->data['search'] ) ) {
-                 ?> value="<?php $this->text('search') ?>"<?php } ?> />
-             <input type='submit' name="go" class="searchButton" id="searchGoButton"
-               value="<?php $this->msg('go') ?>"
-               />&nbsp;<input type='submit' name="fulltext"
-               class="searchButton"
-               value="<?php $this->msg('search') ?>" />
-           </div></form>
-         </div>
+               <h5><label for="searchInput"><?php $this->msg('search') ?></label></h5>
+               <div id="searchBody" class="pBody">
+                       <form action="<?php $this->text('searchaction') ?>" id="searchform"><div>
+                               <input id="searchInput" name="search" type="text"<?php echo $skin->tooltipAndAccesskey('search');
+                                       if( isset( $this->data['search'] ) ) {
+                                               ?> value="<?php $this->text('search') ?>"<?php } ?> />
+                               <input type='submit' name="go" class="searchButton" id="searchGoButton" value="<?php $this->msg('searcharticle') ?>"<?php echo $skin->tooltipAndAccesskey( 'search-go' ); ?> />&nbsp;
+                               <input type='submit' name="fulltext" class="searchButton" id="mw-searchButton" value="<?php $this->msg('searchbutton') ?>"<?php echo $skin->tooltipAndAccesskey( 'search-fulltext' ); ?> />
+                       </div></form>
+               </div>
        </div>
+    <?php
+      if(isset($GLOBALS['wgSpecialPages']['Collection'])) {
+         Collection::printPortlet();
+      }
+    ?>
        <div class="portlet" id="p-tb">
-         <h5><?php $this->msg('toolbox') ?></h5>
-         <div class="pBody">
-           <ul>
-                 <?php if($this->data['notspecialpage']) { foreach( array( 'whatlinkshere', 'recentchangeslinked' ) as $special ) { ?>
-                 <li id="t-<?php echo $special?>"><a href="<?php
-                   echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
-                   ?>"><?php echo $this->msg($special) ?></a></li>
-                 <?php } } ?>
-              <?php if(isset($this->data['nav_urls']['trackbacklink'])) { ?>
-                 <li id="t-trackbacklink"><a href="<?php
-                   echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
-                   ?>"><?php echo $this->msg('trackbacklink') ?></a></li>
-             <?php } ?>
-             <?php if($this->data['feeds']) { ?><li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
-               ?><span id="feed-<?php echo htmlspecialchars($key) ?>"><a href="<?php
-               echo htmlspecialchars($feed['href']) ?>"><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
-               <?php } ?></li><?php } ?>
-             <?php foreach( array('contributions', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) { ?>
-             <?php if($this->data['nav_urls'][$special]) {?><li id="t-<?php echo $special ?>"><a href="<?php
-               echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
-               ?>"><?php $this->msg($special) ?></a></li><?php } ?>
-             <?php } ?>
-             <?php if(!empty($this->data['nav_urls']['print']['href'])) { ?>
-             <li id="t-print"><a href="<?php
-                   echo htmlspecialchars($this->data['nav_urls']['print']['href'])
-                   ?>"><?php echo $this->msg('printableversion') ?></a></li>
-                 <?php } ?>
-             <?php if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
-             <li id="t-permalink"><a href="<?php
-                   echo htmlspecialchars($this->data['nav_urls']['permalink']['href'])
-                   ?>"><?php echo $this->msg('permalink') ?></a></li>
-                 <?php } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
-                   <li id="t-ispermalink"><?php echo $this->msg('permalink') ?></li>
-                 <?php } ?>
-           </ul>
-         </div>
+               <h5><?php $this->msg('toolbox') ?></h5>
+               <div class="pBody">
+                       <ul>
+<?php
+               if($this->data['notspecialpage']) { ?>
+                               <li id="t-whatlinkshere"><a href="<?php
+                               echo htmlspecialchars($this->data['nav_urls']['whatlinkshere']['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-whatlinkshere') ?>><?php $this->msg('whatlinkshere') ?></a></li>
+<?php
+                       if( $this->data['nav_urls']['recentchangeslinked'] ) { ?>
+                               <li id="t-recentchangeslinked"><a href="<?php
+                               echo htmlspecialchars($this->data['nav_urls']['recentchangeslinked']['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-recentchangeslinked') ?>><?php $this->msg('recentchangeslinked') ?></a></li>
+<?php          }
+               }
+               if(isset($this->data['nav_urls']['trackbacklink'])) { ?>
+                       <li id="t-trackbacklink"><a href="<?php
+                               echo htmlspecialchars($this->data['nav_urls']['trackbacklink']['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-trackbacklink') ?>><?php $this->msg('trackbacklink') ?></a></li>
+<?php  }
+               if($this->data['feeds']) { ?>
+                       <li id="feedlinks"><?php foreach($this->data['feeds'] as $key => $feed) {
+                                       ?><span id="feed-<?php echo Sanitizer::escapeId($key) ?>"><a href="<?php
+                                       echo htmlspecialchars($feed['href']) ?>"<?php echo $skin->tooltipAndAccesskey('feed-'.$key) ?>><?php echo htmlspecialchars($feed['text'])?></a>&nbsp;</span>
+                                       <?php } ?></li><?php
+               }
+
+               foreach( array('contributions', 'log', 'blockip', 'emailuser', 'upload', 'specialpages') as $special ) {
+
+                       if($this->data['nav_urls'][$special]) {
+                               ?><li id="t-<?php echo $special ?>"><a href="<?php echo htmlspecialchars($this->data['nav_urls'][$special]['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-'.$special) ?>><?php $this->msg($special) ?></a></li>
+<?php          }
+               }
+
+               if(!empty($this->data['nav_urls']['print']['href'])) { ?>
+                               <li id="t-print"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['print']['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-print') ?>><?php $this->msg('printableversion') ?></a></li><?php
+               }
+
+               if(!empty($this->data['nav_urls']['permalink']['href'])) { ?>
+                               <li id="t-permalink"><a href="<?php echo htmlspecialchars($this->data['nav_urls']['permalink']['href'])
+                               ?>"<?php echo $skin->tooltipAndAccesskey('t-permalink') ?>><?php $this->msg('permalink') ?></a></li><?php
+               } elseif ($this->data['nav_urls']['permalink']['href'] === '') { ?>
+                               <li id="t-ispermalink"<?php echo $skin->tooltip('t-ispermalink') ?>><?php $this->msg('permalink') ?></li><?php
+               }
+
+               wfRunHooks( 'MonoBookTemplateToolboxEnd', array( &$this ) );
+?>
+                       </ul>
+               </div>
        </div>
-       <?php if( $this->data['language_urls'] ) { ?><div id="p-lang" class="portlet">
-         <h5><?php $this->msg('otherlanguages') ?></h5>
-         <div class="pBody">
-           <ul>
-             <?php foreach($this->data['language_urls'] as $langlink) { ?>
-             <li class="<?php echo htmlspecialchars($langlink['class'])?>">
-             <a href="<?php echo htmlspecialchars($langlink['href'])
-               ?>"><?php echo $langlink['text'] ?></a>
-             </li>
-             <?php } ?>
-           </ul>
-         </div>
+<?php
+               if( $this->data['language_urls'] ) { ?>
+       <div id="p-lang" class="portlet">
+               <h5><?php $this->msg('otherlanguages') ?></h5>
+               <div class="pBody">
+                       <ul>
+<?php          foreach($this->data['language_urls'] as $langlink) { ?>
+                               <li class="<?php echo htmlspecialchars($langlink['class'])?>"><?php
+                               ?><a href="<?php echo htmlspecialchars($langlink['href']) ?>"><?php echo $langlink['text'] ?></a></li>
+<?php          } ?>
+                       </ul>
+               </div>
        </div>
-       <?php } ?>
-      </div><!-- end of the left (by default at least) column -->
-      <div class="visualClear"></div>
-      <div id="footer">
-    <?php if($this->data['poweredbyico']) { ?><div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div><?php } ?>
-       <?php if($this->data['copyrightico']) { ?><div id="f-copyrightico"><?php $this->html('copyrightico') ?></div><?php } ?>
-       <ul id="f-list">
-         <?php if($this->data['lastmod'   ]) { ?><li id="f-lastmod"><?php    $this->html('lastmod')    ?></li><?php } ?>
-         <?php if($this->data['viewcount' ]) { ?><li id="f-viewcount"><?php  $this->html('viewcount')  ?></li><?php } ?>
-         <?php if($this->data['numberofwatchingusers' ]) { ?><li id="f-numberofwatchingusers"><?php  $this->html('numberofwatchingusers') ?></li><?php } ?>
-         <?php if($this->data['credits'   ]) { ?><li id="f-credits"><?php    $this->html('credits')    ?></li><?php } ?>
-         <?php if($this->data['copyright' ]) { ?><li id="f-copyright"><?php  $this->html('copyright')  ?></li><?php } ?>
-         <?php if($this->data['about'     ]) { ?><li id="f-about"><?php      $this->html('about')      ?></li><?php } ?>
-         <?php if($this->data['disclaimer']) { ?><li id="f-disclaimer"><?php $this->html('disclaimer') ?></li><?php } ?>
-         <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?>
-       </ul>
-      </div>
-    <script type="text/javascript"> if (window.runOnloadHook) runOnloadHook(); </script>
-    </div>
-    <?php $this->html('reporttime') ?>
-  </body>
-</html>
+<?php  } ?>
+               </div><!-- end of the left (by default at least) column -->
+                       <div class="visualClear"></div>
+                       <div id="footer">
+<?php
+               if($this->data['poweredbyico']) { ?>
+                               <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div>
+<?php  }
+               if($this->data['copyrightico']) { ?>
+                               <div id="f-copyrightico"><?php $this->html('copyrightico') ?></div>
+<?php  }
+
+               // Generate additional footer links
+?>
+                       <ul id="f-list">
+<?php
+               $footerlinks = array(
+                       'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright',
+                       'privacy', 'about', 'disclaimer', 'tagline',
+               );
+               foreach( $footerlinks as $aLink ) {
+                       if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
+?>                             <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
+<?php          }
+               }
+?>
+                       </ul>
+               </div>
+               
+       <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
+</div>
+<?php $this->html('reporttime') ?>
+<?php if ( $this->data['debug'] ): ?>
+<!-- Debug output:
+<?php $this->text( 'debug' ); ?>
+
+-->
+<?php endif; ?>
+</body></html>
 <?php
        wfRestoreWarnings();
-       }
-}
+       } // end of execute() method
+} // end of class
 ?>