Index: branches/5.2.x/core/install/step_templates/sys_requirements.tpl =================================================================== diff -u -N -r15130 -r15165 --- branches/5.2.x/core/install/step_templates/sys_requirements.tpl (.../sys_requirements.tpl) (revision 15130) +++ branches/5.2.x/core/install/step_templates/sys_requirements.tpl (.../sys_requirements.tpl) (revision 15165) @@ -1,75 +1,75 @@ - - %s - '; - - $error_tpl = ' - - %s - %s - '; - - $check_titles = Array ( - 'php_version' => 'PHP version: 5.3.2+ (required)', - 'url_rewriting' => 'URL Rewriting Support (optional)', - 'java' => 'Java (optional)', - 'sep1' => 'PHP extensions:', - 'memcache' => '- Memcache (optional)', - 'curl' => '- Curl (required)', - 'simplexml' => '- SimpleXML (required)', - 'freetype' => '- Freetype (required)', - 'gd_version' => '- GD 1.8+ (required)', - 'jpeg' => '- jpeg (required)', - 'mysql' => '- MySQL (required)', - 'json' => '- JSON (required)', - 'sep2' => 'PHP settings:', - 'memory_limit' => "- ini_set('memory_limit', ...) works (optional)", - 'date.timezone' => "- ini_get('date.timezone') - timezone set (required)", - 'variables_order' => "- ini_get('variables_order') - contains \"GPC\" string", - 'output_buffering' => "- ini_get('output_buffering') > 0 - buffering works (required)", - ); - - $output = sprintf($heading_tpl, 'Server-side requirements'); - $check_results = $this->toolkit->CallPrerequisitesMethod('core/', 'CheckSystemRequirements'); - - /*$required_checks = Array ( - 'php_version', 'simplexml', 'curl', 'freetype', 'gd_version', - 'jpeg', 'mysql', 'date.timezone', 'output_buffering', - ); - - $required_checks = array_diff($required_checks, array_keys( array_filter($check_results) ));*/ - - foreach ($check_titles AS $key => $title) { - if ( substr($key, 0, 3) == 'sep' ) { - $check_result = ''; - } - else { - $check_result = $check_results[$key] ? '[PASSED]' : '[FAILED]'; - } - - $output .= sprintf($error_tpl, $title, $check_result); - } - - $output .= sprintf($heading_tpl, 'Client-side requirements', 'text'); - $output .= sprintf($error_tpl, 'Cookies enabled', '[FAILED]'); - $output .= sprintf($error_tpl, 'JavaScript enabled', '[FAILED]'); - - $output .= ''; - $output .= ''; - - $output .= ""; - - echo $output; -?> + + %s + '; + + $error_tpl = ' + + %s + %s + '; + + $check_titles = Array ( + 'php_version' => 'PHP version: 5.3.2+ (required)', + 'url_rewriting' => 'URL Rewriting Support (optional)', + 'java' => 'Java (optional)', + 'sep1' => 'PHP extensions:', + 'memcache' => '- Memcache (optional)', + 'curl' => '- Curl (required)', + 'simplexml' => '- SimpleXML (required)', + 'freetype' => '- Freetype (required)', + 'gd_version' => '- GD 1.8+ (required)', + 'jpeg' => '- jpeg (required)', + 'mysql' => '- MySQL (required)', + 'json' => '- JSON (required)', + 'sep2' => 'PHP settings:', + 'memory_limit' => "- ini_set('memory_limit', ...) works (optional)", + 'date.timezone' => "- ini_get('date.timezone') - timezone set (required)", + 'variables_order' => "- ini_get('variables_order') - contains \"GPC\" string", + 'output_buffering' => "- ini_get('output_buffering') > 0 - buffering works (required)", + ); + + $output = sprintf($heading_tpl, 'Server-side requirements'); + $check_results = $this->toolkit->CallPrerequisitesMethod('core/', 'CheckSystemRequirements'); + + /*$required_checks = Array ( + 'php_version', 'simplexml', 'curl', 'freetype', 'gd_version', + 'jpeg', 'mysql', 'date.timezone', 'output_buffering', + ); + + $required_checks = array_diff($required_checks, array_keys( array_filter($check_results) ));*/ + + foreach ($check_titles AS $key => $title) { + if ( substr($key, 0, 3) == 'sep' ) { + $check_result = ''; + } + else { + $check_result = $check_results[$key] ? '[PASSED]' : '[FAILED]'; + } + + $output .= sprintf($error_tpl, $title, $check_result); + } + + $output .= sprintf($heading_tpl, 'Client-side requirements', 'text'); + $output .= sprintf($error_tpl, 'Cookies enabled', '[FAILED]'); + $output .= sprintf($error_tpl, 'JavaScript enabled', '[FAILED]'); + + $output .= ''; + $output .= ''; + + $output .= ""; + + echo $output; +?>