1
+ − 1 <?php
+ − 2
+ − 3 /*
+ − 4 * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
73
0a74676a2f2f
Made the move to Loch Ness, and got some basic page grouping functionality working. TODO: fix some UI issues in Javascript ACL editor and change non-JS ACL editor to work with page groups too
Dan
diff
changeset
+ − 5 * Version 1.0.1 (Loch Ness)
1
+ − 6 * Copyright (C) 2006-2007 Dan Fuhry
+ − 7 *
+ − 8 * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
+ − 9 * as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+ − 10 *
+ − 11 * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+ − 12 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
+ − 13 */
22
+ − 14
+ − 15 /**
+ − 16 * Fetch a value from the site configuration.
+ − 17 * @param string The identifier of the value ("site_name" etc.)
+ − 18 * @return string Configuration value, or bool(false) if the value is not set
+ − 19 */
+ − 20
+ − 21 function getConfig($n)
+ − 22 {
1
+ − 23 global $enano_config;
22
+ − 24 if ( isset( $enano_config[ $n ] ) )
+ − 25 {
+ − 26 return $enano_config[$n];
+ − 27 }
+ − 28 else
+ − 29 {
+ − 30 return false;
+ − 31 }
1
+ − 32 }
+ − 33
22
+ − 34 /**
+ − 35 * Update or change a configuration value.
+ − 36 * @param string The identifier of the value ("site_name" etc.)
+ − 37 * @param string The new value
+ − 38 * @return null
+ − 39 */
+ − 40
+ − 41 function setConfig($n, $v)
+ − 42 {
76
+ − 43
1
+ − 44 global $enano_config, $db;
+ − 45 $enano_config[$n] = $v;
+ − 46 $v = $db->escape($v);
76
+ − 47
22
+ − 48 $e = $db->sql_query('DELETE FROM '.table_prefix.'config WHERE config_name=\''.$n.'\';');
+ − 49 if ( !$e )
+ − 50 {
+ − 51 $db->_die('Error during generic setConfig() call row deletion.');
+ − 52 }
76
+ − 53
22
+ − 54 $e = $db->sql_query('INSERT INTO '.table_prefix.'config(config_name, config_value) VALUES(\''.$n.'\', \''.$v.'\')');
+ − 55 if ( !$e )
+ − 56 {
+ − 57 $db->_die('Error during generic setConfig() call row insertion.');
+ − 58 }
1
+ − 59 }
+ − 60
22
+ − 61 /**
+ − 62 * Create a URI for an internal link.
+ − 63 * @param string The full identifier of the page to link to (Special:Administration)
+ − 64 * @param string The GET query string to append
+ − 65 * @param bool If true, perform htmlspecialchars() on the return value to make it HTML-safe
+ − 66 * @return string
+ − 67 */
+ − 68
1
+ − 69 function makeUrl($t, $query = false, $escape = false)
+ − 70 {
+ − 71 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 72 $flags = '';
+ − 73 $sep = urlSeparator;
91
+ − 74 $t = sanitize_page_id($t);
22
+ − 75 if ( isset($_GET['printable'] ) )
+ − 76 {
+ − 77 $flags .= $sep . 'printable=yes';
+ − 78 $sep = '&';
+ − 79 }
+ − 80 if ( isset($_GET['theme'] ) )
+ − 81 {
+ − 82 $flags .= $sep . 'theme='.$session->theme;
+ − 83 $sep = '&';
+ − 84 }
+ − 85 if ( isset($_GET['style'] ) ) {
76
+ − 86 $flags .= $sep . 'style='.$session->style;
22
+ − 87 $sep = '&';
+ − 88 }
76
+ − 89
1
+ − 90 $url = $session->append_sid(contentPath.$t.$flags);
+ − 91 if($query)
+ − 92 {
+ − 93 $sep = strstr($url, '?') ? '&' : '?';
+ − 94 $url = $url . $sep . $query;
+ − 95 }
76
+ − 96
1
+ − 97 return ($escape) ? htmlspecialchars($url) : $url;
+ − 98 }
+ − 99
22
+ − 100 /**
+ − 101 * Create a URI for an internal link, and be namespace-friendly. Watch out for this one because it's different from most other Enano functions, in that the namespace is the first parameter.
+ − 102 * @param string The namespace ID
+ − 103 * @param string The page ID
+ − 104 * @param string The GET query string to append
+ − 105 * @param bool If true, perform htmlspecialchars() on the return value to make it HTML-safe
+ − 106 * @return string
+ − 107 */
+ − 108
1
+ − 109 function makeUrlNS($n, $t, $query = false, $escape = false)
+ − 110 {
+ − 111 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 112 $flags = '';
76
+ − 113
1
+ − 114 if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ − 115 {
22
+ − 116 $sep = urlSeparator;
1
+ − 117 }
+ − 118 else
+ − 119 {
22
+ − 120 $sep = (strstr($_SERVER['REQUEST_URI'], '?')) ? '&' : '?';
+ − 121 }
+ − 122 if ( isset( $_GET['printable'] ) ) {
+ − 123 $flags .= $sep . 'printable';
+ − 124 $sep = '&';
+ − 125 }
76
+ − 126 if ( isset( $_GET['theme'] ) )
22
+ − 127 {
+ − 128 $flags .= $sep . 'theme='.$session->theme;
+ − 129 $sep = '&';
+ − 130 }
+ − 131 if ( isset( $_GET['style'] ) )
+ − 132 {
+ − 133 $flags .= $sep . 'style='.$session->style;
+ − 134 $sep = '&';
+ − 135 }
76
+ − 136
22
+ − 137 if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ − 138 {
+ − 139 $url = contentPath . $paths->nslist[$n] . $t . $flags;
+ − 140 }
+ − 141 else
+ − 142 {
+ − 143 // If the path manager hasn't been initted yet, take an educated guess at what the URI should be
+ − 144 $url = contentPath . $n . ':' . $t . $flags;
1
+ − 145 }
76
+ − 146
1
+ − 147 if($query)
+ − 148 {
76
+ − 149 if(strstr($url, '?'))
22
+ − 150 {
+ − 151 $sep = '&';
+ − 152 }
+ − 153 else
+ − 154 {
+ − 155 $sep = '?';
+ − 156 }
1
+ − 157 $url = $url . $sep . $query . $flags;
+ − 158 }
76
+ − 159
1
+ − 160 if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ − 161 {
+ − 162 $url = $session->append_sid($url);
+ − 163 }
76
+ − 164
1
+ − 165 return ($escape) ? htmlspecialchars($url) : $url;
+ − 166 }
+ − 167
22
+ − 168 /**
+ − 169 * Create a URI for an internal link, be namespace-friendly, and add http://hostname/scriptpath to the beginning if possible. Watch out for this one because it's different from most other Enano functions, in that the namespace is the first parameter.
+ − 170 * @param string The namespace ID
+ − 171 * @param string The page ID
+ − 172 * @param string The GET query string to append
+ − 173 * @param bool If true, perform htmlspecialchars() on the return value to make it HTML-safe
+ − 174 * @return string
+ − 175 */
+ − 176
1
+ − 177 function makeUrlComplete($n, $t, $query = false, $escape = false)
+ − 178 {
+ − 179 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 180 $flags = '';
76
+ − 181
22
+ − 182 if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ − 183 {
+ − 184 $sep = urlSeparator;
+ − 185 }
+ − 186 else
+ − 187 {
+ − 188 $sep = (strstr($_SERVER['REQUEST_URI'], '?')) ? '&' : '?';
+ − 189 }
+ − 190 if ( isset( $_GET['printable'] ) ) {
+ − 191 $flags .= $sep . 'printable';
+ − 192 $sep = '&';
+ − 193 }
76
+ − 194 if ( isset( $_GET['theme'] ) )
22
+ − 195 {
+ − 196 $flags .= $sep . 'theme='.$session->theme;
+ − 197 $sep = '&';
+ − 198 }
+ − 199 if ( isset( $_GET['style'] ) )
+ − 200 {
+ − 201 $flags .= $sep . 'style='.$session->style;
+ − 202 $sep = '&';
+ − 203 }
76
+ − 204
22
+ − 205 if(defined('ENANO_BASE_CLASSES_INITIALIZED'))
+ − 206 {
+ − 207 $url = $session->append_sid(contentPath . $paths->nslist[$n] . $t . $flags);
+ − 208 }
+ − 209 else
+ − 210 {
+ − 211 // If the path manager hasn't been initted yet, take an educated guess at what the URI should be
+ − 212 $url = contentPath . $n . ':' . $t . $flags;
+ − 213 }
1
+ − 214 if($query)
+ − 215 {
+ − 216 if(strstr($url, '?')) $sep = '&';
+ − 217 else $sep = '?';
+ − 218 $url = $url . $sep . $query . $flags;
+ − 219 }
76
+ − 220
1
+ − 221 $baseprot = 'http' . ( isset($_SERVER['HTTPS']) ? 's' : '' ) . '://' . $_SERVER['HTTP_HOST'];
+ − 222 $url = $baseprot . $url;
76
+ − 223
1
+ − 224 return ($escape) ? htmlspecialchars($url) : $url;
+ − 225 }
+ − 226
+ − 227 /**
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 228 * Tells you the title for the given page ID string
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 229 * @param string Page ID string (ex: Special:Administration)
91
+ − 230 * @param bool Optional. If true, and if the namespace turns out to be something other than Article, the namespace prefix will be prepended to the return value.
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 231 * @return string
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 232 */
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 233
91
+ − 234 function get_page_title($page_id, $show_ns = true)
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 235 {
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 236 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 237
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 238 $idata = RenderMan::strToPageID($page_id);
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 239 $page_id_key = $paths->nslist[ $idata[1] ] . $idata[0];
91
+ − 240 $page_id_key = sanitize_page_id($page_id_key);
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 241 $page_data = $paths->pages[$page_id_key];
91
+ − 242 $title = ( isset($page_data['name']) ) ?
+ − 243 ( ( $page_data['namespace'] == 'Article' || !$show_ns ) ?
+ − 244 '' :
+ − 245 $paths->nslist[ $idata[1] ] )
+ − 246 . $page_data['name'] :
+ − 247 ( $show_ns ? $paths->nslist[$idata[1]] : '' ) . str_replace('_', ' ', dirtify_page_id( $idata[0] ) );
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 248 return $title;
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 249 }
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 250
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 251 /**
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 252 * Tells you the title for the given page ID and namespace
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 253 * @param string Page ID
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 254 * @param string Namespace
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 255 * @return string
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 256 */
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 257
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 258 function get_page_title_ns($page_id, $namespace)
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 259 {
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 260 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 261
62
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 262 $page_id_key = $paths->nslist[ $namespace ] . $page_id;
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 263 $page_data = $paths->pages[$page_id_key];
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 264 $title = ( isset($page_data['name']) ) ? $page_data['name'] : $paths->nslist[$namespace] . str_replace('_', ' ', dirtify_page_id( $page_id ) );
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 265 return $title;
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 266 }
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 267
9dc4fded30e6
Redirect pages actually work stable-ish now; critical extraneous debug message removed (oops!)
Dan
diff
changeset
+ − 268 /**
1
+ − 269 * Redirect the user to the specified URL.
+ − 270 * @param string $url The URL, either relative or absolute.
+ − 271 * @param string $title The title of the message
+ − 272 * @param string $message A short message to show to the user
+ − 273 * @param string $timeout Timeout, in seconds, to delay the redirect. Defaults to 3.
+ − 274 */
76
+ − 275
1
+ − 276 function redirect($url, $title = 'Redirecting...', $message = 'Please wait while you are redirected.', $timeout = 3)
+ − 277 {
+ − 278 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 279
1
+ − 280 if ( $timeout == 0 )
+ − 281 {
+ − 282 header('Location: ' . $url);
+ − 283 header('HTTP/1.1 307 Temporary Redirect');
+ − 284 }
76
+ − 285
1
+ − 286 $template->add_header('<meta http-equiv="refresh" content="' . $timeout . '; url=' . str_replace('"', '\\"', $url) . '" />');
+ − 287 $template->add_header('<script type="text/javascript">
+ − 288 function __r() {
+ − 289 // FUNCTION AUTOMATICALLY GENERATED
+ − 290 window.location="' . str_replace('"', '\\"', $url) . '";
+ − 291 }
+ − 292 setTimeout(\'__r();\', ' . $timeout . '000);
+ − 293 </script>
+ − 294 ');
76
+ − 295
1
+ − 296 $template->tpl_strings['PAGE_NAME'] = $title;
+ − 297 $template->header(true);
+ − 298 echo '<p>' . $message . '</p><p>If you are not redirected within ' . ( $timeout + 1 ) . ' seconds, <a href="' . str_replace('"', '\\"', $url) . '">please click here</a>.</p>';
+ − 299 $template->footer(true);
76
+ − 300
1
+ − 301 $db->close();
+ − 302 exit(0);
76
+ − 303
1
+ − 304 }
+ − 305
+ − 306 // Removed wikiFormat() from here, replaced with RenderMan::render
+ − 307
22
+ − 308 /**
+ − 309 * Tell me if the page exists or not.
+ − 310 * @param string the full page ID (Special:Administration) of the page to check for
+ − 311 * @return bool True if the page exists, false otherwise
+ − 312 */
+ − 313
1
+ − 314 function isPage($p) {
+ − 315 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 316
22
+ − 317 // Try the easy way first ;-)
+ − 318 if ( isset( $paths->pages[ $p ] ) )
+ − 319 {
+ − 320 return true;
+ − 321 }
76
+ − 322
22
+ − 323 // Special case for Special, Template, and Admin pages that can't have slashes in their URIs
+ − 324 $ns_test = RenderMan::strToPageID( $p );
76
+ − 325
22
+ − 326 if($ns_test[1] != 'Special' && $ns_test[1] != 'Template' && $ns_test[1] != 'Admin')
+ − 327 {
+ − 328 return false;
+ − 329 }
76
+ − 330
22
+ − 331 $particles = explode('/', $p);
+ − 332 if ( isset ( $paths->pages[ $particles[ 0 ] ] ) )
+ − 333 {
+ − 334 return true;
+ − 335 }
+ − 336 else
+ − 337 {
+ − 338 return false;
+ − 339 }
1
+ − 340 }
+ − 341
76
+ − 342 /**
+ − 343 * These are some old functions that were used with the Midget codebase. They are deprecated and should not be used any more.
+ − 344 */
+ − 345
1
+ − 346 function arrayItemUp($arr, $keyname) {
+ − 347 $keylist = array_keys($arr);
+ − 348 $keyflop = array_flip($keylist);
+ − 349 $idx = $keyflop[$keyname];
+ − 350 $idxm = $idx - 1;
+ − 351 $temp = $arr[$keylist[$idxm]];
+ − 352 if($arr[$keylist[0]] == $arr[$keyname]) return $arr;
+ − 353 $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
+ − 354 $arr[$keylist[$idx]] = $temp;
+ − 355 return $arr;
+ − 356 }
+ − 357
+ − 358 function arrayItemDown($arr, $keyname) {
+ − 359 $keylist = array_keys($arr);
+ − 360 $keyflop = array_flip($keylist);
+ − 361 $idx = $keyflop[$keyname];
+ − 362 $idxm = $idx + 1;
+ − 363 $temp = $arr[$keylist[$idxm]];
+ − 364 $sz = sizeof($arr); $sz--;
+ − 365 if($arr[$keylist[$sz]] == $arr[$keyname]) return $arr;
+ − 366 $arr[$keylist[$idxm]] = $arr[$keylist[$idx]];
+ − 367 $arr[$keylist[$idx]] = $temp;
+ − 368 return $arr;
+ − 369 }
+ − 370
+ − 371 function arrayItemTop($arr, $keyname) {
+ − 372 $keylist = array_keys($arr);
+ − 373 $keyflop = array_flip($keylist);
+ − 374 $idx = $keyflop[$keyname];
+ − 375 while( $orig != $arr[$keylist[0]] ) {
+ − 376 // echo 'Keyname: '.$keylist[$idx] . '<br />'; flush(); ob_flush(); // Debugger
+ − 377 if($idx < 0) return $arr;
+ − 378 if($keylist[$idx] == '' || $keylist[$idx] < 0 || !$keylist[$idx]) {
+ − 379 /* echo 'Infinite loop caught in arrayItemTop(<br /><pre>';
+ − 380 print_r($arr);
+ − 381 echo '</pre><br />, '.$keyname.');<br /><br />EnanoCMS: Critical error during function call, exiting to prevent excessive server load.';
+ − 382 exit; */
+ − 383 return $arr;
+ − 384 }
+ − 385 $arr = arrayItemUp($arr, $keylist[$idx]);
+ − 386 $idx--;
+ − 387 }
+ − 388 return $arr;
+ − 389 }
+ − 390
+ − 391 function arrayItemBottom($arr, $keyname) {
+ − 392 $keylist = array_keys($arr);
+ − 393 $keyflop = array_flip($keylist);
+ − 394 $idx = $keyflop[$keyname];
+ − 395 $sz = sizeof($arr); $sz--;
+ − 396 while( $orig != $arr[$keylist[$sz]] ) {
+ − 397 // echo 'Keyname: '.$keylist[$idx] . '<br />'; flush(); ob_flush(); // Debugger
+ − 398 if($idx > $sz) return $arr;
+ − 399 if($keylist[$idx] == '' || $keylist[$idx] < 0 || !$keylist[$idx]) {
+ − 400 echo 'Infinite loop caught in arrayItemBottom(<br /><pre>';
+ − 401 print_r($arr);
+ − 402 echo '</pre><br />, '.$keyname.');<br /><br />EnanoCMS: Critical error during function call, exiting to prevent excessive server load.';
+ − 403 exit;
+ − 404 }
+ − 405 $arr = arrayItemDown($arr, $keylist[$idx]);
+ − 406 $idx++;
+ − 407 }
+ − 408 return $arr;
+ − 409 }
+ − 410
+ − 411 // Convert IP address to hex string
+ − 412 // Input: 127.0.0.1 (string)
+ − 413 // Output: 0x7f000001 (string)
+ − 414 // Updated 12/8/06 to work with PHP4 and not use eval() (blech)
+ − 415 function ip2hex($ip) {
+ − 416 if ( preg_match('/^([0-9a-f:]+)$/', $ip) )
+ − 417 {
+ − 418 // this is an ipv6 address
+ − 419 return str_replace(':', '', $ip);
+ − 420 }
+ − 421 $nums = explode('.', $ip);
+ − 422 if(sizeof($nums) != 4) return false;
+ − 423 $str = '0x';
+ − 424 foreach($nums as $n)
+ − 425 {
+ − 426 $str .= (string)dechex($n);
+ − 427 }
+ − 428 return $str;
+ − 429 }
+ − 430
+ − 431 // Convert DWord to IP address
+ − 432 // Input: 0x7f000001
+ − 433 // Output: 127.0.0.1
+ − 434 // Updated 12/8/06 to work with PHP4 and not use eval() (blech)
+ − 435 function hex2ip($in) {
+ − 436 if(substr($in, 0, 2) == '0x') $ip = substr($in, 2, 8);
+ − 437 else $ip = substr($in, 0, 8);
+ − 438 $octets = enano_str_split($ip, 2);
+ − 439 $str = '';
+ − 440 $newoct = Array();
+ − 441 foreach($octets as $o)
+ − 442 {
+ − 443 $o = (int)hexdec($o);
+ − 444 $newoct[] = $o;
+ − 445 }
+ − 446 return implode('.', $newoct);
+ − 447 }
+ − 448
+ − 449 // Function strip_php moved to RenderMan class
+ − 450
76
+ − 451 /**
+ − 452 * Immediately brings the site to a halt with an error message. Unlike grinding_halt() this can only be called after the config has been
+ − 453 * fetched (plugin developers don't even need to worry since plugins are always loaded after the config) and shows the site name and
+ − 454 * description.
+ − 455 * @param string The title of the error message
+ − 456 * @param string The body of the message, this can be HTML, and should be separated into paragraphs using the <p> tag
+ − 457 */
+ − 458
1
+ − 459 function die_semicritical($t, $p)
+ − 460 {
+ − 461 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 462 $db->close();
76
+ − 463
1
+ − 464 if ( ob_get_status() )
+ − 465 ob_end_clean();
76
+ − 466
1
+ − 467 dc_here('functions: <span style="color: red">calling die_semicritical</span>');
76
+ − 468
1
+ − 469 $tpl = new template_nodb();
+ − 470 $tpl->load_theme('oxygen', 'bleu');
+ − 471 $tpl->tpl_strings['SITE_NAME'] = getConfig('site_name');
+ − 472 $tpl->tpl_strings['SITE_DESC'] = getConfig('site_desc');
+ − 473 $tpl->tpl_strings['COPYRIGHT'] = getConfig('copyright_notice');
+ − 474 $tpl->tpl_strings['PAGE_NAME'] = $t;
+ − 475 $tpl->header();
+ − 476 echo $p;
+ − 477 $tpl->footer();
76
+ − 478
1
+ − 479 exit;
+ − 480 }
+ − 481
76
+ − 482 /**
+ − 483 * Halts Enano execution with a message. This doesn't have to be an error message, it's sometimes used to indicate success at an operation.
+ − 484 * @param string The title of the message
+ − 485 * @param string The body of the message, this can be HTML, and should be separated into paragraphs using the <p> tag
+ − 486 */
+ − 487
1
+ − 488 function die_friendly($t, $p)
+ − 489 {
+ − 490 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 491
1
+ − 492 if ( ob_get_status() )
+ − 493 ob_end_clean();
76
+ − 494
1
+ − 495 dc_here('functions: <span style="color: red">calling die_friendly</span>');
+ − 496 $paths->cpage['name'] = $t;
+ − 497 $template->tpl_strings['PAGE_NAME'] = $t;
+ − 498 $template->header();
+ − 499 echo $p;
+ − 500 $template->footer();
+ − 501 $db->close();
76
+ − 502
1
+ − 503 exit;
+ − 504 }
+ − 505
76
+ − 506 /**
+ − 507 * Immediately brings the site to a halt with an error message, and focuses on immediately closing the database connection and shutting down Enano in the event that an attack may happen. This should only be used very early on to indicate very severe errors, or if the site may be under attack (like if the DBAL detects a malicious query). In the vast majority of cases, die_semicritical() is more appropriate.
+ − 508 * @param string The title of the error message
+ − 509 * @param string The body of the message, this can be HTML, and should be separated into paragraphs using the <p> tag
+ − 510 */
+ − 511
1
+ − 512 function grinding_halt($t, $p)
+ − 513 {
+ − 514 global $db, $session, $paths, $template, $plugins; // Common objects
125
+ − 515
+ − 516 if ( !defined('scriptPath') )
+ − 517 require( ENANO_ROOT . '/config.php' );
76
+ − 518
125
+ − 519 if ( is_object($db) )
+ − 520 $db->close();
76
+ − 521
1
+ − 522 if ( ob_get_status() )
+ − 523 ob_end_clean();
76
+ − 524
1
+ − 525 dc_here('functions: <span style="color: red">calling grinding_halt</span>');
+ − 526 $tpl = new template_nodb();
+ − 527 $tpl->load_theme('oxygen', 'bleu');
+ − 528 $tpl->tpl_strings['SITE_NAME'] = 'Critical error';
+ − 529 $tpl->tpl_strings['SITE_DESC'] = 'This website is experiencing a serious error and cannot load.';
+ − 530 $tpl->tpl_strings['COPYRIGHT'] = 'Unable to retrieve copyright information';
+ − 531 $tpl->tpl_strings['PAGE_NAME'] = $t;
+ − 532 $tpl->header();
+ − 533 echo $p;
+ − 534 $tpl->footer();
+ − 535 exit;
+ − 536 }
+ − 537
76
+ − 538 /**
+ − 539 * Prints out the categorization box found on most regular pages. Doesn't take or return anything, but assumes that the page information is already set in $paths.
+ − 540 */
+ − 541
+ − 542 /*
+ − 543 function show_category_info()
+ − 544 {
1
+ − 545 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 546 dc_here('functions: showing category info');
76
+ − 547 // if($template->no_headers && !strpos($_SERVER['REQUEST_URI'], 'ajax.php')) return '';
+ − 548 if ( $paths->namespace == 'Category' )
1
+ − 549 {
+ − 550 $q = $db->sql_query('SELECT page_id,namespace FROM '.table_prefix.'categories WHERE category_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace=\'Category\' ORDER BY page_id;');
+ − 551 if(!$q) $db->_die('The category information could not be selected.');
+ − 552 $ticker = -1;
+ − 553 echo '<h3>Subcategories</h3>';
+ − 554 if($db->numrows() < 1) echo '<p>There are no subcategories in this category.</p>';
+ − 555 echo '<table border="0" cellspacing="1" cellpadding="4">';
+ − 556 while($row = $db->fetchrow())
+ − 557 {
76
+ − 558 $ticker++;
+ − 559 if ( $ticker == 3 )
+ − 560 {
+ − 561 $ticker = 0;
+ − 562 }
+ − 563 if ( $ticker == 0 )
+ − 564 {
+ − 565 echo '<tr>';
+ − 566 }
+ − 567 echo '<td style="width: 200px;"><a href="' . makeUrlNS($row['namespace'], $row['page_id']) . '">' . htmlspecialchars($paths->pages[$paths->nslist[$row['namespace']].$row['page_id']]['name']) . '</a></td>';
+ − 568 if ( $ticker == 2 )
+ − 569 {
+ − 570 echo '</tr>';
+ − 571 }
1
+ − 572 }
+ − 573 $db->free_result();
+ − 574 if($ticker) echo '</tr>';
+ − 575 echo '</table>';
76
+ − 576
1
+ − 577 $q = $db->sql_query('SELECT page_id,namespace FROM '.table_prefix.'categories WHERE category_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace!=\'Category\' ORDER BY page_id;');
76
+ − 578 if ( !$q )
+ − 579 {
+ − 580 $db->_die('The category information could not be selected.');
+ − 581 }
1
+ − 582 $ticker = -1;
+ − 583 echo '<h3>Pages</h3>';
76
+ − 584 if ( $db->numrows() < 1 )
+ − 585 {
+ − 586 echo '<p>There are no pages in this category.</p>';
+ − 587 }
1
+ − 588 echo '<table border="0" cellspacing="1" cellpadding="4">';
+ − 589 while($row = $db->fetchrow())
+ − 590 {
76
+ − 591 $ticker += ( $ticker == 3 ) ? -3 : 1;
+ − 592 if ( $ticker == 0 )
+ − 593 {
+ − 594 echo '<tr>';
+ − 595 }
+ − 596 echo '<td style="width: 200px;"><a href="'.makeUrlNS($row['namespace'], $row['page_id']).'">'.htmlspecialchars($paths->pages[$paths->nslist[$row['namespace']].$row['page_id']]['name']).'</a></td>';
+ − 597 if ( $ticker == 2 )
+ − 598 {
+ − 599 echo '</tr>';
+ − 600 }
1
+ − 601 }
+ − 602 $db->free_result();
+ − 603 if($ticker) echo '</tr>';
+ − 604 echo '</table><br /><br />';
+ − 605 }
+ − 606 $q = $db->sql_query('SELECT category_id FROM '.table_prefix.'categories WHERE page_id=\''.$paths->cpage['urlname_nons'].'\' AND namespace=\''.$paths->namespace.'\'');
+ − 607 if(!$q) $db->_die('The error seems to have occurred during selection of category data.');
+ − 608 if($db->numrows() > 0) {
+ − 609 echo '<div class="mdg-comment" style="margin-left: 0;">Categories: ';
+ − 610 $i=0;
+ − 611 while($r = $db->fetchrow())
+ − 612 {
+ − 613 if($i>0) echo ', ';
+ − 614 $i++;
+ − 615 echo '<a href="'.makeUrlNS('Category', $r['category_id']).'">'.$paths->pages[$paths->nslist['Category'].$r['category_id']]['name'].'</a>';
+ − 616 }
+ − 617 if( ( $paths->wiki_mode && !$paths->page_protected ) || ( $session->get_permissions('edit_cat') && $session->get_permissions('even_when_protected') ) ) echo ' [ <a href="'.makeUrl($paths->page, 'do=catedit', true).'" onclick="ajaxCatEdit(); return false;">edit categorization</a> ]</div>';
76
+ − 618 }
+ − 619 else
+ − 620 {
1
+ − 621 echo '<div class="mdg-comment" style="margin-left: 0;">Categories: ';
+ − 622 echo '(Uncategorized)';
+ − 623 if( ( $paths->wiki_mode && !$paths->page_protected ) || ( $session->get_permissions('edit_cat') && $session->get_permissions('even_when_protected') ) ) echo ' [ <a href="'.makeUrl($paths->page, 'do=catedit', true).'" onclick="ajaxCatEdit(); return false;">edit categorization</a> ]</div>';
+ − 624 else echo '</div>';
+ − 625 }
+ − 626 $db->free_result();
+ − 627 }
76
+ − 628 */
+ − 629
+ − 630 function show_category_info()
+ − 631 {
+ − 632 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 633
+ − 634 if ( $paths->namespace == 'Category' )
+ − 635 {
+ − 636 // Show member pages and subcategories
+ − 637 $q = $db->sql_query('SELECT p.urlname, p.namespace, p.name, p.namespace=\'Category\' AS is_category FROM '.table_prefix.'categories AS c
+ − 638 LEFT JOIN '.table_prefix.'pages AS p
+ − 639 ON ( p.urlname = c.page_id AND p.namespace = c.namespace )
+ − 640 WHERE c.category_id=\'' . $db->escape($paths->cpage['urlname_nons']) . '\'
+ − 641 ORDER BY is_category DESC, p.name ASC;');
+ − 642 if ( !$q )
+ − 643 {
+ − 644 $db->_die();
+ − 645 }
+ − 646 echo '<h3>Subcategories</h3>';
+ − 647 echo '<div class="tblholder">';
+ − 648 echo '<table border="0" cellspacing="1" cellpadding="4">';
+ − 649 echo '<tr>';
+ − 650 $ticker = 0;
+ − 651 $counter = 0;
+ − 652 $switched = false;
+ − 653 $class = 'row1';
+ − 654 while ( $row = $db->fetchrow() )
+ − 655 {
+ − 656 if ( $row['is_category'] == 0 && !$switched )
+ − 657 {
+ − 658 if ( $counter > 0 )
+ − 659 {
+ − 660 // Fill-in
+ − 661 while ( $ticker < 3 )
+ − 662 {
+ − 663 $ticker++;
+ − 664 echo '<td class="' . $class . '" style="width: 33.3%;"></td>';
+ − 665 }
+ − 666 }
+ − 667 else
+ − 668 {
+ − 669 echo '<td class="' . $class . '">No subcategories.</td>';
+ − 670 }
+ − 671 echo '</tr></table></div>' . "\n\n";
+ − 672 echo '<h3>Pages</h3>';
+ − 673 echo '<div class="tblholder">';
+ − 674 echo '<table border="0" cellspacing="1" cellpadding="4">';
+ − 675 echo '<tr>';
+ − 676 $counter = 0;
129
0b5244001799
Rebranded as 1.0.1.1; fixed category page drawing bug; updated link to GPL in the about page to the GPLv2
Dan
diff
changeset
+ − 677 $ticker = -1;
76
+ − 678 $switched = true;
+ − 679 }
+ − 680 $counter++;
+ − 681 $ticker++;
+ − 682 if ( $ticker == 3 )
+ − 683 {
+ − 684 echo '</tr><tr>';
+ − 685 $ticker = 0;
+ − 686 $class = ( $class == 'row3' ) ? 'row1' : 'row3';
+ − 687 }
+ − 688 echo "<td class=\"{$class}\" style=\"width: 33.3%;\">"; // " to workaround stupid jEdit bug
+ − 689
+ − 690 $link = makeUrlNS($row['namespace'], sanitize_page_id($row['urlname']));
+ − 691 echo '<a href="' . $link . '"';
+ − 692 $key = $paths->nslist[$row['namespace']] . sanitize_page_id($row['urlname']);
+ − 693 if ( !isPage( $key ) )
+ − 694 {
+ − 695 echo ' class="wikilink-nonexistent"';
+ − 696 }
+ − 697 echo '>';
+ − 698 $title = get_page_title_ns($row['urlname'], $row['namespace']);
+ − 699 echo htmlspecialchars($title);
+ − 700 echo '</a>';
+ − 701
+ − 702 echo "</td>";
+ − 703 }
+ − 704 if ( !$switched )
+ − 705 {
+ − 706 if ( $counter > 0 )
+ − 707 {
+ − 708 // Fill-in
129
0b5244001799
Rebranded as 1.0.1.1; fixed category page drawing bug; updated link to GPL in the about page to the GPLv2
Dan
diff
changeset
+ − 709 while ( $ticker < 2 )
76
+ − 710 {
+ − 711 $ticker++;
+ − 712 echo '<td class="' . $class . '" style="width: 33.3%;"></td>';
+ − 713 }
+ − 714 }
+ − 715 else
+ − 716 {
+ − 717 echo '<td class="' . $class . '">No subcategories.</td>';
+ − 718 }
+ − 719 echo '</tr></table></div>' . "\n\n";
+ − 720 echo '<h3>Pages</h3>';
+ − 721 echo '<div class="tblholder">';
+ − 722 echo '<table border="0" cellspacing="1" cellpadding="4">';
+ − 723 echo '<tr>';
+ − 724 $counter = 0;
+ − 725 $ticker = 0;
+ − 726 $switched = true;
+ − 727 }
+ − 728 if ( $counter > 0 )
+ − 729 {
+ − 730 // Fill-in
129
0b5244001799
Rebranded as 1.0.1.1; fixed category page drawing bug; updated link to GPL in the about page to the GPLv2
Dan
diff
changeset
+ − 731 while ( $ticker < 2 )
76
+ − 732 {
+ − 733 $ticker++;
+ − 734 echo '<td class="' . $class . '" style="width: 33.3%;"></td>';
+ − 735 }
+ − 736 }
+ − 737 else
+ − 738 {
+ − 739 echo '<td class="' . $class . '">No pages in this category.</td>';
+ − 740 }
+ − 741 echo '</tr></table></div>' . "\n\n";
+ − 742 }
+ − 743
+ − 744 if ( $paths->namespace != 'Special' && $paths->namespace != 'Admin' )
+ − 745 {
86
c162ca39db8f
Finished pagination code (was incomplete in previous revision) and added a few hacks for an upcoming theme
Dan
diff
changeset
+ − 746 echo '<div class="mdg-comment" style="margin: 10px 0 0 0;" id="category_box_wrapper">';
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 747 echo '<div style="float: right;">';
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 748 echo '(<a href="#" onclick="ajaxCatToTag(); return false;">show page tags</a>)';
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 749 echo '</div>';
76
+ − 750 echo '<div id="mdgCatBox">Categories: ';
+ − 751
+ − 752 $where = '( c.page_id=\'' . $db->escape($paths->cpage['urlname_nons']) . '\' AND c.namespace=\'' . $db->escape($paths->namespace) . '\' )';
+ − 753 $prefix = table_prefix;
+ − 754 $sql = <<<EOF
+ − 755 SELECT c.category_id FROM {$prefix}categories AS c
+ − 756 LEFT JOIN {$prefix}pages AS p
+ − 757 ON ( ( p.urlname = c.page_id AND p.namespace = c.namespace ) OR ( p.urlname IS NULL AND p.namespace IS NULL ) )
+ − 758 WHERE $where
+ − 759 ORDER BY p.name ASC, c.page_id ASC;
+ − 760 EOF;
+ − 761 $q = $db->sql_query($sql);
+ − 762 if ( !$q )
+ − 763 $db->_die();
+ − 764
+ − 765 if ( $row = $db->fetchrow() )
+ − 766 {
+ − 767 $list = array();
+ − 768 do
+ − 769 {
+ − 770 $cid = sanitize_page_id($row['category_id']);
+ − 771 $title = get_page_title_ns($cid, 'Category');
+ − 772 $link = makeUrlNS('Category', $cid);
+ − 773 $list[] = '<a href="' . $link . '">' . htmlspecialchars($title) . '</a>';
+ − 774 }
+ − 775 while ( $row = $db->fetchrow() );
+ − 776 echo implode(', ', $list);
+ − 777 }
+ − 778 else
+ − 779 {
+ − 780 echo '(Uncategorized)';
+ − 781 }
+ − 782
+ − 783 $can_edit = ( $session->get_permissions('edit_cat') && ( !$paths->page_protected || $session->get_permissions('even_when_protected') ) );
+ − 784 if ( $can_edit )
+ − 785 {
+ − 786 $edit_link = '<a href="' . makeUrl($paths->page, 'do=catedit', true) . '" onclick="ajaxCatEdit(); return false;">edit categorization</a>';
+ − 787 echo ' [ ' . $edit_link . ' ]';
+ − 788 }
+ − 789
+ − 790 echo '</div></div>';
+ − 791
+ − 792 }
+ − 793
+ − 794 }
+ − 795
+ − 796 /**
+ − 797 * Prints out the file information box seen on File: pages. Doesn't take or return anything, but assumes that the page information is already set in $paths, and expects $paths->namespace to be File.
+ − 798 */
1
+ − 799
+ − 800 function show_file_info()
+ − 801 {
+ − 802 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 803 if($paths->namespace != 'File') return null; // Prevent unnecessary work
+ − 804 $selfn = $paths->cpage['urlname_nons']; // substr($paths->page, strlen($paths->nslist['File']), strlen($paths->cpage));
+ − 805 if(substr($paths->cpage['name'], 0, strlen($paths->nslist['File']))==$paths->nslist['File']) $selfn = substr($paths->cpage['urlname_nons'], strlen($paths->nslist['File']), strlen($paths->cpage['urlname_nons']));
+ − 806 $q = $db->sql_query('SELECT mimetype,time_id,size FROM '.table_prefix.'files WHERE page_id=\''.$selfn.'\' ORDER BY time_id DESC;');
+ − 807 if(!$q) $db->_die('The file type could not be fetched.');
+ − 808 if($db->numrows() < 1) { echo '<div class="mdg-comment" style="margin-left: 0;"><h3>Uploaded file</h3><p>There are no files uploaded with this name yet. <a href="'.makeUrlNS('Special', 'UploadFile/'.$paths->cpage['urlname_nons']).'">Upload a file...</a></p></div><br />'; return; }
+ − 809 $r = $db->fetchrow();
+ − 810 $mimetype = $r['mimetype'];
+ − 811 $datestring = date('F d, Y h:i a', (int)$r['time_id']);
+ − 812 echo '<div class="mdg-comment" style="margin-left: 0;"><p><h3>Uploaded file</h3></p><p>Type: '.$r['mimetype'].'<br />Size: ';
+ − 813 $fs = $r['size'];
+ − 814 echo $fs.' bytes';
+ − 815 $fs = (int)$fs;
+ − 816 if($fs >= 1048576)
+ − 817 {
+ − 818 $fs = round($fs / 1048576, 1);
+ − 819 echo ' ('.$fs.' MB)';
+ − 820 } elseif($fs >= 1024) {
+ − 821 $fs = round($fs / 1024, 1);
+ − 822 echo ' ('.$fs.' KB)';
+ − 823 }
+ − 824 echo '<br />Uploaded: '.$datestring.'</p>';
+ − 825 if(substr($mimetype, 0, 6)!='image/' && ( substr($mimetype, 0, 5) != 'text/' || $mimetype == 'text/html' || $mimetype == 'text/javascript' ))
+ − 826 {
+ − 827 echo '<div class="warning-box">This file type may contain viruses or other code that could harm your computer. You should exercise caution if you download it.</div>';
+ − 828 }
+ − 829 if(substr($mimetype, 0, 6)=='image/')
+ − 830 {
+ − 831 echo '<p><a href="'.makeUrlNS('Special', 'DownloadFile'.'/'.$selfn).'"><img style="border: 0;" alt="'.$paths->page.'" src="'.makeUrlNS('Special', 'DownloadFile'.'/'.$selfn.htmlspecialchars(urlSeparator).'preview').'" /></a></p>';
+ − 832 }
+ − 833 echo '<p><a href="'.makeUrlNS('Special', 'DownloadFile'.'/'.$selfn.'/'.$r['time_id'].htmlspecialchars(urlSeparator).'download').'">Download this file</a>';
+ − 834 if(!$paths->page_protected && ( $paths->wiki_mode || $session->get_permissions('upload_new_version') ))
+ − 835 {
+ − 836 echo ' | <a href="'.makeUrlNS('Special', 'UploadFile'.'/'.$selfn).'">Upload new version</a>';
+ − 837 }
+ − 838 echo '</p>';
+ − 839 if($db->numrows() > 1)
+ − 840 {
+ − 841 echo '<h3>File history</h3><p>';
+ − 842 while($r = $db->fetchrow())
+ − 843 {
+ − 844 echo '(<a href="'.makeUrlNS('Special', 'DownloadFile'.'/'.$selfn.'/'.$r['time_id'].htmlspecialchars(urlSeparator).'download').'">this ver</a>) ';
+ − 845 if($session->get_permissions('history_rollback'))
+ − 846 echo ' (<a href="#" onclick="ajaxRollback(\''.$r['time_id'].'\'); return false;">revert</a>) ';
+ − 847 $mimetype = $r['mimetype'];
+ − 848 $datestring = date('F d, Y h:i a', (int)$r['time_id']);
+ − 849 echo $datestring.': '.$r['mimetype'].', ';
+ − 850 $fs = $r['size'];
+ − 851 $fs = (int)$fs;
+ − 852 if($fs >= 1048576)
+ − 853 {
+ − 854 $fs = round($fs / 1048576, 1);
+ − 855 echo ' '.$fs.' MB';
+ − 856 } elseif($fs >= 1024) {
+ − 857 $fs = round($fs / 1024, 1);
+ − 858 echo ' '.$fs.' KB';
+ − 859 } else {
+ − 860 echo ' '.$fs.' bytes';
+ − 861 }
+ − 862 echo '<br />';
+ − 863 }
+ − 864 echo '</p>';
+ − 865 }
+ − 866 $db->free_result();
+ − 867 echo '</div><br />';
+ − 868 }
+ − 869
76
+ − 870 /**
+ − 871 * Shows header information on the current page. Currently this is only the delete-vote feature. Doesn't take or return anything, but assumes that the page information is already set in $paths.
+ − 872 */
+ − 873
1
+ − 874 function display_page_headers()
+ − 875 {
+ − 876 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 877 if($session->get_permissions('vote_reset') && $paths->cpage['delvotes'] > 0)
+ − 878 {
112
+ − 879 $delvote_ips = unserialize($paths->cpage['delvote_ips']);
+ − 880 $hr = htmlspecialchars(implode(', ', $delvote_ips['u']));
1
+ − 881 $is = 'is';
+ − 882 $s = '';
+ − 883 $s2 = 's';
+ − 884 if ( $paths->cpage['delvotes'] > 1)
+ − 885 {
+ − 886 $is = 'are';
+ − 887 $s = 's';
+ − 888 $s2 = '';
+ − 889 }
+ − 890 echo '<div class="info-box" style="margin-left: 0; margin-top: 5px;" id="mdgDeleteVoteNoticeBox">
+ − 891 <b>Notice:</b> There '.$is.' '.$paths->cpage['delvotes'].' user'.$s.' that think'.$s2.' this page should be deleted.<br />
+ − 892 <b>Users that voted:</b> ' . $hr . '<br />
+ − 893 <a href="'.makeUrl($paths->page, 'do=deletepage').'" onclick="ajaxDeletePage(); return false;">Delete page</a> | <a href="'.makeUrl($paths->page, 'do=resetvotes').'" onclick="ajaxResetDelVotes(); return false;">Reset votes</a>
+ − 894 </div>';
+ − 895 }
+ − 896 }
+ − 897
76
+ − 898 /**
+ − 899 * Displays page footer information including file and category info. This also has the send_page_footers hook. Doesn't take or return anything, but assumes that the page information is already set in $paths.
+ − 900 */
+ − 901
1
+ − 902 function display_page_footers()
+ − 903 {
+ − 904 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 905 if(isset($_GET['nofooters'])) return;
+ − 906 $code = $plugins->setHook('send_page_footers');
+ − 907 foreach ( $code as $cmd )
+ − 908 {
+ − 909 eval($cmd);
+ − 910 }
+ − 911 show_file_info();
+ − 912 show_category_info();
+ − 913 }
+ − 914
76
+ − 915 /**
+ − 916 * Deprecated, do not use.
+ − 917 */
+ − 918
1
+ − 919 function password_prompt($id = false)
+ − 920 {
+ − 921 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 922 if(!$id) $id = $paths->page;
+ − 923 if(isset($paths->pages[$id]['password']) && strlen($paths->pages[$id]['password']) == 40 && !isset($_REQUEST['pagepass']))
+ − 924 {
+ − 925 die_friendly('Password required', '<p>You must supply a password to access this page.</p><form action="'.makeUrl($paths->pages[$id]['urlname']).'" method="post"><p>Password: <input name="pagepass" type="password" /></p><p><input type="submit" value="Submit" /></p>');
+ − 926 } elseif(isset($_REQUEST['pagepass'])) {
+ − 927 $p = (preg_match('#^([a-f0-9]*){40}$#', $_REQUEST['pagepass'])) ? $_REQUEST['pagepass'] : sha1($_REQUEST['pagepass']);
+ − 928 if($p != $paths->pages[$id]['password']) die_friendly('Password required', '<p style="color: red;">The password you entered is incorrect.</p><form action="'.makeUrl($paths->page).'" method="post"><p>Password: <input name="pagepass" type="password" /></p><p><input type="submit" value="Submit" /></p>');
+ − 929 }
+ − 930 }
+ − 931
76
+ − 932 /**
+ − 933 * Some sort of primitive hex converter from back in the day. Deprecated, do not use.
+ − 934 * @param string Text to encode
+ − 935 * @return string
+ − 936 */
+ − 937
1
+ − 938 function str_hex($string){
+ − 939 $hex='';
+ − 940 for ($i=0; $i < strlen($string); $i++){
+ − 941 $hex .= ' '.dechex(ord($string[$i]));
+ − 942 }
+ − 943 return substr($hex, 1, strlen($hex));
+ − 944 }
+ − 945
76
+ − 946 /**
+ − 947 * Essentially an return code reader for a socket. Don't use this unless you're writing mail code and smtp_send_email doesn't cut it. Ported from phpBB's smtp.php.
+ − 948 * @param socket A socket resource
+ − 949 * @param string The expected response from the server, this needs to be exactly three characters.
+ − 950 */
+ − 951
+ − 952 function smtp_get_response($socket, $response, $line = __LINE__)
1
+ − 953 {
76
+ − 954 $server_response = '';
+ − 955 while (substr($server_response, 3, 1) != ' ')
+ − 956 {
+ − 957 if (!($server_response = fgets($socket, 256)))
+ − 958 {
1
+ − 959 die_friendly('SMTP Error', "<p>Couldn't get mail server response codes</p>");
76
+ − 960 }
+ − 961 }
1
+ − 962
76
+ − 963 if (!(substr($server_response, 0, 3) == $response))
+ − 964 {
1
+ − 965 die_friendly('SMTP Error', "<p>Ran into problems sending mail. Response: $server_response</p>");
76
+ − 966 }
1
+ − 967 }
+ − 968
76
+ − 969 /**
+ − 970 * Wrapper for smtp_send_email_core that takes the sender as the fourth parameter instead of additional headers.
+ − 971 * @param string E-mail address to send to
+ − 972 * @param string Subject line
+ − 973 * @param string The body of the message
+ − 974 * @param string Address of the sender
+ − 975 */
+ − 976
1
+ − 977 function smtp_send_email($to, $subject, $message, $from)
+ − 978 {
+ − 979 return smtp_send_email_core($to, $subject, $message, "From: <$from>\n");
+ − 980 }
+ − 981
76
+ − 982 /**
+ − 983 * Replacement or substitute for PHP's mail() builtin function.
+ − 984 * @param string E-mail address to send to
+ − 985 * @param string Subject line
+ − 986 * @param string The body of the message
+ − 987 * @param string Message headers, separated by a single newline ("\n")
+ − 988 * @copyright (C) phpBB Group
+ − 989 * @license GPL
+ − 990 */
+ − 991
1
+ − 992 function smtp_send_email_core($mail_to, $subject, $message, $headers = '')
+ − 993 {
76
+ − 994 // Fix any bare linefeeds in the message to make it RFC821 Compliant.
+ − 995 $message = preg_replace("#(?<!\r)\n#si", "\r\n", $message);
1
+ − 996
76
+ − 997 if ($headers != '')
+ − 998 {
+ − 999 if (is_array($headers))
+ − 1000 {
+ − 1001 if (sizeof($headers) > 1)
+ − 1002 {
+ − 1003 $headers = join("\n", $headers);
+ − 1004 }
+ − 1005 else
+ − 1006 {
+ − 1007 $headers = $headers[0];
+ − 1008 }
+ − 1009 }
+ − 1010 $headers = chop($headers);
1
+ − 1011
76
+ − 1012 // Make sure there are no bare linefeeds in the headers
+ − 1013 $headers = preg_replace('#(?<!\r)\n#si', "\r\n", $headers);
1
+ − 1014
76
+ − 1015 // Ok this is rather confusing all things considered,
+ − 1016 // but we have to grab bcc and cc headers and treat them differently
+ − 1017 // Something we really didn't take into consideration originally
+ − 1018 $header_array = explode("\r\n", $headers);
+ − 1019 @reset($header_array);
1
+ − 1020
76
+ − 1021 $headers = '';
+ − 1022 while(list(, $header) = each($header_array))
+ − 1023 {
+ − 1024 if (preg_match('#^cc:#si', $header))
+ − 1025 {
+ − 1026 $cc = preg_replace('#^cc:(.*)#si', '\1', $header);
+ − 1027 }
+ − 1028 else if (preg_match('#^bcc:#si', $header))
+ − 1029 {
+ − 1030 $bcc = preg_replace('#^bcc:(.*)#si', '\1', $header);
+ − 1031 $header = '';
+ − 1032 }
+ − 1033 $headers .= ($header != '') ? $header . "\r\n" : '';
+ − 1034 }
1
+ − 1035
76
+ − 1036 $headers = chop($headers);
+ − 1037 $cc = explode(', ', $cc);
+ − 1038 $bcc = explode(', ', $bcc);
+ − 1039 }
1
+ − 1040
76
+ − 1041 if (trim($subject) == '')
+ − 1042 {
+ − 1043 die_friendly(GENERAL_ERROR, "No email Subject specified");
+ − 1044 }
1
+ − 1045
76
+ − 1046 if (trim($message) == '')
+ − 1047 {
+ − 1048 die_friendly(GENERAL_ERROR, "Email message was blank");
+ − 1049 }
+ − 1050
1
+ − 1051 // setup SMTP
+ − 1052 $host = getConfig('smtp_server');
+ − 1053 if ( empty($host) )
+ − 1054 return 'No smtp_host in config';
+ − 1055 if ( strstr($host, ':' ) )
+ − 1056 {
+ − 1057 $n = explode(':', $host);
+ − 1058 $smtp_host = $n[0];
+ − 1059 $port = intval($n[1]);
+ − 1060 }
+ − 1061 else
+ − 1062 {
+ − 1063 $smtp_host = $host;
+ − 1064 $port = 25;
+ − 1065 }
76
+ − 1066
1
+ − 1067 $smtp_user = getConfig('smtp_user');
+ − 1068 $smtp_pass = getConfig('smtp_password');
+ − 1069
76
+ − 1070 // Ok we have error checked as much as we can to this point let's get on
+ − 1071 // it already.
+ − 1072 if( !$socket = @fsockopen($smtp_host, $port, $errno, $errstr, 20) )
+ − 1073 {
+ − 1074 die_friendly(GENERAL_ERROR, "Could not connect to smtp host : $errno : $errstr");
+ − 1075 }
+ − 1076
+ − 1077 // Wait for reply
+ − 1078 smtp_get_response($socket, "220", __LINE__);
1
+ − 1079
76
+ − 1080 // Do we want to use AUTH?, send RFC2554 EHLO, else send RFC821 HELO
+ − 1081 // This improved as provided by SirSir to accomodate
+ − 1082 if( !empty($smtp_user) && !empty($smtp_pass) )
+ − 1083 {
+ − 1084 enano_fputs($socket, "EHLO " . $smtp_host . "\r\n");
+ − 1085 smtp_get_response($socket, "250", __LINE__);
1
+ − 1086
76
+ − 1087 enano_fputs($socket, "AUTH LOGIN\r\n");
+ − 1088 smtp_get_response($socket, "334", __LINE__);
1
+ − 1089
76
+ − 1090 enano_fputs($socket, base64_encode($smtp_user) . "\r\n");
+ − 1091 smtp_get_response($socket, "334", __LINE__);
1
+ − 1092
76
+ − 1093 enano_fputs($socket, base64_encode($smtp_pass) . "\r\n");
+ − 1094 smtp_get_response($socket, "235", __LINE__);
+ − 1095 }
+ − 1096 else
+ − 1097 {
+ − 1098 enano_fputs($socket, "HELO " . $smtp_host . "\r\n");
+ − 1099 smtp_get_response($socket, "250", __LINE__);
+ − 1100 }
1
+ − 1101
76
+ − 1102 // From this point onward most server response codes should be 250
+ − 1103 // Specify who the mail is from....
+ − 1104 enano_fputs($socket, "MAIL FROM: <" . getConfig('contact_email') . ">\r\n");
+ − 1105 smtp_get_response($socket, "250", __LINE__);
1
+ − 1106
76
+ − 1107 // Specify each user to send to and build to header.
+ − 1108 $to_header = '';
1
+ − 1109
76
+ − 1110 // Add an additional bit of error checking to the To field.
+ − 1111 $mail_to = (trim($mail_to) == '') ? 'Undisclosed-recipients:;' : trim($mail_to);
+ − 1112 if (preg_match('#[^ ]+\@[^ ]+#', $mail_to))
+ − 1113 {
+ − 1114 enano_fputs($socket, "RCPT TO: <$mail_to>\r\n");
+ − 1115 smtp_get_response($socket, "250", __LINE__);
+ − 1116 }
1
+ − 1117
76
+ − 1118 // Ok now do the CC and BCC fields...
+ − 1119 @reset($bcc);
+ − 1120 while(list(, $bcc_address) = each($bcc))
+ − 1121 {
+ − 1122 // Add an additional bit of error checking to bcc header...
+ − 1123 $bcc_address = trim($bcc_address);
+ − 1124 if (preg_match('#[^ ]+\@[^ ]+#', $bcc_address))
+ − 1125 {
+ − 1126 enano_fputs($socket, "RCPT TO: <$bcc_address>\r\n");
+ − 1127 smtp_get_response($socket, "250", __LINE__);
+ − 1128 }
+ − 1129 }
1
+ − 1130
76
+ − 1131 @reset($cc);
+ − 1132 while(list(, $cc_address) = each($cc))
+ − 1133 {
+ − 1134 // Add an additional bit of error checking to cc header
+ − 1135 $cc_address = trim($cc_address);
+ − 1136 if (preg_match('#[^ ]+\@[^ ]+#', $cc_address))
+ − 1137 {
+ − 1138 enano_fputs($socket, "RCPT TO: <$cc_address>\r\n");
+ − 1139 smtp_get_response($socket, "250", __LINE__);
+ − 1140 }
+ − 1141 }
1
+ − 1142
76
+ − 1143 // Ok now we tell the server we are ready to start sending data
+ − 1144 enano_fputs($socket, "DATA\r\n");
1
+ − 1145
76
+ − 1146 // This is the last response code we look for until the end of the message.
+ − 1147 smtp_get_response($socket, "354", __LINE__);
1
+ − 1148
76
+ − 1149 // Send the Subject Line...
+ − 1150 enano_fputs($socket, "Subject: $subject\r\n");
1
+ − 1151
76
+ − 1152 // Now the To Header.
+ − 1153 enano_fputs($socket, "To: $mail_to\r\n");
1
+ − 1154
76
+ − 1155 // Now any custom headers....
+ − 1156 enano_fputs($socket, "$headers\r\n\r\n");
1
+ − 1157
76
+ − 1158 // Ok now we are ready for the message...
+ − 1159 enano_fputs($socket, "$message\r\n");
1
+ − 1160
76
+ − 1161 // Ok the all the ingredients are mixed in let's cook this puppy...
+ − 1162 enano_fputs($socket, ".\r\n");
+ − 1163 smtp_get_response($socket, "250", __LINE__);
1
+ − 1164
76
+ − 1165 // Now tell the server we are done and close the socket...
+ − 1166 enano_fputs($socket, "QUIT\r\n");
+ − 1167 fclose($socket);
1
+ − 1168
76
+ − 1169 return TRUE;
1
+ − 1170 }
+ − 1171
+ − 1172 /**
+ − 1173 * Tell which version of Enano we're running.
+ − 1174 * @param bool $long if true, uses English version names (e.g. alpha, beta, release candidate). If false (default) uses abbreviations (1.0a1, 1.0b3, 1.0RC2, etc.)
+ − 1175 * @return string
+ − 1176 */
+ − 1177
+ − 1178 function enano_version($long = false, $no_nightly = false)
+ − 1179 {
+ − 1180 $r = getConfig('enano_version');
+ − 1181 $rc = ( $long ) ? ' release candidate ' : 'RC';
+ − 1182 $b = ( $long ) ? ' beta ' : 'b';
+ − 1183 $a = ( $long ) ? ' alpha ' : 'a';
+ − 1184 if($v = getConfig('enano_rc_version')) $r .= $rc.$v;
+ − 1185 if($v = getConfig('enano_beta_version')) $r .= $b.$v;
+ − 1186 if($v = getConfig('enano_alpha_version')) $r .= $a.$v;
+ − 1187 if ( defined('ENANO_NIGHTLY') && !$no_nightly )
+ − 1188 {
+ − 1189 $nightlytag = ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
+ − 1190 $nightlylong = ' nightly; build date: ' . ENANO_NIGHTLY_MONTH . '-' . ENANO_NIGHTLY_DAY . '-' . ENANO_NIGHTLY_YEAR;
+ − 1191 $r = ( $long ) ? $r . $nightlylong : $r . '-nightly-' . $nightlytag;
+ − 1192 }
+ − 1193 return $r;
+ − 1194 }
+ − 1195
76
+ − 1196 /**
+ − 1197 * What kinda sh** was I thinking when I wrote this. Deprecated.
+ − 1198 */
+ − 1199
1
+ − 1200 function _dualurlenc($t) {
+ − 1201 return rawurlencode(rawurlencode($t));
+ − 1202 }
76
+ − 1203
+ − 1204 /**
+ − 1205 * Badly named function to send back eval'able Javascript code with an error message. Deprecated, use JSON instead.
+ − 1206 * @param string Message to send
+ − 1207 */
+ − 1208
1
+ − 1209 function _die($t) {
+ − 1210 $_ob = 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\'' . rawurlencode('' . $t . '') . '\')';
+ − 1211 die($_ob);
+ − 1212 }
+ − 1213
76
+ − 1214 /**
+ − 1215 * Same as _die(), but sends an SQL backtrace with the error message, and doesn't halt execution.
+ − 1216 * @param string Message to send
+ − 1217 */
+ − 1218
1
+ − 1219 function jsdie($text) {
+ − 1220 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1221 $text = rawurlencode($text . "\n\nSQL Backtrace:\n" . $db->sql_backtrace());
+ − 1222 echo 'document.getElementById("ajaxEditContainer").innerHTML = unescape(\''.$text.'\');';
+ − 1223 }
+ − 1224
+ − 1225 /**
+ − 1226 * Capitalizes the first letter of a string
+ − 1227 * @param $text string the text to be transformed
+ − 1228 * @return string
+ − 1229 */
76
+ − 1230
1
+ − 1231 function capitalize_first_letter($text)
+ − 1232 {
+ − 1233 return strtoupper(substr($text, 0, 1)) . substr($text, 1);
+ − 1234 }
+ − 1235
+ − 1236 /**
+ − 1237 * Checks if a value in a bitfield is on or off
+ − 1238 * @param $bitfield int the bit-field value
+ − 1239 * @param $value int the value to switch off
+ − 1240 * @return bool
+ − 1241 */
76
+ − 1242
1
+ − 1243 function is_bit($bitfield, $value)
+ − 1244 {
+ − 1245 return ( $bitfield & $value ) ? true : false;
+ − 1246 }
+ − 1247
+ − 1248 /**
+ − 1249 * Trims spaces/newlines from the beginning and end of a string
+ − 1250 * @param $text the text to process
+ − 1251 * @return string
+ − 1252 */
76
+ − 1253
1
+ − 1254 function trim_spaces($text)
+ − 1255 {
+ − 1256 $d = true;
+ − 1257 while($d)
+ − 1258 {
+ − 1259 $c = substr($text, 0, 1);
+ − 1260 $a = substr($text, strlen($text)-1, strlen($text));
+ − 1261 if($c == "\n" || $c == "\r" || $c == "\t" || $c == ' ') $text = substr($text, 1, strlen($text));
+ − 1262 elseif($a == "\n" || $a == "\r" || $a == "\t" || $a == ' ') $text = substr($text, 0, strlen($text)-1);
+ − 1263 else $d = false;
+ − 1264 }
+ − 1265 return $text;
+ − 1266 }
+ − 1267
+ − 1268 /**
+ − 1269 * Enano-ese equivalent of str_split() which is only found in PHP5
+ − 1270 * @param $text string the text to split
+ − 1271 * @param $inc int size of each block
+ − 1272 * @return array
+ − 1273 */
76
+ − 1274
1
+ − 1275 function enano_str_split($text, $inc = 1)
+ − 1276 {
76
+ − 1277 if($inc < 1)
14
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1278 {
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1279 return false;
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1280 }
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1281 if($inc >= strlen($text))
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1282 {
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1283 return Array($text);
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1284 }
1
+ − 1285 $len = ceil(strlen($text) / $inc);
+ − 1286 $ret = Array();
14
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1287 for ( $i = 0; $i < strlen($text); $i = $i + $inc )
1
+ − 1288 {
+ − 1289 $ret[] = substr($text, $i, $inc);
+ − 1290 }
+ − 1291 return $ret;
+ − 1292 }
+ − 1293
+ − 1294 /**
+ − 1295 * Converts a hexadecimal number to a binary string.
+ − 1296 * @param text string hexadecimal number
+ − 1297 * @return string
+ − 1298 */
+ − 1299 function hex2bin($text)
+ − 1300 {
+ − 1301 $arr = enano_str_split($text, 2);
+ − 1302 $ret = '';
+ − 1303 for ($i=0; $i<sizeof($arr); $i++)
+ − 1304 {
+ − 1305 $ret .= chr(hexdec($arr[$i]));
+ − 1306 }
+ − 1307 return $ret;
+ − 1308 }
+ − 1309
+ − 1310 /**
+ − 1311 * Generates and/or prints a human-readable backtrace
76
+ − 1312 * @param bool $return - if true, this function returns a string, otherwise returns null and prints the backtrace
1
+ − 1313 * @return mixed
+ − 1314 */
76
+ − 1315
1
+ − 1316 function enano_debug_print_backtrace($return = false)
+ − 1317 {
+ − 1318 ob_start();
+ − 1319 echo '<pre>';
19
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1320 if ( function_exists('debug_print_backtrace') )
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1321 {
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1322 debug_print_backtrace();
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1323 }
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1324 else
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1325 {
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1326 echo '<b>Warning:</b> No debug_print_backtrace() support!';
5d003b6c9e89
Added demo mode functionality to various parts of Enano (unlocked only with a plugin) and fixed groups table
Dan
diff
changeset
+ − 1327 }
1
+ − 1328 echo '</pre>';
+ − 1329 $c = ob_get_contents();
+ − 1330 ob_end_clean();
+ − 1331 if($return) return $c;
+ − 1332 else echo $c;
+ − 1333 return null;
+ − 1334 }
+ − 1335
+ − 1336 /**
+ − 1337 * Like rawurlencode(), but encodes all characters
+ − 1338 * @param string $text the text to encode
+ − 1339 * @param optional string $prefix text before each hex character
+ − 1340 * @param optional string $suffix text after each hex character
+ − 1341 * @return string
+ − 1342 */
76
+ − 1343
1
+ − 1344 function hexencode($text, $prefix = '%', $suffix = '')
+ − 1345 {
+ − 1346 $arr = enano_str_split($text);
+ − 1347 $r = '';
+ − 1348 foreach($arr as $a)
+ − 1349 {
+ − 1350 $nibble = (string)dechex(ord($a));
+ − 1351 if(strlen($nibble) == 1) $nibble = '0' . $nibble;
+ − 1352 $r .= $prefix . $nibble . $suffix;
+ − 1353 }
+ − 1354 return $r;
+ − 1355 }
+ − 1356
+ − 1357 /**
+ − 1358 * Enano-ese equivalent of get_magic_quotes_gpc()
+ − 1359 * @return bool
+ − 1360 */
76
+ − 1361
1
+ − 1362 function enano_get_magic_quotes_gpc()
+ − 1363 {
+ − 1364 if(function_exists('get_magic_quotes_gpc'))
+ − 1365 {
+ − 1366 return ( get_magic_quotes_gpc() == 1 );
+ − 1367 }
+ − 1368 else
+ − 1369 {
+ − 1370 return ( strtolower(@ini_get('magic_quotes_gpc')) == '1' );
+ − 1371 }
+ − 1372 }
+ − 1373
+ − 1374 /**
+ − 1375 * Recursive stripslashes()
+ − 1376 * @param array
+ − 1377 * @return array
+ − 1378 */
76
+ − 1379
1
+ − 1380 function stripslashes_recurse($arr)
+ − 1381 {
+ − 1382 foreach($arr as $k => $xxxx)
+ − 1383 {
+ − 1384 $val =& $arr[$k];
+ − 1385 if(is_string($val))
+ − 1386 $val = stripslashes($val);
+ − 1387 elseif(is_array($val))
+ − 1388 $val = stripslashes_recurse($val);
+ − 1389 }
+ − 1390 return $arr;
+ − 1391 }
+ − 1392
+ − 1393 /**
14
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1394 * Recursive function to remove all NUL bytes from a string
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1395 * @param array
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1396 * @return array
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1397 */
76
+ − 1398
14
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1399 function strip_nul_chars($arr)
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1400 {
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1401 foreach($arr as $k => $xxxx_unused)
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1402 {
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1403 $val =& $arr[$k];
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1404 if(is_string($val))
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1405 $val = str_replace("\000", '', $val);
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1406 elseif(is_array($val))
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1407 $val = strip_nul_chars($val);
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1408 }
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1409 return $arr;
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1410 }
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1411
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1412 /**
76
+ − 1413 * If magic_quotes_gpc is on, calls stripslashes() on everything in $_GET/$_POST/$_COOKIE. Also strips any NUL characters from incoming requests, as these are typically malicious.
14
ce6053bb48d8
Security: NUL characters are now stripped from GPC; several code readability standards changes
Dan
diff
changeset
+ − 1414 * @ignore - this doesn't work too well in my tests
1
+ − 1415 * @todo port version from the PHP manual
+ − 1416 * @return void
+ − 1417 */
+ − 1418 function strip_magic_quotes_gpc()
+ − 1419 {
+ − 1420 if(enano_get_magic_quotes_gpc())
+ − 1421 {
40
+ − 1422 $_POST = stripslashes_recurse($_POST);
+ − 1423 $_GET = stripslashes_recurse($_GET);
+ − 1424 $_COOKIE = stripslashes_recurse($_COOKIE);
+ − 1425 $_REQUEST = stripslashes_recurse($_REQUEST);
1
+ − 1426 }
40
+ − 1427 $_POST = strip_nul_chars($_POST);
+ − 1428 $_GET = strip_nul_chars($_GET);
+ − 1429 $_COOKIE = strip_nul_chars($_COOKIE);
+ − 1430 $_REQUEST = strip_nul_chars($_REQUEST);
78
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 1431 $_POST = decode_unicode_array($_POST);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 1432 $_GET = decode_unicode_array($_GET);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 1433 $_COOKIE = decode_unicode_array($_COOKIE);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 1434 $_REQUEST = decode_unicode_array($_REQUEST);
1
+ − 1435 }
+ − 1436
+ − 1437 /**
+ − 1438 * A very basic single-character compression algorithm for binary strings/bitfields
76
+ − 1439 * @param string $bits the text to compress, should be only 1s and 0s
1
+ − 1440 * @return string
+ − 1441 */
76
+ − 1442
1
+ − 1443 function compress_bitfield($bits)
+ − 1444 {
+ − 1445 $crc32 = crc32($bits);
+ − 1446 $bits .= '0';
+ − 1447 $start_pos = 0;
+ − 1448 $current = substr($bits, 1, 1);
+ − 1449 $last = substr($bits, 0, 1);
+ − 1450 $chunk_size = 1;
+ − 1451 $len = strlen($bits);
+ − 1452 $crc = $len;
+ − 1453 $crcval = 0;
+ − 1454 for ( $i = 1; $i < $len; $i++ )
+ − 1455 {
+ − 1456 $current = substr($bits, $i, 1);
+ − 1457 $last = substr($bits, $i - 1, 1);
+ − 1458 $next = substr($bits, $i + 1, 1);
+ − 1459 // Are we on the last character?
+ − 1460 if($current == $last && $i+1 < $len)
+ − 1461 $chunk_size++;
+ − 1462 else
+ − 1463 {
+ − 1464 if($i+1 == $len && $current == $next)
+ − 1465 {
+ − 1466 // This character completes a chunk
+ − 1467 $chunk_size++;
+ − 1468 $i++;
+ − 1469 $chunk = substr($bits, $start_pos, $chunk_size);
+ − 1470 $chunklen = strlen($chunk);
+ − 1471 $newchunk = $last . '[' . $chunklen . ']';
+ − 1472 $newlen = strlen($newchunk);
+ − 1473 $bits = substr($bits, 0, $start_pos) . $newchunk . substr($bits, $i, $len);
+ − 1474 $chunk_size = 1;
+ − 1475 $i = $start_pos + $newlen;
+ − 1476 $start_pos = $i;
+ − 1477 $len = strlen($bits);
+ − 1478 $crcval = $crcval + $chunklen;
+ − 1479 }
+ − 1480 else
+ − 1481 {
+ − 1482 // Last character completed a chunk
+ − 1483 $chunk = substr($bits, $start_pos, $chunk_size);
+ − 1484 $chunklen = strlen($chunk);
+ − 1485 $newchunk = $last . '[' . $chunklen . '],';
+ − 1486 $newlen = strlen($newchunk);
+ − 1487 $bits = substr($bits, 0, $start_pos) . $newchunk . substr($bits, $i, $len);
+ − 1488 $chunk_size = 1;
+ − 1489 $i = $start_pos + $newlen;
+ − 1490 $start_pos = $i;
+ − 1491 $len = strlen($bits);
+ − 1492 $crcval = $crcval + $chunklen;
+ − 1493 }
+ − 1494 }
+ − 1495 }
+ − 1496 if($crc != $crcval)
+ − 1497 {
+ − 1498 echo __FUNCTION__.'(): ERROR: length check failed, this is a bug in the algorithm<br />Debug info: aiming for a CRC val of '.$crc.', got '.$crcval;
+ − 1499 return false;
+ − 1500 }
+ − 1501 $compressed = 'cbf:len='.$crc.';crc='.dechex($crc32).';data='.$bits.'|end';
+ − 1502 return $compressed;
+ − 1503 }
+ − 1504
+ − 1505 /**
+ − 1506 * Uncompresses a bitfield compressed with compress_bitfield()
+ − 1507 * @param string $bits the compressed bitfield
+ − 1508 * @return string the uncompressed, original (we hope) bitfield OR bool false on error
+ − 1509 */
76
+ − 1510
1
+ − 1511 function uncompress_bitfield($bits)
+ − 1512 {
+ − 1513 if(substr($bits, 0, 4) != 'cbf:')
+ − 1514 {
+ − 1515 echo __FUNCTION__.'(): ERROR: Invalid stream';
+ − 1516 return false;
+ − 1517 }
+ − 1518 $len = intval(substr($bits, strpos($bits, 'len=')+4, strpos($bits, ';')-strpos($bits, 'len=')-4));
+ − 1519 $crc = substr($bits, strpos($bits, 'crc=')+4, 8);
+ − 1520 $data = substr($bits, strpos($bits, 'data=')+5, strpos($bits, '|end')-strpos($bits, 'data=')-5);
+ − 1521 $data = explode(',', $data);
+ − 1522 foreach($data as $a => $b)
+ − 1523 {
+ − 1524 $d =& $data[$a];
+ − 1525 $char = substr($d, 0, 1);
+ − 1526 $dlen = intval(substr($d, 2, strlen($d)-1));
+ − 1527 $s = '';
+ − 1528 for($i=0;$i<$dlen;$i++,$s.=$char);
+ − 1529 $d = $s;
+ − 1530 unset($s, $dlen, $char);
+ − 1531 }
+ − 1532 $decompressed = implode('', $data);
+ − 1533 $decompressed = substr($decompressed, 0, -1);
+ − 1534 $dcrc = (string)dechex(crc32($decompressed));
+ − 1535 if($dcrc != $crc)
+ − 1536 {
+ − 1537 echo __FUNCTION__.'(): ERROR: CRC check failed<br />debug info:<br />original crc: '.$crc.'<br />decomp\'ed crc: '.$dcrc.'<br />';
+ − 1538 return false;
+ − 1539 }
+ − 1540 return $decompressed;
+ − 1541 }
+ − 1542
+ − 1543 /**
+ − 1544 * Exports a MySQL table into a SQL string.
+ − 1545 * @param string $table The name of the table to export
+ − 1546 * @param bool $structure If true, include a CREATE TABLE command
+ − 1547 * @param bool $data If true, include the contents of the table
+ − 1548 * @param bool $compact If true, omits newlines between parts of SQL statements, use in Enano database exporter
+ − 1549 * @return string
+ − 1550 */
+ − 1551
+ − 1552 function export_table($table, $structure = true, $data = true, $compact = false)
+ − 1553 {
+ − 1554 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1555 $struct_keys = '';
+ − 1556 $divider = (!$compact) ? "\n" : "\n";
+ − 1557 $spacer1 = (!$compact) ? "\n" : " ";
+ − 1558 $spacer2 = (!$compact) ? " " : " ";
+ − 1559 $rowspacer = (!$compact) ? "\n " : " ";
+ − 1560 $index_list = Array();
+ − 1561 $cols = $db->sql_query('SHOW COLUMNS IN '.$table.';');
+ − 1562 if(!$cols)
+ − 1563 {
+ − 1564 echo 'export_table(): Error getting column list: '.$db->get_error_text().'<br />';
+ − 1565 return false;
+ − 1566 }
+ − 1567 $col = Array();
+ − 1568 $sqlcol = Array();
+ − 1569 $collist = Array();
+ − 1570 $pri_keys = Array();
+ − 1571 // Using fetchrow_num() here to compensate for MySQL l10n
+ − 1572 while( $row = $db->fetchrow_num() )
+ − 1573 {
+ − 1574 $field =& $row[0];
+ − 1575 $type =& $row[1];
+ − 1576 $null =& $row[2];
+ − 1577 $key =& $row[3];
+ − 1578 $def =& $row[4];
+ − 1579 $extra =& $row[5];
+ − 1580 $col[] = Array(
+ − 1581 'name'=>$field,
+ − 1582 'type'=>$type,
+ − 1583 'null'=>$null,
+ − 1584 'key'=>$key,
+ − 1585 'default'=>$def,
+ − 1586 'extra'=>$extra,
+ − 1587 );
+ − 1588 $collist[] = $field;
+ − 1589 }
76
+ − 1590
1
+ − 1591 if ( $structure )
+ − 1592 {
+ − 1593 $db->sql_query('SET SQL_QUOTE_SHOW_CREATE = 0;');
+ − 1594 $struct = $db->sql_query('SHOW CREATE TABLE '.$table.';');
+ − 1595 if ( !$struct )
+ − 1596 $db->_die();
+ − 1597 $row = $db->fetchrow_num();
+ − 1598 $db->free_result();
+ − 1599 $struct = $row[1];
+ − 1600 $struct = preg_replace("/\n\) ENGINE=(.+)$/", "\n);", $struct);
+ − 1601 unset($row);
+ − 1602 if ( $compact )
+ − 1603 {
+ − 1604 $struct_arr = explode("\n", $struct);
+ − 1605 foreach ( $struct_arr as $i => $leg )
+ − 1606 {
+ − 1607 if ( $i == 0 )
+ − 1608 continue;
+ − 1609 $test = trim($leg);
+ − 1610 if ( empty($test) )
+ − 1611 {
+ − 1612 unset($struct_arr[$i]);
+ − 1613 continue;
+ − 1614 }
+ − 1615 $struct_arr[$i] = preg_replace('/^([\s]*)/', ' ', $leg);
+ − 1616 }
+ − 1617 $struct = implode("", $struct_arr);
+ − 1618 }
+ − 1619 }
76
+ − 1620
1
+ − 1621 // Structuring complete
+ − 1622 if($data)
+ − 1623 {
+ − 1624 $datq = $db->sql_query('SELECT * FROM '.$table.';');
+ − 1625 if(!$datq)
+ − 1626 {
+ − 1627 echo 'export_table(): Error getting column list: '.$db->get_error_text().'<br />';
+ − 1628 return false;
+ − 1629 }
+ − 1630 if($db->numrows() < 1)
+ − 1631 {
+ − 1632 if($structure) return $struct;
+ − 1633 else return '';
+ − 1634 }
+ − 1635 $rowdata = Array();
+ − 1636 $dataqs = Array();
+ − 1637 $insert_strings = Array();
+ − 1638 $z = false;
+ − 1639 while($row = $db->fetchrow_num())
+ − 1640 {
+ − 1641 $z = false;
+ − 1642 foreach($row as $i => $cell)
+ − 1643 {
+ − 1644 $str = mysql_encode_column($cell, $col[$i]['type']);
+ − 1645 $rowdata[] = $str;
+ − 1646 }
+ − 1647 $dataqs2 = implode(",$rowspacer", $dataqs) . ",$rowspacer" . '( ' . implode(', ', $rowdata) . ' )';
+ − 1648 $ins = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . $dataqs2 . ";";
+ − 1649 if ( strlen( $ins ) > MYSQL_MAX_PACKET_SIZE )
+ − 1650 {
+ − 1651 // We've exceeded the maximum allowed packet size for MySQL - separate this into a different query
+ − 1652 $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
+ − 1653 $dataqs = Array('( ' . implode(', ', $rowdata) . ' )');
+ − 1654 $z = true;
+ − 1655 }
+ − 1656 else
+ − 1657 {
+ − 1658 $dataqs[] = '( ' . implode(', ', $rowdata) . ' )';
+ − 1659 }
+ − 1660 $rowdata = Array();
+ − 1661 }
+ − 1662 if ( !$z )
+ − 1663 {
+ − 1664 $insert_strings[] = 'INSERT INTO '.$table.'( '.implode(',', $collist).' ) VALUES' . implode(",$rowspacer", $dataqs) . ";";;
+ − 1665 $dataqs = Array();
+ − 1666 }
+ − 1667 $datstring = implode($divider, $insert_strings);
+ − 1668 }
+ − 1669 if($structure && !$data) return $struct;
+ − 1670 elseif(!$structure && $data) return $datstring;
+ − 1671 elseif($structure && $data) return $struct . $divider . $datstring;
+ − 1672 elseif(!$structure && !$data) return '';
+ − 1673 }
+ − 1674
+ − 1675 /**
+ − 1676 * Encodes a string value for use in an INSERT statement for given column type $type.
+ − 1677 * @access private
+ − 1678 */
76
+ − 1679
1
+ − 1680 function mysql_encode_column($input, $type)
+ − 1681 {
+ − 1682 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 1683 // Decide whether to quote the string or not
+ − 1684 if(substr($type, 0, 7) == 'varchar' || $type == 'datetime' || $type == 'text' || $type == 'tinytext' || $type == 'smalltext' || $type == 'longtext' || substr($type, 0, 4) == 'char')
+ − 1685 {
+ − 1686 $str = "'" . $db->escape($input) . "'";
+ − 1687 }
+ − 1688 elseif(in_array($type, Array('blob', 'longblob', 'mediumblob', 'smallblob')) || substr($type, 0, 6) == 'binary' || substr($type, 0, 9) == 'varbinary')
+ − 1689 {
+ − 1690 $str = '0x' . hexencode($input, '', '');
+ − 1691 }
+ − 1692 elseif(is_null($input))
+ − 1693 {
+ − 1694 $str = 'NULL';
+ − 1695 }
+ − 1696 else
+ − 1697 {
+ − 1698 $str = (string)$input;
+ − 1699 }
+ − 1700 return $str;
+ − 1701 }
+ − 1702
+ − 1703 /**
+ − 1704 * Creates an associative array defining which file extensions are allowed and which ones aren't
+ − 1705 * @return array keyname will be a file extension, value will be true or false
+ − 1706 */
+ − 1707
+ − 1708 function fetch_allowed_extensions()
+ − 1709 {
+ − 1710 global $mime_types;
+ − 1711 $bits = getConfig('allowed_mime_types');
+ − 1712 if(!$bits) return Array(false);
+ − 1713 $bits = uncompress_bitfield($bits);
+ − 1714 if(!$bits) return Array(false);
+ − 1715 $bits = enano_str_split($bits, 1);
+ − 1716 $ret = Array();
+ − 1717 $mt = array_keys($mime_types);
+ − 1718 foreach($bits as $i => $b)
+ − 1719 {
+ − 1720 $ret[$mt[$i]] = ( $b == '1' ) ? true : false;
+ − 1721 }
+ − 1722 return $ret;
+ − 1723 }
+ − 1724
+ − 1725 /**
+ − 1726 * Generates a random key suitable for encryption
+ − 1727 * @param int $len the length of the key
+ − 1728 * @return string a BINARY key
+ − 1729 */
+ − 1730
+ − 1731 function randkey($len = 32)
+ − 1732 {
+ − 1733 $key = '';
+ − 1734 for($i=0;$i<$len;$i++)
+ − 1735 {
+ − 1736 $key .= chr(mt_rand(0, 255));
+ − 1737 }
+ − 1738 return $key;
+ − 1739 }
+ − 1740
+ − 1741 /**
+ − 1742 * Decodes a hex string.
+ − 1743 * @param string $hex The hex code to decode
+ − 1744 * @return string
+ − 1745 */
+ − 1746
+ − 1747 function hexdecode($hex)
+ − 1748 {
+ − 1749 $hex = enano_str_split($hex, 2);
+ − 1750 $bin_key = '';
+ − 1751 foreach($hex as $nibble)
+ − 1752 {
+ − 1753 $byte = chr(hexdec($nibble));
+ − 1754 $bin_key .= $byte;
+ − 1755 }
+ − 1756 return $bin_key;
+ − 1757 }
+ − 1758
+ − 1759 /**
+ − 1760 * Enano's own (almost) bulletproof HTML sanitizer.
+ − 1761 * @param string $html The input HTML
+ − 1762 * @return string cleaned HTML
+ − 1763 */
+ − 1764
+ − 1765 function sanitize_html($html, $filter_php = true)
+ − 1766 {
76
+ − 1767
1
+ − 1768 $html = preg_replace('#<([a-z]+)([\s]+)([^>]+?)'.htmlalternatives('javascript:').'(.+?)>(.*?)</\\1>#is', '<\\1\\2\\3javascript:\\59>\\60</\\1>', $html);
+ − 1769 $html = preg_replace('#<([a-z]+)([\s]+)([^>]+?)'.htmlalternatives('javascript:').'(.+?)>#is', '<\\1\\2\\3javascript:\\59>', $html);
76
+ − 1770
1
+ − 1771 if($filter_php)
+ − 1772 $html = str_replace(
+ − 1773 Array('<?php', '<?', '<%', '?>', '%>'),
+ − 1774 Array('<?php', '<?', '<%', '?>', '%>'),
+ − 1775 $html);
76
+ − 1776
1
+ − 1777 $tag_whitelist = array_keys ( setupAttributeWhitelist() );
+ − 1778 if ( !$filter_php )
+ − 1779 $tag_whitelist[] = '?php';
+ − 1780 $len = strlen($html);
+ − 1781 $in_quote = false;
+ − 1782 $quote_char = '';
+ − 1783 $tag_start = 0;
+ − 1784 $tag_name = '';
+ − 1785 $in_tag = false;
+ − 1786 $trk_name = false;
+ − 1787 for ( $i = 0; $i < $len; $i++ )
+ − 1788 {
+ − 1789 $chr = $html{$i};
+ − 1790 $prev = ( $i == 0 ) ? '' : $html{ $i - 1 };
+ − 1791 $next = ( ( $i + 1 ) == $len ) ? '' : $html { $i + 1 };
+ − 1792 if ( $in_quote && $in_tag )
+ − 1793 {
+ − 1794 if ( $quote_char == $chr && $prev != '\\' )
+ − 1795 $in_quote = false;
+ − 1796 }
+ − 1797 elseif ( ( $chr == '"' || $chr == "'" ) && $prev != '\\' && $in_tag )
+ − 1798 {
+ − 1799 $in_quote = true;
+ − 1800 $quote_char = $chr;
+ − 1801 }
+ − 1802 if ( $chr == '<' && !$in_tag && $next != '/' )
76
+ − 1803 {
1
+ − 1804 // start of a tag
+ − 1805 $tag_start = $i;
+ − 1806 $in_tag = true;
+ − 1807 $trk_name = true;
+ − 1808 }
+ − 1809 elseif ( !$in_quote && $in_tag && $chr == '>' )
+ − 1810 {
+ − 1811 $full_tag = substr($html, $tag_start, ( $i - $tag_start ) + 1 );
+ − 1812 $l = strlen($tag_name) + 2;
+ − 1813 $attribs_only = trim( substr($full_tag, $l, ( strlen($full_tag) - $l - 1 ) ) );
76
+ − 1814
1
+ − 1815 // Debugging message
+ − 1816 // echo htmlspecialchars($full_tag) . '<br />';
76
+ − 1817
1
+ − 1818 if ( !in_array($tag_name, $tag_whitelist) )
+ − 1819 {
+ − 1820 // Illegal tag
+ − 1821 //echo $tag_name . ' ';
76
+ − 1822
1
+ − 1823 $s = ( empty($attribs_only) ) ? '' : ' ';
76
+ − 1824
1
+ − 1825 $sanitized = '<' . $tag_name . $s . $attribs_only . '>';
76
+ − 1826
1
+ − 1827 $html = substr($html, 0, $tag_start) . $sanitized . substr($html, $i + 1);
+ − 1828 $html = str_replace('</' . $tag_name . '>', '</' . $tag_name . '>', $html);
+ − 1829 $new_i = $tag_start + strlen($sanitized);
76
+ − 1830
1
+ − 1831 $len = strlen($html);
+ − 1832 $i = $new_i;
76
+ − 1833
1
+ − 1834 $in_tag = false;
+ − 1835 $tag_name = '';
+ − 1836 continue;
+ − 1837 }
+ − 1838 else
+ − 1839 {
+ − 1840 if ( $tag_name == '?php' && !$filter_php )
+ − 1841 continue;
+ − 1842 $f = fixTagAttributes( $attribs_only, $tag_name );
+ − 1843 $s = ( empty($f) ) ? '' : ' ';
76
+ − 1844
1
+ − 1845 $sanitized = '<' . $tag_name . $f . '>';
+ − 1846 $new_i = $tag_start + strlen($sanitized);
76
+ − 1847
1
+ − 1848 $html = substr($html, 0, $tag_start) . $sanitized . substr($html, $i + 1);
+ − 1849 $len = strlen($html);
+ − 1850 $i = $new_i;
76
+ − 1851
1
+ − 1852 $in_tag = false;
+ − 1853 $tag_name = '';
+ − 1854 continue;
+ − 1855 }
+ − 1856 }
+ − 1857 elseif ( $in_tag && $trk_name )
+ − 1858 {
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 1859 $is_alphabetical = ( strtolower($chr) != strtoupper($chr) || in_array($chr, array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')) || $chr == '?' || $chr == '!' || $chr == '-' );
1
+ − 1860 if ( $is_alphabetical )
+ − 1861 $tag_name .= $chr;
+ − 1862 else
+ − 1863 {
+ − 1864 $trk_name = false;
+ − 1865 }
+ − 1866 }
76
+ − 1867
1
+ − 1868 }
76
+ − 1869
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 1870 // Vulnerability from ha.ckers.org/xss.html:
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 1871 // <script src="http://foo.com/xss.js"
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 1872 // <
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 1873 // The rule is so specific because everything else will have been filtered by now
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 1874 $html = preg_replace('/<(script|iframe)(.+?)src=([^>]*)</i', '<\\1\\2src=\\3<', $html);
76
+ − 1875
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 1876 // Unstrip comments
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 1877 $html = preg_replace('/<!--([^>]*?)-->/i', '', $html);
76
+ − 1878
1
+ − 1879 return $html;
76
+ − 1880
1
+ − 1881 }
+ − 1882
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1883 /**
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1884 * Using the same parsing code as sanitize_html(), this function adds <litewiki> tags around certain block-level elements
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1885 * @param string $html The input HTML
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1886 * @return string formatted HTML
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1887 */
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1888
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1889 function wikiformat_process_block($html)
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1890 {
76
+ − 1891
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1892 $tok1 = "<litewiki>";
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1893 $tok2 = "</litewiki>";
76
+ − 1894
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1895 $block_tags = array('div', 'p', 'table', 'blockquote', 'pre');
76
+ − 1896
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1897 $len = strlen($html);
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1898 $in_quote = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1899 $quote_char = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1900 $tag_start = 0;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1901 $tag_name = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1902 $in_tag = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1903 $trk_name = false;
76
+ − 1904
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1905 $diag = 0;
76
+ − 1906
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1907 $block_tagname = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1908 $in_blocksec = 0;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1909 $block_start = 0;
76
+ − 1910
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1911 for ( $i = 0; $i < $len; $i++ )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1912 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1913 $chr = $html{$i};
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1914 $prev = ( $i == 0 ) ? '' : $html{ $i - 1 };
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1915 $next = ( ( $i + 1 ) == $len ) ? '' : $html { $i + 1 };
76
+ − 1916
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1917 // Are we inside of a quoted section?
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1918 if ( $in_quote && $in_tag )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1919 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1920 if ( $quote_char == $chr && $prev != '\\' )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1921 $in_quote = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1922 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1923 elseif ( ( $chr == '"' || $chr == "'" ) && $prev != '\\' && $in_tag )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1924 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1925 $in_quote = true;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1926 $quote_char = $chr;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1927 }
76
+ − 1928
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1929 if ( $chr == '<' && !$in_tag && $next == '/' )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1930 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1931 // Iterate through until we've got a tag name
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1932 $tag_name = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1933 $i++;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1934 while(true)
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1935 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1936 $i++;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1937 // echo $i . ' ';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1938 $chr = $html{$i};
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1939 $prev = ( $i == 0 ) ? '' : $html{ $i - 1 };
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1940 $next = ( ( $i + 1 ) == $len ) ? '' : $html { $i + 1 };
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1941 $tag_name .= $chr;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1942 if ( $next == '>' )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1943 break;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1944 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1945 // echo '<br />';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1946 if ( in_array($tag_name, $block_tags) )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1947 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1948 if ( $block_tagname == $tag_name )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1949 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1950 $in_blocksec -= 1;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1951 if ( $in_blocksec == 0 )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1952 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1953 $block_tagname = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1954 $i += 2;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1955 // echo 'Finished wiki litewiki wraparound calc at pos: ' . $i;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1956 $full_litewiki = substr($html, $block_start, ( $i - $block_start ));
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1957 $new_text = "{$tok1}{$full_litewiki}{$tok2}";
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1958 $html = substr($html, 0, $block_start) . $new_text . substr($html, $i);
76
+ − 1959
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1960 $i += ( strlen($tok1) + strlen($tok2) ) - 1;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1961 $len = strlen($html);
76
+ − 1962
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1963 //die('<pre>' . htmlspecialchars($html) . '</pre>');
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1964 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1965 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1966 }
76
+ − 1967
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1968 $in_tag = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1969 $in_quote = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1970 $tag_name = '';
76
+ − 1971
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1972 continue;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1973 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1974 else if ( $chr == '<' && !$in_tag && $next != '/' )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1975 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1976 // start of a tag
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1977 $tag_start = $i;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1978 $in_tag = true;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1979 $trk_name = true;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1980 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1981 else if ( !$in_quote && $in_tag && $chr == '>' )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1982 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1983 if ( !in_array($tag_name, $block_tags) )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1984 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1985 // Inline tag - reset and go to the next one
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1986 // echo '<inline ' . $tag_name . '> ';
76
+ − 1987
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1988 $in_tag = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1989 $tag_name = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1990 continue;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1991 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1992 else
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1993 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1994 // echo '<block: ' . $tag_name . ' @ ' . $i . '><br/>';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1995 if ( $in_blocksec == 0 )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1996 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1997 //die('Found a starting tag for a block element: ' . $tag_name . ' at pos ' . $tag_start);
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1998 $block_tagname = $tag_name;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 1999 $block_start = $tag_start;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2000 $in_blocksec++;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2001 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2002 else if ( $block_tagname == $tag_name )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2003 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2004 $in_blocksec++;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2005 }
76
+ − 2006
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2007 $in_tag = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2008 $tag_name = '';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2009 continue;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2010 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2011 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2012 elseif ( $in_tag && $trk_name )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2013 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2014 $is_alphabetical = ( strtolower($chr) != strtoupper($chr) || in_array($chr, array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9')) || $chr == '?' || $chr == '!' || $chr == '-' );
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2015 if ( $is_alphabetical )
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2016 $tag_name .= $chr;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2017 else
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2018 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2019 $trk_name = false;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2020 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2021 }
76
+ − 2022
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2023 // Tokenization complete
76
+ − 2024
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2025 }
76
+ − 2026
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2027 $regex = '/' . str_replace('/', '\\/', preg_quote($tok2)) . '([\s]*)' . preg_quote($tok1) . '/is';
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2028 // die(htmlspecialchars($regex));
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2029 $html = preg_replace($regex, '\\1', $html);
76
+ − 2030
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2031 return $html;
76
+ − 2032
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2033 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2034
1
+ − 2035 function htmlalternatives($string)
+ − 2036 {
+ − 2037 $ret = '';
+ − 2038 for ( $i = 0; $i < strlen($string); $i++ )
+ − 2039 {
+ − 2040 $chr = $string{$i};
+ − 2041 $ch1 = ord($chr);
+ − 2042 $ch2 = dechex($ch1);
+ − 2043 $byte = '(&\\#([0]*){0,7}' . $ch1 . ';|\\\\([0]*){0,7}' . $ch1 . ';|\\\\([0]*){0,7}' . $ch2 . ';|&\\#x([0]*){0,7}' . $ch2 . ';|%([0]*){0,7}' . $ch2 . '|' . preg_quote($chr) . ')';
+ − 2044 $ret .= $byte;
+ − 2045 $ret .= '([\s]){0,2}';
+ − 2046 }
+ − 2047 return $ret;
+ − 2048 }
+ − 2049
+ − 2050 /**
+ − 2051 * Paginates (breaks into multiple pages) a MySQL result resource, which is treated as unbuffered.
+ − 2052 * @param resource The MySQL result resource. This should preferably be an unbuffered query.
+ − 2053 * @param string A template, with variables being named after the column name
+ − 2054 * @param int The number of total results. This should be determined by a second query.
+ − 2055 * @param string sprintf-style formatting string for URLs for result pages. First parameter will be start offset.
+ − 2056 * @param int Optional. Start offset in individual results. Defaults to 0.
+ − 2057 * @param int Optional. The number of results per page. Defualts to 10.
+ − 2058 * @param int Optional. An associative array of functions to call, with key names being column names, and values being function names. Values can also be an array with key 0 being either an object or a string(class name) and key 1 being a [static] method.
+ − 2059 * @param string Optional. The text to be sent before the result list, only if there are any results. Possibly the start of a table.
+ − 2060 * @param string Optional. The text to be sent after the result list, only if there are any results. Possibly the end of a table.
+ − 2061 * @return string
+ − 2062 */
+ − 2063
+ − 2064 function paginate($q, $tpl_text, $num_results, $result_url, $start = 0, $perpage = 10, $callers = Array(), $header = '', $footer = '')
+ − 2065 {
+ − 2066 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2067 $parser = $template->makeParserText($tpl_text);
+ − 2068 $num_pages = ceil ( $num_results / $perpage );
+ − 2069 $out = '';
+ − 2070 $i = 0;
+ − 2071 $this_page = ceil ( $start / $perpage );
76
+ − 2072
1
+ − 2073 // Build paginator
82
+ − 2074 $pg_css = ( strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) ?
+ − 2075 // IE-specific hack
+ − 2076 'display: block; width: 1px;':
+ − 2077 // Other browsers
+ − 2078 'display: table; margin: 10px 0 0 auto;';
+ − 2079 $begin = '<div class="tblholder" style="'. $pg_css . '">
1
+ − 2080 <table border="0" cellspacing="1" cellpadding="4">
+ − 2081 <tr><th>Page:</th>';
+ − 2082 $block = '<td class="row1" style="text-align: center;">{LINK}</td>';
+ − 2083 $end = '</tr></table></div>';
+ − 2084 $blk = $template->makeParserText($block);
+ − 2085 $inner = '';
+ − 2086 $cls = 'row2';
+ − 2087 if ( $num_pages < 5 )
+ − 2088 {
+ − 2089 for ( $i = 0; $i < $num_pages; $i++ )
+ − 2090 {
+ − 2091 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2092 $offset = strval($i * $perpage);
76
+ − 2093 $url = htmlspecialchars(sprintf($result_url, $offset));
1
+ − 2094 $j = $i + 1;
+ − 2095 $link = ( $offset == strval($start) ) ? "<b>$j</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>$j</a>";
+ − 2096 $blk->assign_vars(array(
+ − 2097 'CLASS'=>$cls,
+ − 2098 'LINK'=>$link
+ − 2099 ));
+ − 2100 $inner .= $blk->run();
+ − 2101 }
+ − 2102 }
+ − 2103 else
+ − 2104 {
+ − 2105 if ( $this_page + 5 > $num_pages )
+ − 2106 {
+ − 2107 $list = Array();
+ − 2108 $tp = $this_page;
+ − 2109 if ( $this_page + 0 == $num_pages ) $tp = $tp - 3;
+ − 2110 if ( $this_page + 1 == $num_pages ) $tp = $tp - 2;
+ − 2111 if ( $this_page + 2 == $num_pages ) $tp = $tp - 1;
+ − 2112 for ( $i = $tp - 1; $i <= $tp + 1; $i++ )
+ − 2113 {
+ − 2114 $list[] = $i;
+ − 2115 }
+ − 2116 }
+ − 2117 else
+ − 2118 {
+ − 2119 $list = Array();
+ − 2120 $current = $this_page;
+ − 2121 $lower = ( $current < 3 ) ? 1 : $current - 1;
+ − 2122 for ( $i = 0; $i < 3; $i++ )
+ − 2123 {
+ − 2124 $list[] = $lower + $i;
+ − 2125 }
+ − 2126 }
+ − 2127 $url = sprintf($result_url, '0');
+ − 2128 $link = ( 0 == $start ) ? "<b>First</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>« First</a>";
+ − 2129 $blk->assign_vars(array(
+ − 2130 'CLASS'=>$cls,
+ − 2131 'LINK'=>$link
+ − 2132 ));
+ − 2133 $inner .= $blk->run();
76
+ − 2134
1
+ − 2135 // if ( !in_array(1, $list) )
+ − 2136 // {
+ − 2137 // $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2138 // $blk->assign_vars(array('CLASS'=>$cls,'LINK'=>'...'));
+ − 2139 // $inner .= $blk->run();
+ − 2140 // }
76
+ − 2141
1
+ − 2142 foreach ( $list as $i )
+ − 2143 {
+ − 2144 if ( $i == $num_pages )
+ − 2145 break;
+ − 2146 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2147 $offset = strval($i * $perpage);
+ − 2148 $url = sprintf($result_url, $offset);
+ − 2149 $j = $i + 1;
+ − 2150 $link = ( $offset == strval($start) ) ? "<b>$j</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>$j</a>";
+ − 2151 $blk->assign_vars(array(
+ − 2152 'CLASS'=>$cls,
+ − 2153 'LINK'=>$link
+ − 2154 ));
+ − 2155 $inner .= $blk->run();
+ − 2156 }
76
+ − 2157
1
+ − 2158 $total = $num_pages * $perpage - $perpage;
76
+ − 2159
1
+ − 2160 if ( $this_page < $num_pages )
+ − 2161 {
+ − 2162 // $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2163 // $blk->assign_vars(array('CLASS'=>$cls,'LINK'=>'...'));
+ − 2164 // $inner .= $blk->run();
76
+ − 2165
1
+ − 2166 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2167 $offset = strval($total);
+ − 2168 $url = sprintf($result_url, $offset);
+ − 2169 $j = $i + 1;
+ − 2170 $link = ( $offset == strval($start) ) ? "<b>Last</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>Last »</a>";
+ − 2171 $blk->assign_vars(array(
+ − 2172 'CLASS'=>$cls,
+ − 2173 'LINK'=>$link
+ − 2174 ));
+ − 2175 $inner .= $blk->run();
+ − 2176 }
76
+ − 2177
1
+ − 2178 }
76
+ − 2179
1
+ − 2180 $inner .= '<td class="row2" style="cursor: pointer;" onclick="paginator_goto(this, '.$this_page.', '.$num_pages.', '.$perpage.', unescape(\'' . rawurlencode($result_url) . '\'));">↓</td>';
76
+ − 2181
1
+ − 2182 $paginator = "\n$begin$inner$end\n";
+ − 2183 $out .= $paginator;
76
+ − 2184
1
+ − 2185 $cls = 'row2';
76
+ − 2186
1
+ − 2187 if ( $row = $db->fetchrow($q) )
+ − 2188 {
+ − 2189 $i = 0;
+ − 2190 $out .= $header;
+ − 2191 do {
+ − 2192 $i++;
+ − 2193 if ( $i <= $start )
+ − 2194 {
+ − 2195 continue;
+ − 2196 }
+ − 2197 if ( ( $i - $start ) > $perpage )
+ − 2198 {
+ − 2199 break;
+ − 2200 }
+ − 2201 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2202 foreach ( $row as $j => $val )
+ − 2203 {
+ − 2204 if ( isset($callers[$j]) )
+ − 2205 {
74
68469a95658d
Various bugfixes and cleanups, too much to remember... see the diffs for what got changed :-)
Dan
diff
changeset
+ − 2206 $tmp = ( is_callable($callers[$j]) ) ? @call_user_func($callers[$j], $val, $row) : $val;
76
+ − 2207
1
+ − 2208 if ( $tmp )
+ − 2209 {
+ − 2210 $row[$j] = $tmp;
+ − 2211 }
+ − 2212 }
+ − 2213 }
+ − 2214 $parser->assign_vars($row);
+ − 2215 $parser->assign_vars(array('_css_class' => $cls));
+ − 2216 $out .= $parser->run();
+ − 2217 } while ( $row = $db->fetchrow($q) );
+ − 2218 $out .= $footer;
+ − 2219 }
76
+ − 2220
1
+ − 2221 $out .= $paginator;
76
+ − 2222
1
+ − 2223 return $out;
+ − 2224 }
+ − 2225
+ − 2226 /**
+ − 2227 * This is the same as paginate(), but it processes an array instead of a MySQL result resource.
+ − 2228 * @param array The results. Each value is simply echoed.
+ − 2229 * @param int The number of total results. This should be determined by a second query.
+ − 2230 * @param string sprintf-style formatting string for URLs for result pages. First parameter will be start offset.
+ − 2231 * @param int Optional. Start offset in individual results. Defaults to 0.
+ − 2232 * @param int Optional. The number of results per page. Defualts to 10.
+ − 2233 * @param string Optional. The text to be sent before the result list, only if there are any results. Possibly the start of a table.
+ − 2234 * @param string Optional. The text to be sent after the result list, only if there are any results. Possibly the end of a table.
+ − 2235 * @return string
+ − 2236 */
+ − 2237
+ − 2238 function paginate_array($q, $num_results, $result_url, $start = 0, $perpage = 10, $header = '', $footer = '')
+ − 2239 {
+ − 2240 global $db, $session, $paths, $template, $plugins; // Common objects
+ − 2241 $parser = $template->makeParserText($tpl_text);
+ − 2242 $num_pages = ceil ( $num_results / $perpage );
+ − 2243 $out = '';
+ − 2244 $i = 0;
+ − 2245 $this_page = ceil ( $start / $perpage );
76
+ − 2246
1
+ − 2247 // Build paginator
+ − 2248 $begin = '<div class="tblholder" style="display: table; margin: 10px 0 0 auto;">
+ − 2249 <table border="0" cellspacing="1" cellpadding="4">
+ − 2250 <tr><th>Page:</th>';
+ − 2251 $block = '<td class="row1" style="text-align: center;">{LINK}</td>';
+ − 2252 $end = '</tr></table></div>';
+ − 2253 $blk = $template->makeParserText($block);
+ − 2254 $inner = '';
+ − 2255 $cls = 'row2';
+ − 2256 if ( $start > 0 )
+ − 2257 {
+ − 2258 $url = sprintf($result_url, abs($start - $perpage));
+ − 2259 $link = "<a href=".'"'."$url".'"'." style='text-decoration: none;'>« Prev</a>";
+ − 2260 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2261 $blk->assign_vars(array(
+ − 2262 'CLASS'=>$cls,
+ − 2263 'LINK'=>$link
+ − 2264 ));
+ − 2265 $inner .= $blk->run();
+ − 2266 }
+ − 2267 if ( $num_pages < 5 )
+ − 2268 {
+ − 2269 for ( $i = 0; $i < $num_pages; $i++ )
+ − 2270 {
+ − 2271 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2272 $offset = strval($i * $perpage);
76
+ − 2273 $url = htmlspecialchars(sprintf($result_url, $offset));
1
+ − 2274 $j = $i + 1;
+ − 2275 $link = ( $offset == strval($start) ) ? "<b>$j</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>$j</a>";
+ − 2276 $blk->assign_vars(array(
+ − 2277 'CLASS'=>$cls,
+ − 2278 'LINK'=>$link
+ − 2279 ));
+ − 2280 $inner .= $blk->run();
+ − 2281 }
+ − 2282 }
+ − 2283 else
+ − 2284 {
+ − 2285 if ( $this_page + 5 > $num_pages )
+ − 2286 {
+ − 2287 $list = Array();
+ − 2288 $tp = $this_page;
+ − 2289 if ( $this_page + 0 == $num_pages ) $tp = $tp - 3;
+ − 2290 if ( $this_page + 1 == $num_pages ) $tp = $tp - 2;
+ − 2291 if ( $this_page + 2 == $num_pages ) $tp = $tp - 1;
+ − 2292 for ( $i = $tp - 1; $i <= $tp + 1; $i++ )
+ − 2293 {
+ − 2294 $list[] = $i;
+ − 2295 }
+ − 2296 }
+ − 2297 else
+ − 2298 {
+ − 2299 $list = Array();
+ − 2300 $current = $this_page;
+ − 2301 $lower = ( $current < 3 ) ? 1 : $current - 1;
+ − 2302 for ( $i = 0; $i < 3; $i++ )
+ − 2303 {
+ − 2304 $list[] = $lower + $i;
+ − 2305 }
+ − 2306 }
+ − 2307 $url = sprintf($result_url, '0');
+ − 2308 $link = ( 0 == $start ) ? "<b>First</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>« First</a>";
+ − 2309 $blk->assign_vars(array(
+ − 2310 'CLASS'=>$cls,
+ − 2311 'LINK'=>$link
+ − 2312 ));
+ − 2313 $inner .= $blk->run();
76
+ − 2314
1
+ − 2315 // if ( !in_array(1, $list) )
+ − 2316 // {
+ − 2317 // $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2318 // $blk->assign_vars(array('CLASS'=>$cls,'LINK'=>'...'));
+ − 2319 // $inner .= $blk->run();
+ − 2320 // }
76
+ − 2321
1
+ − 2322 foreach ( $list as $i )
+ − 2323 {
+ − 2324 if ( $i == $num_pages )
+ − 2325 break;
+ − 2326 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2327 $offset = strval($i * $perpage);
+ − 2328 $url = sprintf($result_url, $offset);
+ − 2329 $j = $i + 1;
+ − 2330 $link = ( $offset == strval($start) ) ? "<b>$j</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>$j</a>";
+ − 2331 $blk->assign_vars(array(
+ − 2332 'CLASS'=>$cls,
+ − 2333 'LINK'=>$link
+ − 2334 ));
+ − 2335 $inner .= $blk->run();
+ − 2336 }
76
+ − 2337
1
+ − 2338 $total = $num_pages * $perpage - $perpage;
76
+ − 2339
1
+ − 2340 if ( $this_page < $num_pages )
+ − 2341 {
+ − 2342 // $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2343 // $blk->assign_vars(array('CLASS'=>$cls,'LINK'=>'...'));
+ − 2344 // $inner .= $blk->run();
76
+ − 2345
1
+ − 2346 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2347 $offset = strval($total);
+ − 2348 $url = sprintf($result_url, $offset);
+ − 2349 $j = $i + 1;
+ − 2350 $link = ( $offset == strval($start) ) ? "<b>Last</b>" : "<a href=".'"'."$url".'"'." style='text-decoration: none;'>Last »</a>";
+ − 2351 $blk->assign_vars(array(
+ − 2352 'CLASS'=>$cls,
+ − 2353 'LINK'=>$link
+ − 2354 ));
+ − 2355 $inner .= $blk->run();
+ − 2356 }
76
+ − 2357
1
+ − 2358 }
76
+ − 2359
1
+ − 2360 if ( $start < $total )
+ − 2361 {
+ − 2362 $url = sprintf($result_url, abs($start + $perpage));
+ − 2363 $link = "<a href=".'"'."$url".'"'." style='text-decoration: none;'>Next »</a>";
+ − 2364 $cls = ( $cls == 'row1' ) ? 'row2' : 'row1';
+ − 2365 $blk->assign_vars(array(
+ − 2366 'CLASS'=>$cls,
+ − 2367 'LINK'=>$link
+ − 2368 ));
+ − 2369 $inner .= $blk->run();
+ − 2370 }
76
+ − 2371
1
+ − 2372 $inner .= '<td class="row2" style="cursor: pointer;" onclick="paginator_goto(this, '.$this_page.', '.$num_pages.', '.$perpage.', unescape(\'' . rawurlencode($result_url) . '\'));">↓</td>';
76
+ − 2373
1
+ − 2374 $paginator = "\n$begin$inner$end\n";
+ − 2375 if ( $total > 1 )
+ − 2376 $out .= $paginator;
76
+ − 2377
1
+ − 2378 $cls = 'row2';
76
+ − 2379
1
+ − 2380 if ( sizeof($q) > 0 )
+ − 2381 {
+ − 2382 $i = 0;
+ − 2383 $out .= $header;
+ − 2384 foreach ( $q as $val ) {
+ − 2385 $i++;
+ − 2386 if ( $i <= $start )
+ − 2387 {
+ − 2388 continue;
+ − 2389 }
+ − 2390 if ( ( $i - $start ) > $perpage )
+ − 2391 {
+ − 2392 break;
+ − 2393 }
+ − 2394 $out .= $val;
+ − 2395 }
+ − 2396 $out .= $footer;
+ − 2397 }
76
+ − 2398
1
+ − 2399 if ( $total > 1 )
+ − 2400 $out .= $paginator;
76
+ − 2401
1
+ − 2402 return $out;
+ − 2403 }
+ − 2404
76
+ − 2405 /**
1
+ − 2406 * Enano version of fputs for debugging
+ − 2407 */
+ − 2408
+ − 2409 function enano_fputs($socket, $data)
+ − 2410 {
+ − 2411 // echo '<pre>' . htmlspecialchars($data) . '</pre>';
+ − 2412 // flush();
+ − 2413 // ob_flush();
+ − 2414 // ob_end_flush();
+ − 2415 return fputs($socket, $data);
+ − 2416 }
+ − 2417
+ − 2418 /**
+ − 2419 * Sanitizes a page URL string so that it can safely be stored in the database.
+ − 2420 * @param string Page ID to sanitize
+ − 2421 * @return string Cleaned text
+ − 2422 */
+ − 2423
+ − 2424 function sanitize_page_id($page_id)
+ − 2425 {
76
+ − 2426
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2427 // Remove character escapes
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2428 $page_id = dirtify_page_id($page_id);
76
+ − 2429
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 2430 $pid_clean = preg_replace('/[\w\.\/:;\(\)@\[\]_-]/', 'X', $page_id);
1
+ − 2431 $pid_dirty = enano_str_split($pid_clean, 1);
76
+ − 2432
1
+ − 2433 foreach ( $pid_dirty as $id => $char )
+ − 2434 {
+ − 2435 if ( $char == 'X' )
+ − 2436 continue;
+ − 2437 $cid = ord($char);
+ − 2438 $cid = dechex($cid);
+ − 2439 $cid = strval($cid);
+ − 2440 if ( strlen($cid) < 2 )
+ − 2441 {
+ − 2442 $cid = strtoupper("0$cid");
+ − 2443 }
+ − 2444 $pid_dirty[$id] = ".$cid";
+ − 2445 }
76
+ − 2446
1
+ − 2447 $pid_chars = enano_str_split($page_id, 1);
+ − 2448 $page_id_cleaned = '';
76
+ − 2449
1
+ − 2450 foreach ( $pid_chars as $id => $char )
+ − 2451 {
+ − 2452 if ( $pid_dirty[$id] == 'X' )
+ − 2453 $page_id_cleaned .= $char;
+ − 2454 else
+ − 2455 $page_id_cleaned .= $pid_dirty[$id];
+ − 2456 }
76
+ − 2457
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 2458 // global $mime_types;
76
+ − 2459
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 2460 // $exts = array_keys($mime_types);
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 2461 // $exts = '(' . implode('|', $exts) . ')';
76
+ − 2462
21
663fcf528726
Updated all version numbers back to Banshee; a few preliminary steps towards full UTF-8 support in page URLs
Dan
diff
changeset
+ − 2463 // $page_id_cleaned = preg_replace('/\.2e' . $exts . '$/', '.\\1', $page_id_cleaned);
76
+ − 2464
1
+ − 2465 return $page_id_cleaned;
+ − 2466 }
+ − 2467
+ − 2468 /**
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2469 * Removes character escapes in a page ID string
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2470 * @param string Page ID string to dirty up
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2471 * @return string
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2472 */
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2473
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2474 function dirtify_page_id($page_id)
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2475 {
38
+ − 2476 global $db, $session, $paths, $template, $plugins; // Common objects
76
+ − 2477 // First, replace spaces with underscores
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2478 $page_id = str_replace(' ', '_', $page_id);
76
+ − 2479
38
+ − 2480 // Exception for userpages for IP addresses
+ − 2481 if ( preg_match('/^' . preg_quote($paths->nslist['User']) . '/', $page_id) )
+ − 2482 {
+ − 2483 $ip = preg_replace('/^' . preg_quote($paths->nslist['User']) . '/', '', $page_id);
+ − 2484 if ( is_valid_ip($ip) )
+ − 2485 return $page_id;
+ − 2486 }
76
+ − 2487
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2488 preg_match_all('/\.[A-Fa-f0-9][A-Fa-f0-9]/', $page_id, $matches);
76
+ − 2489
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2490 foreach ( $matches[0] as $id => $char )
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2491 {
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2492 $char = substr($char, 1);
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2493 $char = strtolower($char);
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2494 $char = intval(hexdec($char));
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2495 $char = chr($char);
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2496 $page_id = str_replace($matches[0][$id], $char, $page_id);
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2497 }
76
+ − 2498
15
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2499 return $page_id;
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2500 }
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2501
ad5986a53197
Fixed complicated SQL injection vulnerability in URL handler, updated license info for Tigra Tree Menu, and killed one XSS vulnerability
Dan
diff
changeset
+ − 2502 /**
76
+ − 2503 * Inserts commas into a number to make it more human-readable. Floating point-safe and doesn't flirt with the number like number_format() does.
1
+ − 2504 * @param int The number to process
+ − 2505 * @return string Input number with commas added
+ − 2506 */
+ − 2507
+ − 2508 function commatize($num)
+ − 2509 {
+ − 2510 $num = (string)$num;
+ − 2511 if ( strpos($num, '.') )
+ − 2512 {
+ − 2513 $whole = explode('.', $num);
+ − 2514 $num = $whole[0];
+ − 2515 $dec = $whole[1];
+ − 2516 }
+ − 2517 else
+ − 2518 {
+ − 2519 $whole = $num;
+ − 2520 }
+ − 2521 $offset = ( strlen($num) ) % 3;
+ − 2522 $len = strlen($num);
+ − 2523 $offset = ( $offset == 0 )
+ − 2524 ? 3
+ − 2525 : $offset;
+ − 2526 for ( $i = $offset; $i < $len; $i=$i+3 )
+ − 2527 {
+ − 2528 $num = substr($num, 0, $i) . ',' . substr($num, $i, $len);
+ − 2529 $len = strlen($num);
+ − 2530 $i++;
+ − 2531 }
+ − 2532 if ( isset($dec) )
+ − 2533 {
+ − 2534 return $num . '.' . $dec;
+ − 2535 }
+ − 2536 else
+ − 2537 {
+ − 2538 return $num;
+ − 2539 }
+ − 2540 }
+ − 2541
32
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2542 /**
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2543 * Injects a string into another string at the specified position.
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2544 * @param string The haystack
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2545 * @param string The needle
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2546 * @param int Position at which to insert the needle
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2547 */
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2548
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2549 function inject_substr($haystack, $needle, $pos)
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2550 {
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2551 $str1 = substr($haystack, 0, $pos);
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2552 $pos++;
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2553 $str2 = substr($haystack, $pos);
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2554 return "{$str1}{$needle}{$str2}";
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2555 }
4d87aad3c4c0
Finished everything on the TODO list (yay!); several CSS cleanups; tons more changes in this commit - see the patch for details
Dan
diff
changeset
+ − 2556
38
+ − 2557 /**
+ − 2558 * Tells if a given IP address is valid.
+ − 2559 * @param string suspected IP address
+ − 2560 * @return bool true if valid, false otherwise
+ − 2561 */
76
+ − 2562
38
+ − 2563 function is_valid_ip($ip)
+ − 2564 {
+ − 2565 // These came from phpBB3.
+ − 2566 $ipv4 = '(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])';
+ − 2567 $ipv6 = '(?:(?:(?:[\dA-F]{1,4}:){6}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:::(?:[\dA-F]{1,4}:){5}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:):(?:[\dA-F]{1,4}:){4}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,2}:(?:[\dA-F]{1,4}:){3}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,3}:(?:[\dA-F]{1,4}:){2}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,4}:(?:[\dA-F]{1,4}:)(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,5}:(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,6}:[\dA-F]{1,4})|(?:(?:[\dA-F]{1,4}:){1,7}:))';
76
+ − 2568
38
+ − 2569 if ( preg_match("/^{$ipv4}$/", $ip) || preg_match("/^{$ipv6}$/", $ip) )
+ − 2570 return true;
+ − 2571 else
+ − 2572 return false;
+ − 2573 }
+ − 2574
48
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2575 /**
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2576 * Replaces the FIRST given occurrence of needle within haystack with thread
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2577 * @param string Needle
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2578 * @param string Thread
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2579 * @param string Haystack
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2580 */
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2581
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2582 function str_replace_once($needle, $thread, $haystack)
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2583 {
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2584 $needle_len = strlen($needle);
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2585 for ( $i = 0; $i < strlen($haystack); $i++ )
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2586 {
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2587 $test = substr($haystack, $i, $needle_len);
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2588 if ( $test == $needle )
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2589 {
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2590 // Got it!
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2591 $upto = substr($haystack, 0, $i);
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2592 $from = substr($haystack, ( $i + $needle_len ));
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2593 $new_haystack = "{$upto}{$thread}{$from}";
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2594 return $new_haystack;
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2595 }
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2596 }
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2597 return $haystack;
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2598 }
fc9762553a3c
E-mail address mask engine non-Javascript fallback now picks random substitutions for @ and . to make address more unreadable by bots
Dan
diff
changeset
+ − 2599
78
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2600 /**
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2601 * From http://us2.php.net/urldecode - decode %uXXXX
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2602 * @param string The urlencoded string
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2603 * @return string
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2604 */
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2605
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2606 function decode_unicode_url($str)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2607 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2608 $res = '';
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2609
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2610 $i = 0;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2611 $max = strlen($str) - 6;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2612 while ($i <= $max)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2613 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2614 $character = $str[$i];
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2615 if ($character == '%' && $str[$i + 1] == 'u')
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2616 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2617 $value = hexdec(substr($str, $i + 2, 4));
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2618 $i += 6;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2619
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2620 if ($value < 0x0080)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2621 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2622 // 1 byte: 0xxxxxxx
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2623 $character = chr($value);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2624 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2625 else if ($value < 0x0800)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2626 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2627 // 2 bytes: 110xxxxx 10xxxxxx
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2628 $character =
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2629 chr((($value & 0x07c0) >> 6) | 0xc0)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2630 . chr(($value & 0x3f) | 0x80);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2631 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2632 else
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2633 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2634 // 3 bytes: 1110xxxx 10xxxxxx 10xxxxxx
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2635 $character =
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2636 chr((($value & 0xf000) >> 12) | 0xe0)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2637 . chr((($value & 0x0fc0) >> 6) | 0x80)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2638 . chr(($value & 0x3f) | 0x80);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2639 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2640 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2641 else
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2642 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2643 $i++;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2644 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2645
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2646 $res .= $character;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2647 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2648
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2649 return $res . substr($str, $i);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2650 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2651
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2652 /**
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2653 * Recursively decodes an array with UTF-8 characters in its strings
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2654 * @param array Can be multi-depth
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2655 * @return array
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2656 */
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2657
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2658 function decode_unicode_array($array)
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2659 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2660 foreach ( $array as $i => $val )
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2661 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2662 if ( is_string($val) )
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2663 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2664 $array[$i] = decode_unicode_url($val);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2665 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2666 else
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2667 {
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2668 $array[$i] = decode_unicode_array($val);
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2669 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2670 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2671 return $array;
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2672 }
4df25dfdde63
Modified Text_Wiki parser to fully support UTF-8 strings; several other UTF-8 fixes, international characters seem to work reasonably well now
Dan
diff
changeset
+ − 2673
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2674 /**
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2675 * Sanitizes a page tag.
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2676 * @param string
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2677 * @return string
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2678 */
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2679
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2680 function sanitize_tag($tag)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2681 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2682 $tag = strtolower($tag);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2683 $tag = preg_replace('/[^\w _-]+/', '', $tag);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2684 $tag = trim($tag);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2685 return $tag;
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2686 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2687
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2688 /**
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2689 * Gzips the output buffer.
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2690 */
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2691
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2692 function gzip_output()
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2693 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2694 global $do_gzip;
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2695
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2696 //
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2697 // Compress buffered output if required and send to browser
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2698 //
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2699 if ( $do_gzip && function_exists('ob_gzhandler') )
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2700 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2701 $gzip_contents = ob_get_contents();
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2702 ob_end_clean();
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2703
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2704 $return = ob_gzhandler($gzip_contents);
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2705 if ( $return )
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2706 {
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2707 header('Content-encoding: gzip');
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2708 echo $gzip_contents;
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2709 }
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2710 else
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2711 {
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2712 echo $gzip_contents;
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2713 }
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2714 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2715 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2716
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2717 /**
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2718 * Aggressively and hopefully non-destructively optimizes a blob of HTML.
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2719 * @param string HTML to process
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2720 * @return string much snaller HTML
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2721 */
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2722
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2723 function aggressive_optimize_html($html)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2724 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2725 $size_before = strlen($html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2726
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2727 // kill carriage returns
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2728 $html = str_replace("\r", "", $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2729
125
+ − 2730 // Which tags to strip for JAVASCRIPT PROCESSING ONLY - you can change this if needed
+ − 2731 $strip_tags = Array('enano:no-opt');
+ − 2732 $strip_tags = implode('|', $strip_tags);
+ − 2733
+ − 2734 // Strip out the tags and replace with placeholders
+ − 2735 preg_match_all("#<($strip_tags)(.*?)>(.*?)</($strip_tags)>#is", $html, $matches);
+ − 2736 $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
+ − 2737 for ($i = 0;$i < sizeof($matches[1]); $i++)
+ − 2738 {
+ − 2739 $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
+ − 2740 }
+ − 2741
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2742 // Optimize (but don't obfuscate) Javascript
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2743 preg_match_all('/<script(.*?)>(.+?)<\/script>/is', $html, $jscript);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2744
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2745 // list of Javascript reserved words - from about.com
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2746 $reserved_words = array('abstract', 'as', 'boolean', 'break', 'byte', 'case', 'catch', 'char', 'class', 'continue', 'const', 'debugger', 'default', 'delete', 'do',
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2747 'double', 'else', 'enum', 'export', 'extends', 'false', 'final', 'finally', 'float', 'for', 'function', 'goto', 'if', 'implements', 'import',
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2748 'in', 'instanceof', 'int', 'interface', 'is', 'long', 'namespace', 'native', 'new', 'null', 'package', 'private', 'protected', 'public',
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2749 'return', 'short', 'static', 'super', 'switch', 'synchronized', 'this', 'throw', 'throws', 'transient', 'true', 'try', 'typeof', 'use', 'var',
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2750 'void', 'volatile', 'while', 'with');
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2751
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2752 $reserved_words = '(' . implode('|', $reserved_words) . ')';
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2753
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2754 for ( $i = 0; $i < count($jscript[0]); $i++ )
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2755 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2756 $js =& $jscript[2][$i];
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2757
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2758 // for line optimization, explode it
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2759 $particles = explode("\n", $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2760
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2761 foreach ( $particles as $j => $atom )
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2762 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2763 // Remove comments
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2764 $atom = preg_replace('#\/\/(.+)#i', '', $atom);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2765
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2766 $atom = trim($atom);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2767 if ( empty($atom) )
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2768 unset($particles[$j]);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2769 else
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2770 $particles[$j] = $atom;
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2771 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2772
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2773 $js = implode("\n", $particles);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2774
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2775 $js = preg_replace('#/\*(.*?)\*/#s', '', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2776
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2777 // find all semicolons and then linebreaks, and replace with a single semicolon
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2778 $js = str_replace(";\n", ';', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2779
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2780 // starting braces
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2781 $js = preg_replace('/\{([\s]+)/m', '{', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2782 $js = str_replace(")\n{", '){', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2783
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2784 // ending braces (tricky)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2785 $js = preg_replace('/\}([^;])/m', '};\\1', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2786
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2787 // other rules
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2788 $js = str_replace("};\n", "};", $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2789 $js = str_replace(",\n", ',', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2790 $js = str_replace("[\n", '[', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2791 $js = str_replace("]\n", ']', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2792 $js = str_replace("\n}", '}', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2793
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2794 // newlines immediately before reserved words
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2795 $js = preg_replace("/(\)|;)\n$reserved_words/is", '\\1\\2', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2796
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2797 // fix for firefox issue
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2798 $js = preg_replace('/\};([\s]*)(else|\))/i', '}\\2', $js);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2799
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2800 $replacement = "<script{$jscript[1][$i]}>/* <![CDATA[ */ $js /* ]]> */</script>";
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2801 // apply changes
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2802 $html = str_replace($jscript[0][$i], $replacement, $html);
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2803 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2804
125
+ − 2805 // Re-insert untouchable tags
+ − 2806 for ($i = 0;$i < sizeof($matches[1]); $i++)
+ − 2807 {
+ − 2808 $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}</{$matches[4][$i]}>", $html);
+ − 2809 }
+ − 2810
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2811 // Which tags to strip - you can change this if needed
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2812 $strip_tags = Array('pre', 'script', 'style', 'enano:no-opt');
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2813 $strip_tags = implode('|', $strip_tags);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2814
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2815 // Strip out the tags and replace with placeholders
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2816 preg_match_all("#<($strip_tags)(.*?)>(.*?)</($strip_tags)>#is", $html, $matches);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2817 $seed = md5(microtime() . mt_rand()); // Random value used for placeholders
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2818 for ($i = 0;$i < sizeof($matches[1]); $i++)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2819 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2820 $html = str_replace($matches[0][$i], "{DONT_STRIP_ME_NAKED:$seed:$i}", $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2821 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2822
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2823 // Finally, process the HTML
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2824 $html = preg_replace("#\n([ ]*)#", " ", $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2825
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2826 // Remove annoying spaces between tags
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2827 $html = preg_replace("#>([ ][ ]+)<#", "> <", $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2828
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2829 // Re-insert untouchable tags
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2830 for ($i = 0;$i < sizeof($matches[1]); $i++)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2831 {
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2832 $html = str_replace("{DONT_STRIP_ME_NAKED:$seed:$i}", "<{$matches[1][$i]}{$matches[2][$i]}>{$matches[3][$i]}</{$matches[4][$i]}>", $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2833 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2834
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2835 // Remove <enano:no-opt> blocks (can be used by themes that don't want their HTML optimized)
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2836 $html = preg_replace('#<(\/|)enano:no-opt(.*?)>#', '', $html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2837
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2838 $size_after = strlen($html);
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2839
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2840 // Tell snoopish users what's going on
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2841 $html = str_replace('<html', "\n".'<!-- NOTE: Enano has performed an HTML optimization routine on the HTML you see here. This is to enhance page loading speeds.
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2842 To view the uncompressed source of this page, add the "nocompress" parameter to the URI of this page: index.php?title=Main_Page&nocompress or Main_Page?nocompress'."
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2843 Size before compression: $size_before bytes
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2844 Size after compression: $size_after bytes
81
d7fc25acd3f3
Replaced the menu in the admin theme with something much more visually pleasureable; minor fix in Special:UploadFile; finished patching a couple of XSS problems from Banshee; finished Admin:PageGroups; removed unneeded code in flyin.js; finished tag system (except tag cloud); 1.0.1 release candidate
Dan
diff
changeset
+ − 2845 -->\n<html", $html);
80
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2846 return $html;
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2847 }
cb7dde69c301
Improved and enabled HTML optimization algorithm; enabled gzip compression; added but did not test at all the tag cloud class in includes/tagcloud.php, this is still very preliminary and not ready for any type of production use
Dan
diff
changeset
+ − 2848
128
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2849 /**
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2850 * For an input range of numbers (like 25-256) returns an array filled with all numbers in the range, inclusive.
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2851 * @param string
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2852 * @return array
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2853 */
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2854
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2855 function int_range($range)
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2856 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2857 if ( strval(intval($range)) == $range )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2858 return $range;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2859 if ( !preg_match('/^[0-9]+(-[0-9]+)?$/', $range) )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2860 return false;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2861 $ends = explode('-', $range);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2862 if ( count($ends) != 2 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2863 return $range;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2864 $ret = array();
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2865 if ( $ends[1] < $ends[0] )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2866 $ends = array($ends[1], $ends[0]);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2867 else if ( $ends[0] == $ends[1] )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2868 return array($ends[0]);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2869 for ( $i = $ends[0]; $i <= $ends[1]; $i++ )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2870 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2871 $ret[] = $i;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2872 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2873 return $ret;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2874 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2875
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2876 /**
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2877 * Parses a range or series of IP addresses, and returns the raw addresses. Only parses ranges in the last two octets to prevent DOSing.
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2878 * Syntax for ranges: x.x.x.x; x|y.x.x.x; x.x.x-z.x; x.x.x-z|p.q|y
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2879 * @param string IP address range string
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2880 * @return array
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2881 */
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2882
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2883 function parse_ip_range($range)
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2884 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2885 $octets = explode('.', $range);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2886 if ( count($octets) != 4 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2887 // invalid range
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2888 return $range;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2889 $i = 0;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2890 $possibilities = array( 0 => array(), 1 => array(), 2 => array(), 3 => array() );
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2891 foreach ( $octets as $octet )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2892 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2893 $existing =& $possibilities[$i];
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2894 $inner = explode('|', $octet);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2895 foreach ( $inner as $bit )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2896 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2897 if ( $i >= 2 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2898 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2899 $bits = int_range($bit);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2900 if ( $bits === false )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2901 return false;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2902 else if ( !is_array($bits) )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2903 $existing[] = intval($bits);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2904 else
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2905 $existing = array_merge($existing, $bits);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2906 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2907 else
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2908 {
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2909 $bit = intval($bit);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2910 $existing[] = $bit;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2911 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2912 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2913 $existing = array_unique($existing);
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2914 $i++;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2915 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2916 $ips = array();
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2917
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2918 // The only way to combine all those possibilities. ;-)
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2919 foreach ( $possibilities[0] as $oc1 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2920 foreach ( $possibilities[1] as $oc2 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2921 foreach ( $possibilities[2] as $oc3 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2922 foreach ( $possibilities[3] as $oc4 )
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2923 $ips[] = "$oc1.$oc2.$oc3.$oc4";
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2924
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2925 return $ips;
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2926 }
01955bf53f96
Improved ban control page and allowed multiple entries/IP ranges; changed some parameters on jBox; user level changes are logged now
Dan
diff
changeset
+ − 2927
1
+ − 2928 //die('<pre>Original: 01010101010100101010100101010101011010'."\nProcessed: ".uncompress_bitfield(compress_bitfield('01010101010100101010100101010101011010')).'</pre>');
+ − 2929
+ − 2930 ?>