BOINC / boinc

html/inc/sandbox.inc

Spacing +11 added lines, -11 removed lines

@@ -61,7 +61,7 @@ 
     foreach ($files as $file) {
         $path = "$dir/$file";
         [$err, $file_size, $file_md5] = sandbox_parse_link_file($path);
-        if (!$err){
+        if (!$err) {
             if (strcmp($md5, $file_md5) == 0) {
                 $exist = true;
                 $elf = $file;
@@ -124,7 +124,7 @@ 
     }
     $files = sandbox_file_names($user);
     foreach ($files as $f) {
-        if ($regexp && !preg_match("/$regexp/",$f)) continue;
+        if ($regexp && !preg_match("/$regexp/", $f)) continue;
         $x .= "<option value=\"$f\">$f</option>\n";
     }
     $x .= "</select>\n";
@@ -154,7 +154,7 @@ 
 // TODO: this is a kludge.
 // Should we use the job_file and batch_file_assoc tables instead?
 //
-function sandbox_file_in_use($user, $file){
+function sandbox_file_in_use($user, $file) {
     $ufiles = array();
 
     $pbatches = BoincBatch::enum(
@@ -164,16 +164,16 @@ 
     );
     if (!$pbatches) return false;
 
-    foreach ($pbatches as $batch){
-        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );
-        if ($wus == null){
+    foreach ($pbatches as $batch) {
+        $wus = BoincWorkUnit::enum("batch = $batch->id limit 1");
+        if ($wus == null) {
             continue;
         }
-        foreach($wus as $wu){
+        foreach ($wus as $wu) {
             $x = "<in>".$wu->xml_doc."</in>";
             $x = simplexml_load_string($x);
             global $fanout;
-            foreach($x->workunit->file_ref as $fr){
+            foreach ($x->workunit->file_ref as $fr) {
                 $pname = (string)$fr->file_name;
                 $ufiles[] = $pname;
             }
@@ -182,10 +182,10 @@ 
     $dir = sandbox_dir($user);
     $path = $dir."/".$file;
     list($err, $size, $md5) = sandbox_parse_link_file($path);
-    if (!$err){
+    if (!$err) {
         $f = sandbox_file_name($user, $md5);
-        foreach($ufiles as $uf) {
-            if (strcmp($f,$uf) == 0){
+        foreach ($ufiles as $uf) {
+            if (strcmp($f, $uf) == 0) {
                 return true;
             }
         }

html/user/submit_rpc_handler.php

Spacing +30 added lines, -30 removed lines

@@ -59,7 +59,7 @@ 
     if ($template) {
         $t = (double)$template->workunit->rsc_fpops_est;
     }
-    foreach($r->batch->job as $job) {
+    foreach ($r->batch->job as $job) {
         $y = (double)$job->rsc_fpops_est;
         if ($y) {
             $x += $y;
@@ -85,7 +85,7 @@ 
 function est_elapsed_time($r, $template) {
     // crude estimate: batch FLOPs / project FLOPS
     //
-    return batch_flop_count($r, $template) / project_flops();
+    return batch_flop_count($r, $template)/project_flops();
 }
 
 // if batch-level input template filename was given, read it;
@@ -95,9 +95,9 @@ 
 //
 function read_input_template($app, $r) {
     if ((isset($r->batch)) && (isset($r->batch->workunit_template_file)) && ($r->batch->workunit_template_file)) {
-        $path = project_dir() . "/templates/".$r->batch->workunit_template_file;
+        $path = project_dir()."/templates/".$r->batch->workunit_template_file;
     } else {
-        $path = project_dir() . "/templates/$app->name"."_in";
+        $path = project_dir()."/templates/$app->name"."_in";
     }
     if (file_exists($path)) {
         $x = simplexml_load_file($path);
@@ -142,7 +142,7 @@ 
 function validate_batch($jobs, $template) {
     $i = 0;
     $n = count($template->file_info);
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         $m = count($job->input_files);
         if ($n != $m) {
             log_write("wrong # of input files for job $i: need $n, got $m");
@@ -211,7 +211,7 @@ 
 // stage all the files
 //
 function stage_files(&$jobs, $user) {
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         foreach ($job->input_files as $file) {
             if ($file->mode != "remote") {
                 $file->name = stage_file($file, $user);
@@ -224,7 +224,7 @@ 
 //
 function submit_jobs(
     $jobs, $job_params, $app, $batch_id, $priority, $app_version_num,
-    $input_template_filename,        // batch-level; can also specify per job
+    $input_template_filename, // batch-level; can also specify per job
     $output_template_filename,
     $user
 ) {
@@ -234,7 +234,7 @@ 
     // one line per job
     //
     $x = "";
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         if ($job->name) {
             $x .= " --wu_name $job->name";
         }
@@ -269,7 +269,7 @@ 
         $x .= "\n";
     }
 
-    $cmd = "cd " . project_dir() . "; ./bin/create_work --appname $app->name --batch $batch_id";
+    $cmd = "cd ".project_dir()."; ./bin/create_work --appname $app->name --batch $batch_id";
 
     if ($user->seti_id) {
         $cmd .= " --target_user $user->id ";
@@ -377,7 +377,7 @@ 
 //
 function xml_get_jobs($r) {
     $jobs = array();
-    foreach($r->batch->job as $j) {
+    foreach ($r->batch->job as $j) {
         $job = new StdClass;
         $job->input_files = array();
         $job->command_line = (string)$j->command_line;
@@ -428,16 +428,16 @@ 
 //
 function logical_end_time($r, $jobs, $user, $app) {
     $total_flops = 0;
-    foreach($jobs as $job) {
+    foreach ($jobs as $job) {
         //print_r($job);
         if ($job->rsc_fpops_est) {
             $total_flops += $job->rsc_fpops_est;
         } else if ($job->input_template && $job->input_template->workunit->rsc_fpops_est) {
-            $total_flops += (double) $job->input_template->workunit->rsc_fpops_est;
+            $total_flops += (double)$job->input_template->workunit->rsc_fpops_est;
         } else if ($r->batch->job_params->rsc_fpops_est) {
-            $total_flops += (double) $r->batch->job_params->rsc_fpops_est;
+            $total_flops += (double)$r->batch->job_params->rsc_fpops_est;
         } else {
-            $x = (double) $template->workunit->rsc_fpops_est;
+            $x = (double)$template->workunit->rsc_fpops_est;
             if ($x) {
                 $total_flops += $x;
             } else {
@@ -445,7 +445,7 @@ 
             }
         }
     }
-    $cmd = "cd " . project_dir() . "/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
+    $cmd = "cd ".project_dir()."/bin; ./adjust_user_priority --user $user->id --flops $total_flops --app $app->name";
     $x = exec($cmd);
     if (!is_numeric($x) || (double)$x == 0) {
         xml_error(-1, "$cmd returned $x");
@@ -530,15 +530,15 @@ 
     }
 
     $job_params = new StdClass;
-    $job_params->rsc_disk_bound = (double) $r->batch->job_params->rsc_disk_bound;
-    $job_params->rsc_fpops_est = (double) $r->batch->job_params->rsc_fpops_est;
-    $job_params->rsc_fpops_bound = (double) $r->batch->job_params->rsc_fpops_bound;
-    $job_params->rsc_memory_bound = (double) $r->batch->job_params->rsc_memory_bound;
-    $job_params->delay_bound = (double) $r->batch->job_params->delay_bound;
+    $job_params->rsc_disk_bound = (double)$r->batch->job_params->rsc_disk_bound;
+    $job_params->rsc_fpops_est = (double)$r->batch->job_params->rsc_fpops_est;
+    $job_params->rsc_fpops_bound = (double)$r->batch->job_params->rsc_fpops_bound;
+    $job_params->rsc_memory_bound = (double)$r->batch->job_params->rsc_memory_bound;
+    $job_params->delay_bound = (double)$r->batch->job_params->delay_bound;
         // could add quorum-related stuff
 
-    $input_template_filename = (string) $r->batch->input_template_filename;
-    $output_template_filename = (string) $r->batch->output_template_filename;
+    $input_template_filename = (string)$r->batch->input_template_filename;
+    $output_template_filename = (string)$r->batch->output_template_filename;
         // possibly empty
 
     submit_jobs(
@@ -631,7 +631,7 @@ 
 }
 
 function n_outfiles($wu) {
-    $path = project_dir() . "/$wu->output_template_filename";
+    $path = project_dir()."/$wu->output_template_filename";
     $r = simplexml_load_file($path);
     return count($r->file_info);
 }
@@ -838,7 +838,7 @@ 
 ";
         if ($result->server_state == 5) {   // over?
             $paths = get_outfile_paths($result);
-            foreach($paths as $path) {
+            foreach ($paths as $path) {
                 if (is_file($path)) {
                     $size = filesize($path);
                     echo "        <outfile>
@@ -882,7 +882,7 @@ 
     } else {
         $results = BoincResult::enum("workunitid=$job_id");
         foreach ($results as $r) {
-            switch($r->outcome) {
+            switch ($r->outcome) {
             case 1:
             case 3:
             case 6:
@@ -997,8 +997,8 @@ 
     }
 
     list($user, $user_submit) = check_remote_submit_permissions($r, $app);
-    $in = file_get_contents(project_dir() . "/templates/".$app->name."_in");
-    $out = file_get_contents(project_dir() . "/templates/".$app->name."_out");
+    $in = file_get_contents(project_dir()."/templates/".$app->name."_in");
+    $out = file_get_contents(project_dir()."/templates/".$app->name."_out");
     if ($in === false || $out === false) {
         log_write("template file missing");
         xml_error(-1, "template file missing");
@@ -1010,7 +1010,7 @@ 
 
 function ping($r) {
     xml_start_tag("ping");
-    BoincDb::get();     // errors out if DB down or web disabled
+    BoincDb::get(); // errors out if DB down or web disabled
     echo "<success>1</success>
         </ping>
     ";
@@ -1077,9 +1077,9 @@ 
 $request_log = parse_config(get_config(), "<remote_submit_request_log>");
 if ($request_log) {
     $log_dir = parse_config(get_config(), "<log_dir>");
-    $request_log = $log_dir . "/" . $request_log;
+    $request_log = $log_dir."/".$request_log;
     if ($file = fopen($request_log, "a")) {
-        fwrite($file, "\n<submit_rpc_handler date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</submit_rpc_handler>\n");
+        fwrite($file, "\n<submit_rpc_handler date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</submit_rpc_handler>\n");
         fclose($file);
     }
 }

html/user/job_file.php

Spacing +10 added lines, -10 removed lines

@@ -79,7 +79,7 @@ 
 require_once("../inc/submit_util.inc");
 
 function upload_error_description($errno) {
-    switch($errno) {
+    switch ($errno) {
         case UPLOAD_ERR_INI_SIZE:
             return "The uploaded file exceeds upload_max_filesize of php.ini."; break;
         case UPLOAD_ERR_FORM_SIZE:
@@ -105,13 +105,13 @@ 
     $delete_time = (int)$r->delete_time;
     $batch_id = (int)$r->batch_id;
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    $phys_names= array();
-    foreach($r->phys_name as $f) {
+    $phys_names = array();
+    foreach ($r->phys_name as $f) {
         $phys_names[] = (string)$f;
     }
     $i = 0;
-    foreach($phys_names as $fname) {
-        $path = dir_hier_path($fname, project_dir() . "/download", $fanout);
+    foreach ($phys_names as $fname) {
+        $path = dir_hier_path($fname, project_dir()."/download", $fanout);
 
         // if the job_file record is there,
         // update the delete time first to avoid race condition
@@ -218,11 +218,11 @@ 
     foreach ($_FILES as $f) {
         $tmp_name = $f['tmp_name'];
         $fname = $phys_names[$i];
-        $path = dir_hier_path($fname, project_dir() . "/download", $fanout);
+        $path = dir_hier_path($fname, project_dir()."/download", $fanout);
 
         // see if file is in download hierarchy
         //
-        switch(check_download_file($tmp_name, $path)) {
+        switch (check_download_file($tmp_name, $path)) {
         case 0:
             // file is already there
             // note: check_download_file() generates .md5 in cases 1 and 2
@@ -277,10 +277,10 @@ 
 if ($request_log) {
     $request_log_dir = parse_config(get_config(), "<log_dir>");
     if ($request_log_dir) {
-        $request_log = $request_log_dir . "/" . $request_log;
+        $request_log = $request_log_dir."/".$request_log;
     }
     if ($file = fopen($request_log, "a+")) {
-        fwrite($file, "\n<job_file date=\"" . date(DATE_ATOM) . "\">\n" . $_POST['request'] . "\n</job_file>\n");
+        fwrite($file, "\n<job_file date=\"".date(DATE_ATOM)."\">\n".$_POST['request']."\n</job_file>\n");
         fclose($file);
     }
 }
@@ -292,7 +292,7 @@ 
     xml_error(-1, "can't parse request message: $req", __FILE__, __LINE__);
 }
 
-switch($r->getName()) {
+switch ($r->getName()) {
 case 'query_files':
     query_files($r);
     break;

drupal/sites/default/boinc/modules/boincuser/boincuser.module

Spacing +120 added lines, -120 removed lines

@@ -189,7 +189,7 @@ 
     'type' => MENU_CALLBACK
   );
   $items['account_finish.php'] = array(
-    'title' => 'Welcome to ' . variable_get('site_name', 'Drupal-BOINC'),
+    'title' => 'Welcome to '.variable_get('site_name', 'Drupal-BOINC'),
     'description' => 'RPC for after a user has created an account.',
     'page callback' => 'boincuser_account_finish',
     'access callback' => TRUE,
@@ -249,8 +249,8 @@ 
   // termsofuse is enabled, by having text in the termsofuse variable.
   $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
   $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-  if ( (!empty($termsofuse)) and ($user->uid) ) {
-    if ( !boincuser_check_termsofuse($user) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($user->uid)) {
+    if (!boincuser_check_termsofuse($user) and ($existinguser_tou)) {
 
       // Admins are exempt, otherwise the admin may not be able to
       // access the site!
@@ -264,14 +264,14 @@ 
           'user/termsofuse',
           'logout',
           'account/info/edit',
-          'user/' . $user->uid . '/edit',
-          'user/' . $user->uid . '/recoveremail/*',
+          'user/'.$user->uid.'/edit',
+          'user/'.$user->uid.'/recoveremail/*',
           'recover_email.php',
         );
         if (module_exists('boincuser_delete')) {
-          $paths0[] = 'user/' . $user->uid . '/delete';
-          $paths0[] = 'user/' . $user->uid . '/deleteconfirm/*';
-          $paths0[] = 'user/' . $user->uid . '/odeleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/delete';
+          $paths0[] = 'user/'.$user->uid.'/deleteconfirm/*';
+          $paths0[] = 'user/'.$user->uid.'/odeleteconfirm/*';
         }
 
         // Paths added by the admin
@@ -282,7 +282,7 @@ 
         }
 
         // paths to ignore
-        $paths_to_ignore = array_unique( array_merge($paths0, $paths2) );
+        $paths_to_ignore = array_unique(array_merge($paths0, $paths2));
 
         if (!_boincuser_ignore_paths($path, $paths_to_ignore)) {
           drupal_goto('user/termsofuse');
@@ -304,7 +304,7 @@ 
   require_boinc('password_compat/password');
   // Handle BOINC integration for users with UID > 1 (skip anonymous and admin)
   if (isset($account->uid) && ($account->uid > 1)) {
-    switch($op) {
+    switch ($op) {
     case 'load':
       // User loading; insert BOINC data into the user object
       $drupal_user = db_fetch_object(db_query("
@@ -334,11 +334,11 @@ 
       ));
       $account->boincuser_name = $boinc_user->name;
       $account->boincuser_account_key = $boinc_user->authenticator;
-      $account->boincuser_weak_auth = md5($boinc_user->authenticator . $boinc_user->passwd_hash);
+      $account->boincuser_weak_auth = md5($boinc_user->authenticator.$boinc_user->passwd_hash);
       $account->boincuser_total_credit = round($boinc_user->total_credit);
       $account->boincuser_expavg_credit = round($boinc_user->expavg_credit);
       $account->boincuser_expavg_time = round($boinc_user->expavg_time);
-      $account->boincuser_cpid = md5($boinc_user->cross_project_id . $account->mail);
+      $account->boincuser_cpid = md5($boinc_user->cross_project_id.$account->mail);
       $account->boincuser_default_pref_set = $boinc_user->venue;
       $account->boincteam_id = $boinc_user->teamid;
       $account->boincuser_previous_email_addr = $boinc_user->previous_email_addr;
@@ -507,7 +507,7 @@ 
 
             // Set password hash appropriately
             $passwd = ($edit['pass']) ? $edit['pass'] : $edit['current_pass'];
-            $passwd_hash = password_hash( md5($passwd.$lower_email_addr), PASSWORD_DEFAULT );
+            $passwd_hash = password_hash(md5($passwd.$lower_email_addr), PASSWORD_DEFAULT);
             // Algorithm for changing email and/or password
             if ($changing_email) {
               // locally store current email to set as previous email
@@ -595,8 +595,8 @@ 
   }
 
   // Check if user has agreed to terms of use.
-  if ( (!empty($termsofuse)) and ($account->uid) and
-       (!boincuser_check_termsofuse($account)) and ($existinguser_tou) ) {
+  if ((!empty($termsofuse)) and ($account->uid) and
+       (!boincuser_check_termsofuse($account)) and ($existinguser_tou)) {
 
     // Admins are exempted.
     $administrator_role = array_search('administrator', user_roles(true));
@@ -610,9 +610,9 @@ 
       $query_for_destination = '';
       $prevdest = $_REQUEST['destination'];
       if ($prevdest) {
-        $query_for_destination = '?destination=' . $prevdest;
+        $query_for_destination = '?destination='.$prevdest;
       }
-      $_REQUEST['destination'] = $path_for_destination . $query_for_destination;
+      $_REQUEST['destination'] = $path_for_destination.$query_for_destination;
 
     }
   }
@@ -645,7 +645,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'update':
     boincuser_node_update($node);
   }
@@ -656,7 +656,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincuser_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'profile':
     // Update the BOINC database directly
     $account = user_load($node->uid);
@@ -778,7 +778,7 @@ 
     }
 
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_dest).'</li>',
       '#weight' => 1004,
     );
     $form['form control tabs suffix'] = array(
@@ -811,7 +811,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -843,7 +843,7 @@ 
     $form['actions']['submit']['#suffix'] = '</li>';
     $form['actions']['submit']['#weight'] = 1002;
     $form['actions']['cancel'] = array(
-        '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}") . '</li>',
+        '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "node/{$form['nid']['#value']}").'</li>',
       '#weight' => 1005,
     );
     $form['actions']['form control tabs suffix'] = array(
@@ -870,7 +870,7 @@ 
     $form['privatemsg']['preview']['#suffix'] = '</li>';
     $form['privatemsg']['preview']['#weight'] = 1003;
     $form['privatemsg']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1004,
     );
     $form['privatemsg']['form control tabs suffix'] = array(
@@ -958,11 +958,11 @@ 
     // Set special message if user has not agreed to TOU
     $existinguser_tou = variable_get('boinc_weboptions_existinguser_tou', FALSE);
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
-    if ( (!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users')) ) {
+    if ((!boincuser_check_termsofuse($account)) and ($existinguser_tou) and (!empty($termsofuse)) and (!user_access('administer users'))) {
       drupal_set_message(
         bts('INFO: You have not agreed to the terms of use for @project. You may use this form to change your email address and/or password. Please note: you may not delete your account within seven (7) days of changing your email address.',
         array(
-          '@project' => variable_get('site_name','Drupal-BOINC'),
+          '@project' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:account-credentials-change')
       , 'info');
     }
@@ -1027,36 +1027,36 @@ 
     $form['account']['boincuser_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_id . '</span>
+          <label>' . bts('BOINC user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_id.'</span>
         </div>',
     );
     $form['account']['user_id'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->uid . '</span>
+          <label>' . bts('Drupal user ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->uid.'</span>
         </div>',
     );
     $form['account']['account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_account_key . '</span>
+          <label>' . bts('Account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_account_key.'</span>
         </div>',
     );
     $form['account']['weak_account_key'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}" . '</span>
+          <label>' . bts('Weak account key', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . "{$account->boincuser_id}_{$account->boincuser_weak_auth}".'</span>
         </div>',
     );
     $form['account']['cpid'] = array(
       '#value' => '
         <div class="form-item">
-          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change') . '</label>
-          <span>' . $account->boincuser_cpid . '</span>
+          <label>' . bts('Cross-project ID', array(), NULL, 'boinc:account-credentials-change').'</label>
+          <span>' . $account->boincuser_cpid.'</span>
         </div>',
     );
 
@@ -1074,7 +1074,7 @@ 
     $form['submit']['#suffix'] = '</li>';
     $form['submit']['#weight'] = 1002;
     $form['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1003,
     );
     if (isset($form['delete']) AND is_array($form['delete'])) {
@@ -1170,7 +1170,7 @@ 
     $form['buttons']['preview_changes']['#suffix'] = '</li>';
     $form['buttons']['preview_changes']['#weight'] = 1004;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $_GET['q']).'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['delete']['#prefix'] = '<li class="tab">';
@@ -1219,11 +1219,11 @@ 
     // Set name temporarily to dummy value to beat validation
     $form['name'] = array(
       '#type' => 'hidden',
-      '#value' => rand() . '.' . time()
+      '#value' => rand().'.'.time()
     );
 
     // Add JS for submit button disabling
-    drupal_add_js(drupal_get_path('module', 'boincuser') . '/boincuser.js');
+    drupal_add_js(drupal_get_path('module', 'boincuser').'/boincuser.js');
 
     // Terms of use section
     $termsofuse = variable_get('boinc_weboptions_termsofuse', '');
@@ -1239,7 +1239,7 @@ 
 
       $form['termsofuse']['title1'] = array(
         '#weight' => -12,
-        '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register' ) . '</h2>',
+        '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'), array(), NULL, 'project:user-register').'</h2>',
         '#prefix' => '<div id="register-title1">',
         '#suffix' => '</div>',
       );
@@ -1262,7 +1262,7 @@ 
 
     $form['title2'] = array(
       '#weight' => -6,
-      '#value' => '<h2>' . bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register') . '</h2>',
+      '#value' => '<h2>'.bts(variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'), array(), NULL, 'project:user-register').'</h2>',
       '#prefix' => '<div id="register-title2">',
       '#suffix' => '</div>',
     );
@@ -1326,7 +1326,7 @@ 
     $form['buttons']['submit']['#suffix'] = '</li>';
     $form['buttons']['submit']['#weight'] = 1002;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login') . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), 'user/login').'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -1408,7 +1408,7 @@ 
  */
 function boincuser_token_list($type = 'all') {
   if ($type == 'user' || $type == 'all') {
-    $tokens['user']['display-name']      = t("The user's name that should be displayed");
+    $tokens['user']['display-name'] = t("The user's name that should be displayed");
     return $tokens;
   }
 }
@@ -1420,9 +1420,9 @@ 
   if ($view->args) {
     $account_id = $view->args[0];
   }
-  if ($view->name=="user_activity") {
+  if ($view->name == "user_activity") {
     // Run the following custom query for the user_activity view
-    $view->build_info['query']= "
+    $view->build_info['query'] = "
       SELECT node_revisions.vid AS vid,
         node.nid AS node_nid,
         node.uid AS users_node_uid,
@@ -1462,13 +1462,13 @@ 
   // Delete expired users in the BOINC database, user_delete table.
   require_boinc('boinc_db');
   $num_deleted = BoincUserDeleted::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boincuser', "Deleted ${num_deleted} users from user_deleted table", WATCHDOG_NOTICE);
   }
 
   // Delete expired tokens from token table
   $tokens_deleted = BoincToken::delete_expired();
-  if ($tokens_deleted>0) {
+  if ($tokens_deleted > 0) {
     watchdog('boincuser', "Deleted ${tokens_deleted} tokens from token table", WATCHDOG_NOTICE);
   }
 }
@@ -1553,38 +1553,38 @@ 
   case 'boinc':
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
+    $output .= '  <li>'.bts("Install BOINC on this device if not already present.", array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts("Select <i>Tools / Add Project</i>. Choose @sitename from the list, or enter @siteurl.",
     array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
+    ), NULL, 'boinc:join-page').'</li>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
+      $output .= '<li>'.bts("If you're running a command-line or pre-5.0 version of BOINC, use <b>!boinccmd</b> to add the project.",
         array(
           '!boinccmd' => l('boinccmd --project_attach', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
     else {
-      $output .= '<li>' . bts("If you're running a command-line version of BOINC,
+      $output .= '<li>'.bts("If you're running a command-line version of BOINC,
         please follow the <b>!instructionslink</b> to first <i>create an account</i>, and then <i>attach</i> to this project. Use the same project URL as above.",
         array(
           '!instructionslink' => l('instructions', 'http://boinc.berkeley.edu/wiki/Boinccmd_tool'),
-        ), NULL, 'boinc:join-page') . '</li>';
+        ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '<li>' . bts("If you're running a pre-5.0 version of BOINC, please
+    $output .= '<li>'.bts("If you're running a pre-5.0 version of BOINC, please
       upgrade to a more recent version of BOINC to create an account
       at @this_project.",
       array(
         '@this_project' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+      ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
     break;
   case 'new':
   default:
@@ -1596,37 +1596,37 @@ 
     //  $ruleslink = drupal_lookup_path('source', $ruleslinkB);
     //}
 
-    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', '') );
+    $ruleslink = drupal_lookup_path('source', variable_get('boinc_weboptions_rulespolicies', ''));
 
     // Join page output
     $output .= '<ol>';
     if ($registration_enabled) {
-      $output .= '<li>' . bts('First !create_an_account here at @sitename.',
+      $output .= '<li>'.bts('First !create_an_account here at @sitename.',
       array(
         '!create_an_account' => l(bts('create an account', array(), NULL, 'boinc:join-page'), 'user/registration'),
         '@sitename' => $site_name,
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    else if ( menu_valid_path(array('link_path' => $ruleslink)) ) {
-      $output .= '  <li>' . bts("Read our !rules_and_policies.", array(
+    else if (menu_valid_path(array('link_path' => $ruleslink))) {
+      $output .= '  <li>'.bts("Read our !rules_and_policies.", array(
         '!rules_and_policies' => l(bts('Rules and Policies', array(), NULL, 'boinc:join-page'), $ruleslink),
-      ), NULL, 'boinc:join-page') . '</li>';
+      ), NULL, 'boinc:join-page').'</li>';
     }
-    $output .= '  <li>' . bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
+    $output .= '  <li>'.bts('Download the BOINC desktop software.', array(), NULL, 'boinc:join-page');
     $output .= '    <p>';
     $output .= '      <a class="button" href="http://boinc.berkeley.edu/download.php">Download</a>';
     $output .= '    </p>';
-    $output .= '    ' . bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
+    $output .= '    '.bts("For Android devices, visit !fdroid_link or download !apk_link directly.", array(
       '!fdroid_link' => '<a href="https://f-droid.org/en/packages/edu.berkeley.boinc">F-Droid</a>',
       '!apk_link' => '<a href="https://boinc.berkeley.edu/download_all.php">BOINC for Android</a>',
     ), NULL, 'boinc:join-page');
     $output .= '  </li>';
-    $output .= '  <li>' . bts('Run the installer.', array(), NULL, 'boinc:join-page') . '</li>';
-    $output .= '  <li>' . bts('Choose @sitename from the list, or enter @siteurl.', array(
+    $output .= '  <li>'.bts('Run the installer.', array(), NULL, 'boinc:join-page').'</li>';
+    $output .= '  <li>'.bts('Choose @sitename from the list, or enter @siteurl.', array(
       '@sitename' => $site_name,
       '@siteurl' => $base_url,
-    ), NULL, 'boinc:join-page') . '</li>';
-    $output .=  '</ol>';
+    ), NULL, 'boinc:join-page').'</li>';
+    $output .= '</ol>';
   }
   $output .= '</div>';
   return $output;
@@ -1639,7 +1639,7 @@ 
   global $user;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
   // get the front page message from database; this is set in the admin interface under BOINC Other
-  $site_message = variable_get('boinc_other_frontpage','');
+  $site_message = variable_get('boinc_other_frontpage', '');
 
   // Determine the user of the day
   $current_uotd = db_fetch_object(db_query("
@@ -1661,30 +1661,30 @@ 
   $output .= ($user->uid) ? bts('Welcome back!', array(), NULL, 'boinc:front-page') : ($site_name ? bts('What is @this_project?', array('@this_project' => $site_name)) : bts('Welcome!', array(), NULL, 'boinc:front-page'));
   $output .= '</h2>';
   $output .= '<div class="boinc-overview balance-height-front">';
-  $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about') . '</div>';
+  $output .= '  <div>'.bts($site_message, array(), NULL, "project:front page").' '.l(bts('Learn more', array(), NULL, 'boinc:front-page'), 'about').'</div>';
   if ($user->uid) {
-    $output .= '  <div>' . l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('View account', array(), NULL, 'boinc:front-page'), 'dashboard', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   else {
-    $output .= '  <div>' . l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
+    $output .= '  <div>'.l(bts('Join now', array(), NULL, 'boinc:front-page'), 'join', array('attributes' => array('class' => 'join button'))).'</div>';
   }
   $output .= '</div>';
   $output .= '<div class="boinc-overview-details">';
   $output .= '  <div class="detail-container">';
-  $output .= '    <a class="user-of-the-day" href="account/' . $uotd->uid . '">';
+  $output .= '    <a class="user-of-the-day" href="account/'.$uotd->uid.'">';
   $output .= '      <div class="picture">';
   $output .= theme('imagefield_image', $uotd_image['image'], $uotd_image['alt'],
     $uotd_image['alt'], array(), FALSE);
   $output .= '      </div>';
-  $output .= '      <div class="text">' . bts('User of the day', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '      <div class="detail">' . $uotd->boincuser_name . '</div>';
+  $output .= '      <div class="text">'.bts('User of the day', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '      <div class="detail">'.$uotd->boincuser_name.'</div>';
   $output .= '    </a>';
   $output .= '    <div class="volunteers">';
-  $output .= '      <div class="text">' . bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '      <div class="text">'.bts('Over 500,000 volunteers and counting.', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      <div class="platforms">';
-  $output .= '        <div class="detail platform windows">' . bts('Windows', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform mac">' .  bts('Mac', array(), NULL, 'boinc:front-page') . '</div>';
-  $output .= '        <div class="detail platform linux">' . bts('Linux', array(), NULL, 'boinc:front-page') . '</div>';
+  $output .= '        <div class="detail platform windows">'.bts('Windows', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform mac">'.bts('Mac', array(), NULL, 'boinc:front-page').'</div>';
+  $output .= '        <div class="detail platform linux">'.bts('Linux', array(), NULL, 'boinc:front-page').'</div>';
   $output .= '      </div>';
   $output .= '    </div>';
   $output .= '  </div>';
@@ -1715,7 +1715,7 @@ 
   $enablethisRPC = variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE);
   if (!$enablethisRPC) {
     $mess = bts('Account creation is done through our Web site. Please register at @url', array(
-      '@url' => $base_url . '/user/registration',
+      '@url' => $base_url.'/user/registration',
     ),
     NULL, 'boinc:create_account');
     xml_error(-208, $mess);
@@ -1747,8 +1747,8 @@ 
   $boinc_user = BoincUser::lookup_email_addr($params['email_addr']);
   if ($boinc_user) {
     // Return authenticator for existing users
-    if ( ($params['passwd_hash'] == $boinc_user->passwd_hash) or
-    password_verify($params['passwd_hash'], $boinc_user->passwd_hash) ) {
+    if (($params['passwd_hash'] == $boinc_user->passwd_hash) or
+    password_verify($params['passwd_hash'], $boinc_user->passwd_hash)) {
       $output = array('authenticator' => $boinc_user->authenticator);
     }
     else {
@@ -1804,7 +1804,7 @@ 
   // Ensure there is a authentication token before continuing
   if (empty($authtoken)) {
     drupal_not_found();
-    return ;
+    return;
   }
 
   if (strlen($authtoken) != 32) {
@@ -1826,8 +1826,8 @@ 
   }
 
   // Lookup path to custom account finish page
-  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', '') );
-  if ( menu_valid_path(array('link_path' => $customaccountfinishpath)) ) {
+  $customaccountfinishpath = drupal_lookup_path('source', variable_get('boinc_weboptions_accountfinish', ''));
+  if (menu_valid_path(array('link_path' => $customaccountfinishpath))) {
     $node = menu_get_object('node', 1, $customaccountfinishpath);
     if ($node) {
       return node_page_view($node);
@@ -1836,12 +1836,12 @@ 
 
   // open links in new window
   $options = array(
-    'attributes' => array( 'target' => '_blank' ),
+    'attributes' => array('target' => '_blank'),
   );
 
   // Check moderation page exists
-  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', '') );
-  if ( menu_valid_path(array('link_path' => $moderationpath)) ) {
+  $moderationpath = drupal_lookup_path('source', variable_get('boinc_weboptions_moderationpage', ''));
+  if (menu_valid_path(array('link_path' => $moderationpath))) {
     $modsentence = bts('Please note: user profiles are subject to !moderation.', array('!moderation' => l(bts('moderation', array(), NULL, 'boinc:account-finish'), $moderationpath, $options)), NULL, 'boinc:account-finish');
   } else {
     $modsentence = bts('Please note: user profiles are subject to moderation.', array(), NULL, 'boinc:account-finish');
@@ -1849,11 +1849,11 @@ 
 
   $username = $user->boincuser_name;
   $site_name = variable_get('site_name', 'Drupal-BOINC');
-  $output = "<p>" . bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
+  $output = "<p>".bts('Thank you @user_name for joining @site_name. Your account has been created. Your BOINC client should start working on assigned tasks soon, without any additional action or configuration. Please visit the links below for more information and additional options. (Links will open in a new window.)',
   array(
     '@user_name' => $username,
     '@site_name' => $site_name,
-  ), NULL, 'boinc:account-finish') . "</p>";
+  ), NULL, 'boinc:account-finish')."</p>";
 
   $links = array(
     array(
@@ -1919,7 +1919,7 @@ 
   );
 
   //List of links
-  $output .= theme_item_list($links, $title = NULL, $type='ul');
+  $output .= theme_item_list($links, $title = NULL, $type = 'ul');
 
   return $output;
 }
@@ -2036,7 +2036,7 @@ 
     global $base_url;
     global $base_path;
     $site_name = variable_get('site_name', 'Drupal-BOINC');
-    $site_url = $base_url . $base_path;
+    $site_url = $base_url.$base_path;
     $moderator = user_load($user->uid);
     $profile->moderate = 0;
     $profile->status = 0;
@@ -2097,7 +2097,7 @@ 
       global $base_url;
       global $base_path;
       $site_name = variable_get('site_name', 'Drupal-BOINC');
-      $site_url = $base_url . $base_path;
+      $site_url = $base_url.$base_path;
       $moderator = user_load($user->uid);
       $settings = array(
         'from' => '',
@@ -2201,25 +2201,25 @@ 
   if (!$projects) return bts('no projects...', array(), NULL, 'boinc:account-dashboard');
 
   $output = '';
-  $output .= '<table class="user-projects">' . "\n";
-  $output .= '<thead>' . "\n";
-  $output .= '  <tr>' . "\n";
-  $output .= '    <th>' . bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Avg credit', array(), NULL, 'boinc:account-dashboard') . '</th>' . "\n";
-  $output .= '    <th class="numeric">' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . '</th>' . "\n";
-  $output .= '  </tr>' . "\n";
-  $output .= '</thead>' . "\n";
-  $output .= '<tbody>' . "\n";
+  $output .= '<table class="user-projects">'."\n";
+  $output .= '<thead>'."\n";
+  $output .= '  <tr>'."\n";
+  $output .= '    <th>'.bts('Name', array(), NULL, 'boinc:project-name:-1:ignoreoverwrite').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Avg credit', array(), NULL, 'boinc:account-dashboard').'</th>'."\n";
+  $output .= '    <th class="numeric">'.bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits').'</th>'."\n";
+  $output .= '  </tr>'."\n";
+  $output .= '</thead>'."\n";
+  $output .= '<tbody>'."\n";
   foreach ($projects AS $project) {
-    $url = rtrim($project->url, '/') . '/show_user.php?userid=' . $project->id;
-    $output .= '  <tr>' . "\n";
-    $output .= '    <td>' . l($project->name, $url) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->expavg_credit) . '</td>' . "\n";
-    $output .= '    <td class="numeric">' . boincwork_format_stats((float) $project->total_credit) . '</td>' . "\n";
-    $output .= '  </tr>' . "\n";
+    $url = rtrim($project->url, '/').'/show_user.php?userid='.$project->id;
+    $output .= '  <tr>'."\n";
+    $output .= '    <td>'.l($project->name, $url).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->expavg_credit).'</td>'."\n";
+    $output .= '    <td class="numeric">'.boincwork_format_stats((float)$project->total_credit).'</td>'."\n";
+    $output .= '  </tr>'."\n";
   }
-  $output .= '</tbody>' . "\n";
-  $output .= '</table>' . "\n";
+  $output .= '</tbody>'."\n";
+  $output .= '</table>'."\n";
   $more_link = ($account) ? "user/{$account->uid}/stats" : 'account/stats';
   //$output .= "<div class=\"more-link\"><a href=\"{$more_link}\">More stats</a></div>" . "\n";
   return $output;
@@ -2239,8 +2239,8 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
-  $query = '?' . implode('&', $args);
+  foreach ($get as $arg => $value) $args[] = "{$arg}=".rawurlencode($value);
+  $query = '?'.implode('&', $args);
 
   // Load XML from RPC
   $target_url = "http://{$stats_server}/{$stats_rpc}{$query}";
@@ -2312,12 +2312,12 @@ 
     $output .= '<ul class="tab-list">';
     $count = 0;
     foreach ($links as $key => $link) {
-      $output .= '<li class="' . (($count == 0) ? 'first primary ' : '') . 'tab">';
+      $output .= '<li class="'.(($count == 0) ? 'first primary ' : '').'tab">';
       $output .= l($link['title'], $link['href'], array('query' => drupal_get_destination()));
       $output .= '</li>';
       $count++;
     }
-    $output .= '<li class="' . (($count) ? '' : 'first ') . 'last tab">' . flag_create_link('abuse_user_meta', $account->uid) . '</li>';
+    $output .= '<li class="'.(($count) ? '' : 'first ').'last tab">'.flag_create_link('abuse_user_meta', $account->uid).'</li>';
     $output .= '</ul>';
   }
   return $output;
@@ -2358,7 +2358,7 @@ 
 function boincuser_apachesolr_index_documents_alter(array &$documents, $entity, $entity_type, $env_id) {
 
   foreach ($documents as $document) {
-    if ( $document->entity_type=='node' AND $document->bundle=='profile' ) {
+    if ($document->entity_type == 'node' AND $document->bundle == 'profile') {
       // Node information.
       $nid = $document->entity_id;
       $node = node_load($nid);
@@ -2408,11 +2408,11 @@ 
   // privatemsg module. We need to convert them back to spaces for the
   // check below.
   $boincname = preg_replace("/\\xc2\\xa0/", " ", $boincname);
-  if ($drupalid>0) {
+  if ($drupalid > 0) {
     if ($recipient = user_load(array('uid' => $drupalid))) {
       // Double-check that the loaded user matches both boincuser_id
       // and boincuser_name.
-      if ( ($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name) ) {
+      if (($boincid == $recipient->boincuser_id) AND ($boincname == $recipient->boincuser_name)) {
         return $recipient;
       }
     }

html/inc/bootstrap.inc

Spacing +20 added lines, -20 removed lines

@@ -141,12 +141,12 @@ 
         // prefix for links; needed for pages not in top dir
     $user,
         // logged-in user, if any
-    $fixed=false,
+    $fixed = false,
         // if true, navbar is fixed at top of page.
         // NOTE: if you do this, you must set a global var $fixed_navbar
         // to true at compile time
         // (it needs to be set when page_head() is called).
-    $inverse=false
+    $inverse = false
         // white on black?
 ) {
     global $master_url;
@@ -215,7 +215,7 @@ 
 // output a panel.
 // $content_func is a function that generates the panel contents
 //
-function panel($title, $content_func, $class="panel-primary", $body_class="") {
+function panel($title, $content_func, $class = "panel-primary", $body_class = "") {
     echo sprintf('<div class="panel %s">
         ', $class
     );
@@ -242,7 +242,7 @@ 
 // $left_width is the width of left column in 1/12 units.
 // $arg is passed to the functions.
 //
-function grid($top_func, $left_func, $right_func, $left_width=6, $arg=null) {
+function grid($top_func, $left_func, $right_func, $left_width = 6, $arg = null) {
     echo '
         <div class="container-fluid">
     ';
@@ -257,7 +257,7 @@ 
             </div>
         ';
     }
-    $right_width = 12-$left_width;
+    $right_width = 12 - $left_width;
     echo '
         <div class="row">
         <div class="col-sm-'.$left_width.'">
@@ -281,7 +281,7 @@ 
 //      use extra = "name=x"
 //      call forum_focus(x, foo) after defining the field
 //
-function form_start($action, $method='get', $extra='') {
+function form_start($action, $method = 'get', $extra = '') {
     echo sprintf(
         '<div class="container-fluid">
         <form class="form-horizontal" method="%s" action="%s" %s>'
@@ -313,7 +313,7 @@ 
 // just the input field
 //
 function form_input_text_field(
-    $name, $value='', $type='text', $attrs='', $extra=''
+    $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     return sprintf(
         '<input %s type="%s" class="form-control" name="%s" value="%s">%s',
@@ -324,7 +324,7 @@ 
 // the whole row
 //
 function form_input_text(
-    $label, $name, $value='', $type='text', $attrs='', $extra=''
+    $label, $name, $value = '', $type = 'text', $attrs = '', $extra = ''
 ) {
     echo sprintf('
         <div class="form-group">
@@ -352,7 +352,7 @@ 
     );
 }
 
-function form_input_textarea($label, $name, $value='', $nrows=4) {
+function form_input_textarea($label, $name, $value = '', $nrows = 4) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -368,7 +368,7 @@ 
 
 // $items is either a string of <option> elements, or an array
 //
-function form_select($label, $name, $items, $selected=null) {
+function form_select($label, $name, $items, $selected = null) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -381,7 +381,7 @@ 
         foreach ($items as $i) {
             echo sprintf(
                 '<option %s value=%s>%s</option>',
-                ($i[0]==$selected)?'selected':'',
+                ($i[0] == $selected) ? 'selected' : '',
                 $i[0], $i[1]
             );
         }
@@ -394,7 +394,7 @@ 
 // same, for multiple select.
 // $selected, if non-null, is a list of selected values
 //
-function form_select_multiple($label, $name, $items, $selected=null) {
+function form_select_multiple($label, $name, $items, $selected = null) {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s" for="%s">%s</label>
@@ -406,7 +406,7 @@ 
     foreach ($items as $i) {
         echo sprintf(
             '<option %s value=%s>%s</option>',
-            ($selected && in_array($i[0], $selected))?'selected':'',
+            ($selected && in_array($i[0], $selected)) ? 'selected' : '',
             $i[0], $i[1]
         );
     }
@@ -415,12 +415,12 @@ 
 
 // return a list of string for checkbox items
 //
-function checkbox_item_strings($items, $attrs='') {
+function checkbox_item_strings($items, $attrs = '') {
     $x = [];
     foreach ($items as $i) {
         $x[] = sprintf('<input %s type="checkbox" name="%s" %s> %s
             ',
-            $attrs, $i[0], $i[2]?"checked":"", $i[1]
+            $attrs, $i[0], $i[2] ? "checked" : "", $i[1]
         );
     }
     return $x;
@@ -428,7 +428,7 @@ 
 
 // $items is list of (name, label, checked)
 //
-function form_checkboxes($label, $items, $attrs='') {
+function form_checkboxes($label, $items, $attrs = '') {
     echo sprintf('
         <div class="form-group">
             <label align=right class="%s">%s</label>
@@ -454,7 +454,7 @@ 
         FORM_LEFT_CLASS, $label, FORM_RIGHT_CLASS
     );
     foreach ($items as $i) {
-        $checked = ($selected == $i[0])?"checked":"";
+        $checked = ($selected == $i[0]) ? "checked" : "";
         echo sprintf('<input type="radio" name="%s" value="%s" %s> %s <br>
             ',
             $name, $i[0], $checked, $i[1]
@@ -487,7 +487,7 @@ 
 ';
 }
 
-function form_submit($text, $attrs='') {
+function form_submit($text, $attrs = '') {
     form_general(
         "",
         sprintf(
@@ -497,11 +497,11 @@ 
     );
 }
 
-function form_checkbox($label, $name, $checked=false) {
+function form_checkbox($label, $name, $checked = false) {
     echo sprintf('
         <div class="form-group">
             <input type="checkbox" name="%s" %s> &nbsp; <span class="lead">%s</span>
         </div>
-        ', $name, $checked?"checked":"", $label
+        ', $name, $checked ? "checked" : "", $label
     );
 }

html/user/forum_search.php

Spacing +10 added lines, -10 removed lines

@@ -56,18 +56,18 @@ 
     </select>");
 
 $forumid = null;
-if (get_str("forumid",true)){
+if (get_str("forumid", true)) {
     $forumid = get_str("forumid");
 }
-$forumlist="<option value=\"-1\">".tra("All")."</option>";
+$forumlist = "<option value=\"-1\">".tra("All")."</option>";
 $categories = BoincCategory::enum();
 foreach ($categories as $category) {
     $forums = BoincForum::enum("parent_type=0 and category=$category->id");
     foreach ($forums as $forum) {
-        if ($forum->id==$forumid){
-            $forumlist.="<option selected value=\"".$forum->id."\">".$forum->title."</option>";
+        if ($forum->id == $forumid) {
+            $forumlist .= "<option selected value=\"".$forum->id."\">".$forum->title."</option>";
         } else {
-            $forumlist.="<option value=\"".$forum->id."\">".$forum->title."</option>";
+            $forumlist .= "<option value=\"".$forum->id."\">".$forum->title."</option>";
         }
     }
 }
@@ -76,11 +76,11 @@ 
     '<select class="form-control" name="search_forum">'.$forumlist.'</select');
 
 $sortlist = null;
-foreach ($thread_sort_styles as $id => $style){
-    if ($id == CREATE_TIME_NEW){
-        $sortlist.="<option selected value=\"".$id."\">".$style."</option>";
+foreach ($thread_sort_styles as $id => $style) {
+    if ($id == CREATE_TIME_NEW) {
+        $sortlist .= "<option selected value=\"".$id."\">".$style."</option>";
     } else {
-        $sortlist.="<option value=\"".$id."\">".$style."</option>";
+        $sortlist .= "<option value=\"".$id."\">".$style."</option>";
     }
 }
 row2(tra("Sort by"),
@@ -98,5 +98,5 @@ 
 
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/inc/user.inc

Spacing +16 added lines, -16 removed lines

@@ -33,7 +33,7 @@ 
 // they've participated in
 //
 function get_other_projects($user) {
-    $cpid = md5($user->cross_project_id . $user->email_addr);
+    $cpid = md5($user->cross_project_id.$user->email_addr);
     $url = "http://boinc.netsoft-online.com/get_user.php?cpid=".$cpid;
 
     // Check the cache for that URL
@@ -121,7 +121,7 @@ 
 
     usort($user->projects, "cmp");
     if ($personal) {
-        $t  = tra("Projects in which you are participating");
+        $t = tra("Projects in which you are participating");
     } else {
         $t = tra("Projects in which %1 is participating", $user->name);
     }
@@ -180,7 +180,7 @@ 
     }
 
     if (!NO_STATS) {
-        $cpid = md5($user->cross_project_id . $user->email_addr);
+        $cpid = md5($user->cross_project_id.$user->email_addr);
         $x = "";
         shuffle($cpid_stats_sites);
         foreach ($cpid_stats_sites as $site) {
@@ -264,7 +264,7 @@ 
         $u = normalize_user_url($user->url);
         row2(
             tra("URL"),
-            $u?sprintf('<a href="%s">%s</a>', $u, $u):tra('Invalid URL')
+            $u ?sprintf('<a href="%s">%s</a>', $u, $u) : tra('Invalid URL')
         );
     }
     if (USER_COUNTRY) {
@@ -375,7 +375,7 @@ 
 // if $badge_height is > 0, show badges
 // if $name_limit, limit name to N chars
 //
-function user_links($user, $badge_height=0, $name_limit=0) {
+function user_links($user, $badge_height = 0, $name_limit = 0) {
     if (!$user) {
         error_log("user_links(): null arg\n");
         return;
@@ -407,13 +407,13 @@ 
         $user->id,
         $name
     );
-    if (function_exists("project_user_links")){
+    if (function_exists("project_user_links")) {
         $x .= project_user_links($user);
     }
     if ($badge_height) {
         $x .= badges_string(true, $user, $badge_height);
     }
-    return $name_limit?"<nobr>$x</nobr>":$x;
+    return $name_limit ? "<nobr>$x</nobr>" : $x;
 }
 
 function show_community_private($user) {
@@ -460,7 +460,7 @@ 
 
             // if there's a foundership request, notify the founder
             //
-            if ($user->id==$team->userid && $team->ping_user >0) {
+            if ($user->id == $team->userid && $team->ping_user > 0) {
                 $x .= "<p class=\"text-danger\">".tra("(foundership change request pending)")."</p>";
             }
             row2(tra("Member of team"), $x);
@@ -484,7 +484,7 @@ 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
     $x = [];
     if ($friends) {
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $fuser = BoincUser::lookup_id($friend->user_dest);
             if (!$fuser) continue;
             $x[] = friend_links($fuser);
@@ -530,7 +530,7 @@ 
 
 // return an object with data to show the user's community links
 //
-function get_community_links_object($user){
+function get_community_links_object($user) {
     $cache_object = new StdClass;
     $cache_object->post_count = total_posts($user);
     $cache_object->user = $user;
@@ -538,7 +538,7 @@ 
     $cache_object->friends = array();
 
     $friends = BoincFriend::enum("user_src=$user->id and reciprocated=1");
-    foreach($friends as $friend) {
+    foreach ($friends as $friend) {
         $fuser = BoincUser::lookup_id($friend->user_dest);
         if (!$fuser) continue;
         $cache_object->friends[] = $fuser;
@@ -548,7 +548,7 @@ 
 
 // show community links of another user (described by $clo)
 //
-function community_links($clo, $logged_in_user){
+function community_links($clo, $logged_in_user) {
     $user = $clo->user;
     if (!$user) {
         error_log("community_links(): null user\n");
@@ -578,15 +578,15 @@ 
                 "<a href=\"friend.php?action=cancel_confirm&userid=$user->id\">".tra("Cancel friendship")."</a>"
             );
         } else if ($friend) {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Request pending")."</a>");
         } else {
-            row2(tra("Friends"),  "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
+            row2(tra("Friends"), "<a href=\"friend.php?action=add&userid=$user->id\">".tra("Add as friend")."</a>");
         }
     }
 
     if ($friends) {
         $x = [];
-        foreach($friends as $friend) {
+        foreach ($friends as $friend) {
             $x[] = friend_links($friend);
         }
         row2(tra('Friends'), implode('<br>', $x));
@@ -653,6 +653,6 @@ 
 }
 
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/host.inc

Spacing +22 added lines, -22 removed lines

@@ -32,12 +32,12 @@ 
 
 function sched_log_name($x) {
     if ($x == 0) return "NO_SUCH_LOG";
-    return gmdate('Y-m-d_H/Y-m-d_H:i', $x) . ".txt";
+    return gmdate('Y-m-d_H/Y-m-d_H:i', $x).".txt";
 }
 
 function sched_log_link($x) {
     if (file_exists("sched_logs")) {
-        return "<a href=\"../sched_logs/" . sched_log_name($x) . "\">" . time_str($x) . "</a>";
+        return "<a href=\"../sched_logs/".sched_log_name($x)."\">".time_str($x)."</a>";
     } else {
         return time_str($x);
     }
@@ -45,7 +45,7 @@ 
 
 function location_form($host) {
     $none = "selected";
-    $h=$w=$s=$m="";
+    $h = $w = $s = $m = "";
     if ($host->venue == "home") $h = "selected";
     if ($host->venue == "work") $w = "selected";
     if ($host->venue == "school") $s = "selected";
@@ -99,7 +99,7 @@ 
             row2(tra("Product name"), $host->product_name);
         }
         $x = $host->timezone/3600;
-        if ($x >= 0) $x="+$x";
+        if ($x >= 0) $x = "+$x";
         row2(tra("Local Standard Time"), tra("UTC %1 hours", $x));
     } else {
         $owner = BoincUser::lookup_id($host->userid);
@@ -259,15 +259,15 @@ 
 // "[vbox|5.0.0|1|1]", where now two additional flags give information about
 // hardware virtualization support. Older clients may have the old-style
 // serialnum in the DB despite the server being upgraded.
-function vbox_desc($x){
-    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/",$x,$matches)){
+function vbox_desc($x) {
+    if (preg_match("/\[vbox\|(.*?)(\|([01])\|([01]))?\]/", $x, $matches)) {
         $desc = "Virtualbox (".$matches[1].") ".tra("installed");
-        if (sizeof($matches)>2){
-            if ($matches[3]=="1" and $matches[4]=="1") {
+        if (sizeof($matches) > 2) {
+            if ($matches[3] == "1" and $matches[4] == "1") {
                 return $desc.tra(", CPU has hardware virtualization support and it is enabled");
-            } elseif ($matches[3]=="1" and $matches[4]=="0") {
+            } elseif ($matches[3] == "1" and $matches[4] == "0") {
                 return $desc.tra(", CPU has hardware virtualization support but it is disabled");
-            } elseif ($matches[3]=="0") {
+            } elseif ($matches[3] == "0") {
                 return $desc.tra(", CPU does not have hardware virtualization support");
             }
         } else {
@@ -281,7 +281,7 @@ 
 // Given string of the form [BOINC|vers][type|model|count|RAM|driver-vers][vbox|vers],
 // return a human-readable version of the GPU info
 //
-function gpu_desc($x, $detail=true) {
+function gpu_desc($x, $detail = true) {
     $descs = explode("]", $x);
     array_pop($descs);
     $str = "";
@@ -293,7 +293,7 @@ 
         if ($d[0] == "vbox") continue;
         if (count($d) < 4) continue;
         if ($str) $str .= "<p>";
-        if ($d[2]!="" && $d[2]!="1") $str .= "[".$d[2]."] ";
+        if ($d[2] != "" && $d[2] != "1") $str .= "[".$d[2]."] ";
         if ($d[0] == "CUDA") {
             $str .= "NVIDIA";
         } else if ($d[0] == "CAL") {
@@ -500,14 +500,14 @@ 
     if ($pos1 === false) return $x;
     $pos2 = strpos($model, ']');
     if ($pos2 === false) return $x;
-    $a = substr($model, $pos1+1, $pos2-$pos1-1);
+    $a = substr($model, $pos1 + 1, $pos2 - $pos1 - 1);
     $y = explode(" ", $a);
     if (count($y) == 0) return $x;
     if ($y[0] == "Family") {
         $x->info = $a;
     } else {
         $x->arch = $y[0];
-        $x->info = substr($a, strlen($y[0])+1);
+        $x->info = substr($a, strlen($y[0]) + 1);
     }
     return $x;
 }
@@ -596,7 +596,7 @@ 
     $avg_time = 0;
 
     $results = BoincResult::enum("hostid=$hostid order by received_time");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         if ($result->granted_credit <= 0) continue;
         $total += $result->granted_credit;
 
@@ -689,7 +689,7 @@ 
 
 function link_url($sort, $rev, $show_all) {
     global $userid;
-    $x = $userid ? "&userid=$userid":"";
+    $x = $userid ? "&userid=$userid" : "";
     return "hosts_user.php?sort=$sort&rev=$rev&show_all=$show_all$x";
 }
 
@@ -763,7 +763,7 @@ 
 }
 
 function show_user_hosts($userid, $private, $show_all, $sort, $rev) {
-    $desc = false;  // whether the sort order's default is decreasing
+    $desc = false; // whether the sort order's default is decreasing
     switch ($sort) {
     case "total_credit": $sort_clause = "total_credit"; $desc = true; break;
     case "expavg_credit": $sort_clause = "expavg_credit"; $desc = true; break;
@@ -786,7 +786,7 @@ 
     more_or_less($sort, $rev, $show_all);
 
     $now = time();
-    $old_hosts=0;
+    $old_hosts = 0;
     $i = 1;
     $hosts = BoincHost::enum("userid=$userid order by $sort_clause");
     $any_product_name = false;
@@ -798,9 +798,9 @@ 
     }
     user_host_table_start($private, $sort, $rev, $show_all, $any_product_name);
     foreach ($hosts as $host) {
-        $is_old=false;
+        $is_old = false;
         if (($now - $host->rpc_time) > 30*86400) {
-            $is_old=true;
+            $is_old = true;
             $old_hosts++;
         }
         if (!$show_all && $is_old) continue;
@@ -809,7 +809,7 @@ 
     }
     end_table();
 
-    if ($old_hosts>0) {
+    if ($old_hosts > 0) {
         more_or_less($sort, $rev, $show_all);
     }
 
@@ -829,6 +829,6 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 
 ?>

html/inc/pm.inc

Spacing +10 added lines, -10 removed lines

@@ -49,7 +49,7 @@ 
     return $x;
 }
 
-function pm_team_form($user, $teamid, $error=null) {
+function pm_team_form($user, $teamid, $error = null) {
     global $bbcode_html, $bbcode_js;
     $team = BoincTeam::lookup_id($teamid);
     if (!$team) {
@@ -59,7 +59,7 @@ 
         error_page("not admin");
     }
 
-    page_head(tra("Send message to team"),'','','', $bbcode_js);
+    page_head(tra("Send message to team"), '', '', '', $bbcode_js);
 
     $subject = post_str("subject", true);
     $content = post_str("content", true);
@@ -111,7 +111,7 @@ 
 function pm_form_page($replyto, $userid, $error = null) {
     global $bbcode_html, $bbcode_js;
     global $g_logged_in_user;
-    page_head(tra("Send private message"),'','','', $bbcode_js);
+    page_head(tra("Send private message"), '', '', '', $bbcode_js);
 
     if (post_str("preview", true) == tra("Preview")) {
         $content = post_str("content", true);
@@ -135,7 +135,7 @@ 
         if (!$user) {
             error_page("Sender no longer exists");
         }
-        $writeto = UNIQUE_USER_NAME?$user->name:$userid." (".$user->name.")";
+        $writeto = UNIQUE_USER_NAME ? $user->name : $userid." (".$user->name.")";
         $subject = $message->subject;
         if (substr($subject, 0, 3) != "re:") {
             $subject = "re: ".$subject;
@@ -145,7 +145,7 @@ 
         if (!$user) {
             error_page("Sender no longer exists");
         }
-        $writeto = UNIQUE_USER_NAME?$user->name:$userid." (".$user->name.")";
+        $writeto = UNIQUE_USER_NAME ? $user->name : $userid." (".$user->name.")";
     } else {
         $writeto = sanitize_tags(post_str("to", true));
         $subject = post_str("subject", true);
@@ -200,7 +200,7 @@ 
 function send_pm_notification_email(
     $logged_in_user, $to_user, $subject, $content
 ) {
-    $message  = "
+    $message = "
 You have received a new private message at ".PROJECT.".
 
 From: $logged_in_user->name (ID $logged_in_user->id)
@@ -230,7 +230,7 @@ 
     $pm = BoincPrivateMessage::lookup_id($notify->opaque);
     $from_user = BoincUser::lookup_id($pm->senderid);
     if (!$pm || !$from_user) return null;
-    return "<a href=pm.php>".tra("Private message%1 from %2, subject:" , "</a>", $from_user->name )." $pm->subject";
+    return "<a href=pm.php>".tra("Private message%1 from %2, subject:", "</a>", $from_user->name)." $pm->subject";
 }
 
 function pm_send_msg($from_user, $to_user, $subject, $content, $send_email) {
@@ -294,11 +294,11 @@ 
 
 function pm_email_remind($user) {
     if (!$user->prefs->pm_notification) {
-        return "<br><small>" .
+        return "<br><small>".
             tra(
                 "For email notification, %1 edit community prefs %2",
                 '<a href="edit_forum_preferences_form.php">', '</a>'
-            ) .
+            ).
             "</small>"
         ;
     }
@@ -324,5 +324,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
+$cvs_version_tracker[] = "\$Id: pm.inc 14019 2007-11-01 23:04:39Z davea $";
 ?>