|
@@ -82,9 +82,9 @@ discard block |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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 |
|
|
block discarded – undo |
|
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')) { |
Ysurac /
FlightAirMap
