BOINC / boinc

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

Braces +91 added lines, -180 removed lines

@@ -172,8 +172,7 @@ 
   $out['result'] = $result;
   if ($result == 1) {
     $out['html'] .= '<li>'. t('Module %module is enabled. OK!', array('%module' => $module)) .'</li>';
-  }
-  else {
+  } else {
     $out['html'] .= '<li><span class="marker">'. t('Module %module is disabled.', array('%module' => $module)) .'</span></li>';
   }
   $out['html'] .= '</ul>';
@@ -201,16 +200,14 @@ 
     if ($GLOBALS['db_type'] == 'pgsql') {
       // adapt from db_table_exists in database.pgsql.inc
       $result = (bool) db_result(db_query("SELECT COUNT(*) FROM pg_class WHERE relname = '%s'", $table));
-    }
-    else {
+    } else {
       // adapt from db_table_exists in database.mysql.inc
       $result = (bool) db_fetch_object(db_query("SHOW TABLES LIKE '%s'", $table));
     }
     db_set_active('default');
     if ($result) {
       $out['html'] .= '<li>'. t('Table %table: OK!', array('%table' => $table)) .'</li>';
-    }
-    else {
+    } else {
       $out['html'] .= '<li><span class="marker">'. t('Table <strong>%table</strong> does not exist!', array('%table' => $table)) .'</span></li>';
       $out['result']= 0;
     }
@@ -258,8 +255,7 @@ 
       array('!unlock_it' => l(t('release the lock'),
         'admin/boinc/import/unlock')
       ), WATCHDOG_WARNING);
-  }
-  else {
+  } else {
     $boincimport_functions = array(
       'users' => t('Import users'),
       'teams' => t('Import teams'),
@@ -294,8 +290,7 @@ 
   // Lock the import process
   if (!variable_get('boincimport_process_locked', 0)) {
     variable_set('boincimport_process_locked', 1);
-  }
-  else {
+  } else {
     watchdog('boincimport', 'The import process is locked, but another process
       is trying to access it...', array(), WATCHDOG_WARNING);
   }
@@ -309,8 +304,7 @@ 
       boincimport_teams();
       if (!variable_get('boincimport_import_team_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'teams';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'friends';
       }
       break;
@@ -319,8 +313,7 @@ 
       boincimport_friends();
       if (!variable_get('boincimport_import_friend_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'friends';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
       }
       break;
@@ -329,8 +322,7 @@ 
       boincimport_preferences();
       if (!variable_get('boincimport_import_preferences_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'preferences';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
       }
       break;
@@ -339,8 +331,7 @@ 
       boincimport_private_msgs();
       if (!variable_get('boincimport_import_private_msg_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'private messages';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'categories';
       }
       break;
@@ -349,8 +340,7 @@ 
       boincimport_forum_categories();
       if (!variable_get('boincimport_import_category_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'categories';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'topics';
       }
       break;
@@ -359,8 +349,7 @@ 
       boincimport_forum_topics();
       if (!variable_get('boincimport_import_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'posts';
       }
       break;
@@ -369,8 +358,7 @@ 
       boincimport_forum_posts();
       if (!variable_get('boincimport_import_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -379,8 +367,7 @@ 
       boincimport_team_forums();
       if (!variable_get('boincimport_team_forum_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team forums';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
       }
       break;
@@ -389,8 +376,7 @@ 
       boincimport_team_forum_topics();
       if (!variable_get('boincimport_team_topic_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team topics';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
       }
       break;
@@ -399,8 +385,7 @@ 
       boincimport_team_forum_posts();
       if (!variable_get('boincimport_team_post_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'team posts';
-      }
-      else {
+      } else {
         $_SESSION['boincimport_stage_selected'] = 'url';
       }
       break;
@@ -409,8 +394,7 @@ 
       boincimport_replace_urls();
       if (!variable_get('boincimport_replace_url_successful', 0)) {
         $_SESSION['boincimport_stage_selected'] = 'url';
-      }
-      else {
+      } else {
         drupal_set_message('Congratulations.  Import Finished');
         drupal_set_message('Please visit the '. l('Post migration configuration', 'admin/boinc/import/post_configuration') .' page');
         watchdog('boincimport', 'Import process is complete', array(), WATCHDOG_INFO);
@@ -479,8 +463,7 @@ 
       ORDER BY id ASC'
     );
     $user_count = mysqli_num_rows($boinc_accounts);
-  }
-  else {
+  } else {
     // Need to import any user who is currently ignored in order to keep them
     // ignored... not particularly clean (ignored users are stored in a string)
     $ignored_user_list = array(0);
@@ -556,8 +539,7 @@ 
      if (isset($existing_users[$boinc_account->id])) {
       // This user has already been imported
       $duplicates[] = $boinc_account->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_users_op', array(
           $boinc_account->id
@@ -613,8 +595,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boinc_id;
     $message = "Successfully imported user {$boinc_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boinc_id;
     $message = "Failed to import user {$boinc_id}!";
     watchdog('boincimport',
@@ -631,8 +612,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'];
   }
 }
@@ -657,8 +637,7 @@ 
     // Set the user import successful flag in the variable table
     variable_set('boincimport_import_user_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'teams';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -720,8 +699,7 @@ 
         $team_type = array(
           'tid' => $team_type_id
         );
-      }
-      else {
+      } else {
         if (!$name) continue;
         $team_type = array(
           'name' => strip_tags($name),
@@ -784,8 +762,7 @@ 
      if (isset($existing_teams[$boinc_team->id])) {
       // This team has already been imported
       $duplicates[] = $boinc_team->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_teams_op', array(
           $boinc_team
@@ -826,8 +803,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $boincteam->id;
     $message = "Successfully imported team {$boincteam->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincteam->id;
     $message = "Failed to import team {$boincteam->id}!";
     watchdog('boincimport',
@@ -844,8 +820,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'];
   }
 }
@@ -868,8 +843,7 @@ 
     // Set the team import successful flag in the variable table
     variable_set('boincimport_import_team_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'friends';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -990,8 +964,7 @@ 
       SET uid = '%d', friend_uid = '%d', created = '%d'",
       $uid, $friend_uid, $friendship->create_time
     );
-  }
-  else {
+  } else {
     $boinc_id = ($uid) ? $friendship->user_dest : $friendship->user_src;
     $message = "No Drupal account exists for BOINC user {$boinc_id}!";
   }
@@ -1000,8 +973,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully made users {$uid} and {$friend_uid} friends";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     if (!$message) {
       $message = "Failed to make users {$uid} and {$friend_uid} friends!";
@@ -1017,8 +989,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'];
   }
 }
@@ -1042,8 +1013,7 @@ 
     // Set the friend import successful flag in the variable table
     variable_set('boincimport_import_friend_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'preferences';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1167,8 +1137,7 @@ 
     );
     if ($user_ignored) {
       $success = TRUE;
-    }
-    else {
+    } else {
       $context['results']['warning'][] = "{$uid}:{$ignored_user_uid}";
       watchdog('boincimport',
         'Could not add user @ignored_uid to the ignore list of user @uid',
@@ -1183,8 +1152,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $uid;
     $message = "Successfully imported ignored users for user {$uid}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $uid;
     $message = "Failed to import any user filter preferences for user {$uid}!";
     watchdog('boincimport',
@@ -1201,8 +1169,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'];
   }
 }
@@ -1227,8 +1194,7 @@ 
     // Set the preference import successful flag in the variable table
     variable_set('boincimport_import_preferences_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'private messages';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1362,8 +1328,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $pm->id;
     $message = "Successfully imported private message {$pm->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $pm->id;
     $message = "Failed to import private message {$pm->id}!";
     watchdog('boincimport',
@@ -1380,8 +1345,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'];
   }
 }
@@ -1404,8 +1368,7 @@ 
     // Set the private message import successful flag in the variable table
     variable_set('boincimport_import_private_msg_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'categories';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -1558,8 +1521,7 @@ 
     if (in_array($boinc_forum_category->name, $existing_categories)) {
       // This category has already been imported
       $duplicate_categories[] = $boinc_forum_category->name;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forum_categories_op', array(
           $boinc_forum_category, $forum_vid, $pre, FALSE
@@ -1573,8 +1535,7 @@ 
      if (isset($existing_forums[$boinc_forum->id])) {
       // This forum has already been imported
       $duplicates[] = $boinc_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_forums_op', array(
           $boinc_forum, $forum_vid, $pre
@@ -1641,8 +1602,7 @@ 
     $category->name = 'Hidden';
     $category->id = 0;
     $hidden = TRUE;
-  }
-  else {
+  } else {
     // If this container is empty, put it into the hidden container
     db_set_active('boinc_rw');
     $forums_contained = db_result(db_query('
@@ -1685,13 +1645,11 @@ 
     // Store some result for post-processing in the finished callback.
     if (!$category AND $create_hidden) {
       $message = "Created special hidden container";
-    }
-    else {
+    } else {
       $context['results']['categories']['success'][] = $category->id;
       $message = "Successfully imported container {$category->id}";
     }
-  }
-  else {
+  } else {
     $context['results']['categories']['failure'][] = $category->id;
     $message = "Failed to import container {$category->id}!";
     watchdog('boincimport',
@@ -1708,8 +1666,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'];
   }
 }
@@ -1745,8 +1702,7 @@ 
     // Save the ID of the News forum for later import
     variable_set('boincimport_news_forum_id', $forum_id);
     $success = TRUE;
-  }
-  else {
+  } else {
     // Save all other forums as taxonomy terms
     $forum = array(
       'name' => $name,
@@ -1772,8 +1728,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['forums']['success'][] = $forum_id;
     $message = "Successfully imported forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['forums']['failure'][] = $forum_id;
     $message = "Failed to import forum {$forum_id}!";
   }
@@ -1786,8 +1741,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'];
   }
 }
@@ -1888,8 +1842,7 @@ 
     // Set the forum import successful flag in the variable table
     variable_set('boincimport_import_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2043,9 +1996,7 @@ 
 
     if ($duplicate OR !$post) {
       $success = FALSE;
-    }
-
-    else {
+    } else {
       // Get the user and term IDs along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
       $tid = db_result(db_query('
@@ -2109,12 +2060,10 @@ 
           if (!$success) {
             $error_detail = 'topic imported, but failed to set last comment timestamp';
           }
-        }
-        else {
+        } else {
           $error_detail = 'topic node saved, but failed to link in boincimport_temp_topic table';
         }
-      }
-      else {
+      } else {
         $error_detail = 'failed to save topic node to database';
       }
     }
@@ -2125,16 +2074,13 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $topic->id;
       $message = "Successfully imported topic {$topic->id}";
-    }
-    elseif ($duplicate) {
+    } elseif ($duplicate) {
       $context['results']['duplicate'][] = $topic->id;
       $message = "Topic {$topic->id} was already imported";
-    }
-    elseif (!$post) {
+    } elseif (!$post) {
       $context['results']['empty'][] = $topic->id;
       $message = "Skipping topic {$topic->id} as empty";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $topic->id;
       $message = "Failed to import topic {$topic->id}!";
       watchdog('boincimport',
@@ -2155,8 +2101,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'];
     }
   }
@@ -2190,8 +2135,7 @@ 
     // Set the topic import successful flag in the variable table
     variable_set('boincimport_import_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2439,18 +2383,15 @@ 
           if ($success) {
             $posts_imported++;
             $context['results']['posts']['success'][] = $post->id;
-          }
-          else {
+          } else {
             $context['results']['posts']['failure'][] = $post->id;
             $error_posts++;
           }
-        }
-        else {
+        } else {
           $context['results']['posts']['failure'][] = $post->id;
           $error_posts++;
         }
-      }
-      else {
+      } else {
         $context['results']['posts']['empty'][] = $post->id;
         $empty_posts++;
       }
@@ -2461,8 +2402,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['success'][] = $boinc_topic->id;
       $message = "Imported {$posts_imported} post(s) for topic {$boinc_topic->id}";
-    }
-    else {
+    } else {
       $context['results']['failure'][] = $boinc_topic->id;
       $message = "Failed to import any posts for topic {$boinc_topic->id} (excluded {$error_posts} errors, {$duplicate_posts} duplicates, and {$empty_posts} empty)";
       watchdog('boincimport', 'Failed to import any posts for topic @id (excluded @error_posts errors, @duplicate_posts duplicates, and @empty_posts empty)',
@@ -2483,8 +2423,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'];
     }
   }
@@ -2524,8 +2463,7 @@ 
     // Set the post import successful flag in the variable table
     variable_set('boincimport_import_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team forums';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2612,8 +2550,7 @@ 
      if (isset($existing_team_forums[$boincteam_forum->id])) {
       // This team has already been imported
       $duplicates[] = $boincteam_forum->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_forums_op', array(
           $boincteam_forum
@@ -2679,8 +2616,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $forum_id;
     $message = "Successfully imported team forum {$forum_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $forum_id;
     $message = "Failed to import team forum {$forum_id}!";
     watchdog('boincimport',
@@ -2697,8 +2633,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'];
   }
 }
@@ -2721,8 +2656,7 @@ 
     // Set the team forum import successful flag in the variable table
     variable_set('boincimport_import_team_forum_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team topics';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -2817,8 +2751,7 @@ 
      if (isset($existing_team_topics[$boincteam_topic->id])) {
       // This team topic has already been imported
       $duplicates[] = $boincteam_topic->id;
-    }
-    else {
+    } else {
       $operations[] = array(
         'boincimport_team_topics_op', array(
           $boincteam_topic
@@ -2865,8 +2798,7 @@ 
   ));
   if (!$team_forum_id) {
     $missing_parent[] = $topic->id;
-  }
-  else {
+  } else {
     // Get the content of the post that started the topic
     db_set_active('boinc_rw');
     $query = db_query('
@@ -2883,8 +2815,7 @@ 
       // Empty topics should have already been filtered out of the import, so
       // consider this an error condition
       $empty_topics[] = $topic->id;
-    }
-    else {
+    } else {
       // Get the user ID along with other data to define the topic
       $uid = boincuser_lookup_uid($topic->owner);
        if (!$topic->owner) {
@@ -2948,8 +2879,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $topic->id;
     $message = "Successfully imported team topic {$topic->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $topic->id;
     $message = "Failed to import team topic {$topic->id}!";
     watchdog('boincimport',
@@ -2966,8 +2896,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'];
   }
 }
@@ -2990,8 +2919,7 @@ 
     // Set the BLAH import successful flag in the variable table
     variable_set('boincimport_import_team_topic_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'team posts';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3113,8 +3041,7 @@ 
       if (isset($existing_posts[$boincteam_post->id])) {
         // This post has already been imported
         $duplicates[] = $boincteam_post->id;
-      }
-      else {
+      } else {
         $operations[] = array(
           'boincimport_team_posts_op', array(
             $boincteam_post
@@ -3230,8 +3157,7 @@ 
     // Store some result for post-processing in the finished callback.
     $context['results']['success'][] = $post->id;
     $message = "Successfully imported team post {$post->id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $post->id;
     $message = "Failed to import team post {$post->id}!";
     watchdog('boincimport',
@@ -3248,8 +3174,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'];
   }
 }
@@ -3272,8 +3197,7 @@ 
     // Set the team post import successful flag in the variable table
     variable_set('boincimport_import_team_post_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3379,8 +3303,7 @@ 
     $context['results']['success'][] = $boincuser_id;
     $context['results']['subscriptions'][$boincuser_id] = $count;
     $message = "Successfully imported {$count} subscriptions for user {$boincuser_id}";
-  }
-  else {
+  } else {
     $context['results']['failure'][] = $boincuser_id;
     $message = "Failed to import subscriptions for user {$boincuser_id}!";
     watchdog('boincimport',
@@ -3397,8 +3320,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'];
   }
 }
@@ -3423,8 +3345,7 @@ 
     // Set the subscription import successful flag in the variable table
     variable_set('boincimport_import_subscription_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'url';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3602,8 +3523,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['nodes']['updated'][] = $node->nid;
       $message = "Successfully updated node {$node->nid}";
-    }
-    else {
+    } else {
       $message = "No changes made to node {$node->nid}!";
     }
 
@@ -3615,8 +3535,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'];
     }
   }
@@ -3666,8 +3585,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['comments']['updated'][] = $comment->cid;
       $message = "Successfully updated comment {$comment->cid}";
-    }
-    else {
+    } else {
       $message = "No changes made to comment {$comment->cid}!";
     }
 
@@ -3679,8 +3597,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'];
     }
   }
@@ -3729,8 +3646,7 @@ 
       // Store some result for post-processing in the finished callback.
       $context['results']['pm']['updated'][] = $pm->mid;
       $message = "Successfully updated private message {$pm->mid}";
-    }
-    else {
+    } else {
       $message = "No changes made to private message {$pm->mid}!";
     }
 
@@ -3742,8 +3658,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'];
     }
   }
@@ -3808,8 +3723,7 @@ 
     // Set the replace URLs successful flag in the variable table
     variable_set('boincimport_replace_urls_successful', '1');
     $_SESSION['boincimport_stage_selected'] = 'users';
-  }
-  else {
+  } else {
     // An error occurred.
     // $operations contains the operations that remained unprocessed.
     $error_operation = reset($operations);
@@ -3911,7 +3825,8 @@ 
   $score = 0; // 0 default value, comments get higher score depending on the author's roles
   $users = serialize(array(0 => 1));  // default value for everybody!!
 
-  if ($edit['uid'] === $user->uid) { // '===' because we want to modify anonymous users too
+  if ($edit['uid'] === $user->uid) {
+// '===' because we want to modify anonymous users too
     $edit['name'] = $user->name;
   }
 
@@ -4034,13 +3949,11 @@ 
       if (isset($this->boincDomains[$domain])) {
         // This is a URL configured to be transformed
         return "{$http}://{$this->drupalDomain}{$this->basePath}";
-      }
-      else {
+      } else {
         // This URL should not be transformed
         return NULL;
       }
-    }
-    else {
+    } else {
       // This is a relative URL
       return $this->basePath;
     }
@@ -4062,8 +3975,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }
@@ -4087,8 +3999,7 @@ 
       ));
       if ($id) {
         $link = "{$newBaseUrl}goto/comment/{$id}";
-      }
-      else {
+      } else {
         // This post is not in the post import table, so it's probably a topic
         $link = $this->transformTopicLinks($matches);
       }

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

Braces +9 added lines, -18 removed lines

@@ -280,8 +280,7 @@ 
         'href' => 'account/prefs/privacy/ignore_user/remove/'. $author->uid,
         'query' => 'destination=messages/view/' . $thread_id,
       );
-    }
-    else {
+    } else {
       $vars['message_actions']['ignore_user'] = array(
         'title' => bts('Ignore User', array(), NULL, 'boinc:ignore-user-add'),
         'href' => 'account/prefs/privacy/ignore_user/add/'. $author->uid,
@@ -400,8 +399,7 @@ 
             }
             if (!$special) {
               $output .= "<td>{$value} {$pref_setting['#field_suffix']}</td>";
-            }
-            else {
+            } else {
               // The "very special" case where we merge two prefs
               $second_pref = $special_map[$name];
               $second_pref_setting = $prefs[$pref_set]['prefs']['advanced'][$category][$second_pref];
@@ -409,8 +407,7 @@ 
               $output .= "<td>{$value} {$pref_setting['#field_suffix']} {$special_delimiter[$name]}" .
                 " {$second_value} {$second_pref_setting['#field_suffix']} </td>";
             }
-          }
-          else  {
+          } else {
             $output .= '<td>---</td>';
           }
         }
@@ -936,22 +933,19 @@ 
         drupal_set_message(t('Host @id has been removed from your account.',
           array('@id' => $host_id)));
         drupal_goto('account/computers');
-      }
-      else {
+      } else {
         drupal_set_message(t('Host @id could not be deleted. Not sure why...',
           array('@id' => $host_id)), 'error'
         );
       }
-    }
-    else {
+    } else {
       drupal_set_message(t('Host @id cannot be deleted because it still has
         tasks associated with it. These tasks should be processed within the
         next few days, after which the host can be deleted.',
         array('@id' => $host_id)), 'warning'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not the owner of host @id, so you cannot
       delete it.',
       array('@id' => $host_id)), 'error'
@@ -999,15 +993,13 @@ 
         bts('The location for this host has been updated.', array(), NULL, 'boinc:account-host-details')
         . bts('This will take effect next time the host contacts the project.', array(), NULL, 'boinc:account-host-details')
       );
-    }
-    else {
+    } else {
       drupal_set_message(
         bts('Unable to save changes to this host for some reason!', array(), NULL, 'boinc:account-host-details'),
         'error'
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(
       bts('You are not allowed to make changes to this host.', array(), NULL, 'boinc:account-host-details'),
       'warning'
@@ -1164,8 +1156,7 @@ 
       $venue = $active_venue;
       //unset($_SESSION['prefs venue']);
     }
-  }
-  else {
+  } else {
     // Set the active venue to keep it selected between computing and project
     // preference pages
     $_SESSION['prefs venue'] = $venue;

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

Braces +17 added lines, -34 removed lines

@@ -258,8 +258,7 @@ 
         ), WATCHDOG_NOTICE
       );
     }
-  }
-  else {
+  } else {
     drupal_set_message(t('You are not allowed to assume foundership of this
       team.'
     ));
@@ -284,8 +283,7 @@ 
     drupal_set_message(t('@team has been removed.',
       array('@team' => $boincteam->name)));
     drupal_goto('community/teams');
-  }
-  else {
+  } else {
     drupal_set_message(t('All members must be removed from @team before the
       team can be deleted.', array('@team' => $boincteam->name)), 'error');
     drupal_goto(strstr($_GET['q'], '/delete', TRUE));
@@ -519,8 +517,7 @@ 
         array('@team' => $boincteam->name)));
       watchdog('boincteam', 'added user @uid to team @nid',
         array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-    }
-    else {
+    } else {
       // @todo - consider another rule/error event here
       drupal_set_message(t('There was a problem joining @team, please try again
         later', array('@team' => $boincteam->name)));
@@ -548,8 +545,7 @@ 
       array('@team' => $boincteam->name)));
     watchdog('boincteam', 'removed user @uid from team @nid',
       array('@uid' => $user->uid, '@nid' => $team_id), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('You are not a member of @team, so you cannot revoke
         your membership to it.', array('@team' => $boincteam->name)));
   }
@@ -618,8 +614,7 @@ 
         '@uid' => $account->uid,
         '@nid' => $team_id
       ), WATCHDOG_NOTICE);
-  }
-  else {
+  } else {
       drupal_set_message(t('@user is not a member of @team, so you cannot
         revoke the membership.', array(
           '@user' => $account->boincuser_name,
@@ -648,14 +643,12 @@ 
         '@user' => $account->boincuser_name
       )
     ), 'warning');
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // It hasn't been long enough since the last transfer request
     drupal_set_message(t('A foundership change was requested during the last 90
       days, so new requests are not allowed. Please try again later.'
     ), 'warning');
-  }
-  elseif (boincteam_is_member($team_id, $account->uid)) {
+  } elseif (boincteam_is_member($team_id, $account->uid)) {
     // Log the transfer request
     db_set_active('boinc_rw');
     db_query("
@@ -861,8 +854,7 @@ 
     $output .= '[';
     if ($credit_needed == 1) {
       $output .= bts('You must earn 1 more credit!', array(), NULL, 'boinc:create-team-panel');
-    }
-    else {
+    } else {
       $output .= bts('You must earn @count more credits!',
         array('@count' => $credit_needed),
 	NULL, 'boinc:create-team-panel'
@@ -915,8 +907,7 @@ 
     $output .= '  <label>' . bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits') . ': </label>';
     $output .= '  <span>' . number_format($team->total_credit, 0) . '</span>';
     $output .= '</div>' . "\n";
-  }
-  else if ($user->uid == $account->uid) {
+  } else if ($user->uid == $account->uid) {
     $output .= '<h2 class="pane-title">' . bts('Team (None)', array(), NULL, 'boinc:team-dashboard') . '</h2>';
     $output .= '<ul class="tab-list action-list">';
     $output .= '<li class="tab primary">';
@@ -1123,8 +1114,7 @@ 
       if ($request_age == 1) {
         $output .= bts('1 day has elapsed since your request and'
           . ' the founder has not responded.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('@count days have elapsed since your request and'
           . ' the founder has not responded.',
           array('@count' => $request_age),
@@ -1134,8 +1124,7 @@ 
       if ($days_to_respond == 1) {
         $output .= bts('You now have 1 day to assume foundership before'
           . ' another team member may submit a request.', array(), NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('You now have @count days to assume foundership before'
           . ' another team member may submit a request.',
           array('@count' => $days_to_respond),
@@ -1146,23 +1135,20 @@ 
       $output .= '  <li class="first last tab">' .
         l(bts('Assume foundership', array(), NULL, 'boinc:team-request-foundership'), "community/teams/{$team_id}/assume-foundership") . '</li>';
       $output .= '</ul>';
-    }
-    else {
+    } else {
       $output .= '<p>';
       if ($days_to_deadline == 1) {
         $output .= bts('The team founder has 1 day to respond to your'
           . ' transfer request.',
           NULL, 'boinc:team-request-foundership');
-      }
-      else {
+      } else {
         $output .= bts('The team founder has @count days to respond to your'
           . ' transfer request.', array('@count' => $days_to_deadline),
           NULL, 'boinc:team-request-foundership');
       }
       $output .= '</p>';
     }
-  }
-  elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
+  } elseif (!boincteam_new_foundership_transfer_request_ok($team_id)) {
     // If this user does not have a transfer request pending, but new requests
     // are not allowed, set the deadline to 90 days instead of 60 (as the user
     // who made the request has 30 additional days to assume foundership if
@@ -1175,15 +1161,13 @@ 
       NULL, 'boinc:team-request-foundership');
     if ($days_to_deadline == 1) {
       $output .= ' (' . bts('1 day remaining', array(), NULL, 'boinc:team-request-foundership') . ')';
-    }
-    else {
+    } else {
       $output .= ' (' . bts('@count days remaining',
         array('@count' => $days_to_deadline),
         NULL, 'boinc:team-request-foundership') . ')';
     }
     $output .= '</p>';
-  }
-  else {
+  } else {
     $output .= '<p>' . bts('If the team founder is not active and you want to'
       . ' assume the role of founder, click below to request foundership of'
       . ' @this_team.',
@@ -1229,8 +1213,7 @@ 
         $boincteam_id
       );
       db_set_active('default');
-    }
-    else {
+    } else {
       $member = user_load(boincuser_lookup_uid($boincteam->ping_user));
       $output .= '<h2 class="pane-title">' . bts('Respond to transfer request', array(), NULL, 'boinc:team-request-foundership-response')
         . '</h2>';

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

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']++;
   }
 

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

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));
     }

html/ops/bbcode_convert_response1.php

Braces +4 added lines, -3 removed lines

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

html/user/sandbox.php

Braces +3 added lines, -3 removed lines

@@ -117,7 +117,7 @@ 
         $s = stat($tmp_name);
         $size = $s['size'];
         [$exists, $elf] = sandbox_lf_exists($user, $md5);
-        if (!$exists){
+        if (!$exists) {
             // move file to download dir
             //
             $phys_path = sandbox_physical_path($user, $md5);
@@ -150,9 +150,9 @@ 
         error_page("physical file is missing");
     }
     $bused = sandbox_file_in_use($user, $name);
-    if ($bused){
+    if ($bused) {
         $notice = "<strong>$name</strong> is being used by batch(es), you can not delete it now!<br/>";
-    } else{
+    } else {
         unlink("$dir/$name");
         $notice = "<strong>$name</strong> was deleted from your sandbox<br/>";
         [$exists, $elf] = sandbox_lf_exists($user, $md5);

html/inc/sandbox.inc

Braces +9 added lines, -9 removed lines

@@ -32,7 +32,7 @@ 
 // Return path of sandbox directory for the given user.
 // Create dir if not present.
 //
-if (!function_exists("sandbox_dir")){
+if (!function_exists("sandbox_dir")) {
 function sandbox_dir($user) {
     $dir = parse_config(get_config(), "<sandbox_dir>");
     if (!$dir) {
@@ -63,7 +63,7 @@ 
     foreach ($files as $file) {
         $path = "$dir/$file";
         [$err, $file_size, $file_md5] = sandbox_parse_link_file($path);
-        if (!$err){
+        if (!$err) {
             if (strcmp($md5, $file_md5) == 0) {
                 $exist = true;
                 $elf = $file;
@@ -152,7 +152,7 @@ 
 // TODO: this is a kludge.
 // Should we use the job_file and batch_file_assoc tables instead?
 //
-function sandbox_file_in_use($user, $file){
+function sandbox_file_in_use($user, $file) {
     $ufiles = array();
 
     $pbatches = BoincBatch::enum(
@@ -162,16 +162,16 @@ 
     );
     if (!$pbatches) return false;
 
-    foreach ($pbatches as $batch){
+    foreach ($pbatches as $batch) {
         $wus = BoincWorkUnit::enum("batch = $batch->id limit 1" );
-        if ($wus == null){
+        if ($wus == null) {
             continue;
         }
-        foreach($wus as $wu){
+        foreach($wus as $wu) {
             $x = "<in>".$wu->xml_doc."</in>";
             $x = simplexml_load_string($x);
             global $fanout;
-            foreach($x->workunit->file_ref as $fr){
+            foreach($x->workunit->file_ref as $fr) {
                 $pname = (string)$fr->file_name;
                 $ufiles[] = $pname;
             }
@@ -180,10 +180,10 @@ 
     $dir = sandbox_dir($user);
     $path = $dir."/".$file;
     list($err, $size, $md5) = sandbox_parse_link_file($path);
-    if (!$err){
+    if (!$err) {
         $f = sandbox_file_name($user, $md5);
         foreach($ufiles as $uf) {
-            if (strcmp($f,$uf) == 0){
+            if (strcmp($f,$uf) == 0) {
                 return true;
             }
 

html/ops/dbinfo.php

Braces +3 added lines, -3 removed lines

@@ -41,7 +41,7 @@ 
 
 
 // returns formatted data size
-function size_format($size){
+function size_format($size) {
 	$retval = 0;
 
 	$KB = 1024;
@@ -126,7 +126,7 @@ 
 	echo "<th>Avg. Size per Row</th>";
 	echo "</tr>";
 
-	for ($i = 0; $i < sizeof($db_rec)-1; $i++){
+	for ($i = 0; $i < sizeof($db_rec)-1; $i++) {
 		echo "<tr>";
 		echo "<td align=left valign=top class=fieldname>" . $db_rec[$i]->name . "</td>";
 		echo "<td align=left valign=top class=fieldname>" . size_format($db_rec[$i]->data_size)  . "</td>";
@@ -172,7 +172,7 @@ 
     }
 	if (empty($r)) $r=0;
 
-	for ($i=0; $i < sizeof($db_rec)-1; $i++){
+	for ($i=0; $i < sizeof($db_rec)-1; $i++) {
 		$file_details["name"]         = $db_rec[$i]->name;
 		$file_details["data_size"]    = $db_rec[$i]->data_size;
 		$file_details["index_size"]   = $db_rec[$i]->index_size;