Passed
Pull Request — master (#5888)
by Vitalii
10:45
created
html/ops/problem_host.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
     Average credit: ".$host->expavg_credit."
38 38
     Average update time: ".time_str($host->expavg_time)."
39 39
     IP address: $host->last_ip_addr (same the last $host->nsame_ip_addr times)
40
-    Domain name: " . $host->domain_name;
40
+    Domain name: ".$host->domain_name;
41 41
     $x = $host->timezone/3600;
42
-    if ($x >= 0) $x="+$x";
43
-    $host_content.="
42
+    if ($x >= 0) $x = "+$x";
43
+    $host_content .= "
44 44
     Local Time = UTC $x hours
45
-    Number of CPUs: " . $host->p_ncpus."
45
+    Number of CPUs: ".$host->p_ncpus."
46 46
     CPU: $host->p_vendor $host->p_model
47 47
     FP ops/sec: ".$host->p_fpops."
48 48
     Int ops/sec: ".$host->p_iops."
@@ -50,28 +50,28 @@  discard block
 block discarded – undo
50 50
     Operating System: $host->os_name $host->os_version";
51 51
     $x = $host->m_nbytes/(1024*1024);
52 52
     $y = round($x, 2);
53
-    $host_content.="
53
+    $host_content .= "
54 54
     Memory: $y MB";
55 55
     $x = $host->m_cache/1024;
56 56
     $y = round($x, 2);
57
-    $host_content.="
57
+    $host_content .= "
58 58
     Cache: $y KB";
59 59
     $x = $host->m_swap/(1024*1024);
60 60
     $y = round($x, 2);
61
-    $host_content.="
61
+    $host_content .= "
62 62
     Swap Space: $y MB";
63 63
     $x = $host->d_total/(1024*1024*1024);
64 64
     $y = round($x, 2);
65
-    $host_content.="
65
+    $host_content .= "
66 66
     Total Disk Space: $y GB";
67 67
     $x = $host->d_free/(1024*1024*1024);
68 68
     $y = round($x, 2);
69
-    $host_content.="
69
+    $host_content .= "
70 70
     Free Disk Space: $y GB
71 71
     Avg network bandwidth (upstream): $host->n_bwup bytes/sec
72 72
     Avg network bandwidth (downstream): $host->n_bwdown bytes/sec";
73 73
     $x = $host->avg_turnaround/86400;
74
-    $host_content.="
74
+    $host_content .= "
75 75
     Average turnaround: ".round($x, 2)." days
76 76
     Number of RPCs: $host->rpc_seqno
77 77
     Last RPC: ".time_str($host->rpc_time)."
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 installation.  Could you please have a look at it?
89 89
 
90 90
 Sincerely,
91
-        The ". PROJECT." team
91
+        The ".PROJECT." team
92 92
 ";
93 93
 $body .= "
94 94
 
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 " . $host_content."
97 97
 
98 98
 For further information and assistance with ".PROJECT." go to $master_url";
99
-    echo nl2br($body) . "<br><br>";
99
+    echo nl2br($body)."<br><br>";
100 100
     return send_email($user, $subject, $body);
101 101
 
102 102
 }
@@ -127,5 +127,5 @@  discard block
 block discarded – undo
127 127
 }
128 128
 
129 129
 admin_page_tail();
130
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
130
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
131 131
 ?>
Please login to merge, or discard this patch.
html/ops/manage_app_versions.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
       "deprecated?",
73 73
       ""
74 74
     );
75
-    $clause = $all?"true":"deprecated = 0";
75
+    $clause = $all ? "true" : "deprecated = 0";
76 76
     $avs = BoincAppVersion::enum(
77 77
         "$clause order by appid, platformid, plan_class, version_num"
78 78
     );
@@ -80,20 +80,20 @@  discard block
 block discarded – undo
80 80
     foreach ($avs as $av) {
81 81
         // grey out deprecated versions
82 82
         //
83
-        $f1=$f2='';
83
+        $f1 = $f2 = '';
84 84
         if ($av->deprecated == 1) {
85
-            $f1="<font color='GREY'>";
86
-            $f2="</font>";
85
+            $f1 = "<font color='GREY'>";
86
+            $f2 = "</font>";
87 87
         }
88 88
 
89
-        $all_value = $all?1:0;
89
+        $all_value = $all ? 1 : 0;
90 90
         $app = $apps[$av->appid];
91 91
         // ignore app versions of deprecated apps by default
92 92
         if ($all_value == 0 && $app->deprecated == 1) {
93 93
             continue;
94 94
         }
95 95
         echo "<tr class=row$i><form action=manage_app_versions.php?all=$all_value#av_$av->id method=POST>\n";
96
-        $i = 1-$i;
96
+        $i = 1 - $i;
97 97
         echo "<input type=hidden name=id value=$av->id>";
98 98
         echo "  <TD>$f1 <a id='av_$av->id' href=db_action.php?table=app_version&id=$av->id>$av->id</a> $f2</TD>\n";
99 99
 
@@ -110,15 +110,15 @@  discard block
 block discarded – undo
110 110
         $v = $av->min_core_version;
111 111
         echo "  <TD><input type='text' size='4' name=min_core_version value='$v'></TD>\n";
112 112
 
113
-        $v=$av->max_core_version;
113
+        $v = $av->max_core_version;
114 114
         echo "  <TD><input type='text' size='4' name=max_core_version value='$v'></TD>\n";
115 115
 
116
-        $v='';
117
-        if ($av->beta) $v=' CHECKED ';
116
+        $v = '';
117
+        if ($av->beta) $v = ' CHECKED ';
118 118
         echo "  <TD> <input name=beta type='checkbox' $v></TD>\n";
119 119
 
120
-        $v='';
121
-        if ($av->deprecated) $v=' CHECKED ';
120
+        $v = '';
121
+        if ($av->deprecated) $v = ' CHECKED ';
122 122
         echo "  <TD> <input name=deprecated type='checkbox' $v></TD>\n";
123 123
 
124 124
         if (!in_rops()) {
Please login to merge, or discard this patch.
html/ops/manage_special_users.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@  discard block
 block discarded – undo
27 27
 row1("Current special users", '9');
28 28
 
29 29
 echo "<tr><td>User</td>";
30
-for ($i=0; $i<S_NFLAGS; $i++) {
31
-    echo "<td width=\"15\">" . $special_user_bitfield[$i] . "</td>\n";
30
+for ($i = 0; $i < S_NFLAGS; $i++) {
31
+    echo "<td width=\"15\">".$special_user_bitfield[$i]."</td>\n";
32 32
 }
33 33
 echo "</tr>";
34 34
 
@@ -37,13 +37,13 @@  discard block
 block discarded – undo
37 37
     FROM forum_preferences as prefs, user
38 38
     WHERE CONVERT(special_user, DECIMAL) > 0 and prefs.userid=user.id"
39 39
 );
40
-for ($i=1; $i<=_mysql_num_rows($result); $i++){
40
+for ($i = 1; $i <= _mysql_num_rows($result); $i++) {
41 41
 	$foo = _mysql_fetch_object($result);
42 42
     echo "<form action=\"manage_special_users_action.php\" method=\"POST\">\n";
43 43
     echo "<input type=\"hidden\" name=\"userid\" value=\"$foo->userid\"
44 44
         <tr><td>$foo->name ($foo->id)</td>
45 45
     ";
46
-    for ($j=0; $j<S_NFLAGS; $j++) {
46
+    for ($j = 0; $j < S_NFLAGS; $j++) {
47 47
         $bit = substr($foo->special_user, $j, 1);
48 48
         echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
49 49
         if ($bit == 1) {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 echo "<tr><form action=\"manage_special_users_action.php\" method=\"POST\">\n";
59 59
 echo "<td>Add UserID:<input type=\"text\" name=\"userid\" size=\"6\"></td>";
60 60
 
61
-for ($j=0; $j<S_NFLAGS; $j++) {
61
+for ($j = 0; $j < S_NFLAGS; $j++) {
62 62
     echo "<td><input type=\"checkbox\" name=\"role".$j."\" value=\"1\"";
63 63
     echo "></td>\n";
64 64
 }
@@ -69,5 +69,5 @@  discard block
 block discarded – undo
69 69
 
70 70
 admin_page_tail();
71 71
 
72
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
72
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
73 73
 ?>
Please login to merge, or discard this patch.
html/ops/db_form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 start_table();
36 36
 
37
-switch($table){
37
+switch ($table) {
38 38
 	case "platform":
39 39
 		break;
40 40
 	case "app":
@@ -102,5 +102,5 @@  discard block
 block discarded – undo
102 102
 print_describe_table($table, 4);
103 103
 
104 104
 admin_page_tail();
105
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
105
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
106 106
 ?>
Please login to merge, or discard this patch.
html/ops/eah_server_status.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 }
42 42
 
43 43
 function find_oldest() {
44
-   $result=_mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1");
44
+   $result = _mysql_query("select name,create_time from result where server_state=2 order by create_time limit 1");
45 45
    $x = _mysql_fetch_object($result);
46 46
    return $x->create_time;
47 47
 }
@@ -88,25 +88,25 @@  discard block
 block discarded – undo
88 88
 
89 89
 
90 90
 
91
-$dbrc = db_init(1);    // 1=soft, remember that DB might be down
91
+$dbrc = db_init(1); // 1=soft, remember that DB might be down
92 92
 
93
-page_head(PROJECT . " - Server Status");
93
+page_head(PROJECT." - Server Status");
94 94
 
95 95
 
96 96
 // Date stamp
97 97
 
98 98
 
99
-echo "<br ALIGN=RIGHT> ".PROJECT. " server status as of ".
100
-    date("g:i A T"). " on ". date("l, j F Y ") .
99
+echo "<br ALIGN=RIGHT> ".PROJECT." server status as of ".
100
+    date("g:i A T")." on ".date("l, j F Y ").
101 101
     " (updated every $Nmin minutes).\n";
102 102
 
103
-$proc_uptime=exec("cat /proc/uptime | cut -d\" \" -f-1");
103
+$proc_uptime = exec("cat /proc/uptime | cut -d\" \" -f-1");
104 104
 $days = (int)($proc_uptime/86400);
105
-$hours=(int)($proc_uptime/3600);
106
-$hours=$hours % 24;
107
-$minutes=(int)($proc_uptime/60);
108
-$minutes=$minutes % 60;
109
-echo "<br ALIGN=RIGHT>The ".PROJECT. " main server has been continuously up for ". "$days"." days "."$hours"." hours "."$minutes"." minutes.\n<P>";
105
+$hours = (int)($proc_uptime/3600);
106
+$hours = $hours%24;
107
+$minutes = (int)($proc_uptime/60);
108
+$minutes = $minutes%60;
109
+echo "<br ALIGN=RIGHT>The ".PROJECT." main server has been continuously up for "."$days"." days "."$hours"." hours "."$minutes"." minutes.\n<P>";
110 110
 
111 111
 // tables side by side
112 112
 echo "<TABLE><TR><TD align=center> \n";
@@ -152,11 +152,11 @@  discard block
 block discarded – undo
152 152
 if ($dbrc) {
153 153
     echo "The database server is not accessable";
154 154
 } else {
155
-    $now=time(0);
156
-    $s_day=24*3600;
157
-    $d_ago=$now-$s_day;
158
-    $s_week=7*$s_day;
159
-    $w_ago=$now-$s_week;
155
+    $now = time(0);
156
+    $s_day = 24*3600;
157
+    $d_ago = $now - $s_day;
158
+    $s_week = 7*$s_day;
159
+    $w_ago = $now - $s_week;
160 160
 
161 161
     echo "
162 162
         <table border=2 cellpadding=6>
@@ -276,12 +276,12 @@  discard block
 block discarded – undo
276 276
         <tr><td>invalid</td><td>".number_format($n)."</td></tr>
277 277
     ";
278 278
 
279
-    $n = time(0)-find_oldest();
279
+    $n = time(0) - find_oldest();
280 280
     $days = (int)($n/86400);
281
-    $hours=(int)($n/3600);
282
-    $hours=$hours % 24;
283
-    $minutes=(int)($n/60);
284
-    $minutes=$minutes % 60;
281
+    $hours = (int)($n/3600);
282
+    $hours = $hours%24;
283
+    $minutes = (int)($n/60);
284
+    $minutes = $minutes%60;
285 285
     echo "
286 286
         <tr><td>Oldest Unsent Result</td><td>".$days." d ".$hours." h ".$minutes." m</td></tr>
287 287
     ";
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 
298 298
 // Display cgi-bin restriction status
299 299
 
300
-if (  file_exists("../../cgi-bin/.htaccess") ) {
300
+if (file_exists("../../cgi-bin/.htaccess")) {
301 301
     echo "<P><font color=RED>
302 302
         <b>The ".PROJECT." scheduler is currently restricted
303 303
 	  to uwm.edu and a few other domains.
Please login to merge, or discard this patch.
html/ops/db_update.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
     do_query("alter table host add max_results_day integer not null");
277 277
 }
278 278
 
279
-function update_4_20_2005(){
279
+function update_4_20_2005() {
280 280
     do_query("ALTER TABLE `thread` ADD `sticky` TINYINT UNSIGNED DEFAULT '0' NOT NULL");
281 281
     do_query("ALTER TABLE `forum` ADD `post_min_total_credit` INT NOT NULL AFTER `posts`");
282 282
     do_query("ALTER TABLE `forum` ADD `post_min_expavg_credit` INT NOT NULL AFTER `posts`");
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
     do_query("ALTER TABLE `forum_preferences` ADD `last_post` INT( 14 ) UNSIGNED NOT NULL AFTER `posts`");
287 287
 }
288 288
 
289
-function update_4_30_2005(){
289
+function update_4_30_2005() {
290 290
     do_query("ALTER TABLE `forum_preferences` ADD `ignore_sticky_posts` TINYINT( 1 ) UNSIGNED NOT NULL");
291 291
 }
292 292
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
     do_query("update user set country='Macedonia' where country='Macedonia, The Former Yugoslav Republic of'");
314 314
 }
315 315
 
316
-function update_11_24_2005(){
316
+function update_11_24_2005() {
317 317
     do_query("ALTER TABLE `forum_preferences` ADD `minimum_wrap_postcount` INT DEFAULT '100' NOT NULL AFTER `high_rating_threshold` ,
318 318
 ADD `display_wrap_postcount` INT DEFAULT '75' NOT NULL AFTER `minimum_wrap_postcount`");
319 319
 }
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
     ");
619 619
 }
620 620
 
621
-function update_10_05_2008(){
621
+function update_10_05_2008() {
622 622
     do_query("alter table forum_preferences add highlight_special tinyint default '1' not null");
623 623
 }
624 624
 
@@ -1244,7 +1244,7 @@  discard block
 block discarded – undo
1244 1244
 // This used to be the Subversion version#,
1245 1245
 // but with Git we just use sequential integers
1246 1246
 //
1247
-$db_updates = array (
1247
+$db_updates = array(
1248 1248
     array(18490, "update_6_16_2009"),
1249 1249
     array(19001, "update_9_3_2009"),
1250 1250
     array(20807, "update_3_5_2010"),
Please login to merge, or discard this patch.
html/ops/bbcode_convert_response2.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,15 +42,15 @@
 block discarded – undo
42 42
     $start_id = 0; //Set this to something else if you like
43 43
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
44 44
     echo _mysql_error();
45
-    $i=0;
46
-    while ($profile = _mysql_fetch_object($profiles)){
45
+    $i = 0;
46
+    while ($profile = _mysql_fetch_object($profiles)) {
47 47
         $i++;
48 48
         if ($i%100 == 0) {                      //For every 100 profiles
49
-            echo $profile->userid.". "; flush();   // print out where we are
49
+            echo $profile->userid.". "; flush(); // print out where we are
50 50
             //usleep(200000);
51 51
         }
52 52
 
53
-        if ($profile->userid > $start_id){
53
+        if ($profile->userid > $start_id) {
54 54
             fix_profile($profile);
55 55
         }
56 56
     }
Please login to merge, or discard this patch.
modules/boinc_solr_search/boinc_solr_comments/boinc_solr_comments.module 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -78,8 +78,8 @@  discard block
 block discarded – undo
78 78
   foreach ($documents as $document) {
79 79
     //dd($document, "index documents alter - document");
80 80
 
81
-    $to_process = ( array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle] );
82
-    if ( $document->entity_type=='node' AND $to_process) {
81
+    $to_process = (array_key_exists($document->bundle, $node_types) AND $node_types[$document->bundle]);
82
+    if ($document->entity_type == 'node' AND $to_process) {
83 83
 
84 84
       // Remove ts_comments if present.
85 85
       if (isset($document->ts_comments)) {
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         $comment_document->bundle = 'Comment';
111 111
         $comment_document->bundle_name = 'Comment';
112 112
 
113
-        $comment_document->path = 'goto/comment/' . $comment->cid;
113
+        $comment_document->path = 'goto/comment/'.$comment->cid;
114 114
         $comment_document->url = url($comment_document->path, $url_options);
115 115
 
116 116
         // Comment object has no language
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
         // Index formatted username so it can be searched and sorted
142 142
         // on.
143
-        $account = (object) array('uid' => $comment->uid, 'name' => $comment->name);
143
+        $account = (object)array('uid' => $comment->uid, 'name' => $comment->name);
144 144
         $username = check_plain($account->name);
145 145
         $comment_document->ss_name_formatted = $username;
146 146
         $comment_document->tos_name_formatted = $username;
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
           // Copy over fields [im_taxonomy_vid_1], [tid], [im_vid_1],
186 186
           // [im_vid_Forums], [tm_vid_1_names]
187
-          if ( ( preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName) ) AND is_array($fieldValue) ) {
187
+          if ((preg_match('/tid/', $fieldName) OR preg_match('/vid/', $fieldName)) AND is_array($fieldValue)) {
188 188
             foreach ($fieldValue as $subkey => $subvalue) {
189 189
               $comment_document->addField($fieldName, $subvalue);
190 190
             }
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
226 226
  */
227 227
 function boinc_solr_comments_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) {
228 228
   //dpm($query->getSolrParams(), "process_results query getSolrParams");
229
-  foreach($results as $id => $result) {
230
-    if ($result['entity_type']=='comment') {
229
+  foreach ($results as $id => $result) {
230
+    if ($result['entity_type'] == 'comment') {
231 231
         $results[$id]['type'] = 'Comment';
232 232
         $results[$id]['date'] = $result['fields']['changed'];
233 233
         if (isset($result['fields']['is_uid'])) {
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
  */
253 253
 function boinc_solr_comments_apachesolr_query_alter($query) {
254 254
   // Add custom field to query results
255
-  $query->addParam('fl','tos_content_extra');
255
+  $query->addParam('fl', 'tos_content_extra');
256 256
 }
257 257
 
258 258
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
   switch ($op) {
283 283
     case 'delete':
284 284
       // Only call delete function on certain node types
285
-      if (in_array( $node->type, $node_types)) {
285
+      if (in_array($node->type, $node_types)) {
286 286
         boinc_solr_comments_delete($node);
287 287
       }
288 288
       break;
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
   try {
315 315
     $solr = apachesolr_get_solr($env_id);
316 316
     // Custom query to find all comments with parent nid of the node bing deleted.
317
-    $query = "entity_type:comment AND tos_content_extra:" . $node->nid;
317
+    $query = "entity_type:comment AND tos_content_extra:".$node->nid;
318 318
     $solr->deleteByQuery($query);
319 319
     // Log the query used for deletion.
320 320
     watchdog('Apache Solr', 'Deleted documents from index with query @query', array('@query' => $query), WATCHDOG_INFO);
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
  */
400 400
 
401 401
 function boinc_solr_comments_enable() {
402
-  drupal_set_message( bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
402
+  drupal_set_message(bts('Warning: Your content <a href="@url">must be re-indexed</a> before Apache Solr will search comments.', array('@url' => url('admin/settings/apachesolr/index')), NULL, 'boinc:admin-solr-index-comments-message'), 'warning');
403 403
 }
404 404
 
405 405
 /**
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
  *   The comment to be published (unhidden).
411 411
  */
412 412
 function boinc_solr_comments_publish($comment) {
413
-  if ( ($comment->cid) AND ($comment->nid) ) {
413
+  if (($comment->cid) AND ($comment->nid)) {
414 414
     $node = node_load($comment->nid);
415 415
     // Tell Solr that the node has been updated, so the comment can be
416 416
     // indexed.
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
  *   The comment to be unpublished (hidden).
427 427
  */
428 428
 function boinc_solr_comments_unpublish($comment) {
429
-  if ( ($comment->cid) ) {
429
+  if (($comment->cid)) {
430 430
     // Call the deletecomment function for hook comment.
431 431
     boinc_solr_comments_deletecomment($comment);
432 432
   }
Please login to merge, or discard this patch.
drupal/sites/default/boinc/modules/boincuser/includes/boincuser.helpers.inc 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
       WHERE n.type = 'profile'
166 166
       AND n.status = 1
167 167
       AND n.moderate = 0
168
-      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '') . "
169
-      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '') . "
168
+      " . ($never_been_picked ? " AND bu.uotd_time = 0 " : '')."
169
+      " . ($active_users ? " AND bu.boinc_id IN ({$active_users}) " : '')."
170 170
       ORDER BY RAND()
171 171
       LIMIT 1"
172 172
     ));
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
  * this function is called, it may be called with optional parameters
213 213
  * new and prev email.
214 214
  */
215
-function _boincuser_send_emailchange($account, $new_email=NULL, $prev_email=NULL, $adminuser=FALSE) {
215
+function _boincuser_send_emailchange($account, $new_email = NULL, $prev_email = NULL, $adminuser = FALSE) {
216 216
   require_boinc('token');
217 217
   module_load_include('inc', 'rules', 'modules/system.rules');
218 218
 
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
     // Name is limited to 60 characters, but we want to leave space to add a
304 304
     // tally if needed (for users with duplicate names); Limit to 56 chars and
305 305
     // replace the middle of the string with "..." if too long
306
-    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length-56)+3);
306
+    $cleaned_name = substr_replace($cleaned_name, '...', 28, ($name_length - 56) + 3);
307 307
   }
308 308
 
309 309
   // Determine if there are duplicate names, if so append a number to end.
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
     // delimiters. Curly brace is not really allowed un URLs, but a
380 380
     // more robust function would first check for these curly braces
381 381
     // in the path_to_ignore patterms, just in case.
382
-    if (preg_match('{' . $pi . '}', $path)) {
382
+    if (preg_match('{'.$pi.'}', $path)) {
383 383
       return TRUE;
384 384
     }
385 385
   }
@@ -505,15 +505,15 @@  discard block
 block discarded – undo
505 505
   elseif (!in_array($_GET['q'], $page_blacklist)) {
506 506
     watchdog('boincuser', 'The BOINC scheduling server settings are not yet
507 507
         configured. Please !verify for the settings to become effective.',
508
-          array('!verify' => l(t('verify the default values') . ' <strong>' .
509
-            t('and') . '</strong> ' . t('save the configuration'),
508
+          array('!verify' => l(t('verify the default values').' <strong>'.
509
+            t('and').'</strong> '.t('save the configuration'),
510 510
             'admin/boinc/scheduler', array('html' => TRUE))
511 511
           ), WATCHDOG_WARNING);
512 512
     if (user_access('administer site configuration')) {
513 513
       drupal_set_message(t('The BOINC scheduling server settings are not yet
514 514
           configured. Please !verify for the settings to become effective',
515
-            array('!verify' => l(t('verify the default values') . ' <strong>' .
516
-              t('and') . '</strong> ' . t('save the configuration'),
515
+            array('!verify' => l(t('verify the default values').' <strong>'.
516
+              t('and').'</strong> '.t('save the configuration'),
517 517
               'admin/boinc/scheduler', array('html' => TRUE))
518 518
             )), 'warning', FALSE);
519 519
     }
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
  */
576 576
 function _boincuser_node_profile_delete_submit($form, &$form_state) {
577 577
   $node = $form['#node'];
578
-  $deleteurl = 'node/'. $node->nid .'/delete';
578
+  $deleteurl = 'node/'.$node->nid.'/delete';
579 579
   $afterq = 'destination=account';
580 580
   drupal_goto($deleteurl, $afterq);
581 581
 }
@@ -605,8 +605,8 @@  discard block
 block discarded – undo
605 605
   $view = views_get_current_view();
606 606
   $account_id = $view->args[0];
607 607
   $friend_count = flag_friend_get_friend_count($account_id);
608
-  return '<h2 class="pane-title">' . bts('Friends (@count)',
609
-    array('@count' => $friend_count)) . '</h2>';
608
+  return '<h2 class="pane-title">'.bts('Friends (@count)',
609
+    array('@count' => $friend_count)).'</h2>';
610 610
 }
611 611
 
612 612
 /**
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
   $result = db_query_range("SELECT id,name FROM {user} WHERE name LIKE '%s%'", $string, 0, 10);
620 620
   db_set_active('default');
621 621
   while ($user = db_fetch_object($result)) {
622
-      $matches[$user->name . '_' . $user->id] = htmlentities($user->name) . " (" . $user->id . ')';
622
+      $matches[$user->name.'_'.$user->id] = htmlentities($user->name)." (".$user->id.')';
623 623
   }
624 624
 
625 625
   drupal_json((object)$matches);
Please login to merge, or discard this patch.