[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.soproject.inc.php, 1.23 class.sore
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.soproject.inc.php, 1.23 class.sorequest.inc.php, 1.9 class.sos_agreement.inc.php, 1.14 class.sotts.inc.php, 1.9 class.solookup.inc.php, 1.7 class.solocation.inc.php, 1.17 class.sodocument.inc.php, 1.7 class.soentity.inc.php, 1.9 class.sogab.inc.php, 1.12 class.soinvestment.inc.php, 1.6 class.socategory.inc.php, 1.9 |
|
Date: |
Fri, 19 Aug 2005 13:56:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
class.soproject.inc.php lines: +26 -30
class.sorequest.inc.php lines: +6 -6
class.sos_agreement.inc.php lines: +6 -6
class.sotts.inc.php lines: +5 -5
class.solookup.inc.php lines: +3 -3
class.solocation.inc.php lines: +8 -8
class.sodocument.inc.php lines: +6 -6
class.soentity.inc.php lines: +4 -4
class.sogab.inc.php lines: +6 -6
class.soinvestment.inc.php lines: +11 -11
class.socategory.inc.php lines: +4 -4
Log Message:
no message
====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.22
property/inc/class.soproject.inc.php:1.23
--- property/inc/class.soproject.inc.php:1.22 Fri Jun 10 09:47:52 2005
+++ property/inc/class.soproject.inc.php Fri Aug 19 11:56:50 2005
@@ -231,7 +231,6 @@
$where= 'AND';
}
-
}
else
{
@@ -275,16 +274,14 @@
$this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
}
-
$j=0;
$k=count($cols_return);
while ($this->db->next_record())
{
for ($i=0;$i<$k;$i++)
{
- $project_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $project_list[$j][$cols_return[$i]] =
stripslashes($this->db->f($cols_return[$i]));
$project_list[$j]['grants'] =
(int)$this->grants[$this->db->f('user_id')];
-
}
$location_code= $this->db->f('location_code');
@@ -316,26 +313,26 @@
if ($this->db->next_record())
{
$project['project_id'] =
$this->db->f('id');
- $project['title']
= $this->db->f('title');
- $project['name']
= $this->db->f('name');
+ $project['title'] =
$this->db->f('title');
+ $project['name'] =
$this->db->f('name');
$project['location_code'] =
$this->db->f('location_code');
$project['key_fetch'] =
$this->db->f('key_fetch');
$project['key_deliver'] =
$this->db->f('key_deliver');
$project['other_branch'] =
$this->db->f('other_branch');
$project['key_responsible'] =
$this->db->f('key_responsible');
- $project['descr']
= $this->db->f('descr');
- $project['status']
= $this->db->f('status');
- $project['budget']
= (int)$this->db->f('budget');
- $project['reserve']
= (int)$this->db->f('reserve');
+ $project['descr'] =
$this->db->f('descr');
+ $project['status'] =
$this->db->f('status');
+ $project['budget'] =
(int)$this->db->f('budget');
+ $project['reserve'] =
(int)$this->db->f('reserve');
$project['tenant_id'] =
$this->db->f('tenant_id');
- $project['user_id']
= $this->db->f('user_id');
+ $project['user_id'] =
$this->db->f('user_id');
$project['coordinator'] =
$this->db->f('coordinator');
- $project['access']
= $this->db->f('access');
+ $project['access'] =
$this->db->f('access');
$project['start_date'] =
$this->db->f('start_date');
$project['end_date'] =
$this->db->f('end_date');
- $project['cat_id']
= $this->db->f('category');
- $project['grants']
= (int)$this->grants[$this->db->f('user_id')];
- $project['p_num']
= $this->db->f('p_num');
+ $project['cat_id'] =
$this->db->f('category');
+ $project['grants'] =
(int)$this->grants[$this->db->f('user_id')];
+ $project['p_num'] =
$this->db->f('p_num');
$project['p_entity_id'] =
$this->db->f('p_entity_id');
$project['p_cat_id'] =
$this->db->f('p_cat_id');
$project['contact_phone'] =
$this->db->f('contact_phone');
@@ -453,7 +450,6 @@
}
}
-
while (is_array($project['extra']) &&
list($input_name,$value) = each($project['extra']))
{
if($value)
@@ -473,12 +469,12 @@
{
$address[]= $project['street_name'];
$address[]= $project['street_number'];
- $address = implode(" ", $address);
+ $address = $this->db->db_addslashes(implode("
", $address));
}
if(!$address)
{
- $address = $project['location_name'];
+ $address =
$this->db->db_addslashes($project['location_name']);
}
$project['descr'] =
$this->db->db_addslashes($project['descr']);
@@ -650,33 +646,33 @@
{
$address[]= $project['street_name'];
$address[]= $project['street_number'];
- $address = implode(" ", $address);
+ $address = $this->db->db_addslashes(implode("
", $address));
}
if(!$address)
{
- $address = $project['location_name'];
+ $address =
$this->db->db_addslashes($project['location_name']);
}
$project['descr'] =
$this->db->db_addslashes($project['descr']);
$project['name'] =
$this->db->db_addslashes($project['name']);
$value_set=array(
- 'name' =>
$project['name'],
- 'status' =>
$project['status'],
- 'category' =>
$project['cat_id'],
+ 'name' => $project['name'],
+ 'status' => $project['status'],
+ 'category' => $project['cat_id'],
'start_date' =>
$project['start_date'],
- 'end_date' =>
$project['end_date'],
+ 'end_date' => $project['end_date'],
'coordinator' =>
$project['coordinator'],
- 'descr' =>
$project['descr'],
- 'budget' =>
(int)$project['budget'],
- 'reserve' =>
(int)$project['reserve'],
+ 'descr' => $project['descr'],
+ 'budget' =>
(int)$project['budget'],
+ 'reserve' =>
(int)$project['reserve'],
'key_deliver' =>
$project['key_deliver'],
- 'key_fetch' =>
$project['key_fetch'],
+ 'key_fetch' =>
$project['key_fetch'],
'other_branch' =>
$project['other_branch'],
'key_responsible' =>
$project['key_responsible'],
'location_code' =>
$project['location_code'],
- 'address' => $address
+ 'address' => $address
);
$value_set =
$this->bocommon->validate_db_update($value_set);
====================================================
Index: property/inc/class.sorequest.inc.php
diff -u property/inc/class.sorequest.inc.php:1.8
property/inc/class.sorequest.inc.php:1.9
--- property/inc/class.sorequest.inc.php:1.8 Thu May 12 21:26:28 2005
+++ property/inc/class.sorequest.inc.php Fri Aug 19 11:56:50 2005
@@ -299,7 +299,7 @@
{
for ($i=0;$i<count($cols_return);$i++)
{
- $request_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $request_list[$j][$cols_return[$i]] =
stripslashes($this->db->f($cols_return[$i]));
}
$location_code= $this->db->f('location_code');
@@ -481,12 +481,12 @@
{
$address[]= $request['street_name'];
$address[]= $request['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $request['location_name'];
+ $address =
$this->db->db_addslashes($request['location_name']);
}
$request['descr'] =
$this->db->db_addslashes($request['descr']);
@@ -600,12 +600,12 @@
{
$address[]= $request['street_name'];
$address[]= $request['street_number'];
- $address = implode(" ", $address);
+ $address = $this->db->db_addslashes(implode("
", $address));
}
if(!$address)
{
- $address = $request['location_name'];
+ $address =
$this->db->db_addslashes($request['location_name']);
}
====================================================
Index: property/inc/class.sos_agreement.inc.php
diff -u property/inc/class.sos_agreement.inc.php:1.13
property/inc/class.sos_agreement.inc.php:1.14
--- property/inc/class.sos_agreement.inc.php:1.13 Thu May 12 21:26:28 2005
+++ property/inc/class.sos_agreement.inc.php Fri Aug 19 11:56:50 2005
@@ -379,7 +379,7 @@
{
for ($i=0;$i<$n;$i++)
{
- $s_agreement_list[$j][$cols_return[$i]]
= $this->db->f($cols_return[$i]);
+ $s_agreement_list[$j][$cols_return[$i]]
= stripslashes($this->db->f($cols_return[$i]));
$s_agreement_list[$j]['grants'] =
(int)$grants[$this->db->f('user_id')];
}
@@ -755,12 +755,12 @@
{
$address[]= $values['street_name'];
$address[]= $values['street_number'];
- $address = implode(" ", $address);
+ $address = $this->db->db_addslashes(implode("
", $address));
}
if(!$address)
{
- $address = $values['location_name'];
+ $address =
$this->db->db_addslashes($values['location_name']);
}
$cols[] = 'address';
@@ -872,12 +872,12 @@
{
$address[]= $values['street_name'];
$address[]= $values['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $values['location_name'];
+ $address =
$this->db->db_addslashes($values['location_name']);
}
$value_set['location_code'] =
$values['location_code'];
====================================================
Index: property/inc/class.sotts.inc.php
diff -u property/inc/class.sotts.inc.php:1.8
property/inc/class.sotts.inc.php:1.9
--- property/inc/class.sotts.inc.php:1.8 Thu May 12 21:26:28 2005
+++ property/inc/class.sotts.inc.php Fri Aug 19 11:56:50 2005
@@ -192,7 +192,7 @@
$tickets[$i]['subject'] =
$this->db->f('subject');
$tickets[$i]['location_code'] =
$this->db->f('location_code');
$tickets[$i]['user'] =
$this->db->f('user_lid');
- $tickets[$i]['address'] =
$this->db->f('address');
+ $tickets[$i]['address'] =
stripslashes($this->db->f('address'));
$tickets[$i]['assignedto'] =
$this->db->f('assignedto');
$tickets[$i]['status'] =
$this->db->f('status');
$tickets[$i]['priority'] =
$this->db->f('priority');
@@ -299,7 +299,7 @@
$ticket['details'] =
stripslashes($this->db->f('details'));
$ticket['location_code'] =
$this->db->f('location_code');
$ticket['contact_phone'] =
$this->db->f('contact_phone');
- $ticket['address'] =
$this->db->f('address');
+ $ticket['address'] =
stripslashes($this->db->f('address'));
$ticket['tenant_id'] =
$this->db->f('tenant_id');
$ticket['p_num'] =
$this->db->f('p_num');
$ticket['p_entity_id'] =
$this->db->f('p_entity_id');
@@ -385,12 +385,12 @@
{
$address[]= $ticket['street_name'];
$address[]= $ticket['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $ticket['location_name'];
+ $address =
$this->db->db_addslashes($ticket['location_name']);
}
$values= array(
====================================================
Index: property/inc/class.solookup.inc.php
diff -u property/inc/class.solookup.inc.php:1.6
property/inc/class.solookup.inc.php:1.7
--- property/inc/class.solookup.inc.php:1.6 Thu May 12 21:26:28 2005
+++ property/inc/class.solookup.inc.php Fri Aug 19 11:56:50 2005
@@ -265,8 +265,8 @@
{
$street[] = array
(
- 'id' =>
$this->db->f('id'),
- 'street_name' => $this->db->f('descr')
+ 'id' => $this->db->f('id'),
+ 'street_name' =>
stripslashes($this->db->f('descr'))
);
}
====================================================
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.16
property/inc/class.solocation.inc.php:1.17
--- property/inc/class.solocation.inc.php:1.16 Wed May 25 07:39:28 2005
+++ property/inc/class.solocation.inc.php Fri Aug 19 11:56:50 2005
@@ -30,9 +30,9 @@
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->socommon =
CreateObject($this->currentapp.'.socommon');
- $this->join = $this->socommon->join;
+ $this->join = $this->socommon->join;
$this->left_join = $this->socommon->left_join;
- $this->like = $this->socommon->like;
+ $this->like = $this->socommon->like;
}
function read_entity_to_link()
@@ -184,16 +184,16 @@
$cols = "fm_location" . ($type_id)
.".location_code";
$cols_return[] = 'location_code';
$uicols['input_type'][] = 'hidden';
- $uicols['name'][] =
'location_code';
- $uicols['descr'][] =
'dummy';
+ $uicols['name'][] =
'location_code';
+ $uicols['descr'][] = 'dummy';
$uicols['statustext'][] = 'dummy';
$uicols['exchange'][] = false;
for ($i=0; $i<($type_id); $i++)
{
$uicols['input_type'][] =
'text';
- $uicols['name'][]
= 'loc' . $location_types[$i]['id'];
- $uicols['descr'][]
= $location_types[$i]['name'];
+ $uicols['name'][] = 'loc'
. $location_types[$i]['id'];
+ $uicols['descr'][] =
$location_types[$i]['name'];
$uicols['statustext'][] =
$location_types[$i]['descr'];
$uicols['exchange'][] = True;
$cols .= ",fm_location" . ($type_id)
.".loc" . $location_types[$i]['id'];
@@ -514,7 +514,7 @@
{
for ($i=0;$i<$cols_return_count;$i++)
{
- $location_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $location_list[$j][$cols_return[$i]] =
stripslashes($this->db->f($cols_return[$i]));
$value = $this->db->f($cols_return[$i]);
if($uicols['cols_return_extra'][$i])
====================================================
Index: property/inc/class.sodocument.inc.php
diff -u property/inc/class.sodocument.inc.php:1.6
property/inc/class.sodocument.inc.php:1.7
--- property/inc/class.sodocument.inc.php:1.6 Thu May 12 21:26:28 2005
+++ property/inc/class.sodocument.inc.php Fri Aug 19 11:56:50 2005
@@ -235,7 +235,7 @@
{
for ($i=0;$i<count($cols_return);$i++)
{
- $document_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $document_list[$j][$cols_return[$i]] =
stripslashes($this->db->f($cols_return[$i]));
}
$location_code= $this->db->f('location_code');
@@ -395,12 +395,12 @@
{
$address[]= $document['street_name'];
$address[]= $document['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $document['location_name'];
+ $address =
$this->db->db_addslashes($document['location_name']);
}
$document['descr'] =
$this->db->db_addslashes($document['descr']);
@@ -474,12 +474,12 @@
{
$address[]= $document['street_name'];
$address[]= $document['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $document['location_name'];
+ $address =
$this->db->db_addslashes($document['location_name']);
}
$this->db->query("SELECT
status,category,coordinator,document_name,loc1,link,p_num FROM fm_document
where id='" .$document['document_id']."'",__LINE__,__FILE__);
====================================================
Index: property/inc/class.soentity.inc.php
diff -u property/inc/class.soentity.inc.php:1.8
property/inc/class.soentity.inc.php:1.9
--- property/inc/class.soentity.inc.php:1.8 Thu May 12 21:26:28 2005
+++ property/inc/class.soentity.inc.php Fri Aug 19 11:56:50 2005
@@ -501,12 +501,12 @@
{
$address[]= $values['street_name'];
$address[]= $values['street_number'];
- $address = implode(" ", $address);
+ $address = $this->db->db_addslashes(implode("
", $address));
}
if(!$address)
{
- $address = $values['location_name'];
+ $address =
$this->db->db_addslashes($values['location_name']);
}
$values['descr'] =
$this->db->db_addslashes($values['descr']);
@@ -597,7 +597,7 @@
$value_set=array(
'location_code' => $values['location_code'],
- 'address' => $address
+ 'address' =>
$this->db->db_addslashes($address)
);
while (is_array($values['location']) &&
list($column,$value) = each($values['location']))
====================================================
Index: property/inc/class.sogab.inc.php
diff -u property/inc/class.sogab.inc.php:1.11
property/inc/class.sogab.inc.php:1.12
--- property/inc/class.sogab.inc.php:1.11 Thu Aug 18 13:23:16 2005
+++ property/inc/class.sogab.inc.php Fri Aug 19 11:56:50 2005
@@ -144,7 +144,7 @@
(
'gab_id' =>
$this->db->f('gab_id'),
'location_code' =>
$this->db->f('location_code'),
- 'address' =>
$this->db->f('address'),
+ 'address' =>
stripslashes($this->db->f('address')),
'hits' =>
$this->db->f('hits'),
'owner' =>
$this->db->f('owner')
);
@@ -258,8 +258,8 @@
if ($this->db->next_record())
{
$gab['location_code'] =
$location_code;
- $gab['remark'] =
$this->db->f('remark');
- $gab['owner'] =
$this->db->f('owner');
+ $gab['remark'] =
$this->db->f('remark');
+ $gab['owner'] =
$this->db->f('owner');
}
//_debug_array($gab);
@@ -391,12 +391,12 @@
{
$address[]=
$gab_insert[$i]['street_name'];
$address[]=
$gab_insert[$i]['street_number'];
- $address = implode(" ",
$address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address =
$gab_insert[$i]['location_name'];
+ $address =
$this->db->db_addslashes($gab_insert[$i]['location_name']);
}
$this->db->query("INSERT INTO fm_gab_location
(location_code,gab_id,remark,owner,entry_date,user_id,address $cols) "
====================================================
Index: property/inc/class.soinvestment.inc.php
diff -u property/inc/class.soinvestment.inc.php:1.5
property/inc/class.soinvestment.inc.php:1.6
--- property/inc/class.soinvestment.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.soinvestment.inc.php Fri Aug 19 11:56:50 2005
@@ -206,23 +206,23 @@
{
$address[]= $values['street_name'];
$address[]= $values['street_number'];
- $address = implode(" ", $address);
+ $address =
$this->db->db_addslashes(implode(" ", $address));
}
if(!$address)
{
- $address = $values['location_name'];
+ $address =
$this->db->db_addslashes($values['location_name']);
}
- $period = $values['period'];
- $type = $values['funding'];
- $initial_value = $values['initial_value'];
- $descr =
$this->db->db_addslashes($values['descr']);
- $date = $values['date'];
- $location_code = $values['location_code'];
- $entity_id = $values['entity_id'];
- $entity_type = $values['entity_type'];
+ $period = $values['period'];
+ $type = $values['funding'];
+ $initial_value = $values['initial_value'];
+ $descr =
$this->db->db_addslashes($values['descr']);
+ $date = $values['date'];
+ $location_code = $values['location_code'];
+ $entity_id = $values['entity_id'];
+ $entity_type = $values['entity_type'];
$this->db->query("select max(invest_id) as
max_invest_id from fm_investment Where entity_id= '$entity_id'");
====================================================
Index: property/inc/class.socategory.inc.php
diff -u property/inc/class.socategory.inc.php:1.8
property/inc/class.socategory.inc.php:1.9
--- property/inc/class.socategory.inc.php:1.8 Fri May 13 12:17:25 2005
+++ property/inc/class.socategory.inc.php Fri Aug 19 11:56:50 2005
@@ -95,7 +95,7 @@
$category[] = array
(
'id' => $this->db->f('id'),
- 'descr' =>
$this->db->f('descr')
+ 'descr' =>
stripslashes($this->db->f('descr'))
);
}
return $category;
@@ -169,8 +169,8 @@
if ($this->db->next_record())
{
- $category['id'] =
$this->db->f('id');
- $category['descr']
= $this->db->f('descr');
+ $category['id'] = $this->db->f('id');
+ $category['descr'] =
stripslashes($this->db->f('descr'));
return $category;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.soproject.inc.php, 1.23 class.sorequest.inc.php, 1.9 class.sos_agreement.inc.php, 1.14 class.sotts.inc.php, 1.9 class.solookup.inc.php, 1.7 class.solocation.inc.php, 1.17 class.sodocument.inc.php, 1.7 class.soentity.inc.php, 1.9 class.sogab.inc.php, 1.12 class.soinvestment.inc.php, 1.6 class.socategory.inc.php, 1.9,
sigurdne <=