BOINC / boinc

html/inc/forum.inc

Spacing +83 added lines, -83 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
 //
@@ -172,15 +172,15 @@ 
 
 // return forum/thread title, with links.
 //
-function forum_title($category, $forum, $thread, $link_thread=false) {
+function 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";
 
     $x = '';
     if (!$forum && !$thread) {
@@ -214,7 +214,7 @@ 
     return $x;
 }
 
-function team_forum_title($forum, $thread=null, $link_thread=false) {
+function team_forum_title($forum, $thread = null, $link_thread = false) {
     $team = BoincTeam::lookup_id($forum->category);
     $x = sprintf('<a href="forum_index.php">%s</a> :',
         tra("Message boards")
@@ -248,12 +248,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;
@@ -261,14 +261,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; "
         );
     }
@@ -283,8 +283,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;
 
@@ -293,20 +293,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")
         );
     }
@@ -327,7 +327,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;
 }
 
@@ -389,7 +389,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;
                 }
@@ -416,7 +416,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;
             }
@@ -524,8 +524,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;
 
@@ -533,7 +533,7 @@ 
 
     // If the user no longer exists, skip the post
     //
-    if (!$user){
+    if (!$user) {
         return;
     }
 
@@ -554,9 +554,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;
         }
     }
@@ -570,8 +570,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;
             }
@@ -581,24 +581,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
     //
@@ -610,12 +610,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>";
         }
     }
@@ -623,14 +623,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>";
@@ -639,8 +639,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:
@@ -669,7 +669,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);
     }
 
@@ -689,8 +689,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>"
@@ -703,7 +703,7 @@ 
         <p>
     ";
 
-    if (!$filter || !$ignore_poster){
+    if (!$filter || !$ignore_poster) {
         $posttext = $post->content;
 
         // If the creator of this post has a signature and
@@ -711,7 +711,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";
         }
@@ -745,10 +745,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"));
         }
@@ -770,7 +770,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;
     }
 
@@ -826,9 +826,9 @@ 
 function post_rules() {
     if (defined('FORUM_RULES')) return FORUM_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>
@@ -857,7 +857,7 @@ 
     );
 }
 
-function post_warning($forum=null) {
+function post_warning($forum = null) {
     $x = "<br><br>
         <table><tr><td align=left>
     ";
@@ -945,7 +945,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.";
@@ -965,7 +965,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");
     }
@@ -973,7 +973,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");
     }
@@ -996,7 +996,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;
@@ -1126,22 +1126,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;
@@ -1194,7 +1194,7 @@ 
     if (!$show_hidden) {
         $sql .= ' AND hidden = 0';
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case CREATE_TIME_NEW:
         $sql .= ' ORDER BY timestamp desc';
         break;
@@ -1216,7 +1216,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");
 
@@ -1303,14 +1303,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."));
     }
 }
@@ -1336,10 +1336,10 @@ 
 // - edit their posts at any time
 // - hide/unhide/move threads and posts
 
-function is_moderator($user, $forum=null) {
+function is_moderator($user, $forum = null) {
     if (!$user) return false;
     BoincForumPrefs::lookup($user);
-    $type = $forum?$forum->parent_type:0;
+    $type = $forum ? $forum->parent_type : 0;
     switch ($type) {
     case 0:
         if ($user->prefs->privilege(S_MODERATOR)) return true;
@@ -1356,7 +1356,7 @@ 
     return false;
 }
 
-function thread_list_header($subscriptions=false) {
+function thread_list_header($subscriptions = false) {
     if ($subscriptions) {
         $x = [
             tra("Thread"),
@@ -1379,13 +1379,13 @@ 
 // show a 1-line summary of thread and its forum.
 // Used for search results and subscription list
 //
-function thread_list_item($thread, $user, $subscriptions=false) {
+function thread_list_item($thread, $user, $subscriptions = false) {
     $thread_forum = BoincForum::lookup_id($thread->forum);
     if (!$thread_forum) return;
     if (!is_forum_visible_to_user($thread_forum, $user)) return;
     $owner = BoincUser::lookup_id($thread->owner);
     if (!$owner) return;
-    switch($thread_forum->parent_type) {
+    switch ($thread_forum->parent_type) {
     case 0:
         $category = BoincCategory::lookup_id($thread_forum->category);
         $title = forum_title($category, $thread_forum, $thread, true);
@@ -1406,7 +1406,7 @@ 
     } else {
         $x = [
             $title,
-            $thread->replies+1,
+            $thread->replies + 1,
             user_links($owner),
             $thread->views,
             time_diff_str($thread->timestamp, time())
@@ -1441,13 +1441,13 @@ 
 
 function subscribed_thread_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 subscribed_thread_rss($notify) {
     $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";
     return [$title, $msg, $url];
 }
@@ -1459,13 +1459,13 @@ 
 
 function subscribed_forum_web_line($notify) {
     $forum = BoincForum::lookup_id($notify->opaque);
-    return tra("New threads in the forum %1","<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
+    return tra("New threads in the forum %1", "<a href=forum_forum.php?id=$forum->id>$forum->title</a>");
 }
 
 function subscribed_forum_rss($notify) {
     $forum = BoincForum::lookup_id($notify->opaque);
     $title = tra("New posts in subscribed forum");
-    $msg = tra("There are new threads in the forum '%1'",$forum->title);
+    $msg = tra("There are new threads in the forum '%1'", $forum->title);
     $url = secure_url_base()."forum_forum.php?id=$forum->id";
     return [$title, $msg, $url];
 }

html/user/forum_search_action.php

Spacing +24 added lines, -24 removed lines

@@ -31,10 +31,10 @@ 
 // Optionally filters by forum, user, time, or hidden if specified.
 //
 function search_thread_titles(
-    $keyword_list, $forum="", $user="", $time="", $limit=200,
-    $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
-    $search_string="%";
+    $keyword_list, $forum = "", $user = "", $time = "", $limit = 200,
+    $sort_style = CREATE_TIME_NEW, $show_hidden = false
+) {
+    $search_string = "%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
@@ -51,7 +51,7 @@ 
     if (!$show_hidden) {
         $query .= " and thread.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $query .= ' ORDER BY timestamp DESC';
         break;
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
-    $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    $search_string = "%";
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -100,20 +100,20 @@ 
     }
     $query = "select post.* from ".$db->db_name.".post".$optional_join." where content like '".$search_string."'";
     if ($forum) {
-        $query.=" and forum = $forum->id";
+        $query .= " and forum = $forum->id";
     }
     if ($user) {
-        $query.=" and post.user = $user->id ";
+        $query .= " and post.user = $user->id ";
     }
     if ($time) {
-        $query.=" and post.timestamp > $time";
+        $query .= " and post.timestamp > $time";
     }
     if (!$show_hidden) {
         $query .= " AND post.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case VIEWS_MOST:
-        $query.= ' ORDER BY views DESC';
+        $query .= ' ORDER BY views DESC';
         break;
     case CREATE_TIME_NEW:
         $query .= ' ORDER by post.timestamp desc';
@@ -128,13 +128,13 @@ 
         $query .= ' ORDER BY post.timestamp DESC';
         break;
     }
-    $query.= " limit $limit";
+    $query .= " limit $limit";
     return BoincPost::enum_general($query);
 }
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -147,7 +147,7 @@ 
 $search_max_time = post_int("search_max_time");
 $search_forum = post_int("search_forum");
 $search_sort = post_int("search_sort");
-$search_list = explode(" ",$search_keywords);
+$search_list = explode(" ", $search_keywords);
 if ($search_max_time) {
     $min_timestamp = time() - ($search_max_time*3600*24);
 } else {
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum == -1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,11 +173,11 @@ 
 
 // Display the threads while we search for posts
 //
-if (count($threads)){
-    echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
+if (count($threads)) {
+    echo "<h3>".tra("Thread titles matching your query:")."</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if ($thread->hidden) continue;
         thread_list_item($thread, $logged_in_user);
     }
@@ -193,8 +193,8 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
-    echo "<h3>" . tra("Messages matching your query:") . "</h3>";
+if (count($posts)) {
+    echo "<h3>".tra("Messages matching your query:")."</h3>";
     start_table();
     $n = 1;
     $options = get_output_options($logged_in_user);
@@ -216,7 +216,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",
@@ -227,5 +227,5 @@ 
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
 function search_thread_titles(
     $keyword_list, $forum="", $user="", $time="", $limit=200,
     $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
+) {
     $search_string="%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
     $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -134,7 +134,7 @@ 
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum==-1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,11 +173,11 @@ 
 
 // Display the threads while we search for posts
 //
-if (count($threads)){
+if (count($threads)) {
     echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if ($thread->hidden) continue;
         thread_list_item($thread, $logged_in_user);
     }
@@ -193,7 +193,7 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
+if (count($posts)) {
     echo "<h3>" . tra("Messages matching your query:") . "</h3>";
     start_table();
     $n = 1;
@@ -216,7 +216,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",

html/user/forum_index.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 
     show_forum_header($user);
 
-    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
+    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
         $categories = BoincCategory::enum("true order by orderID");
     } else {
         echo "<p>"
@@ -206,5 +206,5 @@ 
 } else {
     main($user);
 }
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 
     show_forum_header($user);
 
-    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE){
+    if (defined('FORUM_QA_MERGED_MODE') && FORUM_QA_MERGED_MODE) {
         $categories = BoincCategory::enum("true order by orderID");
     } else {
         echo "<p>"