summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--includes/install.core.inc166
-rw-r--r--modules/system/system.install84
2 files changed, 137 insertions, 113 deletions
diff --git a/includes/install.core.inc b/includes/install.core.inc
index d359d8942..8fcb5ca71 100644
--- a/includes/install.core.inc
+++ b/includes/install.core.inc
@@ -829,102 +829,96 @@ function install_settings_form($form, &$form_state, &$install_state) {
$drivers = drupal_detect_database_types();
- if (!$drivers) {
- // There is no point submitting the form if there are no database drivers
- // at all, so throw an exception here.
- throw new Exception(st('Your web server does not appear to support any common database types. Check with your hosting provider to see if they offer any databases that <a href="@drupal-databases">Drupal supports</a>.', array('@drupal-databases' => 'http://drupal.org/node/270#database')));
+ $form['driver'] = array(
+ '#type' => 'radios',
+ '#title' => st('Database type'),
+ '#required' => TRUE,
+ '#options' => $drivers,
+ '#default_value' => !empty($database['driver']) ? $database['driver'] : current(array_keys($drivers)),
+ '#description' => st('The type of database your @drupal data will be stored in.', array('@drupal' => drupal_install_profile_distribution_name())),
+ );
+ if (count($drivers) == 1) {
+ $form['driver']['#disabled'] = TRUE;
+ $form['driver']['#description'] .= ' ' . st('Your PHP configuration only supports the %driver database type so it has been automatically selected.', array('%driver' => current($drivers)));
}
- else {
- $form['driver'] = array(
- '#type' => 'radios',
- '#title' => st('Database type'),
- '#required' => TRUE,
- '#options' => $drivers,
- '#default_value' => !empty($database['driver']) ? $database['driver'] : current(array_keys($drivers)),
- '#description' => st('The type of database your @drupal data will be stored in.', array('@drupal' => drupal_install_profile_distribution_name())),
- );
- if (count($drivers) == 1) {
- $form['driver']['#disabled'] = TRUE;
- $form['driver']['#description'] .= ' ' . st('Your PHP configuration only supports the %driver database type so it has been automatically selected.', array('%driver' => current($drivers)));
- }
- // Database name
- $form['database'] = array(
- '#type' => 'textfield',
- '#title' => st('Database name'),
- '#default_value' => empty($database['database']) ? '' : $database['database'],
- '#size' => 45,
- '#required' => TRUE,
- '#description' => st('The name of the database your @drupal data will be stored in. It must exist on your server before @drupal can be installed.', array('@drupal' => drupal_install_profile_distribution_name())),
- );
+ // Database name
+ $form['database'] = array(
+ '#type' => 'textfield',
+ '#title' => st('Database name'),
+ '#default_value' => empty($database['database']) ? '' : $database['database'],
+ '#size' => 45,
+ '#required' => TRUE,
+ '#description' => st('The name of the database your @drupal data will be stored in. It must exist on your server before @drupal can be installed.', array('@drupal' => drupal_install_profile_distribution_name())),
+ );
- // Database username
- $form['username'] = array(
- '#type' => 'textfield',
- '#title' => st('Database username'),
- '#default_value' => empty($database['username']) ? '' : $database['username'],
- '#size' => 45,
- );
+ // Database username
+ $form['username'] = array(
+ '#type' => 'textfield',
+ '#title' => st('Database username'),
+ '#default_value' => empty($database['username']) ? '' : $database['username'],
+ '#size' => 45,
+ );
- // Database password
- $form['password'] = array(
- '#type' => 'password',
- '#title' => st('Database password'),
- '#default_value' => empty($database['password']) ? '' : $database['password'],
- '#size' => 45,
- );
+ // Database password
+ $form['password'] = array(
+ '#type' => 'password',
+ '#title' => st('Database password'),
+ '#default_value' => empty($database['password']) ? '' : $database['password'],
+ '#size' => 45,
+ );
- $form['advanced_options'] = array(
- '#type' => 'fieldset',
- '#title' => st('Advanced options'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#description' => st("These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings or check with your hosting provider.")
- );
+ $form['advanced_options'] = array(
+ '#type' => 'fieldset',
+ '#title' => st('Advanced options'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#description' => st("These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings or check with your hosting provider.")
+ );
- // Database host
- $form['advanced_options']['host'] = array(
- '#type' => 'textfield',
- '#title' => st('Database host'),
- '#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
- '#size' => 45,
- // Hostnames can be 255 characters long.
- '#maxlength' => 255,
- '#required' => TRUE,
- '#description' => st('If your database is located on a different server, change this.'),
- );
+ // Database host
+ $form['advanced_options']['host'] = array(
+ '#type' => 'textfield',
+ '#title' => st('Database host'),
+ '#default_value' => empty($database['host']) ? 'localhost' : $database['host'],
+ '#size' => 45,
+ // Hostnames can be 255 characters long.
+ '#maxlength' => 255,
+ '#required' => TRUE,
+ '#description' => st('If your database is located on a different server, change this.'),
+ );
- // Database port
- $form['advanced_options']['port'] = array(
- '#type' => 'textfield',
- '#title' => st('Database port'),
- '#default_value' => empty($database['port']) ? '' : $database['port'],
- '#size' => 45,
- // The maximum port number is 65536, 5 digits.
- '#maxlength' => 5,
- '#description' => st('If your database server is listening to a non-standard port, enter its number.'),
- );
+ // Database port
+ $form['advanced_options']['port'] = array(
+ '#type' => 'textfield',
+ '#title' => st('Database port'),
+ '#default_value' => empty($database['port']) ? '' : $database['port'],
+ '#size' => 45,
+ // The maximum port number is 65536, 5 digits.
+ '#maxlength' => 5,
+ '#description' => st('If your database server is listening to a non-standard port, enter its number.'),
+ );
- // Table prefix
- $db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_';
- $form['advanced_options']['db_prefix'] = array(
- '#type' => 'textfield',
- '#title' => st('Table prefix'),
- '#default_value' => '',
- '#size' => 45,
- '#description' => st('If more than one application will be sharing this database, enter a table prefix such as %prefix for your @drupal site here.', array('@drupal' => drupal_install_profile_distribution_name(), '%prefix' => $db_prefix)),
- );
+ // Table prefix
+ $db_prefix = ($profile == 'standard') ? 'drupal_' : $profile . '_';
+ $form['advanced_options']['db_prefix'] = array(
+ '#type' => 'textfield',
+ '#title' => st('Table prefix'),
+ '#default_value' => '',
+ '#size' => 45,
+ '#description' => st('If more than one application will be sharing this database, enter a table prefix such as %prefix for your @drupal site here.', array('@drupal' => drupal_install_profile_distribution_name(), '%prefix' => $db_prefix)),
+ );
- $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
- $form['actions']['save'] = array(
- '#type' => 'submit',
- '#value' => st('Save and continue'),
- );
+ $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
+ $form['actions']['save'] = array(
+ '#type' => 'submit',
+ '#value' => st('Save and continue'),
+ );
+
+ $form['errors'] = array();
+ $form['settings_file'] = array('#type' => 'value', '#value' => $settings_file);
+ $form['_database'] = array('#type' => 'value');
- $form['errors'] = array();
- $form['settings_file'] = array('#type' => 'value', '#value' => $settings_file);
- $form['_database'] = array('#type' => 'value');
- }
return $form;
}
diff --git a/modules/system/system.install b/modules/system/system.install
index 5c9d19c78..c414d99b1 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -95,30 +95,71 @@ function system_requirements($phase) {
$requirements['php_register_globals']['value'] = $t('Disabled');
}
- // Test PDO library availability.
- $requirements['pdo'] = array(
- 'title' => $t('PDO library'),
+ // Test for PHP extensions.
+ $requirements['php_extensions'] = array(
+ 'title' => $t('PHP extensions'),
);
- if (extension_loaded('pdo')) {
- $requirements['pdo']['value'] = $t('Enabled');
+
+ $missing_extensions = array();
+ $required_extensions = array(
+ 'date',
+ 'dom',
+ 'filter',
+ 'gd',
+ 'hash',
+ 'json',
+ 'pcre',
+ 'pdo',
+ 'session',
+ 'SimpleXML',
+ 'SPL',
+ 'xml',
+ );
+ foreach ($required_extensions as $extension) {
+ if (!extension_loaded($extension)) {
+ $missing_extensions[] = $extension;
+ }
+ }
+
+ if (!empty($missing_extensions)) {
+ $description = $t('Drupal requires you to enable the PHP extensions in the following list (see the <a href="@system_requirements">system requirements page</a> for more information):', array(
+ '@system_requirements' => 'http://drupal.org/requirements',
+ ));
+
+ $description .= theme('item_list', array(
+ 'type' => 'ul',
+ 'items' => $missing_extensions,
+ ));
+
+ $requirements['php_extensions']['value'] = $t('Disabled');
+ $requirements['php_extensions']['severity'] = REQUIREMENT_ERROR;
+ $requirements['php_extensions']['description'] = $description;
}
else {
- $requirements['pdo']['value'] = $t('Disabled');
- $requirements['pdo']['severity'] = REQUIREMENT_ERROR;
- $requirements['pdo']['description'] = $t('Your server does not have the PHP PDO extension enabled. See the <a href="@system_requirements">system requirements page</a> for more information.', array('@system_requirements' => 'http://drupal.org/requirements'));
+ $requirements['php_extensions']['value'] = $t('Enabled');
}
- // Test JSON library availability.
- $requirements['json'] = array(
- 'title' => $t('JSON library'),
+ // Test for PDO (database).
+ $requirements['database_extensions'] = array(
+ 'title' => $t('Database support'),
);
- if (extension_loaded('json')) {
- $requirements['json']['value'] = $t('Enabled');
+
+ // Test for at least one suitable PDO extension, if PDO is available.
+ $database_ok = extension_loaded('pdo');
+ if ($database_ok) {
+ $drivers = drupal_detect_database_types();
+ $database_ok = !empty($drivers);
+ }
+
+ if (!$database_ok) {
+ $requirements['database_extensions']['value'] = $t('Disabled');
+ $requirements['database_extensions']['severity'] = REQUIREMENT_ERROR;
+ $requirements['database_extensions']['description'] = $t('Your web server does not appear to support any common PDO database extensions. Check with your hosting provider to see if they support PDO (PHP Data Objects) and offer any databases that <a href="@drupal-databases">Drupal supports</a>.', array(
+ '@drupal-databases' => 'http://drupal.org/node/270#database',
+ ));
}
else {
- $requirements['json']['value'] = $t('Disabled');
- $requirements['json']['severity'] = REQUIREMENT_ERROR;
- $requirements['json']['description'] = $t('Your server does not have the PHP JSON extension enabled. See the <a href="@system_requirements">system requirements page</a> for more information.', array('@system_requirements' => 'http://drupal.org/requirements'));
+ $requirements['database_extensions']['value'] = $t('Enabled');
}
// Test PHP memory_limit
@@ -316,17 +357,6 @@ function system_requirements($phase) {
include_once DRUPAL_ROOT . '/includes/unicode.inc';
$requirements = array_merge($requirements, unicode_requirements());
- // Verify if the DOM PHP 5 extension is available.
- $has_dom = class_exists('DOMDocument');
- if (!$has_dom) {
- $requirements['php_dom'] = array(
- 'title' => $t('PHP DOM Extension'),
- 'value' => $t('Not found'),
- 'severity' => REQUIREMENT_ERROR,
- 'description' => $t("The DOM extension is part of PHP 5 core, but doesn't seem to be enabled on your system. You need to enable the DOM extension on your PHP installation."),
- );
- }
-
if ($phase == 'runtime') {
// Check for update status module.
if (!module_exists('update')) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-22 14:46:43 +0000