Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the posibility to mark data as safe #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added the posibility to mark data as safe #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions application/libraries/Datatables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Datatables
private $add_columns = array();
private $edit_columns = array();
private $unset_columns = array();
private $use_xss = true;

/**
* Copies an instance of CI
Expand Down Expand Up @@ -265,8 +266,10 @@ public function unset_column($column)
* @param string $charset
* @return string
*/
public function generate($output = 'json', $charset = 'UTF-8')
public function generate($safe = true, $output = 'json', $charset = 'UTF-8')
{
$this->use_xss = $safe;

if(strtolower($output) == 'json')
$this->get_paging();

Expand All @@ -282,8 +285,8 @@ public function generate($output = 'json', $charset = 'UTF-8')
*/
private function get_paging()
{
$iStart = $this->ci->input->post('start');
$iLength = $this->ci->input->post('length');
$iStart = $this->ci->input->post('start', $this->use_xss);
$iLength = $this->ci->input->post('length', $this->use_xss);

if($iLength != '' && $iLength != '-1')
$this->ci->db->limit($iLength, ($iStart)? $iStart : 0);
Expand All @@ -298,14 +301,16 @@ private function get_ordering()
{

$Data = $this->ci->input->post('columns');
$order = $this->ci->input->post('order');


if ($this->ci->input->post('order'))
foreach ($this->ci->input->post('order') as $key)
if ($order) {
foreach ($order as $key) {
if($this->check_cType())
$this->ci->db->order_by($Data[$key['column']]['data'], $key['dir']);
else
$this->ci->db->order_by($this->columns[$key['column']] , $key['dir']);
}
}

}

Expand All @@ -317,10 +322,10 @@ private function get_ordering()
private function get_filtering()
{

$mColArray = $this->ci->input->post('columns');
$mColArray = $this->ci->input->post('columns', $this->use_xss);

$sWhere = '';
$search = $this->ci->input->post('search');
$search = $this->ci->input->post('search', $this->use_xss);
$sSearch = $this->ci->db->escape_like_str(trim($search['value']));
$columns = array_values(array_diff($this->columns, $this->unset_columns));

Expand Down Expand Up @@ -398,19 +403,16 @@ private function produce_output($output, $charset)
{
$sOutput = array
(
'draw' => intval($this->ci->input->post('draw')),
'draw' => intval($this->ci->input->post('draw'), $this->use_xss),
'recordsTotal' => $iTotal,
'recordsFiltered' => $iFilteredTotal,
'data' => $aaData
);

if($charset == 'utf-8')
return json_encode($sOutput);
else
return $this->jsonify($sOutput);
}
else
return json_encode($sOutput);
} else {
return array('aaData' => $aaData);
}
}

/**
Expand Down Expand Up @@ -508,7 +510,7 @@ private function exec_replace($custom_val, $row_data)
*/
private function check_cType()
{
$column = $this->ci->input->post('columns');
$column = $this->ci->input->post('columns', $this->use_xss);
if(is_numeric($column[0]['data']))
return FALSE;
else
Expand Down Expand Up @@ -626,8 +628,8 @@ private function jsonify($result = FALSE)
return '{' . join(',', $json) . '}';
}
}
/**
/**
* returns the sql statement of the last query run
* @return type
*/
Expand All @@ -637,4 +639,4 @@ public function last_query()
}
}
/* End of file Datatables.php */
/* Location: ./application/libraries/Datatables.php */
/* Location: ./application/libraries/Datatables.php */