diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index b3970031c..8dd60e5d8 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -175,7 +175,7 @@
$query = sprintf("insert into `%ssequence` (seq) values ('')", $this->prefix);
$this->_query($query);
$sequence = mysql_insert_id();
- $query = sprintf("delete from `%ssequence`", $this->prefix);
+ $query = sprintf("delete from `%ssequence` where seq < %d", $this->prefix, $sequence);
$this->_query($query);
return $sequence;
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 4a151417d..1730c2d33 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -184,7 +184,7 @@
$query = sprintf("insert into `%ssequence` (seq) values ('')", $this->prefix);
$this->_query($query);
$sequence = mysql_insert_id();
- $query = sprintf("delete from `%ssequence`", $this->prefix);
+ $query = sprintf("delete from `%ssequence` where seq < %d", $this->prefix, $sequence);
$this->_query($query);
return $sequence;
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 2b5096561..63564a4ea 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -172,10 +172,10 @@
* @brief 1씩 증가되는 sequence값을 return
**/
function getNextSequence() {
- $query = sprintf("insert into `%ssequence` (seq) values ('')", $this->prefix);
+ $query = sprintf("insert into %ssequence (seq) values ('')", $this->prefix);
$this->_query($query);
$sequence = sqlite_last_insert_rowid($this->fd);
- $query = sprintf("delete from `%ssequence`", $this->prefix);
+ $query = sprintf("delete from %ssequence where seq < %d", $this->prefix, $sequence);
$this->_query($query);
return $sequence;
@@ -361,7 +361,7 @@
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
elseif(!$value || is_numeric($value)) $value = (int)$value;
- $column_list[] = sprintf("`%s` = %s", $name, $value);
+ $column_list[] = sprintf("%s = %s", $name, $value);
}
}
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 268442b5e..3c57d3a26 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -196,7 +196,7 @@
$this->_prepare($query);
$result = $this->_execute();
$sequence = $this->handler->lastInsertId();
- $query = sprintf("delete from `%ssequence`", $this->prefix);
+ $query = sprintf("delete from %ssequence where seq < %d", $this->prefix, $sequence);
$this->_prepare($query);
$result = $this->_execute();
@@ -398,7 +398,7 @@
if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
elseif(!$value || is_numeric($value)) $value = (int)$value;
- $column_list[] = sprintf("`%s` = %s", $name, $value);
+ $column_list[] = sprintf("%s = %s", $name, $value);
}
}
diff --git a/config/config.inc.php b/config/config.inc.php
index dfd823245..aecc51379 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -24,7 +24,7 @@
* 2 : 1 + DB 쿼리
* 3 : 모든 로그
**/
- define('__DEBUG__', 1);
+ define('__DEBUG__', 3);
/**
* @brief 간단하게 사용하기 위한 함수 정의한 파일 require
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index e92fc96c3..fa54c269c 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -9,7 +9,7 @@
$lang->license =
"제로보드XE는 GPL라이센스를 따릅니다";
- $lang->install_condition_title = "설치 조건";
+ $lang->install_condition_title = "필수 설치조건을 확인하세요.";
$lang->install_checklist_title = array(
'permission' => '퍼미션',
@@ -37,7 +37,7 @@
$lang->install_permission_denied = '설치대상 디렉토리의 퍼미션이 707이 아닙니다';
$lang->cmd_agree_license = '라이센스에 동의합니다';
- $lang->cmd_install_fix_checklist = '필수 조건을 설정후 다음 버튼을 눌러 주세요.';
+ $lang->cmd_install_fix_checklist = '필수 설치조건을 설정하였습니다.';
$lang->cmd_install_next = '설치를 진행합니다';
$lang->db_desc = array(
@@ -48,8 +48,10 @@
'cubrid' => 'CUBRID DB를 이용합니다.
(안정화 테스트 및 튜닝이 되지 않았습니다)',
);
+ $lang->form_title = 'DB & 관리자 정보 입력';
$lang->db_title = 'DB정보 입력';
$lang->db_type = 'DB 종류';
+ $lang->select_db_type = '사용하시려는 DB를 선택해주세요.';
$lang->db_hostname = 'DB 호스트네임';
$lang->db_port = 'DB Port';
$lang->db_userid = 'DB 아이디';
diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html
index df999d350..7bd79ef31 100644
--- a/modules/install/tpl/check_env.html
+++ b/modules/install/tpl/check_env.html
@@ -1,33 +1,37 @@
+
+

-
-
- | {$lang->install_condition_title} |
-
+
+
{$lang->install_condition_title}
-
-
- | {$lang->install_checklist_title[$key]} |
-
-
- {$lang->enable}
-
- {$lang->disable}
+
+
+
+
+
+ | {$lang->install_checklist_title[$key]} |
+
+
+ {$lang->enable}
+
+ {$lang->disable}
+ {$lang->install_checklist_desc[$key]}
+
+ |
+
-
-
-
- | {$lang->install_checklist_desc[$key]} |
-
-
+
- |
+
+
+
-
-[{$lang->cmd_install_next}]
+
-
-{$lang->cmd_install_fix_checklist}
-[{$lang->cmd_next}]
-
-
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
new file mode 100644
index 000000000..f64c4331f
--- /dev/null
+++ b/modules/install/tpl/css/install.css
@@ -0,0 +1,87 @@
+@charset "utf-8";
+/*
+NHN UIT Lab. WebStandardization Team (http://html.nhndesign.com/)
+Jeong, Chan Myeong 070601~070630
+*/
+
+/*
+Used Hack
+
+IE6 & Below
+{ property:value; _property:value;}
+
+IE7 Only
+*:first-child+html #selector
+
+*/
+
+/* default.css - Type Selector Definition */
+* { margin:0; padding:0; font-family:"돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;}
+html, body {}
+html { width:100%; position:relative;}
+body { position:relative; font-size:.75em; width:100%; background:#4d4d4d url(../images/installBg.gif) repeat-x;}
+img { border:none;}
+label { cursor:pointer;}
+select { height:1.6em;}
+option { padding-right:.5em;}
+li { list-style:none;}
+a { text-decoration:none;}
+a:hover { text-decoration:underline;}
+address { font-style:normal;}
+
+/* Input Style Definition */
+.inputTypeText { border:1px solid #c9c9c9; padding:3px; height:1em; line-height:1em; background:#ffffff;}
+.inputTypeText:hover,
+.inputTypeText:focus { background:#f4f4f4;}
+.inputTypeTextArea { border:1px solid #c9c9c9; padding:3px; background:#ffffff;}
+
+/* Internet Explorer 6 PNG Bug Fix */
+.iePngFix { behavior:url(../js/iePngFix.htc);}
+
+/* Special Class Selector */
+.fr { float:right;}
+.fl { float:left;}
+
+/* Content */
+#box { position:relative; left:50%; margin-left:-380px; margin-top:120px; width:750px;}
+#content { position:relative; padding:25px 20px 20px 20px; overflow:hidden; background:#ffffff;}
+#content .iePngFix { position:absolute; bottom:-30px; left:-25px;}
+#content h2 { font-size:1em; padding-left:.5em; margin-bottom:1em;}
+#agreement { border:1px solid #c9c9c9; height:12em; padding:1.2em; overflow:auto; color:#696969; line-height:1.25em;}
+
+.buttonCenter { overflow:hidden; height:24px; padding-top:15px;}
+.buttonCenter li { float:left; margin-right:.3em;}
+.buttonCenter .fl { position:relative; left:48%;}
+.buttonTypeA { display:block; cursor:pointer; background:url(../images/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;}
+.buttonTypeA:hover { text-decoration:none;}
+.buttonTypeA img { vertical-align:middle;}
+.buttonTypeA input { border:none; cursor:pointer; background:url(../images/white/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:3px;}
+.buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;}
+.buttonTypeA .rightCap { width:2px; height:24px; background:url(../images/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;}
+.buttonTypeA .icon { margin:0 .4em 0 .2em;}
+
+#content .tableType6 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%;}
+#content .tableType6 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;}
+#content .tableType6 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; color:#7b7972; line-height:1.25em;}
+#content .tableType6 input,
+#content .tableType6 textarea,
+#content .tableType6 select { vertical-align:middle;}
+#content .tableType6 td .w100 { width:100%; display:block;}
+#content .tableType6 td .checkbox { margin:-3px;}
+#content .tableType6 td p { line-height:1.4em;}
+#content .tableType6 .borderBottomNone { border-bottom:none;}
+#content .tableType6 .none { color:#c95b53;}
+
+#content .tableType7 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%;}
+#content .tableType7 th { border-bottom:1px solid #e4e4e4; background:#e8e8e8; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;}
+#content .tableType7 th.second { background:#f5f5f5;}
+#content .tableType7 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; color:#7b7972; line-height:1.25em; font-size:.9em;}
+#content .tableType7 .hr { border-bottom:1px solid #b8b8b8;}
+#content .tableType7 input,
+#content .tableType7 textarea,
+#content .tableType7 select { vertical-align:middle;}
+#content .tableType7 td .w100 { width:100%; display:block;}
+#content .tableType7 td .checkbox { margin:-3px;}
+#content .tableType7 td p { line-height:1.4em; padding-top:.5em;}
+#content .tableType7 .borderBottomNone { border-bottom:none;}
+#content .tableType7 .none { color:#c95b53;}
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index b1186de15..a40bb9afe 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -1,96 +1,82 @@
+
+
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index 02481597f..ed2725816 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -1,90 +1,82 @@
+
+
diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html
index 02481597f..0c7a7c3a3 100644
--- a/modules/install/tpl/form.mysql_innodb.html
+++ b/modules/install/tpl/form.mysql_innodb.html
@@ -1,90 +1,83 @@
+
+
+
diff --git a/modules/install/tpl/form.sqlite2.html b/modules/install/tpl/form.sqlite2.html
index e28f69f20..b8e4a5eff 100644
--- a/modules/install/tpl/form.sqlite2.html
+++ b/modules/install/tpl/form.sqlite2.html
@@ -1,75 +1,70 @@
+
+
+
diff --git a/modules/install/tpl/form.sqlite3_pdo.html b/modules/install/tpl/form.sqlite3_pdo.html
index e28f69f20..4c5fc9359 100644
--- a/modules/install/tpl/form.sqlite3_pdo.html
+++ b/modules/install/tpl/form.sqlite3_pdo.html
@@ -1,75 +1,71 @@
+
+
+
+
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index 8c6386ccf..c338211b2 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -1,5 +1 @@
-
-
- | {$lang->introduce_title} |
-
-
+
diff --git a/modules/install/tpl/images/blank.gif b/modules/install/tpl/images/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/modules/install/tpl/images/blank.gif differ
diff --git a/modules/install/tpl/images/buttonTypeACenter.gif b/modules/install/tpl/images/buttonTypeACenter.gif
new file mode 100644
index 000000000..56127ea2e
Binary files /dev/null and b/modules/install/tpl/images/buttonTypeACenter.gif differ
diff --git a/modules/install/tpl/images/buttonTypeALeft.gif b/modules/install/tpl/images/buttonTypeALeft.gif
new file mode 100644
index 000000000..12839fe05
Binary files /dev/null and b/modules/install/tpl/images/buttonTypeALeft.gif differ
diff --git a/modules/install/tpl/images/buttonTypeARight.gif b/modules/install/tpl/images/buttonTypeARight.gif
new file mode 100644
index 000000000..1dd5aac05
Binary files /dev/null and b/modules/install/tpl/images/buttonTypeARight.gif differ
diff --git a/modules/install/tpl/images/h1.png b/modules/install/tpl/images/h1.png
new file mode 100644
index 000000000..f92d4d45a
Binary files /dev/null and b/modules/install/tpl/images/h1.png differ
diff --git a/modules/install/tpl/images/iconCreate.gif b/modules/install/tpl/images/iconCreate.gif
new file mode 100644
index 000000000..0fdecf963
Binary files /dev/null and b/modules/install/tpl/images/iconCreate.gif differ
diff --git a/modules/install/tpl/images/installBg.gif b/modules/install/tpl/images/installBg.gif
new file mode 100644
index 000000000..d76bd51b2
Binary files /dev/null and b/modules/install/tpl/images/installBg.gif differ
diff --git a/modules/install/tpl/images/installBoxBottom.png b/modules/install/tpl/images/installBoxBottom.png
new file mode 100644
index 000000000..741ae4776
Binary files /dev/null and b/modules/install/tpl/images/installBoxBottom.png differ
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index 7140f6db8..6b2da904d 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -1,12 +1,17 @@
-
-
- |
- {nl2br($lang->license)}
- |
-
-
+
diff --git a/modules/install/tpl/js/iePngFix.htc b/modules/install/tpl/js/iePngFix.htc
new file mode 100644
index 000000000..3c495eff7
--- /dev/null
+++ b/modules/install/tpl/js/iePngFix.htc
@@ -0,0 +1,64 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html
index a31b609c4..ebc96f4f7 100644
--- a/modules/install/tpl/select_db.html
+++ b/modules/install/tpl/select_db.html
@@ -1,33 +1,35 @@
-
-
- | {$lang->introduce_title} |
-
-
+
-
-