BOINC / boinc

drupal/sites/default/boinc/modules/contrib/flag/includes/flag.views_convert.inc

Switch Indentation +113 added lines, -113 removed lines

@@ -44,124 +44,124 @@
 
   // Now update values, options, etc. to those selected in the imported view.
   switch ($type) {
-    case 'field':
-      switch ($id) {
-        case 'ops':
-          $new_field = array(
-            'label' => $field['label'],
-            'id' => 'ops',
-            'table' => 'flag_content',
-            'field' => 'ops',
-            'relationship' => 'flag_content_rel',
-          );
-          $new_rel = 'flag_content_rel';
-          $flag_content_rel_user = 'current';
-          break;
-        case 'count':
-          $new_field = array(
-            'label' => $field['label'],
-            'id' => 'count',
-            'table' => 'flag_counts',
-            'field' => 'count',
-            'relationship' => 'flag_counts_rel',
-          );
-          $new_rel = 'flag_counts_rel';
-          break;
-        case 'name':
-          $new_field = array(
-            'label' => $field['label'],
-            'link_to_user' => 1,
-            'id' => 'name',
-            'table' => 'users',
-            'field' => 'name',
-            'relationship' => 'uid',
-          );
-          $new_rel = 'uid';
-          break;
-      }
+  case 'field':
+    switch ($id) {
+    case 'ops':
+    $new_field = array(
+    'label' => $field['label'],
+    'id' => 'ops',
+    'table' => 'flag_content',
+    'field' => 'ops',
+    'relationship' => 'flag_content_rel',
+    );
+    $new_rel = 'flag_content_rel';
+    $flag_content_rel_user = 'current';
+    break;
+    case 'count':
+    $new_field = array(
+    'label' => $field['label'],
+    'id' => 'count',
+    'table' => 'flag_counts',
+    'field' => 'count',
+    'relationship' => 'flag_counts_rel',
+    );
+    $new_rel = 'flag_counts_rel';
+    break;
+    case 'name':
+    $new_field = array(
+    'label' => $field['label'],
+    'link_to_user' => 1,
+    'id' => 'name',
+    'table' => 'users',
+    'field' => 'name',
+    'relationship' => 'uid',
+    );
+    $new_rel = 'uid';
+    break;
+    }
       break;
 
-    case 'filter':
-    case 'exposed_filter':
-      switch ($id) {
-        case 'uid':
-          // The flag_content uid filter means "Include content only flagged by
-          // the current user". In D6, this is no longer a filter, but instead
-          // part of the relationship. Make the relationship join on the uid.
-          if ($field['value'] == '***CURRENT_USER***') {
-            $new_rel = 'flag_content_rel';
-            $flag_content_rel_user = 'current';
-          }
-          // Remove the old filter.
-          $view->set_item('default', $type, $id, NULL);
-          break;
-        case 'timestamp':
-          $new_field = array(
-            'operator' => $field['operator'],
-            'value' => flag_views_convert_timestamp_value($field['value']),
-            'group' => 0,
-            'id' => 'timestamp',
-            'table' => 'flag_content',
-            'field' => 'timestamp',
-            'relationship' => 'flag_content_rel',
-            'exposed' => $type == 'exposed_filter' ? 1 : 0,
-          );
-          $new_rel = 'flag_content_rel';
-          drupal_set_message(t('Flag is not able to convert the <em>Flagged time</em> filter. It\'s value is currently empty, but needs to be populated to work properly.'), 'warning');
-          break;
-        case 'count':
-          $new_field = array(
-            'operator' => $field['operator'],
-            'value' => array('value' => $field['value']),
-            'group' => 0,
-            'id' => 'count',
-            'table' => 'flag_counts',
-            'field' => 'count',
-            'relationship' => 'flag_counts_rel',
-            'exposed' => $type == 'exposed_filter' ? 1 : 0,
-          );
-          $new_rel = 'flag_counts_rel';
-          break;
-      }
+  case 'filter':
+  case 'exposed_filter':
+    switch ($id) {
+    case 'uid':
+    // The flag_content uid filter means "Include content only flagged by
+    // the current user". In D6, this is no longer a filter, but instead
+    // part of the relationship. Make the relationship join on the uid.
+    if ($field['value'] == '***CURRENT_USER***') {
+    $new_rel = 'flag_content_rel';
+    $flag_content_rel_user = 'current';
+    }
+    // Remove the old filter.
+    $view->set_item('default', $type, $id, NULL);
+    break;
+    case 'timestamp':
+    $new_field = array(
+    'operator' => $field['operator'],
+    'value' => flag_views_convert_timestamp_value($field['value']),
+    'group' => 0,
+    'id' => 'timestamp',
+    'table' => 'flag_content',
+    'field' => 'timestamp',
+    'relationship' => 'flag_content_rel',
+    'exposed' => $type == 'exposed_filter' ? 1 : 0,
+    );
+    $new_rel = 'flag_content_rel';
+    drupal_set_message(t('Flag is not able to convert the <em>Flagged time</em> filter. It\'s value is currently empty, but needs to be populated to work properly.'), 'warning');
+    break;
+    case 'count':
+    $new_field = array(
+    'operator' => $field['operator'],
+    'value' => array('value' => $field['value']),
+    'group' => 0,
+    'id' => 'count',
+    'table' => 'flag_counts',
+    'field' => 'count',
+    'relationship' => 'flag_counts_rel',
+    'exposed' => $type == 'exposed_filter' ? 1 : 0,
+    );
+    $new_rel = 'flag_counts_rel';
+    break;
+    }
       break;
 
-    case 'argument':
-      // Flag in Drupal 5 only provides one argument, and in Views 1 arguments
-      // weren't given and ID, so we use the field type.
-      if (strpos($field['type'], 'flag_content_') === 0) {
-        $new_field = array(
-          'id' => 'uid',
-          'table' => 'users',
-          'field' => 'uid',
-          'relationship' => 'uid',
-        );
-        $new_rel = 'uid';
-      }
-      break;
+  case 'argument':
+    // Flag in Drupal 5 only provides one argument, and in Views 1 arguments
+    // weren't given and ID, so we use the field type.
+    if (strpos($field['type'], 'flag_content_') === 0) {
+      $new_field = array(
+        'id' => 'uid',
+        'table' => 'users',
+        'field' => 'uid',
+        'relationship' => 'uid',
+      );
+      $new_rel = 'uid';
+    }
+    break;
 
-    case 'sort':
-      switch ($id) {
-        case 'count':
-          $new_field = array(
-            'order' => $field['sortorder'],
-            'id' => 'count',
-            'table' => 'flag_counts',
-            'field' => 'count',
-            'relationship' => 'flag_counts_rel',
-          );
-          $new_rel = 'flag_counts_rel';
-          break;
-        case 'timestamp':
-          $new_field = array(
-            'order' => $field['sortorder'],
-            'id' => 'timestamp',
-            'table' => 'flag_content',
-            'field' => 'timestamp',
-            'relationship' => 'flag_content_rel',
-          );
-          $new_rel = 'flag_content_rel';
-          break;
-      }
+  case 'sort':
+    switch ($id) {
+    case 'count':
+    $new_field = array(
+    'order' => $field['sortorder'],
+    'id' => 'count',
+    'table' => 'flag_counts',
+    'field' => 'count',
+    'relationship' => 'flag_counts_rel',
+    );
+    $new_rel = 'flag_counts_rel';
+    break;
+    case 'timestamp':
+    $new_field = array(
+    'order' => $field['sortorder'],
+    'id' => 'timestamp',
+    'table' => 'flag_content',
+    'field' => 'timestamp',
+    'relationship' => 'flag_content_rel',
+    );
+    $new_rel = 'flag_content_rel';
+    break;
+    }
       break;
   }
 

drupal/sites/default/boinc/modules/contrib/flag/flag.module

Switch Indentation +119 added lines, -119 removed lines

@@ -165,9 +165,9 @@ 
  */
 function flag_help($path, $arg) {
   switch ($path) {
-    case FLAG_ADMIN_PATH:
-      $output = '<p>' . t('This page lists all the <em>flags</em> that are currently defined on this system. You may <a href="@add-url">add new flags</a>.', array('@add-url' => url(FLAG_ADMIN_PATH . '/add'))) . '</p>';
-      return $output;
+  case FLAG_ADMIN_PATH:
+    $output = '<p>' . t('This page lists all the <em>flags</em> that are currently defined on this system. You may <a href="@add-url">add new flags</a>.', array('@add-url' => url(FLAG_ADMIN_PATH . '/add'))) . '</p>';
+    return $output;
   }
 }
 
@@ -433,57 +433,57 @@ 
 function flag_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
   global $user;
   switch ($op) {
-    case 'update':
-    case 'insert':
-      // Response to the flag checkboxes added to the form in flag_form_alter().
-      $remembered = FALSE;
-      if (isset($node->flag)) {
-        foreach ($node->flag as $name => $state) {
-          $flag = flag_get_flag($name);
-          // Flagging may trigger actions. We want actions to get the current
-          // node, not a stale database-loaded one:
-          if (!$remembered) {
-            $flag->remember_content($node->nid, $node);
-            // Actions may modify a node, and we don't want to overwrite this
-            // modification:
-            $remembered = TRUE;
-          }
-          flag($state ? 'flag' : 'unflag', $name, $node->nid, $user);
+  case 'update':
+  case 'insert':
+    // Response to the flag checkboxes added to the form in flag_form_alter().
+    $remembered = FALSE;
+    if (isset($node->flag)) {
+      foreach ($node->flag as $name => $state) {
+        $flag = flag_get_flag($name);
+        // Flagging may trigger actions. We want actions to get the current
+        // node, not a stale database-loaded one:
+        if (!$remembered) {
+          $flag->remember_content($node->nid, $node);
+          // Actions may modify a node, and we don't want to overwrite this
+          // modification:
+          $remembered = TRUE;
         }
+        flag($state ? 'flag' : 'unflag', $name, $node->nid, $user);
       }
-      break;
-    case 'delete':
-      foreach (flag_get_flags('node') as $flag) {
-        // If the flag is being tracked by translation set and the node is part
-        // of a translation set, don't delete the flagging record.
-        // Instead, data will be updated in the 'translation_change' op, below.
-        if (!$flag->i18n || empty($node->tnid)) {
-          db_query("DELETE FROM {flag_content} WHERE fid = %d AND content_id = %d", $flag->fid, $node->nid);
-          db_query("DELETE FROM {flag_counts} WHERE fid = %d AND content_id = %d", $flag->fid, $node->nid);
-
-          // Delete comments.
-          db_query("DELETE FROM {flag_content}
+    }
+    break;
+  case 'delete':
+    foreach (flag_get_flags('node') as $flag) {
+      // If the flag is being tracked by translation set and the node is part
+      // of a translation set, don't delete the flagging record.
+      // Instead, data will be updated in the 'translation_change' op, below.
+      if (!$flag->i18n || empty($node->tnid)) {
+        db_query("DELETE FROM {flag_content} WHERE fid = %d AND content_id = %d", $flag->fid, $node->nid);
+        db_query("DELETE FROM {flag_counts} WHERE fid = %d AND content_id = %d", $flag->fid, $node->nid);
+
+        // Delete comments.
+        db_query("DELETE FROM {flag_content}
                      WHERE content_type = 'comment'
                        AND content_id IN(
                     SELECT cid
                       FROM {comments}
                      WHERE nid = %d)", $node->nid);
-        }
       }
-      break;
-    case 'translation_change':
-      if (isset($node->translation_change)) {
-        // If there is only one node remaining, track by nid rather than tnid.
-        // Otherwise, use the new tnid.
-        $content_id = $node->translation_change['new_tnid'] == 0 ? $node->translation_change['remaining_nid'] : $node->translation_change['new_tnid'];
-        foreach (flag_get_flags('node') as $flag) {
-          if ($flag->i18n) {
-            db_query("UPDATE {flag_content} SET content_id = %d WHERE fid = %d AND content_id = %d", $content_id, $flag->fid, $node->translation_change['old_tnid']);
-            db_query("UPDATE {flag_counts} SET content_id = %d WHERE fid = %d AND content_id = %d", $content_id, $flag->fid, $node->translation_change['old_tnid']);
-          }
+    }
+    break;
+  case 'translation_change':
+    if (isset($node->translation_change)) {
+      // If there is only one node remaining, track by nid rather than tnid.
+      // Otherwise, use the new tnid.
+      $content_id = $node->translation_change['new_tnid'] == 0 ? $node->translation_change['remaining_nid'] : $node->translation_change['new_tnid'];
+      foreach (flag_get_flags('node') as $flag) {
+        if ($flag->i18n) {
+          db_query("UPDATE {flag_content} SET content_id = %d WHERE fid = %d AND content_id = %d", $content_id, $flag->fid, $node->translation_change['old_tnid']);
+          db_query("UPDATE {flag_counts} SET content_id = %d WHERE fid = %d AND content_id = %d", $content_id, $flag->fid, $node->translation_change['old_tnid']);
         }
       }
-      break;
+    }
+    break;
   }
 }
 
@@ -492,74 +492,74 @@ 
  */
 function flag_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-    case 'login':
-      // Migrate anonymous flags to this user's account.
-      if (module_exists('session_api') && ($sid = flag_get_sid(0))) {
-        // The @ symbol suppresses errors if the user flags a piece of content
-        // they have already flagged as a logged-in user.
-        @db_query("UPDATE {flag_content} SET uid = %d, sid = 0 WHERE uid = 0 AND sid = %d", $account->uid, $sid);
-
-        // Delete any remaining flags this user had as an anonymous user. We use the
-        // proper unflag action here to make sure the count gets decremented again
-        // and so that other modules can clean up their tables if needed.
-        $result = db_query("SELECT fcid, fid, content_id FROM {flag_content} WHERE uid = 0 AND sid = %d", $sid);
-        $anonymous_user = drupal_anonymous_user();
-        while ($row = db_fetch_array($result)) {
-          $flag = flag_get_flag(NULL, $row['fid']);
-          $flag->flag('unflag', $row['content_id'], $anonymous_user, TRUE);
-        }
+  case 'login':
+    // Migrate anonymous flags to this user's account.
+    if (module_exists('session_api') && ($sid = flag_get_sid(0))) {
+      // The @ symbol suppresses errors if the user flags a piece of content
+      // they have already flagged as a logged-in user.
+      @db_query("UPDATE {flag_content} SET uid = %d, sid = 0 WHERE uid = 0 AND sid = %d", $account->uid, $sid);
+
+      // Delete any remaining flags this user had as an anonymous user. We use the
+      // proper unflag action here to make sure the count gets decremented again
+      // and so that other modules can clean up their tables if needed.
+      $result = db_query("SELECT fcid, fid, content_id FROM {flag_content} WHERE uid = 0 AND sid = %d", $sid);
+      $anonymous_user = drupal_anonymous_user();
+      while ($row = db_fetch_array($result)) {
+        $flag = flag_get_flag(NULL, $row['fid']);
+        $flag->flag('unflag', $row['content_id'], $anonymous_user, TRUE);
+      }
 
-        // Clean up anonymous cookies.
-        FlagCookieStorage::drop();
+      // Clean up anonymous cookies.
+      FlagCookieStorage::drop();
+    }
+    break;
+  case 'delete':
+    // Remove flags by this user.
+    $result = db_query("SELECT fc.fid, fc.content_id, c.count FROM {flag_content} fc LEFT JOIN {flag_counts} c ON fc.content_id = c.content_id AND fc.content_type = c.content_type WHERE fc.uid = %d", $account->uid);
+    while ($flag_data = db_fetch_object($result)) {
+      $flag_data->count--;
+      // Only decrement the flag count table if it's greater than 1.
+      if ($flag_data->count > 0) {
+        db_query("UPDATE {flag_counts} SET count = %d WHERE fid = %d AND content_id = %d", $flag_data->count, $flag_data->fid, $flag_data->content_id);
       }
-      break;
-    case 'delete':
-      // Remove flags by this user.
-      $result = db_query("SELECT fc.fid, fc.content_id, c.count FROM {flag_content} fc LEFT JOIN {flag_counts} c ON fc.content_id = c.content_id AND fc.content_type = c.content_type WHERE fc.uid = %d", $account->uid);
-      while ($flag_data = db_fetch_object($result)) {
-        $flag_data->count--;
-        // Only decrement the flag count table if it's greater than 1.
-        if ($flag_data->count > 0) {
-          db_query("UPDATE {flag_counts} SET count = %d WHERE fid = %d AND content_id = %d", $flag_data->count, $flag_data->fid, $flag_data->content_id);
-        }
-        elseif ($flag_data->count == 0) {
-          db_query("DELETE FROM {flag_counts} WHERE fid = %d AND content_id = %d", $flag_data->fid, $flag_data->content_id);
-        }
+      elseif ($flag_data->count == 0) {
+        db_query("DELETE FROM {flag_counts} WHERE fid = %d AND content_id = %d", $flag_data->fid, $flag_data->content_id);
       }
-      db_query("DELETE FROM {flag_content} WHERE uid = %d", $account->uid);
-
-      // Remove flags that have been done to this user.
-      db_query("DELETE FROM {flag_counts} WHERE content_type = 'user' AND content_id = %d", $account->uid);
-      db_query("DELETE FROM {flag_content} WHERE content_type = 'user' AND content_id = %d", $account->uid);
-      break;
-    case 'view';
-      $flags = flag_get_flags('user');
-      $flag_items = array();
-      foreach ($flags as $flag) {
-        if (!$flag->access($account->uid)) {
-          // User has no permission to use this flag.
-          continue;
-        }
-        if (!$flag->uses_hook_link(array())) {
-          // Flag not set to appear on profile.
-          continue;
-        }
-        $flag_items[$flag->name] = array(
-          '#type' => 'user_profile_item',
-          '#title' => $flag->get_title($account->uid),
-          '#value' => $flag->theme($flag->is_flagged($account->uid) ? 'unflag' : 'flag', $account->uid),
-          '#attributes' => array('class' => 'flag-profile-' . $flag->name),
-        );
+    }
+    db_query("DELETE FROM {flag_content} WHERE uid = %d", $account->uid);
+
+    // Remove flags that have been done to this user.
+    db_query("DELETE FROM {flag_counts} WHERE content_type = 'user' AND content_id = %d", $account->uid);
+    db_query("DELETE FROM {flag_content} WHERE content_type = 'user' AND content_id = %d", $account->uid);
+    break;
+  case 'view';
+    $flags = flag_get_flags('user');
+    $flag_items = array();
+    foreach ($flags as $flag) {
+      if (!$flag->access($account->uid)) {
+        // User has no permission to use this flag.
+        continue;
       }
-      if (!empty($flag_items)) {
-        $account->content['flags'] = $flag_items;
-        $account->content['flags'] += array(
-          '#type' => 'user_profile_category',
-          '#title' => t('Actions'),
-          '#attributes' => array('class' => 'flag-profile'),
-        );
+      if (!$flag->uses_hook_link(array())) {
+        // Flag not set to appear on profile.
+        continue;
       }
-      break;
+      $flag_items[$flag->name] = array(
+        '#type' => 'user_profile_item',
+        '#title' => $flag->get_title($account->uid),
+        '#value' => $flag->theme($flag->is_flagged($account->uid) ? 'unflag' : 'flag', $account->uid),
+        '#attributes' => array('class' => 'flag-profile-' . $flag->name),
+      );
+    }
+    if (!empty($flag_items)) {
+      $account->content['flags'] = $flag_items;
+      $account->content['flags'] += array(
+        '#type' => 'user_profile_category',
+        '#title' => t('Actions'),
+        '#attributes' => array('class' => 'flag-profile'),
+      );
+    }
+    break;
   }
 }
 
@@ -588,10 +588,10 @@ 
  */
 function flag_node_type($op, $info) {
   switch ($op) {
-    case 'delete':
-      // Remove entry from flaggable content types.
-      db_query("DELETE FROM {flag_types} WHERE type = '%s'", $info->type);
-      break;
+  case 'delete':
+    // Remove entry from flaggable content types.
+    db_query("DELETE FROM {flag_types} WHERE type = '%s'", $info->type);
+    break;
   }
 }
 
@@ -1012,15 +1012,15 @@ 
  */
 function flag_comment(&$comment, $op) {
   switch ($op) {
-    case 'delete':
-      db_query("DELETE FROM {flag_content}
+  case 'delete':
+    db_query("DELETE FROM {flag_content}
                  WHERE content_type = 'comment'
                    AND content_id = %d", $comment->cid);
 
-      db_query("DELETE FROM {flag_counts}
+    db_query("DELETE FROM {flag_counts}
                  WHERE content_type = 'comment'
                    AND content_id = %d", $comment->cid);
-      break;
+    break;
   }
 }
 
@@ -1029,10 +1029,10 @@ 
  */
 function flag_mail($key, &$message, $params) {
   switch ($key) {
-    case 'over_threshold':
-      $message['subject'] = $params['subject'];
-      $message['body'] = $params['body'];
-      break;
+  case 'over_threshold':
+    $message['subject'] = $params['subject'];
+    $message['body'] = $params['body'];
+    break;
   }
 }
 

drupal/sites/default/boinc/modules/contrib/views/modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc

Switch Indentation +78 added lines, -78 removed lines

@@ -57,92 +57,92 @@
     $transform = isset($this->argument->options['validate_argument_transform']) ? $this->argument->options['validate_argument_transform'] : FALSE;
 
     switch ($type) {
-      case 'tid':
-        if (!is_numeric($argument)) {
-          return FALSE;
-        }
-
-        $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t WHERE t.tid = %d", 't', 'tid', array($argument)),  $argument));
-        if (!$result) {
-          return FALSE;
-        }
-
-        return empty($vids) || !empty($vids[$result->vid]);
-      case 'tids':
-        // An empty argument is not a term so doesn't pass.
-        if (empty($argument)) {
-          return FALSE;
-        }
-
-        $tids = new stdClass();
-        $tids->value = $argument;
-        $tids = views_break_phrase($argument, $tids);
-        if ($tids->value == array(-1)) {
-          return FALSE;
-        }
-
-        $test = drupal_map_assoc($tids->value);
-        $titles = array();
-
-        // check, if some tids already verified
-        static $validated_cache = array();
-        foreach ($test as $tid) {
-          if (isset($validated_cache[$tid])) {
-            if ($validated_cache[$tid] === FALSE) {
-              return FALSE;
-            }
-            else {
-              $titles[] = $validated_cache[$tid];
-              unset($test[$tid]);
-            }
+    case 'tid':
+      if (!is_numeric($argument)) {
+        return FALSE;
+      }
+
+      $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t WHERE t.tid = %d", 't', 'tid', array($argument)),  $argument));
+      if (!$result) {
+        return FALSE;
+      }
+
+      return empty($vids) || !empty($vids[$result->vid]);
+    case 'tids':
+      // An empty argument is not a term so doesn't pass.
+      if (empty($argument)) {
+        return FALSE;
+      }
+
+      $tids = new stdClass();
+      $tids->value = $argument;
+      $tids = views_break_phrase($argument, $tids);
+      if ($tids->value == array(-1)) {
+        return FALSE;
+      }
+
+      $test = drupal_map_assoc($tids->value);
+      $titles = array();
+
+      // check, if some tids already verified
+      static $validated_cache = array();
+      foreach ($test as $tid) {
+        if (isset($validated_cache[$tid])) {
+          if ($validated_cache[$tid] === FALSE) {
+            return FALSE;
+          }
+          else {
+            $titles[] = $validated_cache[$tid];
+            unset($test[$tid]);
           }
         }
+      }
 
 
-        // if unverified tids left - verify them and cache results
-        if (count($test)) {
-          $placeholders = implode(', ', array_fill(0, count($test), '%d'));
+      // if unverified tids left - verify them and cache results
+      if (count($test)) {
+        $placeholders = implode(', ', array_fill(0, count($test), '%d'));
 
-          $result = db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t WHERE t.tid IN ($placeholders)", 't', 'tid', array($test)), $test);
-          while ($term = db_fetch_object($result)) {
-            if ($vids && empty($vids[$term->vid])) {
-              $validated_cache[$term->tid] = FALSE;
-              return FALSE;
-            }
-
-            $titles[] = $validated_cache[$term->tid] = check_plain($term->name);
-            unset($test[$term->tid]);
+        $result = db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t WHERE t.tid IN ($placeholders)", 't', 'tid', array($test)), $test);
+        while ($term = db_fetch_object($result)) {
+          if ($vids && empty($vids[$term->vid])) {
+            $validated_cache[$term->tid] = FALSE;
+            return FALSE;
           }
-        }
-
-        // Remove duplicate titles
-        $titles = array_unique($titles);
-
-        $this->argument->validated_title = implode($tids->operator == 'or' ? ' + ' : ', ', $titles);
-        // If this is not empty, we did not find a tid.
-        return empty($test);
-      case 'name':
-      case 'convert':
-        $and = '';
-        if (!empty($vids)) {
-          $and = " AND t.vid IN(" . implode(', ', $vids) . ')';
-        }
-        if ($transform) {
-          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t LEFT JOIN {term_synonym} ts ON ts.tid = t.tid WHERE (replace(t.name, ' ', '-') = '%s' OR replace(ts.name, ' ', '-') = '%s')$and", 't', 'tid', array($argument, $argument)), $argument, $argument));
-        }
-        else {
-          $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t LEFT JOIN {term_synonym} ts ON ts.tid = t.tid WHERE (t.name = '%s' OR ts.name = '%s')$and", 't', 'tid', array($argument, $argument)), $argument, $argument));
-        }
-        if (!$result) {
-          return FALSE;
-        }
 
-        if ($type == 'convert') {
-          $this->argument->argument = $result->tid;
+          $titles[] = $validated_cache[$term->tid] = check_plain($term->name);
+          unset($test[$term->tid]);
         }
-        $this->argument->validated_title = check_plain($result->name);
-
-        return TRUE;
+      }
+
+      // Remove duplicate titles
+      $titles = array_unique($titles);
+
+      $this->argument->validated_title = implode($tids->operator == 'or' ? ' + ' : ', ', $titles);
+      // If this is not empty, we did not find a tid.
+      return empty($test);
+    case 'name':
+    case 'convert':
+      $and = '';
+      if (!empty($vids)) {
+        $and = " AND t.vid IN(" . implode(', ', $vids) . ')';
+      }
+      if ($transform) {
+        $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t LEFT JOIN {term_synonym} ts ON ts.tid = t.tid WHERE (replace(t.name, ' ', '-') = '%s' OR replace(ts.name, ' ', '-') = '%s')$and", 't', 'tid', array($argument, $argument)), $argument, $argument));
+      }
+      else {
+        $result = db_fetch_object(db_query(db_rewrite_sql("SELECT t.* FROM {term_data} t LEFT JOIN {term_synonym} ts ON ts.tid = t.tid WHERE (t.name = '%s' OR ts.name = '%s')$and", 't', 'tid', array($argument, $argument)), $argument, $argument));
+      }
+      if (!$result) {
+        return FALSE;
+      }
+
+      if ($type == 'convert') {
+        $this->argument->argument = $result->tid;
+      }
+      $this->argument->validated_title = check_plain($result->name);
+
+      return TRUE;
     }
   }
 }

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

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
 }
 

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

Switch Indentation +27 added lines, -27 removed lines

@@ -643,9 +643,9 @@ 
     }
     break;
     
-    default:
-      // Don't generate form elements for things that aren't explicitly form
-      // elements (i.e. 'title', '@attributes' keys, and the like)
+  default:
+    // Don't generate form elements for things that aren't explicitly form
+    // elements (i.e. 'title', '@attributes' keys, and the like)
   }
 }
 
@@ -1863,29 +1863,29 @@ 
  */
 function pretty_application_version($appverid, $vernum, $plan_class, $plfm) {
   switch ($appverid) {
-    case ANON_PLATFORM_UNKNOWN:
-      return "Anonymous platform";
-    case ANON_PLATFORM_CPU:
-      return "Anonymous platform CPU";
-    case ANON_PLATFORM_NVIDIA:
-      return "Anonymous platform NVIDIA GPU";
-    case ANON_PLATFORM_ATI:
-      return "Anonymous platform ATI GPU";
-    case ANON_PLATFORM_INTEL:
-      return "Anonymous platform Intel GPU";
-    case 0:
-      return "---";
-    default:
-      // Handle the case where the appversid is still negative. This
-      // may be cause BOINC has introduced a new anonymous platform
-      // that is not handled by the above case statements.
-      if ($appverid < 0) {
-        return "Unknown Anonymous platform";
-      }
-      else {
-        $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
-        $prettyc = ($plan_class) ? "($av->plan_class)" : '';
-        return "v$prettyv $prettyc $plfm";
-      }
+  case ANON_PLATFORM_UNKNOWN:
+    return "Anonymous platform";
+  case ANON_PLATFORM_CPU:
+    return "Anonymous platform CPU";
+  case ANON_PLATFORM_NVIDIA:
+    return "Anonymous platform NVIDIA GPU";
+  case ANON_PLATFORM_ATI:
+    return "Anonymous platform ATI GPU";
+  case ANON_PLATFORM_INTEL:
+    return "Anonymous platform Intel GPU";
+  case 0:
+    return "---";
+  default:
+    // Handle the case where the appversid is still negative. This
+    // may be cause BOINC has introduced a new anonymous platform
+    // that is not handled by the above case statements.
+    if ($appverid < 0) {
+      return "Unknown Anonymous platform";
+    }
+    else {
+      $prettyv = sprintf("%d.%02d", $vernum/100, $vernum%100);
+      $prettyc = ($plan_class) ? "($av->plan_class)" : '';
+      return "v$prettyv $prettyc $plfm";
+    }
   }
 }