BOINC / boinc

drupal/sites/default/boinc/modules/boincteam/boincteam_forum.module

Spacing +20 added lines, -20 removed lines

@@ -59,7 +59,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 'insert':
     boincteam_forum_node_insert($node);
     break;
@@ -84,7 +84,7 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
@@ -107,7 +107,7 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
@@ -125,7 +125,7 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
 
     break;
@@ -140,7 +140,7 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
@@ -167,7 +167,7 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
@@ -256,7 +256,7 @@ 
     while ($team_forum = db_fetch_object($result)) {
 
       $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
-      $team_forum->zebra = $row % 2 ? 'even' : 'odd';
+      $team_forum->zebra = $row%2 ? 'even' : 'odd';
       $team_forum->new_topics = 0; // TODO: Track user views of team topics
       $team_forum->new_text = '';
       $team_forum->new_url = '';
@@ -324,7 +324,7 @@ 
  */
 function boincteam_forum_create_form_panel() {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+  $output .= '<h2 class="pane-title">'.bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</h2>';
   $output .= drupal_get_form('boincteam_forum_create_form');
 
@@ -337,8 +337,8 @@ 
 function boincteam_forum_edit_form_panel($tfid) {
   $team_forum = boincteam_forum_load($tfid);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Edit message board', array(), NULL, 'boinc:team-forum') . ': ' .
-    $team_forum->title . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Edit message board', array(), NULL, 'boinc:team-forum').': '.
+    $team_forum->title.'</h2>';
   $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
   return $output;
@@ -354,19 +354,19 @@ 
   );
   $forums = boincteam_forum_list($team_id);
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('Team forum', array(), NULL, 'boinc:team-forum').'</h2>';
   $output .= '<p>'
     . bts('A discussion forum has been set up for team members.', array(), NULL, 'boinc:team-forum')
     . '</p>';
   $output .= '<ul class="tab-list action-list">';
   foreach ($forums as $forum) {
     if (!$show_public_only OR $forum->public) {
-      $output .= '  <li class="tab primary">' .
+      $output .= '  <li class="tab primary">'.
         l(
           //$forum->title,
           bts('Enter forum', array(), NULL, 'boinc:team-forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
-        ) . '</li>';
+        ).'</li>';
       // Since we're only supporting one team forum for now, we've labeled the
       // link in a generic way above and will now just break out of the loop
       break;
@@ -381,20 +381,20 @@ 
  */
 function boincteam_forum_topic_overview_panel($nid = NULL) {
   $output = '';
-  $output .= '<h2 class="pane-title">' . bts('About message boards', array(), NULL, 'boinc:team-forum') . '</h2>';
+  $output .= '<h2 class="pane-title">'.bts('About message boards', array(), NULL, 'boinc:team-forum').'</h2>';
   $output .= '<div>';
   if ($nid) {
     $team = node_load($nid);
-    $output .= '<p>' . bts('You may create a message board for use by @team',
-      array('@team' => $team->title), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('You may create a message board for use by @team',
+      array('@team' => $team->title), NULL, 'boinc:team-forum').':</p>';
   }
   else {
-    $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
+    $output .= '<p>'.bts('This is a team-only message board', array(), NULL, 'boinc:team-forum').':</p>';
   }
   $output .= '<ul>';
-  $output .= '  <li>' . bts('Only members may post', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum') . '</li>';
-  $output .= '  <li>' . bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum') .
+  $output .= '  <li>'.bts('Only members may post', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Only members may read (optional)', array(), NULL, 'boinc:team-forum').'</li>';
+  $output .= '  <li>'.bts('Founder & Team Admins have moderator privileges', array(), NULL, 'boinc:team-forum').
     '</li>';
   $output .= '</ul>';
   $output .= '</div>';

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

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         $node = node_load($nid);
         if ($node->comment !== 0 AND user_access('post comments', $user)) {
           $block['subject'] = NULL; // This should be NULL otherwise there will be duplicate h2 elements.
-          $block['content'] = '<h2>' . bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment') . '</h2>';
+          $block['content'] = '<h2>'.bts('Post new comment', array(), NULL, 'boinc:forum-post-new-comment').'</h2>';
           $block['content'] .= drupal_get_form('comment_form', array('nid' => $nid));
         }
       }

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

Spacing +34 added lines, -34 removed lines

@@ -311,8 +311,8 @@ 
         // RFC2616 mandates that the decimal part is no more than three digits,
         // so we multiply the qvalue by 1000 to avoid floating point comparisons.
         $langcode = strtolower($match[1]);
-        $qvalue = isset($match[2]) ? (float) $match[2] : 1;
-        $browser_langcodes[$langcode] = (int) ($qvalue * 1000);
+        $qvalue = isset($match[2]) ? (float)$match[2] : 1;
+        $browser_langcodes[$langcode] = (int)($qvalue*1000);
       }
     }
 
@@ -377,7 +377,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;
     $settings = array(
       'from' => '',
       'subject' => "Content at {$site_name} is awaiting moderation",
@@ -437,11 +437,11 @@ 
         $user_info .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
       }
       elseif (is_string($user_image)) {
-        $user_info .= '<img src="' . $user_image . '"/>';
+        $user_info .= '<img src="'.$user_image.'"/>';
       }
       $user_info .= '  </div>';
     }
-    $user_info .= '  <div class="name">' . theme('username', $account) . '</div>';
+    $user_info .= '  <div class="name">'.theme('username', $account).'</div>';
     if ($account->uid) {
       //$user_info .= '  <div class="join-date">Joined: ' . date('j M y', $account->created) . '</div>';
       //$user_info .= '  <div class="post-count">Posts: ' . $account->post_count . '</div>';
@@ -505,7 +505,7 @@ 
     $form['buttons']['preview']['#suffix'] = '</li>';
     $form['buttons']['preview']['#weight'] = 1003;
     $form['buttons']['cancel'] = array(
-      '#value' => '<li class="tab">' . l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url) . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), $cancel_url).'</li>',
       '#weight' => 1004,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -525,7 +525,7 @@ 
     $node = node_load($form['nid']['#value']);
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if ($node->type == 'forum') {
         if (module_exists('captcha')) {
           $form['comment_captcha'] = array(
@@ -570,7 +570,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'), "community/forum/{$forum_id}") . '</li>',
+      '#value' => '<li class="tab">'.l(bts('Cancel', array(), NULL, 'boinc:form-cancel'), "community/forum/{$forum_id}").'</li>',
       '#weight' => 1005,
     );
     $form['buttons']['form control tabs suffix'] = array(
@@ -581,7 +581,7 @@ 
     // Add captcha for role='community member'
     $community_role = array_search('community member', user_roles(true));
     $unrestricted_role = array_search('verified contributor', user_roles(true));
-    if ( (isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role])) ) {
+    if ((isset($account->roles[$community_role])) and (!isset($account->roles[$unrestricted_role]))) {
       if (module_exists('captcha')) {
         $form['comment_captcha'] = array(
           '#type' => 'captcha',
@@ -673,8 +673,8 @@ 
 function boinccore_link($type, $object, $teaser = FALSE) {
   // Add custom links with this hook
 
-  if ($type=='node') {
-    if ( ($object->type=='forum') OR ($object->type=='team_forum') ) {
+  if ($type == 'node') {
+    if (($object->type == 'forum') OR ($object->type == 'team_forum')) {
       // Add topic moderator controls
       if (user_access('edit any forum topic')) {
         $node_control = "node_control/{$object->nid}";
@@ -735,7 +735,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;
@@ -757,7 +757,7 @@ 
     if (user_access('administer comments')) {
       $comment_control = "comment_control/{$cid}";
       // Add link to convert comment into a new topic
-      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid ));
+      $reply_count = db_result(db_query(' SELECT COUNT(*) FROM comments WHERE pid = %d', $cid));
       if ($reply_count == 0) {
         $links['convert'] = array(
             'title' => bts('Convert', array(), NULL, 'boinc:forum-convert-comment-to-topic'),
@@ -802,7 +802,7 @@ 
   */
   $message['headers']['Content-Transfer-Encoding'] = 'Quoted-Printable';
   if (is_array($message['body'])) {
-    $message['body'] = array_map( "quoted_printable_encode", $message['body'] );
+    $message['body'] = array_map("quoted_printable_encode", $message['body']);
   } else {
     $message['body'] = quoted_printable_encode($message['body']);
   }
@@ -853,7 +853,7 @@ 
   // If hiding a forum topic (node) and not an administrator, go to
   // the forum page. Otherwise the user will reach an access-denied
   // page.
-  if (($action=="hide") and (!user_access('administer forums'))) {
+  if (($action == "hide") and (!user_access('administer forums'))) {
     drupal_goto("community/forum/{$node->tid}");
   }
   drupal_goto("node/{$nid}");
@@ -895,8 +895,8 @@ 
     $node->created = $comment->timestamp;
     $node->changed = $node->created;
     $node->promote = 0; // Display on front page?
-    $node->sticky = 0;  // Display top of page?
-    $node->status = 1;   // Published?
+    $node->sticky = 0; // Display top of page?
+    $node->status = 1; // Published?
     $node->comment = 2;
     //$node->language = 'en';
     $node->uid = $comment->uid;
@@ -981,16 +981,16 @@ 
     $xml->loadXML($global_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $global_prefs);
-      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);
+      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) {
     $xml->loadXML($project_prefs, LIBXML_NOBLANKS);
     if ($errors = libxml_get_errors($xml)) {
       $lines = explode("\r", $project_prefs);
-      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
+      watchdog('am_set_info', "XML validation error in project_prefs: {$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1]), array(), WATCHDOG_ERROR);
     }
   }
   if (!$errors) {
@@ -1033,8 +1033,8 @@ 
     $xml = array(
       'error' => array(
         'error_num' => -112,
-        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}" .
-        ': <br/>' . htmlentities($lines[$errors[0]->line - 1])
+        'error_msg' => "{$errors[0]->message} at line {$errors[0]->line}".
+        ': <br/>'.htmlentities($lines[$errors[0]->line - 1])
       ),
     );
   }
@@ -1142,10 +1142,10 @@ 
           'teaser' => $teaser,
           'uid' => $team_owner_uid,
           'path' => null,
-          'status' => 1,  // published or not - always publish
+          'status' => 1, // published or not - always publish
           'promote' => 0,
           'created' => $created_time,
-          'comment' => 0,  // comments disabled
+          'comment' => 0, // comments disabled
           'moderate' => 0,
           'sticky' => 0,
           'format' => $input_format
@@ -1156,7 +1156,7 @@ 
           module_load_include('inc', 'pathauto', 'pathauto');
           $node['path'] = pathauto_cleanstring($values['name']);
 
-          $node = (object) $node; // node_save requires an object form
+          $node = (object)$node; // node_save requires an object form
           $team_categories = taxonomy_get_term_by_name($values['type']);
           $node->taxonomy[] = $team_categories[0];
 
@@ -1315,7 +1315,7 @@ 
       while ($member = db_fetch_object($result)) {
         $team_members[$member->boinc_id]['country'] = $member->field_country_value;
         $team_members[$member->boinc_id]['url'] = $member->field_url_value;
-        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1:  0;
+        $team_members[$member->boinc_id]['has_profile'] = isset($member->nid) ? 1 : 0;
         $xml['users']['user'][] = $team_members[$member->boinc_id];
       }
     } // end if credit_only
@@ -1365,7 +1365,7 @@ 
             if ($profile_nid = content_profile_profile_exists($profile, $account->uid)) {
               $profile_node = node_load($profile_nid);
               if ($profile_node) {
-                $avatar_image = get_cck_image_object(file_directory_path() . '/' . $image_path, 'field_image', 'profile', TRUE);
+                $avatar_image = get_cck_image_object(file_directory_path().'/'.$image_path, 'field_image', 'profile', TRUE);
                 if ($avatar_image) {
                   $profile_node->field_image[0] = $avatar_image;
                   node_save($profile_node);
@@ -1479,7 +1479,7 @@ 
         WHERE (n.status = 1) AND (c.uid = '%d')
         ORDER BY timestamp DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1522,7 +1522,7 @@ 
         WHERE (n.status = 1) AND (n.uid = '%d')
         ORDER BY changed DESC
         LIMIT %d",
-        $uid, (int) $count
+        $uid, (int)$count
       );
       $xml = array(
         'rpc_response' => array(
@@ -1691,7 +1691,7 @@ 
           );
         }
         // Determine which page to display in order to show the given comment
-        $page = floor($comment_offset / $comments_per_page);
+        $page = floor($comment_offset/$comments_per_page);
         if ($page) {
           $params = array('page' => $page);
         }
@@ -2083,7 +2083,7 @@ 
  * Overview of moderation queues
  */
 function boinccore_moderation_overview_panel() {
-  $output = '<h2 class="pane-title">' . bts('Moderation', array(), NULL, 'boinc:moderate-profiles') . '</h2>';
+  $output = '<h2 class="pane-title">'.bts('Moderation', array(), NULL, 'boinc:moderate-profiles').'</h2>';
   $output .= '<ul class="tab-list action-list">';
   if (module_exists('user_profiles')) {
     $profile_count = db_result(db_query("
@@ -2094,7 +2094,7 @@ 
     $output .= '<li class="tab primary">';
     $output .= l(bts('Unvetted profiles', array(), NULL, 'boinc:moderate-profiles'), 'moderate/profiles');
     $output .= '<div class="item-count-wrapper">';
-    $output .= '<span class="item-count">' . $profile_count . '</span>';
+    $output .= '<span class="item-count">'.$profile_count.'</span>';
     $output .= '</div>';
     $output .= '</li>';
   }
@@ -2112,7 +2112,7 @@ 
   require_boinc('boinc_db');
 
   $num_deleted = BoincToken::delete_expired();
-  if ($num_deleted>0) {
+  if ($num_deleted > 0) {
     watchdog('boinccore', "Deleted ${num_deleted} tokens from table token", WATCHDOG_NOTICE);
   }
 }

drupal/sites/default/boinc/themes/boinc/template.php

Spacing +45 added lines, -45 removed lines

@@ -82,7 +82,7 @@ 
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
   $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+  $html .= '<ul id="'.$menu['id'].'" class="'.$menu['class'].'">'."\n";
   $item_count = count($links);
   $i = 1;
   foreach ($links as $key => $link) {
@@ -90,7 +90,7 @@ 
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
-    $html .= '<li class="' . implode(' ', $classes) .'">';
+    $html .= '<li class="'.implode(' ', $classes).'">';
     if ($link['title'] == 'Home') {
       $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
@@ -99,7 +99,7 @@ 
       if ($link['href'] == 'dashboard') {
         $item_count = privatemsg_unread_count();
         if ($item_count) {
-          $link['title'] .= '</a> <a href="' . url('messages') . '" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+          $link['title'] .= '</a> <a href="'.url('messages').'" class="compound secondary"><div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
           $link['html'] = TRUE;
           $link['attributes']['class'] = 'compound';
         }
@@ -109,7 +109,7 @@ 
     if ($link['href'] == 'moderate') {
       $item_count = boincuser_moderation_queue_count();
       if ($item_count) {
-        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">' . $item_count . '</span></div>';
+        $link['title'] .= ' <div class="item-count-wrapper"><span class="item-count">'.$item_count.'</span></div>';
         $link['html'] = TRUE;
       }
     }
@@ -117,7 +117,7 @@ 
     $html .= '</li>';
     $i++;
   }
-  $html .= '</ul>' . "\n";
+  $html .= '</ul>'."\n";
   return $html;
 }
 
@@ -132,7 +132,7 @@ 
     return '';
   }
   else {
-    return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
+    return '<li '.($active ? 'class="active" ' : '').'>'.$link."</li>\n";
   }
 }
 
@@ -197,7 +197,7 @@ 
   if (empty($locality)) {
     $locality = "en";
   }
-  $vars['flag_path'] = base_path() . path_to_theme() . "/images/flags/{$locality}.png";
+  $vars['flag_path'] = base_path().path_to_theme()."/images/flags/{$locality}.png";
 
   $server_status_url = variable_get('boinc_server_status_url', '');
   if (!$server_status_url) {
@@ -219,16 +219,16 @@ 
   if (arg(0) == 'search') {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (is_numeric(arg(1))) AND (empty(arg(2))) ) {
+  else if ((arg(0) == 'account') AND (is_numeric(arg(1))) AND (empty(arg(2)))) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='account') AND (arg(1)=='profile') ) {
+  else if ((arg(0) == 'account') AND (arg(1) == 'profile')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='dashboard') ) {
+  else if ((arg(0) == 'dashboard')) {
     unset($vars['title']);
   }
-  else if ( (arg(0)=='community') AND ( (arg(1)=='teams') OR (arg(1)=='stats') ) ) {
+  else if ((arg(0) == 'community') AND ((arg(1) == 'teams') OR (arg(1) == 'stats'))) {
     unset($vars['title']);
   }
 
@@ -244,7 +244,7 @@ 
               $tab = str_replace('li class="', 'li class="first ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+              $tab = str_replace('li class="', 'li class="last ', $tab).'</ul>';
           }
       }
       elseif (strpos($tab, 'li ')) {
@@ -252,7 +252,7 @@ 
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
           if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+              $tab = str_replace('li ', 'li class="last" ', $tab).'</ul>';
           }
       }
   }
@@ -289,7 +289,7 @@ 
 
   // Optionally, run node-type-specific preprocess functions, like
   // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
+  $function = __FUNCTION__.'_'.$vars['node']->type;
   if (function_exists($function)) {
     $function($vars, $hook);
   }
@@ -340,7 +340,7 @@ 
   $vars['node']->comment = 0;
 
   $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
-  $page_count = max(ceil($vars['comment_count'] / $comments_per_page), 1);
+  $page_count = max(ceil($vars['comment_count']/$comments_per_page), 1);
   $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
@@ -452,7 +452,7 @@ 
   case 'boinc_host':
       $view = views_get_current_view();
       if (!($view->result)) {
-        $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
+        $vars['footer'] = '<h3>'.bts('Host not found in database.', array(), NULL, 'boinc:host-details').'</h3>';
       }
     break;
   case 'boinc_host_list':
@@ -471,10 +471,10 @@ 
 
     if ($result) {
       // Display the stderr output in the footer
-      $vars['footer'] = '<h3>' . bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog') .'</h3>';
-      $vars['footer'] .= '<pre>' . htmlspecialchars($result->result_stderr_out) . '</pre>';
+      $vars['footer'] = '<h3>'.bts('Stderr output', array(), NULL, 'boinc:task-details-errorlog').'</h3>';
+      $vars['footer'] .= '<pre>'.htmlspecialchars($result->result_stderr_out).'</pre>';
     } else {
-      $vars['footer'] = '<h3>' . bts ('Task not found in database.', array(), NULL, 'boinc:task-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Task not found in database.', array(), NULL, 'boinc:task-details').'</h3>';
     }
     break;
   case 'boinc_teams':
@@ -487,7 +487,7 @@ 
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
-    require_boinc(array('util','boinc_db'));
+    require_boinc(array('util', 'boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
       // Output from admin defined BOINC project-specific function
@@ -495,7 +495,7 @@ 
       // Output of project_workunit() gets caught in the buffer
       $vars['footer'] = ob_get_clean();
     } else {
-      $vars['footer'] = '<h3>' . bts ('Workunit not found in database.', array(), NULL, 'boinc:workunit-details') . '</h3>';
+      $vars['footer'] = '<h3>'.bts('Workunit not found in database.', array(), NULL, 'boinc:workunit-details').'</h3>';
     }
   default:
   }
@@ -517,7 +517,7 @@ 
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
-      $author_picture .= '<img src="' . $user_image . '"/>';
+      $author_picture .= '<img src="'.$user_image.'"/>';
     }
   }
   $author_picture .= '</div>';
@@ -556,14 +556,14 @@ 
   case 'profile':
   case 'user':
     $node = $variables['result']['node'];
-    $variables['url'] = url('account/' . $node->is_uid);
+    $variables['url'] = url('account/'.$node->is_uid);
     $variables['title'] = $node->tos_name;
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
   case 'team':
     $node = $variables['result']['node'];
-    $variables['url'] = url('/community/teams/' . $node->entity_id);;
+    $variables['url'] = url('/community/teams/'.$node->entity_id); ;
     break;
   case 'forum':
     $node = $variables['result']['node'];
@@ -581,7 +581,7 @@ 
     // Parent forum topic title
     $variables['parent_title'] = $drupalnode->title;
     // Link to the parent forum topic
-    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/' . $nid) );
+    $variables['parent_topic'] = l($drupalnode->title, drupal_get_path_alias('node/'.$nid));
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
@@ -599,7 +599,7 @@ 
   if (!arg(2)) {
     $message = '';
   }
-  return '<p>' . $message . '</p>';
+  return '<p>'.$message.'</p>';
 }
 
 /**
@@ -615,11 +615,11 @@ 
 
     // Shorten the name when it is too long or it will break many tables.
     if (drupal_strlen($name) > 20) {
-      $name = drupal_substr($name, 0, 15) . '...';
+      $name = drupal_substr($name, 0, 15).'...';
     }
 
     if (user_access('access user profiles')) {
-      $output = l($name, 'account/' . $object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
+      $output = l($name, 'account/'.$object->uid, array('attributes' => array('title' => bts('View user profile.', array(), NULL, 'boinc:users-table'))));
     }
     else {
       $output = check_plain($name);
@@ -637,7 +637,7 @@ 
       $output = check_plain($object->name);
     }
 
-    $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
+    $output .= ' ('.bts('not verified', array(), NULL, 'boinc:user-not-found').')';
   }
   else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
@@ -650,7 +650,7 @@ 
  * Remove the link under text areas that reads:
  * "More information about formatting options"
  */
-function boinc_filter_tips_more_info () {
+function boinc_filter_tips_more_info() {
   return '';
 }
 
@@ -692,8 +692,8 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
-        '!link' => url('account/'. $sender->uid, array('absolute' => TRUE)),
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
+        '!link' => url('account/'.$sender->uid, array('absolute' => TRUE)),
         ), array(), NULL, 'boinc:friend-request-email');
       break;
 
@@ -711,7 +711,7 @@ 
 The !site team', array(
         '!name' => isset($sender->boincuser_name) ? $sender->boincuser_name : $sender->name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message') . ': ' . $flag->friend_message : '',
+        '!message' => $flag->friend_message ? bts('Message', array(), NULL, 'boinc:friend-request-email:-1:a-private-message').': '.$flag->friend_message : '',
         '!link' => url('goto/friend-requests', array('absolute' => TRUE)),
         ),
       array(), NULL, 'boinc:friend-request-email');
@@ -724,13 +724,13 @@ 
  * Edit action links
  */
 function phptemplate_links($links, $attributes = array('class' => 'links')) {
-  if ($links){
+  if ($links) {
     // Remove flag-subscriptions link. It will be placed elsewhere.
     if (isset($links['flag-subscriptions'])) {
       unset($links['flag-subscriptions']);
     }
     // Reorder the links however you need them.
-    $links = reorder_links($links, array('comment_edit','quote','comment_add','comment_reply','flag-abuse_comment','flag-abuse_node'), array('comment_delete'));
+    $links = reorder_links($links, array('comment_edit', 'quote', 'comment_add', 'comment_reply', 'flag-abuse_comment', 'flag-abuse_node'), array('comment_delete'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
   }
@@ -813,7 +813,7 @@ 
   // are the class attribute for the <li> tags.
   $dom = new DOMDocument;
   $dom->loadHTML(mb_convert_encoding($links, 'HTML-ENTITIES', 'UTF-8'));
-  foreach($dom->getElementsByTagName('li') as $node) {
+  foreach ($dom->getElementsByTagName('li') as $node) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
   }
@@ -826,7 +826,7 @@ 
     "hide", "unhide",
     "comment_delete",
   );
-  foreach(array_keys($alllinks) as $key1) {
+  foreach (array_keys($alllinks) as $key1) {
     // Select string up to first space, if present.
     $class1 = strtok($key1, ' ');
     if (in_array($class1, $selected_classes)) {
@@ -855,7 +855,7 @@ 
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
-    if ($myli->length>0) {
+    if ($myli->length > 0) {
       $newclasses = trim(($myli[0]->getAttribute("class"))." first");
       $myli[0]->setAttribute("class", $newclasses);
       $alink = $dom->saveHTML($myli[0]);
@@ -872,13 +872,13 @@ 
 
   $output = '<ul class="menu"><li class="first">';
   if ($user->uid) {
-    $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('logout').'">'.bts('Logout', array(), NULL, 'boinc:menu-link').'</a>';
   } else {
-    $output .= '<a href="' . url('user/login', array('query' => drupal_get_destination()) ) . '">' . bts('Login', array(), NULL, 'boinc:menu-link') . '</a>';
+    $output .= '<a href="'.url('user/login', array('query' => drupal_get_destination())).'">'.bts('Login', array(), NULL, 'boinc:menu-link').'</a>';
   }
   $output .= '</li>';
   if (module_exists('global_search') OR module_exists('global_search_solr')) {
-    $output .= '<li class="last"> <a class="search" href="' . url('search/site') . '">' . bts('search', array(), NULL, 'boinc:menu-link') .'</a> </l1>';
+    $output .= '<li class="last"> <a class="search" href="'.url('search/site').'">'.bts('search', array(), NULL, 'boinc:menu-link').'</a> </l1>';
   }
   $output .= '</ul>';
   return $output;
@@ -905,8 +905,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
@@ -921,8 +921,8 @@ 
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
         'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
-        'href' => 'account/prefs/privacy/ignore_user/add/'. $object->uid,
-        'query' => 'destination='. $_GET['q'],
+        'href' => 'account/prefs/privacy/ignore_user/add/'.$object->uid,
+        'query' => 'destination='.$_GET['q'],
         'attributes' => array(
           'class' => 'ignore-user',
           'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),

html/ops/bbcode_convert_response1.php

Spacing +4 added lines, -4 removed lines

@@ -42,15 +42,15 @@
     $start_id = 0; //Set this to something else if you like
     $profiles = _mysql_query("select * from profile where userid>$start_id order by userid");
     echo _mysql_error();
-    $i=0;
-    while ($profile = _mysql_fetch_object($profiles)){
+    $i = 0;
+    while ($profile = _mysql_fetch_object($profiles)) {
         $i++;
         if ($i%100 == 0) {                      //For every 100 profiles
-            echo $profile->userid.". "; flush();   // print out where we are
+            echo $profile->userid.". "; flush(); // print out where we are
             //usleep(200000);
         }
 
-        if ($profile->userid > $start_id){
+        if ($profile->userid > $start_id) {
             fix_profile($profile);
         }
     }

html/user/sandbox.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
     } else {
         sort($files);
         start_table();
-        table_header("Name<br><p class=\"text-muted\">(click to view)</p>", "Modified", "Size (bytes)", "MD5", "Delete","Download");
+        table_header("Name<br><p class=\"text-muted\">(click to view)</p>", "Modified", "Size (bytes)", "MD5", "Delete", "Download");
         foreach ($files as $f) {
             $path = "$dir/$f";
             list($error, $size, $md5) = sandbox_parse_link_file($path);
@@ -117,7 +117,7 @@ 
         $s = stat($tmp_name);
         $size = $s['size'];
         [$exists, $elf] = sandbox_lf_exists($user, $md5);
-        if (!$exists){
+        if (!$exists) {
             // move file to download dir
             //
             $phys_path = sandbox_physical_path($user, $md5);
@@ -150,9 +150,9 @@ 
         error_page("physical file is missing");
     }
     $bused = sandbox_file_in_use($user, $name);
-    if ($bused){
+    if ($bused) {
         $notice = "<strong>$name</strong> is being used by batch(es), you can not delete it now!<br/>";
-    } else{
+    } else {
         unlink("$dir/$name");
         $notice = "<strong>$name</strong> was deleted from your sandbox<br/>";
         [$exists, $elf] = sandbox_lf_exists($user, $md5);
@@ -196,7 +196,7 @@ 
 if (!$action) $action = post_str('action', true);
 
 switch ($action) {
-case '': list_files($user,""); break;
+case '': list_files($user, ""); break;
 case 'upload_file': upload_file($user); break;
 case 'delete_file': delete_file($user); break;
 case 'download_file': download_file($user); break;

html/ops/check_account_ownership_keys.php

Spacing +4 added lines, -4 removed lines

@@ -23,15 +23,15 @@
 admin_page_head("Account Ownership Keys");
 
 if (!file_exists($account_ownership_private_key_file_path)) {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership private key '" . $account_ownership_private_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership private key '".$account_ownership_private_key_file_name."' exists.</p>";
 }
 
 if (!file_exists($account_ownership_public_key_file_path)) {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' <b>doesn't</b> exist. Please run the 'generate_account_ownership_keys.php' script from the command line in the BOINC web server ops directory.</p>";
 } else {
-  echo "<p>The account ownership public key '" . $account_ownership_public_key_file_name . "' exists.</p>";
+  echo "<p>The account ownership public key '".$account_ownership_public_key_file_name."' exists.</p>";
 }
 
 echo "<p>For more info see the related wiki page: <a href=\"https://github.com/BOINC/boinc/wiki/ProofOfOwnership\">ProofOfOwnership</a></p>";

html/inc/text_transform.inc

Spacing +27 added lines, -27 removed lines

@@ -26,13 +26,13 @@ 
 require_once('../inc/sanitize_html.inc');
 
 class output_options {
-    var $bb2html;            // BBCode as HTML? (on)
-    var $images_as_links;    // Images as hyperlinks? (off)
-    var $link_popup;        // Links in new windows? (off)
-    var $nl2br;                // Convert newlines to <br>'s? (on)
-    var $htmlitems;            // Convert special chars to HTML entities? (on)
-    var $htmlscrub;            // Scrub "bad" HTML tags? (off)
-    var $highlight_terms;// Array of terms to be highlighted (off)
+    var $bb2html; // BBCode as HTML? (on)
+    var $images_as_links; // Images as hyperlinks? (off)
+    var $link_popup; // Links in new windows? (off)
+    var $nl2br; // Convert newlines to <br>'s? (on)
+    var $htmlitems; // Convert special chars to HTML entities? (on)
+    var $htmlscrub; // Scrub "bad" HTML tags? (off)
+    var $highlight_terms; // Array of terms to be highlighted (off)
 
     // Constructor - set the defaults.
 
@@ -68,7 +68,7 @@ 
         $options = new output_options; // Defaults in the class definition
     }
     if ($options->htmlitems) {
-        $text = htmlspecialchars($text, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE);
+        $text = htmlspecialchars($text, ENT_COMPAT|ENT_HTML401|ENT_SUBSTITUTE);
     }
     if (is_array($options->highlight_terms)) {
         $text = highlight_terms($text, $options->highlight_terms);
@@ -109,7 +109,7 @@ 
     if ($export) {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -119,7 +119,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -130,7 +130,7 @@ 
     } else {
         $text = preg_replace_callback(
             "@\[pre\](.*?)\[/pre\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 5, -6));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -140,7 +140,7 @@ 
         );
         return preg_replace_callback(
             "@\[code\](.*?)\[/code\]@is",
-            function ($matches) {
+            function($matches) {
                 $x = remove_br(substr($matches[0], 6, -7));
                 $x = htmlspecialchars($x, ENT_COMPAT, "UTF-8", false);
                 $x = str_replace("[", "&#91;", $x);
@@ -151,7 +151,7 @@ 
     }
 }
 
-function bb2html($text, $export=false) {
+function bb2html($text, $export = false) {
     $urlregex = "(?:\"?)(?:(http\:\/\/)?)([^\[\"<\ ]+)(?:\"?)";
     // NOTE:
     // This matches https:// too; I don't understand why.
@@ -171,7 +171,7 @@ 
 
     $httpsregex = "(?:\"?)https\:\/\/([^\[\"<\ ]+)(?:\"?)";
     // List of allowable tags
-    $bbtags = array (
+    $bbtags = array(
         "@\[b\](.*?)\[/b\]@is",
         "@\[i\](.*?)\[/i\]@is",
         "@\[u\](.*?)\[/u\]@is",
@@ -200,7 +200,7 @@ 
 
     // What the above tags are turned in to
     if ($export) {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -227,7 +227,7 @@ 
             "<a href=\"https://github.com/BOINC/boinc/wiki/\\1\">\\1</a>",
         );
     } else {
-        $htmltags = array (
+        $htmltags = array(
             "<b>\\1</b>",
             "<i>\\1</i>",
             "<u>\\1</u>",
@@ -259,7 +259,7 @@ 
     $lasttext = "";
     $i = 0;
     // $i<1000 to prevent DoS
-    while ($text != $lasttext && $i<1000) {
+    while ($text != $lasttext && $i < 1000) {
         $lasttext = $text;
         $text = replace_pre_code($text, $export);
         $text = preg_replace($bbtags, $htmltags, $text);
@@ -274,7 +274,7 @@ 
 // for example inside <pre> containers
 // The original \n was retained after the br when it was added
 //
-function remove_br($text){
+function remove_br($text) {
     return str_replace("<br />", "", $text);
 }
 
@@ -282,19 +282,19 @@ 
 //
 function externalize_links($text) {
     // TODO:  Convert this to PCRE
-    $i=0;
-    $linkpos=true;
+    $i = 0;
+    $linkpos = true;
     $out = "";
-    while (true){
+    while (true) {
         //Find a link
         //
-        $linkpos=strpos($text, "<a ", $i);
-        if ($linkpos===false) break;
+        $linkpos = strpos($text, "<a ", $i);
+        if ($linkpos === false) break;
 
         //Replace with target='_new'
         //
-        $out .= substr($text, $i, $linkpos-$i)."<a target=\"_new\" ";
-        $i = $linkpos+3;
+        $out .= substr($text, $i, $linkpos - $i)."<a target=\"_new\" ";
+        $i = $linkpos + 3;
     }
     $out .= substr($text, $i);
     return $out;
@@ -302,7 +302,7 @@ 
 
 // Converts image tags to links to the images.
 
-function image_as_link($text){
+function image_as_link($text) {
     /* This function depends on sanitized HTML */
     // Build some regex (should be a *lot* faster)
     $pattern = '@<img([\S\s]+?)src=([^>]+?)>@si';
@@ -327,5 +327,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/project.sample/project.inc

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
 
 define("FORUM_QA_MERGED_MODE", true);
     // Set to true to merge Message boards and Q&A section
-define ("DISABLE_PROFILES", true);
+define("DISABLE_PROFILES", true);
     // enable profiles only after enabling reCAPTCHA
     // https://github.com/BOINC/boinc/wiki/ProtectionFromSpam
 define("USE_STOPFORUMSPAM", true);
@@ -193,15 +193,15 @@ 
     </ol>", PROJECT);
 }
 
-function project_workunit($wu){
+function project_workunit($wu) {
     // shown in the workunit page
 }
 
-function project_user_summary($user){
+function project_user_summary($user) {
     // shown in the user summary page
 }
 
-function project_user_page_private($user){
+function project_user_page_private($user) {
     // shown in the private account page
 }
 
@@ -275,7 +275,7 @@ 
     array("name" => "Uppercase", "short_name" => "UC", "appids" => array(1, 25)),
 );
 
-function project_user_credit($user){
+function project_user_credit($user) {
     global $sub_projects;
     foreach ($sub_projects as $sp) {
         show_app_credit_user($user, $sp["name"], $sp["appids"]);