Hutchy68 / pivot

pivot.php

Spacing +4 added lines, -4 removed lines

@@ -1,14 +1,14 @@
 <?php
 
-if ( function_exists( 'wfLoadSkin' ) ) {
-  wfLoadSkin( 'pivot' );
+if (function_exists('wfLoadSkin')) {
+  wfLoadSkin('pivot');
   // Keep i18n globals so mergeMessageFileList.php doesn't break
-  $wgMessagesDirs['pivot'] = __DIR__ . '/i18n';
+  $wgMessagesDirs['pivot'] = __DIR__.'/i18n';
   /* wfWarn(
     'Deprecated PHP entry point used for Pivot skin. Please use wfLoadSkin instead, ' .
     'see https://www.mediawiki.org/wiki/Extension_registration for more details.'
   ); */
   return true;
 } else {
-  die( 'This version of the Pivot skin requires MediaWiki 1.25+' );
+  die('This version of the Pivot skin requires MediaWiki 1.25+');
 }
\ No newline at end of file

Pivot.skin.php

Indentation +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 		$this->html('headelement');
 		switch ($wgPivotFeatures['usePivotTabs']) {
 			case true:
-			    ob_start();
+				ob_start();
 				$this->html('bodytext');
 				$out = ob_get_contents();
 				ob_end_clean();

Braces +29 added lines, -10 removed lines

@@ -39,8 +39,9 @@ 
 				$out->addHeadItem('ie-meta', '<meta http-equiv="X-UA-Compatible" content="IE=edge" />');
 				break;
 			case 2:
-				if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false))
-					header('X-UA-Compatible: IE=edge');
+				if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
+									header('X-UA-Compatible: IE=edge');
+				}
 				break;
 		}
 		$out->addModuleStyles('skins.pivot.styles');
@@ -93,7 +94,10 @@ 
 <!-- START PIVOTTEMPLATE -->
 		<div class="off-canvas-wrap docs-wrap" data-offcanvas="">
 			<div class="inner-wrap">
-				<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "<div class='fixed'>"; ?>
+				<?php if ($wgPivotFeatures['fixedNavBar'] != false) {
+	echo "<div class='fixed'>";
+}
+?>
 				<nav class="tab-bar hide-for-print">
 					<section id="left-nav-aside" class="left-small show-for-small">
 						<a class="left-off-canvas-toggle"><span id="menu-user"><i class="fa fa-navicon fa-lg"></i></span></a>
@@ -110,10 +114,16 @@ 
 					</section>
 					
 					<section id="right-nav-aside" class="right-small">
-					<a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else: ?>fa-navicon<?php endif; ?> fa-lg"></i></span></a>
+					<a class="right-off-canvas-toggle"><span id="menu-user"><i class="fa <?php if ($wgUser->isLoggedIn()): ?>fa-user<?php else {
+	: ?>fa-navicon<?php endif;
+}
+?> fa-lg"></i></span></a>
 					</section>
 				</nav>
-				<?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "</div>"; ?>
+				<?php if ($wgPivotFeatures['fixedNavBar'] != false) {
+	echo "</div>";
+}
+?>
 				    <aside class="left-off-canvas-menu">
       					<ul class="off-canvas-list">
 						
@@ -136,19 +146,28 @@ 
 					<?php if ($wgUser->isLoggedIn()): ?>
 						<li id="personal-tools"><label>Personal</label></li>
 						<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
-							<?php else: ?>
+							<?php else {
+	: ?>
 								<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
-									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
+									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href'];
+}
+?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
 								<?php elseif (isset($this->data['personal_urls']['login'])): ?>
 									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
-										<?php else: ?>
-											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
+										<?php else {
+	: ?>
+											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text());
+}
+?></li>
 								<?php endif; ?>
 							<?php endif; ?>
 					  </ul>
 					</aside>
 
-					<section id="main-section" class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) echo "style='margin-top:2.8125em'"; ?>>
+					<section id="main-section" class="main-section" <?php if ($wgPivotFeatures['fixedNavBar'] != false) {
+	echo "style='margin-top:2.8125em'";
+}
+?>>
 					
 						<div id="page-content">
 							

Spacing +16 added lines, -16 removed lines

@@ -30,7 +30,7 @@ 
 			'useAddThisFollow' => ''
 		);
 		foreach ($wgPivotFeaturesDefaults as $fgOption => $fgOptionValue) {
-			if ( !isset($wgPivotFeatures[$fgOption]) ) {
+			if ( ! isset($wgPivotFeatures[$fgOption])) {
 				$wgPivotFeatures[$fgOption] = $fgOptionValue;
 			}
 		}
@@ -138,11 +138,11 @@ 
 						<?php foreach ($this->getPersonalTools() as $key => $item) { echo $this->makeListItem($key, $item); } ?>
 							<?php else: ?>
 								<?php if (isset($this->data['personal_urls']['anonlogin'])): ?>
-									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
+									<li><a href="<?php echo $this->data['personal_urls']['anonlogin']['href']; ?>"><?php echo wfMessage('login')->text() ?></a></li>
 								<?php elseif (isset($this->data['personal_urls']['login'])): ?>
-									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage( 'login' )->text() ?></a></li>
+									<li><a href="<?php echo htmlspecialchars($this->data['personal_urls']['login']['href']); ?>"><?php echo wfMessage('login')->text() ?></a></li>
 										<?php else: ?>
-											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage( 'login' )->text()); ?></li>
+											<li><?php echo Linker::link(Title::newFromText('Special:UserLogin'), wfMessage('login')->text()); ?></li>
 								<?php endif; ?>
 							<?php endif; ?>
 					  </ul>
@@ -191,25 +191,25 @@ 
 												</div>
 												<?php endif; ?>
 												<!--[if lt IE 9]>
-												<div id="siteNotice" class="sitenotice"><?php echo $this->text('sitename') . ' '. wfMessage( 'pivot-browsermsg' )->text(); ?></div>
+												<div id="siteNotice" class="sitenotice"><?php echo $this->text('sitename').' '.wfMessage('pivot-browsermsg')->text(); ?></div>
 												<![endif]-->
 
-												<?php if ( $this->data['sitenotice'] ) { ?><div id="siteNotice" class="sitenotice"><?php $this->html( 'sitenotice' ); ?></div><?php } ?>
-												<?php if ( $this->data['newtalk'] ) { ?><div id="usermessage" class="newtalk"><?php $this->html( 'newtalk' ); ?></div><?php } ?>
+												<?php if ($this->data['sitenotice']) { ?><div id="siteNotice" class="sitenotice"><?php $this->html('sitenotice'); ?></div><?php } ?>
+												<?php if ($this->data['newtalk']) { ?><div id="usermessage" class="newtalk"><?php $this->html('newtalk'); ?></div><?php } ?>
 										</div>
 									</div>
 								
 									<?php if ($wgUser->isLoggedIn() || $wgPivotFeatures['showActionsForAnon']): ?>
-										<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right hide-for-print" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up">&nbsp;<?php echo wfMessage( 'actions' )->text() ?></span></i></a>
+										<a href="#" data-options="align:left" data-dropdown="drop1" class="button secondary small radius pull-right hide-for-print" id="drop"><i class="fa fa-navicon fa-lg"><span id="page-actions" class="show-for-medium-up">&nbsp;<?php echo wfMessage('actions')->text() ?></span></i></a>
 										<ul id="drop1" class="tiny content f-dropdown" data-dropdown-content>
-											<?php foreach($this->data['content_actions'] as $key => $tab) { echo preg_replace(array('/\sprimary="1"/', '/\scontext="[a-z]+"/', '/\srel="archives"/'),'',$this->makeListItem($key, $tab)); } ?>
-											<?php wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this, true ));  ?>
+											<?php foreach ($this->data['content_actions'] as $key => $tab) { echo preg_replace(array('/\sprimary="1"/', '/\scontext="[a-z]+"/', '/\srel="archives"/'), '', $this->makeListItem($key, $tab)); } ?>
+											<?php wfRunHooks('SkinTemplateToolboxEnd', array(&$this, true)); ?>
 										</ul>
 
 									<?php endif;
 									$namespace = str_replace('_', ' ', $this->getSkin()->getTitle()->getNsText());
 									$displaytitle = $this->data['title'];
-									if (!empty($namespace)) {
+									if ( ! empty($namespace)) {
 										$pagetitle = $this->getSkin()->getTitle();
 										$newtitle = str_replace($namespace.':', '', $pagetitle);
 										$displaytitle = str_replace($pagetitle, $newtitle, $displaytitle);
@@ -221,7 +221,7 @@ 
 											<div class="<?php echo $wgPivotFeatures['useAddThisShare']; ?> hide-for-print"></div>
 											<!-- Go to www.addthis.com/dashboard to customize your tools -->
 											<?php } ?>
-									<?php if ( $this->data['isarticle'] ) { ?><h3 id="tagline"><?php $this->msg( 'tagline' ) ?></h3><?php } ?>
+									<?php if ($this->data['isarticle']) { ?><h3 id="tagline"><?php $this->msg('tagline') ?></h3><?php } ?>
 									<h5 id="sitesub" class="subtitle"><?php $this->html('subtitle') ?></h5>
 									<div id="contentSub" class="clear_both"></div>
 									<div id="bodyContent" class="mw-bodytext">
@@ -304,10 +304,10 @@ 
 	function renderSidebar() { 
 		$sidebar = $this->getSidebar();
 		$toolbox = $this->getToolbox();
-		foreach ($sidebar as $boxName => $box) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) { 
-			echo '<li id='.Sanitizer::escapeId( $box['id'] ); Linker::tooltip( $box['id'] ).'>';
-			echo '<li><label>'.htmlspecialchars( $box['header'] ).'</label></li>';
-					if ( is_array( $box['content'] ) ) {
+		foreach ($sidebar as $boxName => $box) { if (($box['header'] != wfMessage('toolbox')->text())) { 
+			echo '<li id='.Sanitizer::escapeId($box['id']); Linker::tooltip($box['id']).'>';
+			echo '<li><label>'.htmlspecialchars($box['header']).'</label></li>';
+					if (is_array($box['content'])) {
 							foreach ($box['content'] as $key => $item) { echo $this->makeListItem($key, $item); }
 								} }
 									}