@@ -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; |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | -$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0; |
|
2 | +$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0; |
|
3 | 3 | |
4 | -if( ! function_exists('getTemplates')) { |
|
4 | +if (!function_exists('getTemplates')) { |
|
5 | 5 | /** |
6 | 6 | * @param array $presets |
7 | 7 | * @return string |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | $_[] = parse($tpl, $ph); |
26 | 26 | $i++; |
27 | 27 | } |
28 | - return (0 < count($_)) ? '<h3>[%templates%]</h3>' . implode("\n", $_) : ''; |
|
28 | + return (0 < count($_)) ? '<h3>[%templates%]</h3>'.implode("\n", $_) : ''; |
|
29 | 29 | } |
30 | 30 | } |
31 | 31 | |
32 | -if( ! function_exists('getTVs')) { |
|
32 | +if (!function_exists('getTVs')) { |
|
33 | 33 | /** |
34 | 34 | * @param array $presets |
35 | 35 | * @return string |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | $_[] = parse($tpl, $ph); |
55 | 55 | $i++; |
56 | 56 | } |
57 | - return (0 < count($_)) ? '<h3>[%tvs%]</h3>' . implode("\n", $_) : ''; |
|
57 | + return (0 < count($_)) ? '<h3>[%tvs%]</h3>'.implode("\n", $_) : ''; |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | |
61 | -if( ! function_exists('getChunks')) { |
|
61 | +if (!function_exists('getChunks')) { |
|
62 | 62 | /** |
63 | 63 | * display chunks |
64 | 64 | * |
@@ -84,11 +84,11 @@ discard block |
||
84 | 84 | $_[] = parse($tpl, $ph); |
85 | 85 | $i++; |
86 | 86 | } |
87 | - return (0 < count($_)) ? '<h3>[%chunks%]</h3>' . implode("\n", $_) : ''; |
|
87 | + return (0 < count($_)) ? '<h3>[%chunks%]</h3>'.implode("\n", $_) : ''; |
|
88 | 88 | } |
89 | 89 | } |
90 | 90 | |
91 | -if( ! function_exists('getModules')) { |
|
91 | +if (!function_exists('getModules')) { |
|
92 | 92 | /** |
93 | 93 | * display modules |
94 | 94 | * |
@@ -114,11 +114,11 @@ discard block |
||
114 | 114 | $_[] = parse($tpl, $ph); |
115 | 115 | $i++; |
116 | 116 | } |
117 | - return (0 < count($_)) ? '<h3>[%modules%]</h3>' . implode("\n", $_) : ''; |
|
117 | + return (0 < count($_)) ? '<h3>[%modules%]</h3>'.implode("\n", $_) : ''; |
|
118 | 118 | } |
119 | 119 | } |
120 | 120 | |
121 | -if( ! function_exists('getPlugins')) { |
|
121 | +if (!function_exists('getPlugins')) { |
|
122 | 122 | /** |
123 | 123 | * display plugins |
124 | 124 | * |
@@ -148,11 +148,11 @@ discard block |
||
148 | 148 | $_[] = parse($tpl, $ph); |
149 | 149 | $i++; |
150 | 150 | } |
151 | - return (0 < count($_)) ? '<h3>[%plugins%]</h3>' . implode("\n", $_) : ''; |
|
151 | + return (0 < count($_)) ? '<h3>[%plugins%]</h3>'.implode("\n", $_) : ''; |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
155 | -if( ! function_exists('getSnippets')) { |
|
155 | +if (!function_exists('getSnippets')) { |
|
156 | 156 | /** |
157 | 157 | * display snippets |
158 | 158 | * |
@@ -178,23 +178,23 @@ discard block |
||
178 | 178 | $_[] = parse($tpl, $ph); |
179 | 179 | $i++; |
180 | 180 | } |
181 | - return (0 < count($_)) ? '<h3>[%snippets%]</h3>' . implode("\n", $_) : ''; |
|
181 | + return (0 < count($_)) ? '<h3>[%snippets%]</h3>'.implode("\n", $_) : ''; |
|
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'])) |
|
191 | + if (!empty($_POST['databaseloginpassword'])) |
|
192 | 192 | $_SESSION['databaseloginpassword'] = $_POST['databaseloginpassword']; |
193 | - if(!empty($_POST['databaseloginname'])) |
|
193 | + if (!empty($_POST['databaseloginname'])) |
|
194 | 194 | $_SESSION['databaseloginname'] = $_POST['databaseloginname']; |
195 | 195 | break; |
196 | 196 | case 1: |
197 | - include $base_path . MGR_DIR . '/includes/config.inc.php'; |
|
197 | + include $base_path.MGR_DIR.'/includes/config.inc.php'; |
|
198 | 198 | if (@ $conn = mysqli_connect($database_server, $database_user, $database_password)) { |
199 | 199 | if (@ mysqli_query($conn, "USE {$dbase}")) { |
200 | 200 | if (!$rs = mysqli_query($conn, "show session variables like 'collation_database'")) { |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | $ph['checked'] = isset ($_POST['installdata']) && $_POST['installdata'] == "1" ? 'checked' : ''; |
250 | 250 | |
251 | 251 | # load setup information file |
252 | -include($base_path . 'install/setup.info.php'); |
|
252 | +include($base_path.'install/setup.info.php'); |
|
253 | 253 | $ph['templates'] = getTemplates($moduleTemplates); |
254 | 254 | $ph['tvs'] = getTVs($moduleTVs); |
255 | 255 | $ph['chunks'] = getChunks($moduleChunks); |
@@ -259,6 +259,6 @@ discard block |
||
259 | 259 | |
260 | 260 | $ph['action'] = ($installMode == 1) ? 'mode' : 'connection'; |
261 | 261 | |
262 | -$tpl = file_get_contents($base_path . 'install/actions/tpl_options.html'); |
|
263 | -$content = parse($tpl,$ph); |
|
264 | -echo parse($content,$_lang,'[%','%]'); |
|
262 | +$tpl = file_get_contents($base_path.'install/actions/tpl_options.html'); |
|
263 | +$content = parse($tpl, $ph); |
|
264 | +echo parse($content, $_lang, '[%', '%]'); |
@@ -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'; |