[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11061] htmlspecialchars_decode is moved to db abstra
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11061] htmlspecialchars_decode is moved to db abstraction class |
|
Date: |
Thu, 18 Apr 2013 11:14:48 +0000 |
Revision: 11061
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11061
Author: sigurdne
Date: 2013-04-18 11:14:48 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
htmlspecialchars_decode is moved to db abstraction class
Modified Paths:
--------------
trunk/property/inc/class.historylog.inc.php
trunk/property/inc/class.soagreement.inc.php
trunk/property/inc/class.sopricebook.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.sotts.inc.php
trunk/property/inc/class.sowo_hour.inc.php
Modified: trunk/property/inc/class.historylog.inc.php
===================================================================
--- trunk/property/inc/class.historylog.inc.php 2013-04-15 10:26:27 UTC (rev
11060)
+++ trunk/property/inc/class.historylog.inc.php 2013-04-18 11:14:48 UTC (rev
11061)
@@ -207,8 +207,8 @@
'owner' =>
$GLOBALS['phpgw']->accounts->id2name($this->db->f('history_owner')),
// 'status' =>
lang($this->types[$this->db->f('history_status')]),
'status' =>
preg_replace('/ /','',$this->db->f('history_status')),
- 'new_value' =>
htmlspecialchars_decode($this->db->f('history_new_value',true)),
- 'old_value' =>
htmlspecialchars_decode($this->db->f('history_old_value',true)),
+ 'new_value' =>
$this->db->f('history_new_value',true),
+ 'old_value' =>
$this->db->f('history_old_value',true),
'datetime' =>
strtotime($this->db->f('history_timestamp')),
'publish' =>
$this->db->f('publish')
);
Modified: trunk/property/inc/class.soagreement.inc.php
===================================================================
--- trunk/property/inc/class.soagreement.inc.php 2013-04-15 10:26:27 UTC
(rev 11060)
+++ trunk/property/inc/class.soagreement.inc.php 2013-04-18 11:14:48 UTC
(rev 11061)
@@ -517,7 +517,7 @@
'activity_id' =>
$this->db->f('activity_id'),
'id'
=> $this->db->f('id'),
'num'
=> $this->db->f('num'),
- 'descr'
=> htmlspecialchars_decode($this->db->f('descr',true)),
+ 'descr'
=> $this->db->f('descr',true),
'unit'
=> $this->db->f('unit'),
'unit_name'
=> $this->db->f('unit_name'),
'm_cost'
=> $this->db->f('m_cost'),
Modified: trunk/property/inc/class.sopricebook.inc.php
===================================================================
--- trunk/property/inc/class.sopricebook.inc.php 2013-04-15 10:26:27 UTC
(rev 11060)
+++ trunk/property/inc/class.sopricebook.inc.php 2013-04-18 11:14:48 UTC
(rev 11061)
@@ -276,8 +276,8 @@
'unit_name' =>
$this->db->f('unit_name'),
'dim_d' =>
$this->db->f('dim_d'),
'ns3420_id' =>
$this->db->f('ns3420'),
- 'descr' =>
htmlspecialchars_decode($this->db->f('descr',true)),
- 'base_descr' =>
htmlspecialchars_decode($this->db->f('base_descr',true)),
+ 'descr' =>
$this->db->f('descr',true),
+ 'base_descr' =>
$this->db->f('base_descr',true),
'index_count' =>
$this->db->f('index_count'),
'agreement_id' =>
$this->db->f('fm_agreement.id')
);
@@ -512,13 +512,13 @@
(
'activity_id' =>
$this->db->f('activity_id'),
'num' =>
$this->db->f('num'),
- 'base_descr' =>
htmlspecialchars_decode($this->db->f('base_descr',true)),
+ 'base_descr' =>
$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'),
'unit_name' =>
$this->db->f('unit_name'),
- 'descr' =>
htmlspecialchars_decode($this->db->f('descr',true))
+ 'descr' =>
$this->db->f('descr',true)
);
}
// _debug_array($pricebook);
@@ -612,8 +612,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'] =
htmlspecialchars_decode($this->db->f('descr',true));
- $activity['base_descr'] =
htmlspecialchars_decode($this->db->f('base_descr',true));
+ $activity['descr'] =
$this->db->f('descr',true);
+ $activity['base_descr'] =
$this->db->f('base_descr',true);
$activity['dim_d'] =
$this->db->f('dim_d');
$activity['branch_id'] =
$this->db->f('branch_id');
@@ -632,7 +632,7 @@
$agreement_group['agreement_group_id'] = $id;
$agreement_group['num'] =
$this->db->f('num');
$agreement_group['status'] =
$this->db->f('status');
- $agreement_group['descr']
= stripslashes($this->db->f('descr'));
+ $agreement_group['descr'] =
$this->db->f('descr',true);
return $agreement_group;
}
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2013-04-15 10:26:27 UTC (rev
11060)
+++ trunk/property/inc/class.soproject.inc.php 2013-04-18 11:14:48 UTC (rev
11061)
@@ -2711,7 +2711,7 @@
'id' =>
$this->db->f('id'),
'project_id' =>
$this->db->f('project_id'),
'closed' =>
$this->db->f('closed'),
- 'title' =>
htmlspecialchars_decode($this->db->f('title',true)),
+ 'title' =>
$this->db->f('title',true),
'status' =>
$this->db->f('status',true),
'actual_cost' =>
(float)$this->db->f('actual_cost'),
'start_date' =>
$GLOBALS['phpgw']->common->show_date($this->db->f('start_date'),$dateformat),
Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php 2013-04-15 10:26:27 UTC (rev
11060)
+++ trunk/property/inc/class.sotts.inc.php 2013-04-18 11:14:48 UTC (rev
11061)
@@ -620,7 +620,7 @@
$ticket['cat_id'] =
$this->db->f('cat_id');
$ticket['subject'] =
$this->db->f('subject', true);
$ticket['priority'] =
$this->db->f('priority');
- $ticket['details'] =
htmlspecialchars ($this->db->f('details', true));
+ $ticket['details'] =
$this->db->f('details', true);
$ticket['location_code'] =
$this->db->f('location_code');
$ticket['contact_phone'] =
$this->db->f('contact_phone');
$ticket['contact_email'] =
$this->db->f('contact_email',true);
Modified: trunk/property/inc/class.sowo_hour.inc.php
===================================================================
--- trunk/property/inc/class.sowo_hour.inc.php 2013-04-15 10:26:27 UTC (rev
11060)
+++ trunk/property/inc/class.sowo_hour.inc.php 2013-04-18 11:14:48 UTC (rev
11061)
@@ -127,7 +127,7 @@
(
'hour_id'
=> $this->db->f('id'),
'activity_num' =>
$this->db->f('activity_num'),
- 'hours_descr' =>
htmlspecialchars_decode($this->db->f('hours_descr',true)),
+ 'hours_descr' =>
$this->db->f('hours_descr',true),
'owner'
=> $this->db->f('owner'),
'quantity'
=> $this->db->f('quantity'),
'grouping_id' =>
$this->db->f('grouping_id'),
@@ -548,7 +548,7 @@
$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['hours_descr'] =
$this->db->f('hours_descr',true);
$hour['remark'] =
$this->db->f('remark');
$hour['billperae'] =
$this->db->f('billperae');
$hour['unit'] =
$this->db->f('unit');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11061] htmlspecialchars_decode is moved to db abstraction class,
Sigurd Nes <=