@@ -182,16 +182,18 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | 184 | |
| 185 | -switch($installMode){ |
|
| 185 | +switch($installMode) { |
|
| 186 | 186 | case 0: |
| 187 | 187 | case 2: |
| 188 | 188 | $database_collation = isset($_POST['database_collation']) ? $_POST['database_collation'] : 'utf8_general_ci'; |
| 189 | 189 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 190 | 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']; |
|
| 191 | + if(!empty($_POST['databaseloginpassword'])) { |
|
| 192 | + $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
|
| 193 | + } |
|
| 194 | + if(!empty($_POST['databaseloginname'])) { |
|
| 195 | + $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
|
| 196 | + } |
|
| 195 | 197 | break; |
| 196 | 198 | case 1: |
| 197 | 199 | include $base_path . MGR_DIR . '/includes/config.inc.php'; |
@@ -205,7 +207,9 @@ discard block |
||
| 205 | 207 | } |
| 206 | 208 | } |
| 207 | 209 | } |
| 208 | - if (empty ($database_collation)) $database_collation = 'utf8_general_ci'; |
|
| 210 | + if (empty ($database_collation)) { |
|
| 211 | + $database_collation = 'utf8_general_ci'; |
|
| 212 | + } |
|
| 209 | 213 | |
| 210 | 214 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 211 | 215 | if (!isset ($database_connection_charset) || empty ($database_connection_charset)) { |
@@ -214,7 +218,9 @@ discard block |
||
| 214 | 218 | |
| 215 | 219 | if (!isset ($database_connection_method) || empty ($database_connection_method)) { |
| 216 | 220 | $database_connection_method = 'SET CHARACTER SET'; |
| 217 | - if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_connection_charset); |
|
| 221 | + if (function_exists('mysqli_set_charset')) { |
|
| 222 | + mysqli_set_charset($conn, $database_connection_charset); |
|
| 223 | + } |
|
| 218 | 224 | } |
| 219 | 225 | if ($database_connection_method != 'SET NAMES' && $database_connection_charset != $database_charset) { |
| 220 | 226 | $database_connection_method = 'SET NAMES'; |