From 9d3560d65b72148889922cf215e6afc653e4532d Mon Sep 17 00:00:00 2001 From: chschy Date: Fri, 30 Sep 2011 05:32:33 +0000 Subject: [PATCH] issue 228, Add configuration option git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9444 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.admin.view.php | 2 ++ modules/admin/lang/lang.xml | 13 +++++++--- modules/admin/tpl/config.html | 38 ++++++++++++++++++++++++------ modules/install/lang/lang.xml | 14 ++++++++++- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 91192860d..a295e3422 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -335,6 +335,8 @@ * @return none **/ function dispAdminConfig() { + Context::loadLang('modules/install/lang'); + $db_info = Context::getDBInfo(); Context::set('sftp_support', function_exists(ssh2_sftp)); diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml index 65edf49f3..2aa12dc13 100644 --- a/modules/admin/lang/lang.xml +++ b/modules/admin/lang/lang.xml @@ -575,6 +575,10 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> + + + + @@ -626,9 +630,12 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]> - - - + 선택적으로 - 회원가입, 정보수정 등의 지정된 action에서 SSL을 사용합니다.
+항상 사용 - 모든 서비스에 SSL을 사용 합니다.]]> + Optional - Use SSL for the specified actions such as signing up and changing information.
+Always - Use SSL for all services.]]> + 部分的に使う場合 - 「会員登録/会員情報変更」など特定のactionでSSLを利用する場合。
+常に使う - 全てのサービスがSSLを使う場合に選択します。]]> 選擇開啟時，所有的服務都會使用 SSL功能。]]> diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html index 1be9710f3..0250192f6 100644 --- a/modules/admin/tpl/config.html +++ b/modules/admin/tpl/config.html @@ -17,6 +17,7 @@ jQuery(function($){ }); +
@@ -25,7 +26,6 @@ jQuery(function($){

{$lang->subtitle_primary}

    -

  • {$lang->about_start_module}

    @@ -62,6 +62,16 @@ jQuery(function($){

    • +
  • +

    +

    + +

    +

  • @@ -173,12 +183,17 @@ jQuery(function($){ {$lang->local_ip_address} : {$IP}

  • -

    +

    [?]

    +
    +

    {$lang->about_default_url}

    +

    -

    {$lang->about_default_url}

  • -

    {$lang->use_ssl}

    +

    [?]

    +
    +

    {$lang->about_use_ssl}

    +

    checked="checked" /> @@ -208,21 +223,30 @@ jQuery(function($){

  • -

    {$lang->about_use_sso}

    +

    [?]

    +
    +

    {$lang->about_sso}

    +

    checked="checked" /> checked="checked" />

  • -

    {$lang->use_db_session}

    +

    [?]

    +
    +

    {$lang->about_db_session}

    +

    checked="checked" /> checked="checked" />

  • -

    {$lang->qmail_compatibility}

    +

    [?]

    +
    +

    {$lang->about_qmail_compatibility}

    +

    checked="checked" /> checked="checked" /> diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml index cdb6e6c55..531603eb3 100644 --- a/modules/install/lang/lang.xml +++ b/modules/install/lang/lang.xml @@ -730,6 +730,18 @@ Veri dosyası 707 yetki kapsamı içinde olmalıdır.]]> Hãy CHMOD thành 707.]]> + + 가상 사이트를 사용할 때만 필요합니다.]]> + You will need this only if you are using virtual sites.]]> + 仮想サイトの機能を使用してない場合、設定する必要がありません。]]> + You will need this only if you are using virtual sites.]]> + 使用虛擬網站，這將會是很重要的功能。]]> + You will need this only if you are using virtual sites.]]> + You will need this only if you are using virtual sites.]]> + You will need this only if you are using virtual sites.]]> + Bu, size sadece sanal websiteler kullandığınız durumda lazım olacaktır.]]> + You will need this only if you are using virtual sites.]]> + @@ -877,4 +889,4 @@ Xin cảm ơn đã sử dụng XE!]]> - \ No newline at end of file +