[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17132] property, report: entity decode
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [17132] property, report: entity decode |
Date: |
Tue, 3 Oct 2017 10:13:23 -0400 (EDT) |
Revision: 17132
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17132
Author: sigurdne
Date: 2017-10-03 10:13:22 -0400 (Tue, 03 Oct 2017)
Log Message:
-----------
property, report: entity decode
Modified Paths:
--------------
trunk/property/inc/class.soreport.inc.php
Modified: trunk/property/inc/class.soreport.inc.php
===================================================================
--- trunk/property/inc/class.soreport.inc.php 2017-10-03 12:02:27 UTC (rev
17131)
+++ trunk/property/inc/class.soreport.inc.php 2017-10-03 14:13:22 UTC (rev
17132)
@@ -423,7 +423,7 @@
$value = array();
foreach ($columns as $column)
{
- $value[$column] = $this->db->f($column);
+ $value[$column] =
$this->db->f($column,true);
}
foreach ($functions as $k => $v)
@@ -523,8 +523,8 @@
$values = array
(
'id' => $this->db->f('id'),
- 'view_name' =>
$this->db->f('view_name'),
- 'dataset_name' =>
$this->db->f('dataset_name')
+ 'view_name' =>
$this->db->f('view_name',true),
+ 'dataset_name' =>
$this->db->f('dataset_name',true)
);
}
@@ -588,8 +588,8 @@
$values[] = array
(
'id' => $this->db->f('id'),
- 'view_name' =>
$this->db->f('view_name'),
- 'dataset_name' =>
$this->db->f('dataset_name'),
+ 'view_name' =>
$this->db->f('view_name',true),
+ 'dataset_name' =>
$this->db->f('dataset_name',true),
'n_reports' => $this->db->f('n_reports')
);
}
@@ -603,7 +603,7 @@
$values_insert = array
(
'dataset_id' => $data['dataset_id'],
- 'report_name' => $data['report_name'],
+ 'report_name' =>
$this->db->db_addslashes($data['report_name']),
'report_definition' =>
json_encode($data['report_definition']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -634,7 +634,7 @@
$value_set = array
(
'dataset_id' => $data['dataset_id'],
- 'report_name' => $data['report_name'],
+ 'report_name' =>
$this->db->db_addslashes($data['report_name']),
'report_definition' =>
json_encode($data['report_definition']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -644,7 +644,7 @@
$this->db->transaction_begin();
- $this->db->query("UPDATE fm_view_dataset_report SET
{$value_set} WHERE id='" . $data['id'] . "'", __LINE__, __FILE__);
+ $this->db->query("UPDATE fm_view_dataset_report SET
{$value_set} WHERE id='" . (int)$data['id'] . "'", __LINE__, __FILE__);
$receipt['id'] = $data['id'];
if ($this->db->transaction_commit())
@@ -686,7 +686,7 @@
$receipt = array();
$values_insert = array
(
- 'view_name' => $data['view_name'],
+ 'view_name' =>
$this->db->db_addslashes($data['view_name']),
'dataset_name' =>
$this->db->db_addslashes($data['dataset_name']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
@@ -716,7 +716,7 @@
$value_set = array
(
- 'view_name' => $data['view_name'],
+ 'view_name' =>
$this->db->db_addslashes($data['view_name']),
'dataset_name' =>
$this->db->db_addslashes($data['dataset_name']),
'owner_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
'entry_date' => time()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17132] property, report: entity decode,
sigurdne <=