r8032 보안

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@8035 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2011-01-20 09:17:02 +00:00
parent fdab40757a
commit 144a922954
8 changed files with 217 additions and 77 deletions

View file

@ -639,7 +639,11 @@
}
}
if(!$output->columns) $output->columns = array('*');
$click_count = array();
if(!$output->columns){
$output->columns = array(array('name'=>'*'));
}
$column_list = array();
foreach($output->columns as $key => $val) {
$name = $val['name'];
@ -696,7 +700,13 @@
if(count($output->arg_columns))
{
$columns = '[' . join('],[',$output->arg_columns) . ']';
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']';
else $columns[] = $col;
}
$columns = join(',',$columns);
}
$query = sprintf("%s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
@ -812,7 +822,13 @@
if(count($output->arg_columns))
{
$columns = '[' . join('],[',$output->arg_columns) . ']';
$columns = array();
foreach($output->arg_columns as $col){
if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']';
else $columns[] = $col;
}
$columns = join(',',$columns);
}
if($start_count<1) {