@@ -89,7 +89,9 @@ |
||
| 89 | 89 | <li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li> |
| 90 | 90 | <li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li> |
| 91 | 91 | </ul> |
| 92 | - <?php if ($user_info['is_admin']) { ?> |
|
| 92 | + <?php if ($user_info['is_admin']) |
|
| 93 | +{ |
|
| 94 | +?> |
|
| 93 | 95 | <h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3> |
| 94 | 96 | <ul> |
| 95 | 97 | <li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li> |
@@ -310,7 +310,6 @@ discard block |
||
| 310 | 310 | $replacement .= $precedingStyle . $extra_attr . $afterStyle; |
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | - |
|
| 314 | 313 | elseif (preg_match('~</([A-Za-z]+)>~', $part, $matches) === 1) |
| 315 | 314 | { |
| 316 | 315 | // Is this the element that we've been waiting for to be closed? |
@@ -570,7 +569,6 @@ discard block |
||
| 570 | 569 | $parts[$i + 2] = str_repeat("\t", $listDepth) . '[/list]'; |
| 571 | 570 | $parts[$i + 3] = ''; |
| 572 | 571 | } |
| 573 | - |
|
| 574 | 572 | else |
| 575 | 573 | { |
| 576 | 574 | // We're in a list item. |
@@ -609,7 +607,6 @@ discard block |
||
| 609 | 607 | $parts[$i + 2] = ''; |
| 610 | 608 | $parts[$i + 3] = ''; |
| 611 | 609 | } |
| 612 | - |
|
| 613 | 610 | else |
| 614 | 611 | { |
| 615 | 612 | // Remove the trailing breaks from the list item. |
@@ -1254,7 +1254,6 @@ |
||
| 1254 | 1254 | |
| 1255 | 1255 | return array($charset, $string, 'base64'); |
| 1256 | 1256 | } |
| 1257 | - |
|
| 1258 | 1257 | else |
| 1259 | 1258 | return array($charset, $string, '7bit'); |
| 1260 | 1259 | } |
@@ -1997,7 +1997,9 @@ |
||
| 1997 | 1997 | // Remove anything that isn't actually new from our list of files |
| 1998 | 1998 | foreach ($to_unset as $key => $ids) |
| 1999 | 1999 | { |
| 2000 | - if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true) |
|
| 2000 | + if (array_reduce($ids, function ($carry, $item) |
|
| 2001 | + { |
|
| 2002 | +return $carry * $item; }, true) == true) |
|
| 2001 | 2003 | unset($smiley_files[$key]); |
| 2002 | 2004 | } |
| 2003 | 2005 | |
@@ -94,7 +94,8 @@ discard block |
||
| 94 | 94 | { |
| 95 | 95 | $input = mb_strtolower($input, $this->encoding); |
| 96 | 96 | $parts = explode('.', $input); |
| 97 | - foreach ($parts as &$part) { |
|
| 97 | + foreach ($parts as &$part) |
|
| 98 | + { |
|
| 98 | 99 | $part = $this->encodePart($part); |
| 99 | 100 | } |
| 100 | 101 | $output = implode('.', $parts); |
@@ -119,13 +120,16 @@ discard block |
||
| 119 | 120 | $h = $b = count($codePoints['basic']); |
| 120 | 121 | |
| 121 | 122 | $output = ''; |
| 122 | - foreach ($codePoints['basic'] as $code) { |
|
| 123 | + foreach ($codePoints['basic'] as $code) |
|
| 124 | + { |
|
| 123 | 125 | $output .= $this->codePointToChar($code); |
| 124 | 126 | } |
| 125 | - if ($input === $output) { |
|
| 127 | + if ($input === $output) |
|
| 128 | + { |
|
| 126 | 129 | return $output; |
| 127 | 130 | } |
| 128 | - if ($b > 0) { |
|
| 131 | + if ($b > 0) |
|
| 132 | + { |
|
| 129 | 133 | $output .= static::DELIMITER; |
| 130 | 134 | } |
| 131 | 135 | |
@@ -134,20 +138,26 @@ discard block |
||
| 134 | 138 | |
| 135 | 139 | $i = 0; |
| 136 | 140 | $length = mb_strlen($input, $this->encoding); |
| 137 | - while ($h < $length) { |
|
| 141 | + while ($h < $length) |
|
| 142 | + { |
|
| 138 | 143 | $m = $codePoints['nonBasic'][$i++]; |
| 139 | 144 | $delta = $delta + ($m - $n) * ($h + 1); |
| 140 | 145 | $n = $m; |
| 141 | 146 | |
| 142 | - foreach ($codePoints['all'] as $c) { |
|
| 143 | - if ($c < $n || $c < static::INITIAL_N) { |
|
| 147 | + foreach ($codePoints['all'] as $c) |
|
| 148 | + { |
|
| 149 | + if ($c < $n || $c < static::INITIAL_N) |
|
| 150 | + { |
|
| 144 | 151 | $delta++; |
| 145 | 152 | } |
| 146 | - if ($c === $n) { |
|
| 153 | + if ($c === $n) |
|
| 154 | + { |
|
| 147 | 155 | $q = $delta; |
| 148 | - for ($k = static::BASE;; $k += static::BASE) { |
|
| 156 | + for ($k = static::BASE;; $k += static::BASE) |
|
| 157 | + { |
|
| 149 | 158 | $t = $this->calculateThreshold($k, $bias); |
| 150 | - if ($q < $t) { |
|
| 159 | + if ($q < $t) |
|
| 160 | + { |
|
| 151 | 161 | break; |
| 152 | 162 | } |
| 153 | 163 | |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if (!is_callable('random_bytes')) |
|
| 30 | +{ |
|
| 30 | 31 | /** |
| 31 | 32 | * Powered by ext/mcrypt (and thankfully NOT libmcrypt) |
| 32 | 33 | * |
@@ -41,16 +42,20 @@ discard block |
||
| 41 | 42 | */ |
| 42 | 43 | function random_bytes($bytes) |
| 43 | 44 | { |
| 44 | - try { |
|
| 45 | + try |
|
| 46 | + { |
|
| 45 | 47 | /** @var int $bytes */ |
| 46 | 48 | $bytes = RandomCompat_intval($bytes); |
| 47 | - } catch (TypeError $ex) { |
|
| 49 | + } |
|
| 50 | + catch (TypeError $ex) |
|
| 51 | + { |
|
| 48 | 52 | throw new TypeError( |
| 49 | 53 | 'random_bytes(): $bytes must be an integer' |
| 50 | 54 | ); |
| 51 | 55 | } |
| 52 | 56 | |
| 53 | - if ($bytes < 1) { |
|
| 57 | + if ($bytes < 1) |
|
| 58 | + { |
|
| 54 | 59 | throw new Error( |
| 55 | 60 | 'Length must be greater than 0' |
| 56 | 61 | ); |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if (!is_callable('random_bytes')) |
|
| 30 | +{ |
|
| 30 | 31 | /** |
| 31 | 32 | * Windows with PHP < 5.3.0 will not have the function |
| 32 | 33 | * openssl_random_pseudo_bytes() available, so let's use |
@@ -40,16 +41,20 @@ discard block |
||
| 40 | 41 | */ |
| 41 | 42 | function random_bytes($bytes) |
| 42 | 43 | { |
| 43 | - try { |
|
| 44 | + try |
|
| 45 | + { |
|
| 44 | 46 | /** @var int $bytes */ |
| 45 | 47 | $bytes = RandomCompat_intval($bytes); |
| 46 | - } catch (TypeError $ex) { |
|
| 48 | + } |
|
| 49 | + catch (TypeError $ex) |
|
| 50 | + { |
|
| 47 | 51 | throw new TypeError( |
| 48 | 52 | 'random_bytes(): $bytes must be an integer' |
| 49 | 53 | ); |
| 50 | 54 | } |
| 51 | 55 | |
| 52 | - if ($bytes < 1) { |
|
| 56 | + if ($bytes < 1) |
|
| 57 | + { |
|
| 53 | 58 | throw new Error( |
| 54 | 59 | 'Length must be greater than 0' |
| 55 | 60 | ); |
@@ -57,7 +62,8 @@ discard block |
||
| 57 | 62 | |
| 58 | 63 | /** @var string $buf */ |
| 59 | 64 | $buf = ''; |
| 60 | - if (!class_exists('COM')) { |
|
| 65 | + if (!class_exists('COM')) |
|
| 66 | + { |
|
| 61 | 67 | throw new Error( |
| 62 | 68 | 'COM does not exist' |
| 63 | 69 | ); |
@@ -72,7 +78,8 @@ discard block |
||
| 72 | 78 | */ |
| 73 | 79 | do { |
| 74 | 80 | $buf .= base64_decode((string) $util->GetRandom($bytes, 0)); |
| 75 | - if (RandomCompat_strlen($buf) >= $bytes) { |
|
| 81 | + if (RandomCompat_strlen($buf) >= $bytes) |
|
| 82 | + { |
|
| 76 | 83 | /** |
| 77 | 84 | * Return our random entropy buffer here: |
| 78 | 85 | */ |
@@ -26,7 +26,8 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if (!is_callable('random_bytes')) |
|
| 30 | +{ |
|
| 30 | 31 | /** |
| 31 | 32 | * If the libsodium PHP extension is loaded, we'll use it above any other |
| 32 | 33 | * solution. |
@@ -42,16 +43,20 @@ discard block |
||
| 42 | 43 | */ |
| 43 | 44 | function random_bytes($bytes) |
| 44 | 45 | { |
| 45 | - try { |
|
| 46 | + try |
|
| 47 | + { |
|
| 46 | 48 | /** @var int $bytes */ |
| 47 | 49 | $bytes = RandomCompat_intval($bytes); |
| 48 | - } catch (TypeError $ex) { |
|
| 50 | + } |
|
| 51 | + catch (TypeError $ex) |
|
| 52 | + { |
|
| 49 | 53 | throw new TypeError( |
| 50 | 54 | 'random_bytes(): $bytes must be an integer' |
| 51 | 55 | ); |
| 52 | 56 | } |
| 53 | 57 | |
| 54 | - if ($bytes < 1) { |
|
| 58 | + if ($bytes < 1) |
|
| 59 | + { |
|
| 55 | 60 | throw new Error( |
| 56 | 61 | 'Length must be greater than 0' |
| 57 | 62 | ); |
@@ -66,19 +71,25 @@ discard block |
||
| 66 | 71 | * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
| 67 | 72 | * generated in one invocation. |
| 68 | 73 | */ |
| 69 | - if ($bytes > 2147483647) { |
|
| 70 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 74 | + if ($bytes > 2147483647) |
|
| 75 | + { |
|
| 76 | + for ($i = 0; $i < $bytes; $i += 1073741824) |
|
| 77 | + { |
|
| 71 | 78 | $n = ($bytes - $i) > 1073741824 |
| 72 | 79 | ? 1073741824 |
| 73 | 80 | : $bytes - $i; |
| 74 | 81 | $buf .= Sodium::randombytes_buf((int) $n); |
| 75 | 82 | } |
| 76 | - } else { |
|
| 83 | + } |
|
| 84 | + else |
|
| 85 | + { |
|
| 77 | 86 | $buf .= Sodium::randombytes_buf((int) $bytes); |
| 78 | 87 | } |
| 79 | 88 | |
| 80 | - if (is_string($buf)) { |
|
| 81 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 89 | + if (is_string($buf)) |
|
| 90 | + { |
|
| 91 | + if (RandomCompat_strlen($buf) === $bytes) |
|
| 92 | + { |
|
| 82 | 93 | return $buf; |
| 83 | 94 | } |
| 84 | 95 | } |
@@ -29,7 +29,8 @@ discard block |
||
| 29 | 29 | * SOFTWARE. |
| 30 | 30 | */ |
| 31 | 31 | |
| 32 | -if (!defined('PHP_VERSION_ID')) { |
|
| 32 | +if (!defined('PHP_VERSION_ID')) |
|
| 33 | +{ |
|
| 33 | 34 | // This constant was introduced in PHP 5.2.7 |
| 34 | 35 | $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION)); |
| 35 | 36 | define( |
@@ -44,11 +45,13 @@ discard block |
||
| 44 | 45 | /** |
| 45 | 46 | * PHP 7.0.0 and newer have these functions natively. |
| 46 | 47 | */ |
| 47 | -if (PHP_VERSION_ID >= 70000) { |
|
| 48 | +if (PHP_VERSION_ID >= 70000) |
|
| 49 | +{ |
|
| 48 | 50 | return; |
| 49 | 51 | } |
| 50 | 52 | |
| 51 | -if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
|
| 53 | +if (!defined('RANDOM_COMPAT_READ_BUFFER')) |
|
| 54 | +{ |
|
| 52 | 55 | define('RANDOM_COMPAT_READ_BUFFER', 8); |
| 53 | 56 | } |
| 54 | 57 | |
@@ -58,7 +61,8 @@ discard block |
||
| 58 | 61 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php'; |
| 59 | 62 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php'; |
| 60 | 63 | |
| 61 | -if (!is_callable('random_bytes')) { |
|
| 64 | +if (!is_callable('random_bytes')) |
|
| 65 | +{ |
|
| 62 | 66 | /** |
| 63 | 67 | * PHP 5.2.0 - 5.6.x way to implement random_bytes() |
| 64 | 68 | * |
@@ -73,11 +77,15 @@ discard block |
||
| 73 | 77 | * |
| 74 | 78 | * See RATIONALE.md for our reasoning behind this particular order |
| 75 | 79 | */ |
| 76 | - if (extension_loaded('libsodium')) { |
|
| 80 | + if (extension_loaded('libsodium')) |
|
| 81 | + { |
|
| 77 | 82 | // See random_bytes_libsodium.php |
| 78 | - if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { |
|
| 83 | + if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) |
|
| 84 | + { |
|
| 79 | 85 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php'; |
| 80 | - } elseif (method_exists('Sodium', 'randombytes_buf')) { |
|
| 86 | + } |
|
| 87 | + elseif (method_exists('Sodium', 'randombytes_buf')) |
|
| 88 | + { |
|
| 81 | 89 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php'; |
| 82 | 90 | } |
| 83 | 91 | } |
@@ -85,13 +93,15 @@ discard block |
||
| 85 | 93 | /** |
| 86 | 94 | * Reading directly from /dev/urandom: |
| 87 | 95 | */ |
| 88 | - if (DIRECTORY_SEPARATOR === '/') { |
|
| 96 | + if (DIRECTORY_SEPARATOR === '/') |
|
| 97 | + { |
|
| 89 | 98 | // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast |
| 90 | 99 | // way to exclude Windows. |
| 91 | 100 | $RandomCompatUrandom = true; |
| 92 | 101 | $RandomCompat_basedir = ini_get('open_basedir'); |
| 93 | 102 | |
| 94 | - if (!empty($RandomCompat_basedir)) { |
|
| 103 | + if (!empty($RandomCompat_basedir)) |
|
| 104 | + { |
|
| 95 | 105 | $RandomCompat_open_basedir = explode( |
| 96 | 106 | PATH_SEPARATOR, |
| 97 | 107 | strtolower($RandomCompat_basedir) |
@@ -121,7 +131,9 @@ discard block |
||
| 121 | 131 | } |
| 122 | 132 | // Unset variables after use |
| 123 | 133 | $RandomCompat_basedir = null; |
| 124 | - } else { |
|
| 134 | + } |
|
| 135 | + else |
|
| 136 | + { |
|
| 125 | 137 | $RandomCompatUrandom = false; |
| 126 | 138 | } |
| 127 | 139 | |
@@ -179,14 +191,19 @@ discard block |
||
| 179 | 191 | strtolower(ini_get('disable_classes')) |
| 180 | 192 | ); |
| 181 | 193 | |
| 182 | - if (!in_array('com', $RandomCompat_disabled_classes)) { |
|
| 183 | - try { |
|
| 194 | + if (!in_array('com', $RandomCompat_disabled_classes)) |
|
| 195 | + { |
|
| 196 | + try |
|
| 197 | + { |
|
| 184 | 198 | $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); |
| 185 | - if (method_exists($RandomCompatCOMtest, 'GetRandom')) { |
|
| 199 | + if (method_exists($RandomCompatCOMtest, 'GetRandom')) |
|
| 200 | + { |
|
| 186 | 201 | // See random_bytes_com_dotnet.php |
| 187 | 202 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php'; |
| 188 | 203 | } |
| 189 | - } catch (com_exception $e) { |
|
| 204 | + } |
|
| 205 | + catch (com_exception $e) |
|
| 206 | + { |
|
| 190 | 207 | // Don't try to use it. |
| 191 | 208 | } |
| 192 | 209 | } |
@@ -197,7 +214,8 @@ discard block |
||
| 197 | 214 | /** |
| 198 | 215 | * throw new Exception |
| 199 | 216 | */ |
| 200 | - if (!is_callable('random_bytes')) { |
|
| 217 | + if (!is_callable('random_bytes')) |
|
| 218 | + { |
|
| 201 | 219 | /** |
| 202 | 220 | * We don't have any more options, so let's throw an exception right now |
| 203 | 221 | * and hope the developer won't let it fail silently. |
@@ -218,7 +236,8 @@ discard block |
||
| 218 | 236 | } |
| 219 | 237 | } |
| 220 | 238 | |
| 221 | -if (!is_callable('random_int')) { |
|
| 239 | +if (!is_callable('random_int')) |
|
| 240 | +{ |
|
| 222 | 241 | require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php'; |
| 223 | 242 | } |
| 224 | 243 | |