BOINC / boinc

drupal/sites/default/boinc/modules/contrib/features/includes/features.ctools.inc

Braces +5 added lines, -10 removed lines

@@ -110,8 +110,7 @@ 
   if ($schema && $schema['export']['bulk export']) {
     if (!empty($schema['export']['list callback']) && function_exists($schema['export']['list callback'])) {
       $options = $schema['export']['list callback']();
-    }
-    else {
+    } else {
       $options = _ctools_features_export_default_list($component, $schema);
     }
   }
@@ -165,8 +164,7 @@ 
     $code = explode('}', implode($code, "{\n"));
     array_pop($code);
     $code = implode('}', $code);
-  }
-  else {
+  } else {
     $code = '  $export = array();'."\n\n";
     foreach ($data as $object_name) {
       if ($object = _ctools_features_export_crud_load($component, $object_name)) {
@@ -264,8 +262,7 @@ 
 function _ctools_features_export_crud_load($table, $name) {
   if (ctools_api_version('1.7')) {
     return ctools_export_crud_load($table, $name);
-  }
-  elseif ($objects = ctools_export_load_object($table, 'names', array($name))) {
+  } elseif ($objects = ctools_export_load_object($table, 'names', array($name))) {
     return array_shift($objects);
   }
   return FALSE;
@@ -277,8 +274,7 @@ 
 function _ctools_features_export_default_list($table, $schema) {
   if (ctools_api_version('1.7')) {
     return ctools_export_default_list($table, $schema);
-  }
-  elseif ($objects = ctools_export_load_object($table, 'all')) {
+  } elseif ($objects = ctools_export_load_object($table, 'all')) {
     return drupal_map_assoc(array_keys($objects));
   }
   return array();
@@ -290,8 +286,7 @@ 
 function _ctools_features_export_crud_delete($table, $object) {
   if (ctools_api_version('1.7')) {
     ctools_export_crud_delete($table, $object);
-  }
-  else {
+  } else {
     $schema = ctools_export_get_schema($table);
     $export = $schema['export'];
     db_query("DELETE FROM {{$table}} WHERE {$export['key']} = '%s'", $object->{$export['key']});

drupal/sites/default/boinc/modules/contrib/features/includes/features.menu.inc

Braces +4 added lines, -8 removed lines

@@ -68,8 +68,7 @@ 
     // If this menu is provided by a different module, add it as a dependency.
     if (isset($map[$menu_name]) && $map[$menu_name] != $module_name) {
       $export['dependencies'][$map[$menu_name]] = $map[$menu_name];
-    }
-    else {
+    } else {
       $export['features']['menu_custom'][$menu_name] = $menu_name;
     }
   }
@@ -215,8 +214,7 @@ 
       // If this link is provided by a different module, add it as a dependency.
       if (isset($map[$identifier]) && $map[$identifier] != $module_name) {
         $export['dependencies'][$map[$identifier]] = $map[$identifier];
-      }
-      else {
+      } else {
         $export['features']['menu_links'][$identifier] = $identifier;
       }
       // For now, exclude a variety of common menus from automatic export.
@@ -300,8 +298,7 @@ 
             $ordered[$identifier] = 0;
             $all_links[$identifier] = $link;
             unset($unordered[$key]);
-          }
-          elseif (isset($ordered[$parent])) {
+          } elseif (isset($ordered[$parent])) {
             $ordered[$identifier] = $ordered[$parent] + 1;
             $all_links[$identifier] = $link;
             unset($unordered[$key]);
@@ -324,8 +321,7 @@ 
       // Retrieve the plid for a parent link.
       if (!empty($link['parent_path']) && $parent = features_menu_link_load("{$link['menu_name']}:{$link['parent_path']}")) {
         $link['plid'] = $parent['mlid'];
-      }
-      else {
+      } else {
         $link['plid'] = 0;
       }
       menu_link_save($link);

drupal/sites/default/boinc/modules/contrib/features/includes/features.imagecache.inc

Braces +1 added lines, -2 removed lines

@@ -82,8 +82,7 @@
     foreach ($preset as $k => $v) {
       if (in_array($k, $omit, TRUE)) {
         unset($preset[$k]);
-      }
-      else if (is_array($v)) {
+      } else if (is_array($v)) {
         _imagecache_features_preset_sanitize($preset[$k]);
       }
     }

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

Braces +2 added lines, -4 removed lines

@@ -116,8 +116,7 @@ 
         if ($v = views_get_view($view_name)) {
           if ($v->type === 'Overridden') {
             $conflicts[$map[$view_name]] = $view_name;
-          }
-          elseif ($v->type === 'Default') {
+          } elseif ($v->type === 'Default') {
             $export['dependencies'][$map[$view_name]] = $map[$view_name];
           }
         }
@@ -213,8 +212,7 @@ 
         foreach ($tables as $table => $info) {
           if (isset($info['table']) && (!isset($map[$table]) || $info['table']['group'])) {
             $map[$table] = $module;
-          }
-          else if (!isset($map[$table])) {
+          } else if (!isset($map[$table])) {
             $map[$table] = $module;
           }
         }

drupal/sites/default/boinc/modules/contrib/features/includes/features.node.inc

Braces +1 added lines, -2 removed lines

@@ -98,8 +98,7 @@
           $text = str_replace("'", "\'", $info->$key);
           $text = !empty($text) ? "t('{$text}')" : "''";
           $output[] = "      '{$key}' => {$text},";
-        }
-        else {
+        } else {
           $output[] = "      '{$key}' => '{$info->$key}',";
         }
       }

drupal/sites/default/boinc/modules/contrib/features/includes/features.taxonomy.inc

Braces +4 added lines, -8 removed lines

@@ -40,8 +40,7 @@ 
   foreach ($data as $machine_name) {
     if (isset($map[$machine_name]) && $map[$machine_name] != $module_name) {
       $export['dependencies'][$map[$machine_name]] = $map[$machine_name];
-    }
-    else {
+    } else {
       $export['features']['taxonomy'][$machine_name] = $machine_name;
     }
   }
@@ -120,13 +119,11 @@ 
     // This vocabulary is new or wasn't assigned a machine name.
     $elem['#element_validate'] = array('features_taxonomy_machine_name_validate');
     unset($form['module']);
-  }
-  elseif (strpos($form['module']['#value'], 'features_') === 0) {
+  } elseif (strpos($form['module']['#value'], 'features_') === 0) {
     // Simply display the existing machine name if we have one.
     $elem['#disabled'] = true;
     $elem['#value'] = substr($form['module']['#value'], 9);
-  }
-  else {
+  } else {
     // Some other module is responsible here, do nothing.
     return;
   }
@@ -156,8 +153,7 @@ 
     $vid = db_result(db_query("SELECT vid FROM {vocabulary} WHERE module = '%s'", $name));
     if ($vid) {
       form_error($element, t('This machine name is already taken. Please enter a unique machine name or this taxonomy.'));
-    }
-    else {
+    } else {
       $form_state['values']['module'] = $name;
     }
   }

drupal/sites/default/boinc/modules/contrib/features/includes/features.context.inc

Braces +2 added lines, -4 removed lines

@@ -74,8 +74,7 @@ 
                 $split = explode(':', $item);
                 $view_name = array_shift($split);
                 $pipe[$key][$view_name] = $view_name;
-              }
-              else {
+              } else {
                 $pipe[$key][$item] = $item;
               }
             }
@@ -123,8 +122,7 @@ 
             foreach ($context->{$key} as $item) {
               $pipe[$key][$item] = $item;
             }
-          }
-          else {
+          } else {
             $item = $context->{$key};
             $pipe[$key][$item] = $item;
           }

drupal/sites/default/boinc/modules/contrib/features/theme/theme.inc

Braces +5 added lines, -10 removed lines

@@ -38,8 +38,7 @@ 
     foreach ($module_conflicts as $conflict) {
       $conflicts = array_merge_recursive($conflict, $conflicts);
     }
-  }
-  else {
+  } else {
     $conflicts = array();
   }
   // Display key for conflicting elements.
@@ -162,8 +161,7 @@ 
   if ($path) {
     $options['attributes']['class'] = $classes[$storage] . ' features-storage';
     return l($text, $path, $options);
-  }
-  else {
+  } else {
     return "<span class='{$classes[$storage]} features-storage'>{$text}</span>";
   }
 }
@@ -286,8 +284,7 @@ 
     foreach ($export as $component) {
       if ($component === 'dependencies') {
         $feature_items = isset($info[$component]) ? $info[$component] : array();
-      }
-      else {
+      } else {
         $feature_items = isset($info['features'][$component]) ? $info['features'][$component] : array();
       }
       $source_items = isset($sources[$component]) ? $sources[$component] : array();
@@ -317,11 +314,9 @@ 
     // If component is not in source list, it was autodetected
     if (!in_array($component, $source)) {
       $list[] = "<span class='features-detected'>". check_plain($component) ."</span>";
-    }
-    elseif (is_array($conflicts) && in_array($component, $conflicts)) {
+    } elseif (is_array($conflicts) && in_array($component, $conflicts)) {
       $list[] = "<span class='features-conflict'>". check_plain($component) ."</span>";
-    }
-    else {
+    } else {
       $list[] = "<span class='features-source'>". check_plain($component) ."</span>";
     }
   }

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

Braces +4 added lines, -8 removed lines

@@ -569,8 +569,7 @@ 
       foreach ($components as $component => $modules) {
         if (isset($component_info[$type]['duplicates']) && $component_info[$type]['duplicates'] == FEATURES_DUPLICATES_ALLOWED) {
           continue;
-        }
-        else if (count($modules) > 1) {
+        } else if (count($modules) > 1) {
           foreach ($modules as $module) {
             if (!isset($conflicts[$module])) {
               $conflicts[$module] = array();
@@ -620,11 +619,9 @@ 
 function features_get_module_status($module) {
   if (module_exists($module)) {
     return FEATURES_MODULE_ENABLED;
-  }
-  else if (features_get_modules($module)) {
+  } else if (features_get_modules($module)) {
     return FEATURES_MODULE_DISABLED;
-  }
-  else {
+  } else {
     return FEATURES_MODULE_MISSING;
   }
 }
@@ -765,8 +762,7 @@ 
     $message = strip_tags($message);
     if ($severity == 'status') {
       $severity = 'ok';
-    }
-    elseif ($severity == 'error') {
+    } elseif ($severity == 'error') {
       drush_set_error($message);
       return;
     }