diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 6fb6d6861..6274ae340 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -339,39 +339,88 @@ class installController extends install { // Check each item $checklist = array(); - // 0. check your version of php (5.2.4 or higher) + + // 0. Check PHP version $checklist['php_version'] = true; if(version_compare(PHP_VERSION, __XE_MIN_PHP_VERSION__, '<')) { $checklist['php_version'] = false; } - if(version_compare(PHP_VERSION, __XE_RECOMMEND_PHP_VERSION__, '<')) { Context::set('phpversion_warning', true); } // 1. Check permission - if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true; - else $checklist['permission'] = false; - // 2. Check if xml_parser_create exists - if(function_exists('xml_parser_create')) $checklist['xml'] = true; - else $checklist['xml'] = false; - // 3. Check if ini_get (session.auto_start) == 1 - if(ini_get('session.auto_start')!=1) $checklist['session'] = true; - else $checklist['session'] = false; - // 4. Check if iconv exists - if(function_exists('iconv')) $checklist['iconv'] = true; - else $checklist['iconv'] = false; - // 5. Check gd(imagecreatefromgif function) - if(function_exists('imagecreatefromgif')) $checklist['gd'] = true; - else $checklist['gd'] = false; - // 6. Check DB - if(DB::getEnableList()) $checklist['db'] = true; - else $checklist['db'] = false; + if(is_writable('./')||is_writable('./files')) + { + $checklist['permission'] = true; + } + else + { + $checklist['permission'] = false; + } - if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false; - else $install_enable = true; + // 2. Check if ini_get (session.auto_start) == 1 + if(ini_get('session.auto_start') != 1) + { + $checklist['session'] = true; + } + else + { + $checklist['session'] = false; + } + + // 3. Check if xml_parser_create exists + if(function_exists('xml_parser_create')) + { + $checklist['xml'] = true; + } + else + { + $checklist['xml'] = false; + } + + // 4. Check if iconv exists + if(function_exists('iconv')) + { + $checklist['iconv'] = true; + } + else + { + $checklist['iconv'] = false; + } + + // 5. Check GD + if(function_exists('imagecreatefromgif')) + { + $checklist['gd'] = true; + } + else + { + $checklist['gd'] = false; + } + + // 6. Check DB + if(DB::getEnableList()) + { + $checklist['db'] = true; + } + else + { + $checklist['db'] = false; + } + + // Enable install if all conditions are met + $install_enable = true; + foreach($checklist as $k => $v) + { + if (!$v) + { + $install_enable = false; + break; + } + } // Save the checked result to the Context Context::set('checklist', $checklist); diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml index 830611f17..88cad44cf 100644 --- a/modules/install/lang/lang.xml +++ b/modules/install/lang/lang.xml @@ -86,6 +86,11 @@ + + + + + @@ -641,13 +646,13 @@ - + - - модуль перезаписи
(rewrite mod)]]> - + + модуль перезаписи
(mod_rewrite)]]> + @@ -664,21 +669,21 @@ SSO]]> - http://yourdomain/?document_srl=123 과 같이 복잡한 주소를 http://yourdomain/123 과 같이 간단하게 줄일 수 있습니다. 웹 서버에서 rewrite_mod를 지원해야 합니다. 지원 여부는 서버 관리자에게 문의하세요.]]> - http://blah/?document_srl=123 can be shortened like http://blah/123]]> + http://yourdomain/?document_srl=123 과 같이 복잡한 주소를 http://yourdomain/123 과 같이 간단하게 줄일 수 있습니다. 웹 서버에서 mod_rewrite를 지원해야 합니다. 지원 여부는 서버 관리자에게 문의하세요.]]> + http://blah/?document_srl=123 can be shortened like http://blah/123]]> 例如，http://域名/?document_srl=123简化为http://域名/123。]]> 例>『http://域名/?document_srl=123』縮短成『http://域名/123』。]]> - - + + http://blah/?document_srl=123 sẽ được rút ngắn thành http://blah/123]]> - rewrite_mod지원 여부를 확인 바랍니다.]]> - rewrite_mod module support.]]> - rewrite_modサポート可否を確認してください。]]> + mod_rewrite 지원 여부를 확인 바랍니다.]]> + mod_rewrite module support.]]> + mod_rewriteサポート可否を確認してください。]]> 여기를 참고하세요.]]> diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html index cfae17bcd..3ddbd2537 100644 --- a/modules/install/tpl/check_env.html +++ b/modules/install/tpl/check_env.html @@ -2,39 +2,31 @@
-
    -
  • - {@ $isDisable = TRUE} - {$lang->install_checklist_title[$key]}(Ver. {$phpversion}) +

    + + XE {__XE_VERSION__} {$lang->install_condition_enable} +

    +

    + + XE {__XE_VERSION__} {$lang->install_condition_disable} +

    +
      +
    • + {$lang->install_checklist_title[$key]} : - {$lang->disable} -

      {sprintf($lang->install_checklist_desc[$key], __XE_MIN_PHP_VERSION__)}

      + {$lang->enable} ({$phpversion}) + {$lang->disable} ({$phpversion})

      {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}]

    -
    -

    - - XE {__XE_VERSION__} {$lang->install_condition_enable} -

    -
      -
    • - {$lang->install_checklist_title[$key]}(Ver. {$phpversion}) - : - {$lang->enable} -

      - {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}] -

      -
      • -
    -
    +

    - + {$lang->disable_rewrite} -
    {$lang->about_nginx_rewrite}     + {$lang->about_nginx_rewrite}

    diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css index 99943a49d..33726d8c3 100644 --- a/modules/install/tpl/css/install.css +++ b/modules/install/tpl/css/install.css @@ -7,6 +7,8 @@ body{background:-webkit-linear-gradient(top,#ccc,#fff);background:-moz-linear-gr img, fieldset{border:0} form, fieldset{margin:0;padding:0} .x em{color:#ffc;font-weight:normal;font-style:normal} +.x em.ok{color:#0f0;font-weight:normal;font-style:normal} +.x em.error{color:#f44;font-weight:normal;font-style:normal} .x strong{color:#f60} .x button{margin:0;padding:0;overflow:visible;cursor:pointer} .x a{text-decoration:none}