Ysurac / FlightAirMap

country-statistics-aircraft.php

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['country'])) {
-        header('Location: '.$globalURL.'/country');
-        die();
+		header('Location: '.$globalURL.'/country');
+		die();
 }
 $Spotter = new Spotter();
 

Spacing +7 added lines, -7 removed lines

@@ -9,12 +9,12 @@ 
 $Spotter = new Spotter();
 
 $country = ucwords(str_replace("-", " ", $_GET['country']));
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 $spotter_array = $Spotter->getSpotterDataByCountry($country, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft from %s"),$country);
+	$title = sprintf(_("Most Common Aircraft from %s"), $country);
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -22,9 +22,9 @@ 
 	print '<select name="country" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_countries = $Spotter->getAllCountries();
-	foreach($all_countries as $all_country)
+	foreach ($all_countries as $all_country)
 	{
-		if($country == $all_country['country'])
+		if ($country == $all_country['country'])
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_country['country'])).'" selected="selected">'.$all_country['country'].'</option>';
 		} else {
@@ -39,7 +39,7 @@ 
 	if ($_GET['country'] != "NA")
 	{
 		print '<div class="info column">';
-		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"),$country).'</h1>';
+		print '<h1>'.sprintf(_("Airports &amp; Airlines from %s"), $country).'</h1>';
 		print '</div>';
 	} else {
 		print '<div class="alert alert-warning">'._("This special country profile shows all flights that do <u>not</u> have a country of a airline or departure/arrival airport associated with them.").'</div>';
@@ -48,7 +48,7 @@ 
 	include('country-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."),$country).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common aircrafts of flights from <strong>%s</strong>."), $country).'</p>';
 
 	$aircraft_array = $Spotter->countAllAircraftTypesByCountry($country);
 	if (!empty($aircraft_array))
@@ -62,7 +62,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($aircraft_array as $aircraft_item)
+		foreach ($aircraft_array as $aircraft_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

registration-detailed.php

Spacing +7 added lines, -7 removed lines

@@ -3,17 +3,17 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 
-if (!isset($_GET['registration'])){
+if (!isset($_GET['registration'])) {
 	header('Location: '.$globalURL.'');
 } else {
 	$Spotter = new Spotter();
 	//calculuation for the pagination
-	if(!isset($_GET['limit']))
+	if (!isset($_GET['limit']))
 	{
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];
@@ -26,8 +26,8 @@ 
 	$limit_next = $limit_end + $absolute_difference;
 	$limit_previous_1 = $limit_start - $absolute_difference;
 	$limit_previous_2 = $limit_end - $absolute_difference;
-	$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
-	$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
+	$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING);
+	$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
 	
 	$page_url = $globalURL.'/registration/'.$registration;
 	
@@ -40,7 +40,7 @@ 
 	
 	if (!empty($spotter_array))
 	{
-		$title = sprintf(_("Detailed View of aircraft with registration %s"),$registration);
+		$title = sprintf(_("Detailed View of aircraft with registration %s"), $registration);
 		require_once('header.php');
 		print '<div class="info column">';
 		print '<h1>'.$registration.' - '.$aircraft_array[0]['aircraft_name'].' ('.$aircraft_array[0]['aircraft_icao'].')</h1>';
@@ -51,7 +51,7 @@ 
 		
 		include('registration-sub-menu.php');
 		print '<div class="table column">';
-		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of aircraft with the registration <strong>%s</strong>."),$registration).'</p>';
+		print '<p>'.sprintf(_("The table below shows the detailed information of all flights of aircraft with the registration <strong>%s</strong>."), $registration).'</p>';
 
 		include('table-output.php');
 		print '<div class="pagination">';

Braces +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 		$limit_start = 0;
 		$limit_end = 25;
 		$absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];

contribute.php

Braces +13 added lines, -2 removed lines

@@ -11,10 +11,21 @@
     <p>You can contribute to <?php print $globalName; ?> if you have an ADS-B receiver.</p>
     <h3>You need to : </h3>
     <ul>
-	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) print $globalContributeLogin.'">'.$globalContributeLogin; else print 'https://login.flightairmap.fr">login.flightairmap.fr'; ?></a></li>
+	<li>Create an account on <a href="<?php if (isset($globalContributeLogin)) {
+	print $globalContributeLogin.'">'.$globalContributeLogin;
+} else {
+	print 'https://login.flightairmap.fr">login.flightairmap.fr';
+}
+?></a></li>
 	<li>Download dump1090 fork from <a href="https://github.com/Ysurac/dump1090">https://github.com/Ysurac/dump1090</a></li>
 	<li>Compile zfamup1090 with <em>make zfamup1090</em> (you need to have libcurl installed)</li>
-	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) print ' --net-zfam-addr '.$globalContributeURL; if (isset($globalContributePort)) print ' --net-zfam-port '.$globalContributePort; ?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
+	<li>Run zfamup1090 : <em>./zfamup1090 --net-zfam-user YourUsername --net-zfam-pass YourPassword<?php if (isset($globalContributeURL)) {
+	print ' --net-zfam-addr '.$globalContributeURL;
+}
+if (isset($globalContributePort)) {
+	print ' --net-zfam-port '.$globalContributePort;
+}
+?></em> (add <em>--net-bo-ipaddr ipofbeastsource --net-bo-port portofbeastsource</em> if needed, default to 127.0.0.1 and 30005)</li>
     </ul>
 </div>
 <?php

ident-statistics-manufacturer.php

Spacing +6 added lines, -6 removed lines

@@ -7,13 +7,13 @@ 
         die();
 }
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByIdent($ident,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByIdent($ident, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Aircraft Manufacturer of %s"),$spotter_array[0]['ident']);
+	$title = sprintf(_("Most Common Aircraft Manufacturer of %s"), $spotter_array[0]['ident']);
 	require_once('header.php');
 	print '<div class="info column">';
 	print '<h1>'.$spotter_array[0]['ident'].'</h1>';
@@ -24,7 +24,7 @@ 
 	include('ident-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Aircraft Manufacturer").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights using the ident/callsign <strong>%s</strong>."),$spotter_array[0]['ident']).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common Aircraft Manufacturer of flights using the ident/callsign <strong>%s</strong>."), $spotter_array[0]['ident']).'</p>';
 
 	$manufacturers_array = $Spotter->countAllAircraftManufacturerByIdent($ident);
 	if (!empty($manufacturers_array))
@@ -39,7 +39,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($manufacturers_array as $manufacturer_item)
+		foreach ($manufacturers_array as $manufacturer_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

Indentation +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 if (!isset($_GET['ident'])) {
-        header('Location: '.$globalURL.'/ident');
-        die();
+		header('Location: '.$globalURL.'/ident');
+		die();
 }
 $Spotter = new Spotter();
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);

footer.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 	<?php
 	    if (isset($sql_time)) {
 	?>
-	<i><?php echo _("Page generated in").' '.round($sql_time+$page_time,2); ?>s (<?php print round($page_time,2); ?>ms PHP - <?php print round($sql_time,2); ?>ms SQL)</i>
+	<i><?php echo _("Page generated in").' '.round($sql_time + $page_time, 2); ?>s (<?php print round($page_time, 2); ?>ms PHP - <?php print round($sql_time, 2); ?>ms SQL)</i>
 	<br />
 	<?php
 	    }

Indentation +2 added lines, -2 removed lines

@@ -6,12 +6,12 @@
 </div>
 <footer class="container">
 	<?php
-	    if (isset($sql_time)) {
+		if (isset($sql_time)) {
 	?>
 	<i><?php echo _("Page generated in").' '.round($sql_time+$page_time,2); ?>s (<?php print round($page_time,2); ?>ms PHP - <?php print round($sql_time,2); ?>ms SQL)</i>
 	<br />
 	<?php
-	    }
+		}
 	?>
 	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.fr/" target="_blank">Get source code</a></span>
 </footer>

Braces +8 added lines, -3 removed lines

@@ -1,8 +1,10 @@ 
 </section>
 <div class="pub onmap">
 <?php
-	if (isset($globalPub)) print $globalPub;
-?>
+	if (isset($globalPub)) {
+		print $globalPub;
+	}
+	?>
 </div>
 <footer class="container">
 	<?php
@@ -13,7 +15,10 @@ 
 	<?php
 	    }
 	?>
-	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) print $globalURL; ?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.fr/" target="_blank">Get source code</a></span>
+	<span>Developed in Barrie by <a href="http://mtru.nz/" target="_blank">Mario Trunz</a> & at <a href="http://www.zugaina.com" target="_blank">Zugaina</a> by Ycarus</span> - <span><a href="<?php if (isset($globalURL)) {
+	print $globalURL;
+}
+?>/about#source">Source &amp; Credits</a></span> - <span><a href="https://www.flightairmap.fr/" target="_blank">Get source code</a></span>
 </footer>
 
 <div class="notifications bottom-left"></div>

tools-acars.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 $page_url = $globalURL.'/tools-acars';
 
-$message = filter_input(INPUT_POST,'acars_message',FILTER_SANITIZE_STRING);
+$message = filter_input(INPUT_POST, 'acars_message', FILTER_SANITIZE_STRING);
 
 print '<div class="info column">';
 print '<h1>'._("Parse ACARS messages").'</h1>';

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 print '<fieldset class="form-group">';
 print '<label for="acars_message">'._("ACARS Message").'</label>';
 print '<textarea class="form-control" name="acars_message" id="acars_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';

install/install_db.php

Indentation +25 added lines, -25 removed lines

@@ -1,30 +1,30 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.create_db.php');
-    echo "Create and import all tables...";
-    create_db::import_all_db('../db/');
-    echo "Done !\n";
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.create_db.php');
+	echo "Create and import all tables...";
+	create_db::import_all_db('../db/');
+	echo "Done !\n";
 
-    require('class.update_db.php');
-    echo "Populate all tables...\n";
-    update_db::update_all();
-    echo "\nInstall waypoints...(VERY slow!)";
-    update_db::update_waypoints();
-    echo "Done !\n";
-    echo "Install airspace...";
-    update_db::update_airspace();
-    echo "Done !\n";
-    echo 'All is now installed ! Thanks'."\n";
-    if ($globalSBS1) {
-            echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
-    if ($globalACARS) {
-            echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
-    }
+	require('class.update_db.php');
+	echo "Populate all tables...\n";
+	update_db::update_all();
+	echo "\nInstall waypoints...(VERY slow!)";
+	update_db::update_waypoints();
+	echo "Done !\n";
+	echo "Install airspace...";
+	update_db::update_airspace();
+	echo "Done !\n";
+	echo 'All is now installed ! Thanks'."\n";
+	if ($globalSBS1) {
+			echo 'You need to run cron-sbs.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
+	if ($globalACARS) {
+			echo 'You need to run cron-acars.php as a daemon. You can use init script in the install/init directory.'."\n";
+	}
     
 ?>
\ No newline at end of file

install/populate_ivao.php

Indentation +12 added lines, -12 removed lines

@@ -1,23 +1,23 @@
 #!/usr/bin/php
 <?php
-    require_once('../require/settings.php');
-    if ($globalInstalled) {
-        echo '$globalInstalled must be set to FALSE in require/settings.php';
-        exit;
-    }
-    require('class.update_db.php');
-    if (isset($globalVATSIM) && $globalVATSIM) {
+	require_once('../require/settings.php');
+	if ($globalInstalled) {
+		echo '$globalInstalled must be set to FALSE in require/settings.php';
+		exit;
+	}
+	require('class.update_db.php');
+	if (isset($globalVATSIM) && $globalVATSIM) {
 	echo "Install VATSIM airlines...";
 	update_db::update_vatsim();
 	echo "Done !\n";
-    }
-    if (isset($globalIVAO) && $globalIVAO) {
+	}
+	if (isset($globalIVAO) && $globalIVAO) {
 	if (!file_exists('tmp/ivae_feb2013.zip')) {
 		echo "You have to download the file ivae_feb2013.zip from https://www.ivao.aero/softdev/mirrors.asp?software=IvAeDataUp and put it in install/tmp directory";
 	} else {
-	        echo "Install IVAO airlines and logos...";
-	        update_db::update_IVAO();
+			echo "Install IVAO airlines and logos...";
+			update_db::update_IVAO();
 		echo "Done !\n";
 	}
-    }
+	}
 ?>
\ No newline at end of file

install/install-action.php

Indentation +34 added lines, -34 removed lines

@@ -68,27 +68,27 @@ 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
 		if ($globalDBdriver == 'mysql') {
-		    $error .= create_db::import_all_db('../db/');
+			$error .= create_db::import_all_db('../db/');
 		} elseif ($globalDBdriver == 'pgsql') {
-		    $error .= create_db::import_all_db('../db/pgsql/');
+			$error .= create_db::import_all_db('../db/pgsql/');
 		}
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
 		} else {
-		    $_SESSION['install'] = 'sources';
-		    $_SESSION['next'] = 'Insert data in source table';
+			$_SESSION['install'] = 'sources';
+			$_SESSION['next'] = 'Insert data in source table';
 		}
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
-                        $_SESSION['error'] = $error;
+						$_SESSION['error'] = $error;
 		}
 		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
@@ -118,25 +118,25 @@ 
 	$error .= update_db::update_countries();
 	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
-	    $_SESSION['install'] = 'notam';
-	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'notam';
+		$_SESSION['next'] = 'Populate NOTAM table with externals data';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
-	    $_SESSION['install'] = 'owner';
-	    $_SESSION['next'] = 'Populate owner table with externals data';
-	    unset($_SESSION['owner']);
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'owner';
+		$_SESSION['next'] = 'Populate owner table with externals data';
+		unset($_SESSION['owner']);
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	} else {
-	    $_SESSION['install'] = 'sources';
-	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
-	    print json_encode($result);
+		$_SESSION['install'] = 'sources';
+		$_SESSION['next'] = 'Insert data in source table';
+		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -152,7 +152,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -185,7 +185,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -200,7 +200,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -229,7 +229,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -244,7 +244,7 @@ 
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
-                $error = 'The directory <i>install/tmp</i> must be writable.';
+				$error = 'The directory <i>install/tmp</i> must be writable.';
 		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
@@ -296,17 +296,17 @@ 
 */
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'sources') {
 	if (isset($_SESSION['sources']) && count($_SESSION['sources']) > 0) {
-	    $sources = $_SESSION['sources'];
+		$sources = $_SESSION['sources'];
 
-	    include_once('../require/class.Source.php');
-	    $globalDebug = FALSE;
-	    $Source = new Source();
-	    $Source->deleteAllLocation();
-	    foreach ($sources as $src) {
+		include_once('../require/class.Source.php');
+		$globalDebug = FALSE;
+		$Source = new Source();
+		$Source->deleteAllLocation();
+		foreach ($sources as $src) {
 		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
-	    }
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
-	    unset($_SESSION['sources']);
+		}
+		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+		unset($_SESSION['sources']);
 	}
 	/*
 	if (isset($globalIVAO) && $globalIVAO) $_SESSION['install'] = 'ivao';

Braces +23 added lines, -9 removed lines

@@ -164,15 +164,21 @@ 
 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data';
+			}
 		} elseif (isset($globalVATSIM) && $globalVATSIM) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert VATSIM data';
 		} elseif (isset($globalIVAO) && $globalIVAO) {
 			$_SESSION['install'] = 'vatsim';
-			if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-			else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			if (file_exists('tmp/ivae_feb2013.zip')) {
+				$_SESSION['next'] = 'Insert IVAO data';
+			} else {
+				$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+			}
 		} elseif (isset($globalphpVMS) && $globalphpVMS) {
 			$_SESSION['install'] = 'vatsim';
 			$_SESSION['next'] = 'Insert phpVMS data';
@@ -303,7 +309,9 @@ 
 	    $Source = new Source();
 	    $Source->deleteAllLocation();
 	    foreach ($sources as $src) {
-		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		if (isset($src['latitude']) && $src['latitude'] != '') {
+			$Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		}
 	    }
 	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
 	    unset($_SESSION['sources']);
@@ -314,15 +322,21 @@ 
 	*/
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data';
+		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert VATSIM data';
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		$_SESSION['install'] = 'vatsim';
-		if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data';
-		else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		if (file_exists('tmp/ivae_feb2013.zip')) {
+			$_SESSION['next'] = 'Insert IVAO data';
+		} else {
+			$_SESSION['next'] = 'Insert VATSIM data (IVAO not found)';
+		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
 		$_SESSION['install'] = 'vatsim';
 		$_SESSION['next'] = 'Insert phpVMS data';

Spacing +46 added lines, -46 removed lines

@@ -68,15 +68,15 @@ 
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') {
 	$dbroot = $_SESSION['database_root'];
 	$dbrootpass = $_SESSION['database_rootpass'];
-	$error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost);
+	$error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost);
 	sleep(5);
 	if ($error != '') {
 		$_SESSION['error'] = $error;
 	}
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Create database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Create database'));
 	$_SESSION['install'] = 'database_import';
 	$_SESSION['next'] = 'Create and import tables';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') {
 	if (update_schema::check_version(false) == '0') {
@@ -88,7 +88,7 @@ 
 		if ($error != '') {
                         $_SESSION['error'] = $error;
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables'));
 		if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) {
 			$_SESSION['install'] = 'populate';
 			$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B';
@@ -96,84 +96,84 @@ 
 		    $_SESSION['install'] = 'sources';
 		    $_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		$error .= update_schema::check_version(true);
 		if ($error != '') {
                         $_SESSION['error'] = $error;
 		}
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_waypoints();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database'));
 
 	$_SESSION['install'] = 'airspace';
 	$_SESSION['next'] = 'Populate airspace table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_airspace_fam();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database'));
 	$_SESSION['install'] = 'countries';
 	$_SESSION['next'] = 'Populate countries table';
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') {
 	include_once('class.update_db.php');
 	$error .= update_db::update_countries();
-	$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database'));
+	$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database'));
 	if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 	    $_SESSION['install'] = 'notam';
 	    $_SESSION['next'] = 'Populate NOTAM table with externals data';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 	    $_SESSION['install'] = 'owner';
 	    $_SESSION['next'] = 'Populate owner table with externals data';
 	    unset($_SESSION['owner']);
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	} else {
 	    $_SESSION['install'] = 'sources';
 	    $_SESSION['next'] = 'Insert data in source table';
-	    $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	    $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	    print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_ModeS_fam();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B'));
 
 		$_SESSION['install'] = 'populate_flarm';
 		$_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		//$error .= update_db::update_ModeS_flarm();
 		$error .= update_db::update_ModeS_ogn();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM'));
 
 		if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 			$_SESSION['install'] = 'vatsim';
@@ -193,34 +193,34 @@ 
 			$_SESSION['install'] = 'routes';
 			$_SESSION['next'] = 'Populate routes table with externals data';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_routes();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data'));
 		$_SESSION['install'] = 'translation';
 		$_SESSION['next'] = 'Populate translation table with externals data';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error .= update_db::update_translation();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data'));
 
 		if ($_SESSION['waypoints'] == 1) {
 			$_SESSION['install'] = 'waypoints';
@@ -237,48 +237,48 @@ 
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
 		}
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		$error = update_db::update_owner_fam();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data'));
 		$_SESSION['install'] = 'sources';
 		$_SESSION['next'] = 'Insert data in source table';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	}
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') {
 	if (!is_writable('tmp')) {
                 $error = 'The directory <i>install/tmp</i> must be writable.';
-		$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+		$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 		print json_encode($result);
 	} else {
 		include_once('class.update_db.php');
 		$globalDebug = FALSE;
 		if (isset($globalNOTAMSource) && $globalNOTAMSource != '') {
 			$error .= update_db::update_notam();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data'));
 		} else {
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)'));
 		}
 		if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) {
 			$_SESSION['install'] = 'owner';
 			$_SESSION['next'] = 'Populate owner table';
 			unset($_SESSION['owner']);
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		} else {
 			$_SESSION['install'] = 'sources';
 			$_SESSION['next'] = 'Insert data in source table';
-			$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+			$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 			print json_encode($result);
 		}
 	}
@@ -316,9 +316,9 @@ 
 	    $Source = new Source();
 	    $Source->deleteAllLocation();
 	    foreach ($sources as $src) {
-		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png');
+		if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png');
 	    }
-	    $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table'));
+	    $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table'));
 	    unset($_SESSION['sources']);
 	}
 	/*
@@ -343,7 +343,7 @@ 
 		$_SESSION['install'] = 'finish';
 		$_SESSION['next'] = 'finish';
 	}
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') {
 	include_once('../install/class.create_db.php');
@@ -353,36 +353,36 @@ 
 	if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 		}
 	} elseif (isset($globalVATSIM) && $globalVATSIM) {
 		$error .= update_db::update_vatsim();
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data'));
 	} elseif (isset($globalIVAO) && $globalIVAO) {
 		if (file_exists('tmp/ivae_feb2013.zip')) {
 			$error .= update_db::update_IVAO();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data'));
 		} else {
 			$error .= update_db::update_vatsim();
-			$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)'));
+			$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)'));
 		}
 	} elseif (isset($globalphpVMS) && $globalphpVMS) {
-		$_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data'));
+		$_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data'));
 	}
 	//$_SESSION['install'] = 'routes';
 	//$_SESSION['next'] = 'Populate routes table with externals data';
 	$_SESSION['install'] = 'finish';
 	$_SESSION['next'] = 'finish';
 
-	$result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']);
+	$result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']);
 	print json_encode($result);
 } else {
 	//unset($_SESSION['install']);
 	$_SESSION['error'] = 'Unknwon task : '.$_SESSION['install'];
-	$result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish');
+	$result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish');
 	print json_encode($result);
 }
 ?>
\ No newline at end of file