albertlast /
SMF2.1
@@ -148,8 +148,8 @@ discard block |
||
| 148 | 148 | </thead> |
| 149 | 149 | <tbody>'; |
| 150 | 150 | |
| 151 | - foreach ($context['membergroups'] as $membergroup) |
|
| 152 | - echo ' |
|
| 151 | + foreach ($context['membergroups'] as $membergroup) { |
|
| 152 | + echo ' |
|
| 153 | 153 | <tr class="windowbg"> |
| 154 | 154 | <td>', $membergroup['name'], '</td> |
| 155 | 155 | <td class="centercol"> |
@@ -159,6 +159,7 @@ discard block |
||
| 159 | 159 | ', $membergroup['can_be_additional'] ? '<input type="checkbox" name="membergroups[2][]" value="' . $membergroup['id'] . '" checked class="input_check">' : '', ' |
| 160 | 160 | </td> |
| 161 | 161 | </tr>'; |
| 162 | + } |
|
| 162 | 163 | |
| 163 | 164 | echo ' |
| 164 | 165 | <tr class="windowbg"> |
@@ -185,8 +186,8 @@ discard block |
||
| 185 | 186 | </thead> |
| 186 | 187 | <tbody>'; |
| 187 | 188 | |
| 188 | - foreach ($context['postgroups'] as $postgroup) |
|
| 189 | - echo ' |
|
| 189 | + foreach ($context['postgroups'] as $postgroup) { |
|
| 190 | + echo ' |
|
| 190 | 191 | <tr class="windowbg"> |
| 191 | 192 | <td> |
| 192 | 193 | ', $postgroup['name'], ' |
@@ -195,6 +196,7 @@ discard block |
||
| 195 | 196 | <input type="checkbox" name="postgroups[]" value="', $postgroup['id'], '" checked class="input_check"> |
| 196 | 197 | </td> |
| 197 | 198 | </tr>'; |
| 199 | + } |
|
| 198 | 200 | |
| 199 | 201 | echo ' |
| 200 | 202 | <tr class="windowbg"> |
@@ -24,8 +24,8 @@ |
||
| 24 | 24 | <meta charset="', $context['character_set'], '"> |
| 25 | 25 | <meta name="robots" content="noindex"> |
| 26 | 26 | <title>', $context['page_title'], '</title> |
| 27 | - <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'] ,'"> |
|
| 28 | - <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'] ,'"></script> |
|
| 27 | + <link rel="stylesheet" href="', $settings['theme_url'], '/css/index', $context['theme_variant'], '.css', $modSettings['browser_cache'], '"> |
|
| 28 | + <script src="', $settings['default_theme_url'], '/scripts/script.js', $modSettings['browser_cache'], '"></script> |
|
| 29 | 29 | </head> |
| 30 | 30 | <body id="likes_popup"> |
| 31 | 31 | <div class="windowbg"> |
@@ -176,7 +176,7 @@ |
||
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | function show_msg() { |
| 179 | - $(\'#progress_msg\').html(\'<div><img src="', $settings['actual_images_url'], '/loading_sm.gif" alt="', $txt['ajax_in_progress'], '" width="35" height="35"> ', $txt['attachment_transfer_progress'] , '<\/div>\'); |
|
| 179 | + $(\'#progress_msg\').html(\'<div><img src="', $settings['actual_images_url'], '/loading_sm.gif" alt="', $txt['ajax_in_progress'], '" width="35" height="35"> ', $txt['attachment_transfer_progress'], '<\/div>\'); |
|
| 180 | 180 | show_progress(); |
| 181 | 181 | } |
| 182 | 182 | |
@@ -116,9 +116,10 @@ discard block |
||
| 116 | 116 | <h3 class="catbg">', $txt['attachment_transfer'], '</h3> |
| 117 | 117 | </div>'; |
| 118 | 118 | |
| 119 | - if (!empty($context['results'])) |
|
| 120 | - echo ' |
|
| 119 | + if (!empty($context['results'])) { |
|
| 120 | + echo ' |
|
| 121 | 121 | <div class="noticebox">', $context['results'], '</div>'; |
| 122 | + } |
|
| 122 | 123 | |
| 123 | 124 | echo ' |
| 124 | 125 | <div class="windowbg2 noup"> |
@@ -129,9 +130,10 @@ discard block |
||
| 129 | 130 | <dd><select name="from"> |
| 130 | 131 | <option value="0">', $txt['attachment_transfer_select'], '</option>'; |
| 131 | 132 | |
| 132 | - foreach ($context['attach_dirs'] as $id => $dir) |
|
| 133 | - echo ' |
|
| 133 | + foreach ($context['attach_dirs'] as $id => $dir) { |
|
| 134 | + echo ' |
|
| 134 | 135 | <option value="', $id, '">', $dir, '</option>'; |
| 136 | + } |
|
| 135 | 137 | echo ' |
| 136 | 138 | </select></dd> |
| 137 | 139 | <dt>', $txt['attachment_transfer_auto'], '</dt> |
@@ -139,13 +141,14 @@ discard block |
||
| 139 | 141 | <option value="0">', $txt['attachment_transfer_auto_select'], '</option> |
| 140 | 142 | <option value="-1">', $txt['attachment_transfer_forum_root'], '</option>'; |
| 141 | 143 | |
| 142 | - if (!empty($context['base_dirs'])) |
|
| 143 | - foreach ($context['base_dirs'] as $id => $dir) |
|
| 144 | + if (!empty($context['base_dirs'])) { |
|
| 145 | + foreach ($context['base_dirs'] as $id => $dir) |
|
| 144 | 146 | echo ' |
| 145 | 147 | <option value="', $id, '">', $dir, '</option>'; |
| 146 | - else |
|
| 147 | - echo ' |
|
| 148 | + } else { |
|
| 149 | + echo ' |
|
| 148 | 150 | <option value="0" disabled>', $txt['attachment_transfer_no_base'], '</option>'; |
| 151 | + } |
|
| 149 | 152 | |
| 150 | 153 | echo ' |
| 151 | 154 | </select></dd> |
@@ -153,16 +156,18 @@ discard block |
||
| 153 | 156 | <dd><select name="to"> |
| 154 | 157 | <option value="0">', $txt['attachment_transfer_select'], '</option>'; |
| 155 | 158 | |
| 156 | - foreach ($context['attach_dirs'] as $id => $dir) |
|
| 157 | - echo ' |
|
| 159 | + foreach ($context['attach_dirs'] as $id => $dir) { |
|
| 160 | + echo ' |
|
| 158 | 161 | <option value="', $id, '">', $dir, '</option>'; |
| 162 | + } |
|
| 159 | 163 | echo ' |
| 160 | 164 | </select></dd>'; |
| 161 | 165 | |
| 162 | - if (!empty($modSettings['attachmentDirFileLimit'])) |
|
| 163 | - echo ' |
|
| 166 | + if (!empty($modSettings['attachmentDirFileLimit'])) { |
|
| 167 | + echo ' |
|
| 164 | 168 | <dt>', $txt['attachment_transfer_empty'], '</dt> |
| 165 | 169 | <dd><input type="checkbox" name="empty_it"', $context['checked'] ? ' checked' : '', '></dd>'; |
| 170 | + } |
|
| 166 | 171 | echo ' |
| 167 | 172 | </dl> |
| 168 | 173 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> |
@@ -238,10 +243,11 @@ discard block |
||
| 238 | 243 | // Loop through each error reporting the status |
| 239 | 244 | foreach ($context['repair_errors'] as $error => $number) |
| 240 | 245 | { |
| 241 | - if (!empty($number)) |
|
| 242 | - echo ' |
|
| 246 | + if (!empty($number)) { |
|
| 247 | + echo ' |
|
| 243 | 248 | <input type="checkbox" name="to_fix[]" id="', $error, '" value="', $error, '" class="input_check"> |
| 244 | 249 | <label for="', $error, '">', sprintf($txt['attach_repair_' . $error], $number), '</label><br>'; |
| 250 | + } |
|
| 245 | 251 | } |
| 246 | 252 | |
| 247 | 253 | echo ' <br> |
@@ -66,26 +66,31 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public function checkRequest() |
| 68 | 68 | { |
| 69 | - if (!$this->enabled) |
|
| 70 | - return false; |
|
| 69 | + if (!$this->enabled) { |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 71 | 72 | |
| 72 | 73 | // Try to create the image cache directory if it doesn't exist |
| 73 | - if (!file_exists($this->cache)) |
|
| 74 | - if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php')) |
|
| 74 | + if (!file_exists($this->cache)) { |
|
| 75 | + if (!mkdir($this->cache) || !copy(dirname($this->cache) . '/index.php', $this->cache . '/index.php')) |
|
| 75 | 76 | return false; |
| 77 | + } |
|
| 76 | 78 | |
| 77 | - if (empty($_GET['hash']) || empty($_GET['request'])) |
|
| 78 | - return false; |
|
| 79 | + if (empty($_GET['hash']) || empty($_GET['request'])) { |
|
| 80 | + return false; |
|
| 81 | + } |
|
| 79 | 82 | |
| 80 | 83 | $hash = $_GET['hash']; |
| 81 | 84 | $request = $_GET['request']; |
| 82 | 85 | |
| 83 | - if (md5($request . $this->secret) != $hash) |
|
| 84 | - return false; |
|
| 86 | + if (md5($request . $this->secret) != $hash) { |
|
| 87 | + return false; |
|
| 88 | + } |
|
| 85 | 89 | |
| 86 | 90 | // Attempt to cache the request if it doesn't exist |
| 87 | - if (!$this->isCached($request)) |
|
| 88 | - return $this->cacheImage($request); |
|
| 91 | + if (!$this->isCached($request)) { |
|
| 92 | + return $this->cacheImage($request); |
|
| 93 | + } |
|
| 89 | 94 | |
| 90 | 95 | return true; |
| 91 | 96 | } |
@@ -106,15 +111,17 @@ discard block |
||
| 106 | 111 | if (!$cached || time() - $cached['time'] > (5 * 86400)) |
| 107 | 112 | { |
| 108 | 113 | @unlink($cached_file); |
| 109 | - if ($this->checkRequest()) |
|
| 110 | - $this->serve(); |
|
| 114 | + if ($this->checkRequest()) { |
|
| 115 | + $this->serve(); |
|
| 116 | + } |
|
| 111 | 117 | exit; |
| 112 | 118 | } |
| 113 | 119 | |
| 114 | 120 | // Make sure we're serving an image |
| 115 | 121 | $contentParts = explode('/', !empty($cached['content_type']) ? $cached['content_type'] : ''); |
| 116 | - if ($contentParts[0] != 'image') |
|
| 117 | - exit; |
|
| 122 | + if ($contentParts[0] != 'image') { |
|
| 123 | + exit; |
|
| 124 | + } |
|
| 118 | 125 | |
| 119 | 126 | header('Content-type: ' . $cached['content_type']); |
| 120 | 127 | header('Content-length: ' . $cached['size']); |
@@ -160,19 +167,22 @@ discard block |
||
| 160 | 167 | $request = $curl->get_url_data($request); |
| 161 | 168 | $response = $request->result(); |
| 162 | 169 | |
| 163 | - if (empty($response)) |
|
| 164 | - return false; |
|
| 170 | + if (empty($response)) { |
|
| 171 | + return false; |
|
| 172 | + } |
|
| 165 | 173 | |
| 166 | 174 | $headers = $response['headers']; |
| 167 | 175 | |
| 168 | 176 | // Make sure the url is returning an image |
| 169 | 177 | $contentParts = explode('/', !empty($headers['content-type']) ? $headers['content-type'] : ''); |
| 170 | - if ($contentParts[0] != 'image') |
|
| 171 | - return false; |
|
| 178 | + if ($contentParts[0] != 'image') { |
|
| 179 | + return false; |
|
| 180 | + } |
|
| 172 | 181 | |
| 173 | 182 | // Validate the filesize |
| 174 | - if ($response['size'] > ($this->maxSize * 1024)) |
|
| 175 | - return false; |
|
| 183 | + if ($response['size'] > ($this->maxSize * 1024)) { |
|
| 184 | + return false; |
|
| 185 | + } |
|
| 176 | 186 | |
| 177 | 187 | return file_put_contents($dest, json_encode(array( |
| 178 | 188 | 'content_type' => $headers['content-type'], |
@@ -184,7 +194,8 @@ discard block |
||
| 184 | 194 | } |
| 185 | 195 | |
| 186 | 196 | $proxy = new ProxyServer(); |
| 187 | -if ($proxy->checkRequest()) |
|
| 197 | +if ($proxy->checkRequest()) { |
|
| 188 | 198 | $proxy->serve(); |
| 199 | +} |
|
| 189 | 200 | |
| 190 | 201 | exit; |
@@ -583,8 +583,7 @@ discard block |
||
| 583 | 583 | { |
| 584 | 584 | $header = '<?php require("' . ($user_info['is_admin'] ? addslashes(realpath($boarddir . '/SSI.php')) : 'SSI.php') . '"); ?>' . "\n" . $header; |
| 585 | 585 | return $header . template_homepage_sample1_html() . $footer; |
| 586 | - } |
|
| 587 | - else |
|
| 586 | + } else |
|
| 588 | 587 | { |
| 589 | 588 | echo $header; |
| 590 | 589 | template_homepage_sample1_php(); |
@@ -599,9 +598,10 @@ discard block |
||
| 599 | 598 | |
| 600 | 599 | $topics = ssi_recentTopics(8, null, null, 'array'); |
| 601 | 600 | |
| 602 | - foreach ($topics as $topic) |
|
| 603 | - echo ' |
|
| 601 | + foreach ($topics as $topic) { |
|
| 602 | + echo ' |
|
| 604 | 603 | <li><a href="', $topic['href'], '">', $topic['subject'], '</a> ', $txt['by'], ' ', $topic['poster']['link'], '</li>'; |
| 604 | + } |
|
| 605 | 605 | |
| 606 | 606 | unset($topics); |
| 607 | 607 | |
@@ -41,37 +41,43 @@ discard block |
||
| 41 | 41 | define('TIME_START', microtime(true)); |
| 42 | 42 | |
| 43 | 43 | // Just being safe... |
| 44 | -foreach (array('db_character_set', 'cachedir') as $variable) |
|
| 44 | +foreach (array('db_character_set', 'cachedir') as $variable) { |
|
| 45 | 45 | if (isset($GLOBALS[$variable])) |
| 46 | 46 | unset($GLOBALS[$variable]); |
| 47 | +} |
|
| 47 | 48 | |
| 48 | 49 | // Get the forum's settings for database and file paths. |
| 49 | 50 | require_once(dirname(__FILE__) . '/Settings.php'); |
| 50 | 51 | |
| 51 | 52 | // Make absolutely sure the cache directory is defined. |
| 52 | -if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) |
|
| 53 | +if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) { |
|
| 53 | 54 | $cachedir = $boarddir . '/cache'; |
| 55 | +} |
|
| 54 | 56 | |
| 55 | 57 | // Don't do john didley if the forum's been shut down competely. |
| 56 | -if ($maintenance == 2) |
|
| 58 | +if ($maintenance == 2) { |
|
| 57 | 59 | die($mmessage); |
| 60 | +} |
|
| 58 | 61 | |
| 59 | 62 | // Fix for using the current directory as a path. |
| 60 | -if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') |
|
| 63 | +if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') { |
|
| 61 | 64 | $sourcedir = dirname(__FILE__) . substr($sourcedir, 1); |
| 65 | +} |
|
| 62 | 66 | |
| 63 | 67 | // Have we already turned this off? If so, exist gracefully. |
| 64 | -if (file_exists($cachedir . '/cron.lock')) |
|
| 68 | +if (file_exists($cachedir . '/cron.lock')) { |
|
| 65 | 69 | obExit_cron(); |
| 70 | +} |
|
| 66 | 71 | |
| 67 | 72 | // Before we go any further, if this is not a CLI request, we need to do some checking. |
| 68 | 73 | if (!FROM_CLI) |
| 69 | 74 | { |
| 70 | 75 | // We will clean up $_GET shortly. But we want to this ASAP. |
| 71 | 76 | $ts = isset($_GET['ts']) ? (int) $_GET['ts'] : 0; |
| 72 | - if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) |
|
| 73 | - obExit_cron(); |
|
| 74 | -} |
|
| 77 | + if ($ts <= 0 || $ts % 15 != 0 || time() - $ts < 0 || time() - $ts > 20) { |
|
| 78 | + obExit_cron(); |
|
| 79 | + } |
|
| 80 | + } |
|
| 75 | 81 | |
| 76 | 82 | // Load the most important includes. In general, a background should be loading its own dependencies. |
| 77 | 83 | require_once($sourcedir . '/Errors.php'); |
@@ -123,8 +129,9 @@ discard block |
||
| 123 | 129 | global $smcFunc; |
| 124 | 130 | |
| 125 | 131 | // Check we haven't run over our time limit. |
| 126 | - if (microtime(true) - TIME_START > MAX_CRON_TIME) |
|
| 127 | - return false; |
|
| 132 | + if (microtime(true) - TIME_START > MAX_CRON_TIME) { |
|
| 133 | + return false; |
|
| 134 | + } |
|
| 128 | 135 | |
| 129 | 136 | // Try to find a task. Specifically, try to find one that hasn't been claimed previously, or failing that, |
| 130 | 137 | // a task that was claimed but failed for whatever reason and failed long enough ago. We should not care |
@@ -159,14 +166,12 @@ discard block |
||
| 159 | 166 | // Update the time and go back. |
| 160 | 167 | $row['claimed_time'] = time(); |
| 161 | 168 | return $row; |
| 162 | - } |
|
| 163 | - else |
|
| 169 | + } else |
|
| 164 | 170 | { |
| 165 | 171 | // Uh oh, we just missed it. Try to claim another one, and let it fall through if there aren't any. |
| 166 | 172 | return fetch_task(); |
| 167 | 173 | } |
| 168 | - } |
|
| 169 | - else |
|
| 174 | + } else |
|
| 170 | 175 | { |
| 171 | 176 | // No dice. Clean up and go home. |
| 172 | 177 | $smcFunc['db_free_result']($request); |
@@ -187,8 +192,9 @@ discard block |
||
| 187 | 192 | if (!empty($task_details['task_file'])) |
| 188 | 193 | { |
| 189 | 194 | $include = strtr(trim($task_details['task_file']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir)); |
| 190 | - if (file_exists($include)) |
|
| 191 | - require_once($include); |
|
| 195 | + if (file_exists($include)) { |
|
| 196 | + require_once($include); |
|
| 197 | + } |
|
| 192 | 198 | } |
| 193 | 199 | |
| 194 | 200 | if (empty($task_details['task_class'])) |
@@ -204,8 +210,7 @@ discard block |
||
| 204 | 210 | $details = empty($task_details['task_data']) ? array() : json_decode($task_details['task_data'], true); |
| 205 | 211 | $bgtask = new $task_details['task_class']($details); |
| 206 | 212 | return $bgtask->execute(); |
| 207 | - } |
|
| 208 | - else |
|
| 213 | + } else |
|
| 209 | 214 | { |
| 210 | 215 | log_error('Invalid background task specified: (class: ' . $task_details['task_class'] . ', ' . (empty($task_details['task_file']) ? ' no file' : ' to load ' . $task_details['task_file']) . ')'); |
| 211 | 216 | return true; // So we clear it from the queue. |
@@ -224,8 +229,9 @@ discard block |
||
| 224 | 229 | $scripturl = $boardurl . '/index.php'; |
| 225 | 230 | |
| 226 | 231 | // These keys shouldn't be set...ever. |
| 227 | - if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) |
|
| 228 | - die('Invalid request variable.'); |
|
| 232 | + if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) { |
|
| 233 | + die('Invalid request variable.'); |
|
| 234 | + } |
|
| 229 | 235 | |
| 230 | 236 | // Save some memory.. (since we don't use these anyway.) |
| 231 | 237 | unset($GLOBALS['HTTP_POST_VARS'], $GLOBALS['HTTP_POST_VARS']); |
@@ -246,26 +252,28 @@ discard block |
||
| 246 | 252 | global $modSettings; |
| 247 | 253 | |
| 248 | 254 | // Ignore errors if we're ignoring them or they are strict notices from PHP 5 (which cannot be solved without breaking PHP 4.) |
| 249 | - if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging']))) |
|
| 250 | - return; |
|
| 255 | + if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging']))) { |
|
| 256 | + return; |
|
| 257 | + } |
|
| 251 | 258 | |
| 252 | 259 | $error_type = 'cron'; |
| 253 | 260 | |
| 254 | 261 | log_error($error_level . ': ' . $error_string, $error_type, $file, $line); |
| 255 | 262 | |
| 256 | 263 | // If this is an E_ERROR or E_USER_ERROR.... die. Violently so. |
| 257 | - if ($error_level % 255 == E_ERROR) |
|
| 258 | - die('No direct access...'); |
|
| 259 | -} |
|
| 264 | + if ($error_level % 255 == E_ERROR) { |
|
| 265 | + die('No direct access...'); |
|
| 266 | + } |
|
| 267 | + } |
|
| 260 | 268 | |
| 261 | 269 | /** |
| 262 | 270 | * The exit function |
| 263 | 271 | */ |
| 264 | 272 | function obExit_cron() |
| 265 | 273 | { |
| 266 | - if (FROM_CLI) |
|
| 267 | - die(0); |
|
| 268 | - else |
|
| 274 | + if (FROM_CLI) { |
|
| 275 | + die(0); |
|
| 276 | + } else |
|
| 269 | 277 | { |
| 270 | 278 | header('Content-Type: image/gif'); |
| 271 | 279 | die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B"); |
@@ -12,7 +12,8 @@ |
||
| 12 | 12 | header('Location: ' . $boardurl); |
| 13 | 13 | } |
| 14 | 14 | // Can't find it... just forget it. |
| 15 | -else |
|
| 15 | +else { |
|
| 16 | 16 | exit; |
| 17 | +} |
|
| 17 | 18 | |
| 18 | 19 | ?> |
| 19 | 20 | \ No newline at end of file |
@@ -1,9 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | // Try to handle it with the upper level index.php. (it should know what to do.) |
| 4 | -if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) |
|
| 4 | +if (file_exists(dirname(dirname(__FILE__)) . '/index.php')) { |
|
| 5 | 5 | include (dirname(dirname(__FILE__)) . '/index.php'); |
| 6 | -else |
|
| 6 | +} else { |
|
| 7 | 7 | exit; |
| 8 | +} |
|
| 8 | 9 | |
| 9 | 10 | ?> |
| 10 | 11 | \ No newline at end of file |
@@ -182,7 +182,7 @@ |
||
| 182 | 182 | * Path to the tasks directory. |
| 183 | 183 | * @var string |
| 184 | 184 | */ |
| 185 | -$tasksdir = $sourcedir .'/tasks'; |
|
| 185 | +$tasksdir = $sourcedir . '/tasks'; |
|
| 186 | 186 | |
| 187 | 187 | ########## Error-Catching ########## |
| 188 | 188 | # Note: You shouldn't touch these settings. |
@@ -186,8 +186,9 @@ discard block |
||
| 186 | 186 | |
| 187 | 187 | ########## Error-Catching ########## |
| 188 | 188 | # Note: You shouldn't touch these settings. |
| 189 | -if (file_exists(dirname(__FILE__) . '/db_last_error.php')) |
|
| 189 | +if (file_exists(dirname(__FILE__) . '/db_last_error.php')) { |
|
| 190 | 190 | include(dirname(__FILE__) . '/db_last_error.php'); |
| 191 | +} |
|
| 191 | 192 | |
| 192 | 193 | if (!isset($db_last_error)) |
| 193 | 194 | { |
@@ -202,11 +203,14 @@ discard block |
||
| 202 | 203 | } |
| 203 | 204 | |
| 204 | 205 | # Make sure the paths are correct... at least try to fix them. |
| 205 | -if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) |
|
| 206 | +if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt')) { |
|
| 206 | 207 | $boarddir = dirname(__FILE__); |
| 207 | -if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) |
|
| 208 | +} |
|
| 209 | +if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources')) { |
|
| 208 | 210 | $sourcedir = $boarddir . '/Sources'; |
| 209 | -if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) |
|
| 211 | +} |
|
| 212 | +if (!file_exists($cachedir) && file_exists($boarddir . '/cache')) { |
|
| 210 | 213 | $cachedir = $boarddir . '/cache'; |
| 214 | +} |
|
| 211 | 215 | |
| 212 | 216 | ?> |
| 213 | 217 | \ No newline at end of file |
