@@ -84,9 +84,9 @@ discard block |
||
84 | 84 | if ($check_version == '0') { |
85 | 85 | |
86 | 86 | if ($globalDBdriver == 'mysql') { |
87 | - $error .= create_db::import_all_db('../db/'); |
|
87 | + $error .= create_db::import_all_db('../db/'); |
|
88 | 88 | } elseif ($globalDBdriver == 'pgsql') { |
89 | - $error .= create_db::import_all_db('../db/pgsql/'); |
|
89 | + $error .= create_db::import_all_db('../db/pgsql/'); |
|
90 | 90 | } |
91 | 91 | if ($error != '') { |
92 | 92 | $_SESSION['error'] = $error; |
@@ -96,8 +96,8 @@ discard block |
||
96 | 96 | $_SESSION['install'] = 'populate'; |
97 | 97 | $_SESSION['next'] = 'Populate aircraft_modes table with externals data for ADS-B'; |
98 | 98 | } else { |
99 | - $_SESSION['install'] = 'sources'; |
|
100 | - $_SESSION['next'] = 'Insert data in source table'; |
|
99 | + $_SESSION['install'] = 'sources'; |
|
100 | + $_SESSION['next'] = 'Insert data in source table'; |
|
101 | 101 | } |
102 | 102 | $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
103 | 103 | print json_encode($result); |
@@ -149,21 +149,21 @@ discard block |
||
149 | 149 | $_SESSION['errorlst'] = array_merge($_SESSION['errorlst'],array('Populate countries database')); |
150 | 150 | } else $_SESSION['done'] = array_merge($_SESSION['done'],array('Populate countries database')); |
151 | 151 | if (isset($globalNOTAM) && $globalNOTAM && isset($globalNOTAMSource) && $globalNOTAMSource != '') { |
152 | - $_SESSION['install'] = 'notam'; |
|
153 | - $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
154 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
155 | - print json_encode($result); |
|
152 | + $_SESSION['install'] = 'notam'; |
|
153 | + $_SESSION['next'] = 'Populate NOTAM table with externals data'; |
|
154 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
155 | + print json_encode($result); |
|
156 | 156 | } elseif (isset($_SESSION['owner']) && $_SESSION['owner'] == 1) { |
157 | - $_SESSION['install'] = 'owner'; |
|
158 | - $_SESSION['next'] = 'Populate owner table with externals data'; |
|
159 | - unset($_SESSION['owner']); |
|
160 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
161 | - print json_encode($result); |
|
157 | + $_SESSION['install'] = 'owner'; |
|
158 | + $_SESSION['next'] = 'Populate owner table with externals data'; |
|
159 | + unset($_SESSION['owner']); |
|
160 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
161 | + print json_encode($result); |
|
162 | 162 | } else { |
163 | - $_SESSION['install'] = 'sources'; |
|
164 | - $_SESSION['next'] = 'Insert data in source table'; |
|
165 | - $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
166 | - print json_encode($result); |
|
163 | + $_SESSION['install'] = 'sources'; |
|
164 | + $_SESSION['next'] = 'Insert data in source table'; |
|
165 | + $result = array('error' => $error,'errorlst' => $_SESSION['errorlst'],'done' => $_SESSION['done'],'next' => $_SESSION['next'],'install' => $_SESSION['install']); |
|
166 | + print json_encode($result); |
|
167 | 167 | } |
168 | 168 | } else if (isset($_SESSION['install']) && $_SESSION['install'] == 'populate') { |
169 | 169 | if (!is_writable('tmp')) { |