Completed
Push — master ( 486240...8fac34 )
by Yannick
08:18
created
install/index.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	}
86 86
 	print '</ul>You <strong>must</strong> add these modules.</div>';
87 87
 	require('../footer.php');
88
-        exit;
88
+		exit;
89 89
 }
90 90
 
91 91
 if (!isset($_SESSION['install']) && !isset($_POST['dbtype']) && (count($error) == 0)) {
@@ -291,14 +291,14 @@  discard block
 block discarded – undo
291 291
 					<th>Source name</th>
292 292
 				</tr>
293 293
 		<?php
294
-		    require_once(dirname(__FILE__).'/../require/class.Connection.php');
295
-		    $Connection = new Connection();
296
-		    if ($Connection->db != NULL) {
294
+			require_once(dirname(__FILE__).'/../require/class.Connection.php');
295
+			$Connection = new Connection();
296
+			if ($Connection->db != NULL) {
297 297
 			if ($Connection->tableExists('source_location')) {
298
-			    require_once(dirname(__FILE__).'/../require/class.Source.php');
299
-			    $Source = new Source();
300
-			    $alllocations = $Source->getAllLocationInfo();
301
-			    foreach ($alllocations as $location) {
298
+				require_once(dirname(__FILE__).'/../require/class.Source.php');
299
+				$Source = new Source();
300
+				$alllocations = $Source->getAllLocationInfo();
301
+				foreach ($alllocations as $location) {
302 302
 		?>
303 303
 				<tr>
304 304
 	    				<input type="hidden" name="source_id[]" value="<?php print $location['id']; ?>" />
@@ -312,9 +312,9 @@  discard block
 block discarded – undo
312 312
 				</tr>
313 313
 		
314 314
 		<?php
315
-			    }
315
+				}
316
+			}
316 317
 			}
317
-		    }
318 318
 		?>
319 319
 
320 320
 				<tr>
@@ -499,12 +499,12 @@  discard block
 block discarded – undo
499 499
 ?>
500 500
 							<tr>
501 501
 								<?php
502
-								    if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
502
+									if (filter_var($source['host'],FILTER_VALIDATE_URL)) {
503 503
 								?>
504 504
 								<td><input type="text" name="host[]" id="host" value="<?php print $source['host']; ?>" /></td>
505 505
 								<td><input type="number" name="port[]" id="port" value="<?php print $source['port']; ?>" /></td>
506 506
 								<?php
507
-								    } else {
507
+									} else {
508 508
 									$hostport = explode(':',$source['host']);
509 509
 									if (isset($hostport[1])) {
510 510
 										$host = $hostport[0];
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
 								<td><input type="text" name="host[]" id="host" value="<?php print $host; ?>" /></td>
518 518
 								<td><input type="number" name="port[]" id="port" value="<?php print $port; ?>" /></td>
519 519
 								<?php
520
-								    }
520
+									}
521 521
 								?>
522 522
 								<td>
523 523
 									<select name="format[]" id="format">
@@ -792,7 +792,7 @@  discard block
 block discarded – undo
792 792
 			<br />
793 793
 			<p>
794 794
 			<?php 
795
-			    if (extension_loaded('gd') && function_exists('gd_info')) {
795
+				if (extension_loaded('gd') && function_exists('gd_info')) {
796 796
 			?>
797 797
 				<label for="aircrafticoncolor">Color of aircraft icon on map</label>
798 798
 				<input type="color" name="aircrafticoncolor" id="aircrafticoncolor" value="#<?php if (isset($globalAircraftIconColor)) echo $globalAircraftIconColor; else echo '1a3151'; ?>" />
@@ -802,11 +802,11 @@  discard block
 block discarded – undo
802 802
 				<b>The directory cache is not writable, aircraft icon will not be cached</b>
803 803
 			<?php
804 804
 				}
805
-			    } else {
805
+				} else {
806 806
 			?>
807 807
 				<b>PHP GD is not installed, you can t change color of aircraft icon on map</b>
808 808
 			<?php
809
-			    }
809
+				}
810 810
 			?>
811 811
 			</p>
812 812
 			<br />
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 	</p>
826 826
 <?php
827 827
 	require('../footer.php');
828
-        exit;
828
+		exit;
829 829
 }
830 830
 	
831 831
 $settings = array();
@@ -915,8 +915,8 @@  discard block
 block discarded – undo
915 915
 	
916 916
 	$sources = array();
917 917
 	foreach ($source_name as $keys => $name) {
918
-	    if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
919
-	    else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
918
+		if (isset($source_id[$keys])) $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'id' => $source_id[$keys],'source' => $source_ref[$keys]);
919
+		else $sources[] = array('name' => $name,'latitude' => $source_latitude[$keys],'longitude' => $source_longitude[$keys],'altitude' => $source_altitude[$keys],'city' => $source_city[$keys],'country' => $source_country[$keys],'source' => $source_ref[$keys]);
920 920
 	}
921 921
 	if (count($sources) > 0) $_SESSION['sources'] = $sources;
922 922
 
@@ -1168,14 +1168,14 @@  discard block
 block discarded – undo
1168 1168
 
1169 1169
 	// Set some defaults values...
1170 1170
 	if (!isset($globalAircraftImageSources)) {
1171
-	    $globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1172
-	    $settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1171
+		$globalAircraftImageSources = array('ivaomtl','wikimedia','airportdata','deviantart','flickr','bing','jetphotos','planepictures','planespotters');
1172
+		$settings = array_merge($settings,array('globalAircraftImageSources' => $globalAircraftImageSources));
1173 1173
 	}
1174 1174
 
1175 1175
 	if (!isset($globalSchedulesSources)) {
1176
-	    $globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1177
-    	    $settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1178
-    	}
1176
+		$globalSchedulesSources = array('flightmapper','costtotravel','flightradar24','flightaware');
1177
+			$settings = array_merge($settings,array('globalSchedulesSources' => $globalSchedulesSources));
1178
+		}
1179 1179
 
1180 1180
 	$settings = array_merge($settings,array('globalInstalled' => 'TRUE'));
1181 1181
 
@@ -1215,13 +1215,13 @@  discard block
 block discarded – undo
1215 1215
 	print '<ul><div id="step">';
1216 1216
 	$pop = false;
1217 1217
 	foreach ($_SESSION['done'] as $done) {
1218
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1219
-	    if ($done == 'Create database') $pop = true;
1220
-	    if ($_SESSION['install'] == 'database_create') $pop = true;
1218
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1219
+		if ($done == 'Create database') $pop = true;
1220
+		if ($_SESSION['install'] == 'database_create') $pop = true;
1221 1221
 	}
1222 1222
 	if ($pop) {
1223
-	    sleep(5);
1224
-	    print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
1223
+		sleep(5);
1224
+		print '<li>Create and import tables....<img src="../images/loading.gif" /></li>';
1225 1225
 	} else print '<li>Update schema if needed....<img src="../images/loading.gif" /></li>';
1226 1226
 	print '</div></ul>';
1227 1227
 	print '<div id="error"></div>';
@@ -1284,7 +1284,7 @@  discard block
 block discarded – undo
1284 1284
 	unset($_COOKIE['install']);
1285 1285
 	print '<div class="info column"><ul>';
1286 1286
 	foreach ($_SESSION['done'] as $done) {
1287
-	    print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1287
+		print '<li>'.$done.'....<strong>SUCCESS</strong></li>';
1288 1288
 	}
1289 1289
 	print '<li>Reloading page to check all is now ok....<strong>SUCCESS</strong></li>';
1290 1290
 	print '</ul></div>';
Please login to merge, or discard this patch.