diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index f015dd436..3e3e5c002 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -154,8 +154,10 @@ $db_config_file = $this->getConfigFile(); if(file_exists($db_config_file)) @include($db_config_file); - $this->_setDBInfo($db_info); + if(!$db_info->time_zone) $db_info->time_zone = date("O"); + $this->_setDBInfo($db_info); + $GLOBALS['_time_zone'] = $db_info->time_zone; } diff --git a/config/func.inc.php b/config/func.inc.php index 0e07da690..527455941 100644 --- a/config/func.inc.php +++ b/config/func.inc.php @@ -17,21 +17,21 @@ } $time_zone = array( - '-1200' => '[GMT +12:00] Baker Island Time', - '-1100' => '[GMT +11:00] Niue Time, Samoa Standard Time', - '-1000' => '[GMT +10:00] Hawaii-Aleutian Standard Time, Cook Island Time', - '-0930' => '[GMT +09:30] Marquesas Islands Time', - '-0900' => '[GMT +09:00] Alaska Standard Time, Gambier Island Time', - '-0800' => '[GMT +08:00] Pacific Standard Time', - '-0700' => '[GMT +07:00] Mountain Standard Time', - '-0600' => '[GMT +06:00] Central Standard Time', - '-0500' => '[GMT +05:00] Eastern Standard Time', - '-0400' => '[GMT +04:00] Atlantic Standard Time', - '-0330' => '[GMT +03:30] Newfoundland Standard Time', - '-0300' => '[GMT +03:00] Amazon Standard Time, Central Greenland Time', - '-0200' => '[GMT +02:00] Fernando de Noronha Time, South Georgia & the South Sandwich Islands Time', - '-0100' => '[GMT +01:00] Azores Standard Time, Cape Verde Time, Eastern Greenland Time', - '0000' => '[GMT +00:00] Western European Time, Greenwich Mean Time', + '-1200' => '[GMT -12:00] Baker Island Time', + '-1100' => '[GMT -11:00] Niue Time, Samoa Standard Time', + '-1000' => '[GMT -10:00] Hawaii-Aleutian Standard Time, Cook Island Time', + '-0930' => '[GMT -09:30] Marquesas Islands Time', + '-0900' => '[GMT -09:00] Alaska Standard Time, Gambier Island Time', + '-0800' => '[GMT -08:00] Pacific Standard Time', + '-0700' => '[GMT -07:00] Mountain Standard Time', + '-0600' => '[GMT -06:00] Central Standard Time', + '-0500' => '[GMT -05:00] Eastern Standard Time', + '-0400' => '[GMT -04:00] Atlantic Standard Time', + '-0330' => '[GMT -03:30] Newfoundland Standard Time', + '-0300' => '[GMT -03:00] Amazon Standard Time, Central Greenland Time', + '-0200' => '[GMT -02:00] Fernando de Noronha Time, South Georgia & the South Sandwich Islands Time', + '-0100' => '[GMT -01:00] Azores Standard Time, Cape Verde Time, Eastern Greenland Time', + '0000' => '[GMT 00:00] Western European Time, Greenwich Mean Time', '+0100' => '[GMT +01:00] Central European Time, West African Time', '+0200' => '[GMT +02:00] Eastern European Time, Central African Time', '+0300' => '[GMT +03:00] Moscow Standard Time, Eastern African Time', diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php index 427258b50..fd3b5ed5b 100644 --- a/modules/admin/admin.admin.view.php +++ b/modules/admin/admin.admin.view.php @@ -33,6 +33,9 @@ $running_module = strtolower(preg_replace('/([a-z]+)([A-Z]+)([a-z]+)(.*)/', '\\2\\3', $this->act)); Context::set('running_module', $running_module); + Context::set('time_zone_list', $GLOBALS['time_zone']); + Context::set('time_zone', $GLOBALS['_time_zone']); + Context::setBrowserTitle("ZeroboardXE Admin Page"); } diff --git a/modules/admin/lang/en.lang.php b/modules/admin/lang/en.lang.php index 1977aab7b..a66694ea4 100644 --- a/modules/admin/lang/en.lang.php +++ b/modules/admin/lang/en.lang.php @@ -31,7 +31,8 @@ $lang->xe_user_links = array( 'Official website' => 'http://www.zeroboard.com', - 'Close Beta website' => 'http://spring.zeroboard.com', + //'Close Beta website' => 'http://spring.zeroboard.com', + 'Developer\'s forum' => 'http://spring.zeroboard.com', //'Module morgue' => 'http://www.zeroboard.com', //'Addon morgue' => 'http://www.zeroboard.com', //'Widget morgue' => 'http://www.zeroboard.com', @@ -41,7 +42,6 @@ ); $lang->xe_developer_links = array( - //'Developer\'s forum' => 'http://dev.zeroboard.com', //'Manual' => 'http://www.zeroboard.com/wiki/manual', 'Issue Tracking' => 'http://trac.zeroboard.com', 'SVN Repository' => 'http://svn.zeroboard.com', diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php index c4708dd68..9e8c4286f 100644 --- a/modules/admin/lang/es.lang.php +++ b/modules/admin/lang/es.lang.php @@ -31,7 +31,8 @@ $lang->xe_user_links = array( 'Pagina de web oficial' => 'http://www.zeroboard.com', - 'Sitio para beta cerrado' => 'http://spring.zeroboard.com', + //'Sitio para beta cerrado' => 'http://spring.zeroboard.com', + 'Foro Abierto de desarrolladores' => 'http://spring.zeroboard.com', //'Depósitorio de Módulos´ => 'http://www.zeroboard.com', //'Depósitorio de Adiciónales' => 'http://www.zeroboard.com', //'Depósitorio de Widgets' => 'http://www.zeroboard.com', @@ -41,7 +42,6 @@ ); $lang->xe_developer_links = array( - //'Foro Abierto de desarrolladores' => 'http://dev.zeroboard.com', //'Manuales' => 'http://www.zeroboard.com/wiki/manual', 'Huellas de distribuciónes' => 'http://trac.zeroboard.com', 'Repositor de SVN' => 'http://svn.zeroboard.com', diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php index 81215da9e..cc22fa775 100644 --- a/modules/admin/lang/ko.lang.php +++ b/modules/admin/lang/ko.lang.php @@ -31,7 +31,8 @@ $lang->xe_user_links = array( '공식홈페이지' => 'http://www.zeroboard.com', - '클로즈베타 사이트' => 'http://spring.zeroboard.com', + '개발자 포럼' => 'http://spring.zeroboard.com', + //'클로즈베타 사이트' => 'http://spring.zeroboard.com', //'모듈 자료실' => 'http://www.zeroboard.com', //'애드온 자료실' => 'http://www.zeroboard.com', //'위젯 자료실' => 'http://www.zeroboard.com', @@ -41,7 +42,6 @@ ); $lang->xe_developer_links = array( - //'개발자 포럼' => 'http://dev.zeroboard.com', //'매뉴얼' => 'http://www.zeroboard.com/wiki/manual', '이슈트래킹' => 'http://trac.zeroboard.com', 'SVN Repository' => 'http://svn.zeroboard.com', diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php index 16d292d2b..07b1537e0 100644 --- a/modules/admin/lang/zh-CN.lang.php +++ b/modules/admin/lang/zh-CN.lang.php @@ -31,7 +31,8 @@ $lang->xe_user_links = array( '韩国官方主页' => 'http://www.zeroboard.com', - 'closebeta主页' => 'http://spring.zeroboard.com', + //'closebeta主页' => 'http://spring.zeroboard.com', + 'Developer 论坛' => 'http://spring.zeroboard.com', //'模块下载地址' => 'http://www.zeroboard.com', //'Add-On下载地址' => 'http://www.zeroboard.com', //'Widget下载地址' => 'http://www.zeroboard.com', @@ -41,7 +42,6 @@ ); $lang->xe_developer_links = array( - //'Developer 论坛' => 'http://dev.zeroboard.com', //'使用手册' => 'http://www.zeroboard.com/wiki/manual', 'Issue Tracking' => 'http://trac.zeroboard.com', 'SVN Repository' => 'http://svn.zeroboard.com', diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index 9e062f3ad..a80001eb3 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -46,6 +46,8 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .header4 table.summary th .vr { color:#a3a39f; margin:0 4px; font-weight:normal;} .header4 table.summary td { border-top:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2; font:.9em Tahoma; padding-left:17px;} +select.time_zone { width:70%; position:relative; top:4px; } + /* ----- cBody | End ----- */ /* ----- Content | Start ----- */ @@ -71,6 +73,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: /* tableStyle */ .infoText { clear:both; border:1px solid #f2f2f0; margin-bottom:12px; background:#f9f9f6; padding:1.2em; color:#7b7972; font-size:.9em; line-height:1.4em;} + .gap1 { margin-top:.8em; } .tableSummaryType1 { font:bold .8em Tahoma; color:#a0a0a0; margin-bottom:10px;} .tableSummaryType1 strong { font:bold 1em Tahoma; color:#ff1a00;} @@ -102,6 +105,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .tableType2 td a.red { color:#c95b53;} .tableType3 { width:100%; border-bottom:2px solid #c1c0bd;} +.tableType3 th.bold { font-weight:bold; } .tableType3 th, .tableType3 td { border-top:1px solid #bfbfbf;} .tableType3 thead th { font-weight:normal; color:#ffffff; background:url(../images/tableType1Header.gif) repeat-x; height:28px;} @@ -120,7 +124,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .tableType3 td.red a { color:#c95b53;} .tableType3 td a.blue { color:#158692;} .tableType3 td a.red { color:#c95b53;} -.tableType3 td input, +/*.tableType3 td input,*/ .tableType3 td textarea, .tableType3 td select { margin-bottom:.5em; vertical-align:middle; font-size:1em; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;} .tableType3 td .w100 { width:100%; display:block;} @@ -135,7 +139,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: .tableType4 .tahoma a { font-size:1em;} .tableType4 td.blue a { color:#158692;} .tableType4 td.red a { color:#c95b53;} -.tableType4 td input, +/*.tableType4 td input,*/ .tableType4 td textarea, .tableType4 td select { margin-bottom:.5em; vertical-align:middle;font-size:1em; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;} .tableType4 td label { margin-right:1em; } @@ -165,7 +169,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background: #popBody .tableType5 { border:1px solid #c1c0bd; border-left:none; border-right:none; width:100%;} #popBody .tableType5 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:8px 10px 7px 2em; font-weight:normal; text-align:left; color:#606060;} #popBody .tableType5 td { border-bottom:1px solid #ededed; padding:8px 10px 7px 10px; color:#7b7972;} -#popBody .tableType5 td input, +/*#popBody .tableType5 td input,*/ #popBody .tableType5 td textarea, #popBody .tableType5 td select { margin-bottom:.5em; vertical-align:middle;} #popBody .tableType5 td .w100 { width:100%; display:block;} diff --git a/modules/admin/tpl/css/admin_layout.css b/modules/admin/tpl/css/admin_layout.css index 93678ac3c..85b5f8cd8 100644 --- a/modules/admin/tpl/css/admin_layout.css +++ b/modules/admin/tpl/css/admin_layout.css @@ -48,7 +48,6 @@ address { font-style:normal;} #gNavigation ul li a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:-2px; font-weight:bold; color:#ffffff; text-decoration:none;} #gNavigation ul li.on a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:0; font-weight:bold; color:#ffffff; text-decoration:none;} #gNavigation .menuEdit { width:180px; height:30px; text-align:center; margin-top:1em;} -#gNavigation .selLangType { width:180px; height:30px; text-align:center; margin-top:1em;} #content { float:left; width:100%; padding:71px 0 100px 0;} diff --git a/modules/admin/tpl/filter/save_time_zone.xml b/modules/admin/tpl/filter/save_time_zone.xml new file mode 100644 index 000000000..f60dbae84 --- /dev/null +++ b/modules/admin/tpl/filter/save_time_zone.xml @@ -0,0 +1,9 @@ + +
+ + + + + + +
 diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html index 81f24c05c..7fd67e65a 100644 --- a/modules/admin/tpl/index.html +++ b/modules/admin/tpl/index.html @@ -1,32 +1,60 @@ + +

{$lang->welcome_to_zeroboard_xe}

-
{nl2br($lang->about_admin_page)}
- - - - - - - - - - - - - -
{$lang->zeroboard_xe_user_links}
{$key}{$val}
+
+ +++ + + + + + + + +
Lang + +
Time zone + + +
+
- - - - - - - - - - - - - -
{$lang->zeroboard_xe_developer_links}
{$key}{$val}
+ + +++ + + + + + + + + + + + + + + + + + + + +
{$lang->zeroboard_xe_user_links}
{$key}{$val}
{$lang->zeroboard_xe_developer_links}
{$key}{$val}
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html index 43fa30788..57288c872 100644 --- a/modules/admin/tpl/layout.html +++ b/modules/admin/tpl/layout.html @@ -20,16 +20,6 @@
{$lang->cmd_shortcut_management}
-
- Lang : -
{$content}
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml index f5bf43ad0..79af23682 100644 --- a/modules/install/conf/module.xml +++ b/modules/install/conf/module.xml @@ -9,5 +9,6 @@ + diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php index e92d9d957..7288704ff 100644 --- a/modules/install/install.admin.controller.php +++ b/modules/install/install.admin.controller.php @@ -27,5 +27,20 @@ $this->setMessage('success_installed'); } + /** + * @brief time zone변경 + **/ + function procInstallAdminSaveTimeZone() { + $time_zone = Context::get('time_zone'); + + $db_info = Context::getDBInfo(); + $db_info->time_zone = $time_zone; + Context::setDBInfo($db_info); + + $oInstallController = &getController('install'); + $oInstallController->makeConfigFile(); + + $this->setMessage('success_updated'); + } } ?> diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index fa9ea0b57..739ad7aaa 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -170,7 +170,7 @@ **/ function makeConfigFile() { $config_file = Context::getConfigFile(); - if(file_exists($config_file)) return; + //if(file_exists($config_file)) return; $db_info = Context::getDbInfo(); if(!$db_info) return; diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php index cb5efb1bc..8bcf3750c 100644 --- a/modules/install/lang/ko.lang.php +++ b/modules/install/lang/ko.lang.php @@ -256,8 +256,8 @@ EndOfLicense; $lang->env_title = '환경 설정'; $lang->use_rewrite = 'rewrite mod 사용'; $lang->about_rewrite = '웹서버에서 rewrite mod를 지원하면 http://주소/?document_srl=123 같이 복잡한 주소를 http://주소/123과 같이 간단하게 줄일 수 있습니다.'; - $lang->time_zone = 'time zone'; + $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 time zone을 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다'; $lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다
데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.'; diff --git a/modules/install/tpl/form.install.html b/modules/install/tpl/form.install.html index 4691a87e6..3692128b6 100644 --- a/modules/install/tpl/form.install.html +++ b/modules/install/tpl/form.install.html @@ -42,5 +42,6 @@ +

{$lang->about_time_zone}