SimpleMachines /
SMF2.1
| @@ 5237-5264 (lines=28) @@ | ||
| 5234 | $settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n"; |
|
| 5235 | ||
| 5236 | // go line by line and see whats changing |
|
| 5237 | for ($i = 0, $n = count($settingsArray); $i < $n; $i++) |
|
| 5238 | { |
|
| 5239 | // Don't trim or bother with it if it's not a variable. |
|
| 5240 | if (substr($settingsArray[$i], 0, 1) != '$') |
|
| 5241 | continue; |
|
| 5242 | ||
| 5243 | $settingsArray[$i] = trim($settingsArray[$i]) . "\n"; |
|
| 5244 | ||
| 5245 | // Look through the variables to set.... |
|
| 5246 | foreach ($config_vars as $var => $val) |
|
| 5247 | { |
|
| 5248 | // be sure someone is not updating db_last_error this with a group |
|
| 5249 | if ($var === 'db_last_error') |
|
| 5250 | unset($config_vars[$var]); |
|
| 5251 | elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0) |
|
| 5252 | { |
|
| 5253 | $comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#'); |
|
| 5254 | $settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n"; |
|
| 5255 | ||
| 5256 | // This one's been 'used', so to speak. |
|
| 5257 | unset($config_vars[$var]); |
|
| 5258 | } |
|
| 5259 | } |
|
| 5260 | ||
| 5261 | // End of the file ... maybe |
|
| 5262 | if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') |
|
| 5263 | $end = $i; |
|
| 5264 | } |
|
| 5265 | ||
| 5266 | // This should never happen, but apparently it is happening. |
|
| 5267 | if (empty($end) || $end < 10) |
|
| @@ 323-353 (lines=31) @@ | ||
| 320 | $settingsArray[$k] = strtr($dummy, array("\r" => '')) . "\n"; |
|
| 321 | ||
| 322 | // go line by line and see whats changing |
|
| 323 | for ($i = 0, $n = count($settingsArray); $i < $n; $i++) |
|
| 324 | { |
|
| 325 | // Don't trim or bother with it if it's not a variable. |
|
| 326 | if (substr($settingsArray[$i], 0, 1) != '$') |
|
| 327 | continue; |
|
| 328 | ||
| 329 | $settingsArray[$i] = trim($settingsArray[$i]) . "\n"; |
|
| 330 | ||
| 331 | // Look through the variables to set.... |
|
| 332 | foreach ($config_vars as $var => $val) |
|
| 333 | { |
|
| 334 | // be sure someone is not updating db_last_error this with a group |
|
| 335 | if ($var === 'db_last_error') |
|
| 336 | { |
|
| 337 | updateDbLastError($val); |
|
| 338 | unset($config_vars[$var]); |
|
| 339 | } |
|
| 340 | elseif (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0) |
|
| 341 | { |
|
| 342 | $comment = strstr(substr($settingsArray[$i], strpos($settingsArray[$i], ';')), '#'); |
|
| 343 | $settingsArray[$i] = '$' . $var . ' = ' . $val . ';' . ($comment == '' ? '' : "\t\t" . rtrim($comment)) . "\n"; |
|
| 344 | ||
| 345 | // This one's been 'used', so to speak. |
|
| 346 | unset($config_vars[$var]); |
|
| 347 | } |
|
| 348 | } |
|
| 349 | ||
| 350 | // End of the file ... maybe |
|
| 351 | if (substr(trim($settingsArray[$i]), 0, 2) == '?' . '>') |
|
| 352 | $end = $i; |
|
| 353 | } |
|
| 354 | ||
| 355 | // This should never happen, but apparently it is happening. |
|
| 356 | if (empty($end) || $end < 10) |
|
