Commit b6c1c2fb authored by alexpott's avatar alexpott

Issue #2353335 by Devin Carlson, Wim Leers, myforgedoteu: module install cannot save FTP settings

parent ea24dc51
...@@ -76,7 +76,7 @@ function authorize_access_allowed() { ...@@ -76,7 +76,7 @@ function authorize_access_allowed() {
// Initialize the maintenance theme for this administrative script. // Initialize the maintenance theme for this administrative script.
drupal_maintenance_theme(); drupal_maintenance_theme();
$output = ''; $content = [];
$show_messages = TRUE; $show_messages = TRUE;
$response = new Response(); $response = new Response();
...@@ -107,11 +107,10 @@ function authorize_access_allowed() { ...@@ -107,11 +107,10 @@ function authorize_access_allowed() {
drupal_set_message($results['page_message']['message'], $results['page_message']['type']); drupal_set_message($results['page_message']['message'], $results['page_message']['type']);
} }
$authorize_report = array( $content['authorize_report'] = array(
'#theme' => 'authorize_report', '#theme' => 'authorize_report',
'#messages' => $results['messages'], '#messages' => $results['messages'],
); );
$output = drupal_render_root($authorize_report);
$links = array(); $links = array();
if (is_array($results['tasks'])) { if (is_array($results['tasks'])) {
...@@ -124,25 +123,23 @@ function authorize_access_allowed() { ...@@ -124,25 +123,23 @@ function authorize_access_allowed() {
)); ));
} }
$item_list = array( $content['next_steps'] = array(
'#theme' => 'item_list', '#theme' => 'item_list',
'#items' => $links, '#items' => $links,
'#title' => t('Next steps'), '#title' => t('Next steps'),
); );
$output .= drupal_render_root($item_list);
} }
// If a batch is running, let it run. // If a batch is running, let it run.
elseif ($request->query->has('batch')) { elseif ($request->query->has('batch')) {
$output = _batch_page($request); $content = ['#markup' => _batch_page($request)];
} }
else { else {
if (empty($_SESSION['authorize_operation']) || empty($_SESSION['authorize_filetransfer_info'])) { if (empty($_SESSION['authorize_operation']) || empty($_SESSION['authorize_filetransfer_info'])) {
$output = t('It appears you have reached this page in error.'); $content = ['#markup' => t('It appears you have reached this page in error.')];
} }
elseif (!$batch = batch_get()) { elseif (!$batch = batch_get()) {
// We have a batch to process, show the filetransfer form. // We have a batch to process, show the filetransfer form.
$elements = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm'); $content = \Drupal::formBuilder()->getForm('Drupal\Core\FileTransfer\Form\FileTransferAuthorizeForm');
$output = drupal_render_root($elements);
} }
} }
// We defer the display of messages until all operations are done. // We defer the display of messages until all operations are done.
...@@ -152,12 +149,12 @@ function authorize_access_allowed() { ...@@ -152,12 +149,12 @@ function authorize_access_allowed() {
$response->setStatusCode(403); $response->setStatusCode(403);
\Drupal::logger('access denied')->warning('authorize.php'); \Drupal::logger('access denied')->warning('authorize.php');
$page_title = t('Access denied'); $page_title = t('Access denied');
$output = t('You are not allowed to access this page.'); $content = ['#markup' => t('You are not allowed to access this page.')];
} }
if (!empty($output)) { if (!empty($content)) {
$response->headers->set('Content-Type', 'text/html; charset=utf-8'); $response->headers->set('Content-Type', 'text/html; charset=utf-8');
$response->setContent(\Drupal::service('bare_html_page_renderer')->renderBarePage(['#markup' => $output], $page_title, 'maintenance_page', array( $response->setContent(\Drupal::service('bare_html_page_renderer')->renderBarePage($content, $page_title, 'maintenance_page', array(
'#show_messages' => $show_messages, '#show_messages' => $show_messages,
))); )));
$response->send(); $response->send();
......
...@@ -59,5 +59,8 @@ function testFileTransferHooks() { ...@@ -59,5 +59,8 @@ function testFileTransferHooks() {
$this->assertRaw('System Test FileTransfer'); $this->assertRaw('System Test FileTransfer');
// Make sure the settings form callback works. // Make sure the settings form callback works.
$this->assertText('System Test Username'); $this->assertText('System Test Username');
// Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets as
// expected to the first page of the authorize.php script.
$this->assertRaw('core/misc/states.js');
} }
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment