[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6791] Merge 6789:6790 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6791] Merge 6789:6790 from trunk |
|
Date: |
Mon, 17 Jan 2011 19:39:46 +0000 |
Revision: 6791
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6791
Author: sigurdne
Date: 2011-01-17 19:39:46 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Merge 6789:6790 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
branches/Version-1_0-branch/property/inc/class.sopricebook.inc.php
branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790
Modified: branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
2011-01-17 19:34:47 UTC (rev 6790)
+++ branches/Version-1_0-branch/property/inc/class.soagreement.inc.php
2011-01-17 19:39:46 UTC (rev 6791)
@@ -379,17 +379,15 @@
function read_details($data)
{
- if(is_array($data))
- {
- $start =
(isset($data['start'])?$data['start']:0);
- $filter =
(isset($data['filter'])?$data['filter']:'none');
- $query =
(isset($data['query'])?$data['query']:'');
- $sort =
(isset($data['sort'])?$data['sort']:'DESC');
- $order =
(isset($data['order'])?$data['order']:'');
- $cat_id =
(isset($data['cat_id'])?$data['cat_id']:'');
- $allrows =
(isset($data['allrows'])?$data['allrows']:'');
- $agreement_id =
(isset($data['agreement_id'])?$data['agreement_id']:'');
- }
+ $start = isset($data['start'])
&& $data['start'] ? $data['start']:0;
+ $filter =
isset($data['filter']) && $data['filter'] ? $data['filter']:'none';
+ $query = isset($data['query'])
? $data['query'] : '';
+ $sort = isset($data['sort'])
&& $data['sort'] ? $data['sort']:'DESC';
+ $order = isset($data['order'])
? $data['order'] : '';
+ $cat_id =
isset($data['cat_id']) ? $data['cat_id'] : '';
+ $allrows =
isset($data['allrows']) ? $data['allrows'] : '';
+ $agreement_id = isset($data['agreement_id'])
? $data['agreement_id'] : '';
+
$allrows = true; // return all..
$entity_table = 'fm_activity_price_index';
@@ -493,7 +491,7 @@
'activity_id' =>
$this->db->f('activity_id'),
'id'
=> $this->db->f('id'),
'num'
=> $this->db->f('num'),
- 'descr'
=> $this->db->f('descr'),
+ 'descr'
=> htmlspecialchars_decode($this->db->f('descr',true)),
'unit'
=> $this->db->f('unit'),
'm_cost'
=> $this->db->f('m_cost'),
'w_cost'
=> $this->db->f('w_cost'),
Modified: branches/Version-1_0-branch/property/inc/class.sopricebook.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sopricebook.inc.php
2011-01-17 19:34:47 UTC (rev 6790)
+++ branches/Version-1_0-branch/property/inc/class.sopricebook.inc.php
2011-01-17 19:39:46 UTC (rev 6791)
@@ -272,8 +272,8 @@
'unit' =>
$this->db->f('unit'),
'dim_d' =>
$this->db->f('dim_d'),
'ns3420_id' =>
$this->db->f('ns3420'),
- 'descr' =>
stripslashes($this->db->f('descr')),
- 'base_descr' =>
stripslashes($this->db->f('base_descr')),
+ 'descr' =>
htmlspecialchars_decode($this->db->f('descr',true)),
+ 'base_descr' =>
htmlspecialchars_decode($this->db->f('base_descr',true)),
'index_count' =>
$this->db->f('index_count'),
'agreement_id' =>
$this->db->f('fm_agreement.id')
);
@@ -504,12 +504,12 @@
(
'activity_id' =>
$this->db->f('activity_id'),
'num' =>
$this->db->f('num'),
- 'base_descr' =>
stripslashes($this->db->f('base_descr')),
+ 'base_descr' =>
htmlspecialchars_decode($this->db->f('base_descr',true)),
'branch' =>
$this->db->f('branch'),
'dim_d' =>
$this->db->f('dim_d'),
'ns3420' =>
$this->db->f('ns3420'),
'unit' =>
$this->db->f('unit'),
- 'descr' =>
stripslashes($this->db->f('descr'))
+ 'descr' =>
htmlspecialchars_decode($this->db->f('descr',true))
);
}
// _debug_array($pricebook);
@@ -603,8 +603,8 @@
$activity['unit'] =
$this->db->f('unit');
$activity['cat_id'] =
$this->db->f('agreement_group_id');
$activity['ns3420_id'] =
$this->db->f('ns3420');
- $activity['descr'] =
stripslashes($this->db->f('descr'));
- $activity['base_descr'] =
stripslashes($this->db->f('base_descr'));
+ $activity['descr'] =
htmlspecialchars_decode($this->db->f('descr',true));
+ $activity['base_descr'] =
htmlspecialchars_decode($this->db->f('base_descr',true));
$activity['dim_d'] =
$this->db->f('dim_d');
$activity['branch_id'] =
$this->db->f('branch_id');
Modified: branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
2011-01-17 19:34:47 UTC (rev 6790)
+++ branches/Version-1_0-branch/property/inc/class.sowo_hour.inc.php
2011-01-17 19:39:46 UTC (rev 6791)
@@ -125,11 +125,11 @@
(
'hour_id'
=> $this->db->f('id'),
'activity_num' =>
$this->db->f('activity_num'),
- 'hours_descr' =>
stripslashes($this->db->f('hours_descr')),
+ 'hours_descr' =>
htmlspecialchars_decode($this->db->f('hours_descr',true)),
'owner'
=> $this->db->f('owner'),
'quantity'
=> $this->db->f('quantity'),
'grouping_id' =>
$this->db->f('grouping_id'),
- 'grouping_descr' =>
$this->db->f('grouping_descr'),
+ 'grouping_descr' =>
$this->db->f('grouping_descr',true),
'ns3420_id'
=> $this->db->f('ns3420_id'),
'tolerance'
=> $this->db->f('tolerance'),
'activity_id' =>
$this->db->f('activity_id'),
@@ -542,21 +542,21 @@
{
$hour['hour_id'] =
$this->db->f('id');
$hour['record'] =
$this->db->f('record');
- $hour['activity_id'] =
$this->db->f('activity_id');
- $hour['activity_num'] =
$this->db->f('activity_num');
- $hour['grouping_id'] =
$this->db->f('grouping_id');
- $hour['hours_descr'] =
$this->db->f('hours_descr');
+ $hour['activity_id'] =
$this->db->f('activity_id');
+ $hour['activity_num'] =
$this->db->f('activity_num');
+ $hour['grouping_id'] =
$this->db->f('grouping_id');
+ $hour['hours_descr'] =
htmlspecialchars_decode($this->db->f('hours_descr',true));
$hour['remark'] =
$this->db->f('remark');
$hour['billperae'] =
$this->db->f('billperae');
$hour['unit'] =
$this->db->f('unit');
$hour['ns3420_id'] =
$this->db->f('ns3420_id');
- $hour['tolerance_id'] =
(int)$this->db->f('tolerance');
- $hour['building_part_id'] =
(int)$this->db->f('building_part');
+ $hour['tolerance_id'] =
(int)$this->db->f('tolerance');
+ $hour['building_part_id'] =
(int)$this->db->f('building_part');
$hour['quantity'] =
$this->db->f('quantity');
$hour['cost'] =
$this->db->f('cost');
$hour['dim_d'] =
$this->db->f('dim_d');
- $hour['wo_hour_cat'] =
$this->db->f('category');
- $hour['cat_per_cent'] =
$this->db->f('cat_per_cent');
+ $hour['wo_hour_cat'] =
$this->db->f('category');
+ $hour['cat_per_cent'] =
$this->db->f('cat_per_cent');
}
return $hour;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6791] Merge 6789:6790 from trunk,
Sigurd Nes <=