@@ -22,8 +22,7 @@ discard block |
||
| 22 | 22 | if (!$scenario = variable_get('df_admin_installed_scenario', FALSE)) { |
| 23 | 23 | drupal_set_message(t('No Demo Framework Scenario is currently installed.')); |
| 24 | 24 | return FALSE; |
| 25 | - } |
|
| 26 | - else{ |
|
| 25 | + } else{ |
|
| 27 | 26 | drupal_set_message(t('Uninstalling Demo Framework Scenario @scenario', array('@scenario' => $scenario))); |
| 28 | 27 | } |
| 29 | 28 | |
@@ -111,13 +110,11 @@ discard block |
||
| 111 | 110 | if ($enable_module) { |
| 112 | 111 | $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/enable/' . $enable_module))); |
| 113 | 112 | $path = array('admin/df/enable/' . $enable_module, $options); |
| 114 | - } |
|
| 115 | - else { |
|
| 113 | + } else { |
|
| 116 | 114 | $path = ''; |
| 117 | 115 | } |
| 118 | 116 | batch_process($path); |
| 119 | - } |
|
| 120 | - else { |
|
| 117 | + } else { |
|
| 121 | 118 | drush_backend_batch_process(); |
| 122 | 119 | } |
| 123 | 120 | |
@@ -76,8 +76,7 @@ |
||
| 76 | 76 | watchdog('demo framework', 'Enabled module: ' . $module); |
| 77 | 77 | drupal_set_message(t('@module enabled.', array('@module' => $module)), 'status'); |
| 78 | 78 | return TRUE; |
| 79 | - } |
|
| 80 | - else { |
|
| 79 | + } else { |
|
| 81 | 80 | drupal_set_message(t('@module does not exist or dependencies are missing.', array('@module' => $module)), 'error'); |
| 82 | 81 | return FALSE; |
| 83 | 82 | } |
@@ -108,8 +108,7 @@ discard block |
||
| 108 | 108 | foreach ($messages as $message) { |
| 109 | 109 | $operations[] = array('drupal_get_messages', array($message, TRUE)); |
| 110 | 110 | } |
| 111 | - } |
|
| 112 | - else { |
|
| 111 | + } else { |
|
| 113 | 112 | // Determine the current alias |
| 114 | 113 | $alias_context = drush_get_context('alias'); |
| 115 | 114 | $alias = !empty($alias_context) ? $alias_context : '@self'; |
@@ -139,8 +138,7 @@ discard block |
||
| 139 | 138 | $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/imagestyles'))); |
| 140 | 139 | // The ability to send an array for $redirect is undocumented on Drupal.org, yay! |
| 141 | 140 | batch_process(array('admin/df/imagestyles', $options)); |
| 142 | - } |
|
| 143 | - else { |
|
| 141 | + } else { |
|
| 144 | 142 | drush_backend_batch_process(); |
| 145 | 143 | } |
| 146 | 144 | } |
@@ -51,8 +51,7 @@ |
||
| 51 | 51 | $vars['content'][$field_name][0]['file']['#muted'] = TRUE; |
| 52 | 52 | $vars['content'][$field_name][0]['file']['#autoplay'] = 'auto'; |
| 53 | 53 | } |
| 54 | - } |
|
| 55 | - else if ($field_name != 'title') { |
|
| 54 | + } else if ($field_name != 'title') { |
|
| 56 | 55 | $container[$field_name] = $field_value; |
| 57 | 56 | unset($vars['content'][$field_name]); |
| 58 | 57 | } |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | // Create a MigrateSource object. |
| 35 | 35 | if (isset($arguments['path'])) { |
| 36 | 36 | $import_path = $arguments['path']; |
| 37 | - } |
|
| 38 | - else { |
|
| 37 | + } else { |
|
| 39 | 38 | $import_path = drupal_get_path('module', 'df_tools_hero') . '/import/df_tools_hero.fpp.hero.csv'; |
| 40 | 39 | } |
| 41 | 40 | $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1)); |
@@ -12,8 +12,7 @@ discard block |
||
| 12 | 12 | // Create a MigrateSource object. |
| 13 | 13 | if (isset($arguments['path'])) { |
| 14 | 14 | $import_path = $arguments['path']; |
| 15 | - } |
|
| 16 | - else { |
|
| 15 | + } else { |
|
| 17 | 16 | $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv'; |
| 18 | 17 | } |
| 19 | 18 | $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1)); |
@@ -68,8 +67,7 @@ discard block |
||
| 68 | 67 | parent::__construct($arguments); |
| 69 | 68 | if (isset($arguments['path'])) { |
| 70 | 69 | $import_path = $arguments['path']; |
| 71 | - } |
|
| 72 | - else { |
|
| 70 | + } else { |
|
| 73 | 71 | $import_path = drupal_get_path('module', 'df_tools_user') . '/import/df_tools_user.users.csv'; |
| 74 | 72 | } |
| 75 | 73 | $this->source = new MigrateSourceCSV($import_path, $this->csvcolumns(), array('header_rows' => 1)); |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | // Create a MigrateSource object. |
| 35 | 35 | if (isset($arguments['path'])) { |
| 36 | 36 | $import_path = $arguments['path']; |
| 37 | - } |
|
| 38 | - else { |
|
| 37 | + } else { |
|
| 39 | 38 | $import_path = drupal_get_path('module', 'df_tools_fpp') . '/import/df_tools_fpp.raw_html.csv'; |
| 40 | 39 | } |
| 41 | 40 | $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1)); |
@@ -34,8 +34,7 @@ |
||
| 34 | 34 | // Create a MigrateSource object. |
| 35 | 35 | if (isset($arguments['path'])) { |
| 36 | 36 | $import_path = $arguments['path']; |
| 37 | - } |
|
| 38 | - else { |
|
| 37 | + } else { |
|
| 39 | 38 | $import_path = drupal_get_path('module', 'df_tools_fpp') . '/import/df_tools_fpp.text.csv'; |
| 40 | 39 | } |
| 41 | 40 | $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1)); |
@@ -26,8 +26,7 @@ |
||
| 26 | 26 | // Create a MigrateSource object. |
| 27 | 27 | if (isset($arguments['path'])) { |
| 28 | 28 | $import_path = $arguments['path']; |
| 29 | - } |
|
| 30 | - else { |
|
| 29 | + } else { |
|
| 31 | 30 | $import_path = drupal_get_path('module', 'df_tools_panelizer') . '/import/df_tools_panelizer.nodes.landing.csv'; |
| 32 | 31 | } |
| 33 | 32 | $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1)); |