Issue 2452: [Admin UI Refactoring] Content > General

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11592 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2012-10-04 09:08:39 +00:00
parent a89669b465
commit 30a61a0cb9
5 changed files with 262 additions and 175 deletions

View file

@ -46,35 +46,6 @@
* @brief Change settings
**/
function procInstallAdminSaveTimeZone() {
$use_rewrite = Context::get('use_rewrite');
if($use_rewrite!='Y') $use_rewrite = 'N';
$use_sso = Context::get('use_sso');
if($use_sso !='Y') $use_sso = 'N';
$use_cdn = Context::get('use_cdn');
if($use_cdn != 'Y') $use_cdn = 'N';
$time_zone = Context::get('time_zone');
$qmail_compatibility = Context::get('qmail_compatibility');
if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
$use_db_session = Context::get('use_db_session');
if($use_db_session!='Y') $use_db_session = 'N';
$use_ssl = Context::get('use_ssl');
if(!$use_ssl) $use_ssl = 'none';
$use_html5 = Context::get('use_html5');
if(!$use_html5) $use_html5 = 'N';
$http_port = Context::get('http_port');
$https_port = Context::get('https_port');
$use_mobile_view = Context::get('use_mobile_view');
if($use_mobile_view!='Y') $use_mobile_view = 'N';
$admin_ip_list = Context::get('admin_ip_list');
$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
@ -84,18 +55,42 @@
$admin_ip_list = '';
}
$default_url = Context::get('default_url');
if($default_url && !preg_match('/^(http|https):\/\//i', $default_url)) $default_url = 'http://'.$default_url;
$use_ssl = Context::get('use_ssl');
if(!$use_ssl) $use_ssl = 'none';
$http_port = Context::get('http_port');
$https_port = Context::get('https_port');
$use_cdn = Context::get('use_cdn');
if($use_cdn != 'Y') $use_cdn = 'N';
$use_rewrite = Context::get('use_rewrite');
if($use_rewrite!='Y') $use_rewrite = 'N';
$use_sso = Context::get('use_sso');
if($use_sso !='Y') $use_sso = 'N';
$use_db_session = Context::get('use_db_session');
if($use_db_session!='Y') $use_db_session = 'N';
$qmail_compatibility = Context::get('qmail_compatibility');
if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
$use_html5 = Context::get('use_html5');
if(!$use_html5) $use_html5 = 'N';
$db_info = Context::getDBInfo();
$db_info->default_url = Context::get('default_url');
if($db_info->default_url && !preg_match('/^(http|https):\/\//i', $db_info->default_url)) $db_info->default_url = 'http://'.$db_info->default_url;
$db_info->time_zone = $time_zone;
$db_info->qmail_compatibility = $qmail_compatibility;
$db_info->use_db_session = $use_db_session;
$db_info->default_url = $default_url;
$db_info->qmail_compatibility = $qmail_compatibility;
$db_info->use_db_session = $use_db_session;
$db_info->use_rewrite = $use_rewrite;
$db_info->use_sso = $use_sso;
$db_info->use_ssl = $use_ssl;
$db_info->use_cdn = $use_cdn;
$db_info->use_html5 = $use_html5;
$db_info->use_mobile_view = $use_mobile_view;
$db_info->admin_ip_list = $admin_ip_list;
if($http_port) $db_info->http_port = (int) $http_port;
@ -105,19 +100,20 @@
else if($db_info->https_port) unset($db_info->https_port);
unset($db_info->lang_type);
Context::setDBInfo($db_info);
$oInstallController = &getController('install');
$oInstallController->makeConfigFile();
$site_args->site_srl = 0;
$site_args->index_module_srl = Context::get('index_module_srl');
$site_args->default_language = Context::get('change_lang_type');
$site_args->domain = $db_info->default_url;
$oModuleController = &getController('module');
$oModuleController->updateSite($site_args);
$this->setMessage('success_updated');
if($default_url)
{
$site_args->site_srl = 0;
$site_args->domain = $default_url;
$oModuleController = &getController('module');
$oModuleController->updateSite($site_args);
}
$this->setRedirectUrl(Context::get('error_return_url'));
}
function procInstallAdminUpdateIndexModule()
@ -175,7 +171,23 @@
}
function procInstallAdminConfig(){
$this->procInstallAdminSaveTimeZone();
$use_mobile_view = Context::get('use_mobile_view');
if($use_mobile_view!='Y') $use_mobile_view = 'N';
$time_zone = Context::get('time_zone');
$db_info = Context::getDBInfo();
$db_info->use_mobile_view = $use_mobile_view;
$db_info->time_zone = $time_zone;
unset($db_info->lang_type);
Context::setDBInfo($db_info);
$site_args->site_srl = 0;
$site_args->index_module_srl = Context::get('index_module_srl');//
$site_args->default_language = Context::get('change_lang_type');//
$oModuleController = &getController('module');
$oModuleController->updateSite($site_args);
//언어 선택
$selected_lang = Context::get('selected_lang');

View file

@ -722,18 +722,6 @@
<value xml:lang="tr"><![CDATA[Sqlite veriyi dosyaya kaydeder. Veritabanı dosyası tarayıcıyla erişilebilir olmamalıdır.<br/><span style="color:red">Veri dosyası 707 yetki kapsamı içinde olmalıdır.</span>]]></value>
<value xml:lang="vi"><![CDATA[Sqlite lưu trữ dữ liệu trong một File, vì vậy cần tới sự truy cập đến nó trong Database. <br/><span style="color:red">Hãy CHMOD thành 707.</span>]]></value>
</item>
<item name="about_sso">
<value xml:lang="ko"><![CDATA[사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 됩니다.<br />가상 사이트를 사용할 때만 필요합니다.]]></value>
<value xml:lang="en"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
<value xml:lang="jp"><![CDATA[ユーザが一度のログインで基本サイトと仮想サイトに同時にログインされる機能です。<br />仮想サイトの機能を使用してない場合、設定する必要がありません。]]></value>
<value xml:lang="zh-CN"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
<value xml:lang="zh-TW"><![CDATA[此功能可讓用戶只需登入一次即可訪問多個網站。<br />使用虛擬網站,這將會是很重要的功能。]]></value>
<value xml:lang="fr"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
<value xml:lang="ru"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
<value xml:lang="es"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
<value xml:lang="tr"><![CDATA[SSO kullanıcıları, geçreli ya da sanal siteye bir kere kayıt olmakla, ikisinden de yararlandıracaktır.<br />Bu, size sadece sanal websiteler kullandığınız durumda lazım olacaktır.]]></value>
<value xml:lang="vi"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
</item>
<item name="success_installed">
<value xml:lang="ko"><![CDATA[설치가 되었습니다.]]></value>
<value xml:lang="en"><![CDATA[Installation has been completed.]]></value>