diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 8dd60e5d8..cdafbc921 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -47,7 +47,6 @@
* @brief 설치 가능 여부를 return
**/
function isSupported() {
- //if(!function_exists('mysql_connect') || mysql_get_client_info() < "4.1.00") return false;
if(!function_exists('mysql_connect')) return false;
return true;
}
@@ -79,6 +78,12 @@
return;
}
+ // 버전 확인후 4.1 이하면 오류 표시
+ if(mysql_get_server_info($this->fd)<"4.1") {
+ $this->setError(-1, "zeroboard xe can not install under mysql 4.1. Current mysql version is ".mysql_get_server_info());
+ return;
+ }
+
// db 선택
@mysql_select_db($this->database, $this->fd);
if(mysql_error()) {
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 1730c2d33..46e64600f 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -47,7 +47,6 @@
* @brief 설치 가능 여부를 return
**/
function isSupported() {
- //if(!function_exists('mysql_connect') || mysql_get_client_info() < "4.1.00") return false;
if(!function_exists('mysql_connect')) return false;
return true;
}
@@ -79,6 +78,12 @@
return;
}
+ // 버전 확인후 4.1 이하면 오류 표시
+ if(mysql_get_server_info($this->fd)<"4.1") {
+ $this->setError(-1, "zeroboard xe can not install under mysql 4.1. Current mysql version is ".mysql_get_server_info());
+ return;
+ }
+
// db 선택
@mysql_select_db($this->database, $this->fd);
if(mysql_error()) {
diff --git a/common/css/default.css b/common/css/default.css
index 26c898618..b36fcef5f 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -16,10 +16,10 @@ IE7 & IE6 & Below
.fl { float:left;}
/* default.css - Type Selector Definition */
-* { margin:0; padding:0; font-family:"돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;}
-html, body { height:100%;}
+* { margin:0; padding:0; }
+html, body { }
html { width:100%; position:relative;}
-body { font-size:.75em; margin:2em;}
+body { font-size:.75em; margin:0;}
img { border:none;}
label { cursor:pointer;}
/*select { height:1.6em;}*/
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 7a8da0158..cc6548a94 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -33,7 +33,7 @@
$oDB = &DB::getInstance();
// DB접속이 가능한지 체크
- if(!$oDB->isConnected()) return new Object(-1, 'msg_dbconnect_failed');
+ if(!$oDB->isConnected()) return $oDB->getError();
$oDB->begin();
diff --git a/modules/install/tpl/filter/cubrid.xml b/modules/install/tpl/filter/cubrid.xml
index 6b2e3464a..46f3bc8cc 100644
--- a/modules/install/tpl/filter/cubrid.xml
+++ b/modules/install/tpl/filter/cubrid.xml
@@ -7,11 +7,11 @@
-
+
-
-
+
+
diff --git a/modules/install/tpl/filter/mysql.xml b/modules/install/tpl/filter/mysql.xml
index ecff661b5..923ddc4ec 100644
--- a/modules/install/tpl/filter/mysql.xml
+++ b/modules/install/tpl/filter/mysql.xml
@@ -6,11 +6,11 @@
-
+
-
-
+
+
diff --git a/modules/install/tpl/filter/sqlite2.xml b/modules/install/tpl/filter/sqlite2.xml
index 9fe10bc3e..b9482ae0c 100644
--- a/modules/install/tpl/filter/sqlite2.xml
+++ b/modules/install/tpl/filter/sqlite2.xml
@@ -3,11 +3,11 @@
-
+
-
-
+
+