| @@ -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 | 
| @@ -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 | |
| @@ -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 | 
| @@ -23,13 +23,13 @@ discard block | ||
| 23 | 23 |  { | 
| 24 | 24 | global $context, $txt; | 
| 25 | 25 | |
| 26 | - if (!empty($context['simple_action'])) | |
| 27 | - echo ' | |
| 26 | +	if (!empty($context['simple_action'])) { | |
| 27 | + echo ' | |
| 28 | 28 | <strong> | 
| 29 | 29 | ', $context['error_title'], ' | 
| 30 | 30 | </strong><br> | 
| 31 | 31 | <div ', $context['error_code'], 'class="padding">', $context['error_message'], '</div>'; | 
| 32 | - else | |
| 32 | + } else | |
| 33 | 33 |  	{ | 
| 34 | 34 | echo ' | 
| 35 | 35 | <div id="fatal_error"> | 
| @@ -82,21 +82,23 @@ discard block | ||
| 82 | 82 |   ', $txt['apply_filter_of_type'], ':'; | 
| 83 | 83 | |
| 84 | 84 | $error_types = array(); | 
| 85 | - foreach ($context['error_types'] as $type => $details) | |
| 86 | - $error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>'; | |
| 85 | +	foreach ($context['error_types'] as $type => $details) { | |
| 86 | + $error_types[] = ($details['is_selected'] ? '<img src="' . $settings['images_url'] . '/selected.png" alt=""> ' : '') . '<a href="' . $details['url'] . '" ' . ($details['is_selected'] ? 'style="font-weight: bold;"' : '') . ' title="' . $details['description'] . '">' . $details['label'] . '</a>'; | |
| 87 | + } | |
| 87 | 88 | |
| 88 | 89 | echo ' | 
| 89 | 90 |  						', implode(' | ', $error_types), ' | 
| 90 | 91 | </td> | 
| 91 | 92 | </tr>'; | 
| 92 | 93 | |
| 93 | - if ($context['has_filter']) | |
| 94 | - echo ' | |
| 94 | +	if ($context['has_filter']) { | |
| 95 | + echo ' | |
| 95 | 96 | <tr> | 
| 96 | 97 | <td colspan="3" class="windowbg"> | 
| 97 | 98 | <strong>  ', $txt['applying_filter'], ':</strong> ', $context['filter']['entity'], ' ', $context['filter']['value']['html'], '  [<a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', '">', $txt['clear_filter'], '</a>] | 
| 98 | 99 | </td> | 
| 99 | 100 | </tr>'; | 
| 101 | + } | |
| 100 | 102 | |
| 101 | 103 | echo ' | 
| 102 | 104 | <tr> | 
| @@ -107,11 +109,12 @@ discard block | ||
| 107 | 109 | </tr>'; | 
| 108 | 110 | |
| 109 | 111 | // No errors, then show a message | 
| 110 | - if (count($context['errors']) == 0) | |
| 111 | - echo ' | |
| 112 | +	if (count($context['errors']) == 0) { | |
| 113 | + echo ' | |
| 112 | 114 | <tr class="windowbg"> | 
| 113 | 115 | <td class="centertext" colspan="2">', $txt['errlog_no_entries'], '</td> | 
| 114 | 116 | </tr>'; | 
| 117 | + } | |
| 115 | 118 | |
| 116 | 119 | // we have some errors, must be some mods installed :P | 
| 117 | 120 | foreach ($context['errors'] as $error) | 
| @@ -126,20 +129,22 @@ discard block | ||
| 126 | 129 | <a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? '' : ';desc', $context['has_filter'] ? $context['filter']['href'] : '', '" title="', $txt['reverse_direction'], '"><span class="generic_icons sort_' . $context['sort_direction'] . '"></span></a> | 
| 127 | 130 | ', $error['time'], '<br>'; | 
| 128 | 131 | |
| 129 | - if (!empty($error['member']['ip'])) | |
| 130 | - echo ' | |
| 132 | +		if (!empty($error['member']['ip'])) { | |
| 133 | + echo ' | |
| 131 | 134 | <a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=ip;value=', $error['member']['ip'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_ip'], '"><span class="generic_icons filter centericon"></span></a> | 
| 132 | 135 | <strong><a href="', $scripturl, '?action=trackip;searchip=', $error['member']['ip'], '">', $error['member']['ip'], '</a></strong>  <br>'; | 
| 136 | + } | |
| 133 | 137 | |
| 134 | 138 | echo ' | 
| 135 | 139 | </div> | 
| 136 | 140 | |
| 137 | 141 | <div style="float: left; width: 50%; line-height: 1.8em; padding: 0 4px;">'; | 
| 138 | 142 | |
| 139 | - if ($error['member']['session'] != '') | |
| 140 | - echo ' | |
| 143 | +		if ($error['member']['session'] != '') { | |
| 144 | + echo ' | |
| 141 | 145 | <a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=session;value=', $error['member']['session'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_session'], '"><span class="generic_icons filter centericon"></span></a> | 
| 142 | 146 | ', $error['member']['session'], '<br>'; | 
| 147 | + } | |
| 143 | 148 | |
| 144 | 149 | echo ' | 
| 145 | 150 | <a href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=error_type;value=', $error['error_type']['type'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_type'], '"><span class="generic_icons filter centericon"></span></a> | 
| @@ -153,8 +158,8 @@ discard block | ||
| 153 | 158 | <a style="display: table-cell;" href="', $error['url']['html'], '">', $error['url']['html'], '</a> | 
| 154 | 159 | </div>'; | 
| 155 | 160 | |
| 156 | - if (!empty($error['file'])) | |
| 157 | - echo ' | |
| 161 | +		if (!empty($error['file'])) { | |
| 162 | + echo ' | |
| 158 | 163 | <div style="float: left; width: 100%; padding: 4px 0; line-height: 1.6em; border-top: 1px solid #e3e3e3;"> | 
| 159 | 164 | <a style="display: table-cell; padding: 4px; width: 20px; vertical-align: top;" href="', $scripturl, '?action=admin;area=logs;sa=errorlog', $context['sort_direction'] == 'down' ? ';desc' : '', ';filter=file;value=', $error['file']['search'], '" title="', $txt['apply_filter'], ': ', $txt['filter_only_file'], '"><span class="generic_icons filter"></span></a> | 
| 160 | 165 | <div> | 
| @@ -162,6 +167,7 @@ discard block | ||
| 162 | 167 | ', $txt['line'], ': ', $error['file']['line'], ' | 
| 163 | 168 | </div> | 
| 164 | 169 | </div>'; | 
| 170 | + } | |
| 165 | 171 | |
| 166 | 172 | echo ' | 
| 167 | 173 | </td> | 
| @@ -190,9 +196,10 @@ discard block | ||
| 190 | 196 | </div> | 
| 191 | 197 | <br>'; | 
| 192 | 198 | |
| 193 | - if ($context['sort_direction'] == 'down') | |
| 194 | - echo ' | |
| 199 | +	if ($context['sort_direction'] == 'down') { | |
| 200 | + echo ' | |
| 195 | 201 | <input type="hidden" name="desc" value="1">'; | 
| 202 | + } | |
| 196 | 203 | |
| 197 | 204 | echo ' | 
| 198 | 205 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">'; | 
| @@ -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> | 
| @@ -145,11 +145,12 @@ discard block | ||
| 145 | 145 | <div class="question">', $txt['poll_question'], ': <strong>', $context['poll']['question'], '</strong>'; | 
| 146 | 146 | |
| 147 | 147 | $options = 1; | 
| 148 | - foreach ($context['poll']['options'] as $option) | |
| 149 | - echo ' | |
| 148 | +		foreach ($context['poll']['options'] as $option) { | |
| 149 | + echo ' | |
| 150 | 150 | <div class="', $option['voted_this'] ? 'voted' : '', '">', $txt['option'], ' ', $options++, ': <strong>', $option['option'], '</strong> | 
| 151 | 151 | ', $context['allow_poll_view'] ? $txt['votes'] . ': ' . $option['votes'] . '' : '', ' | 
| 152 | 152 | </div>'; | 
| 153 | + } | |
| 153 | 154 | |
| 154 | 155 | echo ' | 
| 155 | 156 | </div>'; | 
| @@ -171,9 +172,10 @@ discard block | ||
| 171 | 172 | echo ' | 
| 172 | 173 | <hr>'; | 
| 173 | 174 | |
| 174 | - foreach ($context['printattach'][$post['id_msg']] as $attach) | |
| 175 | - echo ' | |
| 175 | +			foreach ($context['printattach'][$post['id_msg']] as $attach) { | |
| 176 | + echo ' | |
| 176 | 177 | <img width="' . $attach['width'] . '" height="' . $attach['height'] . '" src="', $scripturl . '?action=dlattach;topic=' . $topic . '.0;attach=' . $attach['id_attach'] . '" alt="">'; | 
| 178 | + } | |
| 177 | 179 | } | 
| 178 | 180 | |
| 179 | 181 | echo ' | 
| @@ -213,11 +215,12 @@ discard block | ||
| 213 | 215 | <div class="print_options">'; | 
| 214 | 216 | |
| 215 | 217 | // which option is set, text or text&images | 
| 216 | - if (isset($_REQUEST['images'])) | |
| 217 | - echo ' | |
| 218 | +	if (isset($_REQUEST['images'])) { | |
| 219 | + echo ' | |
| 218 | 220 | <a href="', $url_text, '">', $txt['print_page_text'], '</a> | <strong><a href="', $url_images, '">', $txt['print_page_images'], '</a></strong>'; | 
| 219 | - else | |
| 220 | - echo ' | |
| 221 | +	} else { | |
| 222 | + echo ' | |
| 221 | 223 | <strong><a href="', $url_text, '">', $txt['print_page_text'], '</a></strong> | <a href="', $url_images, '">', $txt['print_page_images'], '</a>'; | 
| 222 | -} | |
| 224 | + } | |
| 225 | + } | |
| 223 | 226 | ?> | 
| 224 | 227 | \ No newline at end of file | 
| @@ -36,11 +36,12 @@ discard block | ||
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | 38 | // An error? | 
| 39 | - if (!empty($context['error_message'])) | |
| 40 | - echo ' | |
| 39 | +	if (!empty($context['error_message'])) { | |
| 40 | + echo ' | |
| 41 | 41 | <div class="errorbox"> | 
| 42 | 42 | ', $context['error_message'], ' | 
| 43 | 43 | </div>'; | 
| 44 | + } | |
| 44 | 45 | |
| 45 | 46 | // Provide something of an introduction... | 
| 46 | 47 | echo ' | 
| @@ -67,11 +68,12 @@ discard block | ||
| 67 | 68 | // If the files are not writable, we might! | 
| 68 | 69 | if (!empty($context['still_not_writable'])) | 
| 69 | 70 |  	{ | 
| 70 | - if (!empty($context['package_ftp']['error'])) | |
| 71 | - echo ' | |
| 71 | +		if (!empty($context['package_ftp']['error'])) { | |
| 72 | + echo ' | |
| 72 | 73 | <div class="errorbox"> | 
| 73 | 74 | ', $context['package_ftp']['error'], ' | 
| 74 | 75 | </div>'; | 
| 76 | + } | |
| 75 | 77 | |
| 76 | 78 | echo ' | 
| 77 | 79 | <div class="cat_bar"> | 
| @@ -243,11 +245,12 @@ discard block | ||
| 243 | 245 | |
| 244 | 246 | // Is it not writable? | 
| 245 | 247 | // Show an error. | 
| 246 | - if (!empty($context['entries_not_writable_message'])) | |
| 247 | - echo ' | |
| 248 | +	if (!empty($context['entries_not_writable_message'])) { | |
| 249 | + echo ' | |
| 248 | 250 | <div class="errorbox"> | 
| 249 | 251 | ', $context['entries_not_writable_message'], ' | 
| 250 | 252 | </div>'; | 
| 253 | + } | |
| 251 | 254 | |
| 252 | 255 | // Already have some file entries? | 
| 253 | 256 | if (!empty($context['file_entries'])) | 
| @@ -63,7 +63,7 @@ discard block | ||
| 63 | 63 | // Stick our "create a redirection topic" template in here... | 
| 64 | 64 |  	template_redirect_options('move'); | 
| 65 | 65 | |
| 66 | - echo ' | |
| 66 | + echo ' | |
| 67 | 67 | <input type="submit" value="', $txt['move_topic'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button_submit"> | 
| 68 | 68 | </div> | 
| 69 | 69 | </div>'; | 
| @@ -86,9 +86,9 @@ discard block | ||
| 86 | 86 | */ | 
| 87 | 87 | function template_redirect_options($type) | 
| 88 | 88 |  { | 
| 89 | - global $txt, $context, $modSettings; | |
| 89 | + global $txt, $context, $modSettings; | |
| 90 | 90 | |
| 91 | - echo ' | |
| 91 | + echo ' | |
| 92 | 92 | <label for="postRedirect"><input type="checkbox" name="postRedirect" id="postRedirect"', $context['is_approved'] ? ' checked' : '', ' onclick="', $context['is_approved'] ? '' : 'if (this.checked && !confirm(\'' . $txt[$type . '_topic_unapproved_js'] . '\')) return false; ', 'document.getElementById(\'reasonArea\').style.display = this.checked ? \'block\' : \'none\';" class="input_check"> ', $txt['post_redirection'], '.</label> | 
| 93 | 93 | <fieldset id="reasonArea" style="margin-top: 1ex;', $context['is_approved'] ? '' : 'display: none;', '"> | 
| 94 | 94 | <dl class="settings"> | 
| @@ -37,9 +37,10 @@ discard block | ||
| 37 | 37 | echo ' | 
| 38 | 38 | <optgroup label="', $category['name'], '">'; | 
| 39 | 39 | |
| 40 | - foreach ($category['boards'] as $board) | |
| 41 | - echo ' | |
| 40 | +		foreach ($category['boards'] as $board) { | |
| 41 | + echo ' | |
| 42 | 42 |  									<option value="', $board['id'], '"', $board['selected'] ? ' selected' : '', $board['id'] == $context['current_board'] ? ' disabled' : '', '>', $board['child_level'] > 0 ? str_repeat('==', $board['child_level']-1) . '=> ' : '', $board['name'], '</option>'; | 
| 43 | + } | |
| 43 | 44 | echo ' | 
| 44 | 45 | </optgroup>'; | 
| 45 | 46 | } | 
| @@ -68,9 +69,10 @@ discard block | ||
| 68 | 69 | </div> | 
| 69 | 70 | </div>'; | 
| 70 | 71 | |
| 71 | - if ($context['back_to_topic']) | |
| 72 | - echo ' | |
| 72 | +	if ($context['back_to_topic']) { | |
| 73 | + echo ' | |
| 73 | 74 | <input type="hidden" name="goback" value="1">'; | 
| 75 | + } | |
| 74 | 76 | |
| 75 | 77 | echo ' | 
| 76 | 78 | <input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '"> | 
| @@ -120,8 +122,7 @@ discard block | ||
| 120 | 122 | <option value="86400">', $txt['two_months'], '</option> | 
| 121 | 123 | </select> | 
| 122 | 124 | </dd>'; | 
| 123 | - } | |
| 124 | - else | |
| 125 | + } else | |
| 125 | 126 |  	{ | 
| 126 | 127 | echo ' | 
| 127 | 128 | <input type="hidden" name="redirect_expires" value="0">'; | 
| @@ -217,9 +218,9 @@ discard block | ||
| 217 | 218 | <input type="submit" value="', $txt['go'], '" class="button_submit"> | 
| 218 | 219 | </form>'; | 
| 219 | 220 | |
| 221 | +	} else { | |
| 222 | + echo $txt['target_below']; | |
| 220 | 223 | } | 
| 221 | - else | |
| 222 | - echo $txt['target_below']; | |
| 223 | 224 | |
| 224 | 225 | echo ' </h4> | 
| 225 | 226 | </div>'; | 
| @@ -237,12 +238,13 @@ discard block | ||
| 237 | 238 | |
| 238 | 239 |  		$merge_button = create_button('merge', 'merge', ''); | 
| 239 | 240 | |
| 240 | - foreach ($context['topics'] as $topic) | |
| 241 | - echo ' | |
| 241 | +		foreach ($context['topics'] as $topic) { | |
| 242 | + echo ' | |
| 242 | 243 | <li> | 
| 243 | 244 | <a href="', $scripturl, '?action=mergetopics;sa=options;board=', $context['current_board'], '.0;from=', $context['origin_topic'], ';to=', $topic['id'], ';', $context['session_var'], '=', $context['session_id'], '">', $merge_button, '</a>  | 
| 244 | 245 | <a href="', $scripturl, '?topic=', $topic['id'], '.0" target="_blank" class="new_win">', $topic['subject'], '</a> ', $txt['started_by'], ' ', $topic['poster']['link'], ' | 
| 245 | 246 | </li>'; | 
| 247 | + } | |
| 246 | 248 | |
| 247 | 249 | echo ' | 
| 248 | 250 | </ul> | 
| @@ -251,8 +253,7 @@ discard block | ||
| 251 | 253 | <div class="pagesection"> | 
| 252 | 254 | ', $context['page_index'], ' | 
| 253 | 255 | </div>'; | 
| 254 | - } | |
| 255 | - else | |
| 256 | + } else | |
| 256 | 257 |  	{ | 
| 257 | 258 | // Just a nice "There aren't any topics" message | 
| 258 | 259 | echo ' | 
| @@ -306,8 +307,8 @@ discard block | ||
| 306 | 307 | </tr> | 
| 307 | 308 | </thead> | 
| 308 | 309 | <tbody>'; | 
| 309 | - foreach ($context['topics'] as $topic) | |
| 310 | - echo ' | |
| 310 | +		foreach ($context['topics'] as $topic) { | |
| 311 | + echo ' | |
| 311 | 312 | <tr class="windowbg"> | 
| 312 | 313 | <td> | 
| 313 | 314 | <input type="checkbox" class="input_check" name="topics[]" value="' . $topic['id'] . '" checked> | 
| @@ -327,6 +328,7 @@ discard block | ||
| 327 | 328 | <input type="checkbox" class="input_check" name="notifications[]" value="' . $topic['id'] . '" checked> | 
| 328 | 329 | </td> | 
| 329 | 330 | </tr>'; | 
| 331 | + } | |
| 330 | 332 | echo ' | 
| 331 | 333 | </tbody> | 
| 332 | 334 | </table> | 
| @@ -337,9 +339,10 @@ discard block | ||
| 337 | 339 | <fieldset id="merge_subject" class="merge_options"> | 
| 338 | 340 | <legend>', $txt['merge_select_subject'], '</legend> | 
| 339 | 341 | <select name="subject" onchange="this.form.custom_subject.style.display = (this.options[this.selectedIndex].value != 0) ? \'none\': \'\' ;">'; | 
| 340 | - foreach ($context['topics'] as $topic) | |
| 341 | - echo ' | |
| 342 | +	foreach ($context['topics'] as $topic) { | |
| 343 | + echo ' | |
| 342 | 344 | <option value="', $topic['id'], '"' . ($topic['selected'] ? ' selected' : '') . '>', $topic['subject'], '</option>'; | 
| 345 | + } | |
| 343 | 346 | echo ' | 
| 344 | 347 | <option value="0">', $txt['merge_custom_subject'], ':</option> | 
| 345 | 348 | </select> | 
| @@ -357,11 +360,12 @@ discard block | ||
| 357 | 360 | <fieldset id="merge_board" class="merge_options"> | 
| 358 | 361 | <legend>', $txt['merge_select_target_board'], '</legend> | 
| 359 | 362 | <ul>'; | 
| 360 | - foreach ($context['boards'] as $board) | |
| 361 | - echo ' | |
| 363 | +		foreach ($context['boards'] as $board) { | |
| 364 | + echo ' | |
| 362 | 365 | <li> | 
| 363 | 366 | <input type="radio" name="board" value="' . $board['id'] . '"' . ($board['selected'] ? ' checked' : '') . ' class="input_radio"> ' . $board['name'] . ' | 
| 364 | 367 | </li>'; | 
| 368 | + } | |
| 365 | 369 | echo ' | 
| 366 | 370 | </ul> | 
| 367 | 371 | </fieldset>'; | 
| @@ -372,11 +376,12 @@ discard block | ||
| 372 | 376 | <fieldset id="merge_poll" class="merge_options"> | 
| 373 | 377 | <legend>' . $txt['merge_select_poll'] . '</legend> | 
| 374 | 378 | <ul>'; | 
| 375 | - foreach ($context['polls'] as $poll) | |
| 376 | - echo ' | |
| 379 | +		foreach ($context['polls'] as $poll) { | |
| 380 | + echo ' | |
| 377 | 381 | <li> | 
| 378 | 382 |  							<input type="radio" name="poll" value="' . $poll['id'] . '"' . ($poll['selected'] ? ' checked' : '') . ' class="input_radio"> ' . $poll['question'] . ' (' . $txt['topic'] . ': <a href="' . $scripturl . '?topic=' . $poll['topic']['id'] . '.0" target="_blank" class="new_win">' . $poll['topic']['subject'] . '</a>) | 
| 379 | 383 | </li>'; | 
| 384 | + } | |
| 380 | 385 | echo ' | 
| 381 | 386 | <li> | 
| 382 | 387 |  							<input type="radio" name="poll" value="-1" class="input_radio"> (' . $txt['merge_no_poll'] . ') |