@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * DF Admin page handling functions. |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * DF Admin page handling functions. |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * DF Admin page callback used to list scenarios. |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * Contains DF Admin's uninstall command. |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * Contains DF Admin's uninstall command. |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Page callback; uninstall a scenario. |
@@ -23,7 +23,7 @@ |
||
23 | 23 | drupal_set_message(t('No Demo Framework Scenario is currently installed.')); |
24 | 24 | return FALSE; |
25 | 25 | } |
26 | - else{ |
|
26 | + else { |
|
27 | 27 | drupal_set_message(t('Uninstalling Demo Framework Scenario @scenario', array('@scenario' => $scenario))); |
28 | 28 | } |
29 | 29 |
@@ -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 |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * df_admin.strongarm.inc |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * df_admin.strongarm.inc |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Implements hook_strongarm(). |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * df_admin.features.inc |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * df_admin.features.inc |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Implements hook_ctools_plugin_api(). |
@@ -137,7 +137,7 @@ |
||
137 | 137 | * The machine name of the scenario feature. |
138 | 138 | * @param string $rollback |
139 | 139 | * Boolean: rollback existing demo content. |
140 | - */ |
|
140 | + */ |
|
141 | 141 | function drush_df_admin_reset_scenario($scenario) { |
142 | 142 | $rollback = drush_get_option('rollback', TRUE); |
143 | 143 | $seed = drush_get_option('seed', TRUE); |
@@ -1,8 +1,8 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * Code for the DF Admin feature. |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * Code for the DF Admin feature. |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | include_once 'df_admin.features.inc'; |
8 | 8 | |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | * Implements hook_navbar_alter(). |
79 | 79 | */ |
80 | 80 | function df_admin_navbar_alter(&$items) { |
81 | - foreach ($items['administration']['tray']['navbar_administration']['administration_menu'] as $mid => $item) { |
|
81 | + foreach ($items['administration']['tray']['navbar_administration']['administration_menu'] as $mid => $item) { |
|
82 | 82 | // Change "My Workbench" to "Workbench" in the Navbar. |
83 | 83 | if (isset($item['#href']) && $item['#href'] == 'admin/workbench') { |
84 | 84 | $items['administration']['tray']['navbar_administration']['administration_menu'][$mid]['#title'] = 'Workbench'; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | /** |
64 | 64 | * Implements hook_theme(). |
65 | 65 | */ |
66 | -function df_admin_theme(){ |
|
66 | +function df_admin_theme() { |
|
67 | 67 | return array( |
68 | 68 | 'df_admin_page_template' => array( |
69 | 69 | 'template' => 'df-admin-page', |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | unset($items['administration']['tray']['navbar_administration']['administration_menu'][$mid]); |
94 | 94 | } |
95 | 95 | // Shorten "Demo Framework" to "Demo" on the Navbar. |
96 | - if(isset($item['#href']) && $item['#href'] == 'admin/df') { |
|
96 | + if (isset($item['#href']) && $item['#href'] == 'admin/df') { |
|
97 | 97 | $items['administration']['tray']['navbar_administration']['administration_menu'][$mid]['#title'] = 'Demo'; |
98 | 98 | } |
99 | 99 | } |
@@ -111,8 +111,12 @@ |
||
111 | 111 | $modules = system_rebuild_module_data(); |
112 | 112 | foreach ($modules as $index => $module) { |
113 | 113 | // Process only modules that are Scenarios and are not enabled. |
114 | - if ($module->info['package'] != 'Demo Framework Scenarios') continue; |
|
115 | - if ($module->status) continue; |
|
114 | + if ($module->info['package'] != 'Demo Framework Scenarios') { |
|
115 | + continue; |
|
116 | + } |
|
117 | + if ($module->status) { |
|
118 | + continue; |
|
119 | + } |
|
116 | 120 | |
117 | 121 | // Functionality taken from _advanced_help_parse_ini(). |
118 | 122 | $module_path = drupal_get_path('module', $module->name); |
@@ -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 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file df-admin-page.tpl.php |
|
4 | - */ |
|
3 | + * @file df-admin-page.tpl.php |
|
4 | + */ |
|
5 | 5 | ?> |
6 | 6 | |
7 | 7 | <div class="dfs-wrapper"> |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @file |
|
4 | - * df_admin.features.user_permission.inc |
|
5 | - */ |
|
3 | + * @file |
|
4 | + * df_admin.features.user_permission.inc |
|
5 | + */ |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * Implements hook_defaultconfig_user_default_permissions(). |