Inspection of "Update QueryManagerMysqlRocketmap.php" - brusselopole/Worldopole - Measure and Improve Code Quality continuously with Scrutinizer

Failed Conditions

Pull Request — master (#374)

by Michael

created 2019-09-08 05:20 UTC

Status

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -3,9 +3,9 @@
 block discarded – undo
 // Test to check if the file is called properly
 
 if (!isset($_GET['id'])) {
-    http_response_code(400);
-    echo 'Bad Request';
-    exit();
+	http_response_code(400);
+	echo 'Bad Request';
+	exit();
 }
 
 // Send Javascript header

Please login to merge, or discard this patch.

index.php 1 patch

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 		<link href="core/css/font-awesome.min.css" rel="stylesheet">
 		<link href="<?php auto_ver('core/css/style.css'); ?>" rel="stylesheet">
 		<?php if ('pokemon' == $page) {
-    ?>
+	?>
 			<link href="<?php auto_ver('core/css/jQRangeSlider-bootstrap.min.css'); ?>" rel="stylesheet">
 		<?php
 } ?>
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
 	<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
 
 		<?php
-        // Google Analytics
-        if (is_file('analyticstracking.php')) {
-            include_once 'analyticstracking.php';
-        }
-        ?>
+		// Google Analytics
+		if (is_file('analyticstracking.php')) {
+			include_once 'analyticstracking.php';
+		}
+		?>
 
 		<nav class="navbar navbar-default navbar-fixed-top">
 			<div class="container">
@@ -53,15 +53,15 @@  discard block
 block discarded – undo
 					<ul class="nav navbar-nav navbar-right">
 
 						<?php
-                        if (!isset($config->menu)) {
-                            echo 'Please update variables.json file with menu values';
-                            exit();
-                        }
+						if (!isset($config->menu)) {
+							echo 'Please update variables.json file with menu values';
+							exit();
+						}
 
-                        foreach ($config->menu as $menu) {
-                            printMenuitems($menu, 1, $locales);
-                        }
-                        ?>
+						foreach ($config->menu as $menu) {
+							printMenuitems($menu, 1, $locales);
+						}
+						?>
 
 					</ul>
 				</div> <!-- /.navbar-collapse -->
@@ -70,21 +70,21 @@  discard block
 block discarded – undo
 
 		<div class="container">
 			<?php
-            // Include the pages
-            if (!empty($_GET['page'])) {
-                $file = SYS_PATH.'/pages/'.$page.'.page.php';
-
-                if (is_file($file)) {
-                    echo '<!-- Page :: '.$page.' -->';
-                    include $file;
-                } else {
-                    include 'pages/home.page.php';
-                }
-            } else {
-                include 'pages/home.page.php';
-            }
-
-            ?>
+			// Include the pages
+			if (!empty($_GET['page'])) {
+				$file = SYS_PATH.'/pages/'.$page.'.page.php';
+
+				if (is_file($file)) {
+					echo '<!-- Page :: '.$page.' -->';
+					include $file;
+				} else {
+					include 'pages/home.page.php';
+				}
+			} else {
+				include 'pages/home.page.php';
+			}
+
+			?>
 		</div>
 
 		<footer>
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
 		<script src="core/js/bootstrap.min.js"></script>
 
 		<?php // Load scripts only for page
-        if (empty($page)) {
-            ?>
+		if (empty($page)) {
+			?>
 
 			<script src="<?php auto_ver('core/js/home.script.js'); ?>"></script>
 
@@ -124,10 +124,10 @@  discard block
 block discarded – undo
 				updateCounter(<?= $home->teams->rocket; ?>,'.total-rocket-js');
 			</script>
 		<?php
-        } else {
-            switch ($page) {
-                case 'pokemon':
-                    ?>
+		} else {
+			switch ($page) {
+				case 'pokemon':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/pokemon.graph.js.php?id=<?= $pokemon_id; ?>"></script>
@@ -141,19 +141,19 @@  discard block
 block discarded – undo
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'pokestops':
-                    ?>
+				case 'pokestops':
+					?>
 
 					<script src="<?php auto_ver('core/js/pokestops.maps.js'); ?>"></script>
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'gym':
-                    ?>
+				case 'gym':
+					?>
 
 					<script src="<?php auto_ver('core/js/gym.script.js'); ?>"></script>
 					<script>
@@ -171,10 +171,10 @@  discard block
 block discarded – undo
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'pokedex':
-                    ?>
+				case 'pokedex':
+					?>
 
 					<script src="core/js/holmes.min.js"></script>
 					<script>
@@ -191,56 +191,56 @@  discard block
 block discarded – undo
 					</script>
 
 					<?php
-                    break;
+					break;
 
-                case 'dashboard':
-                    ?>
+				case 'dashboard':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/dashboard.graph.js.php"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'trainer':
-                    ?>
+				case 'trainer':
+					?>
 
 					<script src="<?php auto_ver('core/js/trainer.content.js'); ?>"></script>
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
 					<script src="core/js/trainer.graph.js.php"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'nests':
-                    ?>
+				case 'nests':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
 					<script src="core/js/nests.maps.js.php"></script>
 					<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization,geometry&callback=initMap&v=3"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'raids':
-                    ?>
+				case 'raids':
+					?>
 
 					<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
 					<script src="<?php auto_ver('core/js/raids.content.js'); ?>"></script>
 
 					<?php
-                    break;
+					break;
 
-                case 'gymhistory':
-                    ?>
+				case 'gymhistory':
+					?>
 
 					<script src="<?php auto_ver('core/js/gymhistory.content.js'); ?>"></script>
 
 					<?php
-                    break;
-            }
-        }
-        ?>
+					break;
+			}
+		}
+		?>
 
 	</body>
 </html>

Please login to merge, or discard this patch.

pages/dashboard.page.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -94,17 +94,17 @@  discard block
 block discarded – undo
 		</div>
 
 <?php if (true === !$config->system->no_lures) {
-    ?>
+	?>
 
     <?php if ($config->system->captcha_support) {
-        ?>
+		?>
         <div class="row area">
     <?php
-    } else {
-        ?>
+	} else {
+		?>
         <div class="row">
     <?php
-    } ?>
+	} ?>
 
 			<div class="col-md-12">
 				<h2 class="sub-title"><strong><?= $locales->POKESTOPS; ?></strong> <?= $locales->DASHBOARD_ACTIVITY; ?></h2>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 
 
 <?php if ($config->system->captcha_support) {
-        ?>
+		?>
 		<div class="row">
 
 			<div class="col-md-12">
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
 
 		</div>
 <?php
-    } ?>
+	} ?>
 
 	
 	</div>

Please login to merge, or discard this patch.

pages/home.page.php 1 patch

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -31,8 +31,8 @@  discard block
 block discarded – undo
 	</div>
 
 	<?php
-    if (true === !$config->system->no_lures) {
-        ?>
+	if (true === !$config->system->no_lures) {
+		?>
 		<div class="flex-item-homepage big-data"> <!-- POKESTOPS -->
 			<a href="pokestops">
 				<img src="core/img/lure-module.png" alt="Discover the <?= $config->infos->site_name; ?> Pokéstops" width=50 class="big-icon">
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
 			</a>
 		</div>
 		<?php
-    }
-    if (true === $config->system->homepage_raids) {
-        ?>
+	}
+	if (true === $config->system->homepage_raids) {
+		?>
 		<div class="flex-item-homepage flex-item-homepage-homepage big-data"> <!-- RAIDS -->
 			<a href="raids">
 				<img src="core/img/raid.png" alt="Discover the <?= $config->infos->site_name; ?> Raids" width=50
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
 			</a>
 		</div>
 		<?php
-    }
-    ?>
+	}
+	?>
 
 	<div class="flex-item-homepage big-data">
 		<a href="<?= $config->homewidget->url; ?>" target="_blank">
@@ -70,22 +70,22 @@  discard block
 block discarded – undo
 	<div class="col-md-12 text-center">
 		<h2 class="text-center sub-title">
 			<?php
-            if ($config->system->recents_filter) {
-                ?>
+			if ($config->system->recents_filter) {
+				?>
 				<?= $locales->RECENT_MYTHIC_SPAWNS; ?>
 			<?php
-            } else {
-                ?>
+			} else {
+				?>
 				<?= $locales->RECENT_SPAWNS; ?>
 			<?php
-            } ?>
+			} ?>
 		</h2>
 		<div class="last-mon-js">
 		<?php
-        $timers = array();
-        foreach ($recents as $key => $pokemon) {
-            $id = $pokemon->id;
-            $uid = $pokemon->uid; ?>
+		$timers = array();
+		foreach ($recents as $key => $pokemon) {
+			$id = $pokemon->id;
+			$uid = $pokemon->uid; ?>
 			<div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="<?= $id; ?>" data-pokeuid="<?= $uid; ?>" >
 				<a href="pokemon/<?= $id; ?>"><img src="<?= $pokemons->pokemon->$id->img; ?>" alt="<?= $pokemons->pokemon->$id->name; ?>" class="img-responsive"></a>
 				<a href="pokemon/<?= $id; ?>"><p class="pkmn-name"><?= $pokemons->pokemon->$id->name; ?></p></a>
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
 					<small class="pokemon-timer">00:00:00</small>
 				</a>
 				<?php
-                if ($config->system->recents_encounter_details) {
-                    if ($pokemon->encdetails->available) {
-                        if ($config->system->iv_numbers) {
-                            ?>
+				if ($config->system->recents_encounter_details) {
+					if ($pokemon->encdetails->available) {
+						if ($config->system->iv_numbers) {
+							?>
 							<div class="progress" style="height: 15px; margin-bottom: 0">
 								<div title="Attack IV: <?= $pokemon->encdetails->attack; ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3); ?>%; line-height: 16px">
 									<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $pokemon->encdetails->attack; ?></span><?= $pokemon->encdetails->attack; ?>
@@ -109,8 +109,8 @@  discard block
 block discarded – undo
 								</div>
 							</div>
 						<?php
-                        } else {
-                            ?>
+						} else {
+							?>
 							<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
 								<div title="Attack IV: <?= $pokemon->encdetails->attack; ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->encdetails->attack) / 3; ?>%">
 									<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $pokemon->encdetails->attack; ?></span>
@@ -123,12 +123,12 @@  discard block
 block discarded – undo
 								</div>
 							</div>
 					<?php
-                        } ?>
+						} ?>
 						<small><?= $pokemon->encdetails->cp; ?></small>
 					<?php
-                    } else {
-                        if ($config->system->iv_numbers) {
-                            ?>
+					} else {
+						if ($config->system->iv_numbers) {
+							?>
 							<div class="progress" style="height: 15px; margin-bottom: 0">
 								<div title="Attack IV: not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3); ?>%; line-height: 16px">
 									<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $locales->NOT_AVAILABLE; ?></span>?
@@ -141,24 +141,24 @@  discard block
 block discarded – undo
 								</div>
 							</div>
 						<?php
-                        } else {
-                            ?>
+						} else {
+							?>
 						<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
 							<div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
 								<span class="sr-only">IV <?= $locales->NOT_AVAILABLE; ?></span>
 							</div>
 						</div>
 					<?php
-                        } ?>
+						} ?>
 						<small>???</small>
 					<?php
-                    }
-                } ?>
+					}
+				} ?>
 				</div>
 			<?php
-            // Array with ids and countdowns to start at the end of this file
-            $timers[$uid] = $pokemon->last_seen - time();
-        } ?>
+			// Array with ids and countdowns to start at the end of this file
+			$timers[$uid] = $pokemon->last_seen - time();
+		} ?>
 		</div>
 	</div>
 </div>
@@ -168,9 +168,9 @@  discard block
 block discarded – undo
 	<h2 class="text-center sub-title"><?= $locales->FIGHT_TITLE; ?></h2>
 
 		<?php
-            foreach ($home->teams as $team => $total) {
-                if ($home->teams->rocket) {
-                    ?>
+			foreach ($home->teams as $team => $total) {
+				if ($home->teams->rocket) {
+					?>
 
 					<div class="col-md-3 col-sm-6 col-sm-12 team">
 						<div class="row">
@@ -178,34 +178,34 @@  discard block
 block discarded – undo
 								<p style="margin-top:0.5em;text-align:center;"><img src="core/img/<?= $team; ?>.png" alt="Team <?= $team; ?>" class="img-responsive" style="display:inline-block" width=80> <strong class="total-<?= $team; ?>-js">0</strong> <?= $locales->GYMS; ?></p>
 
 				<?php
-                } else {
-                    ?>
+				} else {
+					?>
 
 					<div class="col-md-4 col-sm-6 col-sm-12 team">
 						<div class="row">
 							<div class="col-xs-12 col-sm-12">
 								<?php
-                                    if ('rocket' != $team) {
-                                        ?>
+									if ('rocket' != $team) {
+										?>
 										<p style="margin-top:0.5em;text-align:center;"><img src="core/img/<?= $team; ?>.png" alt="Team <?= $team; ?>" class="img-responsive" style="display:inline-block" width=80> <strong class="total-<?= $team; ?>-js">0</strong> <?= $locales->GYMS; ?></p>
 										<?php
-                                    }
-                } ?>
+									}
+				} ?>
 							</div>
 						</div>
 					</div>					
 				<?php
-            } ?>
+			} ?>
 </div>
 
 
 <script>
 	document.addEventListener('DOMContentLoaded', function() {
 		<?php
-        foreach (array_reverse($timers, true) as $id => $countdown) {
-            ?>
+		foreach (array_reverse($timers, true) as $id => $countdown) {
+			?>
 			startTimer(<?= $countdown; ?>,"<?= $id; ?>");
 		<?php
-        } ?>
+		} ?>
 	}, false);
 </script>

Please login to merge, or discard this patch.

pages/pokedex.page.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -25,19 +25,19 @@
 block discarded – undo
 
 
 		<?php foreach ($pokedex as $pokemon) {
-    ?>
+	?>
 
 			<div class="flex-item pokemon-single">
 
 				<a href="<?= $pokemon->permalink; ?>"><img src="<?= $pokemon->img; ?>" alt="<?= $pokemon->name; ?>" class="img-responsive <?php if (0 == $pokemon->spawn) {
-        echo 'unseen';
-    } ?> "></a>
+		echo 'unseen';
+	} ?> "></a>
 				<p class="pkmn-name"><a href="<?= $pokemon->permalink; ?>">#<?= sprintf('%03d<br>%s', $pokemon->id, $pokemon->name); ?></a></p>
 				<p><?php if (0 == $pokemon->spawn) {
-        echo $locales->UNSEEN;
-    } else {
-        echo $pokemon->spawn_count.$locales->SEEN;
-    } ?> </p>
+		echo $locales->UNSEEN;
+	} else {
+		echo $pokemon->spawn_count.$locales->SEEN;
+	} ?> </p>
 
 			</div>
 

Please login to merge, or discard this patch.

pages/trainer.page.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -104,7 +104,7 @@
 block discarded – undo
 <?=
 $trainerName = '';
 if (isset($_GET['name'])) {
-    $trainerName = htmlspecialchars($_GET['name'], ENT_QUOTES);
+	$trainerName = htmlspecialchars($_GET['name'], ENT_QUOTES);
 }
 
 ?>

Please login to merge, or discard this patch.

pages/gymhistory.page.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -69,7 +69,7 @@
 block discarded – undo
 <?=
 $gymName = '';
 if (isset($_GET['name'])) {
-    $gymName = htmlspecialchars($_GET['name'], ENT_QUOTES);
+	$gymName = htmlspecialchars($_GET['name'], ENT_QUOTES);
 }
 ?>
 var gymName = "<?= $gymName; ?>";

Please login to merge, or discard this patch.

pages/gym.page.php 1 patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -15,12 +15,12 @@  discard block
 block discarded – undo
 
 	<?php
 
-    foreach ($teams as $team_name => $team) {
-        // We do not display the team rocket result as it's not a real team
+	foreach ($teams as $team_name => $team) {
+		// We do not display the team rocket result as it's not a real team
 
-        if ('rocket' != $team_name) {
-            $upper_team_name = strtoupper($team_name);
-            $lower_team_name = strtolower($team_name); ?>
+		if ('rocket' != $team_name) {
+			$upper_team_name = strtoupper($team_name);
+			$lower_team_name = strtolower($team_name); ?>
 
 	<div class="col-md-4 col-sm-4 col-xs-12 big-data"> <!-- <?= $team_name; ?> -->
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
 			<p style="margin-top:1em"><?= $locales->GYMS_GUARDIANS; ?></p>
 
 			<?php foreach ($team->guardians as $guardian) {
-                ?>
+				?>
 
 				<div class="col-xs-4 pokemon-single">
 					<a href="pokemon/<?= $guardian; ?>">
@@ -50,20 +50,20 @@  discard block
 block discarded – undo
 
 
 			<?php
-            } ?>
+			} ?>
 
 		</div>
 	</div>
 
 	<?php
-        }
-    }?>
+		}
+	}?>
 
 </div>
 
 <!-- auto hide buttons if no url is set in variables.json -->
 <?php if ($config->urls->fb_mystic || $config->urls->fb_valor || $config->urls->fb_instinct) {
-        ?>
+		?>
 <div class="row hidden-xs hiddem-sm area">
 	<div class="col-md-4">
 		<p align="center"><a href="<?= $config->urls->fb_mystic; ?>" target="_blank" class="btn btn-default"><i class="fa fa-facebook"></i> <?= $locales->TEAM; ?> <?= $locales->MYSTIC; ?></a></p>
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 	</div>
 </div>
 <?php
-    } ?>
+	} ?>
 
 <div class="row">
 	<div class="col-md-12">

Please login to merge, or discard this patch.

pages/pokestops.page.php 1 patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -13,35 +13,35 @@  discard block
 block discarded – undo
 <div class="row area">
 
 	<?php
-    if (true === !$config->system->no_lures) {
-        ?>
+	if (true === !$config->system->no_lures) {
+		?>
 		<div class="col-md-6 col-sm-6 col-xs-12 big-data" style="border-right:1px lightgray solid;"> <!-- POKESTOPS -->
 		<?php
-    } else {
-        ?>
+	} else {
+		?>
 		<div class="big-data"> <!-- POKESTOPS -->
 		<?php
-    }
-    ?>
+	}
+	?>
 		<img src="core/img/pokestop.png" alt="Pokestop" width=50 class="big-icon">
 		<p><big><strong><?= $pokestop->total; ?></strong> <?= $locales->POKESTOPS; ?></big><br> <?= sprintf($locales->INCITY, $config->infos->city); ?></p>
 	</div>
 
 	<?php
-    if (true === !$config->system->no_lures) {
-        ?>
+	if (true === !$config->system->no_lures) {
+		?>
 		<div class="col-md-6 col-sm-6 col-xs-12 big-data"> <!-- LURED STOPS -->
 		<img src="core/img/lure-module.png" alt="Lured Pokestop" width=50 class="big-icon">
 			<p><big><strong><?= $pokestop->lured; ?></strong> <?= $locales->LURES; ?></big><br> <?= $locales->POKESTOPS_LURES; ?></p>
 		</div>
 	<?php
-    }
-    ?>
+	}
+	?>
 </div>
 
 <?php
 if (true === !$config->system->no_lures) {
-        ?>
+		?>
 	<div class="row text-center subnav">
 		<div class="btn-group" role="group">
 		<a class="btn btn-default active" id="pokestopSelector"><i
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 	</div>
 	</div>
 	<?php
-    }
+	}
 ?>
 
 <div class="row">

Please login to merge, or discard this patch.

		@@ -3,9 +3,9 @@
		block discarded – undo
3	3	// Test to check if the file is called properly
4	4
5	5	if (!isset($_GET['id'])) {
6		- http_response_code(400);
7		- echo 'Bad Request';
8		- exit();
	6	+ http_response_code(400);
	7	+ echo 'Bad Request';
	8	+ exit();
9	9	}
10	10
11	11	// Send Javascript header

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	<link href="core/css/font-awesome.min.css" rel="stylesheet">
22	22	<link href="<?php auto_ver('core/css/style.css'); ?>" rel="stylesheet">
23	23	<?php if ('pokemon' == $page) {
24		- ?>
	24	+ ?>
25	25	<link href="<?php auto_ver('core/css/jQRangeSlider-bootstrap.min.css'); ?>" rel="stylesheet">
26	26	<?php
27	27	} ?>
		@@ -29,11 +29,11 @@ discard block
		block discarded – undo
29	29	<body id="page-top" data-spy="scroll" data-target=".navbar-fixed-top">
30	30
31	31	<?php
32		- // Google Analytics
33		- if (is_file('analyticstracking.php')) {
34		- include_once 'analyticstracking.php';
35		- }
36		- ?>
	32	+ // Google Analytics
	33	+ if (is_file('analyticstracking.php')) {
	34	+ include_once 'analyticstracking.php';
	35	+ }
	36	+ ?>
37	37
38	38	<nav class="navbar navbar-default navbar-fixed-top">
39	39	<div class="container">
		@@ -53,15 +53,15 @@ discard block
		block discarded – undo
53	53	<ul class="nav navbar-nav navbar-right">
54	54
55	55	<?php
56		- if (!isset($config->menu)) {
57		- echo 'Please update variables.json file with menu values';
58		- exit();
59		- }
	56	+ if (!isset($config->menu)) {
	57	+ echo 'Please update variables.json file with menu values';
	58	+ exit();
	59	+ }
60	60
61		- foreach ($config->menu as $menu) {
62		- printMenuitems($menu, 1, $locales);
63		- }
64		- ?>
	61	+ foreach ($config->menu as $menu) {
	62	+ printMenuitems($menu, 1, $locales);
	63	+ }
	64	+ ?>
65	65
66	66	</ul>
67	67	</div> <!-- /.navbar-collapse -->
		@@ -70,21 +70,21 @@ discard block
		block discarded – undo
70	70
71	71	<div class="container">
72	72	<?php
73		- // Include the pages
74		- if (!empty($_GET['page'])) {
75		- $file = SYS_PATH.'/pages/'.$page.'.page.php';
76		-
77		- if (is_file($file)) {
78		- echo '<!-- Page :: '.$page.' -->';
79		- include $file;
80		- } else {
81		- include 'pages/home.page.php';
82		- }
83		- } else {
84		- include 'pages/home.page.php';
85		- }
86		-
87		- ?>
	73	+ // Include the pages
	74	+ if (!empty($_GET['page'])) {
	75	+ $file = SYS_PATH.'/pages/'.$page.'.page.php';
	76	+
	77	+ if (is_file($file)) {
	78	+ echo '<!-- Page :: '.$page.' -->';
	79	+ include $file;
	80	+ } else {
	81	+ include 'pages/home.page.php';
	82	+ }
	83	+ } else {
	84	+ include 'pages/home.page.php';
	85	+ }
	86	+
	87	+ ?>
88	88	</div>
89	89
90	90	<footer>
		@@ -107,8 +107,8 @@ discard block
		block discarded – undo
107	107	<script src="core/js/bootstrap.min.js"></script>
108	108
109	109	<?php // Load scripts only for page
110		- if (empty($page)) {
111		- ?>
	110	+ if (empty($page)) {
	111	+ ?>
112	112
113	113	<script src="<?php auto_ver('core/js/home.script.js'); ?>"></script>
114	114
		@@ -124,10 +124,10 @@ discard block
		block discarded – undo
124	124	updateCounter(<?= $home->teams->rocket; ?>,'.total-rocket-js');
125	125	</script>
126	126	<?php
127		- } else {
128		- switch ($page) {
129		- case 'pokemon':
130		- ?>
	127	+ } else {
	128	+ switch ($page) {
	129	+ case 'pokemon':
	130	+ ?>
131	131
132	132	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
133	133	<script src="core/js/pokemon.graph.js.php?id=<?= $pokemon_id; ?>"></script>
		@@ -141,19 +141,19 @@ discard block
		block discarded – undo
141	141	<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
142	142
143	143	<?php
144		- break;
	144	+ break;
145	145
146		- case 'pokestops':
147		- ?>
	146	+ case 'pokestops':
	147	+ ?>
148	148
149	149	<script src="<?php auto_ver('core/js/pokestops.maps.js'); ?>"></script>
150	150	<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
151	151
152	152	<?php
153		- break;
	153	+ break;
154	154
155		- case 'gym':
156		- ?>
	155	+ case 'gym':
	156	+ ?>
157	157
158	158	<script src="<?php auto_ver('core/js/gym.script.js'); ?>"></script>
159	159	<script>
		@@ -171,10 +171,10 @@ discard block
		block discarded – undo
171	171	<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization&callback=initMap&v=3"></script>
172	172
173	173	<?php
174		- break;
	174	+ break;
175	175
176		- case 'pokedex':
177		- ?>
	176	+ case 'pokedex':
	177	+ ?>
178	178
179	179	<script src="core/js/holmes.min.js"></script>
180	180	<script>
		@@ -191,56 +191,56 @@ discard block
		block discarded – undo
191	191	</script>
192	192
193	193	<?php
194		- break;
	194	+ break;
195	195
196		- case 'dashboard':
197		- ?>
	196	+ case 'dashboard':
	197	+ ?>
198	198
199	199	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
200	200	<script src="core/js/dashboard.graph.js.php"></script>
201	201
202	202	<?php
203		- break;
	203	+ break;
204	204
205		- case 'trainer':
206		- ?>
	205	+ case 'trainer':
	206	+ ?>
207	207
208	208	<script src="<?php auto_ver('core/js/trainer.content.js'); ?>"></script>
209	209	<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.min.js"></script>
210	210	<script src="core/js/trainer.graph.js.php"></script>
211	211
212	212	<?php
213		- break;
	213	+ break;
214	214
215		- case 'nests':
216		- ?>
	215	+ case 'nests':
	216	+ ?>
217	217
218	218	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
219	219	<script src="core/js/nests.maps.js.php"></script>
220	220	<script src="https://maps.googleapis.com/maps/api/js?key=<?= $config->system->GMaps_Key; ?>&libraries=visualization,geometry&callback=initMap&v=3"></script>
221	221
222	222	<?php
223		- break;
	223	+ break;
224	224
225		- case 'raids':
226		- ?>
	225	+ case 'raids':
	226	+ ?>
227	227
228	228	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.countdown/2.2.0/jquery.countdown.min.js"></script>
229	229	<script src="<?php auto_ver('core/js/raids.content.js'); ?>"></script>
230	230
231	231	<?php
232		- break;
	232	+ break;
233	233
234		- case 'gymhistory':
235		- ?>
	234	+ case 'gymhistory':
	235	+ ?>
236	236
237	237	<script src="<?php auto_ver('core/js/gymhistory.content.js'); ?>"></script>
238	238
239	239	<?php
240		- break;
241		- }
242		- }
243		- ?>
	240	+ break;
	241	+ }
	242	+ }
	243	+ ?>
244	244
245	245	</body>
246	246	</html>

		@@ -94,17 +94,17 @@ discard block
		block discarded – undo
94	94	</div>
95	95
96	96	<?php if (true === !$config->system->no_lures) {
97		- ?>
	97	+ ?>
98	98
99	99	<?php if ($config->system->captcha_support) {
100		- ?>
	100	+ ?>
101	101	<div class="row area">
102	102	<?php
103		- } else {
104		- ?>
	103	+ } else {
	104	+ ?>
105	105	<div class="row">
106	106	<?php
107		- } ?>
	107	+ } ?>
108	108
109	109	<div class="col-md-12">
110	110	<h2 class="sub-title"><strong><?= $locales->POKESTOPS; ?></strong> <?= $locales->DASHBOARD_ACTIVITY; ?></h2>
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125
126	126
127	127	<?php if ($config->system->captcha_support) {
128		- ?>
	128	+ ?>
129	129	<div class="row">
130	130
131	131	<div class="col-md-12">
		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143
144	144	</div>
145	145	<?php
146		- } ?>
	146	+ } ?>
147	147
148	148
149	149	</div>

		@@ -31,8 +31,8 @@ discard block
		block discarded – undo
31	31	</div>
32	32
33	33	<?php
34		- if (true === !$config->system->no_lures) {
35		- ?>
	34	+ if (true === !$config->system->no_lures) {
	35	+ ?>
36	36	<div class="flex-item-homepage big-data"> <!-- POKESTOPS -->
37	37	<a href="pokestops">
38	38	<img src="core/img/lure-module.png" alt="Discover the <?= $config->infos->site_name; ?> Pokéstops" width=50 class="big-icon">
		@@ -41,9 +41,9 @@ discard block
		block discarded – undo
41	41	</a>
42	42	</div>
43	43	<?php
44		- }
45		- if (true === $config->system->homepage_raids) {
46		- ?>
	44	+ }
	45	+ if (true === $config->system->homepage_raids) {
	46	+ ?>
47	47	<div class="flex-item-homepage flex-item-homepage-homepage big-data"> <!-- RAIDS -->
48	48	<a href="raids">
49	49	<img src="core/img/raid.png" alt="Discover the <?= $config->infos->site_name; ?> Raids" width=50
		@@ -53,8 +53,8 @@ discard block
		block discarded – undo
53	53	</a>
54	54	</div>
55	55	<?php
56		- }
57		- ?>
	56	+ }
	57	+ ?>
58	58
59	59	<div class="flex-item-homepage big-data">
60	60	<a href="<?= $config->homewidget->url; ?>" target="_blank">
		@@ -70,22 +70,22 @@ discard block
		block discarded – undo
70	70	<div class="col-md-12 text-center">
71	71	<h2 class="text-center sub-title">
72	72	<?php
73		- if ($config->system->recents_filter) {
74		- ?>
	73	+ if ($config->system->recents_filter) {
	74	+ ?>
75	75	<?= $locales->RECENT_MYTHIC_SPAWNS; ?>
76	76	<?php
77		- } else {
78		- ?>
	77	+ } else {
	78	+ ?>
79	79	<?= $locales->RECENT_SPAWNS; ?>
80	80	<?php
81		- } ?>
	81	+ } ?>
82	82	</h2>
83	83	<div class="last-mon-js">
84	84	<?php
85		- $timers = array();
86		- foreach ($recents as $key => $pokemon) {
87		- $id = $pokemon->id;
88		- $uid = $pokemon->uid; ?>
	85	+ $timers = array();
	86	+ foreach ($recents as $key => $pokemon) {
	87	+ $id = $pokemon->id;
	88	+ $uid = $pokemon->uid; ?>
89	89	<div class="col-md-1 col-xs-4 pokemon-single" data-pokeid="<?= $id; ?>" data-pokeuid="<?= $uid; ?>" >
90	90	<a href="pokemon/<?= $id; ?>"><img src="<?= $pokemons->pokemon->$id->img; ?>" alt="<?= $pokemons->pokemon->$id->name; ?>" class="img-responsive"></a>
91	91	<a href="pokemon/<?= $id; ?>"><p class="pkmn-name"><?= $pokemons->pokemon->$id->name; ?></p></a>
		@@ -93,10 +93,10 @@ discard block
		block discarded – undo
93	93	<small class="pokemon-timer">00:00:00</small>
94	94	</a>
95	95	<?php
96		- if ($config->system->recents_encounter_details) {
97		- if ($pokemon->encdetails->available) {
98		- if ($config->system->iv_numbers) {
99		- ?>
	96	+ if ($config->system->recents_encounter_details) {
	97	+ if ($pokemon->encdetails->available) {
	98	+ if ($config->system->iv_numbers) {
	99	+ ?>
100	100	<div class="progress" style="height: 15px; margin-bottom: 0">
101	101	<div title="Attack IV: <?= $pokemon->encdetails->attack; ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3); ?>%; line-height: 16px">
102	102	<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $pokemon->encdetails->attack; ?></span><?= $pokemon->encdetails->attack; ?>
		@@ -109,8 +109,8 @@ discard block
		block discarded – undo
109	109	</div>
110	110	</div>
111	111	<?php
112		- } else {
113		- ?>
	112	+ } else {
	113	+ ?>
114	114	<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
115	115	<div title="Attack IV: <?= $pokemon->encdetails->attack; ?>" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= ((100 / 15) * $pokemon->encdetails->attack) / 3; ?>%">
116	116	<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $pokemon->encdetails->attack; ?></span>
		@@ -123,12 +123,12 @@ discard block
		block discarded – undo
123	123	</div>
124	124	</div>
125	125	<?php
126		- } ?>
	126	+ } ?>
127	127	<small><?= $pokemon->encdetails->cp; ?></small>
128	128	<?php
129		- } else {
130		- if ($config->system->iv_numbers) {
131		- ?>
	129	+ } else {
	130	+ if ($config->system->iv_numbers) {
	131	+ ?>
132	132	<div class="progress" style="height: 15px; margin-bottom: 0">
133	133	<div title="Attack IV: not available" class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="<?= $pokemon->encdetails->attack; ?>" aria-valuemin="0" aria-valuemax="45" style="width: <?= (100 / 3); ?>%; line-height: 16px">
134	134	<span class="sr-only"><?= $locales->ATTACK; ?> IV: <?= $locales->NOT_AVAILABLE; ?></span>?
		@@ -141,24 +141,24 @@ discard block
		block discarded – undo
141	141	</div>
142	142	</div>
143	143	<?php
144		- } else {
145		- ?>
	144	+ } else {
	145	+ ?>
146	146	<div class="progress" style="height: 6px; width: 80%; margin: 5px auto 0 auto;">
147	147	<div title="IV not available" class="progress-bar" role="progressbar" style="width: 100%; background-color: rgb(210,210,210)" aria-valuenow="1" aria-valuemin="0" aria-valuemax="1">
148	148	<span class="sr-only">IV <?= $locales->NOT_AVAILABLE; ?></span>
149	149	</div>
150	150	</div>
151	151	<?php
152		- } ?>
	152	+ } ?>
153	153	<small>???</small>
154	154	<?php
155		- }
156		- } ?>
	155	+ }
	156	+ } ?>
157	157	</div>
158	158	<?php
159		- // Array with ids and countdowns to start at the end of this file
160		- $timers[$uid] = $pokemon->last_seen - time();
161		- } ?>
	159	+ // Array with ids and countdowns to start at the end of this file
	160	+ $timers[$uid] = $pokemon->last_seen - time();
	161	+ } ?>
162	162	</div>
163	163	</div>
164	164	</div>
		@@ -168,9 +168,9 @@ discard block
		block discarded – undo
168	168	<h2 class="text-center sub-title"><?= $locales->FIGHT_TITLE; ?></h2>
169	169
170	170	<?php
171		- foreach ($home->teams as $team => $total) {
172		- if ($home->teams->rocket) {
173		- ?>
	171	+ foreach ($home->teams as $team => $total) {
	172	+ if ($home->teams->rocket) {
	173	+ ?>
174	174
175	175	<div class="col-md-3 col-sm-6 col-sm-12 team">
176	176	<div class="row">
		@@ -178,34 +178,34 @@ discard block
		block discarded – undo
178	178	<p style="margin-top:0.5em;text-align:center;"><img src="core/img/<?= $team; ?>.png" alt="Team <?= $team; ?>" class="img-responsive" style="display:inline-block" width=80> <strong class="total-<?= $team; ?>-js">0</strong> <?= $locales->GYMS; ?></p>
179	179
180	180	<?php
181		- } else {
182		- ?>
	181	+ } else {
	182	+ ?>
183	183
184	184	<div class="col-md-4 col-sm-6 col-sm-12 team">
185	185	<div class="row">
186	186	<div class="col-xs-12 col-sm-12">
187	187	<?php
188		- if ('rocket' != $team) {
189		- ?>
	188	+ if ('rocket' != $team) {
	189	+ ?>
190	190	<p style="margin-top:0.5em;text-align:center;"><img src="core/img/<?= $team; ?>.png" alt="Team <?= $team; ?>" class="img-responsive" style="display:inline-block" width=80> <strong class="total-<?= $team; ?>-js">0</strong> <?= $locales->GYMS; ?></p>
191	191	<?php
192		- }
193		- } ?>
	192	+ }
	193	+ } ?>
194	194	</div>
195	195	</div>
196	196	</div>
197	197	<?php
198		- } ?>
	198	+ } ?>
199	199	</div>
200	200
201	201
202	202	<script>
203	203	document.addEventListener('DOMContentLoaded', function() {
204	204	<?php
205		- foreach (array_reverse($timers, true) as $id => $countdown) {
206		- ?>
	205	+ foreach (array_reverse($timers, true) as $id => $countdown) {
	206	+ ?>
207	207	startTimer(<?= $countdown; ?>,"<?= $id; ?>");
208	208	<?php
209		- } ?>
	209	+ } ?>
210	210	}, false);
211	211	</script>

		@@ -25,19 +25,19 @@
		block discarded – undo
25	25
26	26
27	27	<?php foreach ($pokedex as $pokemon) {
28		- ?>
	28	+ ?>
29	29
30	30	<div class="flex-item pokemon-single">
31	31
32	32	<a href="<?= $pokemon->permalink; ?>"><img src="<?= $pokemon->img; ?>" alt="<?= $pokemon->name; ?>" class="img-responsive <?php if (0 == $pokemon->spawn) {
33		- echo 'unseen';
34		- } ?> "></a>
	33	+ echo 'unseen';
	34	+ } ?> "></a>
35	35	<p class="pkmn-name"><a href="<?= $pokemon->permalink; ?>">#<?= sprintf('%03d<br>%s', $pokemon->id, $pokemon->name); ?></a></p>
36	36	<p><?php if (0 == $pokemon->spawn) {
37		- echo $locales->UNSEEN;
38		- } else {
39		- echo $pokemon->spawn_count.$locales->SEEN;
40		- } ?> </p>
	37	+ echo $locales->UNSEEN;
	38	+ } else {
	39	+ echo $pokemon->spawn_count.$locales->SEEN;
	40	+ } ?> </p>
41	41
42	42	</div>
43	43

		@@ -104,7 +104,7 @@
		block discarded – undo
104	104	<?=
105	105	$trainerName = '';
106	106	if (isset($_GET['name'])) {
107		- $trainerName = htmlspecialchars($_GET['name'], ENT_QUOTES);
	107	+ $trainerName = htmlspecialchars($_GET['name'], ENT_QUOTES);
108	108	}
109	109
110	110	?>

		@@ -69,7 +69,7 @@
		block discarded – undo
69	69	<?=
70	70	$gymName = '';
71	71	if (isset($_GET['name'])) {
72		- $gymName = htmlspecialchars($_GET['name'], ENT_QUOTES);
	72	+ $gymName = htmlspecialchars($_GET['name'], ENT_QUOTES);
73	73	}
74	74	?>
75	75	var gymName = "<?= $gymName; ?>";

		@@ -15,12 +15,12 @@ discard block
		block discarded – undo
15	15
16	16	<?php
17	17
18		- foreach ($teams as $team_name => $team) {
19		- // We do not display the team rocket result as it's not a real team
	18	+ foreach ($teams as $team_name => $team) {
	19	+ // We do not display the team rocket result as it's not a real team
20	20
21		- if ('rocket' != $team_name) {
22		- $upper_team_name = strtoupper($team_name);
23		- $lower_team_name = strtolower($team_name); ?>
	21	+ if ('rocket' != $team_name) {
	22	+ $upper_team_name = strtoupper($team_name);
	23	+ $lower_team_name = strtolower($team_name); ?>
24	24
25	25	<div class="col-md-4 col-sm-4 col-xs-12 big-data"> <!-- <?= $team_name; ?> -->
26	26
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	<p style="margin-top:1em"><?= $locales->GYMS_GUARDIANS; ?></p>
41	41
42	42	<?php foreach ($team->guardians as $guardian) {
43		- ?>
	43	+ ?>
44	44
45	45	<div class="col-xs-4 pokemon-single">
46	46	<a href="pokemon/<?= $guardian; ?>">
		@@ -50,20 +50,20 @@ discard block
		block discarded – undo
50	50
51	51
52	52	<?php
53		- } ?>
	53	+ } ?>
54	54
55	55	</div>
56	56	</div>
57	57
58	58	<?php
59		- }
60		- }?>
	59	+ }
	60	+ }?>
61	61
62	62	</div>
63	63
64	64	<!-- auto hide buttons if no url is set in variables.json -->
65	65	<?php if ($config->urls->fb_mystic \|\| $config->urls->fb_valor \|\| $config->urls->fb_instinct) {
66		- ?>
	66	+ ?>
67	67	<div class="row hidden-xs hiddem-sm area">
68	68	<div class="col-md-4">
69	69	<p align="center"><a href="<?= $config->urls->fb_mystic; ?>" target="_blank" class="btn btn-default"><i class="fa fa-facebook"></i> <?= $locales->TEAM; ?> <?= $locales->MYSTIC; ?></a></p>
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	</div>
79	79	</div>
80	80	<?php
81		- } ?>
	81	+ } ?>
82	82
83	83	<div class="row">
84	84	<div class="col-md-12">

		@@ -13,35 +13,35 @@ discard block
		block discarded – undo
13	13	<div class="row area">
14	14
15	15	<?php
16		- if (true === !$config->system->no_lures) {
17		- ?>
	16	+ if (true === !$config->system->no_lures) {
	17	+ ?>
18	18	<div class="col-md-6 col-sm-6 col-xs-12 big-data" style="border-right:1px lightgray solid;"> <!-- POKESTOPS -->
19	19	<?php
20		- } else {
21		- ?>
	20	+ } else {
	21	+ ?>
22	22	<div class="big-data"> <!-- POKESTOPS -->
23	23	<?php
24		- }
25		- ?>
	24	+ }
	25	+ ?>
26	26	<img src="core/img/pokestop.png" alt="Pokestop" width=50 class="big-icon">
27	27	<p><big><strong><?= $pokestop->total; ?></strong> <?= $locales->POKESTOPS; ?></big><br> <?= sprintf($locales->INCITY, $config->infos->city); ?></p>
28	28	</div>
29	29
30	30	<?php
31		- if (true === !$config->system->no_lures) {
32		- ?>
	31	+ if (true === !$config->system->no_lures) {
	32	+ ?>
33	33	<div class="col-md-6 col-sm-6 col-xs-12 big-data"> <!-- LURED STOPS -->
34	34	<img src="core/img/lure-module.png" alt="Lured Pokestop" width=50 class="big-icon">
35	35	<p><big><strong><?= $pokestop->lured; ?></strong> <?= $locales->LURES; ?></big><br> <?= $locales->POKESTOPS_LURES; ?></p>
36	36	</div>
37	37	<?php
38		- }
39		- ?>
	38	+ }
	39	+ ?>
40	40	</div>
41	41
42	42	<?php
43	43	if (true === !$config->system->no_lures) {
44		- ?>
	44	+ ?>
45	45	<div class="row text-center subnav">
46	46	<div class="btn-group" role="group">
47	47	<a class="btn btn-default active" id="pokestopSelector"><i
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	</div>
51	51	</div>
52	52	<?php
53		- }
	53	+ }
54	54	?>
55	55
56	56	<div class="row">

brusselopole / Worldopole

Pull Request — master (#374)

Status

Category

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch