Ysurac /
FlightAirMap
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 83 | 83 | if (update_schema::check_version(false) == '0') { |
| 84 | 84 | if ($globalDBdriver == 'mysql') { |
| 85 | - $error .= create_db::import_all_db('../db/'); |
|
| 85 | + $error .= create_db::import_all_db('../db/'); |
|
| 86 | 86 | } elseif ($globalDBdriver == 'pgsql') { |
| 87 | - $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 87 | + $error .= create_db::import_all_db('../db/pgsql/'); |
|
| 88 | 88 | } |
| 89 | 89 | if ($error != '') { |
| 90 | 90 | $_SESSION['error'] = $error; |
@@ -94,8 +94,8 @@ discard block |
||
| 94 | 94 | $_SESSION['install'] = 'populate'; |
| 95 | 95 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
| 96 | 96 | } else { |
| 97 | - $_SESSION['install'] = 'sources'; |
|
| 98 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 97 | + $_SESSION['install'] = 'sources'; |
|
| 98 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 99 | 99 | } |
| 100 | 100 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
| 101 | 101 | print json_encode($result); |
@@ -143,21 +143,21 @@ discard block |
||
| 143 | 143 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 144 | 144 | } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
| 145 | 145 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 146 | - $_SESSION['install'] = 'notam'; |
|
| 147 | - $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 148 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 149 | - print json_encode($result); |
|
| 146 | + $_SESSION['install'] = 'notam'; |
|
| 147 | + $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
| 148 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 149 | + print json_encode($result); |
|
| 150 | 150 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 151 | - $_SESSION['install'] = 'owner'; |
|
| 152 | - $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 153 | - unset($_SESSION['owner']); |
|
| 154 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | - print json_encode($result); |
|
| 151 | + $_SESSION['install'] = 'owner'; |
|
| 152 | + $_SESSION['next'] = 'Populate owner table with externals data'; |
|
| 153 | + unset($_SESSION['owner']); |
|
| 154 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 155 | + print json_encode($result); |
|
| 156 | 156 | } else { |
| 157 | - $_SESSION['install'] = 'sources'; |
|
| 158 | - $_SESSION['next'] = 'Insert data in source table'; |
|
| 159 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 160 | - print json_encode($result); |
|
| 157 | + $_SESSION['install'] = 'sources'; |
|
| 158 | + $_SESSION['next'] = 'Insert data in source table'; |
|
| 159 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 160 | + print json_encode($result); |
|
| 161 | 161 | } |
| 162 | 162 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 163 | 163 | if (!is_writable('tmp')) { |
@@ -69,15 +69,15 @@ discard block |
||
| 69 | 69 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_create') { |
| 70 | 70 | $dbroot = $_SESSION['database_root']; |
| 71 | 71 | $dbrootpass = $_SESSION['database_rootpass']; |
| 72 | - $error .= create_db::create_database($dbroot,$dbrootpass,$globalDBuser,$globalDBpass,$globalDBname,$globalDBdriver,$globalDBhost); |
|
| 72 | + $error .= create_db::create_database($dbroot, $dbrootpass, $globalDBuser, $globalDBpass, $globalDBname, $globalDBdriver, $globalDBhost); |
|
| 73 | 73 | sleep(5); |
| 74 | 74 | if ($error != '') { |
| 75 | 75 | $_SESSION['error'] = $error; |
| 76 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
|
| 77 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 76 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create database')); |
|
| 77 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create database')); |
|
| 78 | 78 | $_SESSION['install'] = 'database_import'; |
| 79 | 79 | $_SESSION['next'] = 'Create and import tables'; |
| 80 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 80 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 81 | 81 | print json_encode($result); |
| 82 | 82 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'database_import') { |
| 83 | 83 | if (update_schema::check_version(false) == '0') { |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | } |
| 89 | 89 | if ($error != '') { |
| 90 | 90 | $_SESSION['error'] = $error; |
| 91 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
|
| 92 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 91 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Create and import tables')); |
|
| 92 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Create and import tables')); |
|
| 93 | 93 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 94 | 94 | $_SESSION['install'] = 'populate'; |
| 95 | 95 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -97,17 +97,17 @@ discard block |
||
| 97 | 97 | $_SESSION['install'] = 'sources'; |
| 98 | 98 | $_SESSION['next'] = 'Insert data in source table'; |
| 99 | 99 | } |
| 100 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 100 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 101 | 101 | print json_encode($result); |
| 102 | 102 | } else { |
| 103 | 103 | $error .= update_schema::check_version(true); |
| 104 | 104 | if ($error != '') { |
| 105 | 105 | $_SESSION['error'] = $error; |
| 106 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
|
| 107 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 106 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Update schema if needed')); |
|
| 107 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Update schema if needed')); |
|
| 108 | 108 | $_SESSION['install'] = 'sources'; |
| 109 | 109 | $_SESSION['next'] = 'Insert data in source table'; |
| 110 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 110 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 111 | 111 | print json_encode($result); |
| 112 | 112 | } |
| 113 | 113 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'waypoints') { |
@@ -116,11 +116,11 @@ discard block |
||
| 116 | 116 | $error .= update_db::update_waypoints(); |
| 117 | 117 | if ($error != '') { |
| 118 | 118 | $_SESSION['error'] = $error; |
| 119 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
|
| 120 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 119 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate waypoints database')); |
|
| 120 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate waypoints database')); |
|
| 121 | 121 | $_SESSION['install'] = 'airspace'; |
| 122 | 122 | $_SESSION['next'] = 'Populate airspace table'; |
| 123 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 123 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 124 | 124 | print json_encode($result); |
| 125 | 125 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'airspace') { |
| 126 | 126 | include_once('class.update_db.php'); |
@@ -128,11 +128,11 @@ discard block |
||
| 128 | 128 | $error .= update_db::update_airspace_fam(); |
| 129 | 129 | if ($error != '') { |
| 130 | 130 | $_SESSION['error'] = $error; |
| 131 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
|
| 132 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 131 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate airspace database')); |
|
| 132 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate airspace database')); |
|
| 133 | 133 | $_SESSION['install'] = 'countries'; |
| 134 | 134 | $_SESSION['next'] = 'Populate countries table'; |
| 135 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 135 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 136 | 136 | print json_encode($result); |
| 137 | 137 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'countries') { |
| 138 | 138 | include_once('class.update_db.php'); |
@@ -140,31 +140,31 @@ discard block |
||
| 140 | 140 | $error .= update_db::update_countries(); |
| 141 | 141 | if ($error != '') { |
| 142 | 142 | $_SESSION['error'] = $error; |
| 143 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
|
| 144 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 143 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate countries database')); |
|
| 144 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate countries database')); |
|
| 145 | 145 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 146 | 146 | $_SESSION['install'] = 'notam'; |
| 147 | 147 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
| 148 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 148 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 149 | 149 | print json_encode($result); |
| 150 | 150 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 151 | 151 | $_SESSION['install'] = 'owner'; |
| 152 | 152 | $_SESSION['next'] = 'Populate owner table with externals data'; |
| 153 | 153 | unset($_SESSION['owner']); |
| 154 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 154 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 155 | 155 | print json_encode($result); |
| 156 | 156 | } else { |
| 157 | 157 | $_SESSION['install'] = 'sources'; |
| 158 | 158 | $_SESSION['next'] = 'Insert data in source table'; |
| 159 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 159 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 160 | 160 | print json_encode($result); |
| 161 | 161 | } |
| 162 | 162 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
| 163 | 163 | if (!is_writable('tmp')) { |
| 164 | 164 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 165 | 165 | $_SESSION['error'] = $error; |
| 166 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 167 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 166 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 167 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 168 | 168 | print json_encode($result); |
| 169 | 169 | } else { |
| 170 | 170 | include_once('class.update_db.php'); |
@@ -172,19 +172,19 @@ discard block |
||
| 172 | 172 | $error .= update_db::update_ModeS_fam(); |
| 173 | 173 | if ($error != '') { |
| 174 | 174 | $_SESSION['error'] = $error; |
| 175 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 176 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 175 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 176 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 177 | 177 | $_SESSION['install'] = 'populate_flarm'; |
| 178 | 178 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 179 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 179 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 180 | 180 | print json_encode($result); |
| 181 | 181 | } |
| 182 | 182 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate_flarm') { |
| 183 | 183 | if (!is_writable('tmp')) { |
| 184 | 184 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 185 | 185 | $_SESSION['error'] = $error; |
| 186 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 187 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 186 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 187 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 188 | 188 | print json_encode($result); |
| 189 | 189 | } else { |
| 190 | 190 | include_once('class.update_db.php'); |
@@ -193,8 +193,8 @@ discard block |
||
| 193 | 193 | $error .= update_db::update_ModeS_ogn(); |
| 194 | 194 | if ($error != '') { |
| 195 | 195 | $_SESSION['error'] = $error; |
| 196 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 196 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 197 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 198 | 198 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 199 | 199 | $_SESSION['install'] = 'vatsim'; |
| 200 | 200 | if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
@@ -213,15 +213,15 @@ discard block |
||
| 213 | 213 | $_SESSION['install'] = 'routes'; |
| 214 | 214 | $_SESSION['next'] = 'Populate routes table with externals data'; |
| 215 | 215 | } |
| 216 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 216 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 217 | 217 | print json_encode($result); |
| 218 | 218 | } |
| 219 | 219 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'routes') { |
| 220 | 220 | if (!is_writable('tmp')) { |
| 221 | 221 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 222 | 222 | $_SESSION['error'] = $error; |
| 223 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 224 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 223 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 224 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 225 | 225 | print json_encode($result); |
| 226 | 226 | } else { |
| 227 | 227 | include_once('class.update_db.php'); |
@@ -229,19 +229,19 @@ discard block |
||
| 229 | 229 | $error .= update_db::update_routes_fam(); |
| 230 | 230 | if ($error != '') { |
| 231 | 231 | $_SESSION['error'] = $error; |
| 232 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
|
| 233 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 232 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate routes table with externals data')); |
|
| 233 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate routes table with externals data')); |
|
| 234 | 234 | $_SESSION['install'] = 'translation'; |
| 235 | 235 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 236 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 236 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 237 | 237 | print json_encode($result); |
| 238 | 238 | } |
| 239 | 239 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'translation') { |
| 240 | 240 | if (!is_writable('tmp')) { |
| 241 | 241 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 242 | 242 | $_SESSION['error'] = $error; |
| 243 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 244 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 243 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 244 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 245 | 245 | print json_encode($result); |
| 246 | 246 | } else { |
| 247 | 247 | include_once('class.update_db.php'); |
@@ -249,8 +249,8 @@ discard block |
||
| 249 | 249 | $error .= update_db::update_translation_fam(); |
| 250 | 250 | if ($error != '') { |
| 251 | 251 | $_SESSION['error'] = $error; |
| 252 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
|
| 253 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 252 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate translation table with externals data')); |
|
| 253 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate translation table with externals data')); |
|
| 254 | 254 | if ($_SESSION['waypoints'] == 1) { |
| 255 | 255 | $_SESSION['install'] = 'waypoints'; |
| 256 | 256 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -266,15 +266,15 @@ discard block |
||
| 266 | 266 | $_SESSION['install'] = 'sources'; |
| 267 | 267 | $_SESSION['next'] = 'Insert data in source table'; |
| 268 | 268 | } |
| 269 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 269 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 270 | 270 | print json_encode($result); |
| 271 | 271 | } |
| 272 | 272 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'owner') { |
| 273 | 273 | if (!is_writable('tmp')) { |
| 274 | 274 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 275 | 275 | $_SESSION['error'] = $error; |
| 276 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 277 | - $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 276 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 277 | + $result = array('error' => $error, 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 278 | 278 | print json_encode($result); |
| 279 | 279 | } else { |
| 280 | 280 | include_once('class.update_db.php'); |
@@ -282,19 +282,19 @@ discard block |
||
| 282 | 282 | $error = update_db::update_owner_fam(); |
| 283 | 283 | if ($error != '') { |
| 284 | 284 | $_SESSION['error'] = $error; |
| 285 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
|
| 286 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 285 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate owner table with externals data')); |
|
| 286 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate owner table with externals data')); |
|
| 287 | 287 | $_SESSION['install'] = 'sources'; |
| 288 | 288 | $_SESSION['next'] = 'Insert data in source table'; |
| 289 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 289 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 290 | 290 | print json_encode($result); |
| 291 | 291 | } |
| 292 | 292 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'notam') { |
| 293 | 293 | if (!is_writable('tmp')) { |
| 294 | 294 | $error = 'The directory <i>install/tmp</i> must be writable.'; |
| 295 | 295 | $_SESSION['error'] = $error; |
| 296 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 297 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 296 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 297 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 298 | 298 | print json_encode($result); |
| 299 | 299 | } else { |
| 300 | 300 | include_once('class.update_db.php'); |
@@ -303,24 +303,24 @@ discard block |
||
| 303 | 303 | $error .= update_db::update_notam(); |
| 304 | 304 | if ($error != '') { |
| 305 | 305 | $_SESSION['error'] = $error; |
| 306 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
|
| 307 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 306 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data')); |
|
| 307 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data')); |
|
| 308 | 308 | } else { |
| 309 | 309 | if ($error != '') { |
| 310 | 310 | $_SESSION['error'] = $error; |
| 311 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
|
| 312 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 311 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Populate notam table with externals data (no source defined)')); |
|
| 312 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Populate notam table with externals data (no source defined)')); |
|
| 313 | 313 | } |
| 314 | 314 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 315 | 315 | $_SESSION['install'] = 'owner'; |
| 316 | 316 | $_SESSION['next'] = 'Populate owner table'; |
| 317 | 317 | unset($_SESSION['owner']); |
| 318 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 318 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 319 | 319 | print json_encode($result); |
| 320 | 320 | } else { |
| 321 | 321 | $_SESSION['install'] = 'sources'; |
| 322 | 322 | $_SESSION['next'] = 'Insert data in source table'; |
| 323 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 323 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 324 | 324 | print json_encode($result); |
| 325 | 325 | } |
| 326 | 326 | } |
@@ -357,9 +357,9 @@ discard block |
||
| 357 | 357 | $Source = new Source(); |
| 358 | 358 | $Source->deleteAllLocation(); |
| 359 | 359 | foreach ($sources as $src) { |
| 360 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 360 | + if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'], $src['latitude'], $src['longitude'], $src['altitude'], $src['city'], $src['country'], $src['source'], 'antenna.png'); |
|
| 361 | 361 | } |
| 362 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
|
| 362 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert data in source table')); |
|
| 363 | 363 | unset($_SESSION['sources']); |
| 364 | 364 | } |
| 365 | 365 | /* |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | $_SESSION['install'] = 'finish'; |
| 385 | 385 | $_SESSION['next'] = 'finish'; |
| 386 | 386 | } |
| 387 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 387 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 388 | 388 | print json_encode($result); |
| 389 | 389 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'vatsim') { |
| 390 | 390 | include_once('../install/class.create_db.php'); |
@@ -396,48 +396,48 @@ discard block |
||
| 396 | 396 | $error .= update_db::update_IVAO(); |
| 397 | 397 | if ($error != '') { |
| 398 | 398 | $_SESSION['error'] = $error; |
| 399 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 400 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 399 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 400 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 401 | 401 | } else { |
| 402 | 402 | $error .= update_db::update_vatsim(); |
| 403 | 403 | if ($error != '') { |
| 404 | 404 | $_SESSION['error'] = $error; |
| 405 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 406 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 405 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 406 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 407 | 407 | } |
| 408 | 408 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 409 | 409 | $error .= update_db::update_vatsim(); |
| 410 | 410 | if ($error != '') { |
| 411 | 411 | $_SESSION['error'] = $error; |
| 412 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
|
| 413 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 412 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data')); |
|
| 413 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data')); |
|
| 414 | 414 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 415 | 415 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 416 | 416 | $error .= update_db::update_IVAO(); |
| 417 | 417 | if ($error != '') { |
| 418 | 418 | $_SESSION['error'] = $error; |
| 419 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
|
| 420 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 419 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert IVAO data')); |
|
| 420 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert IVAO data')); |
|
| 421 | 421 | } else { |
| 422 | 422 | $error .= update_db::update_vatsim(); |
| 423 | 423 | if ($error != '') { |
| 424 | 424 | $_SESSION['error'] = $error; |
| 425 | - $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
|
| 426 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 425 | + $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'], array('Insert VATSIM data (IVAO not found)')); |
|
| 426 | + } else $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert VATSIM data (IVAO not found)')); |
|
| 427 | 427 | } |
| 428 | 428 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 429 | - $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
|
| 429 | + $_SESSION['done'] = array_merge($_SESSION['done'], array('Insert phpVMS data')); |
|
| 430 | 430 | } |
| 431 | 431 | //$_SESSION['install'] = 'routes'; |
| 432 | 432 | //$_SESSION['next'] = 'Populate routes table with externals data'; |
| 433 | 433 | $_SESSION['install'] = 'finish'; |
| 434 | 434 | $_SESSION['next'] = 'finish'; |
| 435 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
| 435 | + $result = array('error' => $error, 'errorlst' => $_SESSION['errorlst'], 'done' => $_SESSION['done'], 'next' => $_SESSION['next'], 'install' => $_SESSION['install']); |
|
| 436 | 436 | print json_encode($result); |
| 437 | 437 | } else { |
| 438 | 438 | //unset($_SESSION['install']); |
| 439 | 439 | $_SESSION['error'] = 'Unknwon task : '.$_SESSION['install']; |
| 440 | - $result = array('error' => 'Unknwon task : '.$_SESSION['install'],'done' => $_SESSION['done'],'next' => 'finish','install' => 'finish'); |
|
| 440 | + $result = array('error' => 'Unknwon task : '.$_SESSION['install'], 'done' => $_SESSION['done'], 'next' => 'finish', 'install' => 'finish'); |
|
| 441 | 441 | print json_encode($result); |
| 442 | 442 | } |
| 443 | 443 | ?> |
| 444 | 444 | \ No newline at end of file |
@@ -74,7 +74,9 @@ discard block |
||
| 74 | 74 | if ($error != '') { |
| 75 | 75 | $_SESSION['error'] = $error; |
| 76 | 76 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create database')); |
| 77 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 77 | + } else { |
|
| 78 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create database')); |
|
| 79 | + } |
|
| 78 | 80 | $_SESSION['install'] = 'database_import'; |
| 79 | 81 | $_SESSION['next'] = 'Create and import tables'; |
| 80 | 82 | $result = array('error' => $error,'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -89,7 +91,9 @@ discard block |
||
| 89 | 91 | if ($error != '') { |
| 90 | 92 | $_SESSION['error'] = $error; |
| 91 | 93 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Create and import tables')); |
| 92 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 94 | + } else { |
|
| 95 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Create and import tables')); |
|
| 96 | + } |
|
| 93 | 97 | if ($globalSBS1 && !$globalIVAO && !$globalVATSIM && !$globalphpVMS) { |
| 94 | 98 | $_SESSION['install'] = 'populate'; |
| 95 | 99 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
@@ -104,7 +108,9 @@ discard block |
||
| 104 | 108 | if ($error != '') { |
| 105 | 109 | $_SESSION['error'] = $error; |
| 106 | 110 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Update schema if needed')); |
| 107 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 111 | + } else { |
|
| 112 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Update schema if needed')); |
|
| 113 | + } |
|
| 108 | 114 | $_SESSION['install'] = 'sources'; |
| 109 | 115 | $_SESSION['next'] = 'Insert data in source table'; |
| 110 | 116 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -117,7 +123,9 @@ discard block |
||
| 117 | 123 | if ($error != '') { |
| 118 | 124 | $_SESSION['error'] = $error; |
| 119 | 125 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate waypoints database')); |
| 120 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 126 | + } else { |
|
| 127 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate waypoints database')); |
|
| 128 | + } |
|
| 121 | 129 | $_SESSION['install'] = 'airspace'; |
| 122 | 130 | $_SESSION['next'] = 'Populate airspace table'; |
| 123 | 131 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -129,7 +137,9 @@ discard block |
||
| 129 | 137 | if ($error != '') { |
| 130 | 138 | $_SESSION['error'] = $error; |
| 131 | 139 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate airspace database')); |
| 132 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 140 | + } else { |
|
| 141 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate airspace database')); |
|
| 142 | + } |
|
| 133 | 143 | $_SESSION['install'] = 'countries'; |
| 134 | 144 | $_SESSION['next'] = 'Populate countries table'; |
| 135 | 145 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -141,7 +151,9 @@ discard block |
||
| 141 | 151 | if ($error != '') { |
| 142 | 152 | $_SESSION['error'] = $error; |
| 143 | 153 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
| 144 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 154 | + } else { |
|
| 155 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
| 156 | + } |
|
| 145 | 157 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
| 146 | 158 | $_SESSION['install'] = 'notam'; |
| 147 | 159 | $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
@@ -173,7 +185,9 @@ discard block |
||
| 173 | 185 | if ($error != '') { |
| 174 | 186 | $_SESSION['error'] = $error; |
| 175 | 187 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for ADS-B')); |
| 176 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 188 | + } else { |
|
| 189 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for ADS-B')); |
|
| 190 | + } |
|
| 177 | 191 | $_SESSION['install'] = 'populate_flarm'; |
| 178 | 192 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for FLARM'; |
| 179 | 193 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -194,18 +208,26 @@ discard block |
||
| 194 | 208 | if ($error != '') { |
| 195 | 209 | $_SESSION['error'] = $error; |
| 196 | 210 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate aircraft_modes table with externals data for FLARM')); |
| 197 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 211 | + } else { |
|
| 212 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate aircraft_modes table with externals data for FLARM')); |
|
| 213 | + } |
|
| 198 | 214 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 199 | 215 | $_SESSION['install'] = 'vatsim'; |
| 200 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 201 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 216 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 217 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 218 | + } else { |
|
| 219 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 220 | + } |
|
| 202 | 221 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 203 | 222 | $_SESSION['install'] = 'vatsim'; |
| 204 | 223 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 205 | 224 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 206 | 225 | $_SESSION['install'] = 'vatsim'; |
| 207 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 208 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 226 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 227 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 228 | + } else { |
|
| 229 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 230 | + } |
|
| 209 | 231 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 210 | 232 | $_SESSION['install'] = 'vatsim'; |
| 211 | 233 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -230,7 +252,9 @@ discard block |
||
| 230 | 252 | if ($error != '') { |
| 231 | 253 | $_SESSION['error'] = $error; |
| 232 | 254 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate routes table with externals data')); |
| 233 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 255 | + } else { |
|
| 256 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate routes table with externals data')); |
|
| 257 | + } |
|
| 234 | 258 | $_SESSION['install'] = 'translation'; |
| 235 | 259 | $_SESSION['next'] = 'Populate translation table with externals data'; |
| 236 | 260 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -250,7 +274,9 @@ discard block |
||
| 250 | 274 | if ($error != '') { |
| 251 | 275 | $_SESSION['error'] = $error; |
| 252 | 276 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate translation table with externals data')); |
| 253 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 277 | + } else { |
|
| 278 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate translation table with externals data')); |
|
| 279 | + } |
|
| 254 | 280 | if ($_SESSION['waypoints'] == 1) { |
| 255 | 281 | $_SESSION['install'] = 'waypoints'; |
| 256 | 282 | $_SESSION['next'] = 'Populate waypoints table'; |
@@ -283,7 +309,9 @@ discard block |
||
| 283 | 309 | if ($error != '') { |
| 284 | 310 | $_SESSION['error'] = $error; |
| 285 | 311 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate owner table with externals data')); |
| 286 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 312 | + } else { |
|
| 313 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate owner table with externals data')); |
|
| 314 | + } |
|
| 287 | 315 | $_SESSION['install'] = 'sources'; |
| 288 | 316 | $_SESSION['next'] = 'Insert data in source table'; |
| 289 | 317 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
@@ -304,12 +332,16 @@ discard block |
||
| 304 | 332 | if ($error != '') { |
| 305 | 333 | $_SESSION['error'] = $error; |
| 306 | 334 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data')); |
| 307 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 335 | + } else { |
|
| 336 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data')); |
|
| 337 | + } |
|
| 308 | 338 | } else { |
| 309 | 339 | if ($error != '') { |
| 310 | 340 | $_SESSION['error'] = $error; |
| 311 | 341 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate notam table with externals data (no source defined)')); |
| 312 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 342 | + } else { |
|
| 343 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate notam table with externals data (no source defined)')); |
|
| 344 | + } |
|
| 313 | 345 | } |
| 314 | 346 | if (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
| 315 | 347 | $_SESSION['install'] = 'owner'; |
@@ -357,7 +389,9 @@ discard block |
||
| 357 | 389 | $Source = new Source(); |
| 358 | 390 | $Source->deleteAllLocation(); |
| 359 | 391 | foreach ($sources as $src) { |
| 360 | - if (isset($src['latitude']) && $src['latitude'] != '') $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 392 | + if (isset($src['latitude']) && $src['latitude'] != '') { |
|
| 393 | + $Source->addLocation($src['name'],$src['latitude'],$src['longitude'],$src['altitude'],$src['city'],$src['country'],$src['source'],'antenna.png'); |
|
| 394 | + } |
|
| 361 | 395 | } |
| 362 | 396 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert data in source table')); |
| 363 | 397 | unset($_SESSION['sources']); |
@@ -368,15 +402,21 @@ discard block |
||
| 368 | 402 | */ |
| 369 | 403 | if ((isset($globalVATSIM) && $globalVATSIM) && (isset($globalIVAO) && $globalIVAO)) { |
| 370 | 404 | $_SESSION['install'] = 'vatsim'; |
| 371 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 372 | - else $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 405 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 406 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 407 | + } else { |
|
| 408 | + $_SESSION['next'] = 'Insert VATSIM data'; |
|
| 409 | + } |
|
| 373 | 410 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 374 | 411 | $_SESSION['install'] = 'vatsim'; |
| 375 | 412 | $_SESSION['next'] = 'Insert VATSIM data'; |
| 376 | 413 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 377 | 414 | $_SESSION['install'] = 'vatsim'; |
| 378 | - if (file_exists('tmp/ivae_feb2013.zip')) $_SESSION['next'] = 'Insert IVAO data'; |
|
| 379 | - else $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 415 | + if (file_exists('tmp/ivae_feb2013.zip')) { |
|
| 416 | + $_SESSION['next'] = 'Insert IVAO data'; |
|
| 417 | + } else { |
|
| 418 | + $_SESSION['next'] = 'Insert VATSIM data (IVAO not found)'; |
|
| 419 | + } |
|
| 380 | 420 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 381 | 421 | $_SESSION['install'] = 'vatsim'; |
| 382 | 422 | $_SESSION['next'] = 'Insert phpVMS data'; |
@@ -397,33 +437,43 @@ discard block |
||
| 397 | 437 | if ($error != '') { |
| 398 | 438 | $_SESSION['error'] = $error; |
| 399 | 439 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 400 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 440 | + } else { |
|
| 441 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 442 | + } |
|
| 401 | 443 | } else { |
| 402 | 444 | $error .= update_db::update_vatsim(); |
| 403 | 445 | if ($error != '') { |
| 404 | 446 | $_SESSION['error'] = $error; |
| 405 | 447 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 406 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 448 | + } else { |
|
| 449 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 450 | + } |
|
| 407 | 451 | } |
| 408 | 452 | } elseif (isset($globalVATSIM) && $globalVATSIM) { |
| 409 | 453 | $error .= update_db::update_vatsim(); |
| 410 | 454 | if ($error != '') { |
| 411 | 455 | $_SESSION['error'] = $error; |
| 412 | 456 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data')); |
| 413 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 457 | + } else { |
|
| 458 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data')); |
|
| 459 | + } |
|
| 414 | 460 | } elseif (isset($globalIVAO) && $globalIVAO) { |
| 415 | 461 | if (file_exists('tmp/ivae_feb2013.zip')) { |
| 416 | 462 | $error .= update_db::update_IVAO(); |
| 417 | 463 | if ($error != '') { |
| 418 | 464 | $_SESSION['error'] = $error; |
| 419 | 465 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert IVAO data')); |
| 420 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 466 | + } else { |
|
| 467 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert IVAO data')); |
|
| 468 | + } |
|
| 421 | 469 | } else { |
| 422 | 470 | $error .= update_db::update_vatsim(); |
| 423 | 471 | if ($error != '') { |
| 424 | 472 | $_SESSION['error'] = $error; |
| 425 | 473 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Insert VATSIM data (IVAO not found)')); |
| 426 | - } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 474 | + } else { |
|
| 475 | + $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert VATSIM data (IVAO not found)')); |
|
| 476 | + } |
|
| 427 | 477 | } |
| 428 | 478 | } elseif (isset($globalphpVMS) && $globalphpVMS) { |
| 429 | 479 | $_SESSION['done'] = array_merge($_SESSION['done'],array('Insert phpVMS data')); |
