BOINC / boinc

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

Switch Indentation +24 added lines, -24 removed lines

@@ -626,13 +626,13 @@ 
   $sender = user_load($sender->uid);
   
   switch ($status) {
-    case FLAG_FRIEND_FLAGGED:
-      // Sender accepted recipient's friend request
-      $email['subject'] = bts('!name accepted your friend request [!site]', array(
-        '!name' => $sender->boincuser_name,
-        '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+  case FLAG_FRIEND_FLAGGED:
+    // Sender accepted recipient's friend request
+    $email['subject'] = bts('!name accepted your friend request [!site]', array(
+      '!name' => $sender->boincuser_name,
+      '!site' => variable_get('site_name', 'Drupal-BOINC'),
+      ), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -641,17 +641,17 @@ 
 
 Thanks,
 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)),
-        ), array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!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)),
+      ), array(), NULL, 'boinc:friend-request-email');
+    break;
 
-    case FLAG_FRIEND_PENDING:
-      // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+  case FLAG_FRIEND_PENDING:
+    // Sender is requesting to be recipient's friend
+    $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+    $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -660,13 +660,13 @@ 
 
 Thanks,
 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('goto/friend-requests', array('absolute' => TRUE)),
-        ),
-      array(), NULL, 'boinc:friend-request-email');
-      break;
+      '!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('goto/friend-requests', array('absolute' => TRUE)),
+      ),
+    array(), NULL, 'boinc:friend-request-email');
+    break;
   }
   return $email;
 }

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'),

Braces +15 added lines, -29 removed lines

@@ -130,8 +130,7 @@ 
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+  } else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
   }
 }
@@ -218,17 +217,13 @@ 
   // See: https://dev.gridrepublic.org/browse/DBOINC-65
   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']);
   }
 
@@ -246,8 +241,7 @@ 
           if ($key == $last_key) {
               $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
           }
-      }
-      elseif (strpos($tab, 'li ')) {
+      } elseif (strpos($tab, 'li ')) {
           if ($key == 0) {
               $tab = str_replace('li ', 'li class="first" ', $tab);
           }
@@ -400,8 +394,7 @@ 
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
           $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
-        }
-        else {
+        } else {
           // User hasn't visited this topic before, so all replies are new...
           $topic->new_replies = NULL;
         }
@@ -458,8 +451,7 @@ 
   case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
      $vars['empty'] = boincwork_views_host_list_empty_text();
-    }
-    elseif ($vars['display_id'] == 'page_1') {
+    } elseif ($vars['display_id'] == 'page_1') {
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
@@ -515,8 +507,7 @@ 
   if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
-    }
-    elseif (is_string($user_image)) {
+    } elseif (is_string($user_image)) {
       $author_picture .= '<img src="' . $user_image . '"/>';
     }
   }
@@ -620,26 +611,22 @@ 
 
     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'))));
-    }
-    else {
+    } else {
       $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+  } else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
       $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
-    }
-    else {
+    } else {
       $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
-  }
-  else {
+  } else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
   }
 
@@ -724,7 +711,7 @@ 
  * 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']);
@@ -913,8 +900,7 @@ 
         ),
       );
     }
-  }
-  else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+  } else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
       $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }

Upper-Lower-Casing +42 added lines, -42 removed lines

@@ -92,7 +92,7 @@ 
     if ($i == $item_count) $classes[] = 'last';
     $html .= '<li class="' . implode(' ', $classes) .'">';
     if ($link['title'] == 'Home') {
-      $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
+      $link['title'] = bts('Home', array(), null, 'boinc:menu-link');
     }
     if (module_exists('privatemsg')) {
       // Put a new mail notification next to the Account menu item
@@ -100,7 +100,7 @@ 
         $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['html'] = TRUE;
+          $link['html'] = true;
           $link['attributes']['class'] = 'compound';
         }
       }
@@ -110,7 +110,7 @@ 
       $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['html'] = TRUE;
+        $link['html'] = true;
       }
     }
     $html .= l($link['title'], $link['href'], $link);
@@ -125,9 +125,9 @@ 
 /**
  * Remove undesired local task tabs
  */
-function boinc_menu_local_task($link, $active = FALSE) {
-  if (strpos($link, 'admin/build/pages') !== FALSE
-  AND strpos($link, 'Edit Panel')) {
+function boinc_menu_local_task($link, $active = false) {
+  if (strpos($link, 'admin/build/pages') !== false
+  and strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
   }
@@ -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') ) {
     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']);
   }
 
@@ -307,7 +307,7 @@ 
     unset($vars['links']['forum']);
     // Add a link to manage subscriptions for the user
     $vars['links']['subscriptions'] = array(
-      'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
+      'title' => bts('Manage subscriptions', array(), null, 'boinc:forum-footer'),
       'href' => 'account/prefs/subscriptions',
     );
   }
@@ -331,17 +331,17 @@ 
   $vars['signature'] = check_markup($account->signature, $vars['node']->format);
 
   // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+  $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
 
   // Expose comment sort order so that the template can put the topic node
   // content (i.e. initial post) at the very end if "Newest post first" is the
   // preference used by this user
-  $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
+  $vars['oldest_post_first'] = ($user->sort != 1) ? true : false;
   $vars['node']->comment = 0;
 
-  $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['page'] < 1));
+  $vars['first_page'] = (!isset($_GET['page']) or ($_GET['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));
+  $vars['last_page'] = ($page_count == 1 or ($page_count > 1 and $_GET['page'] == $page_count - 1));
 
   $links = $vars['links'];
   $moderator_links = array();
@@ -378,7 +378,7 @@ 
   $vars['locality'] = $language->language;
 
   // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+  $vars['show_signatures'] = ($user->hide_signatures) ? false : true;
 
   $links = $vars['links'];
   $moderator_links = array();
@@ -403,7 +403,7 @@ 
         }
         else {
           // User hasn't visited this topic before, so all replies are new...
-          $topic->new_replies = NULL;
+          $topic->new_replies = null;
         }
       }
       // Use same logic in forum.module to change message if topic has
@@ -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'] = '<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':
@@ -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:
   }
@@ -513,7 +513,7 @@ 
   $author_picture = '<div class="picture">';
   $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
   if ($user_image) {
-    if (is_array($user_image) AND $user_image['image']['filepath']) {
+    if (is_array($user_image) and $user_image['image']['filepath']) {
       $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
     }
     elseif (is_string($user_image)) {
@@ -595,7 +595,7 @@ 
 // Remove the mess of text under the search form and don't display "no results"
 // if a search hasn't even been submitted
 function boinc_apachesolr_search_noresults() {
-  $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
+  $message = bts('No results found...', array(), null, 'boinc:search-with-no-results');
   if (!arg(2)) {
     $message = '';
   }
@@ -619,7 +619,7 @@ 
     }
 
     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,10 +637,10 @@ 
       $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')));
+    $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), null, 'boinc:anonymous-user')));
   }
 
   return $output;
@@ -680,7 +680,7 @@ 
       $email['subject'] = bts('!name accepted your friend request [!site]', array(
         '!name' => $sender->boincuser_name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
-        ), NULL, 'boinc:friend-request-email');
+        ), null, 'boinc:friend-request-email');
       $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
@@ -692,14 +692,14 @@ 
 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)),
-        ), array(), NULL, 'boinc:friend-request-email');
+        '!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;
 
     case FLAG_FRIEND_PENDING:
       // Sender is requesting to be recipient's friend
-      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
+      $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:friend-request-email');
       $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
@@ -711,10 +711,10 @@ 
 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('goto/friend-requests', array('absolute' => TRUE)),
+        '!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');
+      array(), null, 'boinc:friend-request-email');
       break;
   }
   return $email;
@@ -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>';
+  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 .= '</ul>';
   return $output;
@@ -888,7 +888,7 @@ 
  * Private function, based on ignore_user ignore_user_link()
  * function. Modified for boinc functionality.
  */
-function _boinc_ignore_user_link($type, $object = NULL, $teaser = FALSE) {
+function _boinc_ignore_user_link($type, $object = null, $teaser = false) {
   global $user;
 
   if (!$user || !$user->uid) {
@@ -904,12 +904,12 @@ 
     }
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
-        'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        'title' => bts('Ignore user', array(), null, 'boinc:ignore-user-add'),
         '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'),
+          'title' => bts('Add user to your ignore list', array(), null, 'boinc:ignore-user-add'),
         ),
       );
     }
@@ -920,12 +920,12 @@ 
     }
     if ($ignored[$object->uid] == 0) {
       $links['ignore_user'] = array(
-        'title' => bts('Ignore user', array(), NULL, 'boinc:ignore-user-add'),
+        'title' => bts('Ignore user', array(), null, 'boinc:ignore-user-add'),
         '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'),
+          'title' => bts('Add user to your ignore list', array(), null, 'boinc:ignore-user-add'),
         ),
       );
     }

Indentation +321 added lines, -321 removed lines

@@ -67,13 +67,13 @@ 
  * Implementation of HOOK_theme().
  */
 function boinc_theme(&$existing, $type, $theme, $path) {
-  $hooks = zen_theme($existing, $type, $theme, $path);
-  // Add your theme hooks like this:
-  /*
+    $hooks = zen_theme($existing, $type, $theme, $path);
+    // Add your theme hooks like this:
+    /*
   $hooks['hook_name_here'] = array( // Details go here );
   */
-  // @TODO: Needs detailed comments. Patches welcome!
-  return $hooks;
+    // @TODO: Needs detailed comments. Patches welcome!
+    return $hooks;
 }
 
 
@@ -81,44 +81,44 @@ 
  * Adjust the rendering of the menu
  */
 function boinc_links__system_main_menu($links, $menu, $element) {
-  $html = '';
-  $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
-  $item_count = count($links);
-  $i = 1;
-  foreach ($links as $key => $link) {
+    $html = '';
+    $html .= '<ul id="' . $menu['id'] . '" class="' . $menu['class'] . '">' . "\n";
+    $item_count = count($links);
+    $i = 1;
+    foreach ($links as $key => $link) {
     $classes = array($key);
     if (strpos($key, 'active-trail')) $classes[] = 'active';
     if ($i == 1) $classes[] = 'first';
     if ($i == $item_count) $classes[] = 'last';
     $html .= '<li class="' . implode(' ', $classes) .'">';
     if ($link['title'] == 'Home') {
-      $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
+        $link['title'] = bts('Home', array(), NULL, 'boinc:menu-link');
     }
     if (module_exists('privatemsg')) {
-      // Put a new mail notification next to the Account menu item
-      if ($link['href'] == 'dashboard') {
+        // Put a new mail notification next to the Account menu item
+        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['html'] = TRUE;
-          $link['attributes']['class'] = 'compound';
+            $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';
+        }
         }
-      }
     }
     // Put a count of items on the Moderation menu item
     if ($link['href'] == 'moderate') {
-      $item_count = boincuser_moderation_queue_count();
-      if ($item_count) {
+        $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['html'] = TRUE;
-      }
+        }
     }
     $html .= l($link['title'], $link['href'], $link);
     $html .= '</li>';
     $i++;
-  }
-  $html .= '</ul>' . "\n";
-  return $html;
+    }
+    $html .= '</ul>' . "\n";
+    return $html;
 }
 
 
@@ -126,14 +126,14 @@ 
  * Remove undesired local task tabs
  */
 function boinc_menu_local_task($link, $active = FALSE) {
-  if (strpos($link, 'admin/build/pages') !== FALSE
+    if (strpos($link, 'admin/build/pages') !== FALSE
   AND strpos($link, 'Edit Panel')) {
     // Remove Edit Panel tab
     return '';
-  }
-  else {
+    }
+    else {
     return '<li '. ($active ? 'class="active" ' : '') .'>'. $link ."</li>\n";
-  }
+    }
 }
 
 
@@ -169,103 +169,103 @@ 
  *   The name of the template being rendered ("page" in this case.)
  */
 function boinc_preprocess_page(&$vars, $hook) {
-  // Responsive Design: Add viewport meta tag to HTML head
-  drupal_set_html_head('<meta name="viewport" content="width=device-width, initial-scale=1.0" />');
-  $vars['head'] = drupal_get_html_head();
-  //dpm($vars['head'], "preprocess (all) vars[head]");
-
-  // Expose comments to template files; this is needed so that comments can be
-  // rendered in locations other than directly below the node content
-  $vars['comments'] = $vars['comment_form'] = '';
-  if (module_exists('comment') && isset($vars['node'])) {
+    // Responsive Design: Add viewport meta tag to HTML head
+    drupal_set_html_head('<meta name="viewport" content="width=device-width, initial-scale=1.0" />');
+    $vars['head'] = drupal_get_html_head();
+    //dpm($vars['head'], "preprocess (all) vars[head]");
+
+    // Expose comments to template files; this is needed so that comments can be
+    // rendered in locations other than directly below the node content
+    $vars['comments'] = $vars['comment_form'] = '';
+    if (module_exists('comment') && isset($vars['node'])) {
     $vars['comments'] = comment_render($vars['node']);
     $vars['comment_form'] = drupal_get_form('comment_form', array('nid' => $vars['node']->nid));
-  }
+    }
 
-  // Determine locale region code so the correct flag is displayed in footer
-  global $language;
-  global $theme_path;
-  $locality = $language->language;
-  if (strpos($language->language, '-')) {
+    // Determine locale region code so the correct flag is displayed in footer
+    global $language;
+    global $theme_path;
+    $locality = $language->language;
+    if (strpos($language->language, '-')) {
     $flag_icon = "{$theme_path}/images/flags/{$language->language}.png";
     if (!file_exists($flag_icon)) {
-      $lang_code = explode('-', $language->language);
-      $locality = $lang_code[0];
+        $lang_code = explode('-', $language->language);
+        $locality = $lang_code[0];
     }
-  }
-  // If there is no language set for some reason, default to English (en).
-  if (empty($locality)) {
+    }
+    // If there is no language set for some reason, default to English (en).
+    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) {
+    $server_status_url = variable_get('boinc_server_status_url', '');
+    if (!$server_status_url) {
     $server_status_url = 'server_status.php';
-  }
-  $vars['server_status_url'] = $server_status_url;
+    }
+    $vars['server_status_url'] = $server_status_url;
 
-  $app_list_url = variable_get('boinc_app_list_url', '');
-  if (!$app_list_url) {
+    $app_list_url = variable_get('boinc_app_list_url', '');
+    if (!$app_list_url) {
     $app_list_url = 'apps.php';
-  }
-  $vars['app_list_url'] = $app_list_url;
-
-  // Remove title from certain pages using URL.
-  // This is a kludge to remove the title of the page but not the
-  // "head_title" which is placed in the HTML <head> section. Most of
-  // these pages are defined in the Page Manager module.
-  // See: https://dev.gridrepublic.org/browse/DBOINC-65
-  if (arg(0) == 'search') {
+    }
+    $vars['app_list_url'] = $app_list_url;
+
+    // Remove title from certain pages using URL.
+    // This is a kludge to remove the title of the page but not the
+    // "head_title" which is placed in the HTML <head> section. Most of
+    // these pages are defined in the Page Manager module.
+    // See: https://dev.gridrepublic.org/browse/DBOINC-65
+    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']);
-  }
+    }
 
-  // Apply classes to tabs to allow for better styling options
-  $tabs = explode("\n", $vars['tabs']);
-  array_pop($tabs);
-  end($tabs);
-  $last_key = key($tabs);
-
-  foreach ($tabs as $key => &$tab) {
-      if (strpos($tab, 'li class=')) {
-          if ($key == 0) {
-              $tab = str_replace('li class="', 'li class="first ', $tab);
-          }
-          if ($key == $last_key) {
-              $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
-          }
-      }
-      elseif (strpos($tab, 'li ')) {
-          if ($key == 0) {
-              $tab = str_replace('li ', 'li class="first" ', $tab);
-          }
-          if ($key == $last_key) {
-              $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
-          }
-      }
-  }
-  $vars['tabs'] = implode("\n", $tabs);
+    // Apply classes to tabs to allow for better styling options
+    $tabs = explode("\n", $vars['tabs']);
+    array_pop($tabs);
+    end($tabs);
+    $last_key = key($tabs);
+
+    foreach ($tabs as $key => &$tab) {
+        if (strpos($tab, 'li class=')) {
+            if ($key == 0) {
+                $tab = str_replace('li class="', 'li class="first ', $tab);
+            }
+            if ($key == $last_key) {
+                $tab = str_replace('li class="', 'li class="last ', $tab) . '</ul>';
+            }
+        }
+        elseif (strpos($tab, 'li ')) {
+            if ($key == 0) {
+                $tab = str_replace('li ', 'li class="first" ', $tab);
+            }
+            if ($key == $last_key) {
+                $tab = str_replace('li ', 'li class="last" ', $tab) . '</ul>';
+            }
+        }
+    }
+    $vars['tabs'] = implode("\n", $tabs);
 
-  // Get the main menu but only for the branch the page is on.
-  $vars['menu_tree_onlyactive'] = menu_tree('primary-links');
+    // Get the main menu but only for the branch the page is on.
+    $vars['menu_tree_onlyactive'] = menu_tree('primary-links');
 
-  // Create tertiary menu
-  $vars['tertiary_links'] = menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 2);
+    // Create tertiary menu
+    $vars['tertiary_links'] = menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 2);
 
-  // Create action links
-  $vars['action_links'] = _boinc_action_links();
+    // Create action links
+    $vars['action_links'] = _boinc_action_links();
 }
 
 /**
@@ -278,79 +278,79 @@ 
  */
 function boinc_preprocess_node(&$vars, $hook) {
 
-  //$vars['sample_variable'] = t('Lorem ipsum.');
+    //$vars['sample_variable'] = t('Lorem ipsum.');
 
-  // Detach subscribe link from the links list. Subscribe link will be placed
-  // on page separately from links.
-  if (!empty($vars['node']->links['flag-subscriptions']['title'])) {
+    // Detach subscribe link from the links list. Subscribe link will be placed
+    // on page separately from links.
+    if (!empty($vars['node']->links['flag-subscriptions']['title'])) {
     $vars['subscribe_link'] = $vars['node']->links['flag-subscriptions']['title'];
     unset($vars['node']->links['flag-subscriptions']);
-  }
+    }
 
-  // Optionally, run node-type-specific preprocess functions, like
-  // boinc_preprocess_node_page() or boinc_preprocess_node_story().
-  $function = __FUNCTION__ . '_' . $vars['node']->type;
-  if (function_exists($function)) {
+    // Optionally, run node-type-specific preprocess functions, like
+    // boinc_preprocess_node_page() or boinc_preprocess_node_story().
+    $function = __FUNCTION__ . '_' . $vars['node']->type;
+    if (function_exists($function)) {
     $function($vars, $hook);
-  }
+    }
 }
 
 /**
  * Preprocessing for forum lists
  */
 function boinc_preprocess_forums(&$vars, $hook) {
-  // Add a link to mark all forums as read
-  module_load_include('inc', 'forum_tweaks', 'includes/mark-read');
-  forum_tweaks_get_mark_read_link($vars['tid'], $vars['links']);
-  if (!$vars['parents']) {
+    // Add a link to mark all forums as read
+    module_load_include('inc', 'forum_tweaks', 'includes/mark-read');
+    forum_tweaks_get_mark_read_link($vars['tid'], $vars['links']);
+    if (!$vars['parents']) {
     // Remove the "Post new forum topic" link from the top level forum list
     unset($vars['links']['forum']);
     // Add a link to manage subscriptions for the user
     $vars['links']['subscriptions'] = array(
-      'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
-      'href' => 'account/prefs/subscriptions',
+        'title' => bts('Manage subscriptions', array(), NULL, 'boinc:forum-footer'),
+        'href' => 'account/prefs/subscriptions',
     );
-  }
+    }
 }
 
 /**
  * Preprocessing for forum type nodes
  */
 function boinc_preprocess_node_forum(&$vars, $hook) {
-  global $language;
-  global $user;
+    global $language;
+    global $user;
 
-  // Locality
-  $vars['locality'] = $language->language;
+    // Locality
+    $vars['locality'] = $language->language;
 
-  // Get the author of the node
-  $account = user_load($vars['uid']);
-  $comments_per_page = ($user->comments_per_page) ? $user->comments_per_page : variable_get("comment_default_per_page_{$vars['node']->type}", 50);
+    // Get the author of the node
+    $account = user_load($vars['uid']);
+    $comments_per_page = ($user->comments_per_page) ? $user->comments_per_page : variable_get("comment_default_per_page_{$vars['node']->type}", 50);
 
-  // Add signature
-  $vars['signature'] = check_markup($account->signature, $vars['node']->format);
+    // Add signature
+    $vars['signature'] = check_markup($account->signature, $vars['node']->format);
 
-  // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+    // Show signatures based on user preference
+    $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
 
-  // Expose comment sort order so that the template can put the topic node
-  // content (i.e. initial post) at the very end if "Newest post first" is the
-  // preference used by this user
-  $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
-  $vars['node']->comment = 0;
+    // Expose comment sort order so that the template can put the topic node
+    // content (i.e. initial post) at the very end if "Newest post first" is the
+    // preference used by this user
+    $vars['oldest_post_first'] = ($user->sort != 1) ? TRUE : FALSE;
+    $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);
-  $vars['last_page'] = ($page_count == 1 OR ($page_count > 1 AND $_GET['page'] == $page_count - 1));
+    $vars['first_page'] = (!isset($_GET['page']) OR ($_GET['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'];
-  $moderator_links = array();
-  _boinc_create_moderator_links($links, $moderator_links);
-  $vars['links'] = $links;
-  $vars['moderator_links'] = $moderator_links;
+    $links = $vars['links'];
+    $moderator_links = array();
+    _boinc_create_moderator_links($links, $moderator_links);
+    $vars['links'] = $links;
+    $vars['moderator_links'] = $moderator_links;
 
-  // Ignore user link
-  $vars['ignore_link'] = _boinc_ignore_user_link('node', $vars['node']);
+    // Ignore user link
+    $vars['ignore_link'] = _boinc_ignore_user_link('node', $vars['node']);
 }
 
 
@@ -371,48 +371,48 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function boinc_preprocess_comment(&$vars, $hook) {
-  global $language;
-  global $user;
+    global $language;
+    global $user;
 
-  // Locality
-  $vars['locality'] = $language->language;
+    // Locality
+    $vars['locality'] = $language->language;
 
-  // Show signatures based on user preference
-  $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
+    // Show signatures based on user preference
+    $vars['show_signatures'] = ($user->hide_signatures) ? FALSE : TRUE;
 
-  $links = $vars['links'];
-  $moderator_links = array();
-  _boinc_create_moderator_links($links, $moderator_links);
-  $vars['links'] = $links;
-  $vars['moderator_links'] = $moderator_links;
+    $links = $vars['links'];
+    $moderator_links = array();
+    _boinc_create_moderator_links($links, $moderator_links);
+    $vars['links'] = $links;
+    $vars['moderator_links'] = $moderator_links;
 
-  // Ignore user link
-  $vars['ignore_link'] = _boinc_ignore_user_link('comment', $vars['comment']);
+    // Ignore user link
+    $vars['ignore_link'] = _boinc_ignore_user_link('comment', $vars['comment']);
 }
 
 /**
  *
  */
 function boinc_preprocess_forum_topic_list(&$variables) {
-  if (!empty($variables['topics'])) {
+    if (!empty($variables['topics'])) {
     foreach ($variables['topics'] as $id => $topic) {
-      if ($topic->new_replies) {
+        if ($topic->new_replies) {
         $cid = boincuser_get_first_unread_comment_id($topic->nid);
         if ($cid) {
-          $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
+            $variables['topics'][$id]->new_url = url("goto/comment/{$cid}");
         }
         else {
-          // User hasn't visited this topic before, so all replies are new...
-          $topic->new_replies = NULL;
+            // User hasn't visited this topic before, so all replies are new...
+            $topic->new_replies = NULL;
+        }
         }
-      }
-      // Use same logic in forum.module to change message if topic has
-      // moved. Changed link to match boinc path-added "community".
-      if ($topic->forum_tid != $variables['tid']) {
+        // Use same logic in forum.module to change message if topic has
+        // moved. Changed link to match boinc path-added "community".
+        if ($topic->forum_tid != $variables['tid']) {
         $variables['topics'][$id]->message = l(t('This topic has been moved'), "community/forum/$topic->forum_tid");
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -425,79 +425,79 @@ 
  */
 ///* -- Delete this line if you want to use this function
 function boinc_preprocess_views_view(&$vars, $hook) {
-  switch ($vars['name']) {
-  case 'boinc_account_computers':
+    switch ($vars['name']) {
+    case 'boinc_account_computers':
     switch ($vars['display_id']) {
     case 'page_1':
     case 'panel_pane_1':
       $vars['empty'] = boincwork_views_host_list_empty_text();
-      break;
+        break;
     case 'page_2':
       $vars['empty'] = boincwork_views_host_list_empty_text('active');
-      break;
+        break;
     case 'block_1':
       $vars['empty'] = boincwork_views_host_list_empty_text('preferences');
-      break;
+        break;
     default:
     }
     break;
-  case 'boinc_account_tasks_all':
+    case 'boinc_account_tasks_all':
     $vars['empty'] = boincwork_views_task_list_empty_text();
     break;
-  case 'boinc_friends':
+    case 'boinc_friends':
     if ($vars['display_id'] == 'block_1') {
-      $vars['header'] = boincuser_views_friends_block_header();
+        $vars['header'] = boincuser_views_friends_block_header();
     }
     break;
-  case 'boinc_host':
+    case 'boinc_host':
       $view = views_get_current_view();
-      if (!($view->result)) {
+        if (!($view->result)) {
         $vars['footer'] = '<h3>' . bts ('Host not found in database.', array(), NULL, 'boinc:host-details') . '</h3>';
-      }
+        }
     break;
-  case 'boinc_host_list':
+    case 'boinc_host_list':
     if ($vars['display_id'] == 'page_2') {
-     $vars['empty'] = boincwork_views_host_list_empty_text();
+        $vars['empty'] = boincwork_views_host_list_empty_text();
     }
     elseif ($vars['display_id'] == 'page_1') {
-      $vars['empty'] = boincwork_views_host_list_empty_text('active');
+        $vars['empty'] = boincwork_views_host_list_empty_text('active');
     }
     break;
-  case 'boinc_task':
+    case 'boinc_task':
     // Load view object (view data is not available in header / footer); execute view query
     $view = views_get_current_view();
     $view->execute();
     $result = reset($view->result);
 
     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>';
+        // 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>';
     } 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':
+    case 'boinc_teams':
     if ($vars['display_id'] == 'panel_pane_3') {
-      $team_id = arg(2);
-      $vars['header'] = boincteam_manage_admins_panel_header($team_id);
+        $team_id = arg(2);
+        $vars['header'] = boincteam_manage_admins_panel_header($team_id);
     }
     break;
-  case 'boinc_workunit':
+    case 'boinc_workunit':
     ob_start();
     // Get the workunit ID from the URL
     $result_id = arg(1);
     require_boinc(array('util','boinc_db'));
     $wu = BoincWorkunit::lookup_id($result_id);
     if ($wu) {
-      // Output from admin defined BOINC project-specific function
-      project_workunit($wu);
-      // Output of project_workunit() gets caught in the buffer
-      $vars['footer'] = ob_get_clean();
+        // Output from admin defined BOINC project-specific function
+        project_workunit($wu);
+        // 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:
+    default:
   }
 }
 // */
@@ -510,19 +510,19 @@ 
  */
 ///* -- Delete this line if you want to use this function
 function boinc_preprocess_privatemsg_view(&$vars, $hook) {
-  $author_picture = '<div class="picture">';
-  $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
-  if ($user_image) {
+    $author_picture = '<div class="picture">';
+    $user_image = boincuser_get_user_profile_image($vars['message']['author']->uid);
+    if ($user_image) {
     if (is_array($user_image) AND $user_image['image']['filepath']) {
-      $author_picture .= theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false);
+        $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>';
-  $vars['author_picture'] = $author_picture;
-  $vars['message_timestamp'] = date('j M Y G:i:s T', $vars['message']['timestamp']);
+    }
+    $author_picture .= '</div>';
+    $vars['author_picture'] = $author_picture;
+    $vars['message_timestamp'] = date('j M Y G:i:s T', $vars['message']['timestamp']);
 }
 // */
 
@@ -541,19 +541,19 @@ 
 // */
 
 function boinc_preprocess_search_result(&$variables) {
-  global $language;
-  // Locality
-  $variables['locality'] = $language->language;
+    global $language;
+    // Locality
+    $variables['locality'] = $language->language;
 
-  // Change the format of the search result date/time in the info string.
-  if ($variables['result']['date']) {
+    // Change the format of the search result date/time in the info string.
+    if ($variables['result']['date']) {
     $variables['info_split']['date'] = date('j M Y G:i:s T', $variables['result']['date']);
-  }
-  $variables['info'] = implode(' - ', $variables['info_split']);
+    }
+    $variables['info'] = implode(' - ', $variables['info_split']);
 
-  $type = strtolower($variables['result']['bundle']);
-  switch ($type) {
-  case 'profile':
+    $type = strtolower($variables['result']['bundle']);
+    switch ($type) {
+    case 'profile':
   case 'user':
     $node = $variables['result']['node'];
     $variables['url'] = url('account/' . $node->is_uid);
@@ -561,20 +561,20 @@ 
     $variables['user_image'] = boincuser_get_user_profile_image($node->is_uid);
     $variables['account'] = user_load($node->is_uid);
     break;
-  case 'team':
+    case 'team':
     $node = $variables['result']['node'];
     $variables['url'] = url('/community/teams/' . $node->entity_id);;
     break;
-  case 'forum':
+    case 'forum':
     $node = $variables['result']['node'];
     $drupalnode = node_load($node->entity_id);
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-      $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
+        $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
     }
     break;
-  case 'comment':
+    case 'comment':
     // Get the node id for this comment
     $nid = $variables['result']['fields']['tos_content_extra'];
     $drupalnode = node_load($nid);
@@ -585,21 +585,21 @@ 
     // Get the taxonomy for the node, creates a link to the parent forum
     $taxonomy = reset($drupalnode->taxonomy);
     if ($vocab = taxonomy_vocabulary_load($taxonomy->vid)) {
-      $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
+        $variables['parent_forum'] = l($taxonomy->name, "community/forum/{$taxonomy->tid}");
     }
-  break;
-  default:
+    break;
+    default:
   }
 }
 
 // Remove the mess of text under the search form and don't display "no results"
 // if a search hasn't even been submitted
 function boinc_apachesolr_search_noresults() {
-  $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
-  if (!arg(2)) {
+    $message = bts('No results found...', array(), NULL, 'boinc:search-with-no-results');
+    if (!arg(2)) {
     $message = '';
-  }
-  return '<p>' . $message . '</p>';
+    }
+    return '<p>' . $message . '</p>';
 }
 
 /**
@@ -608,42 +608,42 @@ 
  */
 function phptemplate_username($object) {
 
-  if ($object->uid && $object->name) {
+    if ($object->uid && $object->name) {
 
     // Show the profile name in general, not the username
     $name = user_load($object->uid)->boincuser_name;
 
     // 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);
+        $output = check_plain($name);
     }
-  }
-  else if ($object->name) {
+    }
+    else if ($object->name) {
     // Sometimes modules display content composed by people who are
     // not registered members of the site (e.g. mailing list or news
     // aggregator modules). This clause enables modules to display
     // the true author of the content.
     if (!empty($object->homepage)) {
-      $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
+        $output = l($object->name, $object->homepage, array('attributes' => array('rel' => 'nofollow')));
     }
     else {
-      $output = check_plain($object->name);
+        $output = check_plain($object->name);
     }
 
     $output .= ' (' . bts('not verified', array(), NULL, 'boinc:user-not-found') . ')';
-  }
-  else {
+    }
+    else {
     $output = check_plain(variable_get('anonymous', bts('Anonymous', array(), NULL, 'boinc:anonymous-user')));
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -651,7 +651,7 @@ 
  * "More information about formatting options"
  */
 function boinc_filter_tips_more_info () {
-  return '';
+    return '';
 }
 
 /**
@@ -669,19 +669,19 @@ 
  *   An array containing the email [type] (mailkey), [subject] and [body].
  */
 function boinc_flag_friend_message_email($status, $flag, $recipient, $sender) {
-  $email = array();
-  $email['type'] = 'flag-friend';
-  // Reload the sender to get a full user object
-  $sender = user_load($sender->uid);
+    $email = array();
+    $email['type'] = 'flag-friend';
+    // Reload the sender to get a full user object
+    $sender = user_load($sender->uid);
 
-  switch ($status) {
+    switch ($status) {
     case FLAG_FRIEND_FLAGGED:
       // Sender accepted recipient's friend request
       $email['subject'] = bts('!name accepted your friend request [!site]', array(
         '!name' => $sender->boincuser_name,
         '!site' => variable_get('site_name', 'Drupal-BOINC'),
         ), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name confirmed you as a friend on !site.
+        $email['body'] = bts('!name confirmed you as a friend on !site.
 
 Follow this link to view his or her profile:
 !link
@@ -695,12 +695,12 @@ 
         '!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;
+        break;
 
     case FLAG_FRIEND_PENDING:
       // Sender is requesting to be recipient's friend
       $email['subject'] = bts('Friend request from !name [!site]', array('!name' => $sender->boincuser_name, '!site' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:friend-request-email');
-      $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
+        $email['body'] = bts('!name added you as a friend on !site. You can approve or deny this request. Denying a request will not send a notification, but will remove the request from both of your accounts.
 
 Follow the link below to view this request:
 !link
@@ -714,26 +714,26 @@ 
         '!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');
-      break;
-  }
-  return $email;
+        array(), NULL, 'boinc:friend-request-email');
+        break;
+    }
+    return $email;
 }
 
 /**
  * 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']);
+        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'));
     // Use the built-in theme_links() function to format the $links array.
     return theme_links($links, $attributes);
-  }
+    }
 }
 
 /**
@@ -777,8 +777,8 @@ 
  * That is to say, get rid of it and use the views-view-table.tpl.php template.
  */
 function boinc_tablesort_indicator($style) {
-  return '';
-  /*
+    return '';
+    /*
   if ($style == "asc") {
     return theme('image', 'misc/arrow-asc.png', t('sort icon'), t('sort ascending'));
   }
@@ -801,48 +801,48 @@ 
  *
  */
 function _boinc_create_moderator_links(&$links, &$moderator_links) {
-  // If there are no links, then do nothing
-  if (empty($links)) {
+    // If there are no links, then do nothing
+    if (empty($links)) {
     return;
-  }
+    }
 
-  $alllinks = array();
-  $modlinks = array();
+    $alllinks = array();
+    $modlinks = array();
 
-  // Create an array of HTML elements from the $links string, keys
-  // 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) {
+    // Create an array of HTML elements from the $links string, keys
+    // 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) {
     $key = $node->getAttribute("class");
     $alllinks[$key] = $dom->saveHTML($node);
-  }
+    }
 
-  // Select classes to be placed into moderator links array
-  $selected_classes = array(
+    // Select classes to be placed into moderator links array
+    $selected_classes = array(
     "make_sticky", "make_unsticky",
     "lock", "unlock",
     "convert",
     "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)) {
-      if (empty($modlinks)) {
+        if (empty($modlinks)) {
         _boinc_firstlink($alllinks[$key1]);
-      }
-      $modlinks[$key1] = $alllinks[$key1];
-      unset($alllinks[$key1]);
+        }
+        $modlinks[$key1] = $alllinks[$key1];
+        unset($alllinks[$key1]);
     }
-  }
-  // Convert the HTML arrays back into strings, wrap them in <ul>
-  // tags
-  $links = "<ul class=\"links\">".implode($alllinks)."</ul>";
-  $moderator_links = "<ul class=\"links\">".implode($modlinks)."</ul>";
+    }
+    // Convert the HTML arrays back into strings, wrap them in <ul>
+    // tags
+    $links = "<ul class=\"links\">".implode($alllinks)."</ul>";
+    $moderator_links = "<ul class=\"links\">".implode($modlinks)."</ul>";
 
-  return;
+    return;
 }
 
 /*
@@ -850,38 +850,38 @@ 
  * attribute to class.
  */
 function _boinc_firstlink(&$alink) {
-  if (!empty($alink)) {
+    if (!empty($alink)) {
     $dom = new DomDocument;
     $dom->loadHTML(mb_convert_encoding($alink, 'HTML-ENTITIES', 'UTF-8'));
 
     $myli = $dom->getElementsByTagName('li');
     if ($myli->length>0) {
-      $newclasses = trim(($myli[0]->getAttribute("class"))." first");
-      $myli[0]->setAttribute("class", $newclasses);
-      $alink = $dom->saveHTML($myli[0]);
+        $newclasses = trim(($myli[0]->getAttribute("class"))." first");
+        $myli[0]->setAttribute("class", $newclasses);
+        $alink = $dom->saveHTML($myli[0]);
+    }
     }
-  }
 }
 
 /*
  * Private function to generate the action links
  */
 function _boinc_action_links() {
-  global $user;
-  global $base_path;
+    global $user;
+    global $base_path;
 
-  $output = '<ul class="menu"><li class="first">';
-  if ($user->uid) {
+    $output = '<ul class="menu"><li class="first">';
+    if ($user->uid) {
     $output .= '<a href="' . url('logout') . '">' . bts('Logout', array(), NULL, 'boinc:menu-link') . '</a>';
-  } else {
+    } else {
     $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>';
+    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 .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
@@ -889,47 +889,47 @@ 
  * function. Modified for boinc functionality.
  */
 function _boinc_ignore_user_link($type, $object = NULL, $teaser = FALSE) {
-  global $user;
+    global $user;
 
-  if (!$user || !$user->uid) {
+    if (!$user || !$user->uid) {
     return;
-  }
+    }
 
-  static $ignored;
-  $links = array();
+    static $ignored;
+    $links = array();
 
-  if ($type == 'node' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+    if ($type == 'node' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
-      $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
+        $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }
     if ($ignored[$object->uid] == 0) {
-      $links['ignore_user'] = array(
+        $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'],
         'attributes' => array(
-          'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+            'class' => 'ignore-user',
+            'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
         ),
-      );
+        );
     }
-  }
-  else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
+    }
+    else if ($type == 'comment' && $user->uid != $object->uid && $object->uid != 0 && user_access('ignore user')) {
     if (!isset($ignored[$object->uid])) {
-      $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
+        $ignored[$object->uid] = db_result(db_query('SELECT COUNT(*) FROM {ignore_user} WHERE uid = %d AND iuid = %d', $user->uid, $object->uid));
     }
     if ($ignored[$object->uid] == 0) {
-      $links['ignore_user'] = array(
+        $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'],
         'attributes' => array(
-          'class' => 'ignore-user',
-          'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
+            'class' => 'ignore-user',
+            'title' => bts('Add user to your ignore list', array(), NULL, 'boinc:ignore-user-add'),
         ),
-      );
+        );
+    }
     }
-  }
 
-  return $links;
+    return $links;
 }

drupal/sites/all/features/user_profiles/user_profiles.features.content.inc

Indentation +233 added lines, -233 removed lines

@@ -4,41 +4,41 @@ 
  * Implementation of hook_content_default_fields().
  */
 function user_profiles_content_default_fields() {
-  $fields = array();
+    $fields = array();
 
-  // Exported field: field_background
-  $fields['profile-field_background'] = array(
+    // Exported field: field_background
+    $fields['profile-field_background'] = array(
     'field_name' => 'field_background',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -51,56 +51,56 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => '10',
-      'size' => 60,
-      'default_value' => array(
+        'rows' => '10',
+        'size' => 60,
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_background][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '3',
-      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
-      'type' => 'text_textarea',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_background][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '3',
+        'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
+        'type' => 'text_textarea',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_country
-  $fields['profile-field_country'] = array(
+    // Exported field: field_country
+    $fields['profile-field_country'] = array(
     'field_name' => 'field_country',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -345,53 +345,53 @@ 
 Zimbabwe|Zimbabwe',
     'allowed_values_php' => 'return boinccore_get_country_list();',
     'widget' => array(
-      'default_value' => array(
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => 'Country',
-      'weight' => '5',
-      'description' => '',
-      'type' => 'optionwidgets_select',
-      'module' => 'optionwidgets',
+            'value' => '',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => 'Country',
+        'weight' => '5',
+        'description' => '',
+        'type' => 'optionwidgets_select',
+        'module' => 'optionwidgets',
     ),
-  );
+    );
 
-  // Exported field: field_image
-  $fields['profile-field_image'] = array(
+    // Exported field: field_image
+    $fields['profile-field_image'] = array(
     'field_name' => 'field_image',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'filefield',
@@ -403,19 +403,19 @@ 
     'list_default' => 1,
     'description_field' => '0',
     'widget' => array(
-      'file_extensions' => 'png gif jpg jpeg',
-      'file_path' => 'profiles',
-      'progress_indicator' => 'bar',
-      'max_filesize_per_file' => '512K',
-      'max_filesize_per_node' => '',
-      'max_resolution' => '300x300',
-      'min_resolution' => '50x50',
-      'alt' => '',
-      'custom_alt' => 0,
-      'title' => '',
-      'custom_title' => 0,
-      'title_type' => 'textfield',
-      'default_image' => array(
+        'file_extensions' => 'png gif jpg jpeg',
+        'file_path' => 'profiles',
+        'progress_indicator' => 'bar',
+        'max_filesize_per_file' => '512K',
+        'max_filesize_per_node' => '',
+        'max_resolution' => '300x300',
+        'min_resolution' => '50x50',
+        'alt' => '',
+        'custom_alt' => 0,
+        'title' => '',
+        'custom_title' => 0,
+        'title_type' => 'textfield',
+        'default_image' => array(
         'filename' => 'default-avatar.png',
         'filepath' => 'sites/default/files/imagefield_default_images/default-avatar.png',
         'filemime' => 'image/png',
@@ -426,49 +426,49 @@ 
         'status' => 1,
         'timestamp' => 1347855344,
         'fid' => '1',
-      ),
-      'use_default_image' => 1,
-      'label' => 'Avatar',
-      'weight' => '7',
-      'description' => '',
-      'type' => 'imagefield_widget',
-      'module' => 'imagefield',
+        ),
+        'use_default_image' => 1,
+        'label' => 'Avatar',
+        'weight' => '7',
+        'description' => '',
+        'type' => 'imagefield_widget',
+        'module' => 'imagefield',
     ),
-  );
+    );
 
-  // Exported field: field_opinions
-  $fields['profile-field_opinions'] = array(
+    // Exported field: field_opinions
+    $fields['profile-field_opinions'] = array(
     'field_name' => 'field_opinions',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -481,60 +481,60 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => '10',
-      'size' => 60,
-      'default_value' => array(
+        'rows' => '10',
+        'size' => 60,
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_opinions][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '4',
-      'description' => bts('Tell us your thoughts about @this_project
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_opinions][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '4',
+        'description' => bts('Tell us your thoughts about @this_project
    1. Why do you run @this_project?
    2. What are your views about the project?
    3. Any suggestions?',
-      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
-      'type' => 'text_textarea',
-      'module' => 'text',
+        array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
+        'type' => 'text_textarea',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_profile_image
-  $fields['profile-field_profile_image'] = array(
+    // Exported field: field_profile_image
+    $fields['profile-field_profile_image'] = array(
     'field_name' => 'field_profile_image',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'image_plain',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'filefield',
@@ -546,19 +546,19 @@ 
     'list_default' => 1,
     'description_field' => '0',
     'widget' => array(
-      'file_extensions' => 'png gif jpg jpeg',
-      'file_path' => 'profiles',
-      'progress_indicator' => 'bar',
-      'max_filesize_per_file' => '512K',
-      'max_filesize_per_node' => '',
-      'max_resolution' => '640x480',
-      'min_resolution' => '100x100',
-      'alt' => '',
-      'custom_alt' => 0,
-      'title' => '',
-      'custom_title' => 0,
-      'title_type' => 'textfield',
-      'default_image' => array(
+        'file_extensions' => 'png gif jpg jpeg',
+        'file_path' => 'profiles',
+        'progress_indicator' => 'bar',
+        'max_filesize_per_file' => '512K',
+        'max_filesize_per_node' => '',
+        'max_resolution' => '640x480',
+        'min_resolution' => '100x100',
+        'alt' => '',
+        'custom_alt' => 0,
+        'title' => '',
+        'custom_title' => 0,
+        'title_type' => 'textfield',
+        'default_image' => array(
         'filename' => 'default-user.png',
         'filepath' => 'sites/default/files/imagefield_default_images/default-user.png',
         'filemime' => 'image/png',
@@ -569,49 +569,49 @@ 
         'status' => 1,
         'timestamp' => 1362770990,
         'fid' => '5',
-      ),
-      'use_default_image' => 1,
-      'label' => 'Profile image',
-      'weight' => '8',
-      'description' => '',
-      'type' => 'imagefield_widget',
-      'module' => 'imagefield',
+        ),
+        'use_default_image' => 1,
+        'label' => 'Profile image',
+        'weight' => '8',
+        'description' => '',
+        'type' => 'imagefield_widget',
+        'module' => 'imagefield',
     ),
-  );
+    );
 
-  // Exported field: field_url
-  $fields['profile-field_url'] = array(
+    // Exported field: field_url
+    $fields['profile-field_url'] = array(
     'field_name' => 'field_url',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -624,56 +624,56 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => 5,
-      'size' => '42',
-      'default_value' => array(
+        'rows' => 5,
+        'size' => '42',
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_url][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => 'Website URL',
-      'weight' => '9',
-      'description' => '',
-      'type' => 'text_textfield',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_url][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => 'Website URL',
+        'weight' => '9',
+        'description' => '',
+        'type' => 'text_textfield',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Exported field: field_zip
-  $fields['profile-field_zip'] = array(
+    // Exported field: field_zip
+    $fields['profile-field_zip'] = array(
     'field_name' => 'field_zip',
     'type_name' => 'profile',
     'display_settings' => array(
-      'label' => array(
+        'label' => array(
         'format' => 'above',
         'exclude' => 0,
-      ),
-      'teaser' => array(
+        ),
+        'teaser' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'full' => array(
+        ),
+        'full' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '4' => array(
+        ),
+        '4' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '2' => array(
+        ),
+        '2' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      '3' => array(
+        ),
+        '3' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
-      'token' => array(
+        ),
+        'token' => array(
         'format' => 'default',
         'exclude' => 0,
-      ),
+        ),
     ),
     'widget_active' => '1',
     'type' => 'text',
@@ -686,32 +686,32 @@ 
     'allowed_values' => '',
     'allowed_values_php' => '',
     'widget' => array(
-      'rows' => 5,
-      'size' => '10',
-      'default_value' => array(
+        'rows' => 5,
+        'size' => '10',
+        'default_value' => array(
         '0' => array(
-          'value' => '',
-          '_error_element' => 'default_value_widget][field_zip][0][value',
-        ),
-      ),
-      'default_value_php' => NULL,
-      'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
-      'weight' => '6',
-      'description' => '',
-      'type' => 'text_textfield',
-      'module' => 'text',
+            'value' => '',
+            '_error_element' => 'default_value_widget][field_zip][0][value',
+        ),
+        ),
+        'default_value_php' => NULL,
+        'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
+        'weight' => '6',
+        'description' => '',
+        'type' => 'text_textfield',
+        'module' => 'text',
     ),
-  );
+    );
 
-  // Translatables
-  // Use bts() function to translate additional strings.
-  bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
-  bts('Country', array(), NULL, 'boinc:country-of-origin');
-  bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
-  bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
-  bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
+    // Translatables
+    // Use bts() function to translate additional strings.
+    bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
+    bts('Country', array(), NULL, 'boinc:country-of-origin');
+    bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
+    bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
+    bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
+    bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
+    bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
 
-  return $fields;
+    return $fields;
 }

Upper-Lower-Casing +17 added lines, -17 removed lines

@@ -59,10 +59,10 @@ 
           '_error_element' => 'default_value_widget][field_background][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Your personal background', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Your personal background', array(), null, 'boinc:account-profile-edit'),
       'weight' => '3',
-      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), NULL, 'boinc:account-profile-edit'),
+      'description' => bts('Tell us about yourself. You could tell us where you\'re from, your age, occupation, hobbies, or anything else about yourself.', array(), null, 'boinc:account-profile-edit'),
       'type' => 'text_textarea',
       'module' => 'text',
     ),
@@ -350,7 +350,7 @@ 
           'value' => '',
         ),
       ),
-      'default_value_php' => NULL,
+      'default_value_php' => null,
       'label' => 'Country',
       'weight' => '5',
       'description' => '',
@@ -489,14 +489,14 @@ 
           '_error_element' => 'default_value_widget][field_opinions][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Your opinions about this project', array(), null, 'boinc:account-profile-edit'),
       'weight' => '4',
       'description' => bts('Tell us your thoughts about @this_project
    1. Why do you run @this_project?
    2. What are your views about the project?
    3. Any suggestions?',
-      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:account-profile-edit'),
+      array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:account-profile-edit'),
       'type' => 'text_textarea',
       'module' => 'text',
     ),
@@ -632,7 +632,7 @@ 
           '_error_element' => 'default_value_widget][field_url][0][value',
         ),
       ),
-      'default_value_php' => NULL,
+      'default_value_php' => null,
       'label' => 'Website URL',
       'weight' => '9',
       'description' => '',
@@ -694,8 +694,8 @@ 
           '_error_element' => 'default_value_widget][field_zip][0][value',
         ),
       ),
-      'default_value_php' => NULL,
-      'label' => bts('Postal code', array(), NULL, 'boinc:account-profile-edit'),
+      'default_value_php' => null,
+      'label' => bts('Postal code', array(), null, 'boinc:account-profile-edit'),
       'weight' => '6',
       'description' => '',
       'type' => 'text_textfield',
@@ -705,13 +705,13 @@ 
 
   // Translatables
   // Use bts() function to translate additional strings.
-  bts('Avatar', array(), NULL, 'boinc:account-profile-edit');
-  bts('Country', array(), NULL, 'boinc:country-of-origin');
-  bts('Profile image', array(), NULL, 'boinc:account-profile-edit');
-  bts('Website URL', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your opinions about this project', array(), NULL, 'boinc:account-profile-edit');
-  bts('Your personal background', array(), NULL, 'boinc:account-profile-edit');
-  bts('Postal code', array(), NULL, 'boinc:account-profile-edit');
+  bts('Avatar', array(), null, 'boinc:account-profile-edit');
+  bts('Country', array(), null, 'boinc:country-of-origin');
+  bts('Profile image', array(), null, 'boinc:account-profile-edit');
+  bts('Website URL', array(), null, 'boinc:account-profile-edit');
+  bts('Your opinions about this project', array(), null, 'boinc:account-profile-edit');
+  bts('Your personal background', array(), null, 'boinc:account-profile-edit');
+  bts('Postal code', array(), null, 'boinc:account-profile-edit');
 
   return $fields;
 }

drupal/sites/all/features/stats_charts/stats_charts.panels_default.inc

Indentation +35 added lines, -35 removed lines

@@ -4,33 +4,33 @@ 
  * Implementation of hook_default_panels_mini().
  */
 function stats_charts_default_panels_mini() {
-  $export = array();
+    $export = array();
 
-  $mini = new stdClass;
-  $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
-  $mini->api_version = 1;
-  $mini->name = 'project_stats_overview';
-  $mini->category = 'BOINC';
-  $mini->admin_title = 'Project stats overview';
-  $mini->admin_description = 'General statistical information for the project';
-  $mini->requiredcontexts = array();
-  $mini->contexts = array();
-  $mini->relationships = array();
-  $display = new panels_display;
-  $display->layout = 'onecol';
-  $display->layout_settings = array();
-  $display->panel_settings = array(
+    $mini = new stdClass;
+    $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
+    $mini->api_version = 1;
+    $mini->name = 'project_stats_overview';
+    $mini->category = 'BOINC';
+    $mini->admin_title = 'Project stats overview';
+    $mini->admin_description = 'General statistical information for the project';
+    $mini->requiredcontexts = array();
+    $mini->contexts = array();
+    $mini->relationships = array();
+    $display = new panels_display;
+    $display->layout = 'onecol';
+    $display->layout_settings = array();
+    $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'middle' => NULL,
+        'default' => NULL,
+        'middle' => NULL,
     ),
-  );
-  $display->cache = array();
-  $display->title = '';
-  $display->storage_type = 'panels_mini';
-  $display->storage_id = 'project_stats_overview';
-  $display->content = array();
-  $display->panels = array();
+    );
+    $display->cache = array();
+    $display->title = '';
+    $display->storage_type = 'panels_mini';
+    $display->storage_id = 'project_stats_overview';
+    $display->content = array();
+    $display->panels = array();
     $pane = new stdClass;
     $pane->pid = 'new-1';
     $pane->panel = 'middle';
@@ -39,25 +39,25 @@ 
     $pane->shown = TRUE;
     $pane->access = array();
     $pane->configuration = array(
-      'admin_title' => 'Project stats overview',
-      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
-      'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
-      'format' => '3',
-      'substitute' => TRUE,
+        'admin_title' => 'Project stats overview',
+        'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
+        'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
+        'format' => '3',
+        'substitute' => TRUE,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+        'settings' => NULL,
     );
     $pane->css = array();
     $pane->extras = array();
     $pane->position = 0;
     $display->content['new-1'] = $pane;
     $display->panels['middle'][0] = 'new-1';
-  $display->hide_title = PANELS_TITLE_FIXED;
-  $display->title_pane = 'new-1';
-  $mini->display = $display;
-  $export['project_stats_overview'] = $mini;
+    $display->hide_title = PANELS_TITLE_FIXED;
+    $display->title_pane = 'new-1';
+    $mini->display = $display;
+    $export['project_stats_overview'] = $mini;
 
-  return $export;
+    return $export;
 }

Upper-Lower-Casing +7 added lines, -7 removed lines

@@ -7,7 +7,7 @@ 
   $export = array();
 
   $mini = new stdClass;
-  $mini->disabled = FALSE; /* Edit this to true to make a default mini disabled initially */
+  $mini->disabled = false; /* Edit this to true to make a default mini disabled initially */
   $mini->api_version = 1;
   $mini->name = 'project_stats_overview';
   $mini->category = 'BOINC';
@@ -21,8 +21,8 @@ 
   $display->layout_settings = array();
   $display->panel_settings = array(
     'style_settings' => array(
-      'default' => NULL,
-      'middle' => NULL,
+      'default' => null,
+      'middle' => null,
     ),
   );
   $display->cache = array();
@@ -36,18 +36,18 @@ 
     $pane->panel = 'middle';
     $pane->type = 'custom';
     $pane->subtype = 'custom';
-    $pane->shown = TRUE;
+    $pane->shown = true;
     $pane->access = array();
     $pane->configuration = array(
       'admin_title' => 'Project stats overview',
-      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), NULL, 'boinc:frontpage'),
+      'title' => bts('@this_project Progress', array('@this_project' => variable_get('site_name', 'Drupal-BOINC')), null, 'boinc:frontpage'),
       'body' => '<?php echo boincstats_get_project_stats_overview(); ?>',
       'format' => '3',
-      'substitute' => TRUE,
+      'substitute' => true,
     );
     $pane->cache = array();
     $pane->style = array(
-      'settings' => NULL,
+      'settings' => null,
     );
     $pane->css = array();
     $pane->extras = array();

html/ops/fix_project_prefs.php

Spacing +3 added lines, -3 removed lines

@@ -76,7 +76,7 @@ 
             // changing the tree in a loop has strange results so do it separately
             $to_remove = array();
             $ids = array();
-            foreach($appids as $elem) {
+            foreach ($appids as $elem) {
                 $ids[] = $elem->nodeValue;
                 $to_remove[] = $elem;
             }
@@ -94,7 +94,7 @@ 
         exit(1);
     }
     $appids = $node->getElementsByTagName("app_id");
-    if ($appids->length == 0 ) return;
+    if ($appids->length == 0) return;
     // changing the tree in a loop has strange results so do it separately
     $to_remove = array();
     $ids = array();
@@ -129,7 +129,7 @@ 
         $to_remove = array();
         foreach ($subNodes as $subNode) {
             // ignore empty text nodes which are basically whitespace from indentation (only relevant if preserveWhiteSpace is set to true above)
-            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) &&(strlen(trim($subNode->wholeText))>=1))) {
+            if (($subNode->nodeType != XML_TEXT_NODE) || (($subNode->nodeType == XML_TEXT_NODE) && (strlen(trim($subNode->wholeText)) >= 1))) {
                 if ($subNode->nodeName == "venue") {
                     if (!$subNode->hasChildNodes()) {
                         // empty venue tag, clean this up too

html/user/profile_menu.php

Spacing +6 added lines, -6 removed lines

@@ -41,7 +41,7 @@ 
 start_table();
 
 $today = getdate(time());
-$UOTD_heading = tra("User of the Day")." -- " . $today['month'] . " " . $today['mday'] . ", " . $today['year'];
+$UOTD_heading = tra("User of the Day")." -- ".$today['month']." ".$today['mday'].", ".$today['year'];
 row1($UOTD_heading);
 echo "<tr><td>";
     $profile = get_current_uotd();
@@ -59,15 +59,15 @@ 
 row1(tra("User Profile Explorer"));
 echo "<tr><td>
     <ul>
-    <li>".tra("View the %1 User Picture Gallery %2.", "<a href=\"" . url_base() . "user_profile/user_gallery_1.html\">", "</a>")."</li>
-    <li>".tra("Browse profiles %1 by country %2.", "<a href=\"" . url_base() . "user_profile/profile_country.html\">", "</a>")."</li>
+    <li>".tra("View the %1 User Picture Gallery %2.", "<a href=\"".url_base()."user_profile/user_gallery_1.html\">", "</a>")."</li>
+    <li>".tra("Browse profiles %1 by country %2.", "<a href=\"".url_base()."user_profile/profile_country.html\">", "</a>")."</li>
     <li>".tra("Browse profiles %1 at random %2, %3 at random with pictures %2, or %4 at random without pictures %2.", "<a href=\"?cmd=rand&amp;pic=-1\">", "</a>",
             "<a href=\"?cmd=rand&amp;pic=1\">", "<a href=\"?cmd=rand&amp;pic=0\">")."</li>
 ";
-if (file_exists(PROFILE_PATH . "profile_alpha.html")) {
+if (file_exists(PROFILE_PATH."profile_alpha.html")) {
     echo "<li>".tra("Alphabetical profile listings:")."<br>";
 
-    include( PROFILE_PATH . "profile_alpha.html" );
+    include(PROFILE_PATH."profile_alpha.html");
 }
 echo "</ul></td></tr>";
 
@@ -110,5 +110,5 @@ 
     }
 }
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

html/user/forum_search_action.php

Indentation +2 added lines, -2 removed lines

@@ -219,8 +219,8 @@
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",
-         "<a href=\"https://www.google.com/search?domains=".url_base()."&sitesearch=".url_base()."forum_thread.php&q=".htmlentities($search_keywords)."\">",
-         "</a>")
+            "<a href=\"https://www.google.com/search?domains=".url_base()."&sitesearch=".url_base()."forum_thread.php&q=".htmlentities($search_keywords)."\">",
+            "</a>")
     ."</p>";
 }
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";

Spacing +24 added lines, -24 removed lines

@@ -31,10 +31,10 @@ 
 // Optionally filters by forum, user, time, or hidden if specified.
 //
 function search_thread_titles(
-    $keyword_list, $forum="", $user="", $time="", $limit=200,
-    $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
-    $search_string="%";
+    $keyword_list, $forum = "", $user = "", $time = "", $limit = 200,
+    $sort_style = CREATE_TIME_NEW, $show_hidden = false
+) {
+    $search_string = "%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
@@ -51,7 +51,7 @@ 
     if (!$show_hidden) {
         $query .= " and thread.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case MODIFIED_NEW:
         $query .= ' ORDER BY timestamp DESC';
         break;
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
-    $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    $search_string = "%";
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -100,20 +100,20 @@ 
     }
     $query = "select post.* from ".$db->db_name.".post".$optional_join." where content like '".$search_string."'";
     if ($forum) {
-        $query.=" and forum = $forum->id";
+        $query .= " and forum = $forum->id";
     }
     if ($user) {
-        $query.=" and post.user = $user->id ";
+        $query .= " and post.user = $user->id ";
     }
     if ($time) {
-        $query.=" and post.timestamp > $time";
+        $query .= " and post.timestamp > $time";
     }
     if (!$show_hidden) {
         $query .= " AND post.hidden = 0";
     }
-    switch($sort_style) {
+    switch ($sort_style) {
     case VIEWS_MOST:
-        $query.= ' ORDER BY views DESC';
+        $query .= ' ORDER BY views DESC';
         break;
     case CREATE_TIME_NEW:
         $query .= ' ORDER by post.timestamp desc';
@@ -128,13 +128,13 @@ 
         $query .= ' ORDER BY post.timestamp DESC';
         break;
     }
-    $query.= " limit $limit";
+    $query .= " limit $limit";
     return BoincPost::enum_general($query);
 }
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -147,7 +147,7 @@ 
 $search_max_time = post_int("search_max_time");
 $search_forum = post_int("search_forum");
 $search_sort = post_int("search_sort");
-$search_list = explode(" ",$search_keywords);
+$search_list = explode(" ", $search_keywords);
 if ($search_max_time) {
     $min_timestamp = time() - ($search_max_time*3600*24);
 } else {
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum == -1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,11 +173,11 @@ 
 
 // Display the threads while we search for posts
 //
-if (count($threads)){
-    echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
+if (count($threads)) {
+    echo "<h3>".tra("Thread titles matching your query:")."</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if ($thread->hidden) continue;
         thread_list_item($thread, $logged_in_user);
     }
@@ -193,8 +193,8 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
-    echo "<h3>" . tra("Messages matching your query:") . "</h3>";
+if (count($posts)) {
+    echo "<h3>".tra("Messages matching your query:")."</h3>";
     start_table('table-striped');
     row_heading_array(['Info', 'Post'], ['', 'width=70%']);
     $n = 1;
@@ -217,7 +217,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",
@@ -228,5 +228,5 @@ 
 echo "<p><a href=\"forum_search.php\">".tra("Perform another search")."</a></p>";
 page_tail();
 
-$cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
+$cvs_version_tracker[] = "\$Id$"; //Generated automatically - do not edit
 ?>

Braces +9 added lines, -9 removed lines

@@ -33,7 +33,7 @@ 
 function search_thread_titles(
     $keyword_list, $forum="", $user="", $time="", $limit=200,
     $sort_style=CREATE_TIME_NEW, $show_hidden = false
-){
+) {
     $search_string="%";
     foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
@@ -84,11 +84,11 @@ 
 //
 function search_post_content(
     $keyword_list, $forum, $user, $time, $limit, $sort_style, $show_hidden
-){
+) {
     $db = BoincDb::get();
 
     $search_string="%";
-    foreach ($keyword_list as $key => $word){
+    foreach ($keyword_list as $key => $word) {
         $search_string .= BoincDb::escape_string($word)."%";
     }
     $optional_join = "";
@@ -134,7 +134,7 @@ 
 
 $logged_in_user = get_logged_in_user(false);
 BoincForumPrefs::lookup($logged_in_user);
-if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)){
+if ($logged_in_user && $logged_in_user->prefs->privilege(S_MODERATOR)) {
     $show_hidden_posts = true;
 } else {
     $show_hidden_posts = false;
@@ -156,7 +156,7 @@ 
 
 $limit = 100;
 
-if ($search_forum==-1){
+if ($search_forum==-1) {
     $forum = null;
 } else if ($search_forum) {
     $forum = BoincForum::lookup_id($search_forum);
@@ -173,11 +173,11 @@ 
 
 // Display the threads while we search for posts
 //
-if (count($threads)){
+if (count($threads)) {
     echo "<h3>" . tra("Thread titles matching your query:") . "</h3>";
     start_table('table-striped');
     thread_list_header();
-    foreach ($threads as $thread){
+    foreach ($threads as $thread) {
         if ($thread->hidden) continue;
         thread_list_item($thread, $logged_in_user);
     }
@@ -193,7 +193,7 @@ 
     $show_hidden_posts
 );
 
-if (count($posts)){
+if (count($posts)) {
     echo "<h3>" . tra("Messages matching your query:") . "</h3>";
     start_table('table-striped');
     row_heading_array(['Info', 'Post'], ['', 'width=70%']);
@@ -217,7 +217,7 @@ 
     end_table();
 }
 
-if (!count($threads) && !count($posts)){
+if (!count($threads) && !count($posts)) {
     echo "<p>".tra("Sorry, couldn't find anything matching your search query. You can try to broaden your search by using less words (or less specific words).")."</p>
     <p>"
     .tra("You can also %1 try the same search on Google. %2",

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

Braces +1 added lines, -2 removed lines

@@ -387,8 +387,7 @@
     $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>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('This is a team-only message board', array(), NULL, 'boinc:team-forum') . ':</p>';
   }
   $output .= '<ul>';

Indentation +121 added lines, -121 removed lines

@@ -25,29 +25,29 @@ 
  * Implementation of hook_menu()
  */
 function boincteam_forum_menu() {
-  $items = array();
+    $items = array();
 
-  return $items;
+    return $items;
 }
 
 /**
 * Implementation of hook_form_alter()
 */
 function boincteam_forum_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-  // Team forum node edit form
-  case 'team_forum_node_form':
+    switch ($form_id) {
+    // Team forum node edit form
+    case 'team_forum_node_form':
 
     // Internal fields to indicate where these changes are taking place
     array_unshift($form, array(
-      'tfid' => array(
+        'tfid' => array(
         '#type' => 'hidden',
         '#value' => arg(3),
-      ),
+        ),
     ));
     break;
 
-  default:
+    default:
   }
 }
 
@@ -56,26 +56,26 @@ 
  * Obsolete in Drupal 7...
  */
 function boincteam_forum_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // 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) {
-  case 'insert':
+    // 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) {
+    case 'insert':
     boincteam_forum_node_insert($node);
     break;
-  case 'load':
+    case 'load':
     boincteam_forum_node_load($node);
     break;
-  case 'update':
+    case 'update':
     boincteam_forum_node_update($node);
     break;
-  case 'validate':
+    case 'validate':
     boincteam_forum_node_validate($node);
     break;
-  case 'view':
+    case 'view':
     boincteam_forum_node_view($node);
     break;
-  default:
+    default:
   }
 }
 
@@ -84,21 +84,21 @@ 
  * is inserted (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_insert($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     if ($account->team == $team_id) {
-      db_query("
+        db_query("
         INSERT INTO {boincteam_forum_node} SET
           nid = %d,
           tfid = %d",
         $node->nid, $node->tfid
-      );
+        );
     }
     unset($node->tfid);
     break;
-  default:
+    default:
   }
 }
 
@@ -107,15 +107,15 @@ 
  * is loaded (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_load($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $node->tfid = db_result(db_query("
       SELECT tfid FROM {boincteam_forum_node}
       WHERE nid = %d", $node->nid
     ));
     break;
 
-  default:
+    default:
 
   }
 }
@@ -125,12 +125,12 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_update($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
 
     break;
 
-  default:
+    default:
 
   }
 }
@@ -140,8 +140,8 @@ 
  * is validated (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_validate($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $account = user_load($node->uid);
     // Get tfid from node, but if empty/null, get it from the database
     if (!($node->tfid)) {
@@ -154,11 +154,11 @@ 
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
     if (!$account->team OR $account->team != $team_id) {
-      drupal_set_message(t('Failed to add team forum topic.'), 'error');
-      drupal_goto('community/forum');
+        drupal_set_message(t('Failed to add team forum topic.'), 'error');
+        drupal_goto('community/forum');
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -167,19 +167,19 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boincteam_forum_node_view($node) {
-  switch($node->type) {
-  case 'team_forum':
+    switch($node->type) {
+    case 'team_forum':
     $team_id = boincteam_forum_lookup_nid($node->tfid);
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
     if (!$public_forum AND !$is_member AND !$is_global_moderator) {
-      drupal_not_found();
-      module_invoke_all('exit');
-      exit();
+        drupal_not_found();
+        module_invoke_all('exit');
+        exit();
     }
     break;
-  default:
+    default:
   }
 }
 
@@ -187,17 +187,17 @@ 
 * Implementation of hook_views_api().
 */
 function boincteam_forum_views_api() {
-  return array(
+    return array(
     'api' => 2.0,
     'path' => drupal_get_path('module', 'boincteam_forum')
-  );
+    );
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boincteam_forum_perm() {
-  return array('manage boincteam forum');
+    return array('manage boincteam forum');
 }
 
 
@@ -209,43 +209,43 @@ 
  * Check if the user has global access to moderate team forums
  */
 function boincteam_forum_is_global_moderator() {
-  global $user;
-  return user_access('manage boincteam forum');
+    global $user;
+    return user_access('manage boincteam forum');
 }
 
 /*
  * Check if any forums for a team are public
  */
 function boincteam_forum_is_any_public($team_id) {
-  $forums = boincteam_forum_list($team_id);
-  foreach ($forums as $forum) {
+    $forums = boincteam_forum_list($team_id);
+    foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+        return TRUE;
     }
-  }
-  return FALSE;
+    }
+    return FALSE;
 }
 
 /*
  * Check if a team forum should be visible to everyone
  */
 function boincteam_forum_is_public($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT public FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 /*
  * Load the forums for a team, if any exist
  */
 function boincteam_forum_list($team_id = NULL) {
-  if (!$team_id) {
+    if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
     $team_id = $account->team;
-  }
-  $team_forums = array();
-  if ($team_id) {
+    }
+    $team_forums = array();
+    if ($team_id) {
     // Load any team forum objects for the user's team
     $result = db_query("
       SELECT tfid, nid, title, description, created, updated, public,
@@ -255,26 +255,26 @@ 
     $row = 0;
     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->new_topics = 0; // TODO: Track user views of team topics
-      $team_forum->new_text = '';
-      $team_forum->new_url = '';
-      $team_forum->num_topics = db_result(db_query("
+        $team_forum->link = url("community/teams/{$team_id}/forum/{$team_forum->tfid}");
+        $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 = '';
+        $team_forum->num_topics = db_result(db_query("
         SELECT COUNT(nid) FROM {boincteam_forum_node}
         WHERE tfid = %d",
         $team_forum->tfid
-      ));
-      $team_forum->num_posts = db_result(db_query("
+        ));
+        $team_forum->num_posts = db_result(db_query("
         SELECT COALESCE(SUM(ncs.comment_count),0) + COUNT(ncs.nid)
         FROM {boincteam_forum_node} bfn
         JOIN {node_comment_statistics} ncs ON ncs.nid = bfn.nid
         JOIN {node} n ON n.nid = ncs.nid
         WHERE bfn.tfid = %d AND n.status = 1",
         $team_forum->tfid
-      ));
-      $last_post = new stdClass();
-      $last_post->timestamp = db_result(db_query("
+        ));
+        $last_post = new stdClass();
+        $last_post->timestamp = db_result(db_query("
         SELECT ncs.last_comment_timestamp FROM {node} n
         INNER JOIN {boincteam_forum_node} bfn
         INNER JOIN {node_comment_statistics} ncs ON n.nid = bfn.nid AND n.nid = ncs.nid
@@ -282,36 +282,36 @@ 
         ORDER BY ncs.last_comment_timestamp DESC
         LIMIT 1",
         $team_forum->tfid
-      ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
-      $team_forums[$team_forum->tfid] = $team_forum;
-      $row++;
+        ));
+        $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+        $team_forums[$team_forum->tfid] = $team_forum;
+        $row++;
     }
-  }
-  return $team_forums;
+    }
+    return $team_forums;
 }
 
 /*
  * Load a team forum by ID
  */
 function boincteam_forum_load($tfid) {
-  // Load any team forum objects for the user's team
-  $result = db_query("
+    // Load any team forum objects for the user's team
+    $result = db_query("
     SELECT tfid, nid, title, description, created, updated, public,
       min_time_between_posts, min_total_credit_to_post, min_avg_credit_to_post
     FROM {boincteam_forum} WHERE tfid=%d", $tfid
-  );
-  return db_fetch_object($result);
+    );
+    return db_fetch_object($result);
 }
 
 /*
  * Look up the team ID for a given team forum
  */
 function boincteam_forum_lookup_nid($tfid) {
-  return db_result(db_query("
+    return db_result(db_query("
     SELECT nid FROM {boincteam_forum}
     WHERE tfid=%d", $tfid
-  ));
+    ));
 }
 
 
@@ -323,80 +323,80 @@ 
  * Create team forum form
  */
 function boincteam_forum_create_form_panel() {
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
+    $output = '';
+    $output .= '<h2 class="pane-title">' . bts('Create team message board', array(), NULL, 'boinc:team-forum')
     . '</h2>';
-  $output .= drupal_get_form('boincteam_forum_create_form');
+    $output .= drupal_get_form('boincteam_forum_create_form');
 
-  return $output;
+    return $output;
 }
 
 /**
  * Edit team forum form
  */
 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 = boincteam_forum_load($tfid);
+    $output = '';
+    $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);
+    $output .= drupal_get_form('boincteam_forum_edit_form', $tfid);
 
-  return $output;
+    return $output;
 }
 
 /**
  * Link to team forums
  */
 function boincteam_forum_link_panel($team_id) {
-  $show_public_only = (
+    $show_public_only = (
     !boincteam_is_member($team_id) AND
     !boincteam_forum_is_global_moderator()
-  );
-  $forums = boincteam_forum_list($team_id);
-  $output = '';
-  $output .= '<h2 class="pane-title">' . bts('Team forum', array(), NULL, 'boinc:team-forum') . '</h2>';
-  $output .= '<p>'
+    );
+    $forums = boincteam_forum_list($team_id);
+    $output = '';
+    $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) {
+    $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}"
+            //$forum->title,
+            bts('Enter forum', array(), NULL, 'boinc:team-forum'),
+            "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</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;
+        // 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;
     }
-  }
-  $output .= '</ul>';
-  return $output;
+    }
+    $output .= '</ul>';
+    return $output;
 }
 
 /**
  * General info about team forums
  */
 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 .= '<div>';
-  if ($nid) {
+    $output = '';
+    $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>';
-  }
-  else {
+        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 .= '<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 .= '<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') .
     '</li>';
-  $output .= '</ul>';
-  $output .= '</div>';
-  return $output;
+    $output .= '</ul>';
+    $output .= '</div>';
+    return $output;
 }

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>';

Upper-Lower-Casing +20 added lines, -20 removed lines

@@ -153,7 +153,7 @@ 
         $tfid = $node->tfid;
     }
     $team_id = boincteam_forum_lookup_nid($tfid);
-    if (!$account->team OR $account->team != $team_id) {
+    if (!$account->team or $account->team != $team_id) {
       drupal_set_message(t('Failed to add team forum topic.'), 'error');
       drupal_goto('community/forum');
     }
@@ -173,7 +173,7 @@ 
     $public_forum = boincteam_forum_is_public($node->tfid);
     $is_member = boincteam_is_member($team_id);
     $is_global_moderator = boincteam_forum_is_global_moderator();
-    if (!$public_forum AND !$is_member AND !$is_global_moderator) {
+    if (!$public_forum and !$is_member and !$is_global_moderator) {
       drupal_not_found();
       module_invoke_all('exit');
       exit();
@@ -220,10 +220,10 @@ 
   $forums = boincteam_forum_list($team_id);
   foreach ($forums as $forum) {
     if ($forum->public) {
-      return TRUE;
+      return true;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /*
@@ -238,7 +238,7 @@ 
 /*
  * Load the forums for a team, if any exist
  */
-function boincteam_forum_list($team_id = NULL) {
+function boincteam_forum_list($team_id = null) {
   if (!$team_id) {
     global $user;
     $account = user_load($user->uid);
@@ -283,7 +283,7 @@ 
         LIMIT 1",
         $team_forum->tfid
       ));
-      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : NULL);
+      $team_forum->last_reply = theme('forum_submitted', ($last_post->timestamp) ? $last_post : null);
       $team_forums[$team_forum->tfid] = $team_forum;
       $row++;
     }
@@ -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,7 +337,7 @@ 
 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') . ': ' .
+  $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);
 
@@ -349,22 +349,22 @@ 
  */
 function boincteam_forum_link_panel($team_id) {
   $show_public_only = (
-    !boincteam_is_member($team_id) AND
+    !boincteam_is_member($team_id) and
     !boincteam_forum_is_global_moderator()
   );
   $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')
+    . 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) {
+    if (!$show_public_only or $forum->public) {
       $output .= '  <li class="tab primary">' .
         l(
           //$forum->title,
-          bts('Enter forum', array(), NULL, 'boinc:team-forum'),
+          bts('Enter forum', array(), null, 'boinc:team-forum'),
           "community/teams/{$team_id}/forum/{$forum->tfid}"
         ) . '</li>';
       // Since we're only supporting one team forum for now, we've labeled the
@@ -379,22 +379,22 @@ 
 /**
  * General info about team forums
  */
-function boincteam_forum_topic_overview_panel($nid = NULL) {
+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>';
+      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/boinctranslate/boinctranslate.module

Braces +5 added lines, -10 removed lines

@@ -136,8 +136,7 @@ 
         $lidkey = array_search($chunk['hash'], $nodehashtable);
         if ($lidkey) {
           unset($nodehashtable[$lidkey]);
-        }
-        else {
+        } else {
 
           $result = db_query("
             INSERT INTO {locales_source}
@@ -150,8 +149,7 @@ 
               'Added translation source strings for node @nid chunk @chunk.',
               array('@nid' => $node->nid, '@chunk' => $idx)
            );
-          }
-          else {
+          } else {
             drupal_set_message(
               t('ERROR: Unable to add translation source strings.'), 'error'
             );
@@ -248,12 +246,10 @@ 
         $mess = 'DEBUG ' . l('BOINC translate', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.';
         drupal_set_message($mess, 'warning');
         return $ret;
-      }
-      else {
+      } else {
         return _boinctranslate_filter_process($text, $format, $mynid);
       }// if debug
-    }
-    else {
+    } else {
       return $text;
     }// if type
     break;
@@ -309,8 +305,7 @@ 
   foreach ($parts as $key => $value) {
     if (preg_match('/(#SPLIT_TOKEN#)/', $value)) {
       $chunks[] = array ('delimiter' => $value,);
-    }
-    else {
+    } else {
       $cleaned = preg_replace('/\s|\n/', '', $value);
       if (!empty($cleaned)) {
         $chunks[] = array(

Indentation +101 added lines, -101 removed lines

@@ -28,7 +28,7 @@ 
  * with defined URL paths
  */
 function boinctranslate_menu() {
-  $items['admin/boinc/translation'] = array(
+    $items['admin/boinc/translation'] = array(
     'title' => 'Environment: Translation',
     'description' => 'Configure URLs for translation files (i.e. integration
       with BOINC Translation Services).',
@@ -37,38 +37,38 @@ 
     'access arguments' => array('administer site configuration'),
     'type' => MENU_NORMAL_ITEM,
     'file' => 'boinctranslate.admin.inc'
-  );
-  $items['admin/boinc/translation/export'] = array(
+    );
+    $items['admin/boinc/translation/export'] = array(
     'title' => 'Export translations',
     'page callback' => 'boinctranslate_export_translations',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/translation/import'] = array(
+    );
+    $items['admin/boinc/translation/import'] = array(
     'title' => 'Import translations',
     'page callback' => 'boinctranslate_refresh_translations',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/translation/initialize-languages'] = array(
+    );
+    $items['admin/boinc/translation/initialize-languages'] = array(
     'title' => 'Install official BOINC languages',
     'page callback' => 'boinctranslate_initialize_languages',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/translation/update-official-boinc'] = array(
+    );
+    $items['admin/boinc/translation/update-official-boinc'] = array(
     'title' => 'Update official BOINC translations',
     'page callback' => 'boinctranslate_update_official_boinc_translations',
     'access arguments' => array('update official BOINC translations'),
     'type' => MENU_CALLBACK,
-  );
-  $items['admin/boinc/translation/download-pot'] = array(
+    );
+    $items['admin/boinc/translation/download-pot'] = array(
     'title' => 'Download translation template',
     'page callback' => 'boinctranslate_download_pot',
     'access arguments' => array('administer site configuration'),
     'type' => MENU_CALLBACK,
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
@@ -76,18 +76,18 @@ 
  * Obsolete in Drupal 7...
  */
 function boinctranslate_nodeapi(&$node, $op, $a3 = null, $a4 = null) {
-  // 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) {
-  case 'update':
+    // 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) {
+    case 'update':
     boinctranslate_node_update($node);
     break;
-  case 'view':
+    case 'view':
     global $language;
     boinctranslate_node_view($node, 'full', $language->language);
     break;
-  default:
+    default:
   }
 }
 
@@ -96,9 +96,9 @@ 
  * is updated (forward compatible to Drupal 7)
  */
 function boinctranslate_node_update($node) {
-  // Only process nodes of certain types as defined by the individual
-  // node's setting for field_boinctranslate_transifex.
-  if ( ($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value']=='1') ) {
+    // Only process nodes of certain types as defined by the individual
+    // node's setting for field_boinctranslate_transifex.
+    if ( ($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value']=='1') ) {
     // Add page content to translation table.
     $textgroup = 'project';
     $location = "node:{$node->nid}:body";
@@ -112,19 +112,19 @@ 
     // Table of lid and hashes
     $nodehashtable = array();
     while ($row = db_fetch_array($dbresult)) {
-      $locsplit = explode(":", $row['location']);
-      // Look for hash in the fourth position.
-      if (isset($locsplit[3])) {
+        $locsplit = explode(":", $row['location']);
+        // Look for hash in the fourth position.
+        if (isset($locsplit[3])) {
         $nodehashtable[$row['lid']] = $locsplit[3];
-      }
+        }
     }// while
 
     // Break node body into chunks.
     $chunks = boinctranslate_splitfortranslation($node->body);
     foreach ($chunks as $idx => $chunk) {
 
-      // Only process this chunk if there is a hash associated with it.
-      if ($chunk['hash']) {
+        // Only process this chunk if there is a hash associated with it.
+        if ($chunk['hash']) {
         $chunkloc = $location . ":{$chunk['hash']}";
 
         // If the hash for this chunk is in the hash table, logically
@@ -133,45 +133,45 @@ 
         // Otherwise, add the chunk to the database.
         $lidkey = array_search($chunk['hash'], $nodehashtable);
         if ($lidkey) {
-          unset($nodehashtable[$lidkey]);
+            unset($nodehashtable[$lidkey]);
         }
         else {
 
-          $result = db_query("
+            $result = db_query("
             INSERT INTO {locales_source}
             SET location = '%s', textgroup = '%s', source = '%s'",
             $chunkloc, $textgroup, $chunk['content']
-          );
-          if ($result) {
+            );
+            if ($result) {
             watchdog(
-              'boinctranslate',
-              'Added translation source strings for node @nid chunk @chunk.',
-              array('@nid' => $node->nid, '@chunk' => $idx)
-           );
-          }
-          else {
+                'boinctranslate',
+                'Added translation source strings for node @nid chunk @chunk.',
+                array('@nid' => $node->nid, '@chunk' => $idx)
+            );
+            }
+            else {
             drupal_set_message(
-              t('ERROR: Unable to add translation source strings.'), 'error'
+                t('ERROR: Unable to add translation source strings.'), 'error'
             );
             watchdog(
-              'boinctranslate',
-              'Unable to add translation source strings for node @nid chunk @chunk.',
-              array('@nid' => $node->nid, '@chunk' => $idx),
-              WATCHDOG_ERROR
+                'boinctranslate',
+                'Unable to add translation source strings for node @nid chunk @chunk.',
+                array('@nid' => $node->nid, '@chunk' => $idx),
+                WATCHDOG_ERROR
             );
-          }// if $result
+            }// if $result
         }// if lidkey
 
-      }// if chunk['hash']
+        }// if chunk['hash']
     }// foreach chunks
 
     // Any remaining hashes in the node hash table are deleted.
     foreach ($nodehashtable as $lid => $hash) {
-      db_query('DELETE FROM {locales_source} WHERE lid = %d', $lid);
-      db_query('DELETE FROM {locales_target} WHERE lid = %d', $lid);
-      cache_clear_all('locale:', 'cache', TRUE);
+        db_query('DELETE FROM {locales_source} WHERE lid = %d', $lid);
+        db_query('DELETE FROM {locales_target} WHERE lid = %d', $lid);
+        cache_clear_all('locale:', 'cache', TRUE);
     }
-  }// if type
+    }// if type
 }
 
 /**
@@ -179,10 +179,10 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boinctranslate_node_view($node, $view_mode, $langcode) {
-  switch($node->type) {
-  case 'page':
+    switch($node->type) {
+    case 'page':
     break;
-  default:
+    default:
   }
 }
 
@@ -195,51 +195,51 @@ 
  * boinctranslate_filter_tips
  */
 function boinctranslate_filter_tips($delta, $format, $long = FALSE) {
-  if ($long) {
+    if ($long) {
     return _boinctranslate_filter_tips_long();
-  } else {
+    } else {
     $output = t('You may use !token (opens in new window) as a delimiter to split the translation into different chunks. See the link for a more detailed guide.',
-      array(
+        array(
         '!token' =>  l('#SPLIT_TOKEN#', "filter/tips/$format",
         array(
-          'fragment' => 'filter-boinctranslate-' . $delta,
-          'attributes' =>
+            'fragment' => 'filter-boinctranslate-' . $delta,
+            'attributes' =>
             array(
-              'target'=>'_blank',
-              'rel'=>'noopener noreferrer',
+                'target'=>'_blank',
+                'rel'=>'noopener noreferrer',
             ),
         ))
-      ));
+        ));
     //$output = 'Help with BOINC Translate input filter.';
     return $output;
-  }
+    }
 }
 
 /**
  * boinctranslate_filter
  */
 function boinctranslate_filter($op, $delta = 0, $format = -1, $text = '', $cache_id = 0) {
-  switch ($op) {
-  case 'list':
+    switch ($op) {
+    case 'list':
     return array(0 => bts('BOINC translation filter to help split content into chunks for translations.', array(), NULL, 'boinc:adminpage-boinctranslate-inputfilter'));
 
-  case 'description':
+    case 'description':
     return bts('Splits node content into chunks for translation.', array(), NULL, 'boinc:input-filter-help');
 
-  case 'process':
+    case 'process':
     /* Only process nodes of certain types. On an individual
      * node-by-node level, content editors may choose to select
      * "Export for translation", which will allow this specific node
      * to be translated. By default this is enabled.
      */
     if ($node = menu_get_object()) {
-      $mynid = $node->nid;
+        $mynid = $node->nid;
     } else {
-      return $text;
+        return $text;
     }
 
     if ( ($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value']=='1') ) {
-      if (variable_get("boinctranslate_filter_debug_$format", 0)) {
+        if (variable_get("boinctranslate_filter_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _boinctranslate_filter_process($text, $format, $mynid);
         $timing_stop = explode(' ', microtime());
@@ -248,22 +248,22 @@ 
         $mess = 'DEBUG ' . l('BOINC translate', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.';
         drupal_set_message($mess, 'warning');
         return $ret;
-      }
-      else {
+        }
+        else {
         return _boinctranslate_filter_process($text, $format, $mynid);
-      }// if debug
+        }// if debug
     }
     else {
-      return $text;
+        return $text;
     }// if type
     break;
 
-  case 'settings':
+    case 'settings':
     return boinctranslate_filter_settings_form($format);
 
-  default:
+    default:
     return $text;
-  }
+    }
 }
 
 /**
@@ -271,17 +271,17 @@ 
  * This workaround makes panel page titles and pane titles translatable
  */
 function boinctranslate_panels_pane_content_alter($content, $pane, $args, $context) {
-  if ($content->title) {
+    if ($content->title) {
     $content->title = t($content->title);
-  }
-  return $content;
+    }
+    return $content;
 }
 
 /**
  * Implementation of hook_perm()
  */
 function boinctranslate_perm() {
-  return array('update official BOINC translations');
+    return array('update official BOINC translations');
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -304,23 +304,23 @@ 
  *   The input string to find.
  */
 function boinctranslate_splitfortranslation($instring) {
-  $parts = preg_split('/(#SPLIT_TOKEN#)|<p>(#SPLIT_TOKEN#)<\/p>/', $instring);
-  $chunks = array();
-  foreach ($parts as $key => $value) {
+    $parts = preg_split('/(#SPLIT_TOKEN#)|<p>(#SPLIT_TOKEN#)<\/p>/', $instring);
+    $chunks = array();
+    foreach ($parts as $key => $value) {
     if (preg_match('/(#SPLIT_TOKEN#)/', $value)) {
-      $chunks[] = array ('delimiter' => $value,);
+        $chunks[] = array ('delimiter' => $value,);
     }
     else {
-      $cleaned = preg_replace('/\s|\n/', '', $value);
-      if (!empty($cleaned)) {
+        $cleaned = preg_replace('/\s|\n/', '', $value);
+        if (!empty($cleaned)) {
         $chunks[] = array(
-          'content' => $value,
-          'hash' => hash('sha1', $cleaned),
+            'content' => $value,
+            'hash' => hash('sha1', $cleaned),
         );
-      }// !empty cleaned
+        }// !empty cleaned
     }// preg_match
-  }// foreach part
-  return $chunks;
+    }// foreach part
+    return $chunks;
 }
 
 
@@ -338,19 +338,19 @@ 
  *   location/context string.
  */
 function _boinctranslate_filter_process(&$text, $format = -1, $nid) {
-  $newbody = '';
-  // Break node body into chunks.
-  $chunks = boinctranslate_splitfortranslation($text);
-  foreach ($chunks as $chunk) {
+    $newbody = '';
+    // Break node body into chunks.
+    $chunks = boinctranslate_splitfortranslation($text);
+    foreach ($chunks as $chunk) {
     $location = "project:node:${nid}:body";
     // Only add this chunk to the content if it has a hash, i.e., it
     // is not a delimiter.
     if ($chunk['hash']) {
-      $location .= ":{$chunk['hash']}";
-      $newbody .= bts($chunk['content'], array(), $langcode, $location, FALSE);
+        $location .= ":{$chunk['hash']}";
+        $newbody .= bts($chunk['content'], array(), $langcode, $location, FALSE);
     }
-  }
-  return $newbody;
+    }
+    return $newbody;
 }
 
 
@@ -358,7 +358,7 @@ 
  * Implementation of hooks for l10n_update
  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  */
 function boinctranslate_l10n_update_projects_alter(&$projects) {
-  foreach ($projects as &$proj) {
+    foreach ($projects as &$proj) {
     $proj['info']['l10n path'] = 'https://ftp-origin.drupal.org/files/translations/%core/%project/%project-%release.%language.po';
-  }
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -79,7 +79,7 @@ 
   // In Drupal 7, these operation cases will all exist as their own hooks,
   // so let's approximate that here so that this function can simply be removed
   // upon migration to 7
-  switch($op) {
+  switch ($op) {
   case 'update':
     boinctranslate_node_update($node);
     break;
@@ -98,7 +98,7 @@ 
 function boinctranslate_node_update($node) {
   // Only process nodes of certain types as defined by the individual
   // node's setting for field_boinctranslate_transifex.
-  if ( ($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value']=='1') ) {
+  if (($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value'] == '1')) {
     // Add page content to translation table.
     $textgroup = 'project';
     $location = "node:{$node->nid}:body";
@@ -125,7 +125,7 @@ 
 
       // Only process this chunk if there is a hash associated with it.
       if ($chunk['hash']) {
-        $chunkloc = $location . ":{$chunk['hash']}";
+        $chunkloc = $location.":{$chunk['hash']}";
 
         // If the hash for this chunk is in the hash table, logically
         // the chunk is already in the database locales_source table. As
@@ -179,7 +179,7 @@ 
  * is viewed (forward compatible to Drupal 7)
  */
 function boinctranslate_node_view($node, $view_mode, $langcode) {
-  switch($node->type) {
+  switch ($node->type) {
   case 'page':
     break;
   default:
@@ -202,7 +202,7 @@ 
       array(
         '!token' =>  l('#SPLIT_TOKEN#', "filter/tips/$format",
         array(
-          'fragment' => 'filter-boinctranslate-' . $delta,
+          'fragment' => 'filter-boinctranslate-'.$delta,
           'attributes' =>
             array(
               'target'=>'_blank',
@@ -238,14 +238,14 @@ 
       return $text;
     }
 
-    if ( ($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value']=='1') ) {
+    if (($node->field_boinctranslate_transifex) and ($node->field_boinctranslate_transifex[0]['value'] == '1')) {
       if (variable_get("boinctranslate_filter_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _boinctranslate_filter_process($text, $format, $mynid);
         $timing_stop = explode(' ', microtime());
         $elapsed = $timing_stop[1] - $timing_start[1];
         $elapsed += $timing_stop[0] - $timing_start[0];
-        $mess = 'DEBUG ' . l('BOINC translate', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.';
+        $mess = 'DEBUG '.l('BOINC translate', "filter/tips/$format").' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.';
         drupal_set_message($mess, 'warning');
         return $ret;
       }
@@ -308,7 +308,7 @@ 
   $chunks = array();
   foreach ($parts as $key => $value) {
     if (preg_match('/(#SPLIT_TOKEN#)/', $value)) {
-      $chunks[] = array ('delimiter' => $value,);
+      $chunks[] = array('delimiter' => $value,);
     }
     else {
       $cleaned = preg_replace('/\s|\n/', '', $value);

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -169,7 +169,7 @@ 
     foreach ($nodehashtable as $lid => $hash) {
       db_query('DELETE FROM {locales_source} WHERE lid = %d', $lid);
       db_query('DELETE FROM {locales_target} WHERE lid = %d', $lid);
-      cache_clear_all('locale:', 'cache', TRUE);
+      cache_clear_all('locale:', 'cache', true);
     }
   }// if type
 }
@@ -194,7 +194,7 @@ 
 /**
  * boinctranslate_filter_tips
  */
-function boinctranslate_filter_tips($delta, $format, $long = FALSE) {
+function boinctranslate_filter_tips($delta, $format, $long = false) {
   if ($long) {
     return _boinctranslate_filter_tips_long();
   } else {
@@ -221,10 +221,10 @@ 
 function boinctranslate_filter($op, $delta = 0, $format = -1, $text = '', $cache_id = 0) {
   switch ($op) {
   case 'list':
-    return array(0 => bts('BOINC translation filter to help split content into chunks for translations.', array(), NULL, 'boinc:adminpage-boinctranslate-inputfilter'));
+    return array(0 => bts('BOINC translation filter to help split content into chunks for translations.', array(), null, 'boinc:adminpage-boinctranslate-inputfilter'));
 
   case 'description':
-    return bts('Splits node content into chunks for translation.', array(), NULL, 'boinc:input-filter-help');
+    return bts('Splits node content into chunks for translation.', array(), null, 'boinc:input-filter-help');
 
   case 'process':
     /* Only process nodes of certain types. On an individual
@@ -347,7 +347,7 @@ 
     // is not a delimiter.
     if ($chunk['hash']) {
       $location .= ":{$chunk['hash']}";
-      $newbody .= bts($chunk['content'], array(), $langcode, $location, FALSE);
+      $newbody .= bts($chunk['content'], array(), $langcode, $location, false);
     }
   }
   return $newbody;

drupal/sites/default/boinc/modules/boinctranslate/includes/boinctranslate.helpers.inc

Switch Indentation +58 added lines, -58 removed lines

@@ -1398,72 +1398,72 @@
 
   switch ($op) {
     // Return stored strings
-    case 'mem-report':
-      return $strings;
-
-      // Store string in memory (only supports single strings)
-    case 'mem-store':
-      $strings[$value['msgid']] = $value['msgstr'];
-      return;
-
-      // Called at end of import to inform the user
-    case 'db-report':
-      return array(
-        $headerdone,
-        $report['additions'],
-        $report['updates'],
-        $report['deletes'],
-        $report['skips'],
-      );
+  case 'mem-report':
+    return $strings;
+
+    // Store string in memory (only supports single strings)
+  case 'mem-store':
+    $strings[$value['msgid']] = $value['msgstr'];
+    return;
+
+    // Called at end of import to inform the user
+  case 'db-report':
+    return array(
+      $headerdone,
+      $report['additions'],
+      $report['updates'],
+      $report['deletes'],
+      $report['skips'],
+    );
 
-      // Store the string we got in the database.
-    case 'db-store':
-      // We got header information.
-      if ($value['msgid'] == '') {
-        $languages = language_list();
-        if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
-
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
-            list($nplurals, $plural) = $p;
-            db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+    // Store the string we got in the database.
+  case 'db-store':
+    // We got header information.
+    if ($value['msgid'] == '') {
+      $languages = language_list();
+      if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
+        // Since we only need to parse the header if we ought to update the
+        // plural formula, only run this if we don't need to keep existing
+        // data untouched or if we don't have an existing plural formula.
+        $header = _locale_import_parse_header($value['msgstr']);
+
+        // Get and store the plural formula if available.
+        if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+          list($nplurals, $plural) = $p;
+          db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
         }
-        $headerdone = TRUE;
       }
+      $headerdone = TRUE;
+    }
 
-      else {
-        // Some real string to import.
-        $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
-
-        if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
-            $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
-            if ($key == 0) {
-              $plid = 0;
-            }
-            $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
+    else {
+      // Some real string to import.
+      $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
+
+      if (strpos($value['msgid'], "\0")) {
+        // This string has plural versions.
+        $english = explode("\0", $value['msgid'], 2);
+        $entries = array_keys($value['msgstr']);
+        for ($i = 3; $i <= count($entries); $i++) {
+          $english[] = $english[1];
+        }
+        $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+        $english = array_map('_locale_import_append_plural', $english, $entries);
+        foreach ($translation as $key => $trans) {
+          if ($key == 0) {
+            $plid = 0;
           }
+          $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
         }
+      }
 
-        else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
-        }
+      else {
+        // A simple string to import.
+        $english = $value['msgid'];
+        $translation = $value['msgstr'];
+        _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
       }
+    }
   } // end of db-store operation
 }
 

Upper-Lower-Casing +91 added lines, -91 removed lines

@@ -44,7 +44,7 @@ 
         $available_languages = _locale_get_predefined_list();
         $transifex_languages = array();
         $disabled_languages = array();
-        $process_batches = FALSE;
+        $process_batches = false;
 
         // Set up Transifex languages in Drupal
         foreach ($response as $language) {
@@ -56,12 +56,12 @@ 
             if (isset($available_languages[$rfc_code])) {
               locale_add_language(
                 $rfc_code,
-                NULL,
-                NULL,
-                NULL,
-                NULL,
-                NULL,
-                FALSE
+                null,
+                null,
+                null,
+                null,
+                null,
+                false
               );
               drupal_set_message(
                 'Added predefined language: '.$available_languages[$rfc_code][0]
@@ -90,9 +90,9 @@ 
                     $response['name'],
                     $response['name'],
                     $response['rtl'],
-                    NULL,
-                    NULL,
-                    TRUE
+                    null,
+                    null,
+                    true
                   );
                   drupal_set_message(
                     'Added new language: '.$response['name']
@@ -133,7 +133,7 @@ 
             // Import any language files for the newly added language
             if ($batch = locale_batch_by_language($rfc_code, '_locale_batch_language_finished')) {
               $operations = array_merge($operations, $batch['operations']);
-              $process_batches = TRUE;
+              $process_batches = true;
             }
           }
         }
@@ -206,15 +206,15 @@ 
   $resource_names = boinctranslate_parse_resources($resource_config);
   $primary_resource = reset($resource_names);
 
-  if ($project_name AND $primary_resource) {
+  if ($project_name and $primary_resource) {
     // Create or update the translation source, if needed
-    $source_exists = FALSE;
+    $source_exists = false;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
-    if ($resources AND is_array($resources)) {
+    if ($resources and is_array($resources)) {
       foreach ($resources as $resource) {
         if ($resource['slug'] == $primary_resource) {
-          $source_exists = TRUE;
+          $source_exists = true;
           break;
         }
       }
@@ -236,11 +236,11 @@ 
         $post = array(
           'content' => boinctranslate_get_po('en', 'project')
         );
-        $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+        $result = boinctranslate_transifex_request($path, $post, true, true);
       }
     }
 
-    if (is_array($result) OR substr($result, 0, 6) != 'ERROR:') {
+    if (is_array($result) or substr($result, 0, 6) != 'ERROR:') {
       $enabled_languages = locale_language_list();
       if ($source_exists) {
         drupal_set_message('Updated source translation strings at Transifex');
@@ -259,16 +259,16 @@ 
           $post = array(
             'content' => $po_file,
           );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+          $result = boinctranslate_transifex_request($path, $post, true, true);
           if (!is_array($result)
-          AND substr($result, 0, 6) == 'ERROR:') {
+          and substr($result, 0, 6) == 'ERROR:') {
             drupal_set_message(
               "Unable to update {$language_name} translations: {$result}",
               'warning'
             );
           }
           else {
-            drupal_set_message("Updated {$language_name} translations");
+            drupal_set_message("updated {$language_name} translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
         }
@@ -305,15 +305,15 @@ 
     'boinc_translate_transifex_boinc_drupal_resource', ''
   );
 
-  if ($project_name AND $drupal_resource) {
+  if ($project_name and $drupal_resource) {
     // Create or update the translation source, if needed
-    $source_exists = FALSE;
+    $source_exists = false;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
-    if ($resources AND is_array($resources)) {
+    if ($resources and is_array($resources)) {
       foreach ($resources as $resource) {
         if ($resource['slug'] == $drupal_resource) {
-          $source_exists = TRUE;
+          $source_exists = true;
           break;
         }
       }
@@ -332,7 +332,7 @@ 
           $post = array(
             'content' => $po_file,
           );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+          $result = boinctranslate_transifex_request($path, $post, true, true);
 
           if (!is_array($result)) {
             if (substr($result, 0, 6) == 'ERROR:') {
@@ -349,7 +349,7 @@ 
               break;
             }
             elseif ($result == 'success') {
-              drupal_set_message("Updated {$language_name} official BOINC translations");
+              drupal_set_message("updated {$language_name} official BOINC translations");
             }
             else {
               drupal_set_message(
@@ -359,7 +359,7 @@ 
             }
           }
           else {
-            drupal_set_message("Updated {$language_name} official BOINC translations");
+            drupal_set_message("updated {$language_name} official BOINC translations");
             //drupal_set_message('DEBUG: <pre>'.print_r($result,1).'</pre>');
           }
         }
@@ -370,7 +370,7 @@ 
     }
     else {
       drupal_set_message(
-        "The {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
+        "the {$drupal_resource} resource does not exist in the {$project_name} project at Transifex",
         'warning'
       );
     }
@@ -388,14 +388,14 @@ 
  *
  */
 function boinctranslate_download_pot($type = 'boinc') {
-  $po = boinctranslate_get_po(NULL, $type);
-  _locale_export_po(NULL, $po);
+  $po = boinctranslate_get_po(null, $type);
+  _locale_export_po(null, $po);
 }
 
 /**
  *
  */
-function boinctranslate_transifex_request($path, $post = NULL, $json = TRUE, $use_put = FALSE, $username = '', $password = '') {
+function boinctranslate_transifex_request($path, $post = null, $json = true, $use_put = false, $username = '', $password = '') {
   $debug_mode = variable_get('boinc_debug_mode', 0);
 
   // Transifex details
@@ -407,7 +407,7 @@ 
   $headers = array(
     'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
   );
-  $data = NULL;
+  $data = null;
 
   if ($post) {
     if ($json) {
@@ -430,7 +430,7 @@ 
   case 304:
     if ($json) {
       // Process as JSON
-      return json_decode($response->data, TRUE);
+      return json_decode($response->data, true);
     }
     else {
       return (string) $response->data;
@@ -448,7 +448,7 @@ 
     return "ERROR: User not allowed to perform this action";
   }
 
-  return NULL;
+  return null;
 }
 
 /**
@@ -459,7 +459,7 @@ 
   require_once(getcwd() . '/includes/locale.inc');
 
   $all_languages = language_list();
-  $language = $langcode ? $all_languages[$langcode] : NULL;
+  $language = $langcode ? $all_languages[$langcode] : null;
   $textgroups = array();
   $strings = array();
 
@@ -495,7 +495,7 @@ 
     // Set the string context
     $strings[$id]['context'] = trim($string['comment']);
   }
-  if ($langcode AND $langcode != 'en') {
+  if ($langcode and $langcode != 'en') {
     // If not the source language, remove untranslated strings from the ouput
     foreach ($strings as $i => $string) {
       if (!$string['translation']) {
@@ -504,23 +504,23 @@ 
     }
   }
   if ($strings) {
-    return boinctranslate_export_po_generate($language, $strings, NULL, $type);
+    return boinctranslate_export_po_generate($language, $strings, null, $type);
   }
 
-  return NULL;
+  return null;
 }
 
 /**
  *
  */
-function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
+function boinctranslate_export_po_generate($language = null, $strings = array(), $header = null, $type = null) {
 
   require_once(getcwd() . '/includes/locale.inc');
   global $user;
 
   // unset $language to indicate template creation
   if (isset($language) && $language->language == "en") {
-    $language = NULL;
+    $language = null;
   }
 
   if (!isset($header)) {
@@ -626,7 +626,7 @@ 
     'boinc_translate_transifex_boinc_drupal_resource', ''
   );
   $boinc_resources[] = $drupal_resource;
-  if ($boinc_name AND $boinc_resources) {
+  if ($boinc_name and $boinc_resources) {
     $translation_resources[$boinc_name] = array(
       'resources' => $boinc_resources,
       'textgroups' => array(
@@ -643,7 +643,7 @@ 
   $project_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_project_resources', array())
   );
-  if ($project_name AND $project_resources) {
+  if ($project_name and $project_resources) {
     $translation_resources[$project_name] = array(
       'resources' => $project_resources,
       'textgroups' => array(
@@ -676,7 +676,7 @@ 
               $tl0 = trim($line[0]);
               $tl1 = trim($line[1]);
               if ($tl0 and $tl1) {
-                bts($tl0, array(), NULL, $tl1);
+                bts($tl0, array(), null, $tl1);
               }
             }
           }// if ($line)
@@ -715,7 +715,7 @@ 
         $operations[] = array(
           'boinctranslate_refresh_translations_op',
           array(
-            NULL, $op[1][0], $langcode, $language, array('default'), $debug_mode
+            null, $op[1][0], $langcode, $language, array('default'), $debug_mode
           ),
         );
       }
@@ -754,7 +754,7 @@ 
 
   if ($project) {
     // Import the configured resources
-    $success = FALSE;
+    $success = false;
     $message = '';
     $path = "project/{$project}/resource/{$resource}/translation/{$langcode}";
     $response = boinctranslate_transifex_request($path);
@@ -768,7 +768,7 @@ 
 
         // Write the translation file to a temporary location
         $file = new stdClass();
-        $file->filepath = file_save_data($po_text, NULL);
+        $file->filepath = file_save_data($po_text, null);
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
           $message = 'Unable to create temporary file in '
@@ -779,13 +779,13 @@ 
         foreach ($textgroups as $textgroup) {
           // Import the translations from the file to each related textgroup
           if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
-            $message = "The {$language} translation import of"
+            $message = "the {$language} translation import of"
               . " {$project}:{$resource} failed.";
-            $success = FALSE;
+            $success = false;
             break;
           }
           else {
-            $success = TRUE;
+            $success = true;
           }
         }
       }
@@ -806,19 +806,19 @@ 
     $file->filepath = $resource;
     $file->filename = basename($file->filepath);
     if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
-      $message = "The {$language} translation import of"
+      $message = "the {$language} translation import of"
         . " local file {$resource} failed.";
-      $success = FALSE;
+      $success = false;
     }
     else {
-      $success = TRUE;
+      $success = true;
     }
   }
 
   if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = "{$langcode}:{$textgroup}";
-    $message = "Imported {$language} translations in {$project}:{$resource} ({$results['new']} added, {$results['updated']} refreshed, {$results['deleted']} removed)";
+    $message = "imported {$language} translations in {$project}:{$resource} ({$results['new']} added, {$results['updated']} refreshed, {$results['deleted']} removed)";
 
     if ($debug_mode) {
       watchdog(
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], true);
     watchdog(
       'boinctranslate',
       $message,
@@ -887,7 +887,7 @@ 
 /**
  *
  */
-function _boinctranslate_locale_import_po($file, $langcode, $mode, $group = NULL) {
+function _boinctranslate_locale_import_po($file, $langcode, $mode, $group = null) {
   // Try to allocate enough time to parse and import the data.
   if (function_exists('set_time_limit')) {
     @set_time_limit(240);
@@ -898,14 +898,14 @@ 
   // Check if we have the language already in the database.
   if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
     drupal_set_message(t('The language selected for import is not supported.'), 'error');
-    return FALSE;
+    return false;
   }
 
   // Get strings from file (returns on failure after a partial import, or on success)
   $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
-  if ($status === FALSE) {
+  if ($status === false) {
     // Error messages are set in _locale_import_read_po().
-    return FALSE;
+    return false;
   }
 
   // Get status information on import process.
@@ -917,7 +917,7 @@ 
 
   // Clear cache and force refresh of JavaScript translations.
   _locale_invalidate_js($langcode);
-  cache_clear_all('locale:', 'cache', TRUE);
+  cache_clear_all('locale:', 'cache', true);
 
   // Rebuild the menu, strings may have changed.
   menu_rebuild();
@@ -933,7 +933,7 @@ 
 /**
  *
  */
-function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
+function _boinctranslate_locale_import_read_po($op, $file, $mode = null, $lang = null, $group = 'default') {
 
   require_once(getcwd() . '/includes/locale.inc');
 
@@ -946,7 +946,7 @@ 
       WATCHDOG_WARNING
     );
     _locale_import_message('The translation import failed, because the file %filename could not be read.', $file);
-    return FALSE;
+    return false;
   }
 
   $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
@@ -981,7 +981,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" was expected but not found on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
     }
     elseif (!strncmp("msgctxt", $line, 7)) {
@@ -997,11 +997,11 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $line = trim(substr($line, 7));
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1009,7 +1009,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $current["msgctxt"] = $quoted;
       $context = "MSGCTXT";
@@ -1023,11 +1023,11 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $line = trim(substr($line, 12));
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1035,7 +1035,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $current["msgid"] = $current["msgid"] . "\0" . $quoted;
       $context = "MSGID_PLURAL";
@@ -1053,11 +1053,11 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $line = trim(substr($line, 5));
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1065,7 +1065,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $current["msgid"] = $quoted;
       $context = "MSGID";
@@ -1079,9 +1079,9 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
-      if (strpos($line, "]") === FALSE) {
+      if (strpos($line, "]") === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1089,13 +1089,13 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $frombracket = strstr($line, "[");
       $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
       $line = trim(strstr($line, " "));
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1103,7 +1103,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $current["msgstr"][$plural] = $quoted;
       $context = "MSGSTR_ARR";
@@ -1117,11 +1117,11 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $line = trim(substr($line, 6));
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1129,14 +1129,14 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       $current["msgstr"] = $quoted;
       $context = "MSGSTR";
     }
     elseif ($line != "") {
       $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+      if ($quoted === false) {
         watchdog(
           'boinctranslate',
           'The translation file %filename for language %lang contains a syntax error on line %line.',
@@ -1144,7 +1144,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
       if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
         $current["msgid"] .= $quoted;
@@ -1163,7 +1163,7 @@ 
           WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: there is an unexpected string on line %line.', $file, $lineno);
-        return FALSE;
+        return false;
       }
     }
   }
@@ -1180,7 +1180,7 @@ 
       WATCHDOG_WARNING
     );
     _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno);
-    return FALSE;
+    return false;
   }
 
 }
@@ -1188,7 +1188,7 @@ 
 /**
  *
  */
-function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
+function _boinctranslate_locale_import_one_string($op, $value = null, $mode = null, $lang = null, $file = null, $group = 'default') {
 
   require_once(getcwd() . '/includes/locale.inc');
 
@@ -1198,7 +1198,7 @@ 
     'deletes' => 0,
     'skips' => 0,
   );
-  static $headerdone = FALSE;
+  static $headerdone = false;
   static $strings = array();
 
   switch ($op) {
@@ -1238,7 +1238,7 @@ 
             db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
           }
         }
-        $headerdone = TRUE;
+        $headerdone = true;
       }
 
       else {
@@ -1284,9 +1284,9 @@ 
  * Textgroups 'boinc' and 'project' use the location string to
  * uniquely identify rows in the locales_source database.
  */
-function _boinctranslate_locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = NULL, $plural = NULL) {
+function _boinctranslate_locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = null, $plural = null) {
 
-  $ignoreoverwrite = FALSE;
+  $ignoreoverwrite = false;
   $lid = 0;
 
   // Use different DB query depending on the textgroup.
@@ -1304,7 +1304,7 @@ 
     $parts = explode(':', $location);
     if (!empty($parts[2])) {
       if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
-        $ignoreoverwrite = TRUE;
+        $ignoreoverwrite = true;
       }
     }
   }// if (in_array($textgroup, $uselocation))
@@ -1341,7 +1341,7 @@ 
       }// while
     }
   }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+  elseif ($mode == LOCALE_IMPORT_OVERWRITE and $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
       $lid = $row['lid'];
@@ -1372,7 +1372,7 @@ 
   );
   foreach ($resource_array as $resource) {
     $resource = trim($resource);
-    if ($resource AND $resource[0] != '#') {
+    if ($resource and $resource[0] != '#') {
       $resources[] = $resource;
     }
   }

Spacing +38 added lines, -38 removed lines

@@ -15,7 +15,7 @@ 
  */
 function boinctranslate_initialize_languages() {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $api_base_url = 'https://www.transifex.com/api/2';
   $project_name = variable_get(
@@ -146,7 +146,7 @@ 
           }
         }
         if ($disabled_languages) {
-          drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
+          drupal_set_message('The following languages were not found in Transifex and were disabled: '.implode(' ', $disabled_languages));
         }
         if ($process_batches) {
           $batch = array(
@@ -195,7 +195,7 @@ 
  *
  */
 function boinctranslate_export_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
   );
@@ -297,7 +297,7 @@ 
  *
  */
 function boinctranslate_update_official_boinc_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $project_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
   );
@@ -405,7 +405,7 @@ 
 
   $url = "{$api_base_url}/{$path}";
   $headers = array(
-    'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
+    'Authorization' => 'Basic '.base64_encode($username.":".$password),
   );
   $data = NULL;
 
@@ -433,7 +433,7 @@ 
       return json_decode($response->data, TRUE);
     }
     else {
-      return (string) $response->data;
+      return (string)$response->data;
     }
     break;
   case 404:
@@ -456,7 +456,7 @@ 
  */
 function boinctranslate_get_po($langcode, $type = 'standard') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $all_languages = language_list();
   $language = $langcode ? $all_languages[$langcode] : NULL;
@@ -515,7 +515,7 @@ 
  */
 function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   global $user;
 
   // unset $language to indicate template creation
@@ -531,7 +531,7 @@ 
       $header = "# BOINC drupal localization template\n";
       $header .= "# Copyright (C) ".date("Y")." University of California\n";
     }
-    $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n";
+    $header .= '# Generated by '.$user->name.' <'.$user->mail.">\n";
     $header .= "#\n";
     $header .= "# This file is distributed under the same license as BOINC.\n";
     $header .= "#\n";
@@ -543,9 +543,9 @@ 
       $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
     }
     $header .= "\"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\\n\"\n";
-    $header .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+    $header .= "\"POT-Creation-Date: ".date("Y-m-d H:iO")."\\n\"\n";
     if (isset($language)) {
-      $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+      $header .= "\"PO-Revision-Date: ".date("Y-m-d H:iO")."\\n\"\n";
     }
     $header .= "\"Last-Translator: Generated automatically from Drupal translate interface\\n\"\n";
     $header .= "\"MIME-Version: 1.0\\n\"\n";
@@ -554,31 +554,31 @@ 
     if (isset($language)) {
       $header .= "\"Language: ".$language->language."\\n\"";
       if ($language->formula && $language->plurals) {
-        $header .= "\"Plural-Forms: nplurals=" . $language->plurals . "; plural=" . strtr($language->formula, array('$' => '')) . ";\\n\"\n";
+        $header .= "\"Plural-Forms: nplurals=".$language->plurals."; plural=".strtr($language->formula, array('$' => '')).";\\n\"\n";
       }
     }
     $header .= "\"X-Poedit-SourceCharset: utf-8\\n\"\n";
   }
 
-  $output = $header . "\n";
+  $output = $header."\n";
 
   foreach ($strings as $lid => $string) {
     // Only process non-children, children are output below their parent.
     if (!isset($string['child'])) {
       if ($string['comment']) {
-        $output .= '#: ' . $string['comment'] . "\n";
+        $output .= '#: '.$string['comment']."\n";
       }
       if ($string['context']) {
-        $output .= 'msgctxt "' . $string['context'] . "\"\n";
+        $output .= 'msgctxt "'.$string['context']."\"\n";
       }
-      $output .= 'msgid ' . _locale_export_string($string['source']);
+      $output .= 'msgid '._locale_export_string($string['source']);
       if (!empty($string['plural'])) {
         $plural = $string['plural'];
-        $output .= 'msgid_plural ' . _locale_export_string($strings[$plural]['source']);
+        $output .= 'msgid_plural '._locale_export_string($strings[$plural]['source']);
         if (isset($language)) {
           $translation = $string['translation'];
           for ($i = 0; $i < $language->plurals; $i++) {
-            $output .= 'msgstr[' . $i . '] ' . _locale_export_string($translation);
+            $output .= 'msgstr['.$i.'] '._locale_export_string($translation);
             if ($plural) {
               $translation = _locale_export_remove_plural($strings[$plural]['translation']);
               $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
@@ -589,12 +589,12 @@ 
           }
         }
         else {
-          $output .= 'msgstr[0] ""' . "\n";
-          $output .= 'msgstr[1] ""' . "\n";
+          $output .= 'msgstr[0] ""'."\n";
+          $output .= 'msgstr[1] ""'."\n";
         }
       }
       else {
-        $output .= 'msgstr ' . _locale_export_string($string['translation']);
+        $output .= 'msgstr '._locale_export_string($string['translation']);
       }
       $output .= "\n";
     }
@@ -606,7 +606,7 @@ 
  *
  */
 function boinctranslate_refresh_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
   $errors = array();
   $languages = locale_language_list();
   $translation_resources = array();
@@ -653,7 +653,7 @@ 
       ),
     );
     // Be sure any strings from the override file are added to the boinc group
-    $override_file = './' . drupal_get_path('module', 'boinctranslate') . '/includes/other-boinc-translation-strings.txt';
+    $override_file = './'.drupal_get_path('module', 'boinctranslate').'/includes/other-boinc-translation-strings.txt';
     $other_strings = file($override_file);
     if ($other_strings) {
       foreach ($other_strings as $string) {
@@ -666,13 +666,13 @@ 
           // Use '|' as delimiter to split string and context info.
           $line = explode("|", $string);
           if ($line) {
-            if (count($line)==1) {
+            if (count($line) == 1) {
               $tl0 = trim($line[0]);
               if ($tl0) {
                 bts($tl0);
               }
             }
-            elseif (count($line)>1) {
+            elseif (count($line) > 1) {
               $tl0 = trim($line[0]);
               $tl1 = trim($line[1]);
               if ($tl0 and $tl1) {
@@ -741,7 +741,7 @@ 
  */
 function boinctranslate_refresh_translations_op($project, $resource, $langcode, $language, $textgroups, $debug_mode, &$context) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   if ($debug_mode) {
     watchdog(
@@ -772,7 +772,7 @@ 
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
           $message = 'Unable to create temporary file in '
-            . file_directory_temp() . " for {$language} translation "
+            . file_directory_temp()." for {$language} translation "
             . "resource {$project}:{$resource}";
         }
 
@@ -849,7 +849,7 @@ 
     $context['finished'] = 1;
   }
   else {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -872,7 +872,7 @@ 
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
-    $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
+    $message = 'An error occurred while processing '.$error_operation[0].' with arguments :'.print_r($error_operation[0], TRUE);
     watchdog(
       'boinctranslate',
       $message,
@@ -893,7 +893,7 @@ 
     @set_time_limit(240);
   }
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   // Check if we have the language already in the database.
   if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
@@ -935,7 +935,7 @@ 
  */
 function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
   if (!$fd) {
@@ -955,7 +955,7 @@ 
   $lineno = 0; // Current line
 
   while (!feof($fd)) {
-    $line = fgets($fd, 10 * 1024); // A line should not be this long
+    $line = fgets($fd, 10*1024); // A line should not be this long
     if ($lineno == 0) {
       // The first line might come with a UTF-8 BOM, which should be removed.
       $line = str_replace("\xEF\xBB\xBF", '', $line);
@@ -1037,7 +1037,7 @@ 
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
       }
-      $current["msgid"] = $current["msgid"] . "\0" . $quoted;
+      $current["msgid"] = $current["msgid"]."\0".$quoted;
       $context = "MSGID_PLURAL";
     }
     elseif (!strncmp("msgid", $line, 5)) {
@@ -1190,7 +1190,7 @@ 
  */
 function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+  require_once(getcwd().'/includes/locale.inc');
 
   static $report = array(
     'additions' => 0,
@@ -1323,13 +1323,13 @@ 
 
         $lid = $row['lid'];
         // Check of if one or more translations exist for this lid in locales_target table.
-        $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+        $exists = (bool)db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
         if (!$exists) {
           // No translation in this language, insert translation into locales_target table.
           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) and (!$ignoreoverwrite) ) {
+        else if (($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite)) {
           // 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']++;
@@ -1345,7 +1345,7 @@ 
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
       $lid = $row['lid'];
-      $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
+      $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);
@@ -1403,5 +1403,5 @@ 
  * database.
  */
 function _boinctranslate_supertrim($instr) {
-  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
+  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr)));
 }

Indentation +642 added lines, -642 removed lines

@@ -15,30 +15,30 @@ 
  */
 function boinctranslate_initialize_languages() {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $api_base_url = 'https://www.transifex.com/api/2';
-  $project_name = variable_get(
+    $api_base_url = 'https://www.transifex.com/api/2';
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $operations = array();
+    );
+    $operations = array();
 
-  if ($project_name) {
+    if ($project_name) {
     // Get all languages configured for this project at Transifex
     $path = "project/{$project_name}/languages";
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      drupal_set_message(
+        drupal_set_message(
         t('Unable to get languages for %project.',
-          array(
+            array(
             '%project' => $project_name,
-          )
+            )
         ), 'warning'
-      );
+        );
     }
     elseif ($response) {
-      if (is_array($response)) {
+        if (is_array($response)) {
 
         $installed_languages = language_list();
         $available_languages = _locale_get_predefined_list();
@@ -48,13 +48,13 @@ 
 
         // Set up Transifex languages in Drupal
         foreach ($response as $language) {
-          $posix_code = $language['language_code'];
-          $rfc_code = strtolower(str_replace('_', '-', $posix_code));
-          $transifex_languages[$rfc_code] = $language;
-          if (!isset($installed_languages[$rfc_code])) {
+            $posix_code = $language['language_code'];
+            $rfc_code = strtolower(str_replace('_', '-', $posix_code));
+            $transifex_languages[$rfc_code] = $language;
+            if (!isset($installed_languages[$rfc_code])) {
             // See if this language can be installed from a predefined list
             if (isset($available_languages[$rfc_code])) {
-              locale_add_language(
+                locale_add_language(
                 $rfc_code,
                 NULL,
                 NULL,
@@ -62,30 +62,30 @@ 
                 NULL,
                 NULL,
                 FALSE
-              );
-              drupal_set_message(
+                );
+                drupal_set_message(
                 'Added predefined language: '.$available_languages[$rfc_code][0]
-              );
-              db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
+                );
+                db_query("UPDATE {languages} SET enabled = 1 WHERE language = '%s'", $rfc_code);
             }
             else {
-              // Retrieve language details from Transifex
-              $path = "language/{$posix_code}";
-              $response = boinctranslate_transifex_request($path);
+                // Retrieve language details from Transifex
+                $path = "language/{$posix_code}";
+                $response = boinctranslate_transifex_request($path);
 
-              if ($response == '404 NOT FOUND') {
+                if ($response == '404 NOT FOUND') {
                 drupal_set_message(
-                  t('Unable to get details for language %code.',
+                    t('Unable to get details for language %code.',
                     array(
-                      '%code' => $posix_code,
+                        '%code' => $posix_code,
                     )
-                  ), 'warning'
+                    ), 'warning'
                 );
-              }
-              elseif ($response) {
+                }
+                elseif ($response) {
                 if (!empty($response['name'])) {
-                  // Add a custom language to Drupal and enable
-                  locale_add_language(
+                    // Add a custom language to Drupal and enable
+                    locale_add_language(
                     $rfc_code,
                     $response['name'],
                     $response['name'],
@@ -93,362 +93,362 @@ 
                     NULL,
                     NULL,
                     TRUE
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     'Added new language: '.$response['name']
-                  );
+                    );
                 }
                 else {
-                  $variables = array(
+                    $variables = array(
                     '%code' => $posix_code,
-                  );
-                  drupal_set_message(
+                    );
+                    drupal_set_message(
                     t('Unable to get details for language %code.', $variables),
                     'error'
-                  );
-                  watchdog(
+                    );
+                    watchdog(
                     'boinctranslate',
                     'Unable to get details for language %code.',
                     $variables,
                     WATCHDOG_ERROR
-                  );
+                    );
+                }
                 }
-              }
-              else {
-               $variables = array(
-                  '%code' => $posix_code,
+                else {
+                $variables = array(
+                    '%code' => $posix_code,
                 );
                 drupal_set_message(
-                  t('Invalid response while getting details for language %code.', $variables),
-                  'error'
+                    t('Invalid response while getting details for language %code.', $variables),
+                    'error'
                 );
                 watchdog(
-                  'boinctranslate',
-                  'Invalid response while getting details for language %code.',
-                  $variables,
-                  WATCHDOG_ERROR
+                    'boinctranslate',
+                    'Invalid response while getting details for language %code.',
+                    $variables,
+                    WATCHDOG_ERROR
                 );
-              }
+                }
             }
             // Import any language files for the newly added language
             if ($batch = locale_batch_by_language($rfc_code, '_locale_batch_language_finished')) {
-              $operations = array_merge($operations, $batch['operations']);
-              $process_batches = TRUE;
+                $operations = array_merge($operations, $batch['operations']);
+                $process_batches = TRUE;
+            }
             }
-          }
         }
         drupal_set_message('Finished installing official BOINC languages.');
         // Disable languages that are not in Transifex
         foreach ($installed_languages as $langcode => $language) {
-          if (!isset($transifex_languages[$langcode])) {
+            if (!isset($transifex_languages[$langcode])) {
             $disabled_languages[$langcode] = $langcode;
             db_query("UPDATE {languages} SET enabled = 0 WHERE language = '%s'", $langcode);
-          }
+            }
         }
         if ($disabled_languages) {
-          drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
+            drupal_set_message('The following languages were not found in Transifex and were disabled: ' . implode(' ', $disabled_languages));
         }
         if ($process_batches) {
-          $batch = array(
+            $batch = array(
             'operations' => $operations,
-          );
-          batch_set($batch);
-          batch_process('admin/boinc/translation');
+            );
+            batch_set($batch);
+            batch_process('admin/boinc/translation');
+        }
         }
-      }
-      else {
+        else {
         $variables = array(
-          '%project' => $project_name,
+            '%project' => $project_name,
         );
         drupal_set_message(
-          t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
-          'error'
+            t('No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)', $variables),
+            'error'
         );
         watchdog(
-          'boinctranslate',
-          'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
-          $variables,
-          WATCHDOG_ERROR
+            'boinctranslate',
+            'No languages found for %project. (Does the configured account have sufficient privileges at Transifex?)',
+            $variables,
+            WATCHDOG_ERROR
         );
-      }
+        }
     }
     else {
-     $variables = array(
+        $variables = array(
         '%project' => $project_name,
-      );
-      drupal_set_message(
+        );
+        drupal_set_message(
         t('Invalid response while getting languages for %project.', $variables),
         'error'
-      );
-      watchdog(
+        );
+        watchdog(
         'boinctranslate',
         'Invalid response while getting languages for %project.',
         $variables,
         WATCHDOG_ERROR
-      );
+        );
     }
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_export_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  // Get resource names from local config
-  $resource_config = (variable_get(
+    );
+    // Get resource names from local config
+    $resource_config = (variable_get(
     'boinc_translate_transifex_project_resources', ''
-  ));
-  $resource_names = boinctranslate_parse_resources($resource_config);
-  $primary_resource = reset($resource_names);
+    ));
+    $resource_names = boinctranslate_parse_resources($resource_config);
+    $primary_resource = reset($resource_names);
 
-  if ($project_name AND $primary_resource) {
+    if ($project_name AND $primary_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $primary_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
         }
-      }
-      if (!$source_exists) {
+        }
+        if (!$source_exists) {
         // Create the source
         $path = "project/{$project_name}/resources";
         $post = array(
-          'slug' => $primary_resource,
-          'name' => 'Drupal-Project',
-          'i18n_type' => 'PO',
-          'category' => 'Drupal',
-          'content' => boinctranslate_get_po('en', 'project'),
+            'slug' => $primary_resource,
+            'name' => 'Drupal-Project',
+            'i18n_type' => 'PO',
+            'category' => 'Drupal',
+            '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(
-          'content' => boinctranslate_get_po('en', 'project')
+            'content' => boinctranslate_get_po('en', 'project')
         );
         $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-      }
+        }
     }
 
     if (is_array($result) OR substr($result, 0, 6) != 'ERROR:') {
-      $enabled_languages = locale_language_list();
-      if ($source_exists) {
+        $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
-      foreach ($enabled_languages as $langcode => $language_name) {
+        }
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'project');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$primary_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
-          if (!is_array($result)
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            if (!is_array($result)
           AND substr($result, 0, 6) == 'ERROR:') {
             drupal_set_message(
-              "Unable to update {$language_name} translations: {$result}",
-              'warning'
+                "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 {
-          drupal_set_message("No translations to export for {$language_name}");
+            drupal_set_message("No translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        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'
+        'Failed to export translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_update_official_boinc_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $project_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $project_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $drupal_resource = variable_get(
+    );
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
+    );
 
-  if ($project_name AND $drupal_resource) {
+    if ($project_name AND $drupal_resource) {
     // Create or update the translation source, if needed
     $source_exists = FALSE;
     $path = "project/{$project_name}/resources";
     $resources = boinctranslate_transifex_request($path);
     if ($resources AND is_array($resources)) {
-      foreach ($resources as $resource) {
+        foreach ($resources as $resource) {
         if ($resource['slug'] == $drupal_resource) {
-          $source_exists = TRUE;
-          break;
+            $source_exists = TRUE;
+            break;
+        }
         }
-      }
     }
 
     if ($source_exists) {
-      $enabled_languages = locale_language_list();
-      // Try to export translations for all enabled languages
-      foreach ($enabled_languages as $langcode => $language_name) {
+        $enabled_languages = locale_language_list();
+        // Try to export translations for all enabled languages
+        foreach ($enabled_languages as $langcode => $language_name) {
         if ($langcode == 'en') {
-          continue;
+            continue;
         }
         $po_file = boinctranslate_get_po($langcode, 'boinc');
         if ($po_file) {
-          $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
-          $post = array(
+            $path = "project/{$project_name}/resource/{$drupal_resource}/translation/{$langcode}";
+            $post = array(
             'content' => $po_file,
-          );
-          $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
+            );
+            $result = boinctranslate_transifex_request($path, $post, TRUE, TRUE);
 
-          if (!is_array($result)) {
+            if (!is_array($result)) {
             if (substr($result, 0, 6) == 'ERROR:') {
-              drupal_set_message(
+                drupal_set_message(
                 "Unable to update {$language_name} official BOINC translations: {$result}",
                 'warning'
-              );
+                );
             }
             elseif ($result == '401 UNAUTHORIZED') {
-              drupal_set_message(
+                drupal_set_message(
                 'Not authorized to update official BOINC translations',
                 'warning'
-              );
-              break;
+                );
+                break;
             }
             elseif ($result == 'success') {
-              drupal_set_message("Updated {$language_name} official BOINC translations");
+                drupal_set_message("Updated {$language_name} official BOINC translations");
             }
             else {
-              drupal_set_message(
+                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 {
-          drupal_set_message("No official BOINC translations to export for {$language_name}");
+            drupal_set_message("No official BOINC translations to export for {$language_name}");
+        }
         }
-      }
     }
     else {
-      drupal_set_message(
+        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'
+        'Failed to export official BOINC translations: Transifex settings are not intiailized.',
+        'error'
     );
-  }
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function boinctranslate_download_pot($type = 'boinc') {
-  $po = boinctranslate_get_po(NULL, $type);
-  _locale_export_po(NULL, $po);
+    $po = boinctranslate_get_po(NULL, $type);
+    _locale_export_po(NULL, $po);
 }
 
 /**
  *
  */
 function boinctranslate_transifex_request($path, $post = NULL, $json = TRUE, $use_put = FALSE, $username = '', $password = '') {
-  $debug_mode = variable_get('boinc_debug_mode', 0);
+    $debug_mode = variable_get('boinc_debug_mode', 0);
 
-  // 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', '');
+    // 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', '');
 
-  $url = "{$api_base_url}/{$path}";
-  $headers = array(
+    $url = "{$api_base_url}/{$path}";
+    $headers = array(
     'Authorization' => 'Basic ' . base64_encode($username . ":" . $password),
-  );
-  $data = NULL;
+    );
+    $data = NULL;
 
-  if ($post) {
+    if ($post) {
     if ($json) {
-      $headers['Content-Type'] = 'application/json';
-      $data = json_encode($post);
+        $headers['Content-Type'] = 'application/json';
+        $data = json_encode($post);
     }
     else {
-      $data = drupal_query_string_encode($post);
+        $data = drupal_query_string_encode($post);
     }
     $method = ($use_put) ? 'PUT' : 'POST';
-  }
-  else {
+    }
+    else {
     $method = 'GET';
-  }
+    }
 
-  $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
+    $response = drupal_http_request($url, $headers, $method, $data, 1, 10);
 
-  switch ($response->code) {
-  case 200:
+    switch ($response->code) {
+    case 200:
   case 304:
     if ($json) {
-      // Process as JSON
-      return json_decode($response->data, TRUE);
+        // Process as JSON
+        return json_decode($response->data, TRUE);
     }
     else {
-      return (string) $response->data;
+        return (string) $response->data;
     }
     break;
-  case 404:
+    case 404:
     return '404 NOT FOUND';
-  case 401:
+    case 401:
     return '401 UNAUTHORIZED';
-  case 400:
+    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);
     return "ERROR: {$response->data}";
-  case 405:
+    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);
     return "ERROR: User not allowed to perform this action";
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -456,58 +456,58 @@ 
  */
 function boinctranslate_get_po($langcode, $type = 'standard') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $all_languages = language_list();
-  $language = $langcode ? $all_languages[$langcode] : NULL;
-  $textgroups = array();
-  $strings = array();
+    $all_languages = language_list();
+    $language = $langcode ? $all_languages[$langcode] : NULL;
+    $textgroups = array();
+    $strings = array();
 
-  switch ($type) {
-  case 'standard':
+    switch ($type) {
+    case 'standard':
     $textgroups = array(
-      'default',
-      'taxonomy',
-      'views',
+        'default',
+        'taxonomy',
+        'views',
     );
     break;
-  case 'boinc':
+    case 'boinc':
     $textgroups = array(
-      'boinc',
+        'boinc',
     );
     break;
-  case 'project':
+    case 'project':
     $textgroups = array(
-      'blocks',
-      'menu',
-      'project',
+        'blocks',
+        'menu',
+        'project',
     );
     break;
-  default:
+    default:
   }
 
-  // Merge textgroup strings together for export as one file
-  foreach ($textgroups as $textgroup) {
+    // Merge textgroup strings together for export as one file
+    foreach ($textgroups as $textgroup) {
     $strings += _locale_export_get_strings($language, $textgroup);
-  }
-  ksort($strings);
-  foreach ($strings as $id => $string) {
+    }
+    ksort($strings);
+    foreach ($strings as $id => $string) {
     // Set the string context
     $strings[$id]['context'] = trim($string['comment']);
-  }
-  if ($langcode AND $langcode != 'en') {
+    }
+    if ($langcode AND $langcode != 'en') {
     // If not the source language, remove untranslated strings from the ouput
     foreach ($strings as $i => $string) {
-      if (!$string['translation']) {
+        if (!$string['translation']) {
         unset($strings[$i]);
-      }
+        }
     }
-  }
-  if ($strings) {
+    }
+    if ($strings) {
     return boinctranslate_export_po_generate($language, $strings, NULL, $type);
-  }
+    }
 
-  return NULL;
+    return NULL;
 }
 
 /**
@@ -515,21 +515,21 @@ 
  */
 function boinctranslate_export_po_generate($language = NULL, $strings = array(), $header = NULL, $type = NULL) {
 
-  require_once(getcwd() . '/includes/locale.inc');
-  global $user;
+    require_once(getcwd() . '/includes/locale.inc');
+    global $user;
 
-  // unset $language to indicate template creation
-  if (isset($language) && $language->language == "en") {
+    // unset $language to indicate template creation
+    if (isset($language) && $language->language == "en") {
     $language = NULL;
-  }
+    }
 
-  if (!isset($header)) {
+    if (!isset($header)) {
     if (isset($type) && $type == "project") {
-      $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
+        $header = "# ".variable_get('site_name', 'Drupal-BOINC')." drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." ".variable_get('site_name', 'Drupal-BOINC')."\n";
     } else {
-      $header = "# BOINC drupal localization template\n";
-      $header .= "# Copyright (C) ".date("Y")." University of California\n";
+        $header = "# BOINC drupal localization template\n";
+        $header .= "# Copyright (C) ".date("Y")." University of California\n";
     }
     $header .= '# Generated by ' . $user->name . ' <' . $user->mail . ">\n";
     $header .= "#\n";
@@ -538,201 +538,201 @@ 
     $header .= "msgid \"\"\n";
     $header .= "msgstr \"\"\n";
     if (isset($type) && $type == "project") {
-      $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
+        $header .= "\"Project-Id-Version: ".variable_get('site_name', 'Drupal-BOINC')." ".date("Y-m-d-H:iO")."\\n\"\n";
     } else {
-      $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
+        $header .= "\"Project-Id-Version: BOINC unknown\\n\"\n"; // TODO: add SHA1 of source checkout here
     }
     $header .= "\"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@ssl.berkeley.edu>\\n\"\n";
     $header .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     if (isset($language)) {
-      $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+        $header .= "\"PO-Revision-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
     }
     $header .= "\"Last-Translator: Generated automatically from Drupal translate interface\\n\"\n";
     $header .= "\"MIME-Version: 1.0\\n\"\n";
     $header .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n";
     $header .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
     if (isset($language)) {
-      $header .= "\"Language: ".$language->language."\\n\"";
-      if ($language->formula && $language->plurals) {
+        $header .= "\"Language: ".$language->language."\\n\"";
+        if ($language->formula && $language->plurals) {
         $header .= "\"Plural-Forms: nplurals=" . $language->plurals . "; plural=" . strtr($language->formula, array('$' => '')) . ";\\n\"\n";
-      }
+        }
     }
     $header .= "\"X-Poedit-SourceCharset: utf-8\\n\"\n";
-  }
+    }
 
-  $output = $header . "\n";
+    $output = $header . "\n";
 
-  foreach ($strings as $lid => $string) {
+    foreach ($strings as $lid => $string) {
     // Only process non-children, children are output below their parent.
     if (!isset($string['child'])) {
-      if ($string['comment']) {
+        if ($string['comment']) {
         $output .= '#: ' . $string['comment'] . "\n";
-      }
-      if ($string['context']) {
+        }
+        if ($string['context']) {
         $output .= 'msgctxt "' . $string['context'] . "\"\n";
-      }
-      $output .= 'msgid ' . _locale_export_string($string['source']);
-      if (!empty($string['plural'])) {
+        }
+        $output .= 'msgid ' . _locale_export_string($string['source']);
+        if (!empty($string['plural'])) {
         $plural = $string['plural'];
         $output .= 'msgid_plural ' . _locale_export_string($strings[$plural]['source']);
         if (isset($language)) {
-          $translation = $string['translation'];
-          for ($i = 0; $i < $language->plurals; $i++) {
+            $translation = $string['translation'];
+            for ($i = 0; $i < $language->plurals; $i++) {
             $output .= 'msgstr[' . $i . '] ' . _locale_export_string($translation);
             if ($plural) {
-              $translation = _locale_export_remove_plural($strings[$plural]['translation']);
-              $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
+                $translation = _locale_export_remove_plural($strings[$plural]['translation']);
+                $plural = isset($strings[$plural]['plural']) ? $strings[$plural]['plural'] : 0;
             }
             else {
-              $translation = '';
+                $translation = '';
+            }
             }
-          }
         }
         else {
-          $output .= 'msgstr[0] ""' . "\n";
-          $output .= 'msgstr[1] ""' . "\n";
+            $output .= 'msgstr[0] ""' . "\n";
+            $output .= 'msgstr[1] ""' . "\n";
+        }
         }
-      }
-      else {
+        else {
         $output .= 'msgstr ' . _locale_export_string($string['translation']);
-      }
-      $output .= "\n";
+        }
+        $output .= "\n";
     }
-  }
-  return $output;
+    }
+    return $output;
 }
 
 /**
  *
  */
 function boinctranslate_refresh_translations() {
-  require_once(getcwd() . '/includes/locale.inc');
-  $errors = array();
-  $languages = locale_language_list();
-  $translation_resources = array();
-  $operations = array();
-  $debug_mode = variable_get('boinc_debug_mode', 0);
-
-  $boinc_name = variable_get(
+    require_once(getcwd() . '/includes/locale.inc');
+    $errors = array();
+    $languages = locale_language_list();
+    $translation_resources = array();
+    $operations = array();
+    $debug_mode = variable_get('boinc_debug_mode', 0);
+
+    $boinc_name = variable_get(
     'boinc_translate_transifex_standard_name', ''
-  );
-  $boinc_resources = boinctranslate_parse_resources(
+    );
+    $boinc_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_standard_resources', array())
-  );
-  // Add the Official BOINC resource to the list of BOINC resources;
-  // The official resource overrides any additional resources provided, so it
-  // should be added to the end so as to be processed last
-  $drupal_resource = variable_get(
+    );
+    // Add the Official BOINC resource to the list of BOINC resources;
+    // The official resource overrides any additional resources provided, so it
+    // should be added to the end so as to be processed last
+    $drupal_resource = variable_get(
     'boinc_translate_transifex_boinc_drupal_resource', ''
-  );
-  $boinc_resources[] = $drupal_resource;
-  if ($boinc_name AND $boinc_resources) {
+    );
+    $boinc_resources[] = $drupal_resource;
+    if ($boinc_name AND $boinc_resources) {
     $translation_resources[$boinc_name] = array(
-      'resources' => $boinc_resources,
-      'textgroups' => array(
+        'resources' => $boinc_resources,
+        'textgroups' => array(
         'boinc',
         'default',
         'taxonomy',
         'views',
-      ),
+        ),
     );
-  }
-  $project_name = variable_get(
+    }
+    $project_name = variable_get(
     'boinc_translate_transifex_project_name', ''
-  );
-  $project_resources = boinctranslate_parse_resources(
+    );
+    $project_resources = boinctranslate_parse_resources(
     variable_get('boinc_translate_transifex_project_resources', array())
-  );
-  if ($project_name AND $project_resources) {
+    );
+    if ($project_name AND $project_resources) {
     $translation_resources[$project_name] = array(
-      'resources' => $project_resources,
-      'textgroups' => array(
+        'resources' => $project_resources,
+        'textgroups' => array(
         'blocks',
         'menu',
         'project',
-      ),
+        ),
     );
     // Be sure any strings from the override file are added to the boinc group
     $override_file = './' . drupal_get_path('module', 'boinctranslate') . '/includes/other-boinc-translation-strings.txt';
     $other_strings = file($override_file);
     if ($other_strings) {
-      foreach ($other_strings as $string) {
+        foreach ($other_strings as $string) {
         $string = trim($string);
         if ($string) {
-          // Ignore lines starting with '#' i.e., comments.
-          if ($string[0] === "#")
+            // Ignore lines starting with '#' i.e., comments.
+            if ($string[0] === "#")
             continue;
 
-          // Use '|' as delimiter to split string and context info.
-          $line = explode("|", $string);
-          if ($line) {
+            // Use '|' as delimiter to split string and context info.
+            $line = explode("|", $string);
+            if ($line) {
             if (count($line)==1) {
-              $tl0 = trim($line[0]);
-              if ($tl0) {
+                $tl0 = trim($line[0]);
+                if ($tl0) {
                 bts($tl0);
-              }
+                }
             }
             elseif (count($line)>1) {
-              $tl0 = trim($line[0]);
-              $tl1 = trim($line[1]);
-              if ($tl0 and $tl1) {
+                $tl0 = trim($line[0]);
+                $tl1 = trim($line[1]);
+                if ($tl0 and $tl1) {
                 bts($tl0, array(), NULL, $tl1);
-              }
+                }
             }
-          }// if ($line)
+            }// if ($line)
 
         }// if ($string)
-      }// foreach
+        }// foreach
     }// if ($other_strings)
-  }
+    }
 
-  foreach ($languages as $langcode => $language) {
+    foreach ($languages as $langcode => $language) {
     if ($langcode == 'en') {
-      continue;
+        continue;
     }
 
     $import_stats = array(
-      'new' => 0,
-      'updated' => 0,
-      'deleted' => 0,
-      'skipped' => 0,
+        'new' => 0,
+        'updated' => 0,
+        'deleted' => 0,
+        'skipped' => 0,
     );
 
     foreach ($translation_resources as $project => $translation) {
-      foreach ($translation['resources'] as $resource) {
+        foreach ($translation['resources'] as $resource) {
 
         // Add this language to the batch operations
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             $project, $resource, $langcode, $language, $translation['textgroups'], $debug_mode
-          ),
+            ),
         );
-      }
+        }
     }
     if ($batch = locale_batch_by_language($langcode)) {
-      foreach ($batch['operations'] as $op) {
+        foreach ($batch['operations'] as $op) {
         $operations[] = array(
-          'boinctranslate_refresh_translations_op',
-          array(
+            'boinctranslate_refresh_translations_op',
+            array(
             NULL, $op[1][0], $langcode, $language, array('default'), $debug_mode
-          ),
+            ),
         );
-      }
+        }
+    }
     }
-  }
 
-  $batch = array(
+    $batch = array(
     'operations' => $operations,
     'finished' => 'boinctranslate_refresh_translations_finished',
     'title' => t('Importing translations'),
     'init_message' => t('Beginning translation import...'),
     'progress_message' => t('Applied @current out of @total translation updates.'),
     'error_message' => t('Translation import has encountered an error.'),
-  );
+    );
 
-  batch_set($batch);
-  batch_process();
+    batch_set($batch);
+    batch_process();
 }
 
 
@@ -741,18 +741,18 @@ 
  */
 function boinctranslate_refresh_translations_op($project, $resource, $langcode, $language, $textgroups, $debug_mode, &$context) {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  if ($debug_mode) {
+    if ($debug_mode) {
     watchdog(
-      'boinctranslate',
-      'Checking for @language updates in @project:@resource',
-      array('@language' => $language, '@project' => $project, '@resource' => $resource),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Checking for @language updates in @project:@resource',
+        array('@language' => $language, '@project' => $project, '@resource' => $resource),
+        WATCHDOG_INFO
     );
-  }
+    }
 
-  if ($project) {
+    if ($project) {
     // Import the configured resources
     $success = FALSE;
     $message = '';
@@ -760,10 +760,10 @@ 
     $response = boinctranslate_transifex_request($path);
 
     if ($response == '404 NOT FOUND') {
-      $message = "Project resource {$project}:{$resource} not found in {$language}.";
+        $message = "Project resource {$project}:{$resource} not found in {$language}.";
     }
     elseif ($response) {
-      if (!empty($response['content'])) {
+        if (!empty($response['content'])) {
         $po_text = $response['content'];
 
         // Write the translation file to a temporary location
@@ -771,163 +771,163 @@ 
         $file->filepath = file_save_data($po_text, NULL);
         $file->filename = basename($file->filepath);
         if (!$file->filepath) {
-          $message = 'Unable to create temporary file in '
+            $message = 'Unable to create temporary file in '
             . file_directory_temp() . " for {$language} translation "
             . "resource {$project}:{$resource}";
         }
 
         foreach ($textgroups as $textgroup) {
-          // Import the translations from the file to each related textgroup
-          if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
+            // Import the translations from the file to each related textgroup
+            if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
             $message = "The {$language} translation import of"
-              . " {$project}:{$resource} failed.";
+                . " {$project}:{$resource} failed.";
             $success = FALSE;
             break;
-          }
-          else {
+            }
+            else {
             $success = TRUE;
-          }
+            }
+        }
         }
-      }
-      else {
+        else {
         $message = "Unable to read response for {$language} translation import"
-          . " of {$project}:{$resource}.";
-      }
+            . " of {$project}:{$resource}.";
+        }
     }
     else {
-      $message = "Translation data not found in response for {$language}"
+        $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();
     $file->filepath = $resource;
     $file->filename = basename($file->filepath);
     if (!$results = _boinctranslate_locale_import_po($file, $langcode, LOCALE_IMPORT_OVERWRITE, $textgroup)) {
-      $message = "The {$language} translation import of"
+        $message = "The {$language} translation import of"
         . " local file {$resource} failed.";
-      $success = FALSE;
+        $success = FALSE;
     }
     else {
-      $success = TRUE;
+        $success = TRUE;
+    }
     }
-  }
 
-  if ($success) {
+    if ($success) {
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = "{$langcode}:{$textgroup}";
     $message = "Imported {$language} translations in {$project}:{$resource} ({$results['new']} added, {$results['updated']} refreshed, {$results['deleted']} removed)";
 
     if ($debug_mode) {
-      watchdog(
+        watchdog(
         'boinctranslate',
         $message,
         array(),
         WATCHDOG_INFO
-      );
+        );
     }
-  }
-  else {
+    }
+    else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
+    }
 
-  // Update our progress information.
-  $context['sandbox']['progress']++;
-  $context['sandbox']['language'] = $langcode;
-  $context['message'] = $message;
+    // Update our progress information.
+    $context['sandbox']['progress']++;
+    $context['sandbox']['language'] = $langcode;
+    $context['message'] = $message;
 
-  // Update the progress for the batch engine
-  if ($context['sandbox']['progress'] >= $context['sandbox']['max']) {
+    // 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'];
-  }
+    }
 }
 
 /**
  * Batch 'finished' callback
  */
 function boinctranslate_refresh_translations_finished($success, $results, $operations) {
-  if ($success) {
+    if ($success) {
     // Let's count our successes
     $count = count($results['success']);
     $message = "Successfully completed {$count} import operations";
     watchdog(
-      'boinctranslate',
-      'Successfully completed @count import operations.',
-      array('@count' => $count),
-      WATCHDOG_INFO
+        'boinctranslate',
+        'Successfully completed @count import operations.',
+        array('@count' => $count),
+        WATCHDOG_INFO
     );
-  }
-  else {
+    }
+    else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
     $message = 'An error occurred while processing ' . $error_operation[0] . ' with arguments :' . print_r($error_operation[0], TRUE);
     watchdog(
-      'boinctranslate',
-      $message,
-      array(),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        $message,
+        array(),
+        WATCHDOG_WARNING
     );
-  }
-  drupal_set_message($message);
-  drupal_goto('admin/boinc/translation');
+    }
+    drupal_set_message($message);
+    drupal_goto('admin/boinc/translation');
 }
 
 /**
  *
  */
 function _boinctranslate_locale_import_po($file, $langcode, $mode, $group = NULL) {
-  // Try to allocate enough time to parse and import the data.
-  if (function_exists('set_time_limit')) {
+    // Try to allocate enough time to parse and import the data.
+    if (function_exists('set_time_limit')) {
     @set_time_limit(240);
-  }
+    }
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  // Check if we have the language already in the database.
-  if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
+    // Check if we have the language already in the database.
+    if (!db_fetch_object(db_query("SELECT language FROM {languages} WHERE language = '%s'", $langcode))) {
     drupal_set_message(t('The language selected for import is not supported.'), 'error');
     return FALSE;
-  }
+    }
 
-  // Get strings from file (returns on failure after a partial import, or on success)
-  $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
-  if ($status === FALSE) {
+    // Get strings from file (returns on failure after a partial import, or on success)
+    $status = _boinctranslate_locale_import_read_po('db-store', $file, $mode, $langcode, $group);
+    if ($status === FALSE) {
     // Error messages are set in _locale_import_read_po().
     return FALSE;
-  }
+    }
 
-  // Get status information on import process.
-  list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
+    // Get status information on import process.
+    list($headerdone, $additions, $updates, $deletes, $skips) = _boinctranslate_locale_import_one_string('db-report');
 
-  if (!$headerdone) {
+    if (!$headerdone) {
     drupal_set_message(t('The translation file %filename appears to have a missing or malformed header.', array('%filename' => $file->filename)), 'error');
-  }
+    }
 
-  // Clear cache and force refresh of JavaScript translations.
-  _locale_invalidate_js($langcode);
-  cache_clear_all('locale:', 'cache', TRUE);
+    // Clear cache and force refresh of JavaScript translations.
+    _locale_invalidate_js($langcode);
+    cache_clear_all('locale:', 'cache', TRUE);
 
-  // Rebuild the menu, strings may have changed.
-  menu_rebuild();
+    // Rebuild the menu, strings may have changed.
+    menu_rebuild();
 
-  return array(
+    return array(
     'new' => $additions,
     'updated' => $updates,
     'deleted' => $deletes,
     'skipped' => $skips,
-  );
+    );
 }
 
 /**
@@ -935,253 +935,253 @@ 
  */
 function _boinctranslate_locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
-  if (!$fd) {
+    $fd = fopen($file->filepath, "rb"); // File will get closed by PHP on return
+    if (!$fd) {
     watchdog(
-      'boinctranslate',
-      'The translation import for %lang failed, because %filename could not be read.',
-      array('%lang' => $lang, '%filename' => $file->filename),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation import for %lang failed, because %filename could not be read.',
+        array('%lang' => $lang, '%filename' => $file->filename),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation import failed, because the file %filename could not be read.', $file);
     return FALSE;
-  }
+    }
 
-  $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
-  $current = array(); // Current entry being read
-  $plural = 0; // Current plural form
-  $lineno = 0; // Current line
+    $context = "COMMENT"; // Parser context: COMMENT, MSGID, MSGID_PLURAL, MSGSTR and MSGSTR_ARR
+    $current = array(); // Current entry being read
+    $plural = 0; // Current plural form
+    $lineno = 0; // Current line
 
-  while (!feof($fd)) {
+    while (!feof($fd)) {
     $line = fgets($fd, 10 * 1024); // A line should not be this long
     if ($lineno == 0) {
-      // The first line might come with a UTF-8 BOM, which should be removed.
-      $line = str_replace("\xEF\xBB\xBF", '', $line);
+        // The first line might come with a UTF-8 BOM, which should be removed.
+        $line = str_replace("\xEF\xBB\xBF", '', $line);
     }
     $lineno++;
     $line = trim(strtr($line, array("\\\n" => "")));
 
     if (!strncmp("#", $line, 1)) { // A comment
-      if ($context == "COMMENT") { // Already in comment context: add
+        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.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _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)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        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.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgctxt" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 7));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 7));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgctxt"] = $quoted;
-      $context = "MSGCTXT";
+        }
+        $current["msgctxt"] = $quoted;
+        $context = "MSGCTXT";
     }
     elseif (!strncmp("msgid_plural", $line, 12)) {
-      if ($context != "MSGID") { // Must be plural form for current entry
+        if ($context != "MSGID") { // Must be plural form for current entry
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid_plural" was expected but not found on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 12));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 12));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $current["msgid"] . "\0" . $quoted;
-      $context = "MSGID_PLURAL";
+        }
+        $current["msgid"] = $current["msgid"] . "\0" . $quoted;
+        $context = "MSGID_PLURAL";
     }
     elseif (!strncmp("msgid", $line, 5)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+        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.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgid" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgid" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 5));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 5));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgid"] = $quoted;
-      $context = "MSGID";
+        }
+        $current["msgid"] = $quoted;
+        $context = "MSGID";
     }
     elseif (!strncmp("msgstr[", $line, 7)) {
-      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
+        if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr[]" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (strpos($line, "]") === FALSE) {
+        }
+        if (strpos($line, "]") === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $frombracket = strstr($line, "[");
-      $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
-      $line = trim(strstr($line, " "));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $frombracket = strstr($line, "[");
+        $plural = substr($frombracket, 1, strpos($frombracket, "]") - 1);
+        $line = trim(strstr($line, " "));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"][$plural] = $quoted;
-      $context = "MSGSTR_ARR";
+        }
+        $current["msgstr"][$plural] = $quoted;
+        $context = "MSGSTR_ARR";
     }
     elseif (!strncmp("msgstr", $line, 6)) {
-      if ($context != "MSGID") { // Should come just after a msgid block
+        if ($context != "MSGID") { // Should come just after a msgid block
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: "msgstr" is unexpected on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $line = trim(substr($line, 6));
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        }
+        $line = trim(substr($line, 6));
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      $current["msgstr"] = $quoted;
-      $context = "MSGSTR";
+        }
+        $current["msgstr"] = $quoted;
+        $context = "MSGSTR";
     }
     elseif ($line != "") {
-      $quoted = _locale_import_parse_quoted($line);
-      if ($quoted === FALSE) {
+        $quoted = _locale_import_parse_quoted($line);
+        if ($quoted === FALSE) {
         watchdog(
-          'boinctranslate',
-          'The translation file %filename for language %lang contains a syntax error on line %line.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for language %lang contains a syntax error on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains a syntax error on line %line.', $file, $lineno);
         return FALSE;
-      }
-      if (($context == "MSGID") || ($context == "MSGID_PLURAL")) {
+        }
+        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.',
-          array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-          WATCHDOG_WARNING
+            'boinctranslate',
+            'The translation file %filename for %lang contains an error: there is an unexpected string on line %line.',
+            array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+            WATCHDOG_WARNING
         );
         _locale_import_message('The translation file %filename contains an error: there is an unexpected string on line %line.', $file, $lineno);
         return FALSE;
-      }
+        }
+    }
     }
-  }
 
-  // End of PO file, flush last entry
-  if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) {
+    // 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.',
-      array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
-      WATCHDOG_WARNING
+        'boinctranslate',
+        'The translation file %filename for %lang ended unexpectedly at line %line.',
+        array('%filename' => $file->filename, '%lang' => $lang, '%line' => $lineno),
+        WATCHDOG_WARNING
     );
     _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno);
     return FALSE;
-  }
+    }
 
 }
 
@@ -1190,28 +1190,28 @@ 
  */
 function _boinctranslate_locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL, $group = 'default') {
 
-  require_once(getcwd() . '/includes/locale.inc');
+    require_once(getcwd() . '/includes/locale.inc');
 
-  static $report = array(
+    static $report = array(
     'additions' => 0,
     'updates' => 0,
     'deletes' => 0,
     'skips' => 0,
-  );
-  static $headerdone = FALSE;
-  static $strings = array();
+    );
+    static $headerdone = FALSE;
+    static $strings = array();
 
-  switch ($op) {
+    switch ($op) {
     // Return stored strings
     case 'mem-report':
       return $strings;
 
-      // Store string in memory (only supports single strings)
+        // Store string in memory (only supports single strings)
     case 'mem-store':
       $strings[$value['msgid']] = $value['msgstr'];
-      return;
+        return;
 
-      // Called at end of import to inform the user
+        // Called at end of import to inform the user
     case 'db-report':
       return array(
         $headerdone,
@@ -1219,57 +1219,57 @@ 
         $report['updates'],
         $report['deletes'],
         $report['skips'],
-      );
+        );
 
-      // Store the string we got in the database.
+        // Store the string we got in the database.
     case 'db-store':
       // We got header information.
       if ($value['msgid'] == '') {
         $languages = language_list();
         if (($mode != LOCALE_IMPORT_KEEP) || empty($languages[$lang]->plurals)) {
-          // Since we only need to parse the header if we ought to update the
-          // plural formula, only run this if we don't need to keep existing
-          // data untouched or if we don't have an existing plural formula.
-          $header = _locale_import_parse_header($value['msgstr']);
+            // Since we only need to parse the header if we ought to update the
+            // plural formula, only run this if we don't need to keep existing
+            // data untouched or if we don't have an existing plural formula.
+            $header = _locale_import_parse_header($value['msgstr']);
 
-          // Get and store the plural formula if available.
-          if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
+            // Get and store the plural formula if available.
+            if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) {
             list($nplurals, $plural) = $p;
             db_query("UPDATE {languages} SET plurals = %d, formula = '%s' WHERE language = '%s'", $nplurals, $plural, $lang);
-          }
+            }
         }
         $headerdone = TRUE;
-      }
+        }
 
-      else {
+        else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
         if (strpos($value['msgid'], "\0")) {
-          // This string has plural versions.
-          $english = explode("\0", $value['msgid'], 2);
-          $entries = array_keys($value['msgstr']);
-          for ($i = 3; $i <= count($entries); $i++) {
+            // This string has plural versions.
+            $english = explode("\0", $value['msgid'], 2);
+            $entries = array_keys($value['msgstr']);
+            for ($i = 3; $i <= count($entries); $i++) {
             $english[] = $english[1];
-          }
-          $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
-          $english = array_map('_locale_import_append_plural', $english, $entries);
-          foreach ($translation as $key => $trans) {
+            }
+            $translation = array_map('_locale_import_append_plural', $value['msgstr'], $entries);
+            $english = array_map('_locale_import_append_plural', $english, $entries);
+            foreach ($translation as $key => $trans) {
             if ($key == 0) {
-              $plid = 0;
+                $plid = 0;
             }
             $plid = _boinctranslate_locale_import_one_string_db($report, $lang, $english[$key], $trans, $group, $comments, $mode, $plid, $key);
-          }
+            }
         }
 
         else {
-          // A simple string to import.
-          $english = $value['msgid'];
-          $translation = $value['msgstr'];
-          _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
+            // A simple string to import.
+            $english = $value['msgid'];
+            $translation = $value['msgstr'];
+            _boinctranslate_locale_import_one_string_db($report, $lang, $english, $translation, $group, $comments, $mode);
         }
-      }
-  } // end of db-store operation
+        }
+    } // end of db-store operation
 }
 
 /**
@@ -1286,15 +1286,15 @@ 
  */
 function _boinctranslate_locale_import_one_string_db(&$report, $langcode, $source, $translation, $textgroup, $location, $mode, $plid = NULL, $plural = NULL) {
 
-  $ignoreoverwrite = FALSE;
-  $lid = 0;
+    $ignoreoverwrite = FALSE;
+    $lid = 0;
 
-  // Use different DB query depending on the textgroup.
-  $uselocation = array("boinc", "project");
-  if (in_array($textgroup, $uselocation)) {
+    // Use different DB query depending on the textgroup.
+    $uselocation = array("boinc", "project");
+    if (in_array($textgroup, $uselocation)) {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s' AND textgroup = '%s'", $location, $source, $textgroup);
-  }
-  else {
+    }
+    else {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup);
 
     // Parse the location string for the string ignoreoverwrite, which
@@ -1303,61 +1303,61 @@ 
     // location string.
     $parts = explode(':', $location);
     if (!empty($parts[2])) {
-      if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
+        if (preg_match('/(ignoreoverwrite)/', $parts[2])) {
         $ignoreoverwrite = TRUE;
-      }
+        }
     }
-  }// if (in_array($textgroup, $uselocation))
+    }// if (in_array($textgroup, $uselocation))
 
-  if (!empty($translation)) {
+    if (!empty($translation)) {
     // Skip this string unless it passes a check for dangerous code.
     // Text groups other than default still can contain HTML tags
     // (i.e. translatable blocks).
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
-      $report['skips']++;
-      $lid = 0;
+        $report['skips']++;
+        $lid = 0;
     }
     elseif ($resource) {
-      // We have this source string saved already. Loop over the db results from locales_source table.
-      while ($row = db_fetch_array($resource)) {
+        // We have this source string saved already. Loop over the db results from locales_source table.
+        while ($row = db_fetch_array($resource)) {
 
         $lid = $row['lid'];
         // Check of if one or more translations exist for this lid in locales_target table.
         $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
         if (!$exists) {
-          // No translation in this language, insert translation into locales_target table.
-          db_query("INSERT INTO {locales_target} (lid, language, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $langcode, $translation, $plid, $plural);
-          $report['additions']++;
+            // No translation in this language, insert translation into locales_target table.
+            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) and (!$ignoreoverwrite) ) {
-          // 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']++;
+            // 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 {
-          $report['skips']++;
+            $report['skips']++;
         }// end if !$exists
 
-      }// while
+        }// while
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+    }
+    elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
-      $lid = $row['lid'];
-      $exists = (bool) db_result(db_query("SELECT lid FROM {locales_target} WHERE lid = %d AND language = '%s'", $lid, $langcode));
-      if ($exists) {
+        $lid = $row['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']++;
-      }// if $exists
+        }// if $exists
     }// while
-  }
-  else {
+    }
+    else {
     $report['skips']++;
-  }
+    }
 
-  return $lid;
+    return $lid;
 }
 
 
@@ -1366,17 +1366,17 @@ 
  * Parse valid resources out of configuration
  */
 function boinctranslate_parse_resources($resource_text) {
-  $resources = array();
-  $resource_array = explode(
+    $resources = array();
+    $resource_array = explode(
     "\n", $resource_text
-  );
-  foreach ($resource_array as $resource) {
+    );
+    foreach ($resource_array as $resource) {
     $resource = trim($resource);
     if ($resource AND $resource[0] != '#') {
-      $resources[] = $resource;
+        $resources[] = $resource;
     }
-  }
-  return $resources;
+    }
+    return $resources;
 }
 
 /*  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *  *
@@ -1403,5 +1403,5 @@ 
  * database.
  */
 function _boinctranslate_supertrim($instr) {
-  return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
+    return implode("\n", array_map('trim', preg_split('/\r\n|\r|\n/', $instr) ) );
 }

Braces +76 added lines, -125 removed lines

@@ -36,8 +36,7 @@ 
           )
         ), 'warning'
       );
-    }
-    elseif ($response) {
+    } elseif ($response) {
       if (is_array($response)) {
 
         $installed_languages = language_list();
@@ -67,8 +66,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);
@@ -81,8 +79,7 @@ 
                     )
                   ), 'warning'
                 );
-              }
-              elseif ($response) {
+              } elseif ($response) {
                 if (!empty($response['name'])) {
                   // Add a custom language to Drupal and enable
                   locale_add_language(
@@ -97,8 +94,7 @@ 
                   drupal_set_message(
                     'Added new language: '.$response['name']
                   );
-                }
-                else {
+                } else {
                   $variables = array(
                     '%code' => $posix_code,
                   );
@@ -113,8 +109,7 @@ 
                     WATCHDOG_ERROR
                   );
                 }
-              }
-              else {
+              } else {
                $variables = array(
                   '%code' => $posix_code,
                 );
@@ -155,8 +150,7 @@ 
           batch_set($batch);
           batch_process('admin/boinc/translation');
         }
-      }
-      else {
+      } else {
         $variables = array(
           '%project' => $project_name,
         );
@@ -171,8 +165,7 @@ 
           WATCHDOG_ERROR
         );
       }
-    }
-    else {
+    } else {
      $variables = array(
         '%project' => $project_name,
       );
@@ -229,8 +222,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(
@@ -244,8 +236,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
@@ -266,25 +257,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'
@@ -340,42 +327,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'
@@ -413,13 +393,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';
   }
 
@@ -431,8 +409,7 @@ 
     if ($json) {
       // Process as JSON
       return json_decode($response->data, TRUE);
-    }
-    else {
+    } else {
       return (string) $response->data;
     }
     break;
@@ -582,18 +559,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";
@@ -671,8 +645,7 @@ 
               if ($tl0) {
                 bts($tl0);
               }
-            }
-            elseif (count($line)>1) {
+            } elseif (count($line)>1) {
               $tl0 = trim($line[0]);
               $tl1 = trim($line[1]);
               if ($tl0 and $tl1) {
@@ -761,8 +734,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'];
 
@@ -783,23 +755,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();
@@ -809,8 +777,7 @@ 
       $message = "The {$language} translation import of"
         . " local file {$resource} failed.";
       $success = FALSE;
-    }
-    else {
+    } else {
       $success = TRUE;
     }
   }
@@ -828,8 +795,7 @@ 
         WATCHDOG_INFO
       );
     }
-  }
-  else {
+  } else {
     $context['results']['failure'][] = "{$langcode}:{$textgroup}";
     watchdog(
       'boinctranslate',
@@ -847,8 +813,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 +832,7 @@ 
       array('@count' => $count),
       WATCHDOG_INFO
     );
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -963,17 +927,19 @@ 
     $lineno++;
     $line = trim(strtr($line, array("\\\n" => "")));
 
-    if (!strncmp("#", $line, 1)) { // A comment
-      if ($context == "COMMENT") { // Already in comment context: add
+    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.',
@@ -983,13 +949,13 @@ 
         _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)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+    } 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.',
@@ -1013,9 +979,9 @@ 
       }
       $current["msgctxt"] = $quoted;
       $context = "MSGCTXT";
-    }
-    elseif (!strncmp("msgid_plural", $line, 12)) {
-      if ($context != "MSGID") { // Must be plural form for current entry
+    } elseif (!strncmp("msgid_plural", $line, 12)) {
+      if ($context != "MSGID") {
+// Must be plural form for current entry
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgid_plural" was expected but not found on line %line.',
@@ -1039,13 +1005,13 @@ 
       }
       $current["msgid"] = $current["msgid"] . "\0" . $quoted;
       $context = "MSGID_PLURAL";
-    }
-    elseif (!strncmp("msgid", $line, 5)) {
-      if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one
+    } 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.',
@@ -1069,9 +1035,9 @@ 
       }
       $current["msgid"] = $quoted;
       $context = "MSGID";
-    }
-    elseif (!strncmp("msgstr[", $line, 7)) {
-      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) { // Must come after msgid, msgid_plural, or msgstr[]
+    } elseif (!strncmp("msgstr[", $line, 7)) {
+      if (($context != "MSGID") && ($context != "MSGID_PLURAL") && ($context != "MSGSTR_ARR")) {
+// Must come after msgid, msgid_plural, or msgstr[]
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr[]" is unexpected on line %line.',
@@ -1107,9 +1073,9 @@ 
       }
       $current["msgstr"][$plural] = $quoted;
       $context = "MSGSTR_ARR";
-    }
-    elseif (!strncmp("msgstr", $line, 6)) {
-      if ($context != "MSGID") { // Should come just after a msgid block
+    } elseif (!strncmp("msgstr", $line, 6)) {
+      if ($context != "MSGID") {
+// Should come just after a msgid block
         watchdog(
           'boinctranslate',
           'The translation file %filename for %lang contains an error: "msgstr" is unexpected on line %line.',
@@ -1133,8 +1099,7 @@ 
       }
       $current["msgstr"] = $quoted;
       $context = "MSGSTR";
-    }
-    elseif ($line != "") {
+    } elseif ($line != "") {
       $quoted = _locale_import_parse_quoted($line);
       if ($quoted === FALSE) {
         watchdog(
@@ -1148,14 +1113,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.',
@@ -1171,8 +1133,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.',
@@ -1239,9 +1200,7 @@ 
           }
         }
         $headerdone = TRUE;
-      }
-
-      else {
+      } else {
         // Some real string to import.
         $comments = _locale_import_shorten_comments(empty($value['#']) ? array() : $value['#']);
 
@@ -1260,9 +1219,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'];
@@ -1293,8 +1250,7 @@ 
   $uselocation = array("boinc", "project");
   if (in_array($textgroup, $uselocation)) {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE location = '%s' AND source = '%s' AND textgroup = '%s'", $location, $source, $textgroup);
-  }
-  else {
+  } else {
     $resource = db_query("SELECT lid FROM {locales_source} WHERE source = '%s' AND textgroup = '%s'", $source, $textgroup);
 
     // Parse the location string for the string ignoreoverwrite, which
@@ -1316,8 +1272,7 @@ 
     if ($textgroup == "default" && !locale_string_is_safe($translation)) {
       $report['skips']++;
       $lid = 0;
-    }
-    elseif ($resource) {
+    } elseif ($resource) {
       // We have this source string saved already. Loop over the db results from locales_source table.
       while ($row = db_fetch_array($resource)) {
 
@@ -1328,20 +1283,17 @@ 
           // No translation in this language, insert translation into locales_target table.
           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) and (!$ignoreoverwrite) ) {
+        } else if ( ($mode == LOCALE_IMPORT_OVERWRITE) and (!$ignoreoverwrite) ) {
           // 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 {
           $report['skips']++;
         }// end if !$exists
 
       }// while
     }
-  }
-  elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
+  } elseif ($mode == LOCALE_IMPORT_OVERWRITE AND $resource) {
     // Loop over db results from locales_source table.
     while ($row = db_fetch_array($resource)) {
       $lid = $row['lid'];
@@ -1352,8 +1304,7 @@ 
         $report['deletes']++;
       }// if $exists
     }// while
-  }
-  else {
+  } else {
     $report['skips']++;
   }