BOINC / boinc

drupal/sites/default/boinc/modules/contrib/views/includes/view.inc

Braces +21 added lines, -42 removed lines

@@ -524,8 +524,7 @@ 
 
         if ($argument->is_wildcard()) {
           $arg_title = $argument->wildcard_title();
-        }
-        else {
+        } else {
           $arg_title = $argument->get_title();
           $argument->query();
         }
@@ -552,8 +551,7 @@ 
         }
 
         $breadcrumb_args[] = $arg;
-      }
-      else {
+      } else {
         // determine default condition and handle.
         $status = $argument->default_action();
         break;
@@ -765,15 +763,13 @@ 
     // Check for already-cached results.
     if (!empty($this->live_preview)) {
       $cache = FALSE;
-    }
-    else {
+    } else {
       $cache = $this->display_handler->get_cache_plugin();
     }
     if ($cache && $cache->cache_get('results')) {
       $this->synchronize_pager();
       vpr('Used cached results');
-    }
-    else {
+    } else {
       $items = array();
       if ($query) {
         $replacements = $this->substitutions();
@@ -806,8 +802,7 @@ 
           $offset = $this->pager['current_page'] * $this->pager['items_per_page'] + $this->pager['offset'];
           $result = db_query_range($query, $args, $offset, $this->pager['items_per_page']);
 
-        }
-        else {
+        } else {
           $result = db_query($query, $args);
         }
 
@@ -862,14 +857,12 @@ 
     // Check for already-cached output.
     if (!empty($this->live_preview)) {
       $cache = FALSE;
-    }
-    else {
+    } else {
       $cache = $this->display_handler->get_cache_plugin();
     }
     if ($cache && $cache->cache_get('output')) {
       vpr('Used cached output');
-    }
-    else {
+    } else {
       if ($cache) {
         $cache->cache_start();
       }
@@ -1139,8 +1132,7 @@ 
     // During building, we might find a title override. If so, use it.
     if (!empty($this->build_info['title'])) {
       $title = $this->build_info['title'];
-    }
-    else {
+    } else {
       $title = $this->display_handler->get_option('title');
     }
 
@@ -1184,19 +1176,16 @@ 
     foreach (explode('/', $path) as $piece) {
       if ($piece != '%') {
         $pieces[] = $piece;
-      }
-      else {
+      } else {
         if (empty($args)) {
           // Try to never put % in a url; use the wildcard instead.
           if ($id && !empty($arguments[$id]['wildcard'])) {
             $pieces[] = $arguments[$id]['wildcard'];
-          }
-          else {
+          } else {
             $pieces[] = '*'; // gotta put something if there just isn't one.
           }
 
-        }
-        else {
+        } else {
           $pieces[] = array_shift($args);
         }
 
@@ -1345,8 +1334,7 @@ 
       $data = db_fetch_object(db_query("SELECT * FROM {views_view} WHERE $where", $arg));
       if (empty($data)) {
         $cache[$arg] = NULL;
-      }
-      else {
+      } else {
         $view = new view();
         $view->load_row($data);
         $view->type = t('Normal');
@@ -1367,8 +1355,7 @@ 
             // this ID, otherwise push it on.
             if (!empty($object->id)) {
               $location[$object->id] = $object;
-            }
-            else {
+            } else {
               $location[] = $object;
             }
           }
@@ -1427,8 +1414,7 @@ 
         // this ID, otherwise push it on.
         if (!empty($object->id)) {
           $location[$object->id] = $object;
-        }
-        else {
+        } else {
           $location[] = $object;
         }
       }
@@ -1530,8 +1516,7 @@ 
               $value = $display->handler->get_option($option);
               if ($id == 'default') {
                 $default = isset($definition['default']) ? $definition['default'] : NULL;
-              }
-              else {
+              } else {
                 $default = $this->display['default']->handler->get_option($option);
               }
 
@@ -1705,11 +1690,9 @@ 
       if (!isset($this->$field)) {
         if (!empty($info['serialize']) && isset($info['serialized default'])) {
           $this->$field = unserialize($info['serialized default']);
-        }
-        else if (isset($info['default'])) {
+        } else if (isset($info['default'])) {
           $this->$field = $info['default'];
-        }
-        else {
+        } else {
           $this->$field = '';
         }
       }
@@ -1750,16 +1733,14 @@ 
       }
       if (empty($info['serialize'])) {
         $values[] = $this->$field;
-      }
-      else {
+      } else {
         $values[] = serialize($this->$field);
       }
     }
     $query = '';
     if (!$update) {
       $query = "INSERT INTO {" . $this->db_table . "} (" . implode(', ', $fields) . ') VALUES (' . implode(', ', $defs) . ')';
-    }
-    else {
+    } else {
       $query = '';
       foreach ($fields as $id => $field) {
         if ($query) {
@@ -1822,8 +1803,7 @@ 
       if (!isset($this->$field)) {
         if (isset($info['default'])) {
           $this->$field = $info['default'];
-        }
-        else {
+        } else {
           $this->$field = '';
         }
 
@@ -2024,8 +2004,7 @@ 
     $fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
     if (isset($item)) {
       $fields[$id] = $item;
-    }
-    else {
+    } else {
       unset($fields[$id]);
     }
 

drupal/sites/default/boinc/modules/contrib/views/includes/handlers.inc

Braces +32 added lines, -64 removed lines

@@ -46,8 +46,7 @@ 
   if (!isset($definition['path'])) {
     if ($type == 'handler') {
       $definition += views_fetch_handler_data($definition['handler']);
-    }
-    else {
+    } else {
       $definition += views_fetch_plugin_data($type, $definition['handler']);
     }
   }
@@ -55,8 +54,7 @@ 
   if (!empty($definition['parent'])) {
     if ($type == 'handler') {
       $parent = views_fetch_handler_data($definition['parent']);
-    }
-    else {
+    } else {
       $parent = views_fetch_plugin_data($type, $definition['parent']);
     }
 
@@ -115,8 +113,7 @@ 
 
   if (!$handler) {
     return $cache;
-  }
-  else if (isset($cache[$handler])) {
+  } else if (isset($cache[$handler])) {
     return $cache[$handler];
   }
 
@@ -171,8 +168,7 @@ 
     $h = $data['table']['join'][$base_table];
     if (!empty($h['handler']) && class_exists($h['handler'])) {
       $handler = new $h['handler'];
-    }
-    else {
+    } else {
       $handler = new views_join();
     }
 
@@ -188,8 +184,7 @@ 
 
     if (isset($h['arguments'])) {
       call_user_func_array(array(&$handler, 'construct'), $h['arguments']);
-    }
-    else {
+    } else {
       $handler->construct();
     }
 
@@ -464,8 +459,7 @@ 
     // Determine the primary table to seek
     if (empty($this->query->relationships[$this->relationship])) {
       $base_table = $this->query->base_table;
-    }
-    else {
+    } else {
       $base_table = $this->query->relationships[$this->relationship]['base'];
     }
 
@@ -535,8 +529,7 @@ 
   function get_field() {
     if (!empty($this->formula)) {
       return $this->handler->get_formula();
-    }
-    else {
+    } else {
       return $this->handler->table_alias . '.' . $this->handler->real_field;
     }
   }
@@ -564,8 +557,7 @@ 
     // Determine the primary table to seek
     if (empty($this->handler->query->relationships[$relationship])) {
       $base_table = $this->handler->query->base_table;
-    }
-    else {
+    } else {
       $base_table = $this->handler->query->relationships[$relationship]['base'];
     }
 
@@ -587,8 +579,7 @@ 
     // automatically discard those values.
     if (empty($this->handler->view->many_to_one_tables[$field])) {
       $this->handler->view->many_to_one_tables[$field] = $this->handler->value;
-    }
-    else {
+    } else {
       $this->handler->view->many_to_one_tables[$field] = array_merge($this->handler->view->many_to_one_tables[$field], $this->handler->value);
     }
 
@@ -618,8 +609,7 @@ 
 
     if (empty($options['add_table']) || empty($view->many_to_one_tables[$field])) {
       return $query->ensure_table($this->handler->table, $this->handler->relationship, $join);
-    }
-    else {
+    } else {
       if (!empty($view->many_to_one_tables[$field])) {
         foreach ($view->many_to_one_tables[$field] as $value) {
           $join->extra = array(
@@ -652,8 +642,7 @@ 
           $join->type = 'INNER';
           $this->handler->table_alias = $this->handler->query->ensure_table($this->handler->table, $this->handler->relationship, $join);
           $this->handler->view->many_to_one_tables[$field] = $this->handler->value;
-        }
-        else {
+        } else {
           $join = $this->get_join();
           $join->type = 'LEFT';
           if (!empty($this->handler->view->many_to_one_tables[$field])) {
@@ -707,8 +696,7 @@ 
             $this->handler->table_alias = $alias;
           }
         }
-      }
-      else {
+      } else {
         // For not, we just do one join. We'll add a where clause during
         // the query phase to ensure that $table.$field IS NULL.
         $join = $this->get_join();
@@ -747,18 +735,15 @@ 
 
     if ($operator == 'not') {
       $this->handler->query->add_where($options['group'], "$field IS NULL");
-    }
-    else if ($operator == 'or' && empty($options['reduce_duplicates'])) {
+    } else if ($operator == 'or' && empty($options['reduce_duplicates'])) {
       if (count($this->handler->value) > 1) {
         $replace = array_fill(0, sizeof($this->handler->value), $placeholder);
         $in = '(' . implode(", ", $replace) . ')';
         $this->handler->query->add_where($options['group'], "$field IN $in", $this->handler->value);
-      }
-      else {
+      } else {
         $this->handler->query->add_where($options['group'], "$field = $placeholder", $this->handler->value);
       }
-    }
-    else {
+    } else {
       $field = $this->handler->real_field;
       $clauses = array();
       foreach ($this->handler->table_aliases as $value => $alias) {
@@ -806,8 +791,7 @@ 
     // The '+' character in a query string may be parsed as ' '.
     $filter->operator = 'or';
     $filter->value = preg_split('/[+ ]/', $str);
-  }
-  else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str)) {
+  } else if (preg_match('/^([0-9]+,)*[0-9]+$/', $str)) {
     $filter->operator = 'and';
     $filter->value = explode(',', $str);
   }
@@ -836,8 +820,7 @@ 
   global $user;
   if (variable_get('configurable_timezones', 1) && $user->uid && strlen($user->timezone)) {
     $timezone = $user->timezone;
-  }
-  else {
+  } else {
     $timezone = variable_get('date_default_timezone', 0);
   }
 
@@ -848,11 +831,9 @@ 
     if (!$already_set) {
       if ($GLOBALS['db_type'] == 'pgsql') {
         db_query("SET TIME ZONE INTERVAL '$offset' HOUR TO MINUTE");
-      }
-      elseif ($GLOBALS['db_type'] == 'mysqli') {
+      } elseif ($GLOBALS['db_type'] == 'mysqli') {
         db_query("SET @@session.time_zone = '$offset'");
-      }
-      elseif ($GLOBALS['db_type'] == 'mysql' && version_compare(db_version(), '4.1.3', '>=')) {
+      } elseif ($GLOBALS['db_type'] == 'mysql' && version_compare(db_version(), '4.1.3', '>=')) {
         db_query("SET @@session.time_zone = '$offset'");
       }
 
@@ -1256,8 +1237,7 @@ 
       $this->field = $field;
       $this->extra = $extra;
       $this->type = strtoupper($type);
-    }
-    else if (!empty($this->definition)) {
+    } else if (!empty($this->definition)) {
       // if no arguments, construct from definition.
       // These four must exist or it will throw notices.
       $this->table = $this->definition['table'];
@@ -1281,16 +1261,14 @@ 
   function join($table, &$query) {
     if (empty($this->definition['table formula'])) {
       $right_table = "{" . $this->table . "}";
-    }
-    else {
+    } else {
       $right_table = $this->definition['table formula'];
     }
 
     if ($this->left_table) {
       $left = $query->get_table_info($this->left_table);
       $left_field = "$left[alias].$this->left_field";
-    }
-    else {
+    } else {
       // This can be used if left_field is a formula or something. It should be used only *very* rarely.
       $left_field = $this->left_field;
     }
@@ -1302,8 +1280,7 @@ 
     $replacements = array();
     if (!empty($view)) {
       $replacements = $view->substitutions();
-    }
-    else {
+    } else {
       vpr('The current view is not set, maybe some code missed to execute $view->pre_execute()');
     }
 
@@ -1318,8 +1295,7 @@ 
           $join_table = '';
           if (!array_key_exists('table', $info)) {
             $join_table = $table['alias'] . '.';
-          }
-          elseif (isset($info['table'])) {
+          } elseif (isset($info['table'])) {
             $join_table = $info['table'] . '.';
           }
 
@@ -1332,8 +1308,7 @@ 
           if (empty($info['raw'])) {
             $raw_value = $this->db_safe($info['value'], $info);
             $q = (empty($info['numeric']) ? "'" : '');
-          }
-          else {
+          } else {
             $raw_value = $info['value'];
             $q = '';
           }
@@ -1344,12 +1319,10 @@ 
             if (count($raw_value) == 1) {
               $value = $q . array_shift($raw_value) . $q;
               $operator = $operator == 'NOT IN' ? '!=' : '=';
-            }
-            else {
+            } else {
               $value = "($q" . implode("$q, $q", $raw_value) . "$q)";
             }
-          }
-          else {
+          } else {
             $operator = !empty($info['operator']) ? $info['operator'] : '=';
             $value = "$q$raw_value$q";
           }
@@ -1359,13 +1332,11 @@ 
         if ($extras) {
           if (count($extras) == 1) {
             $output .= ' AND ' . array_shift($extras);
-          }
-          else {
+          } else {
             $output .= ' AND (' . implode(' ' . $this->extra_type . ' ', $extras) . ')';
           }
         }
-      }
-      else if ($this->extra && is_string($this->extra)) {
+      } else if ($this->extra && is_string($this->extra)) {
         $output .= " AND ($this->extra)";
       }
     }
@@ -1383,16 +1354,13 @@ 
       foreach ($input as $value) {
         if (empty($info['numeric'])) {
           $output[] = db_escape_string($value);
-        }
-        else {
+        } else {
           $output[] = intval($value);
         }
       }
-    }
-    else if (empty($info['numeric'])) {
+    } else if (empty($info['numeric'])) {
       $output = db_escape_string($input);
-    }
-    else {
+    } else {
       $output = intval($input);
     }
 

drupal/sites/default/boinc/modules/contrib/views/includes/query.inc

Braces +9 added lines, -18 removed lines

@@ -176,8 +176,7 @@ 
   function add_relationship($alias, $join, $base, $link_point = NULL) {
     if (empty($link_point)) {
       $link_point = $this->base_table;
-    }
-    else if (!array_key_exists($link_point, $this->relationships)) {
+    } else if (!array_key_exists($link_point, $this->relationships)) {
       return FALSE;
     }
 
@@ -303,8 +302,7 @@ 
     if (!$alias && $join && $relationship && !empty($join->adjusted) && $table != $join->table) {
       if ($relationship == $this->base_table) {
         $alias = $table;
-      }
-      else {
+      } else {
         $alias = $relationship . '_' . $table;
       }
     }
@@ -365,8 +363,7 @@ 
         'count' => 1,
         'alias' => $alias,
       );
-    }
-    else {
+    } else {
       $this->tables[$relationship][$table]['count']++;
     }
 
@@ -824,8 +821,7 @@ 
     // otherwise we assume it is a formula.
     if (!$alias && $table) {
       $as = $table . '_' . $field;
-    }
-    else {
+    } else {
       $as = $alias;
     }
 
@@ -875,8 +871,7 @@ 
       $keyword = drupal_strtoupper($where);
       if (count($clauses) > 1) {
         return "$keyword (" . implode(")\n    " . $this->group_operator . ' (', $clauses) . ")\n";
-      }
-      else {
+      } else {
         return "$keyword " . array_shift($clauses) . "\n";
       }
     }
@@ -911,8 +906,7 @@ 
           break;
         }
       }
-    }
-    else {
+    } else {
       $get_count_optimized = FALSE;
     }
     if (!isset($get_count_optimized)) {
@@ -949,14 +943,11 @@ 
       if (!empty($field['count'])) {
         $string = "COUNT($string)";
         $has_aggregate = TRUE;
-      }
-      else if (!empty($field['aggregate'])) {
+      } else if (!empty($field['aggregate'])) {
         $has_aggregate = TRUE;
-      }
-      elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
+      } elseif ($this->distinct && !in_array($fieldname, $this->groupby)) {
         $string = $GLOBALS['db_type'] == 'pgsql' ? "FIRST($string)" : $string;
-      }
-      else {
+      } else {
         $non_aggregates[] = $fieldname;
       }
       if ($field['alias']) {

drupal/sites/default/boinc/modules/contrib/views/includes/plugins.inc

Braces +1 added lines, -2 removed lines

@@ -304,8 +304,7 @@
       $theme_path = drupal_get_path('module', $module_dir) . '/theme';
       $theme_file = 'theme.inc';
       $path = drupal_get_path('module', $module_dir) . '/plugins';
-    }
-    else {
+    } else {
       $theme_path = $path = drupal_get_path('module', $module_dir);
       $theme_file = "$module.views.inc";
     }

drupal/sites/default/boinc/modules/contrib/views/includes/form.inc

Braces +3 added lines, -6 removed lines

@@ -20,8 +20,7 @@ 
     // and move on to form display. See _batch_finished() function.
     $form_state = $_SESSION['batch_form_state'];
     unset($_SESSION['batch_form_state']);
-  }
-  else {
+  } else {
     // If the incoming $_POST contains a form_build_id, we'll check the
     // cache for a copy of the form in question. If it's there, we don't
     // have to rebuild the form to proceed. In addition, if there is stored
@@ -219,8 +218,7 @@ 
       if (!$form['#programmed'] && empty($form_state['rebuild']) && empty($form_state['storage'])) {
         if (!empty($form_state['no_redirect'])) {
           $form_state['executed'] = TRUE;
-        }
-        else {
+        } else {
           drupal_redirect_form($form, $form_state['redirect']);
         }
       }
@@ -270,8 +268,7 @@ 
     }
     if (!empty($form_state['ajax'])) {
       $form_state['js settings']['viewsAjax']['formRelationships'][$element['#id']] = array('num' => $element['#dependency_count'], 'values' => $element['#dependency']);
-    }
-    else {
+    } else {
       views_add_js('dependent');
       $options['viewsAjax']['formRelationships'][$element['#id']] = array('num' => $element['#dependency_count'], 'values' => $element['#dependency']);
       drupal_add_js($options, 'setting');

drupal/sites/default/boinc/modules/contrib/views/includes/base.inc

Braces +4 added lines, -8 removed lines

@@ -61,11 +61,9 @@ 
       if (isset($definition['contains']) && is_array($definition['contains'])) {
         $storage[$option] = array();
         $this->_set_option_defaults($storage[$option], $definition['contains'], $level++);
-      }
-      elseif (!empty($definition['translatable']) && !empty($definition['default'])) {
+      } elseif (!empty($definition['translatable']) && !empty($definition['default'])) {
         $storage[$option] = t($definition['default']);
-      }
-      else {
+      } else {
         $storage[$option] = isset($definition['default']) ? $definition['default'] : NULL;
       }
     }
@@ -91,11 +89,9 @@ 
         }
 
         $this->unpack_options($storage[$key], $value, isset($definition[$key]['contains']) ? $definition[$key]['contains'] : array(), FALSE);
-      }
-      else if (!empty($definition[$key]['translatable']) && !empty($value)) {
+      } else if (!empty($definition[$key]['translatable']) && !empty($value)) {
         $storage[$key] = t($value);
-      }
-      else {
+      } else {
         $storage[$key] = $value;
       }
     }

drupal/sites/default/boinc/modules/contrib/views/includes/convert.inc

Braces +5 added lines, -10 removed lines

@@ -27,8 +27,7 @@ 
     $ops = array();
     if (!isset($current_views[$view->name])) {
       $ops[] = l(t('Convert'), "admin/build/views1/convert/$view->name");
-    }
-    else {
+    } else {
       $ops[] = t('Converted');
     }
     $ops[] = l(t('Delete'), "admin/build/views1/delete/$view->name");
@@ -54,8 +53,7 @@ 
   if (!empty($ts)) {
     if (strtolower($ts['sort']) == 'desc') {
       arsort($sorts);
-    }
-    else {
+    } else {
       asort($sorts);
     }
   }
@@ -133,8 +131,7 @@ 
   if ($view) {
     views_ui_cache_set($view);
     drupal_goto('admin/build/views/edit/' . $view->name);
-  }
-  else {
+  } else {
     return t('Unable to convert view.');
   }
 }
@@ -332,8 +329,7 @@ 
       $field['argoptions']['default_argument_php'] .= '  return $args['. $field['position'] .'];'."\n";
       $field['argoptions']['default_argument_php'] .= '}';
       $field['argoptions']['validate_fail'] = $actions[$field['argdefault']];
-    }
-    else {
+    } else {
       $field['argoptions']['default_action'] = $actions[$field['argdefault']];
     }
     if (!empty($field['title'])) {
@@ -497,8 +493,7 @@ 
         //|| $filters[$filter['field']]['value-type'] == 'array' ) {
       if ($filter['value'] !== NULL && $filter['value'] !== '') {
         $filter['value'] = explode(',', $filter['value']);
-      }
-      else {
+      } else {
         $filter['value'] = array();
       }
     }

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_cache_none.inc

Braces +2 added lines, -1 removed lines

@@ -4,7 +4,8 @@
  * Caching plugin that provides no caching at all.
  */
 class views_plugin_cache_none extends views_plugin_cache {
-  function cache_start() { /* do nothing */ }
+  function cache_start() {
+/* do nothing */ }
 
   function summary_title() {
     return t('None');

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_cache_time.inc

Braces +2 added lines, -4 removed lines

@@ -38,8 +38,7 @@ 
     if ($lifespan = $this->options[$type . '_lifespan']) {
       $cutoff = time() - $lifespan;
       return $cutoff;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }
@@ -47,8 +46,7 @@ 
   function cache_set_expire($type) {
     if ($lifespan = $this->options[$type . '_lifespan']) {
       return time() + $lifespan;
-    }
-    else {
+    } else {
       return CACHE_PERMANENT;
     }
   }