BOINC / boinc

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

Braces +37 added lines, -26 removed lines

@@ -301,8 +301,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -310,8 +309,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else  {
             $output .= '<td>---</td>';
           }
         }
@@ -475,10 +473,16 @@ 
               isset($prefs[$pref_set][$category])) {
             $pref_setting = $prefs[$pref_set][$category][$name];
             $value = isset($pref_setting['#options']) ? $pref_setting['#options'][$pref_setting['#default_value']] : $pref_setting['#default_value'];
-            if ($value == '') $value = '---';
-            if (!isset($pref_setting['#field_suffix'])) $pref_setting['#field_suffix'] = '';
+            if ($value == '') {
+                $value = '---';
+            }
+            if (!isset($pref_setting['#field_suffix'])) {
+                $pref_setting['#field_suffix'] = '';
+            }
             $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-          } else $output .= '<td>---</td>';
+          } else {
+              $output .= '<td>---</td>';
+          }
         }
         $output .= '</tr>';
       }
@@ -618,13 +622,24 @@ 
       $output .= '<tr class="section-heading">';
       $output .= "<td>{$section['#title']}</td></tr>";
       foreach ($section as $name => $setting) {
-        if ($name{0} == '#') continue;
+        if ($name{0} == '#') {
+            continue;
+        }
         $value = isset($setting['#default_value']) ? $setting['#default_value'] : '';
-        if ($value AND isset($setting['#options'])) $value = $setting['#options'][$value];
-        elseif ($value == '') $value = '---';
-        if (!isset($setting['#title'])) $setting['#title'] = '';
-        if (!isset($setting['#description'])) $setting['#description'] = '';
-        if (!isset($setting['#field_suffix'])) $setting['#field_suffix'] = '';
+        if ($value AND isset($setting['#options'])) {
+            $value = $setting['#options'][$value];
+        } elseif ($value == '') {
+            $value = '---';
+        }
+        if (!isset($setting['#title'])) {
+            $setting['#title'] = '';
+        }
+        if (!isset($setting['#description'])) {
+            $setting['#description'] = '';
+        }
+        if (!isset($setting['#field_suffix'])) {
+            $setting['#field_suffix'] = '';
+        }
         $output .= '<tr>';
         $output .= "<td>{$setting['#title']}<br/>{$setting['#description']}</td>";
         $output .= "<td>{$value} {$setting['#field_suffix']}</td>";
@@ -722,7 +737,9 @@ 
         <tr><th align=left>Project</th><th align=left>Cobblestones</th><th align=left>Joined</th></tr>
     ";
     foreach ($boincuser->projects as $p) {
-        if ($p->total_credit<100) continue;
+        if ($p->total_credit<100) {
+            continue;
+        }
         show_proj($p);
     }
     echo "
@@ -836,22 +853,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.', 
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.', 
       array('@id' => $host_id)), 'error'
@@ -896,15 +910,13 @@ 
         bts('The location for this host has been updated.')
         . bts('This will take effect next time the host contacts the project.')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.'),
       'warning'
@@ -996,8 +1008,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

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

Braces +39 added lines, -58 removed lines

@@ -378,8 +378,7 @@ 
       $user_info .= '  <div class="picture">';
       if (is_array($user_image) AND $user_image['image']['filepath']) {
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-      }
-      elseif (is_string($user_image)) {
+      } elseif (is_string($user_image)) {
         $user_info .= '<img src="' . $user_image . '"/>';
       }
       $user_info .= '  </div>';
@@ -421,8 +420,7 @@ 
     // If a specific comment is being referenced, go back to it on cancel
     if ($comment_ref = $form['pid']['#value']) {
       $cancel_url = "goto/comment/{$comment_ref}";
-    }
-    else {
+    } else {
       $cancel_url = "node/{$form['nid']['#value']}";
     }
     
@@ -525,8 +523,7 @@ 
           'title' => bts('Reply to this topic with a quote')
       );
     }
-  }
-  else {
+  } else {
     // Standard EDIT, DELETE, and REPLY links are created by Drupal, but we want to alter them
     if (isset($links['comment_delete'])) {
       $links['comment_delete']['attributes'] = array(
@@ -580,8 +577,7 @@ 
                   'title' => bts('Remove sticky status from this topic')
               )
           );
-        }
-        else {
+        } else {
           $links['make_sticky'] = array(
               'title' => bts('Make sticky'),
               'href' => "{$node_control}/sticky",
@@ -598,8 +594,7 @@ 
                   'title' => bts('Lock this thread for comments')
               )
           );
-        }
-        else {
+        } else {
           $links['unlock'] = array(
               'title' => bts('Unlock'),
               'href' => "{$node_control}/unlock",
@@ -616,8 +611,7 @@ 
                   'title' => bts('Hide this topic')
               )
           );
-        }
-        else {
+        } else {
           $links['unhide'] = array(
               'title' => bts('Unhide'),
               'href' => "{$node_control}/unhide",
@@ -628,8 +622,7 @@ 
         }
       }// if user_access('edit any forum topic')
     }
-  }
-  else if ($type=='comment') {
+  } else if ($type=='comment') {
     $node = node_load($object->nid);
     $nid = $object->nid;
     $cid = $object->cid;
@@ -670,8 +663,7 @@ 
                 'title' => bts('Hide this comment')
             )
         );
-      }
-      else {
+      } else {
         $links['unhide'] = array(
             'title' => bts('Unhide'),
             'href' => "{$comment_control}/unhide",
@@ -853,8 +845,7 @@ 
       watchdog('am_set_info', "XML validation error in global_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
         ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
-  }
-  elseif ($project_prefs) {
+  } elseif ($project_prefs) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
@@ -892,13 +883,16 @@ 
       }
       if ($country OR $url) {
         $content_profile = content_profile_load('profile', $uid);
-        if ($country) $content_profile->field_country[0]['value'] = $country;
-        if ($url) $content_profile->field_url[0]['value'] = $url;
+        if ($country) {
+            $content_profile->field_country[0]['value'] = $country;
+        }
+        if ($url) {
+            $content_profile->field_url[0]['value'] = $url;
+        }
         node_save($content_profile);
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -112,
@@ -978,7 +972,9 @@ 
     module_load_include('module', 'boincteam', 'boincteam');
   
     $input_format = !empty($values['format']) ? $values['format'] : 4;
-    if (!empty($_GET['description'])) $_GET['description'] = check_markup($_GET['description'], $input_format);
+    if (!empty($_GET['description'])) {
+        $_GET['description'] = check_markup($_GET['description'], $input_format);
+    }
     
     // Try to add the team to BOINC and capture the XML output of the RPC
     ob_start();
@@ -1033,8 +1029,7 @@ 
           node_save($node);
           // Save the team IDs to a BOINC <--> Drupal reference table.
           db_query('INSERT INTO {boincteam} (team_id, nid) VALUES (%d, %d)', $boincteam_id, $node->nid);
-        }
-        else {
+        } else {
           $xml['create_team_reply']['warning'] = t(
             'There was a problem integrating this team into Drupal. Please
             contact @project administrators!', array('@project' => PROJECT)
@@ -1049,8 +1044,7 @@ 
           // Delete from the BOINC DB if we can't sync with Drupal
           $boincteam::delete();
         }
-      }
-      else {
+      } else {
         $xml['create_team_reply']['warning'] = t(
           'There was a problem integrating this team into Drupal. Please
           contact @project administrators!', array('@project' => PROJECT)
@@ -1064,8 +1058,7 @@ 
         );
       }
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -1,
@@ -1159,8 +1152,7 @@ 
       }
       $xml['users']['user'][] = $team_member;
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1209,24 +1201,19 @@ 
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
-                }
-                else {
+                } else {
                   $error = 'Error saving avatar to profile';
                 }
-              }
-              else {
+              } else {
                 $error = 'Unable to load user profile';
               }
-            }
-            else {
+            } else {
               $error = 'User has no profile, so avatar could not be added';
             }
-          }
-          else {
+          } else {
             $error = 'Unable to save remote image';
           }
-        }
-        else {
+        } else {
           $error = 'Could not find avatar image at URL';
         }
       }
@@ -1253,8 +1240,7 @@ 
             'success' => NULL,
           ),
         );
-      }
-      else {
+      } else {
         // Failure
         $xml = array(
           'error' => array(
@@ -1263,8 +1249,7 @@ 
           ),
         );
       }
-    }
-    else {
+    } else {
       // Drupal user not found
       $xml = array(
         'error' => array(
@@ -1273,8 +1258,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     // BOINC user not found
     $xml = array(
       'error' => array(
@@ -1301,7 +1285,9 @@ 
   if ($uid) {
     $method = !empty($_POST['method']) ? $_POST['method'] : (!empty($_GET['method']) ? $_GET['method'] : NULL);
     $count = !empty($_POST['count']) ? $_POST['count'] : (!empty($_GET['count']) ? $_GET['count'] : NULL);
-    if (!$count) $count = 10;
+    if (!$count) {
+        $count = 10;
+    }
     
     switch ($method) {
     case 'user_posts':
@@ -1392,8 +1378,7 @@ 
         ),
       );
     }
-  }
-  else {
+  } else {
     $xml = array(
       'error' => array(
         'error_num' => -136,
@@ -1517,8 +1502,7 @@ 
         // Get the number of comments per page
         if ($user->comments_per_page) {
           $comments_per_page = $user->comments_per_page;
-        }
-        else {
+        } else {
           $node = node_load($object->nid);
           $comments_per_page = variable_get(
             "comment_default_per_page_{$node->type}", 50
@@ -1539,8 +1523,7 @@ 
     // Check for a login, then redirect to the user's friend requests page
     if ($user->uid) {
       drupal_goto("account/{$user->uid}/friends/pending");
-    }
-    else {
+    } else {
       drupal_goto('user/login', array(
         'destination' => 'goto/friend-requests'
       ));
@@ -1816,8 +1799,7 @@ 
     if ($moderator_rid !== FALSE) {
       $settings['recipients'] = array($moderator_rid);
       rules_action_mail_to_users_of_role($settings);
-    }
-    else {
+    } else {
       watchdog(
         'boinccore',
         'Unable to identify members of the moderator role to send moderator notifications!',
@@ -1848,8 +1830,7 @@ 
   }
   if (empty($args)) {
     return $string;
-  }
-  else {
+  } else {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
       switch ($key [0]) {

drupal/sites/default/boinc/modules/boinccore/boinccore.admin.inc

Braces +3 added lines, -6 removed lines

@@ -144,13 +144,11 @@ 
         '@pages' => format_plural($pages_generated, 'page', 'pages'),
       )
     ));
-  }
-  else {
+  } else {
     if ($option) {
       drupal_set_message(t('The @specified page already exists.',
         array('@specified' => $option)), 'warning');
-    }
-    else {
+    } else {
       drupal_set_message(t('All pages already exist, so none can be recreated
         automatically.'), 'warning');
     }
@@ -169,8 +167,7 @@ 
       'help',
 //      'about',
     );
-  }
-  elseif (!is_array($pages)) {
+  } elseif (!is_array($pages)) {
     $pages = array($pages);
   }
   $pages_generated = array();

drupal/sites/default/boinc/modules/boincimport/includes/import_team.php

Braces +4 added lines, -3 removed lines

@@ -57,8 +57,7 @@ 
     if (module_exists('pathauto')) {
       module_load_include('inc', 'pathauto', 'pathauto');
       $node['path'] = pathauto_cleanstring($boincteam->name);
-    }
-    else {
+    } else {
       echo 'Pathauto module is required!';
       exit;
     }
@@ -77,7 +76,9 @@ 
   // Determine team membership
   db_set_active('boinc');
   $boincteam_member_ids = array();
-  while ($boincuser = db_fetch_object($boincteam_members)) $boincteam_member_ids[] = $boincuser->id;
+  while ($boincuser = db_fetch_object($boincteam_members)) {
+      $boincteam_member_ids[] = $boincuser->id;
+  }
   db_set_active('default');
   if ($boincteam_member_ids) {
     $team_members = db_query('SELECT uid FROM {boincuser} WHERE boinc_id IN(%s)', implode(',', $boincteam_member_ids));

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

Braces +110 added lines, -188 removed lines

@@ -172,8 +172,7 @@ 
   $out['result'] = $result;
   if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+  } else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
   }
   $out['html'] .= '</ul>';
@@ -201,16 +200,14 @@ 
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
       $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
-    }
-    else {
+    } else {
       // adapt from db_table_exists in database.mysql.inc
       $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
       $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
-    }
-    else {
+    } else {
       $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
       $out['result']= 0;
     }
@@ -257,8 +254,7 @@ 
       array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
       ), WATCHDOG_WARNING); 
-  }
-  else {
+  } else {
     $boincimport_functions = array(
       'users' => t('Import users'),
       'teams' => t('Import teams'),
@@ -293,8 +289,7 @@ 
   // Lock the import process
   if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+  } else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING); 
   }
@@ -308,8 +303,7 @@ 
       boincimport_teams();
       if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
       }
       break;
@@ -318,8 +312,7 @@ 
       boincimport_friends();
       if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
       }
       break;
@@ -328,8 +321,7 @@ 
       boincimport_preferences();
       if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
       }
       break;
@@ -338,8 +330,7 @@ 
       boincimport_private_msgs();
       if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
       }
       break;
@@ -348,8 +339,7 @@ 
       boincimport_forum_categories();
       if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
       }
       break;
@@ -358,8 +348,7 @@ 
       boincimport_forum_topics();
       if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
       }
       break;
@@ -368,8 +357,7 @@ 
       boincimport_forum_posts();
       if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -378,8 +366,7 @@ 
       boincimport_team_forums();
       if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
       }
       break;
@@ -388,8 +375,7 @@ 
       boincimport_team_forum_topics();
       if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
       }
       break;
@@ -398,8 +384,7 @@ 
       boincimport_team_forum_posts();
       if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -408,8 +393,7 @@ 
       boincimport_replace_urls();
       if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+      } else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO); 
@@ -478,8 +462,7 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysql_num_rows($boinc_accounts);
-  }
-  else {
+  } else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array(0);
@@ -555,8 +538,7 @@ 
      if (isset($existing_users[$boinc_account->id])) {
       // This user has already been imported
       $duplicates[] = $boinc_account->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_users_op', array(
           $boinc_account->id
@@ -612,8 +594,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
@@ -630,8 +611,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -656,8 +636,7 @@ 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -719,9 +698,10 @@ 
         $team_type = array(
           'tid' => $team_type_id
         );
-      }
-      else {
-        if (!$name) continue;
+      } else {
+        if (!$name) {
+            continue;
+        }
         $team_type = array(
           'name' => strip_tags($name),
           'vid' => $team_vid,
@@ -783,8 +763,7 @@ 
      if (isset($existing_teams[$boinc_team->id])) {
       // This team has already been imported
       $duplicates[] = $boinc_team->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_teams_op', array(
           $boinc_team
@@ -825,8 +804,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
@@ -843,8 +821,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -867,8 +844,7 @@ 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -989,8 +965,7 @@ 
       SET uid = '%d', friend_uid = '%d', created = '%d'",
       $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+  } else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
   }
@@ -999,8 +974,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
       $message = "Failed to make users {$uid} and {$friend_uid} friends!";
@@ -1016,8 +990,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1041,8 +1014,7 @@ 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1166,8 +1138,7 @@ 
     );
     if ($user_ignored) {
       $success = TRUE;
-    }
-    else {
+    } else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
       watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
@@ -1182,8 +1153,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
@@ -1200,8 +1170,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1226,8 +1195,7 @@ 
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1361,8 +1329,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
@@ -1379,8 +1346,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1403,8 +1369,7 @@ 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1557,8 +1522,7 @@ 
     if (in_array($boinc_forum_category->name, $existing_categories)) {
       // This category has already been imported
       $duplicate_categories[] = $boinc_forum_category->name;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
           $boinc_forum_category, $forum_vid, $pre, FALSE
@@ -1572,8 +1536,7 @@ 
      if (isset($existing_forums[$boinc_forum->id])) {
       // This forum has already been imported
       $duplicates[] = $boinc_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forums_op', array(
           $boinc_forum, $forum_vid, $pre
@@ -1640,8 +1603,7 @@ 
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+  } else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc');
     $forums_contained = db_result(db_query('
@@ -1684,13 +1646,11 @@ 
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
       $message = "Created special hidden container";
-    }
-    else {
+    } else {
       $context['results']['categories']['success'][] = $category->id;
       $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+  } else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
@@ -1707,8 +1667,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1744,8 +1703,7 @@ 
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+  } else {
     // Save all other forums as taxonomy terms
     $forum = array(
       'name' => $name,
@@ -1771,8 +1729,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
   }
@@ -1785,8 +1742,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1887,8 +1843,7 @@ 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2042,9 +1997,7 @@ 
     
     if ($duplicate OR !$post) {
       $success = FALSE;
-    }
-    
-    else {
+    } else {
       // Get the user and term IDs along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
       $tid = db_result(db_query('
@@ -2108,12 +2061,10 @@ 
           if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
           }
-        }
-        else {
+        } else {
           $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+      } else {
         $error_detail = 'failed to save topic node to database';
       }
     }
@@ -2124,16 +2075,13 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $topic->id;
       $message = "Successfully imported topic {$topic->id}";
-    }
-    elseif ($duplicate) {
+    } elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
       $message = "Topic {$topic->id} was already imported";
-    }
-    elseif (!$post) {
+    } elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
       $message = "Skipping topic {$topic->id} as empty";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $topic->id;
       $message = "Failed to import topic {$topic->id}!";
       watchdog('boincimport',
@@ -2154,8 +2102,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2189,8 +2136,7 @@ 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2383,8 +2329,12 @@ 
           FROM {boincimport_temp_post}
           WHERE post_id = %d',
           $post->parent_post));
-        if (is_null($pid)) $pid = 0;
-        if (!$uid) $uid = 0;
+        if (is_null($pid)) {
+            $pid = 0;
+        }
+        if (!$uid) {
+            $uid = 0;
+        }
         
         $post->content = _boincimport_strip_bbcode($post->content);
         $post->content = _boincimport_text_sanitize($post->content);
@@ -2409,8 +2359,9 @@ 
           $subject = str_replace('Quote:', 'RE: ', $subject);
           // Fringe cases where the comment body is populated only by HTML tags
           // will require a default subject...
-          if ($subject === '')
-            $subject = "RE: {$node->title}";
+          if ($subject === '') {
+                      $subject = "RE: {$node->title}";
+          }
         } else {
           // This is the first post in the topic
           $subject = $node->title;
@@ -2438,18 +2389,15 @@ 
           if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+          } else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
           }
-        }
-        else {
+        } else {
           $context['results']['posts']['failure'][] = $post->id;
           $error_posts++;
         }
-      }
-      else {
+      } else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
       }
@@ -2460,8 +2408,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $boinc_topic->id;
       $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $boinc_topic->id;
       $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
       watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)', 
@@ -2482,8 +2429,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -2523,8 +2469,7 @@ 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2611,8 +2556,7 @@ 
      if (isset($existing_team_forums[$boincteam_forum->id])) {
       // This team has already been imported
       $duplicates[] = $boincteam_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_forums_op', array(
           $boincteam_forum
@@ -2678,8 +2622,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
@@ -2696,8 +2639,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2720,8 +2662,7 @@ 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2816,8 +2757,7 @@ 
      if (isset($existing_team_topics[$boincteam_topic->id])) {
       // This team topic has already been imported
       $duplicates[] = $boincteam_topic->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_topics_op', array(
           $boincteam_topic
@@ -2864,8 +2804,7 @@ 
   ));
   if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+  } else {
     // Get the content of the post that started the topic
     db_set_active('boinc');
     $query = db_query('
@@ -2882,8 +2821,7 @@ 
       // Empty topics should have already been filtered out of the import, so
       // consider this an error condition
       $empty_topics[] = $topic->id;
-    }
-    else {
+    } else {
       // Get the user ID along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
        if (!$topic->owner) {
@@ -2947,8 +2885,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
@@ -2965,8 +2902,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -2989,8 +2925,7 @@ 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3112,8 +3047,7 @@ 
       if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+      } else {
         $operations[] = array(
           'boincimport_team_posts_op', array(
             $boincteam_post
@@ -3169,8 +3103,12 @@ 
       FROM {boincimport_temp_post}
       WHERE post_id = %d',
       $post->parent_post));
-    if (is_null($pid)) $pid = 0;
-    if (!$uid) $uid = 0;
+    if (is_null($pid)) {
+        $pid = 0;
+    }
+    if (!$uid) {
+        $uid = 0;
+    }
     
     $post->content = _boincimport_strip_bbcode($post->content);
     $post->content = _boincimport_text_sanitize($post->content);
@@ -3195,8 +3133,9 @@ 
       $subject = str_replace('Quote:', 'RE: ', $subject);
       // Fringe cases where the comment body is populated only by HTML tags
       // will require a default subject...
-      if ($subject === '')
-        $subject = "RE: {$node->title}";
+      if ($subject === '') {
+              $subject = "RE: {$node->title}";
+      }
     } else {
       // This is the first post in the topic
       $subject = $node->title;
@@ -3229,8 +3168,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
@@ -3247,8 +3185,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3271,8 +3208,7 @@ 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3378,8 +3314,7 @@ 
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
@@ -3396,8 +3331,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -3422,8 +3356,7 @@ 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3601,8 +3534,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['nodes']['updated'][] = $node->nid;
       $message = "Successfully updated node {$node->nid}";
-    }
-    else {
+    } else {
       $message = "No changes made to node {$node->nid}!";
     }
     
@@ -3614,8 +3546,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3665,8 +3596,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['comments']['updated'][] = $comment->cid;
       $message = "Successfully updated comment {$comment->cid}";
-    }
-    else {
+    } else {
       $message = "No changes made to comment {$comment->cid}!";
     }
     
@@ -3678,8 +3608,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3728,8 +3657,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['pm']['updated'][] = $pm->mid;
       $message = "Successfully updated private message {$pm->mid}";
-    }
-    else {
+    } else {
       $message = "No changes made to private message {$pm->mid}!";
     }
     
@@ -3741,8 +3669,7 @@ 
     // Update the progress for the batch engine
     if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
       $context['finished'] = 1;
-    }
-    else {
+    } else {
       $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
     }
   }
@@ -3807,8 +3734,7 @@ 
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -4028,13 +3954,11 @@ 
       if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+      } else {
         // This URL should not be transformed
         return NULL;
       }
-    }
-    else {
+    } else {
       // This is a relative URL
       return $this->basePath;
     }
@@ -4056,8 +3980,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }
@@ -4081,8 +4004,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }

drupal/sites/default/boinc/modules/boincimport/boincimport.pages.inc

Braces +3 added lines, -1 removed lines

@@ -183,7 +183,9 @@
   // By default, use the format named "Rich text"; fall back to Filtered HTML
   $default_input_format = db_result(db_query("
     SELECT format FROM {filter_formats} WHERE name = '%s'", 'Rich text'));
-  if (!$default_input_format) $default_input_format = 1;
+  if (!$default_input_format) {
+      $default_input_format = 1;
+  }
   
   $input_format = variable_get('boincimport_input_format', $default_input_format);
   $form['input']['boincimport_input_format'] = array(

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

Braces +71 added lines, -124 removed lines

@@ -120,8 +120,7 @@ 
           'Updated translation source strings for node @nid.',
           array('@nid' => $node->nid)
         );
-      }
-      else {
+      } else {
         drupal_set_message(
           t('Unable to update translation source strings.'), 'error'
         );
@@ -132,8 +131,7 @@ 
           WATCHDOG_ERROR
         );
       }
-    }
-    else {
+    } else {
       $result = db_query("
         INSERT INTO {locales_source}
         SET location = '%s', textgroup = '%s', source = '%s'",
@@ -145,8 +143,7 @@ 
           'Added translation source strings for node @nid.',
           array('@nid' => $node->nid)
         );
-      }
-      else {
+      } else {
         drupal_set_message(
           t('Unable to add translation source strings.'), 'error'
         );
@@ -230,8 +227,7 @@ 
           )
         ), 'warning'
       );
-    }
-    elseif ($response) {
+    } elseif ($response) {
       if (is_array($response)) {
       
         $installed_languages = language_list();
@@ -261,8 +257,7 @@ 
                 'Added predefined language: '.$available_languages[$rfc_code][0]
               );
               db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
-            }
-            else {
+            } else {
               // Retrieve language details from Transifex
               $path = "language/{$posix_code}";
               $response = boinctranslate_transifex_request($path);
@@ -275,8 +270,7 @@ 
                     )
                   ), 'warning'
                 );
-              }
-              elseif ($response) {
+              } elseif ($response) {
                 if (!empty($response['name'])) {
                   // Add a custom language to Drupal and enable
                   locale_add_language(
@@ -291,8 +285,7 @@ 
                   drupal_set_message(
                     'Added new language: '.$response['name']
                   );
-                }
-                else {
+                } else {
                   $variables = array(
                     '%code' => $posix_code,
                   );
@@ -307,8 +300,7 @@ 
                     WATCHDOG_ERROR
                   );
                 }
-              }
-              else {
+              } else {
                $variables = array(
                   '%code' => $posix_code,
                 );
@@ -349,8 +341,7 @@ 
           batch_set($batch);
           batch_process('admin/boinc/translation');
         }
-      }
-      else {
+      } else {
         $variables = array(
           '%project' => $project,
         );
@@ -365,8 +356,7 @@ 
           WATCHDOG_ERROR
         );
       }
-    }
-    else {
+    } else {
      $variables = array(
         '%project' => $project,
       );
@@ -423,8 +413,7 @@ 
           'content' => boinctranslate_get_po('en', 'project'),
         );
         $result = boinctranslate_transifex_request($path, $post);
-      }
-      else {
+      } else {
         // Update the source
         $path = "project/{$project_name}/resource/{$primary_resource}/content";
         $post = array(
@@ -438,8 +427,7 @@ 
       $enabled_languages = locale_language_list();
       if ($source_exists) {
         drupal_set_message('Updated source translation strings at Transifex');
-      }
-      else {
+      } else {
         drupal_set_message('Established new translation resource at Transifex');
       }
       // Try to export translations for all enabled languages
@@ -460,25 +448,21 @@ 
               "Unable to update {$language_name} translations: {$result}",
               'warning'
             );
-          }
-          else {
+          } else {
             drupal_set_message("Updated {$language_name} translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
-        }
-        else {
+        } else {
           drupal_set_message("No translations to export for {$language_name}");
         }
       }
-    }
-    else {
+    } else {
       drupal_set_message(
         "Unable to update the translation source: {$result}",
         'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       'Failed to export translations: Transifex settings are not intiailized.',
       'error'
@@ -534,42 +518,35 @@ 
                 "Unable to update {$language_name} official BOINC translations: {$result}",
                 'warning'
               );
-            }
-            elseif ($result == '401 UNAUTHORIZED') {
+            } elseif ($result == '401 UNAUTHORIZED') {
               drupal_set_message(
                 'Not authorized to update official BOINC translations',
                 'warning'
               );
               break;
-            }
-            elseif ($result == 'success') {
+            } elseif ($result == 'success') {
               drupal_set_message("Updated {$language_name} official BOINC translations");
-            }
-            else {
+            } else {
               drupal_set_message(
                 "Unexpected response for {$language_name}: {$result}",
                 'warning'
               );
             }
-          }
-          else {
+          } else {
             drupal_set_message("Updated {$language_name} official BOINC translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
-        }
-        else {
+        } else {
           drupal_set_message("No official BOINC translations to export for {$language_name}");
         }
       }
-    }
-    else {
+    } else {
       drupal_set_message(
         "The {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
         'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       'Failed to export official BOINC translations: Transifex settings are not intiailized.',
       'error'
@@ -594,8 +571,12 @@ 
   
   // Transifex details
   $api_base_url = 'https://www.transifex.com/api/2';
-  if (!$username) $username = variable_get('boinc_translate_transifex_user', '');
-  if (!$password) $password = variable_get('boinc_translate_transifex_pass', '');
+  if (!$username) {
+      $username = variable_get('boinc_translate_transifex_user', '');
+  }
+  if (!$password) {
+      $password = variable_get('boinc_translate_transifex_pass', '');
+  }
   
   $url = "{$api_base_url}/{$path}";
   $headers = array(
@@ -607,13 +588,11 @@ 
     if ($json) {
       $headers['Content-Type'] = 'application/json';
       $data = json_encode($post);
-    }
-    else {
+    } else {
       $data = drupal_query_string_encode($post);
     }
     $method = ($use_put) ? 'PUT' : 'POST';
-  }
-  else {
+  } else {
     $method = 'GET';
   }
   
@@ -625,8 +604,7 @@ 
     if ($json) {
       // Process as JSON
       return json_decode($response->data, TRUE);
-    }
-    else {
+    } else {
       return (string) $response->data;
     }
     break;
@@ -635,10 +613,14 @@ 
   case 401:
     return '401 UNAUTHORIZED';
   case 400:
-    if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
+    if ($debug_mode) {
+        watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
+    }
     return "ERROR: {$response->data}";
   case 405:
-    if ($debug_mode) watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
+    if ($debug_mode) {
+        watchdog('boinctranslate', "The following response was received when trying to communicate with the Transifex system: \n{$response}", array(), WATCHDOG_WARNING);
+    }
     return "ERROR: User not allowed to perform this action";
   }
   
@@ -776,18 +758,15 @@ 
             if ($plural) {
               $translation = _locale_export_remove_plural($strings[$plural]['translation']);
               $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
-            }
-            else {
+            } else {
               $translation = '';
             }
           }
-        }
-        else {
+        } else {
           $output .= 'msgstr[0] ""' . "\n";
           $output .= 'msgstr[1] ""' . "\n";
         }
-      }
-      else {
+      } else {
         $output .= 'msgstr ' . _locale_export_string($string['translation']);
       }
       $output .= "\n";
@@ -934,8 +913,7 @@ 
     
     if ($response == '404 NOT FOUND') {
       $message = "Project resource {$project}:{$resource} not found in {$language}.";
-    }
-    elseif ($response) {
+    } elseif ($response) {
       if (!empty($response['content'])) {
         $po_text = $response['content'];
         
@@ -956,23 +934,19 @@ 
               . " {$project}:{$resource} failed.";
             $success = FALSE;
             break;
-          }
-          else {
+          } else {
             $success = TRUE;
           }
         }
-      }
-      else {
+      } else {
         $message = "Unable to read response for {$language} translation import"
           . " of {$project}:{$resource}.";
       }
-    }
-    else {
+    } else {
       $message = "Translation data not found in response for {$language}"
         . " translation import of {$project}:{$resource}.";
     }
-  }
-  else {
+  } else {
     // If project isn't specified, import as a local Drupal resource
     $project = 'drupal.local';
     $file = new stdClass();
@@ -983,8 +957,7 @@ 
         . " local file {$resource} failed.";
       $success = FALSE;
       break;
-    }
-    else {
+    } else {
       $success = TRUE;
     }
   }
@@ -1002,8 +975,7 @@ 
         WATCHDOG_INFO
       );
     }
-  }
-  else {
+  } else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
       'boinctranslate',
@@ -1021,8 +993,7 @@ 
   // Update the progress for the batch engine
   if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
     $context['finished'] = 1;
-  }
-  else {
+  } else {
     $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
   }
 }
@@ -1041,8 +1012,7 @@ 
       array('@count' => $count),
       WATCHDOG_INFO
     ); 
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1140,14 +1110,12 @@ 
     if (!strncmp("#", $line, 1)) { // A comment
       if ($context == "COMMENT") { // Already in comment context: add
         $current["#"][] = substr($line, 1);
-      }
-      elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+      } elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
         $current["#"][] = substr($line, 1);
         $context = "COMMENT";
-      }
-      else { // Parse error
+      } else { // Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
@@ -1157,13 +1125,11 @@ 
         _locale_import_message('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
       }
-    }
-    elseif (!strncmp("msgctxt", $line, 7)) {
+    } elseif (!strncmp("msgctxt", $line, 7)) {
       if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
+      } elseif (($context == "MSGID") || ($context == "MSGCTXT")) { // Already in this context? Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
@@ -1187,8 +1153,7 @@ 
       }
       $current["msgctxt"] = $quoted;
       $context = "MSGCTXT";
-    }
-    elseif (!strncmp("msgid_plural", $line, 12)) {
+    } elseif (!strncmp("msgid_plural", $line, 12)) {
       if ($context != "MSGID") { // Must be plural form for current entry
         watchdog(
           'boinctranslate',
@@ -1213,13 +1178,11 @@ 
       }
       $current["msgid"] = $current["msgid"] . "\0" . $quoted;
       $context = "MSGID_PLURAL";
-    }
-    elseif (!strncmp("msgid", $line, 5)) {
+    } elseif (!strncmp("msgid", $line, 5)) {
       if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
         _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
         $current = array();
-      }
-      elseif ($context == "MSGID") { // Already in this context? Parse error
+      } elseif ($context == "MSGID") { // Already in this context? Parse error
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
@@ -1243,8 +1206,7 @@ 
       }
       $current["msgid"] = $quoted;
       $context = "MSGID";
-    }
-    elseif (!strncmp("msgstr[", $line, 7)) {
+    } elseif (!strncmp("msgstr[", $line, 7)) {
       if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
           'boinctranslate',
@@ -1281,8 +1243,7 @@ 
       }
       $current["msgstr"][$plural] = $quoted;
       $context = "MSGSTR_ARR";
-    }
-    elseif (!strncmp("msgstr", $line, 6)) {
+    } elseif (!strncmp("msgstr", $line, 6)) {
       if ($context != "MSGID") { // Should come just after a msgid block
         watchdog(
           'boinctranslate',
@@ -1307,8 +1268,7 @@ 
       }
       $current["msgstr"] = $quoted;
       $context = "MSGSTR";
-    }
-    elseif ($line != "") {
+    } elseif ($line != "") {
       $quoted = _locale_import_parse_quoted($line);
       if ($quoted === FALSE) {
         watchdog(
@@ -1322,14 +1282,11 @@ 
       }
       if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR") {
+      } elseif ($context == "MSGSTR") {
         $current["msgstr"] .= $quoted;
-      }
-      elseif ($context == "MSGSTR_ARR") {
+      } elseif ($context == "MSGSTR_ARR") {
         $current["msgstr"][$plural] .= $quoted;
-      }
-      else {
+      } else {
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
@@ -1345,8 +1302,7 @@ 
   // End of PO file, flush last entry
   if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
     _boinctranslate_locale_import_one_string($op, $current, $mode, $lang, $file, $group);
-  }
-  elseif ($context != "COMMENT") {
+  } elseif ($context != "COMMENT") {
     watchdog(
       'boinctranslate',
       'The translation file %filename for %lang ended unexpectedly at line %line.',
@@ -1413,9 +1369,7 @@ 
           }
         }
         $headerdone = TRUE;
-      }
-
-      else {
+      } else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
@@ -1434,9 +1388,7 @@ 
             }
             $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
           }
-        }
-
-        else {
+        } else {
           // A simple string to import.
           $english = $value['msgid'];
           $translation = $value['msgstr'];
@@ -1460,8 +1412,7 @@ 
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
       $report['skips']++;
       $lid = 0;
-    }
-    elseif ($lid) {
+    } elseif ($lid) {
       // We have this source string saved already.
       // Don't update location, that just makes Drupal add the same strings
       // over and over
@@ -1471,14 +1422,12 @@ 
         // No translation in this language.
         db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
         $report['additions']++;
-      }
-      else if ($mode == LOCALE_IMPORT_OVERWRITE) {
+      } else if ($mode == LOCALE_IMPORT_OVERWRITE) {
         // Translation exists, only overwrite if instructed.
         db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE language = '%s' AND lid = %d", $translation, $plid, $plural, $langcode, $lid);
         $report['updates']++;
       }
-    }
-    else {
+    } else {
       // No such source string in the database yet.
       // Do not insert the source string if it does not belong on the site!
       /*
@@ -1488,16 +1437,14 @@ 
       $report['additions']++;
       */
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $lid) {
+  } elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $lid) {
     $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
     if ($exists) {
       // Empty translation, remove existing if instructed.
       db_query("DELETE FROM {locales_target} WHERE language = '%s' AND lid = %d AND plid = %d AND plural = %d", $langcode, $lid, $plid, $plural);
       $report['deletes']++;
     }
-  }
-  else {
+  } else {
     $report['skips']++;
   }
 

drupal/sites/default/boinc/modules/boinctranslate/boinctranslate.admin.inc

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
   if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
       form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
-    }
-    else {
+    } else {
       unset($form_state['values']['boinc_translate_transifex_pass']);
     }
   }
@@ -260,8 +259,7 @@ 
           'boinc_translate_transifex_pass',
           t('Transifex authentication failed.')
         );
-      }
-      else {
+      } else {
         $authenticated = TRUE;
       }
     }
@@ -278,14 +276,12 @@ 
       );
       if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+      } elseif ($project_name AND !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+      } elseif ($project_resources AND !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

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

Braces +12 added lines, -14 removed lines

@@ -303,8 +303,7 @@ 
           if (!boincuser_register_validate($edit)) {
             // BOINC user validation failed for registration; set an error accordingly
             form_set_error('mail', bts('An account already exists for @email. Log in or request password assistance to access your @project account.', array('@email' => $edit['mail'], '@project' => PROJECT)));
-          }
-          else {
+          } else {
             // Save profile information for use during Insert
             $_SESSION['profileInfo'] = array(
               'country' => $edit['field_country'][0]['value'],
@@ -557,8 +556,7 @@ 
       case FLAG_FRIEND_APPROVAL:
         if ($action == 'flag') {
           $form['flag_friend_submit']['#value'] = bts('Approve request');
-        }
-        elseif ($action == 'unflag') {
+        } elseif ($action == 'unflag') {
           unset($form['actions']);
           $form['flag_friend_submit']['#value'] = bts('Deny request');
         }
@@ -1211,8 +1209,7 @@ 
       $output .= '<p>' . bts("If you're running a command-line or pre-5.0 version
         of BOINC, !create_an_account first.", array('!create_an_account' => 
           l(bts('create an account'), 'user/registration'))) . '</p>';
-    }
-    else {
+    } else {
       $output .= '<p>' . bts("If you're running a command-line version of BOINC,
         first use the BOINC Manager software (elsewhere if necessary) to create an
         an account at this project, then use that account to connect with the
@@ -1264,8 +1261,7 @@ 
   ));
   if ($current_uotd->uotd_time < strtotime('today midnight')) {
     $uotd = boincuser_select_user_of_the_day();
-  }
-  else {
+  } else {
     $uotd = user_load($current_uotd->uid);
   }
   $uotd_image = boincuser_get_user_profile_image($uotd->uid, FALSE);
@@ -1276,8 +1272,7 @@ 
   $output .= '  <div>' . bts($site_message, array(), NULL, "project:front page") . ' ' . l(bts('Learn more'), 'about') . '</div>';
   if ($user->uid) {
     $output .= '  <div>' . l(bts('View account'), 'dashboard', array('attributes' => array('class' => 'join button'))) . '</div>';
-  }
-  else {
+  } else {
     $output .= '  <div>' . l(bts('Join now'), 'join', array('attributes' => array('class' => 'join button'))) . '</div>';
   }
   $output .= '</div>';
@@ -1649,7 +1644,9 @@ 
     $account = user_load($account);
   }
   $projects = boincuser_get_projects($account);
-  if (!$projects) return bts('no projects...');
+  if (!$projects) {
+      return bts('no projects...');
+  }
   
   $output = '';
   $output .= '<table class="user-projects">' . "\n";
@@ -1690,7 +1687,9 @@ 
     'cpid' => $cpid
   );
   $args = array();
-  foreach ($get as $arg => $value) $args[] = "{$arg}=" . rawurlencode($value);
+  foreach ($get as $arg => $value) {
+      $args[] = "{$arg}=" . rawurlencode($value);
+  }
   $query = '?' . implode('&', $args);
   
   // Load XML from RPC
@@ -1821,8 +1820,7 @@ 
       if ($node->uid == 0 || strlen($node->name) == 0) {
         // @see user_validate_name(). !'0' === TRUE.
         $document->ss_name = '0';
-      }
-      else {
+      } else {
         $document->ss_name = $account->boincuser_name;
         // We want the name to be searchable for keywords.
         $document->tos_name = $account->boincuser_name;