@@ -183,53 +183,53 @@ |
||
183 | 183 | } |
184 | 184 | |
185 | 185 | switch($installMode){ |
186 | - case 0: |
|
187 | - case 2: |
|
188 | - $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci'; |
|
189 | - $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
|
190 | - $_POST['database_connection_charset'] = $database_charset; |
|
191 | - if(!empty($_POST['databaseloginpassword'])) |
|
192 | - $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
|
193 | - if(!empty($_POST['databaseloginname'])) |
|
194 | - $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
|
195 | - break; |
|
196 | - case 1: |
|
197 | - include $base_path . MGR_DIR . '/includes/config.inc.php'; |
|
198 | - if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) { |
|
199 | - if (@ mysqli_query($conn, "USE {$dbase}")) { |
|
200 | - if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) { |
|
201 | - $rs = mysqli_query($conn, "show session variables like 'collation_server'"); |
|
202 | - } |
|
203 | - if ($rs && $collation = mysqli_fetch_row($rs)) { |
|
204 | - $database_collation = trim($collation[1]); |
|
186 | + case 0: |
|
187 | + case 2: |
|
188 | + $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci'; |
|
189 | + $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
|
190 | + $_POST['database_connection_charset'] = $database_charset; |
|
191 | + if(!empty($_POST['databaseloginpassword'])) |
|
192 | + $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
|
193 | + if(!empty($_POST['databaseloginname'])) |
|
194 | + $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
|
195 | + break; |
|
196 | + case 1: |
|
197 | + include $base_path . MGR_DIR . '/includes/config.inc.php'; |
|
198 | + if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) { |
|
199 | + if (@ mysqli_query($conn, "USE {$dbase}")) { |
|
200 | + if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) { |
|
201 | + $rs = mysqli_query($conn, "show session variables like 'collation_server'"); |
|
202 | + } |
|
203 | + if ($rs && $collation = mysqli_fetch_row($rs)) { |
|
204 | + $database_collation = trim($collation[1]); |
|
205 | + } |
|
205 | 206 | } |
206 | 207 | } |
207 | - } |
|
208 | - if (empty ($database_collation)) $database_collation = 'utf8_general_ci'; |
|
208 | + if (empty ($database_collation)) $database_collation = 'utf8_general_ci'; |
|
209 | 209 | |
210 | - $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
|
211 | - if (!isset ($database_connection_charset) || empty ($database_connection_charset)) { |
|
212 | - $database_connection_charset = $database_charset; |
|
213 | - } |
|
210 | + $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
|
211 | + if (!isset ($database_connection_charset) || empty ($database_connection_charset)) { |
|
212 | + $database_connection_charset = $database_charset; |
|
213 | + } |
|
214 | 214 | |
215 | - if (!isset ($database_connection_method) || empty ($database_connection_method)) { |
|
216 | - $database_connection_method = 'SET CHARACTER SET'; |
|
217 | - if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset); |
|
218 | - } |
|
219 | - if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) { |
|
220 | - $database_connection_method = 'SET NAMES'; |
|
221 | - } |
|
215 | + if (!isset ($database_connection_method) || empty ($database_connection_method)) { |
|
216 | + $database_connection_method = 'SET CHARACTER SET'; |
|
217 | + if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset); |
|
218 | + } |
|
219 | + if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) { |
|
220 | + $database_connection_method = 'SET NAMES'; |
|
221 | + } |
|
222 | 222 | |
223 | - $_POST['database_name'] = $dbase; |
|
224 | - $_POST['tableprefix'] = $table_prefix; |
|
225 | - $_POST['database_connection_charset'] = $database_connection_charset; |
|
226 | - $_POST['database_connection_method'] = $database_connection_method; |
|
227 | - $_POST['databasehost'] = $database_server; |
|
228 | - $_SESSION['databaseloginname'] = $database_user; |
|
229 | - $_SESSION['databaseloginpassword'] = $database_password; |
|
230 | - break; |
|
231 | - default: |
|
232 | - throw new Exception('installmode is undefined'); |
|
223 | + $_POST['database_name'] = $dbase; |
|
224 | + $_POST['tableprefix'] = $table_prefix; |
|
225 | + $_POST['database_connection_charset'] = $database_connection_charset; |
|
226 | + $_POST['database_connection_method'] = $database_connection_method; |
|
227 | + $_POST['databasehost'] = $database_server; |
|
228 | + $_SESSION['databaseloginname'] = $database_user; |
|
229 | + $_SESSION['databaseloginpassword'] = $database_password; |
|
230 | + break; |
|
231 | + default: |
|
232 | + throw new Exception('installmode is undefined'); |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | $ph['install_language'] = $install_language; |