diff -r e271ae801c62 -r fcb2be1428e7 install/includes/stages/sysreqs.php --- a/install/includes/stages/sysreqs.php Tue Dec 01 00:27:26 2009 -0500 +++ b/install/includes/stages/sysreqs.php Tue Dec 01 00:35:04 2009 -0500 @@ -16,6 +16,8 @@ if ( !defined('IN_ENANO_INSTALL') ) die(); +require_once(ENANO_ROOT . '/install/includes/libenanoinstall.php'); + global $failed, $warned; $failed = false; @@ -127,20 +129,12 @@ if ( !$req_imagick ) $warnings[] = $lang->get('sysreqs_req_help_imagemagick'); -// Extension test: GMP -$req_gmp = function_exists('gmp_init'); -if ( !$req_gmp ) - $warnings[] = $lang->get('sysreqs_req_help_gmp'); +$crypto_backend = install_get_crypto_backend(); -// Extension test: Big_Int -$req_bigint = function_exists('bi_from_str'); -if ( !$req_bigint && !$req_gmp ) - $warnings[] = $lang->get('sysreqs_req_help_bigint'); - -// Extension test: BCMath -$req_bcmath = function_exists('bcadd'); -if ( !$req_bcmath && !$req_bigint && !$req_gmp ) - $warnings[] = $lang->get('sysreqs_req_help_bcmath'); +if ( $crypto_backend == 'none' ) + $warnings[] = $lang->get('sysreqs_req_help_crypto_none'); +else if ( $crypto_backend == 'bcmath' ) + $warnings[] = $lang->get('sysreqs_req_help_crypto_bcmath'); ?> @@ -265,6 +259,24 @@ + + get('sysreqs_req_crypto'); ?> + + ' . $lang->get("sysreqs_req_{$crypto_backend}") . ''; + } + else + { + echo '' . $lang->get("sysreqs_req_notfound") . ''; + } + ?> + + + + + get('sysreqs_heading_dbms'); ?> @@ -379,52 +391,6 @@ ?> - - get('sysreqs_heading_crypto'); ?> - - - - - get('sysreqs_req_gmp'); ?>
- get('sysreqs_req_hint_gmp'); ?> - - ' . $lang->get('sysreqs_req_supported') . ''; - else: - echo '' . $lang->get('sysreqs_req_notfound') . ''; - endif; - ?> - - - - - get('sysreqs_req_bigint'); ?>
- get('sysreqs_req_hint_bigint'); ?> - - ' . $lang->get('sysreqs_req_supported') . ''; - else: - echo '' . $lang->get('sysreqs_req_notfound') . ''; - endif; - ?> - - - - - get('sysreqs_req_bcmath'); ?>
- get('sysreqs_req_hint_bcmath'); ?> - - ' . $lang->get('sysreqs_req_supported') . ''; - else: - echo '' . $lang->get('sysreqs_req_notfound') . ''; - endif; - ?> - -