@@ -26,13 +26,13 @@ discard block  | 
                                                    ||
| 26 | 26 |  require_once('../inc/sanitize_html.inc'); | 
                                                        
| 27 | 27 | |
| 28 | 28 |  class output_options { | 
                                                        
| 29 | - var $bb2html; // BBCode as HTML? (on)  | 
                                                        |
| 30 | - var $images_as_links; // Images as hyperlinks? (off)  | 
                                                        |
| 31 | - var $link_popup; // Links in new windows? (off)  | 
                                                        |
| 32 | - var $nl2br; // Convert newlines to <br>'s? (on)  | 
                                                        |
| 33 | - var $htmlitems; // Convert special chars to HTML entities? (on)  | 
                                                        |
| 34 | - var $htmlscrub; // Scrub "bad" HTML tags? (off)  | 
                                                        |
| 35 | - var $highlight_terms;// Array of terms to be highlighted (off)  | 
                                                        |
| 29 | + var $bb2html; // BBCode as HTML? (on)  | 
                                                        |
| 30 | + var $images_as_links; // Images as hyperlinks? (off)  | 
                                                        |
| 31 | + var $link_popup; // Links in new windows? (off)  | 
                                                        |
| 32 | + var $nl2br; // Convert newlines to <br>'s? (on)  | 
                                                        |
| 33 | + var $htmlitems; // Convert special chars to HTML entities? (on)  | 
                                                        |
| 34 | + var $htmlscrub; // Scrub "bad" HTML tags? (off)  | 
                                                        |
| 35 | + var $highlight_terms; // Array of terms to be highlighted (off)  | 
                                                        |
| 36 | 36 | |
| 37 | 37 | // Constructor - set the defaults.  | 
                                                        
| 38 | 38 | |
@@ -68,7 +68,7 @@ discard block  | 
                                                    ||
| 68 | 68 | $options = new output_options; // Defaults in the class definition  | 
                                                        
| 69 | 69 | }  | 
                                                        
| 70 | 70 |      if ($options->htmlitems) { | 
                                                        
| 71 | - $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);  | 
                                                        |
| 71 | + $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);  | 
                                                        |
| 72 | 72 | }  | 
                                                        
| 73 | 73 |      if (is_array($options->highlight_terms)) { | 
                                                        
| 74 | 74 | $text = highlight_terms($text, $options->highlight_terms);  | 
                                                        
@@ -104,7 +104,7 @@ discard block  | 
                                                    ||
| 104 | 104 | // If $export is true, don't use BOINC CSS  | 
                                                        
| 105 | 105 | |
| 106 | 106 |  function substr2($s, $n1, $n2) { | 
                                                        
| 107 | - return substr($s, $n1, $n2-$n1);  | 
                                                        |
| 107 | + return substr($s, $n1, $n2 - $n1);  | 
                                                        |
| 108 | 108 | }  | 
                                                        
| 109 | 109 | |
| 110 | 110 | // process non-nestable constructs: [pre] and [code]  | 
                                                        
@@ -177,7 +177,7 @@ discard block  | 
                                                    ||
| 177 | 177 | |
| 178 | 178 | $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";  | 
                                                        
| 179 | 179 | // List of allowable tags  | 
                                                        
| 180 | - $bbtags = array (  | 
                                                        |
| 180 | + $bbtags = array(  | 
                                                        |
| 181 | 181 | "@\[b\](.*?)\[/b\]@is",  | 
                                                        
| 182 | 182 | "@\[i\](.*?)\[/i\]@is",  | 
                                                        
| 183 | 183 | "@\[u\](.*?)\[/u\]@is",  | 
                                                        
@@ -206,7 +206,7 @@ discard block  | 
                                                    ||
| 206 | 206 | |
| 207 | 207 | // What the above tags are turned in to  | 
                                                        
| 208 | 208 |      if ($export) { | 
                                                        
| 209 | - $htmltags = array (  | 
                                                        |
| 209 | + $htmltags = array(  | 
                                                        |
| 210 | 210 | "<b>\\1</b>",  | 
                                                        
| 211 | 211 | "<i>\\1</i>",  | 
                                                        
| 212 | 212 | "<u>\\1</u>",  | 
                                                        
@@ -233,7 +233,7 @@ discard block  | 
                                                    ||
| 233 | 233 | "<a href=\"https://github.com/BOINC/boinc/wiki/\\1\">\\1</a>",  | 
                                                        
| 234 | 234 | );  | 
                                                        
| 235 | 235 |      } else { | 
                                                        
| 236 | - $htmltags = array (  | 
                                                        |
| 236 | + $htmltags = array(  | 
                                                        |
| 237 | 237 | "<b>\\1</b>",  | 
                                                        
| 238 | 238 | "<i>\\1</i>",  | 
                                                        
| 239 | 239 | "<u>\\1</u>",  | 
                                                        
@@ -265,7 +265,7 @@ discard block  | 
                                                    ||
| 265 | 265 | $lasttext = "";  | 
                                                        
| 266 | 266 | $i = 0;  | 
                                                        
| 267 | 267 | // $i<1000 to prevent DoS  | 
                                                        
| 268 | -    while ($text != $lasttext && $i<1000) { | 
                                                        |
| 268 | +    while ($text != $lasttext && $i < 1000) { | 
                                                        |
| 269 | 269 | $lasttext = $text;  | 
                                                        
| 270 | 270 | $text = preg_replace($bbtags, $htmltags, $text);  | 
                                                        
| 271 | 271 | $i = $i + 1;  | 
                                                        
@@ -275,7 +275,7 @@ discard block  | 
                                                    ||
| 275 | 275 | return $text;  | 
                                                        
| 276 | 276 | }  | 
                                                        
| 277 | 277 | |
| 278 | -function bb2html($text, $export=false) { | 
                                                        |
| 278 | +function bb2html($text, $export = false) { | 
                                                        |
| 279 | 279 | $text = replace_pre_code($text, $export);  | 
                                                        
| 280 | 280 | return bb2html_aux($text, $export);  | 
                                                        
| 281 | 281 | }  | 
                                                        
@@ -284,7 +284,7 @@ discard block  | 
                                                    ||
| 284 | 284 | // for example inside <pre> containers  | 
                                                        
| 285 | 285 | // The original \n was retained after the br when it was added  | 
                                                        
| 286 | 286 | //  | 
                                                        
| 287 | -function remove_br($text){ | 
                                                        |
| 287 | +function remove_br($text) { | 
                                                        |
| 288 | 288 |      return str_replace("<br />", "", $text); | 
                                                        
| 289 | 289 | }  | 
                                                        
| 290 | 290 | |
@@ -292,19 +292,19 @@ discard block  | 
                                                    ||
| 292 | 292 | //  | 
                                                        
| 293 | 293 |  function externalize_links($text) { | 
                                                        
| 294 | 294 | // TODO: Convert this to PCRE  | 
                                                        
| 295 | - $i=0;  | 
                                                        |
| 296 | - $linkpos=true;  | 
                                                        |
| 295 | + $i = 0;  | 
                                                        |
| 296 | + $linkpos = true;  | 
                                                        |
| 297 | 297 | $out = "";  | 
                                                        
| 298 | -    while (true){ | 
                                                        |
| 298 | +    while (true) { | 
                                                        |
| 299 | 299 | //Find a link  | 
                                                        
| 300 | 300 | //  | 
                                                        
| 301 | - $linkpos=strpos($text, "<a ", $i);  | 
                                                        |
| 302 | - if ($linkpos===false) break;  | 
                                                        |
| 301 | + $linkpos = strpos($text, "<a ", $i);  | 
                                                        |
| 302 | + if ($linkpos === false) break;  | 
                                                        |
| 303 | 303 | |
| 304 | 304 | //Replace with target='_new'  | 
                                                        
| 305 | 305 | //  | 
                                                        
| 306 | - $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";  | 
                                                        |
| 307 | - $i = $linkpos+3;  | 
                                                        |
| 306 | + $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";  | 
                                                        |
| 307 | + $i = $linkpos + 3;  | 
                                                        |
| 308 | 308 | }  | 
                                                        
| 309 | 309 | $out .= substr($text, $i);  | 
                                                        
| 310 | 310 | return $out;  | 
                                                        
@@ -312,7 +312,7 @@ discard block  | 
                                                    ||
| 312 | 312 | |
| 313 | 313 | // Converts image tags to links to the images.  | 
                                                        
| 314 | 314 | |
| 315 | -function image_as_link($text){ | 
                                                        |
| 315 | +function image_as_link($text) { | 
                                                        |
| 316 | 316 | /* This function depends on sanitized HTML */  | 
                                                        
| 317 | 317 | // Build some regex (should be a *lot* faster)  | 
                                                        
| 318 | 318 | $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';  | 
                                                        
@@ -333,5 +333,5 @@ discard block  | 
                                                    ||
| 333 | 333 | return str_ireplace($search, $replace, $text);  | 
                                                        
| 334 | 334 | }  | 
                                                        
| 335 | 335 | |
| 336 | -$cvs_version_tracker[]="\$Id$"; //Generated automatically - do not edit  | 
                                                        |
| 336 | +$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit  | 
                                                        |
| 337 | 337 | ?>  | 
                                                        
@@ -284,7 +284,7 @@ discard block  | 
                                                    ||
| 284 | 284 | // for example inside <pre> containers  | 
                                                        
| 285 | 285 | // The original \n was retained after the br when it was added  | 
                                                        
| 286 | 286 | //  | 
                                                        
| 287 | -function remove_br($text){ | 
                                                        |
| 287 | +function remove_br($text) { | 
                                                        |
| 288 | 288 |      return str_replace("<br />", "", $text); | 
                                                        
| 289 | 289 | }  | 
                                                        
| 290 | 290 | |
@@ -295,7 +295,7 @@ discard block  | 
                                                    ||
| 295 | 295 | $i=0;  | 
                                                        
| 296 | 296 | $linkpos=true;  | 
                                                        
| 297 | 297 | $out = "";  | 
                                                        
| 298 | -    while (true){ | 
                                                        |
| 298 | +    while (true) { | 
                                                        |
| 299 | 299 | //Find a link  | 
                                                        
| 300 | 300 | //  | 
                                                        
| 301 | 301 | $linkpos=strpos($text, "<a ", $i);  | 
                                                        
@@ -312,7 +312,7 @@ discard block  | 
                                                    ||
| 312 | 312 | |
| 313 | 313 | // Converts image tags to links to the images.  | 
                                                        
| 314 | 314 | |
| 315 | -function image_as_link($text){ | 
                                                        |
| 315 | +function image_as_link($text) { | 
                                                        |
| 316 | 316 | /* This function depends on sanitized HTML */  | 
                                                        
| 317 | 317 | // Build some regex (should be a *lot* faster)  | 
                                                        
| 318 | 318 | $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';  |