|
@@ -86,9 +86,9 @@ discard block |
|
|
block discarded – undo |
|
86
|
86
|
if ($check_version == '0') { |
|
87
|
87
|
|
|
88
|
88
|
if ($globalDBdriver == 'mysql') { |
|
89
|
|
- $error .= create_db::import_all_db('../db/'); |
|
|
89
|
+ $error .= create_db::import_all_db('../db/'); |
|
90
|
90
|
} elseif ($globalDBdriver == 'pgsql') { |
|
91
|
|
- $error .= create_db::import_all_db('../db/pgsql/'); |
|
|
91
|
+ $error .= create_db::import_all_db('../db/pgsql/'); |
|
92
|
92
|
} |
|
93
|
93
|
if ($error != '') { |
|
94
|
94
|
$_SESSION['error'] = $error; |
|
@@ -98,8 +98,8 @@ discard block |
|
|
block discarded – undo |
|
98
|
98
|
$_SESSION['install'] = 'populate'; |
|
99
|
99
|
$_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
|
100
|
100
|
} else { |
|
101
|
|
- $_SESSION['install'] = 'sources'; |
|
102
|
|
- $_SESSION['next'] = 'Insert data in source table'; |
|
|
101
|
+ $_SESSION['install'] = 'sources'; |
|
|
102
|
+ $_SESSION['next'] = 'Insert data in source table'; |
|
103
|
103
|
} |
|
104
|
104
|
$result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
105
|
105
|
print json_encode($result); |
|
@@ -156,10 +156,10 @@ discard block |
|
|
block discarded – undo |
|
156
|
156
|
$_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
|
157
|
157
|
} else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
|
158
|
158
|
if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
|
159
|
|
- $_SESSION['install'] = 'notam'; |
|
160
|
|
- $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
161
|
|
- $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
162
|
|
- print json_encode($result); |
|
|
159
|
+ $_SESSION['install'] = 'notam'; |
|
|
160
|
+ $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
|
161
|
+ $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
|
162
|
+ print json_encode($result); |
|
163
|
163
|
/* |
|
164
|
164
|
} elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
|
165
|
165
|
$_SESSION['install'] = 'owner'; |
|
@@ -169,10 +169,10 @@ discard block |
|
|
block discarded – undo |
|
169
|
169
|
print json_encode($result); |
|
170
|
170
|
*/ |
|
171
|
171
|
} else { |
|
172
|
|
- $_SESSION['install'] = 'sources'; |
|
173
|
|
- $_SESSION['next'] = 'Insert data in source table'; |
|
174
|
|
- $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
175
|
|
- print json_encode($result); |
|
|
172
|
+ $_SESSION['install'] = 'sources'; |
|
|
173
|
+ $_SESSION['next'] = 'Insert data in source table'; |
|
|
174
|
+ $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
|
175
|
+ print json_encode($result); |
|
176
|
176
|
} |
|
177
|
177
|
} else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
|
178
|
178
|
if (!is_writable('tmp')) { |