@@ -11,10 +11,10 @@ |
||
11 | 11 | parent::__construct($arguments); |
12 | 12 | $this->description = t('Import UUID nodes.'); |
13 | 13 | |
14 | - $import_path = drupal_get_path('module', 'df_engage') . '/import/'; |
|
14 | + $import_path = drupal_get_path('module', 'df_engage').'/import/'; |
|
15 | 15 | |
16 | 16 | // Create a MigrateSource object. |
17 | - $this->source = new MigrateSourceCSV($import_path . 'df_engage.base.nodes.uuid.csv', $this->csvcolumns(), array('header_rows' => 1)); |
|
17 | + $this->source = new MigrateSourceCSV($import_path.'df_engage.base.nodes.uuid.csv', $this->csvcolumns(), array('header_rows' => 1)); |
|
18 | 18 | |
19 | 19 | $this->destination = new MigrateDestinationNode('page'); |
20 | 20 |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * Page callback; uninstall a scenario. |
9 | 9 | */ |
10 | 10 | function df_admin_page_uninstall() { |
11 | - if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/uninstall')) { |
|
11 | + if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/uninstall')) { |
|
12 | 12 | return drupal_access_denied(); |
13 | 13 | } |
14 | 14 | return df_admin_uninstall_scenario(); |
@@ -23,12 +23,12 @@ discard block |
||
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 | |
30 | 30 | // Load info file to grab dependencies. |
31 | - if (!$info = drupal_parse_info_file(drupal_get_path('module', $scenario) . '/' . $scenario . '.info')) { |
|
31 | + if (!$info = drupal_parse_info_file(drupal_get_path('module', $scenario).'/'.$scenario.'.info')) { |
|
32 | 32 | drupal_set_message(t('Unable to load Scenario .info file'), 'error'); |
33 | 33 | return FALSE; |
34 | 34 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | 'operations' => $operations, |
100 | 100 | 'title' => t('Uninstall processing'), |
101 | 101 | 'init_message' => t('Starting uninstall process'), |
102 | - 'file' => drupal_get_path('module', 'migrate_ui') . '/migrate_ui.pages.inc', |
|
102 | + 'file' => drupal_get_path('module', 'migrate_ui').'/migrate_ui.pages.inc', |
|
103 | 103 | 'progress_message' => t('Uninstalling Demo Framework Scenario...'), |
104 | 104 | 'error_message' => t('An error occurred. Some or all of the uninstall processing has failed.'), |
105 | 105 | 'finished' => 'df_admin_batch_finish', |
@@ -109,8 +109,8 @@ discard block |
||
109 | 109 | // If we're being called from the enable function, redirect to enable after |
110 | 110 | // the current module is uninstalled. |
111 | 111 | if ($enable_module) { |
112 | - $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/enable/' . $enable_module))); |
|
113 | - $path = array('admin/df/enable/' . $enable_module, $options); |
|
112 | + $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT.'/df/enable/'.$enable_module))); |
|
113 | + $path = array('admin/df/enable/'.$enable_module, $options); |
|
114 | 114 | } |
115 | 115 | else { |
116 | 116 | $path = ''; |
@@ -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 | } |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | 'parent' => isset($topic['parent']) ? $topic['parent'] : 0, |
154 | 154 | 'popup width' => isset($topic['popup width']) ? $topic['popup width'] : 500, |
155 | 155 | 'popup height' => isset($topic['popup height']) ? $topic['popup height'] : 500, |
156 | - 'file' => $file . '.html', |
|
156 | + 'file' => $file.'.html', |
|
157 | 157 | // Not in .ini file. |
158 | 158 | 'path' => "$module_path/help", |
159 | 159 | 'line break' => isset($topic['line break']) ? $topic['line break'] : (isset($ini['settings'][$module->name]['line break']) ? $ini['settings'][$module->name]['line break'] : FALSE), |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | 'website' => 'https://github.com/jquery/jquery-migrate', |
203 | 203 | 'version' => '1.2.1', |
204 | 204 | 'js' => array( |
205 | - drupal_get_path('module', 'df_admin') . '/js/jquery-migrate-1.2.1.min.js' => array(), |
|
205 | + drupal_get_path('module', 'df_admin').'/js/jquery-migrate-1.2.1.min.js' => array(), |
|
206 | 206 | ), |
207 | 207 | ); |
208 | 208 | return $libraries; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | } |
17 | 17 | |
18 | 18 | // Load info file to grab base scenario. |
19 | - if (!$info = drupal_parse_info_file(drupal_get_path('module', $module) . '/' . $module . '.info')) { |
|
19 | + if (!$info = drupal_parse_info_file(drupal_get_path('module', $module).'/'.$module.'.info')) { |
|
20 | 20 | drupal_set_message(t('Unable to load Scenario .info file'), 'error'); |
21 | 21 | return FALSE; |
22 | 22 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'operations' => $operations, |
52 | 52 | 'title' => t('Sub-scenario base scenario rollback.'), |
53 | 53 | 'init_message' => t('Rolling back base scenario.'), |
54 | - 'file' => drupal_get_path('module', 'migrate_ui') . '/migrate_ui.pages.inc', |
|
54 | + 'file' => drupal_get_path('module', 'migrate_ui').'/migrate_ui.pages.inc', |
|
55 | 55 | 'progress_message' => t('Rolling back base scenario migrations...'), |
56 | 56 | 'error_message' => t('An error occurred. Some or all of the rollback processing has failed.') |
57 | 57 | ); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | */ |
12 | 12 | function df_admin_page() { |
13 | 13 | // Add DF Admin CSS. |
14 | - drupal_add_css(drupal_get_path('module', 'df_admin') . '/css/df_admin.page.css'); |
|
14 | + drupal_add_css(drupal_get_path('module', 'df_admin').'/css/df_admin.page.css'); |
|
15 | 15 | |
16 | 16 | // Get advanced help topics. |
17 | 17 | $advanced_help = module_exists('advanced_help') ? advanced_help_get_topics() : array(); |
@@ -34,9 +34,9 @@ discard block |
||
34 | 34 | 'description' => $module->info['description'], |
35 | 35 | ); |
36 | 36 | // Append optional screenshot to scenario's info array. |
37 | - $screenshot = drupal_get_path('module', $module->name) . '/screenshot.png'; |
|
37 | + $screenshot = drupal_get_path('module', $module->name).'/screenshot.png'; |
|
38 | 38 | if (file_exists($screenshot)) { |
39 | - $list[$module->name]['screenshot'] = '/' . $screenshot; |
|
39 | + $list[$module->name]['screenshot'] = '/'.$screenshot; |
|
40 | 40 | } |
41 | 41 | // Add optional advanced_help topic to scenario info array. |
42 | 42 | if (isset($advanced_help[$module->name])) { |
@@ -59,13 +59,13 @@ discard block |
||
59 | 59 | function _df_admin_dfs_links($module) { |
60 | 60 | $links = array(); |
61 | 61 | $action = !module_exists($module->name) ? 'enable' : 'reset'; |
62 | - $path = 'admin/df/' . $action . '/' . $module->name; |
|
63 | - $token = drupal_get_token(DRUPAL_ROOT . '/df/' . $action . '/' . $module->name); |
|
62 | + $path = 'admin/df/'.$action.'/'.$module->name; |
|
63 | + $token = drupal_get_token(DRUPAL_ROOT.'/df/'.$action.'/'.$module->name); |
|
64 | 64 | $links[] = l(t(ucwords($action)), $path, array('attributes' => array('class' => array('dfs-link')), 'query' => array('token' => $token))); |
65 | 65 | // Add an uninstall button if needed |
66 | 66 | if ($action == 'reset') { |
67 | 67 | $path = 'admin/df/uninstall'; |
68 | - $token = drupal_get_token(DRUPAL_ROOT . '/df/uninstall'); |
|
68 | + $token = drupal_get_token(DRUPAL_ROOT.'/df/uninstall'); |
|
69 | 69 | $links[] = l(t('Uninstall'), $path, array('attributes' => array('class' => array('dfs-link')), 'query' => array('token' => $token))); |
70 | 70 | } |
71 | 71 | return $links; |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Page callback; enable a scenario. |
10 | 10 | */ |
11 | 11 | function df_admin_page_enable($module) { |
12 | - if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/enable/' . $module)) { |
|
12 | + if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/enable/'.$module)) { |
|
13 | 13 | return drupal_access_denied(); |
14 | 14 | } |
15 | 15 | return df_admin_enable_scenario($module); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | // Load info file to grab dependencies. |
37 | - if (!$info = drupal_parse_info_file(drupal_get_path('module', $module) . '/' . $module . '.info')) { |
|
37 | + if (!$info = drupal_parse_info_file(drupal_get_path('module', $module).'/'.$module.'.info')) { |
|
38 | 38 | drupal_set_message(t('Unable to load Scenario .info file'), 'error'); |
39 | 39 | return FALSE; |
40 | 40 | } |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | // Not all DFS require a batch content import, but some need this. |
59 | 59 | // Resolves to the DF admin page if no reset callback present. |
60 | 60 | if (!drupal_is_cli()) { |
61 | - $path = 'admin/df/reset/' . $module; |
|
62 | - $token = drupal_get_token(DRUPAL_ROOT . '/df/reset/' . $module); |
|
61 | + $path = 'admin/df/reset/'.$module; |
|
62 | + $token = drupal_get_token(DRUPAL_ROOT.'/df/reset/'.$module); |
|
63 | 63 | drupal_goto($path, array('query' => array('token' => $token))); |
64 | 64 | } |
65 | 65 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | // Enable a disabled Features module. |
74 | 74 | if (!module_exists($module)) { |
75 | 75 | if (module_enable(array($module))) { |
76 | - watchdog('demo framework', 'Enabled module: ' . $module); |
|
76 | + watchdog('demo framework', 'Enabled module: '.$module); |
|
77 | 77 | drupal_set_message(t('@module enabled.', array('@module' => $module)), 'status'); |
78 | 78 | return TRUE; |
79 | 79 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | * Page callback; reset a scenario. |
10 | 10 | */ |
11 | 11 | function df_admin_page_reset($module) { |
12 | - if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT . '/df/reset/' . $module)) { |
|
12 | + if (!isset($_GET['token']) || !drupal_valid_token($_GET['token'], DRUPAL_ROOT.'/df/reset/'.$module)) { |
|
13 | 13 | return drupal_access_denied(); |
14 | 14 | } |
15 | 15 | return df_admin_reset_scenario($module, TRUE, TRUE); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | // Confirm if there was an attempt to run scenario migrations. |
80 | 80 | $migrations_count = count($migrations[$scenario]); |
81 | 81 | if ($migrations_count > 0 && drupal_is_cli()) { |
82 | - $message = $migrations_count . ' demo migrations attempted.'; |
|
82 | + $message = $migrations_count.' demo migrations attempted.'; |
|
83 | 83 | $operations[] = array('drush_print', array($message, 0, NULL, TRUE)); |
84 | 84 | } |
85 | 85 | |
@@ -129,14 +129,14 @@ discard block |
||
129 | 129 | 'operations' => $operations, |
130 | 130 | 'title' => t('Import processing'), |
131 | 131 | 'init_message' => t('Starting import process'), |
132 | - 'file' => drupal_get_path('module', 'migrate_ui') . '/migrate_ui.pages.inc', |
|
132 | + 'file' => drupal_get_path('module', 'migrate_ui').'/migrate_ui.pages.inc', |
|
133 | 133 | 'progress_message' => t('Importing Demo Framework Scenario...'), |
134 | 134 | 'error_message' => t('An error occurred. Some or all of the import processing has failed.'), |
135 | 135 | 'finished' => 'df_admin_batch_finish', |
136 | 136 | ); |
137 | 137 | batch_set($batch); |
138 | 138 | if (!drupal_is_cli()) { |
139 | - $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT . '/df/imagestyles'))); |
|
139 | + $options = array('query' => array('token' => drupal_get_token(DRUPAL_ROOT.'/df/imagestyles'))); |
|
140 | 140 | // The ability to send an array for $redirect is undocumented on Drupal.org, yay! |
141 | 141 | batch_process(array('admin/df/imagestyles', $options)); |
142 | 142 | } |
@@ -36,14 +36,14 @@ |
||
36 | 36 | $import_path = $arguments['path']; |
37 | 37 | } |
38 | 38 | else { |
39 | - $import_path = drupal_get_path('module', 'df_tools_hero') . '/import/df_tools_hero.fpp.hero.csv'; |
|
39 | + $import_path = drupal_get_path('module', 'df_tools_hero').'/import/df_tools_hero.fpp.hero.csv'; |
|
40 | 40 | } |
41 | 41 | $this->source = new MigrateSourceCSV($import_path, array(), array('header_rows' => 1)); |
42 | 42 | $this->destination = new MigrateDestinationFieldablePanelsPanes('hero', array('text_format' => 'full_html')); |
43 | 43 | |
44 | 44 | $this->addFieldMapping('field_hero_image', 'Image'); |
45 | 45 | $this->addFieldMapping('field_hero_image:file_replace')->defaultValue(FILE_EXISTS_REPLACE); |
46 | - $this->addFieldMapping('field_hero_image:source_dir')->defaultValue(dirname($import_path) . '/images'); |
|
46 | + $this->addFieldMapping('field_hero_image:source_dir')->defaultValue(dirname($import_path).'/images'); |
|
47 | 47 | $this->addFieldMapping('field_hero_image:destination_file', 'filename'); |
48 | 48 | |
49 | 49 | $this->addFieldMapping('field_hero_headline_1', 'Headline 1'); |