| @@ -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"> | 
| @@ -220,7 +220,7 @@ | ||
| 220 | 220 | ), | 
| 221 | 221 | ), | 
| 222 | 222 | ); | 
| 223 | - */ | |
| 223 | + */ | |
| 224 | 224 | |
| 225 | 225 | // Are we using right-to-left orientation? | 
| 226 | 226 | $first = $context['right_to_left'] ? 'last' : 'first'; | 
| @@ -793,7 +793,7 @@ discard block | ||
| 793 | 793 | if (!$this->connection) | 
| 794 | 794 |  		{ | 
| 795 | 795 | $this->error = 'bad_server'; | 
| 796 | - $this->last_message = 'Invalid Server'; | |
| 796 | + $this->last_message = 'Invalid Server'; | |
| 797 | 797 | return; | 
| 798 | 798 | } | 
| 799 | 799 | |
| @@ -801,7 +801,7 @@ discard block | ||
| 801 | 801 | if (!$this->check_response(220)) | 
| 802 | 802 |  		{ | 
| 803 | 803 | $this->error = 'bad_response'; | 
| 804 | - $this->last_message = 'Bad Response'; | |
| 804 | + $this->last_message = 'Bad Response'; | |
| 805 | 805 | return; | 
| 806 | 806 | } | 
| 807 | 807 | |
| @@ -426,8 +426,8 @@ | ||
| 426 | 426 | */ | 
| 427 | 427 | function matchIPtoCIDR($ip_address, $cidr_address) | 
| 428 | 428 |  { | 
| 429 | -    list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); | |
| 430 | - return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); | |
| 429 | +	list ($cidr_network, $cidr_subnetmask) = preg_split('/', $cidr_address); | |
| 430 | + return (ip2long($ip_address) & (~((1 << (32 - $cidr_subnetmask)) - 1))) == ip2long($cidr_network); | |
| 431 | 431 | } | 
| 432 | 432 | |
| 433 | 433 | /** | 
| @@ -272,13 +272,13 @@ | ||
| 272 | 272 | $context['post_error']['messages'][] = $txt['mc_warning_template_error_no_body']; | 
| 273 | 273 | // Add in few replacements. | 
| 274 | 274 | /** | 
| 275 | - * These are the defaults: | |
| 276 | -			* - {MEMBER} - Member Name. => current user for review | |
| 277 | -			* - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced | |
| 278 | -			* - {FORUMNAME} - Forum Name. | |
| 279 | -			* - {SCRIPTURL} - Web address of forum. | |
| 280 | -			* - {REGARDS} - Standard email sign-off. | |
| 281 | - */ | |
| 275 | + * These are the defaults: | |
| 276 | +			 * - {MEMBER} - Member Name. => current user for review | |
| 277 | +			 * - {MESSAGE} - Link to Offending Post. (If Applicable) => not applicable here, so not replaced | |
| 278 | +			 * - {FORUMNAME} - Forum Name. | |
| 279 | +			 * - {SCRIPTURL} - Web address of forum. | |
| 280 | +			 * - {REGARDS} - Standard email sign-off. | |
| 281 | + */ | |
| 282 | 282 | $find = array( | 
| 283 | 283 |  				'{MEMBER}', | 
| 284 | 284 |  				'{FORUMNAME}', | 
| @@ -101,9 +101,9 @@ discard block | ||
| 101 | 101 | } | 
| 102 | 102 | |
| 103 | 103 | /** | 
| 104 | - * Determine if the browser is Opera or not | |
| 105 | - * @return boolean Whether or not this is Opera | |
| 106 | - */ | |
| 104 | + * Determine if the browser is Opera or not | |
| 105 | + * @return boolean Whether or not this is Opera | |
| 106 | + */ | |
| 107 | 107 | function isOpera() | 
| 108 | 108 |  	{ | 
| 109 | 109 | if (!isset($this->_browsers['is_opera'])) | 
| @@ -112,9 +112,9 @@ discard block | ||
| 112 | 112 | } | 
| 113 | 113 | |
| 114 | 114 | /** | 
| 115 | - * Determine if the browser is IE or not | |
| 116 | - * @return boolean true Whether or not the browser is IE | |
| 117 | - */ | |
| 115 | + * Determine if the browser is IE or not | |
| 116 | + * @return boolean true Whether or not the browser is IE | |
| 117 | + */ | |
| 118 | 118 | function isIe() | 
| 119 | 119 |  	{ | 
| 120 | 120 | // I'm IE, Yes I'm the real IE; All you other IEs are just imitating. | 
| @@ -124,9 +124,9 @@ discard block | ||
| 124 | 124 | } | 
| 125 | 125 | |
| 126 | 126 | /** | 
| 127 | - * Determine if the browser is IE11 or not | |
| 128 | - * @return boolean Whether or not the browser is IE11 | |
| 129 | - */ | |
| 127 | + * Determine if the browser is IE11 or not | |
| 128 | + * @return boolean Whether or not the browser is IE11 | |
| 129 | + */ | |
| 130 | 130 | function isIe11() | 
| 131 | 131 |  	{ | 
| 132 | 132 | // IE11 is a bit different than earlier versions | 
| @@ -137,9 +137,9 @@ discard block | ||
| 137 | 137 | } | 
| 138 | 138 | |
| 139 | 139 | /** | 
| 140 | - * Determine if the browser is Edge or not | |
| 141 | - * @return boolean Whether or not the browser is Edge | |
| 142 | - */ | |
| 140 | + * Determine if the browser is Edge or not | |
| 141 | + * @return boolean Whether or not the browser is Edge | |
| 142 | + */ | |
| 143 | 143 | function isEdge() | 
| 144 | 144 |  	{ | 
| 145 | 145 | if (!isset($this->_browsers['is_edge'])) | 
| @@ -148,9 +148,9 @@ discard block | ||
| 148 | 148 | } | 
| 149 | 149 | |
| 150 | 150 | /** | 
| 151 | - * Determine if the browser is a Webkit based one or not | |
| 152 | - * @return boolean Whether or not this is a Webkit-based browser | |
| 153 | - */ | |
| 151 | + * Determine if the browser is a Webkit based one or not | |
| 152 | + * @return boolean Whether or not this is a Webkit-based browser | |
| 153 | + */ | |
| 154 | 154 | function isWebkit() | 
| 155 | 155 |  	{ | 
| 156 | 156 | if (!isset($this->_browsers['is_webkit'])) | 
| @@ -159,9 +159,9 @@ discard block | ||
| 159 | 159 | } | 
| 160 | 160 | |
| 161 | 161 | /** | 
| 162 | - * Determine if the browser is Firefox or one of its variants | |
| 163 | - * @return boolean Whether or not this is Firefox (or one of its variants) | |
| 164 | - */ | |
| 162 | + * Determine if the browser is Firefox or one of its variants | |
| 163 | + * @return boolean Whether or not this is Firefox (or one of its variants) | |
| 164 | + */ | |
| 165 | 165 | function isFirefox() | 
| 166 | 166 |  	{ | 
| 167 | 167 | if (!isset($this->_browsers['is_firefox'])) | 
| @@ -170,9 +170,9 @@ discard block | ||
| 170 | 170 | } | 
| 171 | 171 | |
| 172 | 172 | /** | 
| 173 | - * Determine if the browser is WebTv or not | |
| 174 | - * @return boolean Whether or not this is WebTV | |
| 175 | - */ | |
| 173 | + * Determine if the browser is WebTv or not | |
| 174 | + * @return boolean Whether or not this is WebTV | |
| 175 | + */ | |
| 176 | 176 | function isWebTv() | 
| 177 | 177 |  	{ | 
| 178 | 178 | if (!isset($this->_browsers['is_web_tv'])) | 
| @@ -181,9 +181,9 @@ discard block | ||
| 181 | 181 | } | 
| 182 | 182 | |
| 183 | 183 | /** | 
| 184 | - * Determine if the browser is konqueror or not | |
| 185 | - * @return boolean Whether or not this is Konqueror | |
| 186 | - */ | |
| 184 | + * Determine if the browser is konqueror or not | |
| 185 | + * @return boolean Whether or not this is Konqueror | |
| 186 | + */ | |
| 187 | 187 | function isKonqueror() | 
| 188 | 188 |  	{ | 
| 189 | 189 | if (!isset($this->_browsers['is_konqueror'])) | 
| @@ -192,9 +192,9 @@ discard block | ||
| 192 | 192 | } | 
| 193 | 193 | |
| 194 | 194 | /** | 
| 195 | - * Determine if the browser is Gecko or not | |
| 196 | - * @return boolean Whether or not this is a Gecko-based browser | |
| 197 | - */ | |
| 195 | + * Determine if the browser is Gecko or not | |
| 196 | + * @return boolean Whether or not this is a Gecko-based browser | |
| 197 | + */ | |
| 198 | 198 | function isGecko() | 
| 199 | 199 |  	{ | 
| 200 | 200 | if (!isset($this->_browsers['is_gecko'])) | 
| @@ -203,9 +203,9 @@ discard block | ||
| 203 | 203 | } | 
| 204 | 204 | |
| 205 | 205 | /** | 
| 206 | - * Determine if the browser is Opera Mini or not | |
| 207 | - * @return boolean Whether or not this is Opera Mini | |
| 208 | - */ | |
| 206 | + * Determine if the browser is Opera Mini or not | |
| 207 | + * @return boolean Whether or not this is Opera Mini | |
| 208 | + */ | |
| 209 | 209 | function isOperaMini() | 
| 210 | 210 |  	{ | 
| 211 | 211 | if (!isset($this->_browsers['is_opera_mini'])) | 
| @@ -216,9 +216,9 @@ discard block | ||
| 216 | 216 | } | 
| 217 | 217 | |
| 218 | 218 | /** | 
| 219 | - * Determine if the browser is Opera Mobile or not | |
| 220 | - * @return boolean Whether or not this is Opera Mobile | |
| 221 | - */ | |
| 219 | + * Determine if the browser is Opera Mobile or not | |
| 220 | + * @return boolean Whether or not this is Opera Mobile | |
| 221 | + */ | |
| 222 | 222 | function isOperaMobi() | 
| 223 | 223 |  	{ | 
| 224 | 224 | if (!isset($this->_browsers['is_opera_mobi'])) | 
| @@ -523,7 +523,6 @@ discard block | ||
| 523 | 523 | /** | 
| 524 | 524 | * Copy image. | 
| 525 | 525 | * Used when imagecopyresample() is not available. | 
| 526 | - | |
| 527 | 526 | * @param resource $dst_img The destination image - a GD image resource | 
| 528 | 527 | * @param resource $src_img The source image - a GD image resource | 
| 529 | 528 | * @param int $dst_x The "x" coordinate of the destination image | 
| @@ -754,7 +753,6 @@ discard block | ||
| 754 | 753 | |
| 755 | 754 | /** | 
| 756 | 755 | * Writes a gif file to disk as a png file. | 
| 757 | - | |
| 758 | 756 | * @param resource $gif A gif image resource | 
| 759 | 757 | * @param string $lpszFileName The name of the file | 
| 760 | 758 | * @param int $background_color The background color | 
| @@ -842,7 +842,7 @@ | ||
| 842 | 842 | require_once($sourcedir . '/Subs-Boards.php'); | 
| 843 | 843 | sortBoards($recycle_boards); | 
| 844 | 844 | |
| 845 | -        $recycle_boards = array('') + $recycle_boards; | |
| 845 | +		$recycle_boards = array('') + $recycle_boards; | |
| 846 | 846 | |
| 847 | 847 | // Here and the board settings... | 
| 848 | 848 | $config_vars = array( | 
| @@ -694,7 +694,6 @@ | ||
| 694 | 694 | * It shows as the maintain_forum admin area. | 
| 695 | 695 | * It is accessed from ?action=admin;area=maintain;sa=database;activity=optimize. | 
| 696 | 696 | * It also updates the optimize scheduled task such that the tables are not automatically optimized again too soon. | 
| 697 | - | |
| 698 | 697 | * @uses the optimize sub template | 
| 699 | 698 | */ | 
| 700 | 699 | function OptimizeTables() |