Passed
Pull Request — master (#5679)
by
unknown
08:27
created
html/user/forum_thread.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 $postid = get_int('postid', true);
31 31
 $filter = get_str('filter', true);
32 32
 
33
-if ($filter != "false"){
33
+if ($filter != "false") {
34 34
     $filter = true;
35 35
 } else {
36 36
     $filter = false;
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 if ($temp_sort_style) {
80 80
     $sort_style = $temp_sort_style;
81 81
 } else if ($sort_style) {
82
-    $forum_style = 0;   // this is deprecated
83
-    if ($logged_in_user){
82
+    $forum_style = 0; // this is deprecated
83
+    if ($logged_in_user) {
84 84
         $logged_in_user->prefs->thread_sorting = $sort_style;
85 85
         $logged_in_user->prefs->update("thread_sorting=$sort_style");
86 86
     } else {
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
     );
93 93
 } else {
94 94
     // get the sorting style from the user or a cookie
95
-    if ($logged_in_user){
95
+    if ($logged_in_user) {
96 96
         $sort_style = $logged_in_user->prefs->thread_sorting;
97 97
     } else {
98 98
         list($forum_style, $sort_style) = parse_forum_cookie();
@@ -120,10 +120,10 @@  discard block
 block discarded – undo
120 120
 
121 121
 if (false) {
122 122
 if ($forum->parent_type == 0) {
123
-    if ($category->is_helpdesk && !$thread->status){
124
-        if ($logged_in_user){
125
-            if ($thread->owner == $logged_in_user->id){
126
-                if ($thread->replies !=0) {
123
+    if ($category->is_helpdesk && !$thread->status) {
124
+        if ($logged_in_user) {
125
+            if ($thread->owner == $logged_in_user->id) {
126
+                if ($thread->replies != 0) {
127 127
                     // Show a "this question has been answered" to the author
128 128
                     echo "<p>";
129 129
                     show_button(
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
     // If logged in user is moderator, enable some extra features
190 190
     //
191 191
     if (is_moderator($logged_in_user, $forum)) {
192
-        if ($thread->hidden){
192
+        if ($thread->hidden) {
193 193
             show_button_small(
194 194
                 "forum_moderate_thread_action.php?action=unhide&amp;thread=".$thread->id."$tokens",
195 195
                 tra("Unhide"),
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
                 tra("Hide this thread")
203 203
             );
204 204
         }
205
-        if ($thread->sticky){
205
+        if ($thread->sticky) {
206 206
             show_button_small(
207 207
                 "forum_moderate_thread_action.php?action=desticky&amp;thread=".$thread->id."$tokens",
208 208
                 tra("Make unsticky"),
@@ -308,5 +308,5 @@  discard block
 block discarded – undo
308 308
 $thread->update("views=views+1");
309 309
 
310 310
 page_tail();
311
-$cvs_version_tracker[]="\$Id$";
311
+$cvs_version_tracker[] = "\$Id$";
312 312
 ?>
Please login to merge, or discard this patch.
html/user/forum_reply.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     $parent_post_id = 0;
51 51
 }
52 52
 
53
-if ($filter != "false"){
53
+if ($filter != "false") {
54 54
     $filter = true;
55 55
 } else {
56 56
     $filter = false;
@@ -65,11 +65,11 @@  discard block
 block discarded – undo
65 65
 }
66 66
 
67 67
 $warning = null;
68
-if ($content && (!$preview)){
69
-    if (post_str('add_signature',true)=="add_it"){
70
-        $add_signature=true;    // set a flag and concatenate later
71
-    }  else {
72
-        $add_signature=false;
68
+if ($content && (!$preview)) {
69
+    if (post_str('add_signature', true) == "add_it") {
70
+        $add_signature = true; // set a flag and concatenate later
71
+    } else {
72
+        $add_signature = false;
73 73
     }
74 74
     check_tokens($logged_in_user->authenticator);
75 75
     if (!akismet_check($logged_in_user, $content)) {
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     }
89 89
 }
90 90
 
91
-page_head(tra("Post to thread"),'','','', $bbcode_js);
91
+page_head(tra("Post to thread"), '', '', '', $bbcode_js);
92 92
 
93 93
 show_forum_header($logged_in_user);
94 94
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     $x1 = tra("Message:").bbcode_info().post_warning();
143 143
     $x2 = "";
144 144
     if ($parent_post) {
145
-        $x2 .=" ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
145
+        $x2 .= " ".tra("reply to %1 Message ID %2:", "<a href=#".$parent_post->id.">", " ".$parent_post->id."</a>");
146 146
     }
147 147
     $x2 .= "<form action=forum_reply.php?thread=".$thread->id;
148 148
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
     $x2 .= " method=\"post\" name=\"post\" onsubmit=\"return checkForm(this)\">\n";
154 154
     $x2 .= form_tokens($logged_in_user->authenticator);
155 155
     $x2 .= start_table_str().$bbcode_html.end_table_str()."<textarea class=\"form-control\" name=\"content\" rows=\"18\">";
156
-    $no_quote = get_int("no_quote", true)==1;
156
+    $no_quote = get_int("no_quote", true) == 1;
157 157
     if ($preview) {
158 158
         $x2 .= htmlspecialchars($content);
159 159
     } else if (!$no_quote) {
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
         }
163 163
     }
164 164
     if (!$logged_in_user->prefs->no_signature_by_default) {
165
-        $enable_signature="checked=\"true\"";
165
+        $enable_signature = "checked=\"true\"";
166 166
     } else {
167
-        $enable_signature="";
167
+        $enable_signature = "";
168 168
     }
169 169
     $x2 .= "</textarea><p> </p>
170 170
         <input class=\"btn btn-primary btn-sm \" type=\"submit\" name=\"preview\" value=\"".tra("Preview")."\">
@@ -179,9 +179,9 @@  discard block
 block discarded – undo
179 179
 }
180 180
 
181 181
 function quote_text($text) {
182
-    $text = "[quote]" . $text . "[/quote]";
182
+    $text = "[quote]".$text."[/quote]";
183 183
     return $text;
184 184
 }
185 185
 
186
-$cvs_version_tracker[]="\$Id$";
186
+$cvs_version_tracker[] = "\$Id$";
187 187
 ?>
Please login to merge, or discard this patch.
html/inc/submit.inc 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
     $b->create_time = (double)($batch->create_time);
171 171
     $b->est_completion_time = (double)($batch->est_completion_time);
172 172
     $b->njobs = (int)($batch->njobs);
173
-    $b->fraction_done = (double) $batch->fraction_done;
173
+    $b->fraction_done = (double)$batch->fraction_done;
174 174
     $b->nerror_jobs = (int)($batch->nerror_jobs);
175 175
     $b->state = (int)($batch->state);
176 176
     $b->completion_time = (double)($batch->completion_time);
@@ -398,7 +398,7 @@  discard block
 block discarded – undo
398 398
     </result>
399 399
 </output_template>
400 400
 ";
401
-    for ($i=0; $i<2; $i++) {
401
+    for ($i = 0; $i < 2; $i++) {
402 402
         $job = new StdClass;
403 403
         $job->input_files = array();
404 404
         $job->input_files[] = $f;
Please login to merge, or discard this patch.
html/ops/db_action.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 // For display, convert query string characters < and > into 'html form' so
65 65
 // that they will be displayed.
66 66
 //
67
-$html_text=str_replace('<', '&lt;', str_replace('>', '&gt;', $main_query));
67
+$html_text = str_replace('<', '&lt;', str_replace('>', '&gt;', $main_query));
68 68
 
69 69
 echo "<p>Query: <b>$html_text</b><p>\n";
70 70
     
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 if ($result) {
160 160
     if ($detail == "low") {
161 161
         start_table('table-striped');
162
-        switch($table) {
162
+        switch ($table) {
163 163
         case "result":
164 164
             result_short_header();
165 165
             break;
@@ -228,5 +228,5 @@  discard block
 block discarded – undo
228 228
 }
229 229
 
230 230
 admin_page_tail();
231
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
231
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
232 232
 ?>
Please login to merge, or discard this patch.
html/ops/manage_apps.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     $app = BoincApp::lookup_id($id);
26 26
     if (!$app) admin_error_page("no such app");
27 27
 
28
-    $n = post_str("deprecated", true)?1:0;
28
+    $n = post_str("deprecated", true) ? 1 : 0;
29 29
     $app->update("deprecated=$n");
30 30
 
31 31
     $n = post_num("weight");
@@ -37,16 +37,16 @@  discard block
 block discarded – undo
37 37
     $n = post_int("target_nresults");
38 38
     $app->update("target_nresults=$n");
39 39
 
40
-    $n = post_str("homogeneous_app_version", true)?1:0;
40
+    $n = post_str("homogeneous_app_version", true) ? 1 : 0;
41 41
     $app->update("homogeneous_app_version=$n");
42 42
 
43
-    $n = post_str("non_cpu_intensive", true)?1:0;
43
+    $n = post_str("non_cpu_intensive", true) ? 1 : 0;
44 44
     $app->update("non_cpu_intensive=$n");
45 45
 
46
-    $n = post_str("beta", true)?1:0;
46
+    $n = post_str("beta", true) ? 1 : 0;
47 47
     $app->update("beta=$n");
48 48
 
49
-    $n = post_str("fraction_done_exact", true)?1:0;
49
+    $n = post_str("fraction_done_exact", true) ? 1 : 0;
50 50
     $app->update("fraction_done_exact=$n");
51 51
 
52 52
     echo "Application $id updated.
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 function add_app() {
59 59
     $name = BoincDb::escape_string(post_str('add_name'));
60 60
     $user_friendly_name = BoincDb::escape_string(post_str('add_user_friendly_name'));
61
-    if (empty($name) || empty($user_friendly_name) ) {
61
+    if (empty($name) || empty($user_friendly_name)) {
62 62
         admin_error_page(
63 63
             "To add a new application please supply both a brief name and a longer 'user-friendly' name.</font></p>"
64 64
         );
@@ -81,11 +81,11 @@  discard block
 block discarded – undo
81 81
         <h2>Edit applications</h2>
82 82
     ";
83 83
 
84
-    $app_clause="deprecated=0";
85
-    $action_url="manage_apps.php";
86
-    if($all) {
84
+    $app_clause = "deprecated=0";
85
+    $action_url = "manage_apps.php";
86
+    if ($all) {
87 87
         $app_clause = "";
88
-        $action_url="manage_apps.php?all=1";
88
+        $action_url = "manage_apps.php?all=1";
89 89
         echo "<a href=\"manage_apps.php\">Don't show deprecated applications</a>";
90 90
     } else {
91 91
         echo "<a href=\"manage_apps.php?all=1\">Show deprecated applications</a>";
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
     $apps = BoincApp::enum($app_clause);
118 118
     foreach ($apps as $app) {
119 119
         // grey-out deprecated versions
120
-        $f1=$f2='';
121
-        if ($app->deprecated==1) {
120
+        $f1 = $f2 = '';
121
+        if ($app->deprecated == 1) {
122 122
             $f1 = "<font color='GREY'>";
123 123
             $f2 = "</font>";
124 124
         }
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
         echo "  <TD align='left'>$f1<a href=app_details.php?appid=$app->id>$app->name</a><br> $app->user_friendly_name $f2</TD>\n";
130 130
 
131
-        echo "  <TD align='center'>$f1 " .date_str($app->create_time)."$f2</TD>\n";
131
+        echo "  <TD align='center'>$f1 ".date_str($app->create_time)."$f2</TD>\n";
132 132
 
133 133
         $v = $app->weight;
134 134
         echo "  <TD align='center'>
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         ";
152 152
 
153 153
         $v = '';
154
-        if ($app->homogeneous_app_version) $v=' CHECKED ';
154
+        if ($app->homogeneous_app_version) $v = ' CHECKED ';
155 155
         echo "  <TD align='center'>
156 156
             <input name='homogeneous_app_version' type='checkbox' $v></TD>
157 157
         ";
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/boinccore/boinccore.admin.inc 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
       break;
139 139
     default:
140 140
       end($page_list);
141
-      $page_list[key($page_list)] = 'and ' . $page_list[key($page_list)];
141
+      $page_list[key($page_list)] = 'and '.$page_list[key($page_list)];
142 142
       $page_list = implode(', ', $page_list);
143 143
     }
144 144
     drupal_set_message(t('Default content has been generated for the @listed
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
         'type' => 'page',
196 196
         'title' => t('Help'),
197 197
         'uid' => 1,
198
-        'status' => 1,  // published
198
+        'status' => 1, // published
199 199
         'promote' => 0, // not promoted to front page
200 200
         'path' => 'help',
201 201
         'pathauto_perform_alias' => FALSE,
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
         'format' => 4,
217 217
         //'teaser' => $teaser,
218 218
       );
219
-      $node = (object) $node; // node_save requires an object
219
+      $node = (object)$node; // node_save requires an object
220 220
       node_save($node);
221 221
       
222 222
       $item = array(
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
         'type' => 'page',
238 238
         'title' => t('Rules and Policies'),
239 239
         'uid' => 1,
240
-        'status' => 1,  // published
240
+        'status' => 1, // published
241 241
         'promote' => 0, // not promoted to front page
242 242
         'path' => 'rules-and-policies',
243 243
         'pathauto_perform_alias' => FALSE,
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
         'format' => 4,
252 252
         //'teaser' => $teaser,
253 253
       );
254
-      $node = (object) $node; // node_save requires an object
254
+      $node = (object)$node; // node_save requires an object
255 255
       node_save($node);
256 256
 
257 257
       // Create menu item to node
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
         'type' => 'page',
274 274
         'title' => t('Moderation'),
275 275
         'uid' => 1,
276
-        'status' => 1,  // published
276
+        'status' => 1, // published
277 277
         'promote' => 0, // not promoted to front page
278 278
         'path' => 'moderation',
279 279
         'pathauto_perform_alias' => FALSE,
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
         'format' => 4,
288 288
         //'teaser' => $teaser,
289 289
       );
290
-      $node = (object) $node; // node_save requires an object
290
+      $node = (object)$node; // node_save requires an object
291 291
       node_save($node);
292 292
 
293 293
       // Create menu item to node
Please login to merge, or discard this patch.
sites/default/boinc/modules/boinc_solr_search/boinc_solr_search.module 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
  */
53 53
 function boinc_solr_search_block_view($delta = 0) {
54 54
   $block = array();
55
-  switch($delta) {
55
+  switch ($delta) {
56 56
     case 'boinc_solr_search_0':
57 57
       $items = array(
58 58
           bts('By default a search matches ANY search term. Results with more than one term will be presented higher in the search results.', array(), NULL, 'boinc:search-help-sidebar-block'),
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/boinccore/includes/boinccore.forms.inc 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
   );
17 17
 
18 18
   // Build confirm form from elements, depending on node type.
19
-  $description =  bts('This action cannot be undone.', array(), NULL, 'boinc:delete-node');
19
+  $description = bts('This action cannot be undone.', array(), NULL, 'boinc:delete-node');
20 20
   $no = bts('Cancel', array(), NULL, 'boinc:form-cancel');
21 21
 
22
-  switch($node->type) {
22
+  switch ($node->type) {
23 23
   case 'profile':
24 24
     $question = bts('Are you sure you want to clear your profile?', array(), NULL, 'boinc:delete-node');
25 25
     $path = isset($_GET['destination']) ? $_GET['destination'] : 'account';
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 
29 29
   default:
30 30
     $question = bts('Are you sure you want to Delete %title?', array('%title' => $node->title), NULL, 'boinc:delete-node');
31
-    $path = isset($_GET['destination']) ? $_GET['destination'] : 'node/'. $node->nid;
31
+    $path = isset($_GET['destination']) ? $_GET['destination'] : 'node/'.$node->nid;
32 32
     $yes = bts('Delete', array(), NULL, 'boinc:form-delete');
33 33
   }
34 34
   return confirm_form($form, $question, $path, $description, $yes, $no);
Please login to merge, or discard this patch.
html/user/forum_edit.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 $post_owner = BoincUser::lookup_id($post->user);
46 46
 if (($logged_in_user->id != $post_owner->id) || (can_reply($thread, $forum, $logged_in_user) == false)) {
47
-    error_page (tra("You are not authorized to edit this post."));
47
+    error_page(tra("You are not authorized to edit this post."));
48 48
 }
49 49
 
50 50
 $thread_owner = BoincUser::lookup_id($thread->owner);
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
 // (ie. not a response to another post)
54 54
 // allow the user to modify the thread title
55 55
 //
56
-$can_edit_title = ($post->parent_post==0 && $thread_owner->id==$logged_in_user->id && !is_banished($logged_in_user));
56
+$can_edit_title = ($post->parent_post == 0 && $thread_owner->id == $logged_in_user->id && !is_banished($logged_in_user));
57 57
 
58 58
 $content = post_str("content", true);
59 59
 $title = post_str("title", true);
60 60
 $preview = post_str("preview", true);
61 61
 
62
-if (post_str('submit',true) && (!$preview)) {
62
+if (post_str('submit', true) && (!$preview)) {
63 63
     if (POST_MAX_LINKS
64 64
         && link_count($content) > POST_MAX_LINKS
65 65
         && !is_moderator($logged_in_user, $forum)
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     }
69 69
     check_tokens($logged_in_user->authenticator);
70 70
     
71
-    $add_signature = (post_str('add_signature', true) == "1")?1:0;
71
+    $add_signature = (post_str('add_signature', true) == "1") ? 1 : 0;
72 72
     $content = substr($content, 0, 64000);
73 73
     $content = trim($content);
74 74
     if (strlen($content)) {
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $now = time();
77 77
         $post->update("signature=$add_signature, content='$content', modified=$now");
78 78
     
79
-        if ($can_edit_title){
79
+        if ($can_edit_title) {
80 80
             $title = trim($title);
81 81
             $title = sanitize_tags($title);
82 82
             $title = BoincDb::escape_string($title);
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
     }
90 90
 }
91 91
 
92
-page_head(tra("Edit post"),'','','', $bbcode_js);
92
+page_head(tra("Edit post"), '', '', '', $bbcode_js);
93 93
 
94 94
 show_forum_header($logged_in_user);
95 95
 switch ($forum->parent_type) {
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
144 144
 }
145 145
 
146 146
 if ($post->signature) {
147
-    $enable_signature="checked=\"true\"";
147
+    $enable_signature = "checked=\"true\"";
148 148
 } else {
149
-    $enable_signature="";
149
+    $enable_signature = "";
150 150
 }
151 151
 row2("", "<input id=\"add_signature\" name=\"add_signature\" value=\"1\" ".$enable_signature." type=\"checkbox\">
152 152
     <label for=\"add_signature\">".tra("Add my signature to this post")."</label>");
@@ -159,5 +159,5 @@  discard block
 block discarded – undo
159 159
 
160 160
 page_tail();
161 161
 
162
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
162
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
163 163
 ?>
Please login to merge, or discard this patch.