diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 4ec3a45e9..f70048522 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -191,11 +191,12 @@
/**
* @brief mysql old password를 가져오는 함수 (mysql에서만 사용)
**/
- function getOldPassword($password) {
- $query = sprintf("select old_password('%s') as password", $password);
+ function isValidOldPassword($password, $saved_password) {
+ $query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
$result = $this->_query($query);
$tmp = $this->_fetch($result);
- return $tmp->password;
+ if($tmp->password == $saved_password || $tmp->old_password == $saved_password) return true;
+ return false;
}
/**
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index c8d6199d1..a69773b7d 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -200,11 +200,12 @@
/**
* @brief mysql old password를 가져오는 함수 (mysql에서만 사용)
**/
- function getOldPassword($password) {
- $query = sprintf("select old_password('%s') as password", $password);
+ function isValidOldPassword($password, $saved_password) {
+ $query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
$result = $this->_query($query);
$tmp = $this->_fetch($result);
- return $tmp->password;
+ if($tmp->password == $saved_password || $tmp->old_password == $saved_password) return true;
+ return false;
}
/**
diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index d840d2896..58d92c504 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -26,6 +26,11 @@
* @brief optimize 대상 파일을 받아서 처리 후 optimize 된 파일이름을 return
**/
function getOptimizedFiles($source_files, $type = "js") {
+ // 관리자 설정시 설정이 되어 있지 않으면 패스
+ $db_info = Context::getDBInfo();
+ if($db_info->use_optimizer == 'N') return $source_files;
+
+ // 캐시 디렉토리가 없으면 실행하지 않음
if(!is_dir($this->cache_path)) return $source_files;
$file_count = count($source_files);
diff --git a/common/js/common.js b/common/js/common.js
index 390d78847..3d129e9c0 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -630,3 +630,25 @@ function doDocumentPreview(obj) {
function viewSkinInfo(module, skin) {
popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo');
}
+
+/* 체크박스 선택 */
+function checkboxSelectAll(form, name, option){
+ var value;
+ var fo_obj = xGetElementById(form);
+ for ( var i = 0 ; i < fo_obj.length ; i++ ){
+ if(typeof(option) == "undefined") {
+ var select_mode = fo_obj[i].checked;
+ if ( select_mode == 0 ){
+ value = true;
+ select_mode = 1;
+ }else{
+ value = false;
+ select_mode = 0;
+ }
+ }
+ else if(option == true) value = true
+ else if(option == false) value = false
+
+ if(fo_obj[i].name == name) fo_obj[i].checked = value;
+ }
+}
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 43d53e49a..9cf83d210 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -37,6 +37,7 @@
$lang->cmd_select = '선택';
$lang->cmd_select_all = '모두선택';
$lang->cmd_unselect_all = '모두해제';
+ $lang->cmd_reverse_all = "선택반전";
$lang->cmd_close_all = '모두닫기';
$lang->cmd_open_all = '모두열기';
$lang->cmd_reload = '다시읽기';
diff --git a/config/config.inc.php b/config/config.inc.php
index c10e32a68..5b6f083ba 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -14,7 +14,7 @@
* 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
* config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
**/
- define('__ZBXE_VERSION__', '0.1.8');
+ define('__ZBXE_VERSION__', '0.1.9');
/**
* @brief 디버깅 메세지 출력
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index c6e64e829..547a21741 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -38,6 +38,7 @@
Context::set('time_zone_list', $GLOBALS['time_zone']);
Context::set('time_zone', $GLOBALS['_time_zone']);
Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
+ Context::set('use_optimizer', $db_info->use_optimizer==''?'Y':'N');
Context::setBrowserTitle("ZeroboardXE Admin Page");
}
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index badda5183..16ca362f5 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -34,6 +34,20 @@
| {$lang->time_zone} |
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 2b0d6827c..7c0c54339 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -15,7 +15,7 @@
- |
+ |
| |