\n";
$output .= "Backtrace:
\n"; $backtrace = debug_backtrace(); - + foreach ($backtrace as $bt) { $args = ''; foreach ($bt['args'] as $a) { @@ -672,18 +687,18 @@ $output .= "
\n";
return $output;
}
-
+
/**
* @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf('select count(*) as "count" from %s %s', implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$result = $this->_query($count_query);
@@ -707,7 +722,7 @@
if($page > $total_page) $page = $total_page;
$start_count = ($page-1)*$list_count;
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -724,7 +739,7 @@
else {
if ($condition)
$query = sprintf('%s and inst_num() between %d and %d', $query, $start_count + 1, $list_count + $start_count);
- else
+ else
$query = sprintf('%s where inst_num() between %d and %d', $query, $start_count + 1, $list_count + $start_count);
}
}
diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php
index d3facb5be..e5181f810 100644
--- a/classes/db/DBFirebird.class.php
+++ b/classes/db/DBFirebird.class.php
@@ -89,7 +89,7 @@
// get server version and implementation strings
$server_info = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
ibase_service_detach($service);
- }
+ }
else {
$this->setError(ibase_errcode(), ibase_errmsg());
return;
@@ -341,7 +341,7 @@
/**
* @brief 1씩 증가되는 sequence값을 return (firebird의 generator 값을 증가)
**/
- function getNextSequence() {
+ function getNextSequence() {
$gen = "GEN_".$this->prefix."sequence_ID";
$sequence = ibase_gen_id($gen, 1);
return $sequence;
@@ -509,7 +509,7 @@
if($this->column_type[$type]=='INTEGER') $size = null;
else if($this->column_type[$type]=='VARCHAR' && !$size) $size = 256;
-
+
$column_schema[] = sprintf('"%s" %s%s %s %s',
$name,
$this->column_type[$type],
@@ -540,8 +540,8 @@
//commit();
@ibase_commit($this->fd);
if(!$output) return false;
-
- if(count($index_list)) {
+
+ if(count($index_list)) {
foreach($index_list as $key => $val) {
// index name = prefix + table name + index_list
// index name 크기가 31byte로 제한되어 있어 중복되지 않을만큼 테이블명을 줄임
@@ -567,7 +567,7 @@
if(!$output) return false;
}
}
-
+
foreach($auto_increment_list as $increment) {
$schema = sprintf('CREATE GENERATOR GEN_%s_ID;', $table_name);
$output = $this->_query($schema);
@@ -598,8 +598,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -609,15 +620,11 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue('"'.$name.'"', $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
-
- $name = $this->autoQuotes($name);
- $value = $this->autoValueQuotes($value, $output);
-
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str;
@@ -627,8 +634,6 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' Where '.$condition;
return $condition;
}
@@ -641,7 +646,7 @@
$table_list[] = '"'.$this->prefix.$val.'"';
}
- // 컬럼 정리
+ // 컬럼 정리
foreach($output->columns as $key => $val) {
$name = $val['name'];
$value = $val['value'];
@@ -752,9 +757,21 @@
// 테이블 정리
$table_list = array();
foreach($output->tables as $key => $val) {
- $table_list[] = sprintf("\"%s%s\" as \"%s\"", $this->prefix, $val, $key);
+ $table_list[] = sprintf("\"%s%s\" as \"%s\"", $this->prefix, $val, $key);
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' "'.$this->prefix.$output->_tables[$key].'" as '.$key . ' on (' . $condition . ')';
+ }
+ }
+
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -762,7 +779,7 @@
foreach($output->columns as $key => $val) {
$name = $val['name'];
$alias = $val['alias'];
-
+
if($alias == "")
$column_list[] = $this->autoQuotes($name);
else
@@ -773,7 +790,7 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -792,7 +809,7 @@
if($output->list_count['value']) $limit = sprintf('FIRST %d', $output->list_count['value']);
else $limit = '';
- $query = sprintf("select %s %s from %s %s", $limit, $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if($output->groups) {
foreach($output->groups as $key => $val) {
@@ -825,11 +842,11 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf('select count(*) as "count" from %s %s;', implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$result = $this->_query($count_query);
@@ -868,8 +885,8 @@
}
}
- $limit = sprintf('FIRST %d SKIP %d ', $list_count, $start_count);
- $query = sprintf('SELECT %s %s FROM %s %s', $limit, $columns, implode(',',$table_list), $condition);
+ $limit = sprintf('FIRST %d SKIP %d ', $list_count, $start_count);
+ $query = sprintf('SELECT %s %s FROM %s %s %s', $limit, $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if($output->groups) {
foreach($output->groups as $key => $val) {
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index dee547f95..d61a1f869 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -376,8 +376,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -387,10 +398,9 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
-
- $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
@@ -401,8 +411,6 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' where '.$condition;
return $condition;
}
@@ -493,6 +501,16 @@
$table_list[] = '`'.$this->prefix.$val.'` as '.$key;
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' `'.$this->prefix.$output->_tables[$key].'` as '.$key . ' on (' . $condition . ')';
+ }
+ }
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -515,7 +533,7 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -530,7 +548,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -558,11 +576,11 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf("select count(*) as count from %s %s", implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$result = $this->_query($count_query);
@@ -599,7 +617,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -611,7 +629,6 @@
}
$query = sprintf('%s limit %d, %d', $query, $start_count, $list_count);
-
$result = $this->_query($query);
if($this->isError()) {
$buff = new Object();
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index f9cfa704e..4203d1c7b 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -385,8 +385,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -396,10 +407,10 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
@@ -410,8 +421,6 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' where '.$condition;
return $condition;
}
@@ -502,6 +511,17 @@
$table_list[] = '`'.$this->prefix.$val.'` as '.$key;
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' `'.$this->prefix.$output->_tables[$key].'` as '.$key . ' on (' . $condition . ')';
+ }
+ }
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -524,7 +544,8 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
+
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -539,7 +560,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -567,11 +588,11 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf("select count(*) as count from %s %s", implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$result = $this->_query($count_query);
@@ -608,7 +629,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
if($output->order) {
diff --git a/classes/db/DBPostgresql.class.php b/classes/db/DBPostgresql.class.php
index ac593469a..0e7fb8b07 100644
--- a/classes/db/DBPostgresql.class.php
+++ b/classes/db/DBPostgresql.class.php
@@ -69,20 +69,20 @@
* @brief DB 접속
**/
function _connect() {
- // pg용 connection string
- $conn_string = "";
+ // pg용 connection string
+ $conn_string = "";
// db 정보가 없으면 무시
if(!$this->hostname || !$this->userid || !$this->database) return;
- // connection string 만들기
- $conn_string .= ($this->hostname) ? " host=$this->hostname" : "";
- $conn_string .= ($this->userid) ? " user=$this->userid" : "";
- $conn_string .= ($this->password) ? " password=$this->password" : "";
- $conn_string .= ($this->database) ? " dbname=$this->database" : "";
- $conn_string .= ($this->port) ? " port=$this->port" : "";
+ // connection string 만들기
+ $conn_string .= ($this->hostname) ? " host=$this->hostname" : "";
+ $conn_string .= ($this->userid) ? " user=$this->userid" : "";
+ $conn_string .= ($this->password) ? " password=$this->password" : "";
+ $conn_string .= ($this->database) ? " dbname=$this->database" : "";
+ $conn_string .= ($this->port) ? " port=$this->port" : "";
- // 접속시도
+ // 접속시도
$this->fd = @pg_connect($conn_string);
if(!$this->fd || pg_connection_status($this->fd) != PGSQL_CONNECTION_OK) {
$this->setError(-1, "CONNECTION FAILURE");
@@ -314,10 +314,10 @@
// 테이블 생성 schema 작성
$table_name = $xml_obj->table->attrs->name;
- if($table_name == 'sequence') {
+ if($table_name == 'sequence') {
$query = sprintf('create sequence %s', $this->prefix.$table_name);
- return $this->_query($query);
- }
+ return $this->_query($query);
+ }
if($this->isTableExists($table_name)) return;
$table_name = $this->prefix.$table_name;
@@ -336,7 +336,7 @@
$default = $column->attrs->default;
$auto_increment = $column->attrs->auto_increment;
- if($type == "bignumber" || $type == "number") $size = 0;
+ if($type == "bignumber" || $type == "number") $size = 0;
$column_schema[] = sprintf('%s %s%s %s %s',
$name,
@@ -361,7 +361,7 @@
}
}
-
+
$schema = sprintf('create table %s (%s%s);', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
$output = $this->_query($schema);
@@ -381,8 +381,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -392,10 +403,10 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
@@ -406,11 +417,10 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' where '.$condition;
return $condition;
}
+
/**
* @brief insertAct 처리
**/
@@ -420,7 +430,7 @@
$table_list[] = $this->prefix.$val;
}
- // 컬럼 정리
+ // 컬럼 정리
foreach($output->columns as $key => $val) {
$name = $val['name'];
$value = $val['value'];
@@ -446,7 +456,7 @@
$table_list[] = $this->prefix.$val.' as '.$key;
}
- // 컬럼 정리
+ // 컬럼 정리
foreach($output->columns as $key => $val) {
if(!isset($val['value'])) continue;
$name = $val['name'];
@@ -498,6 +508,18 @@
$table_list[] = $this->prefix.$val.' as '.$key;
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key . ' on (' . $condition . ')';
+ }
+ }
+
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -520,7 +542,7 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -535,7 +557,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -560,11 +582,11 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf("select count(*) as count from %s %s", implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$result = $this->_query($count_query);
@@ -601,7 +623,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 47bfd5f48..34efa7da6 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -357,8 +357,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -368,10 +379,10 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
@@ -382,8 +393,6 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' where '.$condition;
return $condition;
}
@@ -509,6 +518,17 @@
$table_list[] = $this->prefix.$val.' as '.$key;
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key . ' on ' . $condition . '';
+ }
+ }
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -531,7 +551,7 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -546,7 +566,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -574,12 +594,14 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf("select count(*) as count from %s %s", implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
+
$total_count = $this->getCountCache($output->tables, $condition);
+
if($total_count === false) {
$result = $this->_query($count_query);
$count_output = $this->_fetch($result);
@@ -615,7 +637,8 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
+
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 994e1cec9..000487132 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -386,8 +386,19 @@
**/
function getCondition($output) {
if(!$output->conditions) return;
+ $condition = $this->_getCondition($output->conditions,$output->column_type);
+ if($condition) $condition = ' where '.$condition;
+ return $condition;
+ }
- foreach($output->conditions as $val) {
+ function getLeftCondition($conditions,$column_type){
+ return $this->_getCondition($conditions,$column_type);
+ }
+
+
+ function _getCondition($conditions,$column_type) {
+ $condition = '';
+ foreach($conditions as $val) {
$sub_condition = '';
foreach($val['condition'] as $v) {
if(!isset($v['value'])) continue;
@@ -397,12 +408,11 @@
$name = $v['column'];
$operation = $v['operation'];
$value = $v['value'];
- $type = $this->getColumnType($output->column_type,$name);
+ $type = $this->getColumnType($column_type,$name);
$pipe = $v['pipe'];
- $value = $this->getConditionValue($name, $value, $operation, $type, $output->column_type);
+ $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
if(!$value) $value = $v['value'];
-
$str = $this->getConditionPart($name, $value, $operation);
if($sub_condition) $sub_condition .= ' '.$pipe.' ';
$sub_condition .= $str;
@@ -412,8 +422,6 @@
$condition .= '('.$sub_condition.')';
}
}
-
- if($condition) $condition = ' where '.$condition;
return $condition;
}
@@ -550,6 +558,19 @@
$table_list[] = $this->prefix.$val.' as '.$key;
}
+ $left_join = array();
+ // why???
+ $left_tables= (array)$output->left_tables;
+
+ foreach($left_tables as $key => $val) {
+ $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+ if($condition){
+ $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key . ' on (' . $condition . ')';
+ }
+ }
+
+
+
if(!$output->columns) {
$columns = '*';
} else {
@@ -572,7 +593,7 @@
$condition = $this->getCondition($output);
- if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $condition, $output);
+ if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
// list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
if($output->order) {
@@ -587,7 +608,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
@@ -615,11 +636,11 @@
*
* 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
**/
- function _getNavigationData($table_list, $columns, $condition, $output) {
+ function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
// 전체 개수를 구함
- $count_query = sprintf("select count(*) as count from %s %s", implode(',',$table_list), $condition);
+ $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
$total_count = $this->getCountCache($output->tables, $condition);
if($total_count === false) {
$this->_prepare($count_query);
@@ -656,7 +677,7 @@
}
}
- $query = sprintf("select %s from %s %s", $columns, implode(',',$table_list), $condition);
+ $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 34345fcc2..d81093ffd 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -33,7 +33,7 @@
// 요청방식에 따라 출력을 별도로
if(Context::getResponseMethod()=="HTML") {
-
+
Context::set('content', $content);
// 레이아웃을 컴파일
@@ -60,7 +60,7 @@
if(__DEBUG__==3) $GLOBALS['__trans_widget_editor_elapsed__'] = getMicroTime()-$start;
- // 최종 결과를 common_layout에 넣어버림
+ // 최종 결과를 common_layout에 넣어버림
Context::set('zbxe_final_content', $zbxe_final_content);
$output = $oTemplate->compile('./common/tpl', 'common_layout');
@@ -172,50 +172,116 @@
$end = getMicroTime();
- // debug string 작성 시작
- $buff = "\n\n** Debug at ".date('Y-m-d H:i:s')." ************************************************************\n";
+ if(__DEBUG_OUTPUT__ != 2) {
+ // debug string 작성 시작
+ $buff = "\n\n** Debug at ".date('Y-m-d H:i:s')." ************************************************************\n";
- // Request/Response 정보 작성
- $buff .= "\n- Request/ Response info\n";
- $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
- $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
- $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
- $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->getContentSize());
+ // Request/Response 정보 작성
+ $buff .= "\n- Request/ Response info\n";
+ $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
+ $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
+ $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
+ $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->getContentSize());
- // DB 로그 작성
- if(__DEBUG__>1) {
- if($GLOBALS['__db_queries__']) {
- $buff .= "\n- DB Queries\n";
- $buff .= $GLOBALS['__db_queries__'];
+ // DB 로그 작성
+ if(__DEBUG__ > 1) {
+ if($GLOBALS['__db_queries__']) {
+ $buff .= "\n- DB Queries\n";
+ $num = 0;
+ foreach($GLOBALS['__db_queries__'] as $query) {
+ $buff .= sprintf("\t%02d. %s (%0.6f sec)\n", ++$num, $query['query'], $query['elapsed_time']);
+ if($query['result'] == 'Success') {
+ $buff .= "\t Query Success\n";
+ } else {
+ $buff .= sprintf("\t Query $s : %d\n\t\t\t %s\n", $query['result'], $query['errno'], $query['errstr']);
+ }
+ }
+ }
+ $buff .= "\n- Elapsed time\n";
+
+ if($GLOBALS['__db_elapsed_time__']) $buff .= sprintf("\tDB queries elapsed time\t\t: %0.5f sec\n", $GLOBALS['__db_elapsed_time__']);
}
- $buff .= "\n- Elapsed time\n";
- if($GLOBALS['__db_elapsed_time__']) $buff .= sprintf("\tDB queries elapsed time\t\t: %0.5f sec\n", $GLOBALS['__db_elapsed_time__']);
+ // 기타 로그 작성
+ if(__DEBUG__==3) {
+ $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
+ $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
+ $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
+ $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
+
+ // 위젯 실행 시간 작성
+ $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
+
+ // 레이아웃 실행 시간
+ $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
+
+ // 위젯, 에디터 컴포넌트 치환 시간
+ $buff .= sprintf("\n\tTrans widget&editor elapsed time: %0.5f sec\n\n", $GLOBALS['__trans_widget_editor_elapsed__']);
+ }
+
+ // 전체 실행 시간 작성
+ $buff .= sprintf("\tTotal elapsed time \t\t: %0.5f sec", $end-__StartTime__);
}
- // 기타 로그 작성
- if(__DEBUG__==3) {
- $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
- $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
- $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
- $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
-
- // 위젯 실행 시간 작성
- $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
-
- // 레이아웃 실행 시간
- $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
-
- // 위젯, 에디터 컴포넌트 치환 시간
- $buff .= sprintf("\n\tTrans widget&editor elapsed time: %0.5f sec\n\n", $GLOBALS['__trans_widget_editor_elapsed__']);
+ if(__DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
+ if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+ $buff = '허용되지 않은 IP 입니다. config/config.inc.php 파일의 __DEBUG_PROTECT_IP__ 상수 값을 자신의 IP로 변경하세요.';
+ }
+ return "";
}
- // 전체 실행 시간 작성
- $buff .= sprintf("\tTotal elapsed time \t\t: %0.5f sec", $end-__StartTime__);
-
- if(__DEBUG_OUTPUT__==1 && Context::getResponseMethod()=='HTML') return "";
-
if(__DEBUG_OUTPUT__==0) debugPrint($buff, false);
+
+ // Firebug 콘솔 출력
+ if(__DEBUG_OUTPUT__ == 2) {
+ debugPrint(
+ array('Request / Response info >>> '.Context::getResponseMethod().' / '.$_SERVER['REQUEST_METHOD'],
+ array(
+ array('Request URI', 'Request method', 'Response method', 'Response contents size'),
+ array(
+ sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']),
+ $_SERVER['REQUEST_METHOD'],
+ Context::getResponseMethod(),
+ $this->getContentSize().' byte'
+ )
+ )
+ ),
+ FirePHP::TABLE
+ );
+
+ // 기타 로그 작성
+ if(__DEBUG__ == 3 || __DEBUG__ == 1) {
+ debugPrint(
+ array('Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
+ array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans widget&editor'),
+ array(
+ sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+ sprintf('%0.5f sec', $GLOBALS['__elapsed_class_load__']),
+ sprintf('%0.5f sec (%d called)', $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']),
+ sprintf('%0.5f sec', $GLOBALS['__xmlparse_elapsed__']),
+ sprintf('%0.5f sec', $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']),
+ sprintf('%0.5f sec', $GLOBALS['__widget_excute_elapsed__']),
+ sprintf('%0.5f sec', $GLOBALS['__trans_widget_editor_elapsed__'])
+ )
+ )
+ ),
+ FirePHP::TABLE
+ );
+ }
+
+ // DB 쿼리 로그
+ if(__DEBUG__ > 1) {
+ $queries_output = array(array('Query', 'Elapsed time', 'Result'));
+ foreach($GLOBALS['__db_queries__'] as $query) {
+ array_push($queries_output, array($query['query'], sprintf('%0.5f', $query['elapsed_time']), $query['result']));
+ }
+ debugPrint(
+ array('DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']), $queries_output),
+ FirePHP::TABLE
+ );
+ }
+
+ }
}
/**
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index f9f2898b6..9c201559c 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -66,10 +66,12 @@
$headers = sprintf(
"From: %s".$eol.
+ "To: %s".$eol.
"MIME-Version: 1.0".$eol.
"Content-Type: multipart/alternative;".$eol."\tboundary=\"%s\"".$eol.$eol.
"",
$this->getSender(),
+ $this->getReceiptor(),
$boundary
);
@@ -93,7 +95,7 @@
$boundary
);
- return mail($this->getReceiptor(), $this->getTitle(), $body, $headers);
+ return mail($this->receiptor_email, $this->getTitle(), $body, $headers);
}
function checkMailMX($email_address) {
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index 2420b6b9c..be30f05d7 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -15,7 +15,7 @@
**/
function parse($query_id, $xml_file, $cache_file) {
// query xml 파일을 찾아서 파싱, 결과가 없으면 return
- $buff = FileHandler::readFile($xml_file);
+ $buff = FileHandler::readFile($xml_file);
$xml_obj = parent::parse($buff);
if(!$xml_obj) return;
unset($buff);
@@ -38,9 +38,14 @@
// 테이블 정리 (배열코드로 변환)
$tables = $xml_obj->query->tables->table;
+ $output->left_tables = array();
+
+ $left_conditions = array();
+
if(!$tables) return;
if(!is_array($tables)) $tables = array($tables);
foreach($tables as $key => $val) {
+
// 테이블과 alias의 이름을 구함
$table_name = $val->attrs->name;
$alias = $val->attrs->alias;
@@ -48,6 +53,11 @@
$output->tables[$alias] = $table_name;
+ if(in_array($val->attrs->type,array('left join','left outer join','right join','right outer join')) && count($val->conditions)){
+ $output->left_tables[$alias] = $val->attrs->type;
+ $left_conditions[$alias] = $val->conditions;
+ }
+
// 테이블을 찾아서 컬럼의 속성을 구함
$table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
if(!file_exists($table_file)) {
@@ -75,167 +85,92 @@
}
}
+
// 컬럼 정리
$columns = $xml_obj->query->columns->column;
- if(!$columns) {
- $output->column[] = array("*" => "*");
- } else {
- if(!is_array($columns)) $columns = array($columns);
- foreach($columns as $key => $val) {
- $name = $val->attrs->name;
- /*
- if(strpos('.',$name)===false && count($output->tables)==1) {
- $tmp = array_values($output->tables);
- $name = sprintf('%s.%s', $tmp[0], $val->attrs->name);
- }
- */
+ $out = $this->_setColumn($columns);
+ $output->columns = $out->columns;
- $output->columns[] = array(
- "name" => $name,
- "var" => $val->attrs->var,
- "default" => $val->attrs->default,
- "notnull" => $val->attrs->notnull,
- "filter" => $val->attrs->filter,
- "minlength" => $val->attrs->minlength,
- "maxlength" => $val->attrs->maxlength,
- "alias" => $val->attrs->alias,
- );
- }
- }
-
- // 조건절 정리
$conditions = $xml_obj->query->conditions;
+ $out = $this->_setConditions($conditions);
+ $output->conditions = $out->conditions;
- $condition = $conditions->condition;
- if($condition) {
- $obj->condition = $condition;
- unset($condition);
- $condition = array($obj);
- }
-
- $condition_group = $conditions->group;
- if($condition_group && !is_array($condition_group)) $condition_group = array($condition_group);
-
- if($condition && $condition_group) $cond = array_merge($condition, $condition_group);
- elseif($condition_group) $cond = $condition_group;
- else $cond = $condition;
-
- if($cond) {
- foreach($cond as $key => $val) {
- unset($cond_output);
-
- if($val->attrs->pipe) $cond_output->pipe = $val->attrs->pipe;
- else $cond_output->pipe = null;
-
- if(!$val->condition) continue;
- if(!is_array($val->condition)) $val->condition = array($val->condition);
-
- foreach($val->condition as $k => $v) {
- $obj = $v->attrs;
- if(!$obj->alias) $obj->alias = $obj->column;
- $cond_output->condition[] = $obj;
- }
-
- $output->conditions[] = $cond_output;
+ foreach($output->left_tables as $key => $val){
+ if($left_conditions[$key]){
+ $out = $this->_setConditions($left_conditions[$key]);
+ $output->left_conditions[$key] = $out->conditions;
}
}
- // group 정리
$group_list = $xml_obj->query->groups->group;
- if($group_list) {
- if(!is_array($group_list)) $group_list = array($group_list);
- for($i=0;$i\n"; $backtrace = debug_backtrace(); - + foreach ($backtrace as $bt) { $args = ''; foreach ($bt['args'] as $a) { @@ -672,18 +687,18 @@ $output .= "
').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
-
- //ajax get data and transeform ul il
- jQuery.get(url,function(data){
- jQuery(data).find("node").each(function(i){
- var text = jQuery(this).attr("text");
- var node_srl = jQuery(this).attr("node_srl");
- var parent_srl = jQuery(this).attr("parent_srl");
- var color = jQuery(this).attr("color");
- var url = jQuery(this).attr("url");
-
- // node
-
- var node = '';
- if(color){
- node = jQuery('').bind("click",function(e){
- jQuery("#tree_"+node_srl+" > span").click();
- addNode(node_srl,e);
- return false;
- }).appendTo(node);
-
- jQuery('
').bind("click",function(e){
- jQuery("#tree_"+node_srl+" > span").click();
- modifyNode(node_srl,e);
- return false;
- }).appendTo(node);
-
- jQuery('
').bind("click",function(e){
- deleteNode(node_srl);
- return false;
- }).appendTo(node);
-
- // insert parent child
- if(parent_srl>0){
- if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('- '));
- jQuery('#tree_'+parent_srl+'> ul').append(node);
- }else{
- if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("
- '+text+' '); + }else{ + node = jQuery('
- '+text+' '); + } + + // button + jQuery('
- ").appendTo('#menu ul.simpleTree > li');
- jQuery('#menu ul.simpleTree > li > ul').append(node);
- }
-
- });
-
- //button show hide
- jQuery("#menu li").each(function(){
- if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
- if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
- });
-
-
- // draw tree
- simpleTreeCollection = jQuery('.simpleTree').simpleTree({
- autoclose: false,
- afterClick:function(node){
- jQuery('#category_info').html("");
- //alert("text-"+jQuery('span:first',node).text());
- },
- afterDblClick:function(node){
- //alert("text-"+jQuery('span:first',node).text());
- },
- afterMove:function(destination, source, pos){
- if(destination.size() == 0){
- Tree(xml_url);
- return;
- }
- var module_srl = jQuery("#fo_category input[name=module_srl]").val();
- var parent_srl = destination.attr('id').replace(/.*_/g,'');
- var source_srl = source.attr('id').replace(/.*_/g,'');
-
- var target = source.prevAll("li:not([class^=line])");
- var target_srl = 0;
- if(target.length >0){
- target_srl = source.prevAll("li:not([class^=line])").get(0).id.replace(/.*_/g,'');
- parent_srl = 0;
- }
-
- jQuery.exec_json("board.procBoardAdminMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
- function(data){
- jQuery('#category_info').html('');
- if(data.error > 0) Tree(xml_url);
- });
-
- },
-
- // i want you !! made by sol
- beforeMovedToLine : function(destination, source, pos){
- return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
- },
-
- // i want you !! made by sol
- beforeMovedToFolder : function(destination, source, pos){
- return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
- },
- afterAjax:function()
- {
- //alert('Loaded');
- },
- animate:true
- ,docToFolderConvert:true
- });
-
-
-
- // open all node
- nodeToggleAll();
- },"xml");
-}
-function addNode(node,e){
- var params ={
- "category_srl":0
- ,"parent_srl":node
- ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
- };
-
- jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
- jQuery('#category_info').html(data.tpl);
- });
-}
-
-function modifyNode(node,e){
- var params ={
- "category_srl":node
- ,"parent_srl":0
- ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
- };
-
- jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
- jQuery('#category_info').html(data.tpl);
- });
-}
-
-
-function nodeToggleAll(){
- jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
- simpleTreeCollection[0].nodeToggle(this);
- });
-}
-
-function deleteNode(node){
- if(confirm(lang_confirm_delete)){
- jQuery('#category_info').html("");
- var params ={
- "category_srl":node
- ,"parent_srl":0
- ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
- };
-
- jQuery.exec_json('board.procBoardAdminDeleteCategory', params, function(data){
- if(data.error==0) Tree(xml_url);
- });
- }
-}
-
-/* 카테고리 아이템 입력후 */
-function completeInsertCategory(ret_obj) {
- jQuery('#category_info').html("");
- Tree(xml_url);
-}
-
-function hideCategoryInfo() {
- jQuery('#category_info').html("");
-}
-
-
-
-
-
-
-
-
-
-
-
-
/* 모듈 생성 후 */
function completeInsertBoard(ret_obj) {
var error = ret_obj['error'];
@@ -265,116 +80,13 @@ function doChangeCategory(fo_obj) {
/* 일괄 설정 */
function doCartSetup(act_type) {
- var fo_obj = xGetElementById('fo_list');
var module_srl = new Array();
- if(typeof(fo_obj.cart.length)=='undefined') {
- if(fo_obj.cart.checked) module_srl[module_srl.length] = fo_obj.cart.value;
- } else {
- for(var i=0;i
').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
+
+ //ajax get data and transeform ul il
+ jQuery.get(url,function(data){
+ jQuery(data).find("node").each(function(i){
+ var text = jQuery(this).attr("text");
+ var node_srl = jQuery(this).attr("node_srl");
+ var parent_srl = jQuery(this).attr("parent_srl");
+ var color = jQuery(this).attr("color");
+ var url = jQuery(this).attr("url");
+
+ // node
+ var node = '';
+ if(color){
+ node = jQuery('').bind("click",function(e){
+ jQuery("#tree_"+node_srl+" > span").click();
+ addNode(node_srl,e);
+ return false;
+ }).appendTo(node);
+
+ jQuery('').bind("click",function(e){
+ jQuery("#tree_"+node_srl+" > span").click();
+ modifyNode(node_srl,e);
+ return false;
+ }).appendTo(node);
+
+ jQuery('').bind("click",function(e){
+ deleteNode(node_srl);
+ return false;
+ }).appendTo(node);
+
+ // insert parent child
+ if(parent_srl>0){
+ if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('- '));
+ jQuery('#tree_'+parent_srl+'> ul').append(node);
+ }else{
+ if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("
- ").appendTo('#menu ul.simpleTree > li');
+ jQuery('#menu ul.simpleTree > li > ul').append(node);
+ }
+
+ });
+
+ //button show hide
+ jQuery("#menu li").each(function(){
+ if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
+ if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
+ });
+
+
+ // draw tree
+ simpleTreeCollection = jQuery('.simpleTree').simpleTree({
+ autoclose: false,
+ afterClick:function(node){
+ jQuery('#category_info').html("");
+ //alert("text-"+jQuery('span:first',node).text());
+ },
+ afterDblClick:function(node){
+ //alert("text-"+jQuery('span:first',node).text());
+ },
+ afterMove:function(destination, source, pos){
+ if(destination.size() == 0){
+ Tree(xml_url);
+ return;
+ }
+ var module_srl = jQuery("#fo_category input[name=module_srl]").val();
+ var parent_srl = destination.attr('id').replace(/.*_/g,'');
+ var source_srl = source.attr('id').replace(/.*_/g,'');
+
+ var target = source.prevAll("li:not([class^=line])");
+ var target_srl = 0;
+ if(target.length >0){
+ target_srl = source.prevAll("li:not([class^=line])").get(0).id.replace(/.*_/g,'');
+ parent_srl = 0;
+ }
+
+ jQuery.exec_json("board.procBoardAdminMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
+ function(data){
+ jQuery('#category_info').html('');
+ if(data.error > 0) Tree(xml_url);
+ });
+
+ },
+
+ // i want you !! made by sol
+ beforeMovedToLine : function(destination, source, pos){
+ return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
+ },
+
+ // i want you !! made by sol
+ beforeMovedToFolder : function(destination, source, pos){
+ return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
+ },
+ afterAjax:function()
+ {
+ //alert('Loaded');
+ },
+ animate:true
+ ,docToFolderConvert:true
+ });
+
+
+
+ // open all node
+ nodeToggleAll();
+ },"xml");
+}
+function addNode(node,e){
+ var params ={
+ "category_srl":0
+ ,"parent_srl":node
+ ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+ };
+
+ jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
+ jQuery('#category_info').html(data.tpl);
+ });
+}
+
+function modifyNode(node,e){
+ var params ={
+ "category_srl":node
+ ,"parent_srl":0
+ ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+ };
+
+ jQuery.exec_json('board.getBoardAdminCategoryTplInfo', params, function(data){
+ jQuery('#category_info').html(data.tpl);
+ });
+}
+
+
+function nodeToggleAll(){
+ jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
+ simpleTreeCollection[0].nodeToggle(this);
+ });
+}
+
+function deleteNode(node){
+ if(confirm(lang_confirm_delete)){
+ jQuery('#category_info').html("");
+ var params ={
+ "category_srl":node
+ ,"parent_srl":0
+ ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+ };
+
+ jQuery.exec_json('board.procBoardAdminDeleteCategory', params, function(data){
+ if(data.error==0) Tree(xml_url);
+ });
+ }
+}
+
+/* 카테고리 아이템 입력후 */
+function completeInsertCategory(ret_obj) {
+ jQuery('#category_info').html("");
+ Tree(xml_url);
+}
+
+function hideCategoryInfo() {
+ jQuery('#category_info').html("");
+}
+
+/* 카테고리 목록 갱신 */
+function doReloadTreeCategory(module_srl) {
+ var params = new Array();
+ params["module_srl"] = module_srl;
+
+ // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다.
+ var response_tags = new Array('error','message', 'xml_file');
+ exec_xml('board', 'procBoardAdminMakeXmlFile', params, completeInsertCategory, response_tags, params);
+}
\ No newline at end of file
diff --git a/modules/board/tpl/skin_info.html b/modules/board/tpl/skin_info.html
index 998bec559..ad54348d1 100644
--- a/modules/board/tpl/skin_info.html
+++ b/modules/board/tpl/skin_info.html
@@ -13,7 +13,7 @@
{$lang->skin}
{$lang->skin_author}
{$lang->homepage}
{$lang->date}
{$lang->description}
{$val->title}
| diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index b2a45f9f5..2245ff497 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -35,7 +35,7 @@ | ||||||||||||||||||
| {$no} | {htmlspecialchars($module_list[$val->module_srl]->browser_title)} | {htmlspecialchars($val->nick_name)} | diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html index 6db771a78..6b88410e6 100644 --- a/modules/comment/tpl/comment_module_config.html +++ b/modules/comment/tpl/comment_module_config.html @@ -12,7 +12,7 @@||||||||||||||||
| diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html index 1196f17f1..4fc17ae10 100644 --- a/modules/comment/tpl/declared_list.html +++ b/modules/comment/tpl/declared_list.html @@ -24,7 +24,7 @@ | ||||||||||||||||||
| {$no} | {$oComment->getSummary(100)} | {$oComment->getNickName()} | diff --git a/modules/comment/tpl/js/comment_admin.js b/modules/comment/tpl/js/comment_admin.js index a4093b0fc..57b99158c 100644 --- a/modules/comment/tpl/js/comment_admin.js +++ b/modules/comment/tpl/js/comment_admin.js @@ -1,31 +1,14 @@ -function doCheckAll(bToggle) { - var fo_obj = xGetElementById('fo_list'); - if(typeof(bToggle) == "undefined") bToggle = false; - for(var i=0;i||||||||||||||||
{$lang->editor_skin} |
|
|---|---|
{$lang->colorset} |