diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 1616f18..4db7e31 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -2141,7 +2141,7 @@ function install_display_requirements($install_state, $requirements) { // and indicating a desire to continue anyway. See drupal_requirements_url(). if ($severity == REQUIREMENT_ERROR || ($severity == REQUIREMENT_WARNING && empty($install_state['parameters']['continue']))) { if ($install_state['interactive']) { - $build['report']['#theme'] = 'status_report'; + $build['report']['#type'] = 'status_report'; $build['report']['#requirements'] = $requirements; if ($severity == REQUIREMENT_WARNING) { $build['#title'] = t('Requirements review'); diff --git a/core/lib/Drupal/Core/Render/Element/StatusReport.php b/core/lib/Drupal/Core/Render/Element/StatusReport.php new file mode 100644 index 0000000..5aa50ab --- /dev/null +++ b/core/lib/Drupal/Core/Render/Element/StatusReport.php @@ -0,0 +1,91 @@ + 'status_report', + '#priorities' => [ + 'error', + 'warning', + 'checked', + 'ok', + ], + '#pre_render' => [ + [$class, 'preRenderGroupRequirements'], + ], + ]; + } + + /** + * #pre_render callback to group requirements. + */ + public static function preRenderGroupRequirements($element) { + $severities = static::getSeverities(); + $grouped_requirements = []; + + foreach ($element['#requirements'] as $key => $requirement) { + $severity = $severities[REQUIREMENT_INFO]; + if (isset($requirement['severity'])) { + $severity = $severities[(int) $requirement['severity']]; + } + elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { + $severity = $severities[REQUIREMENT_OK]; + } + + $grouped_requirements[$severity['status']]['title'] = $severity['title']; + $grouped_requirements[$severity['status']]['type'] = $severity['status']; + $grouped_requirements[$severity['status']]['items'][$key] = $requirement; + } + + // Order the grouped requirements by a set order. + $order = array_flip($element['#priorities']); + uksort($grouped_requirements, function ($a, $b) use ($order) { + return $order[$a] > $order[$b]; + }); + + $element['#grouped_requirements'] = $grouped_requirements; + + return $element; + } + + /** + * Gets the severities. + * + * @return array + */ + public static function getSeverities() { + return [ + REQUIREMENT_INFO => [ + 'title' => t('Checked'), + 'status' => 'checked', + ], + REQUIREMENT_OK => [ + 'title' => t('OK'), + 'status' => 'ok', + ], + REQUIREMENT_WARNING => [ + 'title' => t('Warnings found'), + 'status' => 'warning', + ], + REQUIREMENT_ERROR => [ + 'title' => t('Errors found'), + 'status' => 'error', + ], + ]; + } + +} diff --git a/core/modules/system/src/Controller/DbUpdateController.php b/core/modules/system/src/Controller/DbUpdateController.php index f378631..fdedcc6 100644 --- a/core/modules/system/src/Controller/DbUpdateController.php +++ b/core/modules/system/src/Controller/DbUpdateController.php @@ -522,7 +522,7 @@ public function requirements($severity, array $requirements, Request $request) { $try_again_url = Url::fromUri($request->getUriForPath(''))->setOptions(['query' => $options])->toString(TRUE)->getGeneratedUrl(); $build['status_report'] = array( - '#theme' => 'status_report', + '#type' => 'status_report', '#requirements' => $requirements, '#suffix' => $this->t('Check the messages and try again.', array(':url' => $try_again_url)) ); diff --git a/core/modules/system/src/Controller/SystemInfoController.php b/core/modules/system/src/Controller/SystemInfoController.php index aa9f140..829d1fe 100644 --- a/core/modules/system/src/Controller/SystemInfoController.php +++ b/core/modules/system/src/Controller/SystemInfoController.php @@ -47,7 +47,7 @@ public function __construct(SystemManager $systemManager) { */ public function status() { $requirements = $this->systemManager->listRequirements(); - return array('#theme' => 'status_report', '#requirements' => $requirements); + return ['#type' => 'status_report_page', '#requirements' => $requirements]; } /** diff --git a/core/modules/system/src/Element/StatusReportPage.php b/core/modules/system/src/Element/StatusReportPage.php new file mode 100644 index 0000000..5d2f985 --- /dev/null +++ b/core/modules/system/src/Element/StatusReportPage.php @@ -0,0 +1,139 @@ + 'status_report_page', + '#pre_render' => [ + [$class, 'preRenderCounters'], + [$class, 'preRenderGeneralInfo'], + [$class, 'preRenderRequirements'], + ], + ]; + } + + /** + * #pre_render callback to get general info out of requirements. + */ + public static function preRenderGeneralInfo($element) { + $element['#general_info'] = [ + '#theme' => 'status_report_general_info', + ]; + // Loop through requirements and pull out items. + foreach ($element['#requirements'] as $key => $requirement) { + switch ($key) { + case 'cron': + foreach ($requirement['description'] as &$description_elements) { + foreach ($description_elements as &$description_element) { + if (isset($description_element['#url']) && $description_element['#url']->getRouteName() == 'system.run_cron') { + $description_element['#attributes']['class'][] = 'button'; + $description_element['#attributes']['class'][] = 'button--small'; + $description_element['#attributes']['class'][] = 'button--primary'; + $description_element['#attributes']['class'][] = 'system-status-general-info__run-cron'; + } + } + } + $element['#general_info']['#' . $key] = $requirement; + unset($element['#requirements'][$key]); + break; + + case 'drupal': + case 'webserver': + case 'database_system': + case 'database_system_version': + case 'php': + case 'php_memory_limit': + $element['#general_info']['#' . $key] = $requirement; + unset($element['#requirements'][$key]); + break; + } + } + + return $element; + } + + /** + * #pre_render callback to create counter elements. + */ + public static function preRenderCounters($element) { + // Count number of items with different severity for summary. + $counters = [ + 'error' => [ + 'amount' => 0, + 'text' => t('Error'), + 'text_plural' => t('Errors'), + ], + 'warning' => [ + 'amount' => 0, + 'text' => t('Warning'), + 'text_plural' => t('Warnings'), + ], + 'checked' => [ + 'amount' => 0, + 'text' => t('Checked'), + 'text_plural' => t('Checked'), + ], + ]; + + $severities = StatusReport::getSeverities(); + foreach ($element['#requirements'] as $key => &$requirement) { + $severity = $severities[REQUIREMENT_INFO]; + if (isset($requirement['severity'])) { + $severity = $severities[(int) $requirement['severity']]; + } + elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { + $severity = $severities[REQUIREMENT_OK]; + } + + if (isset($counters[$severity['status']])) { + $counters[$severity['status']]['amount']++; + } + } + + foreach ($counters as $key => $counter) { + if ($counter['amount'] === 0) { + continue; + } + + $text = new PluralTranslatableMarkup($counter['amount'], $counter['text'], $counter['text_plural']); + + $element['#counters'][$key] = [ + '#theme' => 'status_report_counter', + '#amount' => $counter['amount'], + '#text' => $text, + '#severity' => $key, + ]; + } + + return $element; + } + + /** + * #pre_render callback to create status report requirements. + */ + public static function preRenderRequirements($element) { + $element['#requirements'] = [ + '#type' => 'status_report', + '#requirements' => $element['#requirements'], + ]; + + return $element; + } + +} diff --git a/core/modules/system/src/SystemManager.php b/core/modules/system/src/SystemManager.php index e5d3a18..b9fcebb 100644 --- a/core/modules/system/src/SystemManager.php +++ b/core/modules/system/src/SystemManager.php @@ -110,7 +110,7 @@ public function listRequirements() { // Check run-time requirements and status information. $requirements = $this->moduleHandler->invokeAll('requirements', array('runtime')); - usort($requirements, function($a, $b) { + uasort($requirements, function($a, $b) { if (!isset($a['weight'])) { if (!isset($b['weight'])) { return strcasecmp($a['title'], $b['title']); diff --git a/core/modules/system/src/Tests/System/CronRunTest.php b/core/modules/system/src/Tests/System/CronRunTest.php index ec35b72..26a56a3 100644 --- a/core/modules/system/src/Tests/System/CronRunTest.php +++ b/core/modules/system/src/Tests/System/CronRunTest.php @@ -121,7 +121,7 @@ public function testManualCron() { $this->assertResponse(403); $this->drupalGet('admin/reports/status'); - $this->clickLink(t('run cron manually')); + $this->clickLink(t('Run cron')); $this->assertResponse(200); $this->assertText(t('Cron ran successfully.')); } diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc index f9c49c7..94f6302 100644 --- a/core/modules/system/system.admin.inc +++ b/core/modules/system/system.admin.inc @@ -106,66 +106,6 @@ function template_preprocess_system_admin_index(&$variables) { } /** - * Prepares variables for status report template. - * - * Default template: status-report.html.twig. - * - * This theme function is dependent on install.inc being loaded, because - * that's where the constants are defined. - * - * @param $variables - * An associative array containing: - * - requirements: An array of requirements/status items. Each requirement - * is an associative array containing the following elements: - * - title: The name of the requirement. - * - value: (optional) The current value (version, time, level, etc). - * - description: (optional) The description of the requirement. - * - severity: (optional) The requirement's result/severity level, one of: - * - REQUIREMENT_INFO: Status information. - * - REQUIREMENT_OK: The requirement is satisfied. - * - REQUIREMENT_WARNING: The requirement failed with a warning. - * - REQUIREMENT_ERROR: The requirement failed with an error. - */ -function template_preprocess_status_report(&$variables) { - $severities = array( - REQUIREMENT_INFO => array( - 'title' => t('Info'), - 'status' => 'info', - ), - REQUIREMENT_OK => array( - 'title' => t('OK'), - 'status' => 'ok', - ), - REQUIREMENT_WARNING => array( - 'title' => t('Warning'), - 'status' => 'warning', - ), - REQUIREMENT_ERROR => array( - 'title' => t('Error'), - 'status' => 'error', - ), - ); - - foreach ($variables['requirements'] as $i => $requirement) { - // Always use the explicit requirement severity, if defined. Otherwise, - // default to REQUIREMENT_OK in the installer to visually confirm that - // installation requirements are met. And default to REQUIREMENT_INFO to - // denote neutral information without special visualization. - if (isset($requirement['severity'])) { - $severity = $severities[(int) $requirement['severity']]; - } - elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { - $severity = $severities[REQUIREMENT_OK]; - } - else { - $severity = $severities[REQUIREMENT_INFO]; - } - $variables['requirements'][$i]['severity_title'] = $severity['title']; - $variables['requirements'][$i]['severity_status'] = $severity['status']; - } -} - -/** * Prepares variables for the module details templates. * * Default template: system-modules-details.html.twig. diff --git a/core/modules/system/system.install b/core/modules/system/system.install index 6dc2663..8186338 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -535,14 +535,19 @@ function system_requirements($phase) { ], ]; } - $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]); $requirements['cron']['description'][] = [ [ - '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), + '#type' => 'link', + '#prefix' => '(', + '#title' => t('more information'), + '#suffix' => ')', + '#url' => Url::fromRoute('system.cron_settings'), ], [ - '#prefix' => '
', - '#markup' => t('To run cron from outside the site, go to @cron', [':url' => $cron_url, '@cron' => $cron_url]), + '#prefix' => '
', + '#type' => 'link', + '#title' => t('Run cron'), + '#url' => Url::fromRoute('system.run_cron'), ], ]; } diff --git a/core/modules/system/system.install.orig b/core/modules/system/system.install.orig new file mode 100644 index 0000000..e8f45eb --- /dev/null +++ b/core/modules/system/system.install.orig @@ -0,0 +1,1770 @@ + t('Drupal'), + 'value' => \Drupal::VERSION, + 'severity' => REQUIREMENT_INFO, + 'weight' => -10, + ); + + // Display the currently active installation profile, if the site + // is not running the default installation profile. + $profile = drupal_get_profile(); + if ($profile != 'standard') { + $info = system_get_info('module', $profile); + $requirements['install_profile'] = array( + 'title' => t('Installation profile'), + 'value' => t('%profile_name (%profile-%version)', array( + '%profile_name' => $info['name'], + '%profile' => $profile, + '%version' => $info['version'] + )), + 'severity' => REQUIREMENT_INFO, + 'weight' => -9 + ); + } + + // Warn if any experimental modules are installed. + $experimental = array(); + $enabled_modules = \Drupal::moduleHandler()->getModuleList(); + foreach ($enabled_modules as $module => $data) { + $info = system_get_info('module', $module); + if ($info['package'] === 'Core (Experimental)') { + $experimental[$module] = $info['name']; + } + } + if (!empty($experimental)) { + $requirements['experimental'] = array( + 'title' => t('Experimental modules enabled'), + 'value' => t('Experimental modules found: %module_list. Experimental modules are provided for testing purposes only. Use at your own risk.', array('%module_list' => implode(', ', $experimental), ':url' => 'https://www.drupal.org/core/experimental')), + 'severity' => REQUIREMENT_WARNING, + ); + } + } + + // Web server information. + $software = \Drupal::request()->server->get('SERVER_SOFTWARE'); + $requirements['webserver'] = array( + 'title' => t('Web server'), + 'value' => $software, + ); + + // Tests clean URL support. + if ($phase == 'install' && $install_state['interactive'] && !isset($_GET['rewrite']) && strpos($software, 'Apache') !== FALSE) { + // If the Apache rewrite module is not enabled, Apache version must be >= + // 2.2.16 because of the FallbackResource directive in the root .htaccess + // file. Since the Apache version reported by the server is dependent on the + // ServerTokens setting in httpd.conf, we may not be able to determine if a + // given config is valid. Thus we are unable to use version_compare() as we + // need have three possible outcomes: the version of Apache is greater than + // 2.2.16, is less than 2.2.16, or cannot be determined accurately. In the + // first case, we encourage the use of mod_rewrite; in the second case, we + // raise an error regarding the minimum Apache version; in the third case, + // we raise a warning that the current version of Apache may not be + // supported. + $rewrite_warning = FALSE; + $rewrite_error = FALSE; + $apache_version_string = 'Apache'; + + // Determine the Apache version number: major, minor and revision. + if (preg_match('/Apache\/(\d+)\.?(\d+)?\.?(\d+)?/', $software, $matches)) { + $apache_version_string = $matches[0]; + + // Major version number + if ($matches[1] < 2) { + $rewrite_error = TRUE; + } + elseif ($matches[1] == 2) { + if (!isset($matches[2])) { + $rewrite_warning = TRUE; + } + elseif ($matches[2] < 2) { + $rewrite_error = TRUE; + } + elseif ($matches[2] == 2) { + if (!isset($matches[3])) { + $rewrite_warning = TRUE; + } + elseif ($matches[3] < 16) { + $rewrite_error = TRUE; + } + } + } + } + else { + $rewrite_warning = TRUE; + } + + if ($rewrite_warning) { + $requirements['apache_version'] = array ( + 'title' => t('Apache version'), + 'value' => $apache_version_string, + 'severity' => REQUIREMENT_WARNING, + 'description' => t('Due to the settings for ServerTokens in httpd.conf, it is impossible to accurately determine the version of Apache running on this server. The reported value is @reported, to run Drupal without mod_rewrite, a minimum version of 2.2.16 is needed.', array('@reported' => $apache_version_string)), + ); + } + + if ($rewrite_error) { + $requirements['Apache version'] = array ( + 'title' => t('Apache version'), + 'value' => $apache_version_string, + 'severity' => REQUIREMENT_ERROR, + 'description' => t('The minimum version of Apache needed to run Drupal without mod_rewrite enabled is 2.2.16. See the enabling clean URLs page for more information on mod_rewrite.', array(':link' => 'http://drupal.org/node/15365')), + ); + } + + if (!$rewrite_error && !$rewrite_warning) { + $requirements['rewrite_module'] = array ( + 'title' => t('Clean URLs'), + 'value' => t('Disabled'), + 'severity' => REQUIREMENT_WARNING, + 'description' => t('Your server is capable of using clean URLs, but it is not enabled. Using clean URLs gives an improved user experience and is recommended. Enable clean URLs', array(':link' => 'http://drupal.org/node/15365')), + ); + } + } + + // Test PHP version and show link to phpinfo() if it's available + $phpversion = $phpversion_label = phpversion(); + if (function_exists('phpinfo')) { + if ($phase === 'runtime') { + $phpversion_label = t('@phpversion (more information)', ['@phpversion' => $phpversion, ':url' => (new Url('system.php'))->toString()]); + } + $requirements['php'] = array( + 'title' => t('PHP'), + 'value' => $phpversion_label, + ); + } + else { + $requirements['php'] = array( + 'title' => t('PHP'), + 'value' => $phpversion_label, + 'description' => t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, Enabling and disabling phpinfo() handbook page.', array(':phpinfo' => 'https://www.drupal.org/node/243993')), + 'severity' => REQUIREMENT_INFO, + ); + } + + if (version_compare($phpversion, DRUPAL_MINIMUM_PHP) < 0) { + $requirements['php']['description'] = t('Your PHP installation is too old. Drupal requires at least PHP %version.', array('%version' => DRUPAL_MINIMUM_PHP)); + $requirements['php']['severity'] = REQUIREMENT_ERROR; + // If PHP is old, it's not safe to continue with the requirements check. + return $requirements; + } + + // Suggest to update to at least 5.5.21 or 5.6.5 for disabling multiple + // statements. + if (($phase === 'install' || \Drupal::database()->driver() === 'mysql') && !SystemRequirements::phpVersionWithPdoDisallowMultipleStatements($phpversion)) { + $requirements['php'] = array( + 'title' => t('PHP (multiple statement disabling)'), + 'value' => $phpversion_label, + 'description' => t('PHP versions higher than 5.6.5 or 5.5.21 provide built-in SQL injection protection for mysql databases. It is recommended to update.'), + 'severity' => REQUIREMENT_INFO, + ); + } + + // Test for PHP extensions. + $requirements['php_extensions'] = array( + 'title' => t('PHP extensions'), + ); + + $missing_extensions = array(); + $required_extensions = array( + 'date', + 'dom', + 'filter', + 'gd', + 'hash', + 'json', + 'pcre', + 'pdo', + 'session', + 'SimpleXML', + 'SPL', + 'tokenizer', + '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 system requirements page for more information):', array( + ':system_requirements' => 'https://www.drupal.org/requirements', + )); + + // We use twig inline_template to avoid twig's autoescape. + $description = array( + '#type' => 'inline_template', + '#template' => '{{ description }}{{ missing_extensions }}', + '#context' => array( + 'description' => $description, + 'missing_extensions' => array( + '#theme' => 'item_list', + '#items' => $missing_extensions, + ), + ), + ); + + $requirements['php_extensions']['value'] = t('Disabled'); + $requirements['php_extensions']['severity'] = REQUIREMENT_ERROR; + $requirements['php_extensions']['description'] = $description; + } + else { + $requirements['php_extensions']['value'] = t('Enabled'); + } + + if ($phase == 'install' || $phase == 'runtime') { + // Check to see if OPcache is installed. + if (!OpCodeCache::isEnabled()) { + $requirements['php_opcache'] = array( + 'value' => t('Not enabled'), + 'severity' => REQUIREMENT_WARNING, + 'description' => t('PHP OPcode caching can improve your site\'s performance considerably. It is highly recommended to have OPcache installed on your server.'), + ); + } + else { + $requirements['php_opcache']['value'] = t('Enabled'); + } + $requirements['php_opcache']['title'] = t('PHP OPcode caching'); + } + + if ($phase != 'update') { + // Test whether we have a good source of random bytes. + $requirements['php_random_bytes'] = array( + 'title' => t('Random number generation'), + ); + try { + $bytes = random_bytes(10); + if (strlen($bytes) != 10) { + throw new \Exception(t('Tried to generate 10 random bytes, generated @count', array('@count' => strlen($bytes)))); + } + $requirements['php_random_bytes']['value'] = t('Successful'); + } + catch (\Exception $e) { + // If /dev/urandom is not available on a UNIX-like system, check whether + // open_basedir restrictions are the cause. + $open_basedir_blocks_urandom = FALSE; + if (DIRECTORY_SEPARATOR === '/' && !@is_readable('/dev/urandom')) { + $open_basedir = ini_get('open_basedir'); + if ($open_basedir) { + $open_basedir_paths = explode(PATH_SEPARATOR, $open_basedir); + $open_basedir_blocks_urandom = !array_intersect(array('/dev', '/dev/', '/dev/urandom'), $open_basedir_paths); + } + } + $args = array( + ':drupal-php' => 'https://www.drupal.org/docs/7/system-requirements/php#csprng', + '%exception_message' => $e->getMessage(), + ); + if ($open_basedir_blocks_urandom) { + $requirements['php_random_bytes']['description'] = t('Drupal is unable to generate highly randomized numbers, which means certain security features like password reset URLs are not as secure as they should be. Instead, only a slow, less-secure fallback generator is available. The most likely cause is that open_basedir restrictions are in effect and /dev/urandom is not on the whitelist. See the system requirements page for more information. %exception_message', $args); + } + else { + $requirements['php_random_bytes']['description'] = t('Drupal is unable to generate highly randomized numbers, which means certain security features like password reset URLs are not as secure as they should be. Instead, only a slow, less-secure fallback generator is available. See the system requirements page for more information. %exception_message', $args); + } + $requirements['php_random_bytes']['value'] = t('Less secure'); + $requirements['php_random_bytes']['severity'] = REQUIREMENT_ERROR; + } + } + + if ($phase == 'install' || $phase == 'update') { + // Test for PDO (database). + $requirements['database_extensions'] = array( + 'title' => t('Database support'), + ); + + // Make sure PDO is available. + $database_ok = extension_loaded('pdo'); + if (!$database_ok) { + $pdo_message = t('Your web server does not appear to support PDO (PHP Data Objects). Ask your hosting provider if they support the native PDO extension. See the system requirements page for more information.', array( + ':link' => 'https://www.drupal.org/requirements/pdo', + )); + } + else { + // Make sure at least one supported database driver exists. + $drivers = drupal_detect_database_types(); + if (empty($drivers)) { + $database_ok = FALSE; + $pdo_message = 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 Drupal supports.', array( + ':drupal-databases' => 'https://www.drupal.org/requirements/database', + )); + } + // Make sure the native PDO extension is available, not the older PEAR + // version. (See install_verify_pdo() for details.) + if (!defined('PDO::ATTR_DEFAULT_FETCH_MODE')) { + $database_ok = FALSE; + $pdo_message = t('Your web server seems to have the wrong version of PDO installed. Drupal requires the PDO extension from PHP core. This system has the older PECL version. See the system requirements page for more information.', array( + ':link' => 'https://www.drupal.org/requirements/pdo#pecl', + )); + } + } + + if (!$database_ok) { + $requirements['database_extensions']['value'] = t('Disabled'); + $requirements['database_extensions']['severity'] = REQUIREMENT_ERROR; + $requirements['database_extensions']['description'] = $pdo_message; + } + else { + $requirements['database_extensions']['value'] = t('Enabled'); + } + } + else { + // Database information. + $class = Database::getConnection()->getDriverClass('Install\\Tasks'); + $tasks = new $class(); + $requirements['database_system'] = array( + 'title' => t('Database system'), + 'value' => $tasks->name(), + ); + $requirements['database_system_version'] = array( + 'title' => t('Database system version'), + 'value' => Database::getConnection()->version(), + ); + } + + // Test PHP memory_limit + $memory_limit = ini_get('memory_limit'); + $requirements['php_memory_limit'] = array( + 'title' => t('PHP memory limit'), + 'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit, + ); + + if (!Environment::checkMemoryLimit(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT, $memory_limit)) { + $description = array(); + if ($phase == 'install') { + $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); + } + elseif ($phase == 'update') { + $description['phase'] = t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the update process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); + } + elseif ($phase == 'runtime') { + $description['phase'] = t('Depending on your configuration, Drupal can run with a %memory_limit PHP memory limit. However, a %memory_minimum_limit PHP memory limit or above is recommended, especially if your site uses additional custom or contributed modules.', array('%memory_limit' => $memory_limit, '%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)); + } + + if (!empty($description['phase'])) { + if ($php_ini_path = get_cfg_var('cfg_file_path')) { + $description['memory'] = t('Increase the memory limit by editing the memory_limit parameter in the file %configuration-file and then restart your web server (or contact your system administrator or hosting provider for assistance).', array('%configuration-file' => $php_ini_path)); + } + else { + $description['memory'] = t('Contact your system administrator or hosting provider for assistance with increasing your PHP memory limit.'); + } + + $handbook_link = t('For more information, see the online handbook entry for increasing the PHP memory limit.', array(':memory-limit' => 'https://www.drupal.org/node/207036')); + + $description = array( + '#type' => 'inline_template', + '#template' => '{{ description_phase }} {{ description_memory }} {{ handbook }}', + '#context' => array( + 'description_phase' => $description['phase'], + 'description_memory' => $description['memory'], + 'handbook' => $handbook_link, + ), + ); + + $requirements['php_memory_limit']['description'] = $description; + $requirements['php_memory_limit']['severity'] = REQUIREMENT_WARNING; + } + } + + // Test configuration files and directory for writability. + if ($phase == 'runtime') { + $conf_errors = array(); + // Find the site path. Kernel service is not always available at this point, + // but is preferred, when available. + if (\Drupal::hasService('kernel')) { + $site_path = \Drupal::service('site.path'); + } + else { + $site_path = DrupalKernel::findSitePath(Request::createFromGlobals()); + } + // Allow system administrators to disable permissions hardening for the site + // directory. This allows additional files in the site directory to be + // updated when they are managed in a version control system. + if (Settings::get('skip_permissions_hardening')) { + $conf_errors[] = t('Protection disabled'); + // If permissions hardening is disabled, then only show a warning for a + // writable file, as a reminder, rather than an error. + $file_protection_severity = REQUIREMENT_WARNING; + } + else { + // In normal operation, writable files or directories are an error. + $file_protection_severity = REQUIREMENT_ERROR; + if (!drupal_verify_install_file($site_path, FILE_NOT_WRITABLE, 'dir')) { + $conf_errors[] = t("The directory %file is not protected from modifications and poses a security risk. You must change the directory's permissions to be non-writable.", array('%file' => $site_path)); + } + } + foreach (array('settings.php', 'settings.local.php', 'services.yml') as $conf_file) { + $full_path = $site_path . '/' . $conf_file; + if (file_exists($full_path) && (Settings::get('skip_permissions_hardening') || !drupal_verify_install_file($full_path, FILE_EXIST | FILE_READABLE | FILE_NOT_WRITABLE))) { + $conf_errors[] = t("The file %file is not protected from modifications and poses a security risk. You must change the file's permissions to be non-writable.", array('%file' => $full_path)); + } + } + if (!empty($conf_errors)) { + if (count($conf_errors) == 1) { + $description = $conf_errors[0]; + } + else { + // We use twig inline_template to avoid double escaping. + $description = array( + '#type' => 'inline_template', + '#template' => '{{ configuration_error_list }}', + '#context' => array( + 'configuration_error_list' => array( + '#theme' => 'item_list', + '#items' => $conf_errors, + ), + ), + ); + } + $requirements['configuration_files'] = array( + 'value' => t('Not protected'), + 'severity' => $file_protection_severity, + 'description' => $description, + ); + } + else { + $requirements['configuration_files'] = array( + 'value' => t('Protected'), + ); + } + $requirements['configuration_files']['title'] = t('Configuration files'); + } + + // Test the contents of the .htaccess files. + if ($phase == 'runtime') { + // Try to write the .htaccess files first, to prevent false alarms in case + // (for example) the /tmp directory was wiped. + file_ensure_htaccess(); + $htaccess_files['public://.htaccess'] = array( + 'title' => t('Public files directory'), + 'directory' => drupal_realpath('public://'), + ); + if (PrivateStream::basePath()) { + $htaccess_files['private://.htaccess'] = array( + 'title' => t('Private files directory'), + 'directory' => drupal_realpath('private://'), + ); + } + $htaccess_files['temporary://.htaccess'] = array( + 'title' => t('Temporary files directory'), + 'directory' => drupal_realpath('temporary://'), + ); + foreach ($htaccess_files as $htaccess_file => $info) { + // Check for the string which was added to the recommended .htaccess file + // in the latest security update. + if (!file_exists($htaccess_file) || !($contents = @file_get_contents($htaccess_file)) || strpos($contents, 'Drupal_Security_Do_Not_Remove_See_SA_2013_003') === FALSE) { + $url = 'https://www.drupal.org/SA-CORE-2013-003'; + $requirements[$htaccess_file] = array( + 'title' => $info['title'], + 'value' => t('Not fully protected'), + 'severity' => REQUIREMENT_ERROR, + 'description' => t('See @url for information about the recommended .htaccess file which should be added to the %directory directory to help protect against arbitrary code execution.', array(':url' => $url, '@url' => $url, '%directory' => $info['directory'])), + ); + } + } + } + + // Report cron status. + if ($phase == 'runtime') { + $cron_config = \Drupal::config('system.cron'); + // Cron warning threshold defaults to two days. + $threshold_warning = $cron_config->get('threshold.requirements_warning'); + // Cron error threshold defaults to two weeks. + $threshold_error = $cron_config->get('threshold.requirements_error'); + + // Determine when cron last ran. + $cron_last = \Drupal::state()->get('system.cron_last'); + if (!is_numeric($cron_last)) { + $cron_last = \Drupal::state()->get('install_time', 0); + } + + // Determine severity based on time since cron last ran. + $severity = REQUIREMENT_INFO; + if (REQUEST_TIME - $cron_last > $threshold_error) { + $severity = REQUIREMENT_ERROR; + } + elseif (REQUEST_TIME - $cron_last > $threshold_warning) { + $severity = REQUIREMENT_WARNING; + } + + // Set summary and description based on values determined above. + $summary = t('Last run @time ago', array('@time' => \Drupal::service('date.formatter')->formatTimeDiffSince($cron_last))); + + $requirements['cron'] = array( + 'title' => t('Cron maintenance tasks'), + 'severity' => $severity, + 'value' => $summary, + ); + if ($severity != REQUIREMENT_INFO) { + $requirements['cron']['description'][] = [ + [ + '#markup' => t('Cron has not run recently.'), + '#suffix' => ' ', + ], + [ + '#markup' => t('For more information, see the online handbook entry for configuring cron jobs.', [':cron-handbook' => 'https://www.drupal.org/cron']), + '#suffix' => ' ', + ], + ]; + } + $cron_url = \Drupal::url('system.cron', ['key' => \Drupal::state()->get('system.cron_key'), ['absolute' => TRUE]]); + $requirements['cron']['description'][] = [ + [ + '#markup' => t('You can run cron manually.', [':cron' => \Drupal::url('system.run_cron')]), + ], + [ + '#prefix' => '
', + '#markup' => t('To run cron from outside the site, go to @cron', [':url' => $cron_url, '@cron' => $cron_url]), + ], + ]; + } + if ($phase != 'install') { + $filesystem_config = \Drupal::config('system.file'); + $directories = array( + PublicStream::basePath(), + // By default no private files directory is configured. For private files + // to be secure the admin needs to provide a path outside the webroot. + PrivateStream::basePath(), + file_directory_temp(), + ); + } + + // During an install we need to make assumptions about the file system + // unless overrides are provided in settings.php. + if ($phase == 'install') { + $directories = array(); + if ($file_public_path = Settings::get('file_public_path')) { + $directories[] = $file_public_path; + } + else { + // If we are installing Drupal, the settings.php file might not exist yet + // in the intended site directory, so don't require it. + $request = Request::createFromGlobals(); + $site_path = DrupalKernel::findSitePath($request); + $directories[] = $site_path . '/files'; + } + if ($file_private_path = Settings::get('file_private_path')) { + $directories[] = $file_private_path; + } + if (!empty($GLOBALS['config']['system.file']['path']['temporary'])) { + $directories[] = $GLOBALS['config']['system.file']['path']['temporary']; + } + else { + // If the temporary directory is not overridden use an appropriate + // temporary path for the system. + $directories[] = FileSystem::getOsTemporaryDirectory(); + } + } + + // Check the config directory if it is defined in settings.php. If it isn't + // defined, the installer will create a valid config directory later, but + // during runtime we must always display an error. + if (!empty($GLOBALS['config_directories'])) { + foreach (array_keys(array_filter($GLOBALS['config_directories'])) as $type) { + $directory = config_get_config_directory($type); + // If we're installing Drupal try and create the config sync directory. + if (!is_dir($directory) && $phase == 'install') { + file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + } + if (!is_dir($directory)) { + if ($phase == 'install') { + $description = t('An automated attempt to create the directory %directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the online handbook.', array('%directory' => $directory, ':handbook_url' => 'https://www.drupal.org/server-permissions')); + } + else { + $description = t('The directory %directory does not exist.', array('%directory' => $directory)); + } + $requirements['config directory ' . $type] = array( + 'title' => t('Configuration directory: %type', ['%type' => $type]), + 'description' => $description, + 'severity' => REQUIREMENT_ERROR, + ); + } + } + } + if ($phase != 'install' && (empty($GLOBALS['config_directories']) || empty($GLOBALS['config_directories'][CONFIG_SYNC_DIRECTORY]) )) { + $requirements['config directories'] = array( + 'title' => t('Configuration directories'), + 'value' => t('Not present'), + 'description' => t('Your %file file must define the $config_directories variable as an array containing the names of directories in which configuration files can be found. It must contain a %sync_key key.', array('%file' => $site_path . '/settings.php', '%sync_key' => CONFIG_SYNC_DIRECTORY)), + 'severity' => REQUIREMENT_ERROR, + ); + } + + $requirements['file system'] = array( + 'title' => t('File system'), + ); + + $error = ''; + // For installer, create the directories if possible. + foreach ($directories as $directory) { + if (!$directory) { + continue; + } + if ($phase == 'install') { + file_prepare_directory($directory, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS); + } + $is_writable = is_writable($directory); + $is_directory = is_dir($directory); + if (!$is_writable || !$is_directory) { + $description = ''; + $requirements['file system']['value'] = t('Not writable'); + if (!$is_directory) { + $error = t('The directory %directory does not exist.', array('%directory' => $directory)); + } + else { + $error = t('The directory %directory is not writable.', array('%directory' => $directory)); + } + // The files directory requirement check is done only during install and runtime. + if ($phase == 'runtime') { + $description = t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array(':admin-file-system' => \Drupal::url('system.file_system_settings'))); + } + elseif ($phase == 'install') { + // For the installer UI, we need different wording. 'value' will + // be treated as version, so provide none there. + $description = t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the online handbook.', array(':handbook_url' => 'https://www.drupal.org/server-permissions')); + $requirements['file system']['value'] = ''; + } + if (!empty($description)) { + $description = array( + '#type' => 'inline_template', + '#template' => '{{ error }} {{ description }}', + '#context' => array( + 'error' => $error, + 'description' => $description, + ), + ); + $requirements['file system']['description'] = $description; + $requirements['file system']['severity'] = REQUIREMENT_ERROR; + } + } + else { + // This function can be called before the config_cache table has been + // created. + if ($phase == 'install' || file_default_scheme() == 'public') { + $requirements['file system']['value'] = t('Writable (public download method)'); + } + else { + $requirements['file system']['value'] = t('Writable (private download method)'); + } + } + } + + // See if updates are available in update.php. + if ($phase == 'runtime') { + $requirements['update'] = array( + 'title' => t('Database updates'), + 'value' => t('Up to date'), + ); + + // Check installed modules. + $has_pending_updates = FALSE; + foreach (\Drupal::moduleHandler()->getModuleList() as $module => $filename) { + $updates = drupal_get_schema_versions($module); + if ($updates !== FALSE) { + $default = drupal_get_installed_schema_version($module); + if (max($updates) > $default) { + $has_pending_updates = TRUE; + break; + } + } + } + if (!$has_pending_updates) { + /** @var \Drupal\Core\Update\UpdateRegistry $post_update_registry */ + $post_update_registry = \Drupal::service('update.post_update_registry'); + $missing_post_update_functions = $post_update_registry->getPendingUpdateFunctions(); + if (!empty($missing_post_update_functions)) { + $has_pending_updates = TRUE; + } + } + + if ($has_pending_updates) { + $requirements['update']['severity'] = REQUIREMENT_ERROR; + $requirements['update']['value'] = t('Out of date'); + $requirements['update']['description'] = t('Some modules have database schema updates to install. You should run the database update script immediately.', array(':update' => \Drupal::url('system.db_update'))); + } + + $requirements['entity_update'] = [ + 'title' => t('Entity/field definitions'), + 'value' => t('Up to date'), + ]; + // Verify that no entity updates are pending. + if ($change_list = \Drupal::entityDefinitionUpdateManager()->getChangeSummary()) { + $build = []; + foreach ($change_list as $entity_type_id => $changes) { + $entity_type = \Drupal::entityManager()->getDefinition($entity_type_id); + $build[] = [ + '#theme' => 'item_list', + '#title' => $entity_type->getLabel(), + '#items' => $changes, + ]; + } + + $entity_update_issues = \Drupal::service('renderer')->renderPlain($build); + $requirements['entity_update']['severity'] = REQUIREMENT_ERROR; + $requirements['entity_update']['value'] = t('Mismatched entity and/or field definitions'); + $requirements['entity_update']['description'] = t('The following changes were detected in the entity type and field definitions. @updates', ['@updates' => $entity_update_issues]); + } + } + + // Verify the update.php access setting + if ($phase == 'runtime') { + if (Settings::get('update_free_access')) { + $requirements['update access'] = array( + 'value' => t('Not protected'), + 'severity' => REQUIREMENT_ERROR, + 'description' => t('The update.php script is accessible to everyone without authentication check, which is a security risk. You must change the @settings_name value in your settings.php back to FALSE.', array('@settings_name' => '$settings[\'update_free_access\']')), + ); + } + else { + $requirements['update access'] = array( + 'value' => t('Protected'), + ); + } + $requirements['update access']['title'] = t('Access to update.php'); + } + + // Display an error if a newly introduced dependency in a module is not resolved. + if ($phase == 'update') { + $profile = drupal_get_profile(); + $files = system_rebuild_module_data(); + foreach ($files as $module => $file) { + // Ignore disabled modules and installation profiles. + if (!$file->status || $module == $profile) { + continue; + } + // Check the module's PHP version. + $name = $file->info['name']; + $php = $file->info['php']; + if (version_compare($php, PHP_VERSION, '>')) { + $requirements['php']['description'] .= t('@name requires at least PHP @version.', array('@name' => $name, '@version' => $php)); + $requirements['php']['severity'] = REQUIREMENT_ERROR; + } + // Check the module's required modules. + foreach ($file->requires as $requirement) { + $required_module = $requirement['name']; + // Check if the module exists. + if (!isset($files[$required_module])) { + $requirements["$module-$required_module"] = array( + 'title' => t('Unresolved dependency'), + 'description' => t('@name requires this module.', array('@name' => $name)), + 'value' => t('@required_name (Missing)', array('@required_name' => $required_module)), + 'severity' => REQUIREMENT_ERROR, + ); + continue; + } + // Check for an incompatible version. + $required_file = $files[$required_module]; + $required_name = $required_file->info['name']; + $version = str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $required_file->info['version']); + $compatibility = drupal_check_incompatibility($requirement, $version); + if ($compatibility) { + $compatibility = rtrim(substr($compatibility, 2), ')'); + $requirements["$module-$required_module"] = array( + 'title' => t('Unresolved dependency'), + 'description' => t('@name requires this module and version. Currently using @required_name version @version', array('@name' => $name, '@required_name' => $required_name, '@version' => $version)), + 'value' => t('@required_name (Version @compatibility required)', array('@required_name' => $required_name, '@compatibility' => $compatibility)), + 'severity' => REQUIREMENT_ERROR, + ); + continue; + } + } + } + } + + // Test Unicode library + include_once DRUPAL_ROOT . '/core/includes/unicode.inc'; + $requirements = array_merge($requirements, unicode_requirements()); + + if ($phase == 'runtime') { + // Check for update status module. + if (!\Drupal::moduleHandler()->moduleExists('update')) { + $requirements['update status'] = array( + 'value' => t('Not enabled'), + 'severity' => REQUIREMENT_WARNING, + 'description' => t('Update notifications are not enabled. It is highly recommended that you enable the Update Manager module from the module administration page in order to stay up-to-date on new releases. For more information, Update status handbook page.', array( + ':update' => 'https://www.drupal.org/documentation/modules/update', + ':module' => \Drupal::url('system.modules_list'), + )), + ); + } + else { + $requirements['update status'] = array( + 'value' => t('Enabled'), + ); + } + $requirements['update status']['title'] = t('Update notifications'); + + if (Settings::get('rebuild_access')) { + $requirements['rebuild access'] = array( + 'title' => t('Rebuild access'), + 'value' => t('Enabled'), + 'severity' => REQUIREMENT_ERROR, + 'description' => t('The rebuild_access setting is enabled in settings.php. It is recommended to have this setting disabled unless you are performing a rebuild.'), + ); + } + } + + // See if trusted hostnames have been configured, and warn the user if they + // are not set. + if ($phase == 'runtime') { + $trusted_host_patterns = Settings::get('trusted_host_patterns'); + if (empty($trusted_host_patterns)) { + $requirements['trusted_host_patterns'] = array( + 'title' => t('Trusted Host Settings'), + 'value' => t('Not enabled'), + 'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is highly recommended that you configure this. See Protecting against HTTP HOST Header attacks for more information.', array(':url' => 'https://www.drupal.org/node/1992030')), + 'severity' => REQUIREMENT_ERROR, + ); + } + else { + $requirements['trusted_host_patterns'] = array( + 'title' => t('Trusted Host Settings'), + 'value' => t('Enabled'), + 'description' => t('The trusted_host_patterns setting is set to allow %trusted_host_patterns', array('%trusted_host_patterns' => join(', ', $trusted_host_patterns))), + ); + } + } + + // Check xdebug.max_nesting_level, as some pages will not work if it is too + // low. + if (extension_loaded('xdebug')) { + // Setting this value to 256 was considered adequate on Xdebug 2.3 + // (see http://bugs.xdebug.org/bug_view_page.php?bug_id=00001100) + $minimum_nesting_level = 256; + $current_nesting_level = ini_get('xdebug.max_nesting_level'); + + if ($current_nesting_level < $minimum_nesting_level) { + $requirements['xdebug_max_nesting_level'] = [ + 'title' => t('Xdebug settings'), + 'value' => t('xdebug.max_nesting_level is set to %value.', ['%value' => $current_nesting_level]), + 'description' => t('Set xdebug.max_nesting_level=@level in your PHP configuration as some pages in your Drupal site will not work when this setting is too low.', ['@level' => $minimum_nesting_level]), + 'severity' => REQUIREMENT_ERROR, + ]; + } + } + + // Warning for httpoxy on IIS with affected PHP versions + // @see https://www.drupal.org/node/2783079 + if (strpos($software, 'Microsoft-IIS') !== FALSE + && ( + version_compare(PHP_VERSION, '5.5.38', '<') + || (version_compare(PHP_VERSION, '5.6.0', '>=') && version_compare(PHP_VERSION, '5.6.24', '<')) + || (version_compare(PHP_VERSION, '7.0.0', '>=') && version_compare(PHP_VERSION, '7.0.9', '<')) + )) { + $dom = new \DOMDocument('1.0', 'UTF-8'); + $webconfig = file_get_contents('web.config'); + // If you are here the web.config file must - of course - be well formed. + // But the PHP DOM component will throw warnings on some XML compliant + // stuff, so silently parse the configuration file. + @$dom->loadHTML($webconfig); + $httpoxy_rewrite = FALSE; + foreach ($dom->getElementsByTagName('rule') as $rule) { + foreach ($rule->attributes as $attr) { + if (@$attr->name == 'name' && @$attr->nodeValue == 'Erase HTTP_PROXY') { + $httpoxy_rewrite = TRUE; + break 2; + } + } + } + if (!$httpoxy_rewrite) { + $requirements['iis_httpoxy_protection'] = [ + 'title' => t('IIS httpoxy protection'), + 'value' => t('Your PHP runtime version is affected by the httpoxy vulnerability.'), + 'description' => t('Either update your PHP runtime version or uncomment the "Erase HTTP_PROXY" rule in your web.config file and add HTTP_PROXY to the allowed headers list. See more details in the security advisory.', [':link' => 'https://www.drupal.org/SA-CORE-2016-003']), + 'severity' => REQUIREMENT_ERROR, + ]; + } + } + + return $requirements; +} + +/** + * Implements hook_install(). + */ +function system_install() { + // Populate the cron key state variable. + $cron_key = Crypt::randomBytesBase64(55); + \Drupal::state()->set('system.cron_key', $cron_key); + + // Populate the site UUID and default name (if not set). + $site = \Drupal::configFactory()->getEditable('system.site'); + $site->set('uuid', \Drupal::service('uuid')->generate()); + if (!$site->get('name')) { + $site->set('name', 'Drupal'); + } + $site->save(TRUE); +} + +/** + * Implements hook_schema(). + */ +function system_schema() { + $schema['key_value'] = array( + 'description' => 'Generic key-value storage table. See the state system for an example.', + 'fields' => array( + 'collection' => array( + 'description' => 'A named collection of key and value pairs.', + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + 'default' => '', + ), + 'name' => array( + 'description' => 'The key of the key-value pair. As KEY is a SQL reserved keyword, name was chosen instead.', + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + 'default' => '', + ), + 'value' => array( + 'description' => 'The value.', + 'type' => 'blob', + 'not null' => TRUE, + 'size' => 'big', + ), + ), + 'primary key' => array('collection', 'name'), + ); + + $schema['key_value_expire'] = array( + 'description' => 'Generic key/value storage table with an expiration.', + 'fields' => array( + 'collection' => array( + 'description' => 'A named collection of key and value pairs.', + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + 'default' => '', + ), + 'name' => array( + // KEY is an SQL reserved word, so use 'name' as the key's field name. + 'description' => 'The key of the key/value pair.', + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + 'default' => '', + ), + 'value' => array( + 'description' => 'The value of the key/value pair.', + 'type' => 'blob', + 'not null' => TRUE, + 'size' => 'big', + ), + 'expire' => array( + 'description' => 'The time since Unix epoch in seconds when this item expires. Defaults to the maximum possible time.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 2147483647, + ), + ), + 'primary key' => array('collection', 'name'), + 'indexes' => array( + 'all' => array('name', 'collection', 'expire'), + 'expire' => array('expire'), + ), + ); + + $schema['sequences'] = array( + 'description' => 'Stores IDs.', + 'fields' => array( + 'value' => array( + 'description' => 'The value of the sequence.', + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + ), + 'primary key' => array('value'), + ); + + $schema['sessions'] = array( + 'description' => "Drupal's session handlers read and write into the sessions table. Each record represents a user session, either anonymous or authenticated.", + 'fields' => array( + 'uid' => array( + 'description' => 'The {users}.uid corresponding to a session, or 0 for anonymous user.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'sid' => array( + 'description' => "A session ID (hashed). The value is generated by Drupal's session handlers.", + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + ), + 'hostname' => array( + 'description' => 'The IP address that last used this session ID (sid).', + 'type' => 'varchar_ascii', + 'length' => 128, + 'not null' => TRUE, + 'default' => '', + ), + 'timestamp' => array( + 'description' => 'The Unix timestamp when this session last requested a page. Old records are purged by PHP automatically.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + ), + 'session' => array( + 'description' => 'The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID. Drupal loads $_SESSION from here at the start of each request and saves it at the end.', + 'type' => 'blob', + 'not null' => FALSE, + 'size' => 'big', + ), + ), + 'primary key' => array( + 'sid', + ), + 'indexes' => array( + 'timestamp' => array('timestamp'), + 'uid' => array('uid'), + ), + 'foreign keys' => array( + 'session_user' => array( + 'table' => 'users', + 'columns' => array('uid' => 'uid'), + ), + ), + ); + + // Create the url_alias table. The alias_storage service can auto-create its + // table, but this relies on exceptions being thrown. These exceptions will be + // thrown every request until an alias is created. + $schema['url_alias'] = AliasStorage::schemaDefinition(); + + return $schema; +} + +/** + * @addtogroup updates-8.0.0-beta + * @{ + */ + +/** + * Change two fields on the default menu link storage to be serialized data. + */ +function system_update_8001(&$sandbox = NULL) { + $database = \Drupal::database(); + $schema = $database->schema(); + if ($schema->tableExists('menu_tree')) { + + if (!isset($sandbox['current'])) { + // Converting directly to blob can cause problems with reading out and + // serializing the string data later on postgres, so rename the existing + // columns and create replacement ones to hold the serialized objects. + $old_fields = array( + 'title' => array( + 'description' => 'The text displayed for the link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'description' => array( + 'description' => 'The description of this link - used for admin pages and title attribute.', + 'type' => 'text', + 'not null' => FALSE, + ), + ); + foreach ($old_fields as $name => $spec) { + $schema->changeField('menu_tree', $name, 'system_update_8001_' . $name, $spec); + } + $spec = array( + 'description' => 'The title for the link. May be a serialized TranslatableMarkup.', + 'type' => 'blob', + 'size' => 'big', + 'not null' => FALSE, + 'serialize' => TRUE, + ); + $schema->addField('menu_tree', 'title', $spec); + $spec = array( + 'description' => 'The description of this link - used for admin pages and title attribute.', + 'type' => 'blob', + 'size' => 'big', + 'not null' => FALSE, + 'serialize' => TRUE, + ); + $schema->addField('menu_tree', 'description', $spec); + + $sandbox['current'] = 0; + $sandbox['max'] = $database->query('SELECT COUNT(mlid) FROM {menu_tree}') + ->fetchField(); + } + + $menu_links = $database->queryRange('SELECT mlid, system_update_8001_title AS title, system_update_8001_description AS description FROM {menu_tree} ORDER BY mlid ASC', $sandbox['current'], $sandbox['current'] + 50) + ->fetchAllAssoc('mlid'); + + foreach ($menu_links as $menu_link) { + $menu_link = (array) $menu_link; + // Convert title and description to serialized strings. + $menu_link['title'] = serialize($menu_link['title']); + $menu_link['description'] = serialize($menu_link['description']); + + $database->update('menu_tree') + ->fields($menu_link) + ->condition('mlid', $menu_link['mlid']) + ->execute(); + + $sandbox['current']++; + } + + $sandbox['#finished'] = empty($sandbox['max']) ? 1 : ($sandbox['current'] / $sandbox['max']); + + if ($sandbox['#finished'] >= 1) { + // Drop unnecessary fields from {menu_tree}. + $schema->dropField('menu_tree', 'system_update_8001_title'); + $schema->dropField('menu_tree', 'title_arguments'); + $schema->dropField('menu_tree', 'title_context'); + $schema->dropField('menu_tree', 'system_update_8001_description'); + } + return t('Menu links converted'); + } + else { + return t('Menu link conversion skipped, because the {menu_tree} table did not exist yet.'); + } +} + +/** + * Removes the system.filter configuration. + */ +function system_update_8002() { + \Drupal::configFactory()->getEditable('system.filter')->delete(); + return t('The system.filter configuration has been moved to a container parameter, see default.services.yml for more information.'); +} + +/** + * Change the index on the {router} table. + */ +function system_update_8003() { + $database = \Drupal::database(); + $database->schema()->dropIndex('router', 'pattern_outline_fit'); + $database->schema()->addIndex( + 'router', + 'pattern_outline_parts', + ['pattern_outline', 'number_parts'], + [ + 'fields' => [ + 'pattern_outline' => [ + 'description' => 'The pattern', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ], + 'number_parts' => [ + 'description' => 'Number of parts in this router path.', + 'type' => 'int', + 'not null' => TRUE, + 'default' => 0, + 'size' => 'small', + ], + ], + ] + ); +} + +/** + * Add a (id, default_langcode, langcode) composite index to entities. + */ +function system_update_8004() { + // \Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema was changed in + // https://www.drupal.org/node/2261669 to include a (id, default_langcode, + // langcode) compound index, but this update function wasn't added until + // https://www.drupal.org/node/2542748. Regenerate the related schemas to + // ensure they match the currently expected status. + $manager = \Drupal::entityDefinitionUpdateManager(); + foreach (array_keys(\Drupal::entityManager() + ->getDefinitions()) as $entity_type_id) { + // Only update the entity type if it already exists. This condition is + // needed in case new entity types are introduced after this update. + if ($entity_type = $manager->getEntityType($entity_type_id)) { + $manager->updateEntityType($entity_type); + } + } +} + +/** + * Place local actions and tasks blocks in every theme. + */ +function system_update_8005() { + // When block module is not installed, there is nothing that could be done + // except showing a warning. + if (!\Drupal::moduleHandler()->moduleExists('block')) { + return t('Block module is not enabled so local actions and tasks which have been converted to blocks, are not visible anymore.'); + } + $config_factory = \Drupal::configFactory(); + /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */ + $theme_handler = \Drupal::service('theme_handler'); + $custom_themes_installed = FALSE; + $message = NULL; + $langcode = \Drupal::service('language_manager')->getCurrentLanguage()->getId(); + + $local_actions_default_settings = [ + 'plugin' => 'local_actions_block', + 'region' => 'content', + 'settings.label' => 'Primary admin actions', + 'settings.label_display' => 0, + 'settings.cache.max_age' => 0, + 'visibility' => [], + 'weight' => 0, + 'langcode' => $langcode, + ]; + $tabs_default_settings = [ + 'plugin' => 'local_tasks_block', + 'region' => 'content', + 'settings.label' => 'Tabs', + 'settings.label_display' => 0, + 'settings.cache.max_age' => 0, + 'visibility' => [], + 'weight' => 0, + 'langcode' => $langcode, + ]; + foreach ($theme_handler->listInfo() as $theme) { + $theme_name = $theme->getName(); + switch ($theme_name) { + case 'bartik': + $name = 'block.block.bartik_local_actions'; + $values = [ + 'id' => 'bartik_local_actions', + 'weight' => -1, + ] + $local_actions_default_settings; + _system_update_create_block($name, $theme_name, $values); + + $name = 'block.block.bartik_local_tasks'; + $values = [ + 'id' => 'bartik_local_tasks', + 'weight' => -7, + ] + $tabs_default_settings; + _system_update_create_block($name, $theme_name, $values); + + // Help region has been removed so all the blocks inside has to be moved + // to content region. + $weight = -6; + $blocks = []; + foreach ($config_factory->listAll('block.block.') as $block_config) { + $block = $config_factory->getEditable($block_config); + if ($block->get('theme') == 'bartik' && $block->get('region') == 'help') { + $blocks[] = $block; + } + } + // Sort blocks by block weight. + uasort($blocks, function ($a, $b) { + return $a->get('weight') - $b->get('weight'); + }); + // Move blocks to content region and set them in right order by their + // weight. + foreach ($blocks as $block) { + $block->set('region', 'content'); + $block->set('weight', $weight++); + $block->save(); + } + break; + + case 'seven': + $name = 'block.block.seven_local_actions'; + $values = [ + 'id' => 'seven_local_actions', + 'weight' => -10, + ] + $local_actions_default_settings; + _system_update_create_block($name, $theme_name, $values); + + $name = 'block.block.seven_primary_local_tasks'; + $values = [ + 'region' => 'header', + 'id' => 'seven_primary_local_tasks', + 'settings.label' => 'Primary tabs', + 'settings.primary' => TRUE, + 'settings.secondary' => FALSE, + ] + $tabs_default_settings; + _system_update_create_block($name, $theme_name, $values); + + $name = 'block.block.seven_secondary_local_tasks'; + $values = [ + 'region' => 'pre_content', + 'id' => 'seven_secondary_local_tasks', + 'settings.label' => 'Secondary tabs', + 'settings.primary' => FALSE, + 'settings.secondary' => TRUE, + ] + $tabs_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'stark': + $name = 'block.block.stark_local_actions'; + $values = [ + 'id' => 'stark_local_actions', + ] + $local_actions_default_settings; + _system_update_create_block($name, $theme_name, $values); + + $name = 'block.block.stark_local_tasks'; + $values = [ + 'id' => 'stark_local_tasks', + ] + $tabs_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'classy': + case 'stable': + // Don't place any blocks or trigger custom themes installed warning. + break; + + default: + $custom_themes_installed = TRUE; + $name = 'block.block.' . $theme_name . '_local_actions'; + $values = [ + 'id' => $theme_name . '_local_actions', + 'weight' => -10, + ] + $local_actions_default_settings; + _system_update_create_block($name, $theme_name, $values); + + $name = sprintf('block.block.%s_local_tasks', $theme_name); + $values = [ + 'id' => $theme_name . '_local_tasks', + 'weight' => -20, + ] + $tabs_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + } + } + + if ($custom_themes_installed) { + $message = t('Because your site has custom theme(s) installed, we had to set local actions and tasks blocks into the content region. Please manually review the block configurations and remove the removed variables from your templates.'); + } + + return $message; +} + +/** + * Place branding blocks in every theme. + */ +function system_update_8006() { + // When block module is not installed, there is nothing that could be done + // except showing a warning. + if (!\Drupal::moduleHandler()->moduleExists('block')) { + return t('Block module is not enabled so site branding elements, which have been converted to a block, are not visible anymore.'); + } + + /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */ + $theme_handler = \Drupal::service('theme_handler'); + $custom_themes_installed = FALSE; + $message = NULL; + $langcode = \Drupal::service('language_manager')->getCurrentLanguage()->getId(); + + $site_branding_default_settings = [ + 'plugin' => 'system_branding_block', + 'region' => 'content', + 'settings.label' => 'Site branding', + 'settings.label_display' => 0, + 'visibility' => [], + 'weight' => 0, + 'langcode' => $langcode, + ]; + foreach ($theme_handler->listInfo() as $theme) { + $theme_name = $theme->getName(); + switch ($theme_name) { + case 'bartik': + $name = 'block.block.bartik_branding'; + $values = [ + 'id' => 'bartik_branding', + 'region' => 'header', + ] + $site_branding_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'stark': + $name = 'block.block.stark_branding'; + $values = [ + 'id' => 'stark_branding', + 'region' => 'header', + ] + $site_branding_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'seven': + case 'classy': + case 'stable': + // Don't place any blocks or trigger custom themes installed warning. + break; + default: + $custom_themes_installed = TRUE; + $name = sprintf('block.block.%s_branding', $theme_name); + $values = [ + 'id' => sprintf('%s_branding', $theme_name), + 'region' => 'content', + 'weight' => '-50', + ] + $site_branding_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + } + } + + if ($custom_themes_installed) { + $message = t('Because your site has custom theme(s) installed, we had to set the branding block into the content region. Please manually review the block configuration and remove the site name, slogan, and logo variables from your templates.'); + } + + return $message; +} + +/** + * Helper function to create block configuration objects for an update. + * + * @param string $name + * The name of the config object. + * @param string $theme_name + * The name of the theme the block is associated with. + * @param array $values + * The block config values. + */ +function _system_update_create_block($name, $theme_name, array $values) { + if (!\Drupal::service('config.storage')->exists($name)) { + $block = \Drupal::configFactory()->getEditable($name); + $values['uuid'] = \Drupal::service('uuid')->generate(); + $values['theme'] = $theme_name; + $values['dependencies.theme'] = [$theme_name]; + foreach ($values as $key => $value) { + $block->set($key, $value); + } + $block->save(); + } +} + +/** + * Set langcode fields to be ASCII-only. + */ +function system_update_8007() { + $database = \Drupal::database(); + $database_schema = $database->schema(); + $entity_types = \Drupal::entityManager()->getDefinitions(); + + $schema = \Drupal::keyValue('entity.storage_schema.sql')->getAll(); + $schema_copy = $schema; + foreach ($schema as $item_name => $item) { + list($entity_type_id, , ) = explode('.', $item_name); + if (!isset($entity_types[$entity_type_id])) { + continue; + } + foreach ($item as $table_name => $table_schema) { + foreach ($table_schema as $schema_key => $schema_data) { + if ($schema_key == 'fields') { + foreach ($schema_data as $field_name => $field_data) { + foreach ($field_data as $field_data_property => $field_data_value) { + // Langcode fields have the property 'is_ascii' set, instead + // they should have set the type to 'varchar_ascii'. + if ($field_data_property == 'is_ascii') { + unset($schema_copy[$item_name][$table_name]['fields'][$field_name]['is_ascii']); + $schema_copy[$item_name][$table_name]['fields'][$field_name]['type'] = 'varchar_ascii'; + if ($database->driver() == 'mysql') { + $database_schema->changeField($table_name, $field_name, $field_name, $schema_copy[$item_name][$table_name]['fields'][$field_name]); + } + } + } + } + } + } + } + } + \Drupal::keyValue('entity.storage_schema.sql')->setMultiple($schema_copy); + + $definitions = \Drupal::keyValue('entity.definitions.installed')->getAll(); + $definitions_copy = $definitions; + foreach ($definitions as $item_name => $item_value) { + $suffix = '.field_storage_definitions'; + if (substr($item_name, -strlen($suffix)) == $suffix) { + foreach ($item_value as $field_name => $field_definition) { + $reflection = new \ReflectionObject($field_definition); + $schema_property = $reflection->getProperty('schema'); + $schema_property->setAccessible(TRUE); + $schema = $schema_property->getValue($field_definition); + if (isset($schema['columns']['value']['is_ascii'])) { + $schema['columns']['value']['type'] = 'varchar_ascii'; + unset($schema['columns']['value']['is_ascii']); + } + $schema_property->setValue($field_definition, $schema); + $schema_property->setAccessible(FALSE); + $definitions_copy[$item_name][$field_name] = $field_definition; + } + } + } + \Drupal::keyValue('entity.definitions.installed')->setMultiple($definitions_copy); +} + +/** + * Purge field schema data for uninstalled entity types. + */ +function system_update_8008() { + $entity_types = \Drupal::entityManager()->getDefinitions(); + /** @var \Drupal\Core\KeyValueStore\KeyValueStoreInterface $schema */ + $schema = \Drupal::keyValue('entity.storage_schema.sql'); + foreach ($schema->getAll() as $key => $item) { + list($entity_type_id, ,) = explode('.', $key); + if (!isset($entity_types[$entity_type_id])) { + $schema->delete($key); + } + } +} + +/** + * Add allowed attributes to existing html filters. + */ +function system_update_8009() { + $default_mapping = [ + '' => '', + '
' => '
', + '
    ' => '
      ', + '
        ' => '
          ', + '' => '', + '

          ' => '

          ', + '

          ' => '

          ', + '

          ' => '

          ', + '

          ' => '
          ', + '
          ' => '
          ', + ]; + $config_factory = \Drupal::configFactory(); + foreach ($config_factory->listAll('filter.format') as $name) { + $allowed_html_mapping = $default_mapping; + $config = $config_factory->getEditable($name); + // The image alignment filter needs the data-align attribute. + $align_enabled = $config->get('filters.filter_align.status'); + if ($align_enabled) { + $allowed_html_mapping[''] = str_replace('>', ' data-align>', $allowed_html_mapping['']); + } + // The image caption filter needs the data-caption attribute. + $caption_enabled = $config->get('filters.filter_caption.status'); + if ($caption_enabled) { + $allowed_html_mapping[''] = str_replace('>', ' data-caption>', $allowed_html_mapping['']); + } + $allowed_html = $config->get('filters.filter_html.settings.allowed_html'); + if (!empty($allowed_html)) { + $allowed_html = strtr($allowed_html, $allowed_html_mapping); + $config->set('filters.filter_html.settings.allowed_html', $allowed_html); + $config->save(); + } + } +} + +/** + * Place page title blocks in every theme. + */ +function system_update_8010() { + // When block module is not installed, there is nothing that could be done + // except showing a warning. + if (!\Drupal::moduleHandler()->moduleExists('block')) { + return t('Block module is not enabled. The page title has been converted to a block, but default page title markup will still display at the top of the main content area.'); + } + + /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */ + $theme_handler = \Drupal::service('theme_handler'); + $custom_themes_installed = FALSE; + $message = NULL; + $langcode = \Drupal::service('language_manager')->getCurrentLanguage()->getId(); + + $page_title_default_settings = [ + 'plugin' => 'page_title_block', + 'region' => 'content', + 'settings.label' => 'Page title', + 'settings.label_display' => 0, + 'visibility' => [], + 'weight' => -50, + 'langcode' => $langcode, + ]; + foreach ($theme_handler->listInfo() as $theme) { + $theme_name = $theme->getName(); + switch ($theme_name) { + case 'bartik': + $name = 'block.block.bartik_page_title'; + $values = [ + 'id' => 'bartik_page_title', + ] + $page_title_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'stark': + $name = 'block.block.stark_page_title'; + $values = [ + 'id' => 'stark_page_title', + 'region' => 'content', + ] + $page_title_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'seven': + $name = 'block.block.seven_page_title'; + $values = [ + 'id' => 'seven_page_title', + 'region' => 'header', + ] + $page_title_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + case 'classy': + $name = 'block.block.classy_page_title'; + $values = [ + 'id' => 'classy_page_title', + 'region' => 'content', + ] + $page_title_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + + default: + $custom_themes_installed = TRUE; + $name = sprintf('block.block.%s_page_title', $theme_name); + $values = [ + 'id' => sprintf('%s_page_title', $theme_name), + 'region' => 'content', + 'weight' => '-50', + ] + $page_title_default_settings; + _system_update_create_block($name, $theme_name, $values); + break; + } + } + + if ($custom_themes_installed) { + $message = t('Because your site has custom theme(s) installed, we have placed the page title block in the content region. Please manually review the block configuration and remove the page title variables from your page templates.'); + } + + return $message; +} + +/** + * Add secondary local tasks block to Seven (fixes system_update_8005). + */ +function system_update_8011() { + $langcode = \Drupal::service('language_manager')->getCurrentLanguage()->getId(); + $theme_name = 'seven'; + $name = 'block.block.seven_secondary_local_tasks'; + $values = [ + 'plugin' => 'local_tasks_block', + 'region' => 'pre_content', + 'id' => 'seven_secondary_local_tasks', + 'settings.label' => 'Secondary tabs', + 'settings.label_display' => 0, + 'settings.primary' => FALSE, + 'settings.secondary' => TRUE, + 'visibility' => [], + 'weight' => 0, + 'langcode' => $langcode, + ]; + _system_update_create_block($name, $theme_name, $values); +} + +/** + * Enable automated cron module and move the config into it. + */ +function system_update_8013() { + $config_factory = \Drupal::configFactory(); + $system_cron_config = $config_factory->getEditable('system.cron'); + if ($autorun = $system_cron_config->get('threshold.autorun')) { + // Install 'automated_cron' module. + \Drupal::service('module_installer')->install(['automated_cron'], FALSE); + + // Copy 'autorun' value into the new module's 'interval' setting. + $config_factory->getEditable('automated_cron.settings') + ->set('interval', $autorun) + ->save(TRUE); + } + + // Remove the 'autorun' key in system module config. + $system_cron_config + ->clear('threshold.autorun') + ->save(TRUE); +} + +/** + * @} End of "addtogroup updates-8.0.0-beta". + */ + +/** + * @addtogroup updates-8.0.0-rc + * @{ + */ + +/** + * Install the Stable base theme if needed. + */ +function system_update_8014() { + $theme_handler = \Drupal::service('theme_handler'); + if ($theme_handler->themeExists('stable')) { + return; + } + $theme_handler->refreshInfo(); + foreach ($theme_handler->listInfo() as $theme) { + // We first check that a base theme is set because if it's set to false then + // it's unset in \Drupal\Core\Extension\ThemeHandler::rebuildThemeData(). + if (isset($theme->info['base theme']) && $theme->info['base theme'] == 'stable') { + $theme_handler->install(['stable']); + return; + } + } +} + +/** + * @} End of "addtogroup updates-8.0.0-rc". + */ + +/** + * @addtogroup updates-8.2.0 + * @{ + */ + +/** + * Fix configuration overrides to not override non existing keys. + */ +function system_update_8200(&$sandbox) { + $config_factory = \Drupal::configFactory(); + if (!array_key_exists('config_names', $sandbox)) { + $sandbox['config_names'] = $config_factory->listAll(); + $sandbox['max'] = count($sandbox['config_names']); + } + + // Get a list of 50 to work on at a time. + $config_names_to_process = array_slice($sandbox['config_names'], 0, 50); + // Preload in a single query. + $config_factory->loadMultiple($config_names_to_process); + foreach ($config_names_to_process as $config_name) { + $config_factory->getEditable($config_name)->save(); + } + + // Update the list of names to process. + $sandbox['config_names'] = array_diff($sandbox['config_names'], $config_names_to_process); + $sandbox['#finished'] = empty($sandbox['config_names']) ? 1 : ($sandbox['max'] - count($sandbox['config_names'])) / $sandbox['max']; +} + +/** + * Clear caches due to behavior change in DefaultPluginManager. + */ +function system_update_8201() { + // Empty update to cause a cache rebuild. +} + +/** + * @} End of "addtogroup updates-8.2.0". + */ diff --git a/core/modules/system/system.module b/core/modules/system/system.module index 3c858f9..bf73799 100644 --- a/core/modules/system/system.module +++ b/core/modules/system/system.module @@ -197,9 +197,31 @@ function system_theme() { 'render element' => 'form', 'file' => 'system.admin.inc', ), + 'status_report_page' => array( + 'variables' => array( + 'counters' => array(), + 'general_info' => array(), + 'requirements' => NULL, + ), + ), 'status_report' => array( - 'variables' => array('requirements' => NULL), - 'file' => 'system.admin.inc', + 'variables' => array( + 'grouped_requirements' => NULL, + ), + ), + 'status_report_counter' => array( + 'variables' => array('amount' => NULL, 'text' => NULL, 'severity' => NULL), + ), + 'status_report_general_info' => array( + 'variables' => array( + 'drupal' => array(), + 'cron' => array(), + 'database_system' => array(), + 'database_system_version' => array(), + 'php' => array(), + 'php_memory_limit' => array(), + 'webserver' => array(), + ), ), 'admin_page' => array( 'variables' => array('blocks' => NULL), diff --git a/core/modules/system/templates/status-report-counter.html.twig b/core/modules/system/templates/status-report-counter.html.twig new file mode 100644 index 0000000..fcfce50 --- /dev/null +++ b/core/modules/system/templates/status-report-counter.html.twig @@ -0,0 +1,18 @@ +{# +/** + * @file + * Default template for status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} + + {{ amount }} {{ text }} +
          +
          {{ text }} Details + diff --git a/core/modules/system/templates/status-report-general-info.html.twig b/core/modules/system/templates/status-report-general-info.html.twig new file mode 100644 index 0000000..294b449 --- /dev/null +++ b/core/modules/system/templates/status-report-general-info.html.twig @@ -0,0 +1,75 @@ +{# +/** + * @file + * Default template implementation for status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} +

          {{ 'General System Information'|t }}

          +
          +

          {{ 'Drupal Version'|t }}

          + {{ drupal.value }} + {{ drupal.description }} +
          + +
          +

          {{ 'Last Cron Run'|t }}

          + {{ cron.value }} + {{ cron.run_cron }} + {{ cron.description }} +
          +
          +

          {{ 'Web Server'|t }}

          + {{ webserver.value }} + {{ webserver.description }} +
          + +
          +

          {{ 'PHP'|t }}

          + {{ 'Version'|t }} +
          + {{ php.value }} + {{ php.description }} +
          + {{ 'Memory limit'|t }} +
          + {{ php_memory_limit.value }} + {{ php_memory_limit.description }} +
          + +
          +

          {{ 'Database'|t }}

          + {{ 'Version'|t }} +
          + {{ database_system_version.value }} + {{ database_system_version.description }} +
          + {{ 'System'|t }} +
          + {{ database_system.value }} + {{ database_system.description }} +
          diff --git a/core/modules/system/templates/status-report-page.html.twig b/core/modules/system/templates/status-report-page.html.twig new file mode 100644 index 0000000..c226036 --- /dev/null +++ b/core/modules/system/templates/status-report-page.html.twig @@ -0,0 +1,18 @@ +{# +/** + * @file + * Default theme implementation for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @ingroup themeable + */ +#} +{% for counter in counters %} + {{ counter }} +{% endfor %} +{{ general_info }} +{{ requirements }} diff --git a/core/modules/system/templates/status-report.html.twig b/core/modules/system/templates/status-report.html.twig index b6ad739..4c63f6d 100644 --- a/core/modules/system/templates/status-report.html.twig +++ b/core/modules/system/templates/status-report.html.twig @@ -4,38 +4,36 @@ * Default theme implementation for the status report. * * Available variables: - * - requirements: Contains multiple requirement instances. - * Each requirement contains: - * - title: The title of the requirement. - * - value: (optional) The requirement's status. - * - description: (optional) The requirement's description. - * - severity_title: The title of the severity. - * - severity_status: Indicates the severity status. - * - * @see template_preprocess_status_report() + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. * * @ingroup themeable */ #} - - - {% for requirement in requirements %} - - {% if requirement.severity_status in ['warning', 'error'] %} - - - + {{ requirement.title }} + + + {{ requirement.value }} + {% if requirement.description %} +
          {{ requirement.description }}
          + {% endif %} + {% endfor %} - -
          +{% for group in grouped_requirements %} +

          {{ group.title }}

          + {% for requirement in group.items %} +
          + + {% if requirement.severity_title %} {{ requirement.severity_title }} - {% else %} -
          - {% endif %} - {{ requirement.title }} - - {{ requirement.value }} - {% if requirement.description %} -
          {{ requirement.description }}
          {% endif %} -
          +{% endfor %} diff --git a/core/themes/classy/templates/admin/status-report-counter.html.twig b/core/themes/classy/templates/admin/status-report-counter.html.twig new file mode 100644 index 0000000..5c408b8 --- /dev/null +++ b/core/themes/classy/templates/admin/status-report-counter.html.twig @@ -0,0 +1,27 @@ +{# +/** + * @file + * Theme override for status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} +{% + set classes = [ + 'system-status-counter', + 'system-status-counter--' ~ severity, + ] +%} + + + + {{ amount }} {{ text }} +
          + {{ text }} Details +
          + diff --git a/core/themes/classy/templates/admin/status-report-general-info.html.twig b/core/themes/classy/templates/admin/status-report-general-info.html.twig new file mode 100644 index 0000000..e070449 --- /dev/null +++ b/core/themes/classy/templates/admin/status-report-general-info.html.twig @@ -0,0 +1,99 @@ +{# +/** + * @file + * Theme override for status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} +
          +

          {{ 'General System Information'|t }}

          +
          +
          + +
          +

          {{ 'Drupal Version'|t }}

          + {{ drupal.value }} + {% if drupal.description %} +
          {{ drupal.description }}
          + {% endif %} +
          +
          +
          + +
          +

          {{ 'Last Cron Run'|t }}

          + {{ cron.value }} + {% if cron.run_cron %} +
          {{ cron.run_cron }}
          + {% endif %} + {% if cron.description %} +
          {{ cron.description }}
          + {% endif %} +
          +
          +
          + +
          +

          {{ 'Web Server'|t }}

          + {{ webserver.value }} + {% if webserver.description %} +
          {{ webserver.description }}
          + {% endif %} +
          +
          +
          + +
          +

          {{ 'PHP'|t }}

          + {{ 'Version'|t }}
          {{ php.value }} + {% if php.description %} +
          {{ php.description }}
          + {% endif %} +
          + {{ 'Memory limit'|t }}
          {{ php_memory_limit.value }} + {% if php_memory_limit.description %} +
          {{ php_memory_limit.description }}
          + {% endif %} +
          +
          +
          + +
          +

          {{ 'Database'|t }}

          + {{ 'Version'|t }}
          {{ database_system_version.value }} + {% if database_system_version.description %} +
          {{ database_system_version.description }}
          + {% endif %} +
          + {{ 'System'|t }}
          {{ database_system.value }} + {% if database_system.description %} +
          {{ database_system.description }}
          + {% endif %} +
          +
          +
          +
          diff --git a/core/themes/classy/templates/admin/status-report-page.html.twig b/core/themes/classy/templates/admin/status-report-page.html.twig new file mode 100644 index 0000000..27e0d15 --- /dev/null +++ b/core/themes/classy/templates/admin/status-report-page.html.twig @@ -0,0 +1,28 @@ +{# +/** + * @file + * Theme override for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @see template_preprocess_status_report() + */ +#} +{% if counters|length == 3 %} + {% set element_width_class = ' system-status-report-counters__item--third-width' %} +{% elseif counters|length == 2 %} + {% set element_width_class = ' system-status-report-counters__item--half-width' %} +{% endif %} +
          + {% for counter in counters %} +
          + {{ counter }} +
          + {% endfor %} +
          + +{{ general_info }} +{{ requirements }} diff --git a/core/themes/seven/css/components/colors.css b/core/themes/seven/css/components/colors.css index 54358d8..a602adc 100644 --- a/core/themes/seven/css/components/colors.css +++ b/core/themes/seven/css/components/colors.css @@ -3,14 +3,11 @@ */ .color-success { color: #325e1c; - background-color: #f3faef; } .color-warning { color: #734c00; - background-color: #fdf8ed; } .color-error { color: #a51b00; - background-color: #fcf4f2; } diff --git a/core/themes/seven/css/components/system-status-counter.css b/core/themes/seven/css/components/system-status-counter.css new file mode 100644 index 0000000..2caa950 --- /dev/null +++ b/core/themes/seven/css/components/system-status-counter.css @@ -0,0 +1,79 @@ +/** + * @file + * Styles for the system status counter component. + */ + +.system-status-counter { + border: 1px solid #e6e4df; + border-radius: 3px; + display: inline-block; + width: 100%; + white-space: nowrap; + background: #FCFCFA; +} +.system-status-counter__status-icon { + display: inline-block; + height: 45px; + width: 45px; + vertical-align: middle; + border-right: 1px solid #e6e4df; /* LTR */ + border-left: 0; /* LTR */ + background-color: #faf9f5; + box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset; +} +[dir="rtl"] .system-status-counter__status-icon { + border-right: 0; + border-left: 1px solid #e6e4df; + box-shadow: 0 1px 1px rgba(0, 0, 0, .1) inset; +} +.system-status-counter__status-icon:before { + content: ""; + background-size: 25px; + background-position: 50% center; + background-repeat: no-repeat; + width: 100%; + height: 100%; + display: block; +} + +.system-status-counter__status-icon--error:before { + background-image: url(../../../stable/images/core/icons/e32700/error.svg); +} +.system-status-counter__status-icon--warning:before { + background-image: url(../../../stable/images/core/icons/e29700/warning.svg); +} +.system-status-counter__status-icon--checked:before { + background-image: url(../../../stable/images/core/icons/73b355/check.svg); +} + +.system-status-counter__status-title { + display: inline-block; + vertical-align: middle; + text-transform: uppercase; + padding: 0 6px; + font-size: 1rem; + line-height: 1em; + font-weight: bold; +} +.system-status-counter__details { + font-size: 12px; + font-weight: normal; + text-transform: none; +} + +@media screen and (min-width: 61em) { + .system-status-counter__status-icon, + .system-status-counter { + height: 65px; + } + .system-status-counter__status-icon { + width: 65px; + } + .system-status-counter__status-title { + font-size: 16px; + padding: 10px 3%; + } + .system-status-counter__status-icon:before { + background-size: 35px; + } +} diff --git a/core/themes/seven/css/components/system-status-general-info.css b/core/themes/seven/css/components/system-status-general-info.css new file mode 100644 index 0000000..e4ca960 --- /dev/null +++ b/core/themes/seven/css/components/system-status-general-info.css @@ -0,0 +1,149 @@ +/** + * @file + * Seven styles for the System Status general info. + */ + +.system-status-general-info { + border: 1px solid #ccc; + border-radius: 3px; +} + +.system-status-general-info__header { + background-color: #f5f5f2; + padding: 10px; + margin: 0; + overflow: hidden; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + font-size: 14px; + text-transform: uppercase; +} + +.system-status-general-info__item { + background: #fcfcfa; + border-top: 1px solid #ccc; + padding: 10px 10px 20px; + box-sizing: border-box; + overflow-x: auto; +} + +.system-status-general-info__item-icon { + display: inline-block; + height: 45px; + width: 45px; + vertical-align: top; +} +.system-status-general-info__item-icon:before { + content: ""; + background-size: 35px; + background-position: 50% center; + background-repeat: no-repeat; + width: 100%; + height: 100%; + display: block; +} +.system-status-general-info__item-icon--d8:before { + background-image: url(../../images/icons/cccccc/d8-logo.svg); +} +.system-status-general-info__item-icon--clock:before { + background-image: url(../../images/icons/cccccc/clock.svg); +} +.system-status-general-info__item-icon--server:before { + background-image: url(../../images/icons/cccccc/server.svg); +} +.system-status-general-info__item-icon--php:before { + background-image: url(../../images/icons/cccccc/php-logo.svg); + background-size: 45px; +} +.system-status-general-info__item-icon--database:before { + background-image: url(../../images/icons/cccccc/database.svg); + background-size: 30px; +} + +.system-status-general-info__item-details { + box-sizing: border-box; + display: inline-block; + width: calc(100% - 60px); + padding-left: 10px; /* LTR */ + position: relative; +} +[dir="rtl"] .system-status-general-info__item-details { + padding-right: 10px; + padding-left: 0; +} + +.system-status-general-info__item-title { + margin-bottom: 0; +} + +.system-status-general-info__run-cron { + margin: 1em 0 0; +} + +@media screen and (min-width: 48em) { + .system-status-general-info__items { + display: flex; + flex-wrap: wrap; + } + + .system-status-general-info__item { + flex: 1; + flex-basis: 33%; + width: 33%; + } + .system-status-general-info__item:nth-child(2) { + flex: 2; + flex-basis: 66%; + } + .system-status-general-info__item:nth-child(2), + .system-status-general-info__item:nth-child(4), + .system-status-general-info__item:nth-child(5) { + border-left: 1px solid #ccc; /* LTR */ + } + [dir="rtl"] .system-status-general-info__item:nth-child(1), + [dir="rtl"] .system-status-general-info__item:nth-child(3) { + border-left: 1px solid #ccc; + } + [dir="rtl"] .system-status-general-info__item:nth-child(2), + [dir="rtl"] .system-status-general-info__item:nth-child(5) { + border-left: 0; + } + + .system-status-general-info__run-cron { + margin: 15px 0 5px; + } +} + +@media screen and (min-width: 60em) { + .system-status-general-info__item-icon { + width: 55px; + height: 55px; + } + .system-status-general-info__item-icon:before { + background-size: 35px; + } + .system-status-general-info__item-icon--php:before { + background-size: 55px; + } + + .system-status-general-info__run-cron { + position: absolute; + top: 1em; + right: 1em; /* LTR */ + margin-top: 0; + } + [dir="rtl"] .system-status-general-info__run-cron { + left: 1em; + right: auto; + } +} + +@media screen and (max-width: 48em) { + .system-status-general-info__header { + display: none; + } + .system-status-general-info { + border-top: 0; + margin-top: 25px; + } +} diff --git a/core/themes/seven/css/components/system-status-report-counters.css b/core/themes/seven/css/components/system-status-report-counters.css new file mode 100644 index 0000000..a8e6db3 --- /dev/null +++ b/core/themes/seven/css/components/system-status-report-counters.css @@ -0,0 +1,26 @@ +/** + * @file + * Styles for the system status report counters. + */ + +.system-status-report-counters__item { + margin: 10px 0; + width: 100%; +} + +@media screen and (min-width: 60em) { + .system-status-report-counters__item { + margin-bottom: 20px; + } + .system-status-report-counters { + flex-wrap: wrap; + display: flex; + justify-content: space-between; + } + .system-status-report-counters__item--half-width { + width: 49%; + } + .system-status-report-counters__item--third-width { + width: 32%; + } +} diff --git a/core/themes/seven/css/components/system-status-report.css b/core/themes/seven/css/components/system-status-report.css index aeac1d3..e817feb 100644 --- a/core/themes/seven/css/components/system-status-report.css +++ b/core/themes/seven/css/components/system-status-report.css @@ -3,13 +3,139 @@ * Seven styles for the System Status Report. */ +.system-status-report__requirements-group { + padding-top: 20px; +} .system-status-report__entry { + border: 0; border-top: 1px solid #ccc; - border-bottom: inherit; -} -.system-status-report__entry:first-child { - border-top: 1px solid #bebfb9; + margin: 0; + width: 100%; + overflow: auto; } -.system-status-report__entry:last-child { +.system-status-report__entry:last-of-type { border-bottom: 1px solid #bebfb9; } +/* Account for native and poly-filled details element */ +.system-status-report__status-title { + position: relative; + padding: 1em 1em 1em 3em; /* LTR */ + box-sizing: border-box; + width: 100%; + font-weight: bold; +} +.system-status-report__status-title .details-title { + color: inherit; + text-transform: none; +} +html:not(.details) .system-status-report__status-title { + padding-left: 0; +} +.system-status-report__status-title .details-title { + padding-left: 3em; /* LTR */ +} +[dir="rtl"] .system-status-report__status-title .details-title { + padding-right: 3em; + padding-left: 0; +} +[dir="rtl"].details .system-status-report__status-title { + padding: 1em 3em 1em 1em; +} +.collapse-processed > .system-status-report__status-title:before { + float: right; /* LTR */ +} +.system-status-report__status-title::-webkit-details-marker { + float: right; /* LTR */ +} +[dir="rtl"] .collapse-processed > .system-status-report__status-title:before { + float: left; +} +[dir="rtl"] .system-status-report__status-title::-webkit-details-marker { + float: left; +} + +/* Make poly-filled details and summary elements behave correctly. */ +.system-status-report summary:first-child ~ * { + display: none; +} +.system-status-report details[open] > *, +.system-status-report details > summary:first-child { + display: block; +} + +.system-status-report__status-title .details-title:before, +.details .system-status-report__status-icon:before { + content: ""; + background-repeat: no-repeat; + background-size: contain; + background-position: top center; + height: 16px; + width: 16px; + position: absolute; + left: 10px; /* LTR */ + top: 1em; + display: inline-block; + vertical-align: top; + margin-right: 10px; /* LTR */ +} +[dir="rtl"] .system-status-report__status-title .details-title:before, +[dir="rtl"].details .system-status-report__status-title:before { + left: auto; + right: 10px; + margin-right: 0; +} +.system-status-report__status-icon--error .details-title:before, +.details .system-status-report__status-icon--error:before { + background-image: url(../../../stable/images/core/icons/e32700/error.svg); +} +.system-status-report__status-icon--warning .details-title:before, +.details .system-status-report__status-icon--warning:before { + background-image: url(../../../stable/images/core/icons/e29700/warning.svg); +} + +.system-status-report__entry__value { + box-sizing: border-box; + padding: 0 1em 1em 3em; /* LTR */ +} +[dir="rtl"] .system-status-report__entry__value { + padding-right: 3em; + padding-left: 1em; +} + +@media screen and (max-width: 48em) { + .system-status-report { + word-wrap: break-word; + } +} + +@media screen and (min-width: 48em) { + .system-status-report__entry::after { + display: table; + content: ''; + clear: both; + } + .system-status-report__status-title { + width: 18rem; + float: left; /* LTR */ + } + [dir="rtl"] .system-status-report__status-title { + float: right; + } + .collapse-processed > .system-status-report__status-title:before { + display: none; + } + .system-status-report__status-title::-webkit-details-marker { + display: none; + } + .system-status-report__entry__value { + width: calc(100% - 23em); + float: right; + display: block; + padding-left: 0; /* LTR */ + padding-top: 1em; + } + [dir="rtl"] .system-status-report__entry__value { + padding-left: 0; + padding-right: 3em; + } +} diff --git a/core/themes/seven/css/components/tables.css b/core/themes/seven/css/components/tables.css index 913e21a..4fbafba 100644 --- a/core/themes/seven/css/components/tables.css +++ b/core/themes/seven/css/components/tables.css @@ -39,15 +39,6 @@ tbody tr:focus { background: #f7fcff; } -/* See colors.css */ -tbody tr.color-warning:hover, -tbody tr.color-warning:focus { - background: #fdf8ed; -} -tbody tr.color-error:hover, -tbody tr.color-error:focus { - background: #fcf4f2; -} td, th { vertical-align: middle; diff --git a/core/themes/seven/css/theme/maintenance-page.css b/core/themes/seven/css/theme/maintenance-page.css index 3725ac6..bb29a22 100644 --- a/core/themes/seven/css/theme/maintenance-page.css +++ b/core/themes/seven/css/theme/maintenance-page.css @@ -2,6 +2,7 @@ * @file * Maintenance theming. */ + .maintenance-page { background-color: #e0e0d8; background-image: -webkit-radial-gradient(hsl(203, 2%, 90%), hsl(203, 2%, 95%)); @@ -51,7 +52,6 @@ .task-list { margin-left: 0; /* LTR */ list-style-type: none; - list-style-image: none; padding-left: 0; /* LTR */ padding-bottom: 1em; } @@ -142,7 +142,7 @@ } .layout-container { margin: 0 auto; - max-width: 770px; + min-height: 75%; width: 75%; border-radius: 5px; box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15); @@ -181,3 +181,21 @@ margin: 0.75em 1.9em; } } + +/** + * Status report customization for install and update page. + */ +.system-status-report__status-title { + float: none; + width: 100%; +} +.system-status-report__entry__value { + float: none; + width: 100%; + padding-left: 3em; /* LTR */ + padding-top: 0; +} +[dir="rtl"] .system-status-report__entry__value { + padding-left: 1em; + padding-right: 3em; +} diff --git a/core/themes/seven/images/icons/cccccc/clock.svg b/core/themes/seven/images/icons/cccccc/clock.svg new file mode 100644 index 0000000..e51d3e0 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/clock.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/themes/seven/images/icons/cccccc/d8-logo.svg b/core/themes/seven/images/icons/cccccc/d8-logo.svg new file mode 100644 index 0000000..035119b --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/d8-logo.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/database.svg b/core/themes/seven/images/icons/cccccc/database.svg new file mode 100644 index 0000000..3351212 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/database.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/php-logo.svg b/core/themes/seven/images/icons/cccccc/php-logo.svg new file mode 100644 index 0000000..b039d24 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/php-logo.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/core/themes/seven/images/icons/cccccc/server.svg b/core/themes/seven/images/icons/cccccc/server.svg new file mode 100644 index 0000000..1576b39 --- /dev/null +++ b/core/themes/seven/images/icons/cccccc/server.svg @@ -0,0 +1,3 @@ + + + diff --git a/core/themes/seven/js/responsive-details.js b/core/themes/seven/js/responsive-details.js new file mode 100644 index 0000000..587d124 --- /dev/null +++ b/core/themes/seven/js/responsive-details.js @@ -0,0 +1,49 @@ +/** + * @file + * Provides responsive behaviors to HTML details elements. + */ + +(function ($, Drupal) { + + 'use strict'; + + /** + * Initializes the responsive behaviors for details elements. + * + * @type {Drupal~behavior} + * + * @prop {Drupal~behaviorAttach} attach + * Attaches the responsive behavior to status report specific details elements. + */ + Drupal.behaviors.responsiveDetails = { + attach: function (context) { + $(context).find('details').once('responsive-details').each(init); + } + }; + + function init(i, detailElement) { + var mql = window.matchMedia('(min-width:48em)'); + mql.addListener(function() { + handleResize(mql, detailElement); + }); + handleResize(mql, detailElement); + + function handleResize(mql, detail) { + var $detail = $(detail); + if (mql.matches) { + $detail + .attr('open', true) + .children('summary') + .attr('aria-expanded', true); + } + else { + // If user explicitly opened one, leave it alone. + $detail.find('summary[aria-pressed!=true]') + .attr('aria-expanded', false) + .parent('details') + .attr('open', false); + } + } + } + +})(jQuery, Drupal); diff --git a/core/themes/seven/seven.libraries.yml b/core/themes/seven/seven.libraries.yml index e68b75a..968579b 100644 --- a/core/themes/seven/seven.libraries.yml +++ b/core/themes/seven/seven.libraries.yml @@ -27,7 +27,10 @@ global-styling: css/components/tables.css: {} css/components/search-admin-settings.css: {} css/components/tablesort-indicator.css: {} + css/components/system-status-general-info.css: {} css/components/system-status-report.css: {} + css/components/system-status-report-counters.css: {} + css/components/system-status-counter.css: {} css/components/tabs.css: {} css/components/views-ui.css: {} layout: @@ -74,6 +77,18 @@ drupal.nav-tabs: - core/drupal - core/jquery.once - core/drupal.debounce + - core/collapse + +drupal.responsive-detail: + version: VERSION + js: + js/responsive-details.js: {} + dependencies: + - core/matchmedia + - core/matchmedia.addListener + - core/jquery + - core/jquery.once + - core/collapse vertical-tabs: version: VERSION diff --git a/core/themes/seven/templates/status-report.html.twig b/core/themes/seven/templates/status-report.html.twig new file mode 100644 index 0000000..c5d6303 --- /dev/null +++ b/core/themes/seven/templates/status-report.html.twig @@ -0,0 +1,50 @@ +{# +/** + * @file + * Theme override to display status report. + * + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + */ +#} +{{ attach_library('core/drupal.collapse') }} +{{ attach_library('seven/drupal.responsive-detail') }} + +
          + {% for group in grouped_requirements %} +
          +

          {{ group.title }}

          + {% for requirement in group.items %} +
          + {% + set summary_classes = [ + 'system-status-report__status-title', + group.type in ['warning', 'error'] ? 'system-status-report__status-icon system-status-report__status-icon--' ~ group.type + ] + %} + + {% if requirement.severity_title %} + {{ requirement.severity_title }} + {% endif %} + {{ requirement.title }} + +
          + {{ requirement.value }} + {% if requirement.description %} +
          {{ requirement.description }}
          + {% endif %} +
          +
          + {% endfor %} +
          + {% endfor %} +
          diff --git a/core/themes/stable/stable.theme b/core/themes/stable/stable.theme index 456a4ad..b3b633d 100644 --- a/core/themes/stable/stable.theme +++ b/core/themes/stable/stable.theme @@ -6,6 +6,16 @@ */ use Drupal\Component\Utility\Html; +use Drupal\Core\Render\Element\StatusReport; + +/** + * Implements hook_theme_registry_alter(). + */ +function stable_theme_registry_alter(&$registry) { + if (isset($registry['status_report'])) { + $registry['status_report']['variables']['requirements'] = NULL; + } +} /** * Implements template_preprocess_links(). @@ -23,3 +33,53 @@ function stable_preprocess_links(&$variables) { } } } + +/** + * Prepares variables for status report template. + * + * Default template: status-report.html.twig. + * + * This theme function is dependent on install.inc being loaded, because + * that's where the constants are defined. + * + * @param $variables + * An associative array containing: + * - requirements: An array of requirements/status items. Each requirement + * is an associative array containing the following elements: + * - title: The name of the requirement. + * - value: (optional) The current value (version, time, level, etc). + * - description: (optional) The description of the requirement. + * - severity: (optional) The requirement's result/severity level, one of: + * - REQUIREMENT_INFO: Status information. + * - REQUIREMENT_OK: The requirement is satisfied. + * - REQUIREMENT_WARNING: The requirement failed with a warning. + * - REQUIREMENT_ERROR: The requirement failed with an error. + */ +function template_preprocess_status_report(&$variables) { + $severities = StatusReport::getSeverities(); + + if (empty($variables['requirements'])) { + $variables['requirements'] = []; + foreach ($variables['grouped_requirements'] as $group) { + $variables['requirements'] = array_merge($variables['requirements'], $group['items']); + } + } + + foreach ($variables['requirements'] as $i => $requirement) { + // Always use the explicit requirement severity, if defined. Otherwise, + // default to REQUIREMENT_OK in the installer to visually confirm that + // installation requirements are met. And default to REQUIREMENT_INFO to + // denote neutral information without special visualization. + if (isset($requirement['severity'])) { + $severity = $severities[(int) $requirement['severity']]; + } + elseif (defined('MAINTENANCE_MODE') && MAINTENANCE_MODE == 'install') { + $severity = $severities[REQUIREMENT_OK]; + } + else { + $severity = $severities[REQUIREMENT_INFO]; + } + $variables['requirements'][$i]['severity_title'] = $severity['title']; + $variables['requirements'][$i]['severity_status'] = $severity['status']; + } +} diff --git a/core/themes/stable/templates/admin/status-report-counter.html.twig b/core/themes/stable/templates/admin/status-report-counter.html.twig new file mode 100644 index 0000000..3ed6d84 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-counter.html.twig @@ -0,0 +1,18 @@ +{# +/** + * @file + * Theme override for status report counter. + * + * Available variables: + * - amount: The number shown on counter. + * - text: The text shown on counter. + * - severity: The severity of the counter. + * + * @ingroup themable + */ +#} + + {{ amount }} {{ text }} +
          + {{ text }} Details + diff --git a/core/themes/stable/templates/admin/status-report-general-info.html.twig b/core/themes/stable/templates/admin/status-report-general-info.html.twig new file mode 100644 index 0000000..841d0f1 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-general-info.html.twig @@ -0,0 +1,75 @@ +{# +/** + * @file + * Theme override for status report general info. + * + * Available variables: + * - drupal: The status of Drupal installation: + * - value: The current status of Drupal installation. + * - description: The description for current status of Drupal installation. + * - cron: The status of cron: + * - value: The current status of cron. + * - description: The description for current status of cron. + * - cron.run_cron: An array to render a button for running cron. + * - database_system: The status of database system: + * - value: The current status of database sytem. + * - description: The description for current status of cron. + * - database_system_version: The info about current database version: + * - value: The current version of database. + * - description: The description for current version of database. + * - php: The current version of PHP: + * - value: The status of currently installed PHP version. + * - description: The description for current installed PHP version. + * - php_memory_limit: The info about current PHP memory limit: + * - value: The status of currently set PHP memory limit. + * - description: The description for currently set PHP memory limit. + * - webserver: The info about currently installed web server: + * - value: The status of currently installed web server. + * - description: The description for the status of currently installed web + * server. + */ +#} +

          {{ 'General System Information'|t }}

          +
          +

          {{ 'Drupal Version'|t }}

          + {{ drupal.value }} + {{ drupal.description }} +
          + +
          +

          {{ 'Last Cron Run'|t }}

          + {{ cron.value }} + {{ cron.run_cron }} + {{ cron.description }} +
          +
          +

          {{ 'Web Server'|t }}

          + {{ webserver.value }} + {{ webserver.description }} +
          + +
          +

          {{ 'PHP'|t }}

          + {{ 'Version'|t }} +
          + {{ php.value }} + {{ php.description }} +
          + {{ 'Memory limit'|t }} +
          + {{ php_memory_limit.value }} + {{ php_memory_limit.description }} +
          + +
          +

          {{ 'Database'|t }}

          + {{ 'Version'|t }} +
          + {{ database_system_version.value }} + {{ database_system_version.description }} +
          + {{ 'System'|t }} +
          + {{ database_system.value }} + {{ database_system.description }} +
          diff --git a/core/themes/stable/templates/admin/status-report-page.html.twig b/core/themes/stable/templates/admin/status-report-page.html.twig new file mode 100644 index 0000000..c226036 --- /dev/null +++ b/core/themes/stable/templates/admin/status-report-page.html.twig @@ -0,0 +1,18 @@ +{# +/** + * @file + * Default theme implementation for the status report page. + * + * Available variables: + * - counters: The list of counter elements. + * - general_info: A render array to create general info element. + * - requirements: A render array to create requirements table. + * + * @ingroup themeable + */ +#} +{% for counter in counters %} + {{ counter }} +{% endfor %} +{{ general_info }} +{{ requirements }} diff --git a/core/themes/stable/templates/admin/status-report.html.twig b/core/themes/stable/templates/admin/status-report.html.twig index 7f4c600..95a085a 100644 --- a/core/themes/stable/templates/admin/status-report.html.twig +++ b/core/themes/stable/templates/admin/status-report.html.twig @@ -4,15 +4,20 @@ * Theme override for the status report. * * Available variables: - * - requirements: Contains multiple requirement instances. - * Each requirement contains: - * - title: The title of the requirement. - * - value: (optional) The requirement's status. - * - description: (optional) The requirement's description. - * - severity_title: The title of the severity. - * - severity_status: Indicates the severity status. + * - grouped_requirements: Contains grouped requirements. + * Each group contains: + * - title: The title of the group. + * - type: The severity of the group. + * - items: The requirement instances. + * Each requirement item contains: + * - title: The title of the requirement. + * - value: (optional) The requirement's status. + * - description: (optional) The requirement's description. + * - severity_title: The title of the severity. + * - severity_status: Indicates the severity status. + * - requirements: Contains list of requirements without grouping. * - * @see template_preprocess_status_report() + * @see stable_preprocess_status_report() */ #}