Passed
Pull Request — master (#4020)
by David
08:00
created
sites/default/boinc/modules/flag_comment_notify/flag_comment_notify.module 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
   case 'insert':
31 31
     module_load_include('inc', 'drupal_queue', 'drupal_queue');
32 32
     $queue = DrupalQueue::get('flag_comment_notify');
33
-    $subscribed_users = array_keys((array) flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
33
+    $subscribed_users = array_keys((array)flag_get_content_flags('node', $a1['nid'], 'subscriptions'));
34 34
     foreach ($subscribed_users as $uid) {
35
-      $queue->createItem(array('uid' => $uid, 'cid' => (int) $a1['cid']));
35
+      $queue->createItem(array('uid' => $uid, 'cid' => (int)$a1['cid']));
36 36
     }
37 37
     break;
38 38
   default:
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
   );
87 87
   $variables['!topic_name'] = $params['node']->title;
88 88
   $variables['!author'] = $params['author']->name;
89
-  switch($key) {
89
+  switch ($key) {
90 90
   case 'comment_posted':
91 91
     $message['subject'] = bts('!site: comment posted to "!topic_name"', $variables,
92 92
       $language->language, 'boinc:forum-topic-subscription-email-notification');
Please login to merge, or discard this patch.
sites/default/boinc/modules/boincteam/includes/boincteam_forum.forms.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     '#suffix' => '</li>',
87 87
   );
88 88
   $form['form control tabs'] = array(
89
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)) . '</li>'
89
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum/add', TRUE)).'</li>'
90 90
   );
91 91
   
92 92
   $form['#redirect'] = "community/teams/{$account->team}";
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
       updated = UNIX_TIMESTAMP()",
153 153
     $account->team,
154 154
     $values['title'],
155
-    (int) $values['min_time_between_posts'],
156
-    (int) $values['min_total_credit_to_post'],
157
-    (int) $values['min_avg_credit_to_post'],
155
+    (int)$values['min_time_between_posts'],
156
+    (int)$values['min_total_credit_to_post'],
157
+    (int)$values['min_avg_credit_to_post'],
158 158
     ($values['public']) ? 1 : 0,
159 159
     $values['description']
160 160
   );
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
     '#suffix' => '</li>',
244 244
   );
245 245
   $form['form control tabs'] = array(
246
-    '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)) . '</li>'
246
+    '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), strstr($_GET['q'], '/forum', TRUE)).'</li>'
247 247
   );
248 248
   
249 249
   $form['#redirect'] = "community/teams/{$boincteam_forum->nid}";
@@ -305,9 +305,9 @@  discard block
 block discarded – undo
305 305
       updated = UNIX_TIMESTAMP()
306 306
     WHERE tfid='%d'",
307 307
     $values['title'],
308
-    (int) $values['min_time_between_posts'],
309
-    (int) $values['min_total_credit_to_post'],
310
-    (int) $values['min_avg_credit_to_post'],
308
+    (int)$values['min_time_between_posts'],
309
+    (int)$values['min_total_credit_to_post'],
310
+    (int)$values['min_avg_credit_to_post'],
311 311
     ($values['public']) ? 1 : 0,
312 312
     $values['description'],
313 313
     $tfid
Please login to merge, or discard this patch.
html/ops/show_log.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@  discard block
 block discarded – undo
27 27
     exit("Error: couldn't get log_dir from config file.");
28 28
 }
29 29
 
30
-if( isset($_GET["f"]) ){
30
+if (isset($_GET["f"])) {
31 31
     $f = $_GET["f"];
32 32
     $f = escapeshellcmd($f);
33 33
 } else {
34 34
     $f = "";
35 35
 }
36
-if( isset($_GET["s"]) ){
36
+if (isset($_GET["s"])) {
37 37
     $s = $_GET["s"];
38 38
     $s = escapeshellcmd($s);
39 39
 } else {
40 40
     $s = "";
41 41
 }
42
-if( isset($_GET["l"]) ){
42
+if (isset($_GET["l"])) {
43 43
     $l = (int)$_GET["l"];
44 44
 } else {
45 45
     $l = 0;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 echo 'Hint: Example greps: "RESULT#106876", "26fe99aa_25636_00119.wu_1", "WU#8152", "too many errors", "2003-07-17", "CRITICAL" <br>';
61 61
 
62 62
 if (strlen($f)) {
63
-	$f = "../log*/". $f;
63
+	$f = "../log*/".$f;
64 64
 } else {
65 65
     $f = "../log*/*.log";
66 66
 }
Please login to merge, or discard this patch.
html/user/openid_login.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,23 +35,23 @@  discard block
 block discarded – undo
35 35
     $openid = new LightOpenID;
36 36
     echo "<pre>";
37 37
     print_r($openid); exit;
38
-    if(!$openid->mode) {
39
-        if(isset($_POST['openid_identifier'])) {
38
+    if (!$openid->mode) {
39
+        if (isset($_POST['openid_identifier'])) {
40 40
             $openid->identity = $_POST['openid_identifier'];
41 41
             $openid->required = array('namePerson/friendly', 'contact/email');
42 42
             $openid->optional = array('contact/country/home');
43
-            header('Location: ' . $openid->authUrl());
43
+            header('Location: '.$openid->authUrl());
44 44
         }
45
-        if(isset($_GET['openid_identifier'])) {
45
+        if (isset($_GET['openid_identifier'])) {
46 46
             $openid->identity = $_GET['openid_identifier'];
47 47
             $openid->required = array('namePerson/friendly', 'contact/email');
48 48
             $openid->optional = array('contact/country/home');
49
-            header('Location: ' . $openid->authUrl());
49
+            header('Location: '.$openid->authUrl());
50 50
         }
51
-    } elseif($openid->mode == 'cancel') {
51
+    } elseif ($openid->mode == 'cancel') {
52 52
         echo 'User has canceled authentication!';
53 53
     } else {
54
-        echo 'User ' . ($openid->validate() ? $openid->identity . ' has ' : 'has not ') . 'logged in.';
54
+        echo 'User '.($openid->validate() ? $openid->identity.' has ' : 'has not ').'logged in.';
55 55
         //print_r($openid->getAttributes());
56 56
         // Create the user in the DB
57 57
         $data = $openid->getAttributes();
@@ -125,13 +125,13 @@  discard block
 block discarded – undo
125 125
             
126 126
             $user = make_user(
127 127
                 $new_email_addr, $new_name, $passwd_hash,
128
-                $country, '', $project_prefs="", $teamid=0
128
+                $country, '', $project_prefs = "", $teamid = 0
129 129
             );
130 130
             if (!$user) {
131 131
                 show_error("Couldn't create account");
132 132
             }
133 133
             
134
-            if(defined('INVITE_CODES')) {
134
+            if (defined('INVITE_CODES')) {
135 135
                 error_log("Account '$new_email_addr' created using invitation code '$invite_code'");
136 136
             }
137 137
         }
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         send_cookie('auth', $user->authenticator, true);
154 154
 
155 155
     }
156
-} catch(ErrorException $e) {
156
+} catch (ErrorException $e) {
157 157
     echo $e->getMessage();
158 158
 }
159 159
 
Please login to merge, or discard this patch.
html/ops/fix_project_prefs.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             // changing the tree in a loop has strange results so do it separately
77 77
             $to_remove = array();
78 78
             $ids = array();
79
-            foreach($appids as $elem) {
79
+            foreach ($appids as $elem) {
80 80
                 $ids[] = $elem->nodeValue;
81 81
                 $to_remove[] = $elem;
82 82
             }
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
         exit(1);
95 95
     }
96 96
     $appids = $node->getElementsByTagName("app_id");
97
-    if ($appids->length == 0 ) return;
97
+    if ($appids->length == 0) return;
98 98
     // changing the tree in a loop has strange results so do it separately
99 99
     $to_remove = array();
100 100
     $ids = array();
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         $to_remove = array();
130 130
         foreach ($subNodes as $subNode) {
131 131
             // ignore empty text nodes which are basically whitespace from indentation (only relevant if preserveWhiteSpace is set to true above)
132
-            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) &&(strlen(trim($subNode->wholeText))>=1))) {
132
+            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) && (strlen(trim($subNode->wholeText)) >= 1))) {
133 133
                 if ($subNode->nodeName == "venue") {
134 134
                     if (!$subNode->hasChildNodes()) {
135 135
                         // empty venue tag, clean this up too
Please login to merge, or discard this patch.
html/user/edit_forum_preferences_form.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 // ------------ Notification -----------
39 39
 
40 40
 row1(tra("Notifications"));
41
-$ch0 = $user->prefs->pm_notification==0?"checked":"";
42
-$ch1 = $user->prefs->pm_notification==1?"checked":"";
43
-$ch2 = $user->prefs->pm_notification==2?"checked":"";
41
+$ch0 = $user->prefs->pm_notification == 0 ? "checked" : "";
42
+$ch1 = $user->prefs->pm_notification == 1 ? "checked" : "";
43
+$ch2 = $user->prefs->pm_notification == 2 ? "checked" : "";
44 44
 row2(
45 45
     tra("How should we notify you of new private messages, friend requests, posts in subscribed threads, and other events?"),
46 46
     "<input type=radio name=pm_notification value=0 $ch0> ".tra("On my Account page (no email)")."
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
 // ------------ Forum identity -----------
54 54
 
55 55
 $select_0 = $select_1 = $select_2 = "";
56
-if (strlen($user->prefs->avatar)){
57
-    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18)=="//www.gravatar.com") { // Gravatar
56
+if (strlen($user->prefs->avatar)) {
57
+    if (substr($user->prefs->avatar, 0, 23) == 'http://www.gravatar.com' || substr($user->prefs->avatar, 0, 18) == "//www.gravatar.com") { // Gravatar
58 58
         $select_1 = "checked=\"true\"";
59 59
     } else {
60 60
         $select_2 = "checked=\"true\"";
@@ -73,15 +73,15 @@  discard block
 block discarded – undo
73 73
     <input type=\"radio\" id=\"avatar_select_2\" name=\"avatar_select\" value=\"2\" ".$select_2.">
74 74
         <label for=\"avatar_select_2\">".tra("Use this uploaded avatar:")."</label> <input type=\"file\" name=\"picture\">"
75 75
 );
76
-if (strlen($user->prefs->avatar)){
76
+if (strlen($user->prefs->avatar)) {
77 77
     row2(tra("Avatar preview")."<br><p class=\"text-muted\">".tra("This is how your avatar will look")."</p>",
78 78
     "<img src=\"".$user->prefs->avatar."\" width=\"100\" height=\"100\">");
79 79
 }
80 80
 
81
-$signature_by_default = $user->prefs->no_signature_by_default==false?"checked=\"checked\"":"";
81
+$signature_by_default = $user->prefs->no_signature_by_default == false ? "checked=\"checked\"" : "";
82 82
 
83
-$signature=$user->prefs->signature;
84
-$maxlen=250;
83
+$signature = $user->prefs->signature;
84
+$maxlen = 250;
85 85
 row2(
86 86
     tra("Signature for message board posts")
87 87
     .bbcode_info()
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     textarea_with_counter("signature", 250, $signature)
93 93
     ."<br><input type=\"checkbox\" name=\"signature_by_default\" ".$signature_by_default."> ".tra("Attach signature by default")
94 94
 );
95
-if ($user->prefs->signature!=""){
95
+if ($user->prefs->signature != "") {
96 96
     row2(tra("Signature preview").
97 97
         "<br><p class=\"text-muted\">".tra("This is how your signature will look in the forums")."</p>",
98 98
         output_transform($user->prefs->signature)
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
101 101
 
102 102
 // ------------ Message display  -----------
103 103
 
104
-$forum_hide_avatars = $user->prefs->hide_avatars?"checked=\"checked\"":"";
105
-$forum_hide_signatures = $user->prefs->hide_signatures?"checked=\"checked\"":"";
106
-$forum_link_popup = $user->prefs->link_popup?"checked=\"checked\"":""; 
107
-$forum_image_as_link = $user->prefs->images_as_links?"checked=\"checked\"":"";
108
-$forum_jump_to_unread = $user->prefs->jump_to_unread?"checked=\"checked\"":"";
109
-$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts?"checked=\"checked\"":"";
110
-$forum_highlight_special = $user->prefs->highlight_special?"checked=\"checked\"":"";
104
+$forum_hide_avatars = $user->prefs->hide_avatars ? "checked=\"checked\"" : "";
105
+$forum_hide_signatures = $user->prefs->hide_signatures ? "checked=\"checked\"" : "";
106
+$forum_link_popup = $user->prefs->link_popup ? "checked=\"checked\"" : ""; 
107
+$forum_image_as_link = $user->prefs->images_as_links ? "checked=\"checked\"" : "";
108
+$forum_jump_to_unread = $user->prefs->jump_to_unread ? "checked=\"checked\"" : "";
109
+$forum_ignore_sticky_posts = $user->prefs->ignore_sticky_posts ? "checked=\"checked\"" : "";
110
+$forum_highlight_special = $user->prefs->highlight_special ? "checked=\"checked\"" : "";
111 111
 
112 112
 $forum_minimum_wrap_postcount = intval($user->prefs->minimum_wrap_postcount);
113 113
 $forum_display_wrap_postcount = intval($user->prefs->display_wrap_postcount);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
 $filtered_userlist = get_ignored_list($user);
140 140
 $forum_filtered_userlist = "";
141
-for ($i=0; $i<sizeof($filtered_userlist); $i++){
141
+for ($i = 0; $i < sizeof($filtered_userlist); $i++) {
142 142
     $id = (int)$filtered_userlist[$i];
143 143
     if ($id) {
144 144
         $filtered_user = BoincUser::lookup_id($id);
@@ -168,5 +168,5 @@  discard block
 block discarded – undo
168 168
 end_table();
169 169
 page_tail();
170 170
 
171
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
171
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
172 172
 ?>
Please login to merge, or discard this patch.
html/inc/pm.inc 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     return $x;
49 49
 }
50 50
 
51
-function pm_team_form($user, $teamid, $error=null) {
51
+function pm_team_form($user, $teamid, $error = null) {
52 52
     global $bbcode_html, $bbcode_js;
53 53
     $team = BoincTeam::lookup_id($teamid);
54 54
     if (!$team) {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
         error_page("not admin");
59 59
     }
60 60
 
61
-    page_head(tra("Send message to team"),'','','', $bbcode_js);
61
+    page_head(tra("Send message to team"), '', '', '', $bbcode_js);
62 62
 
63 63
     $subject = post_str("subject", true);
64 64
     $content = post_str("content", true);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 function pm_form($replyto, $userid, $error = null) {
103 103
     global $bbcode_html, $bbcode_js;
104 104
     global $g_logged_in_user;
105
-    page_head(tra("Send private message"),'','','', $bbcode_js);
105
+    page_head(tra("Send private message"), '', '', '', $bbcode_js);
106 106
     
107 107
     if (post_str("preview", true) == tra("Preview")) {
108 108
         $content = post_str("content", true);
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 function send_pm_notification_email(
185 185
     $logged_in_user, $to_user, $subject, $content
186 186
 ) {
187
-    $message  = "
187
+    $message = "
188 188
 You have received a new private message at ".PROJECT.".
189 189
 
190 190
 From: $logged_in_user->name (ID $logged_in_user->id)
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
215 215
     $from_user = BoincUser::lookup_id($pm->senderid);
216 216
     if (!$pm || !$from_user) return null;
217
-    return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
217
+    return "<a href=pm.php>".tra("Private message%1 from %2, subject:", "</a>", $from_user->name)." $pm->subject";
218 218
 }
219 219
 
220 220
 function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) {
@@ -278,11 +278,11 @@  discard block
 block discarded – undo
278 278
 
279 279
 function pm_email_remind($user) {
280 280
     if (!$user->prefs->pm_notification) {
281
-        return "<br><small>" .
281
+        return "<br><small>".
282 282
             tra(
283 283
                 "For email notification, %1 edit community prefs %2",
284 284
                 '<a href="edit_forum_preferences_form.php">', '</a>'
285
-            ) .
285
+            ).
286 286
             "</small>"
287 287
         ;
288 288
     }
@@ -308,5 +308,5 @@  discard block
 block discarded – undo
308 308
     }
309 309
 }
310 310
 
311
-$cvs_version_tracker[]="\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
311
+$cvs_version_tracker[] = "\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
312 312
 ?>
Please login to merge, or discard this patch.
html/user/profile_menu.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 start_table();
42 42
 
43 43
 $today = getdate(time());
44
-$UOTD_heading = tra("User of the Day")." -- " . $today['month'] . " " . $today['mday'] . ", " . $today['year'];
44
+$UOTD_heading = tra("User of the Day")." -- ".$today['month']." ".$today['mday'].", ".$today['year'];
45 45
 row1($UOTD_heading);
46 46
 echo "<tr><td>";
47 47
     $profile = get_current_uotd();
@@ -59,15 +59,15 @@  discard block
 block discarded – undo
59 59
 row1(tra("User Profile Explorer"));
60 60
 echo "<tr><td>
61 61
     <ul>
62
-    <li>".tra("View the %1 User Picture Gallery %2.", "<a href=\"" . url_base() . "user_profile/user_gallery_1.html\">", "</a>")."</li>
63
-    <li>".tra("Browse profiles %1 by country %2.", "<a href=\"" . url_base() . "user_profile/profile_country.html\">", "</a>")."</li>
62
+    <li>".tra("View the %1 User Picture Gallery %2.", "<a href=\"".url_base()."user_profile/user_gallery_1.html\">", "</a>")."</li>
63
+    <li>".tra("Browse profiles %1 by country %2.", "<a href=\"".url_base()."user_profile/profile_country.html\">", "</a>")."</li>
64 64
     <li>".tra("Browse profiles %1 at random %2, %3 at random with pictures %2, or %4 at random without pictures %2.", "<a href=\"?cmd=rand&amp;pic=-1\">", "</a>",
65 65
             "<a href=\"?cmd=rand&amp;pic=1\">", "<a href=\"?cmd=rand&amp;pic=0\">")."</li>
66 66
 ";
67
-if (file_exists(PROFILE_PATH . "profile_alpha.html")) {
67
+if (file_exists(PROFILE_PATH."profile_alpha.html")) {
68 68
     echo "<li>".tra("Alphabetical profile listings:")."<br>";
69 69
 
70
-    include( PROFILE_PATH . "profile_alpha.html" );
70
+    include(PROFILE_PATH."profile_alpha.html");
71 71
 }
72 72
 echo "</ul></td></tr>";
73 73
 
@@ -110,5 +110,5 @@  discard block
 block discarded – undo
110 110
     }
111 111
 }
112 112
 
113
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
113
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
114 114
 ?>
Please login to merge, or discard this patch.
html/user/forum_search_action.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 // Optionally filters by forum, user, time, or hidden if specified.
32 32
 //
33 33
 function search_thread_titles(
34
-    $keyword_list, $forum="", $user="", $time="", $limit=200,
35
-    $sort_style=CREATE_TIME_NEW, $show_hidden = false
36
-){
37
-    $search_string="%";
34
+    $keyword_list, $forum = "", $user = "", $time = "", $limit = 200,
35
+    $sort_style = CREATE_TIME_NEW, $show_hidden = false
36
+) {
37
+    $search_string = "%";
38 38
     foreach ($keyword_list as $key => $word) {
39 39
         $search_string .= BoincDb::escape_string($word)."%";
40 40
     }        
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
     if (!$show_hidden) {
52 52
         $query .= " and thread.hidden = 0";
53 53
     }
54
-    switch($sort_style) {
54
+    switch ($sort_style) {
55 55
     case MODIFIED_NEW:
56 56
         $query .= ' ORDER BY timestamp DESC';
57 57
         break;
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
 //
85 85
 function search_post_content(
86 86
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
87
-){
87
+) {
88 88
     $db = BoincDb::get();
89 89
 
90
-    $search_string="%";
91
-    foreach ($keyword_list as $key => $word){
90
+    $search_string = "%";
91
+    foreach ($keyword_list as $key => $word) {
92 92
         $search_string .= BoincDb::escape_string($word)."%";
93 93
     } 
94 94
     $optional_join = "";
@@ -100,20 +100,20 @@  discard block
 block discarded – undo
100 100
     }
101 101
     $query = "select post.* from ".$db->db_name.".post".$optional_join." where content like '".$search_string."'";
102 102
     if ($forum) {
103
-        $query.=" and forum = $forum->id";
103
+        $query .= " and forum = $forum->id";
104 104
     }
105 105
     if ($user) {
106
-        $query.=" and post.user = $user->id ";
106
+        $query .= " and post.user = $user->id ";
107 107
     }
108 108
     if ($time) {
109
-        $query.=" and post.timestamp > $time";
109
+        $query .= " and post.timestamp > $time";
110 110
     }
111 111
     if (!$show_hidden) {
112 112
         $query .= " AND post.hidden = 0";
113 113
     }
114
-    switch($sort_style) {
114
+    switch ($sort_style) {
115 115
     case VIEWS_MOST:
116
-        $query.= ' ORDER BY views DESC';
116
+        $query .= ' ORDER BY views DESC';
117 117
         break;
118 118
     case CREATE_TIME_NEW:
119 119
         $query .= ' ORDER by post.timestamp desc';
@@ -128,13 +128,13 @@  discard block
 block discarded – undo
128 128
         $query .= ' ORDER BY post.timestamp DESC';
129 129
         break;
130 130
     }
131
-    $query.= " limit $limit";
131
+    $query .= " limit $limit";
132 132
     return BoincPost::enum_general($query);
133 133
 }
134 134
 
135 135
 $logged_in_user = get_logged_in_user(false);
136 136
 BoincForumPrefs::lookup($logged_in_user);
137
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
137
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
138 138
     $show_hidden_posts = true;
139 139
 } else {
140 140
     $show_hidden_posts = false;
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 $search_max_time = post_int("search_max_time");
148 148
 $search_forum = post_int("search_forum");
149 149
 $search_sort = post_int("search_sort");
150
-$search_list = explode(" ",$search_keywords);
150
+$search_list = explode(" ", $search_keywords);
151 151
 if ($search_max_time) {
152 152
     $min_timestamp = time() - ($search_max_time*3600*24);
153 153
 } else {
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
 $limit = 100;
158 158
 
159
-if ($search_forum==-1){
159
+if ($search_forum == -1) {
160 160
     $forum = null;
161 161
 } else if ($search_forum) {
162 162
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,10 +173,10 @@  discard block
 block discarded – undo
173 173
 
174 174
 // Display the threads while we search for posts
175 175
 //
176
-if (count($threads)){
177
-    echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
176
+if (count($threads)) {
177
+    echo "<h3>".tra("Thread titles matching your query:")."</h3>";
178 178
     show_thread_and_context_header();
179
-    foreach ($threads as $thread){
179
+    foreach ($threads as $thread) {
180 180
         if ($thread->hidden) continue;
181 181
         show_thread_and_context($thread, $logged_in_user);
182 182
     }
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
     $show_hidden_posts
193 193
 );
194 194
 
195
-if (count($posts)){
196
-    echo "<h3>" . tra("Messages matching your query:") . "</h3>";
195
+if (count($posts)) {
196
+    echo "<h3>".tra("Messages matching your query:")."</h3>";
197 197
     start_table();
198 198
     $n = 1;
199 199
     $options = get_output_options($logged_in_user);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     end_table();
216 216
 }
217 217
 
218
-if (!count($threads) && !count($posts)){
218
+if (!count($threads) && !count($posts)) {
219 219
     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>
220 220
     <p>"
221 221
     .tra("You can also %1 try the same search on Google. %2",
@@ -226,5 +226,5 @@  discard block
 block discarded – undo
226 226
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";
227 227
 page_tail();
228 228
 
229
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
229
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
230 230
 ?>
Please login to merge, or discard this patch.