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

Braces +26 added lines, -8 removed lines

@@ -78,7 +78,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>
@@ -95,10 +98,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">
 						
@@ -121,19 +130,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">
 							

Indentation +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 	public function setupSkinUserCss(OutputPage $out) {
 		parent::setupSkinUserCss($out);
-    	global $wgLocalStylePath;
+		global $wgLocalStylePath;
 		global $wgPivotFeatures;
 		$wgPivotFeaturesDefaults = array(
 			'showActionsForAnon' => true,
@@ -36,7 +36,7 @@ 
 			}
 		}
 		$out->addModuleStyles('skins.pivot.styles');
-    	$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
+		$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
 		$out->addMeta('viewport', $viewport_meta);
 		$out->addModuleScripts('skins.pivot.js');
 		if ( $wgPivotFeatures['preloadFontAwesome'] ) {
@@ -55,7 +55,7 @@ 
 		$this->html('headelement');
 		switch ($wgPivotFeatures['usePivotTabs']) {
 			case true:
-			    ob_start();
+				ob_start();
 				$this->html('bodytext');
 				$out = ob_get_contents();
 				ob_end_clean();

Spacing +21 added lines, -21 removed lines

@@ -31,7 +31,7 @@ 
 			'useAddThisFollow' => ''
 		);
 		foreach ($wgPivotFeaturesDefaults as $fgOption => $fgOptionValue) {
-			if ( !isset($wgPivotFeatures[$fgOption]) ) {
+			if ( ! isset($wgPivotFeatures[$fgOption])) {
 				$wgPivotFeatures[$fgOption] = $fgOptionValue;
 			}
 		}
@@ -39,7 +39,7 @@ 
     	$viewport_meta = 'width=device-width, user-scalable=yes, initial-scale=1.0';
 		$out->addMeta('viewport', $viewport_meta);
 		$out->addModuleScripts('skins.pivot.js');
-		if ( $wgPivotFeatures['preloadFontAwesome'] ) {
+		if ($wgPivotFeatures['preloadFontAwesome']) {
 			$out->addHeadItem('font', '<link rel="preload" href="'.$wgLocalStylePath.'/pivot/assets/fonts/fontawesome-webfont.woff2?v=4.7.0" as="font" type="font/woff2" crossorigin="anonymous" />');
 		}
 	}
@@ -107,10 +107,10 @@ 
       					<ul class="off-canvas-list">
 						
 								<li class="has-form">
-									<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
+									<form action="<?php $this->text('wgScript'); ?>" id="searchform" class="mw-search">
 										<div class="row collapse">
 											<div class="small-12 columns">
-												<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
+												<input type="search" name="search" placeholder="<?php echo wfMessage('search')->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput-offcanvas" autocomplete="off">
 											</div>
 										</div>
 									</form>
@@ -127,11 +127,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>
@@ -152,10 +152,10 @@ 
 												<img alt="<?php echo $this->text('sitename'); ?>" src="<?php echo $this->text('logopath') ?>" style="max-width: 100%;height: auto;display: inline-block; vertical-align: middle;"></a>		
 											</li>
 											<li class="has-form">
-												<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
+												<form action="<?php $this->text('wgScript'); ?>" id="searchform" class="mw-search">
 													<div class="row collapse">
 														<div class="small-12 columns">
-															<input type="search" name="search" placeholder="<?php echo wfMessage( 'search' )->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
+															<input type="search" name="search" placeholder="<?php echo wfMessage('search')->text() ?>" title="Search [alt-shift-f]" accesskey="f" id="searchInput" autocomplete="off">
 														</div>
 													</div>
 												</form>
@@ -180,25 +180,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);
@@ -210,8 +210,8 @@ 
 											<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->html('subtitle') ) { ?><h5 id="sitesub" class="subtitle"><?php $this->html('subtitle') ?></h5><?php } ?>
+									<?php if ($this->data['isarticle']) { ?><h3 id="tagline"><?php $this->msg('tagline') ?></h3><?php } ?>
+									<?php if ($this->html('subtitle')) { ?><h5 id="sitesub" class="subtitle"><?php $this->html('subtitle') ?></h5><?php } ?>
 									<div id="contentSub" class="clear_both"></div>
 									<div id="bodyContent" class="mw-bodytext">
 									<?php 
@@ -294,11 +294,11 @@ 
 	function renderSidebar() { 
 		$sidebar = $this->getSidebar();
 		foreach ($sidebar as $boxName => $box) { 
-			echo '<li><label class="sidebar" id="'.Sanitizer::escapeId( $box['id'] ).'"';echo Linker::tooltip( $box['id'] ).'>'.htmlspecialchars( $box['header'] ).'</label></li>';
-					if ( is_array( $box['content'] ) ) {
+			echo '<li><label class="sidebar" id="'.Sanitizer::escapeId($box['id']).'"'; echo Linker::tooltip($box['id']).'>'.htmlspecialchars($box['header']).'</label></li>';
+					if (is_array($box['content'])) {
 							foreach ($box['content'] as $key => $item) { echo $this->makeListItem($key, $item); }
 								} 
 							}
-		return;	}	
+		return; }	
 }
 ?>
\ No newline at end of file