BOINC / boinc

html/inc/text_transform.inc

Spacing +27 added lines, -27 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)    
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)    
 
     // Constructor - set the defaults.
 
@@ -68,7 +68,7 @@ 
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);
+        $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);
     }
     if (is_array($options->highlight_terms)) {
         $text = highlight_terms($text, $options->highlight_terms);
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
     
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc-dev-doc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -274,7 +274,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -282,19 +282,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -302,7 +302,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -327,5 +327,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/forum.inc

Spacing +78 added lines, -78 removed lines

@@ -54,12 +54,12 @@ 
 define('THREAD_SOLVED', 1);
 
 define('AVATAR_WIDTH', 100);
-define('AVATAR_HEIGHT',100);
+define('AVATAR_HEIGHT', 100);
 
 define('ST_NEW_TIME', 1209600); //3600*24*14 - 14 days
 define('ST_NEW', 'New member');
 
-define('MAXIMUM_EDIT_TIME',3600);
+define('MAXIMUM_EDIT_TIME', 3600);
     // allow edits of forums posts up till one hour after posting.
 
 define('MAX_FORUM_LOGGING_TIME', 2419200); //3600*24*28 - 28 days
@@ -77,24 +77,24 @@ 
 define('IMAGE_HIDDEN', 'img/hidden.png');
 define('IMAGE_STICKY_LOCKED', 'img/sticky_locked_post.png');
 define('IMAGE_POST', 'img/post.png');
-define('NEW_IMAGE_HEIGHT','15');
+define('NEW_IMAGE_HEIGHT', '15');
 define('EMPHASIZE_IMAGE', 'img/emphasized_post.png');
-define('EMPHASIZE_IMAGE_HEIGHT','15');
+define('EMPHASIZE_IMAGE_HEIGHT', '15');
 define('FILTER_IMAGE', 'img/filtered_post.png');
-define('FILTER_IMAGE_HEIGHT','15');
+define('FILTER_IMAGE_HEIGHT', '15');
 define('RATE_POSITIVE_IMAGE', 'img/rate_positive.png');
-define('RATE_POSITIVE_IMAGE_HEIGHT','9');
+define('RATE_POSITIVE_IMAGE_HEIGHT', '9');
 define('RATE_NEGATIVE_IMAGE', 'img/rate_negative.png');
-define('RATE_NEGATIVE_IMAGE_HEIGHT','9');
+define('RATE_NEGATIVE_IMAGE_HEIGHT', '9');
 define('REPORT_POST_IMAGE', 'img/report_post.png');
-define('REPORT_POST_IMAGE_HEIGHT','9');
+define('REPORT_POST_IMAGE_HEIGHT', '9');
 
 define('SOLUTION', tra('This answered my question'));
 define('SUFFERER', tra('I also have this question'));
 define('OFF_TOPIC', tra('Off-topic'));
 
-define ('DEFAULT_LOW_RATING_THRESHOLD', -25);
-define ('DEFAULT_HIGH_RATING_THRESHOLD', 5);
+define('DEFAULT_LOW_RATING_THRESHOLD', -25);
+define('DEFAULT_HIGH_RATING_THRESHOLD', 5);
 
 // special user attributes
 //
@@ -164,15 +164,15 @@ 
 
 // Output the forum/thread title.
 //
-function show_forum_title($category, $forum, $thread, $link_thread=false) {
+function show_forum_title($category, $forum, $thread, $link_thread = false) {
     if ($category) {
         $is_helpdesk = $category->is_helpdesk;
     } else {
         $is_helpdesk = false;
     }
 
-    $where = $is_helpdesk?tra("Questions and Answers"):tra("Message boards");
-    $top_url = $is_helpdesk?"forum_help_desk.php":"forum_index.php";
+    $where = $is_helpdesk ?tra("Questions and Answers") : tra("Message boards");
+    $top_url = $is_helpdesk ? "forum_help_desk.php" : "forum_index.php";
 
     if (!$forum && !$thread) {
         echo "<span class=\"title\">$where</span>\n";
@@ -200,7 +200,7 @@ 
     }
 }
 
-function show_team_forum_title($forum, $thread=null, $link_thread=false) {
+function show_team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     echo "<span class=title>
         <a href=\"forum_index.php\">".tra("Message boards")."</a> :
@@ -233,12 +233,12 @@ 
 }
 
 function page_link($url, $page_num, $items_per_page, $text) {
-    return " <a href=\"$url&amp;start=" . $page_num*$items_per_page . "\">$text</a> ";
+    return " <a href=\"$url&amp;start=".$page_num*$items_per_page."\">$text</a> ";
 }
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -246,14 +246,14 @@ 
     $x = "";
     
     if ($nitems <= $items_per_page) return "";
-    $npages = ceil($nitems / $items_per_page);
-    $curpage = ceil($start / $items_per_page);
+    $npages = ceil($nitems/$items_per_page);
+    $curpage = ceil($start/$items_per_page);
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
-            $url, $curpage-1, $items_per_page,
+            $url, $curpage - 1, $items_per_page,
             tra("Previous")." &middot; "
         );
     }
@@ -268,8 +268,8 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
-        $page_str = (string)($i+1);
+    for ($i = $curpage - $preshow; $i <= $curpage + $postshow; $i++) {
+        $page_str = (string)($i + 1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
 
@@ -278,20 +278,20 @@ 
         } else {
             $x .= page_link($url, $i, $items_per_page, $page_str);
         }
-        if ($i == $npages-1) break;
-        if ($i == $curpage+$postshow) break;
+        if ($i == $npages - 1) break;
+        if ($i == $curpage + $postshow) break;
         $x .= " &middot; ";
     }
 
-    if ($curpage + $postshow < $npages-1) {
+    if ($curpage + $postshow < $npages - 1) {
         $x .= " . . . ";
-        $x .= page_link($url, $npages-1, $items_per_page, $npages);
+        $x .= page_link($url, $npages - 1, $items_per_page, $npages);
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages - 1) {
         $x .= page_link(
-            $url, $curpage+1, $items_per_page,
+            $url, $curpage + 1, $items_per_page,
             " &middot; ".tra("Next")
         );
     }
@@ -312,7 +312,7 @@ 
 function cleanup_title($title) {
     $x = sanitize_tags(bb2html($title));
     $x = trim($x);
-    if (strlen($x)==0) return "(no title)";
+    if (strlen($x) == 0) return "(no title)";
     else return $x;
 }
 
@@ -374,7 +374,7 @@ 
             $i = 0;
             foreach ($posts as $post) {
                 if ($post->id == $postid) {
-                    $start = $i - ($i % $num_to_show);
+                    $start = $i - ($i%$num_to_show);
                     $jump_to_post = $post;
                     break;
                 }
@@ -401,7 +401,7 @@ 
             // if jump to post, figure out what page to show
             //
             if ($jump_to_post) {
-                $start = $ibest - ($ibest % $num_to_show);
+                $start = $ibest - ($ibest%$num_to_show);
             } else {
                 $start = $default_start;
             }
@@ -509,8 +509,8 @@ 
 // Generates a table row with two cells: author and message
 //
 function show_post(
-    $post, $thread, $forum, $logged_in_user, $start=0,
-    $latest_viewed=0, $controls=FORUM_CONTROLS, $filter=true
+    $post, $thread, $forum, $logged_in_user, $start = 0,
+    $latest_viewed = 0, $controls = FORUM_CONTROLS, $filter = true
 ) {
     global $country_to_iso3166_2;
 
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -555,8 +555,8 @@ 
             if (is_moderator($logged_in_user, $forum)) {
                 $can_edit = true;
             } else if (can_reply($thread, $forum, $logged_in_user)) {
-                $time_limit = $post->timestamp+MAXIMUM_EDIT_TIME;
-                $can_edit = time()<$time_limit;
+                $time_limit = $post->timestamp + MAXIMUM_EDIT_TIME;
+                $can_edit = time() < $time_limit;
             } else {
                 $can_edit = false;
             }
@@ -566,24 +566,24 @@ 
     // Print the special user lines, if any
     //
     global $special_user_bitfield;
-    $fstatus="";
+    $fstatus = "";
     $keys = array_keys($special_user_bitfield);
     $is_posted_by_special = false;
-    for ($i=0; $i<sizeof($special_user_bitfield);$i++) {
+    for ($i = 0; $i < sizeof($special_user_bitfield); $i++) {
         if ($user->prefs && $user->prefs->privilege($keys[$i])) {
-            $fstatus.="<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
+            $fstatus .= "<nobr>".$special_user_bitfield[$keys[$i]]."<nobr><br>";
             $is_posted_by_special = true;
         }
     }
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
     }
-    $class = $highlight?' style="border-left: 5px solid LightGreen" ':'';
+    $class = $highlight ? ' style="border-left: 5px solid LightGreen" ' : '';
 
     // row and start of author col
     //
@@ -595,12 +595,12 @@ 
 
     echo user_links($user, 0, 30);
     echo "<br>";
-    if ($user->create_time > time()-ST_NEW_TIME) $fstatus.=ST_NEW."<br>";
+    if ($user->create_time > time() - ST_NEW_TIME) $fstatus .= ST_NEW."<br>";
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
-        if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
+    if (!$filter || !$ignore_poster) {
+        if ($user->prefs && $user->prefs->avatar != "" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars == false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
     }
@@ -608,14 +608,14 @@ 
     
     $url = "pm.php?action=new&amp;userid=".$user->id;
     $name = $user->name;
-    show_button_small($url, tra("Send message"), tra("Send %1 a private message",$name));
+    show_button_small($url, tra("Send message"), tra("Send %1 a private message", $name));
     echo '<br>'.tra("Joined: %1", gmdate('j M y', $user->create_time)), "<br>";
 
     if (!isset($user->nposts)) {
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -624,8 +624,8 @@ 
         //
         //echo "ID: ".$user->id."<br>";
         if (!NO_COMPUTING) {
-            echo tra("Credit: %1", number_format($user->total_credit)) ."<br>";
-            echo tra("RAC: %1",    number_format($user->expavg_credit))."<br>";
+            echo tra("Credit: %1", number_format($user->total_credit))."<br>";
+            echo tra("RAC: %1", number_format($user->expavg_credit))."<br>";
         }
 
         // to use this feature:
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,8 +674,8 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
-        echo "<br>" .tra(
+    if ($ignore_poster && $filter) {
+        echo "<br>".tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
             "</a>"
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -730,10 +730,10 @@ 
         }
         if (($controls == FORUM_CONTROLS) && (can_reply($thread, $forum, $logged_in_user))) {
             echo "&nbsp;&nbsp;&nbsp;&nbsp;";
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "&amp;no_quote=1#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."&amp;no_quote=1#input";
             // "Reply" is used as a verb
             show_button($url, tra("Reply"), tra("Post a reply to this message"));
-            $url = "forum_reply.php?thread=" . $thread->id . "&amp;post=" . $post->id . "#input";
+            $url = "forum_reply.php?thread=".$thread->id."&amp;post=".$post->id."#input";
             // "Quote" is used as a verb
             show_button($url, tra("Quote"), tra("Post a reply by quoting this message"));
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -810,9 +810,9 @@ 
 
 function post_rules() {
     if (function_exists("project_forum_post_rules")) {
-      $project_rules=project_forum_post_rules();
+      $project_rules = project_forum_post_rules();
     } else {
-      $project_rules="";
+      $project_rules = "";
     }
     return sprintf("
         <ul>
@@ -841,7 +841,7 @@ 
     );
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = "<br><br>
         <table><tr><td align=left>
     ";
@@ -901,7 +901,7 @@ 
     $content = substr($content, 0, 64000);
     $content = BoincDb::escape_string($content);
     $now = time();
-    $sig = $signature?1:0;
+    $sig = $signature ? 1 : 0;
     $id = BoincPost::insert("(thread, user, timestamp, content, modified, parent_post, score, votes, signature, hidden) values ($thread->id, $user->id, $now, '$content', 0, $parent_id, 0, 0, $sig, 0)");
     if (!$id) {
         $forum_error = "Failed to add post to DB.";
@@ -921,7 +921,7 @@ 
 //
 function update_thread_timestamp($thread) {
     $posts = BoincPost::enum("thread=$thread->id and hidden=0 order by timestamp desc limit 1");
-    if (count($posts)>0) {
+    if (count($posts) > 0) {
         $post = $posts[0];
         $thread->update("timestamp=$post->timestamp");
     }
@@ -929,7 +929,7 @@ 
 
 function update_forum_timestamp($forum) {
     $threads = BoincThread::enum("forum=$forum->id and hidden=0 order by timestamp desc limit 1");
-    if (count($threads)>0) {
+    if (count($threads) > 0) {
         $thread = $threads[0];
         $forum->update("timestamp=$thread->timestamp");
     }
@@ -952,7 +952,7 @@ 
     if (is_news_forum($forum) && !$export) {
         $status = 1;
     }
-    $id  = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
+    $id = BoincThread::insert("(forum, owner, status, title, timestamp, views, replies, activity, sufferers, score, votes, create_time, hidden, sticky, locked) values ($forum->id, $user->id, $status, '$title', $now, 0, -1, 0, 0, 0, 0, $now, 0, 0, 0)");
     if (!$id) {
         $forum_error = "Failed to add thread to DB.";
         return null;
@@ -1080,22 +1080,22 @@ 
 // $sticky - bool (not directly passed to SQL)
 //
 function get_forum_threads(
-    $forumID, $start=-1, $nRec=-1, $sort_style=MODIFIED_NEW,
+    $forumID, $start = -1, $nRec = -1, $sort_style = MODIFIED_NEW,
     $show_hidden = 0, $sticky = 1
 ) {
     //if (! (is_numeric($forumID) && is_numeric($min) && is_numeric($nRec))) {
     //    return NULL;  // Something is wrong here.
     //}
         
-    $sql = 'forum = ' . $forumID ;
+    $sql = 'forum = '.$forumID;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $sql .= ' ORDER BY '.$stickysql.'timestamp DESC';
         break;
@@ -1148,7 +1148,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");
 
@@ -1257,14 +1257,14 @@ 
     // We do not tell the (ab)user how much this is -
     // no need to make it easy for them to break the system.
     //
-    if ($user->total_credit<$forum->post_min_total_credit || $user->expavg_credit<$forum->post_min_expavg_credit) {
+    if ($user->total_credit < $forum->post_min_total_credit || $user->expavg_credit < $forum->post_min_expavg_credit) {
         error_page(tra("To create a new thread in %1 you must have a certain level of average credit. This is to protect against abuse of the system.", $forum->title));
     }
 
     // If the user is posting faster than forum regulations allow
     // Tell the user to wait a while before creating any more posts
     //
-    if (time()-$user->prefs->last_post <$forum->post_min_interval) {
+    if (time() - $user->prefs->last_post < $forum->post_min_interval) {
         error_page(tra("You cannot create threads right now. Please wait before trying again. This is to protect against abuse of the system."));
     }
 }
@@ -1292,7 +1292,7 @@ 
 
 function is_moderator($user, $forum) {
     if (!$user) return false;
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1330,7 +1330,7 @@ 
     $owner = BoincUser::lookup_id($thread->owner);
     if (!$owner) return;
     echo "<tr><td>\n";
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         show_forum_title($category, $thread_forum, $thread, true);
@@ -1340,7 +1340,7 @@ 
         break;
     }
     echo '
-        </td><td class="numbers">'.($thread->replies+1).'</td>
+        </td><td class="numbers">'.($thread->replies + 1).'</td>
         <td>'.user_links($owner).'</td>
         <td class="numbers">'.$thread->views.'</td>
         <td class="lastpost">'.time_diff_str($thread->timestamp, time()).'</td>
@@ -1374,13 +1374,13 @@ 
 
 function subscribed_post_web_line($notify) {
     $thread = BoincThread::lookup_id($notify->opaque);
-    return tra("New posts in the thread %1","<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
+    return tra("New posts in the thread %1", "<a href=forum_thread.php?id=$thread->id>$thread->title</a>");
 }
 
 function subscribe_rss($notify, &$title, &$msg, &$url) {
     $thread = BoincThread::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed thread");
-    $msg = tra("There are new posts in the thread '%1'",$thread->title);
+    $msg = tra("There are new posts in the thread '%1'", $thread->title);
     $url = secure_url_base()."forum_thread.php?id=$thread->id";
 }
 

Braces +17 added lines, -17 removed lines

@@ -238,7 +238,7 @@ 
 
 // return a string for navigating pages
 //
-function page_links($url, $nitems, $items_per_page, $start){
+function page_links($url, $nitems, $items_per_page, $start) {
     // How many pages to potentially show before and after this one:
     $preshow = 3;
     $postshow = 3;
@@ -251,7 +251,7 @@ 
 
     // If this is not the first page, display "previous"
     //
-    if ($curpage > 0){
+    if ($curpage > 0) {
         $x .= page_link(
             $url, $curpage-1, $items_per_page,
             tra("Previous")." · "
@@ -268,7 +268,7 @@ 
     }
     // Display a list of pages surrounding this one
     //
-    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++){
+    for ($i=$curpage-$preshow; $i<=$curpage+$postshow; $i++) {
         $page_str = (string)($i+1);
         if ($i < 0) continue;
         if ($i >= $npages) break;
@@ -289,7 +289,7 @@ 
     }
     // If there is a next page
     //
-    if ($curpage < $npages-1){
+    if ($curpage < $npages-1) {
         $x .= page_link(
             $url, $curpage+1, $items_per_page,
             " &middot; ".tra("Next")
@@ -518,7 +518,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -539,9 +539,9 @@ 
     // check whether the poster is on the list of people to ignore
     //
     $ignore_poster = false;
-    if ($logged_in_user){
+    if ($logged_in_user) {
         $tokens = url_tokens($logged_in_user->authenticator);
-        if (is_ignoring($logged_in_user, $user)){
+        if (is_ignoring($logged_in_user, $user)) {
             $ignore_poster = true;
         }
     }
@@ -578,7 +578,7 @@ 
     
     // Highlight special users if set in prefs;
     //
-    if ($logged_in_user && $logged_in_user->prefs){
+    if ($logged_in_user && $logged_in_user->prefs) {
         $highlight = $logged_in_user->prefs->highlight_special && $is_posted_by_special;
     } else {
         $highlight = $is_posted_by_special;
@@ -599,7 +599,7 @@ 
     echo "<span class=\"small\">";
     if ($fstatus) echo "$fstatus";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         if ($user->prefs && $user->prefs->avatar!="" && (!$logged_in_user || ($logged_in_user->prefs->hide_avatars==false))) {
             echo "<img width=\"".AVATAR_WIDTH."\" height=\"".AVATAR_HEIGHT."\" src=\"".avatar_url($user->prefs->avatar)."\" alt=\"Avatar\"><br>";
         }
@@ -615,7 +615,7 @@ 
         $user->nposts = BoincPost::count("user=$user->id");
     }
     
-    if (function_exists('project_forum_user_info')){
+    if (function_exists('project_forum_user_info')) {
         project_forum_user_info($user);
     } else {
         echo tra("Posts: %1", $user->nposts)."<br>";
@@ -654,7 +654,7 @@ 
         echo "<form action=\"forum_rate.php?post=", $post->id, "\" method=\"post\">";
     }
 
-    if ($logged_in_user && $post->timestamp > $latest_viewed){
+    if ($logged_in_user && $post->timestamp > $latest_viewed) {
         show_image(NEW_IMAGE, tra("You haven't read this message yet"), tra("Unread"), NEW_IMAGE_HEIGHT);
     }
 
@@ -674,7 +674,7 @@ 
     if ($post->modified) {
         echo "<br>".tra("Last modified: %1", pretty_time_Str($post->modified));
     }
-    if ($ignore_poster && $filter){
+    if ($ignore_poster && $filter) {
         echo "<br>" .tra(
             "This post is hidden because the sender is on your 'ignore' list.  Click %1 here %2 to view hidden posts",
             "<a href=\"?id=".$thread->id."&amp;filter=false&amp;start=$start#".$post->id."\">",
@@ -688,7 +688,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -696,7 +696,7 @@ 
         // user has signatures enabled: show it
         //
         $posttext = output_transform($posttext, $options);
-        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)){
+        if ($post->signature && (!$logged_in_user || !$logged_in_user->prefs->hide_signatures)) {
             $sig = output_transform($user->prefs->signature, $options);
             $posttext .= "<hr>$sig\n";
         }
@@ -755,7 +755,7 @@ 
     $content = output_transform($post->content, $options);
     $when = time_diff_str($post->timestamp, time());
     $user = BoincUser::lookup_id($post->user);
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -1089,7 +1089,7 @@ 
         
     $sql = 'forum = ' . $forumID ;
     $stickysql = "";
-    if ($sticky){
+    if ($sticky) {
         $stickysql = "sticky DESC, ";
     }
     if (!$show_hidden) {
@@ -1170,7 +1170,7 @@ 
 //
 function show_post_moderation_links(
     $config, $logged_in_user, $post, $forum, $tokens
-){
+) {
     $moderators_allowed_to_ban = parse_bool($config, "moderators_allowed_to_ban"); 
     $moderators_vote_to_ban = parse_bool($config, "moderators_vote_to_ban");