[Phpgroupware-cvs] property/class.soadmin_entity.php, 1.1.1.6

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.soadmin_entity.php

date: 2004/04/29 07:10:49;  author: sigurdne;  state: Exp;  lines: +21 -20

Log Message:
db_addslashes
=====================================================================
Index: property/class.soadmin_entity.php
diff -u property/class.soadmin_entity.php:1.1.1.5 
property/class.soadmin_entity.php:1.1.1.6
--- property/class.soadmin_entity.php:1.1.1.5   Mon Apr 26 08:00:00 2004
+++ property/class.soadmin_entity.php   Thu Apr 29 07:10:49 2004
@@ -26,6 +26,7 @@
                        $this->db2                      = $this->db;
                        $this->account          = 
$GLOBALS['phpgw_data']['user']['id'];
                        $this->bocommon         = 
CreateObject($this->currentapp.'_bocommon');
+                       $this->functions                = 
CreateObject($this->currentapp.'_functions');
 
                        $this->join                     = $this->bocommon->join;
 
@@ -334,8 +335,8 @@
 
                function add_entity($entity)
                {
-                       $entity['name'] = 
$this->db->db_addslashes($entity['name']);
-                       $entity['descr'] = 
$this->db->db_addslashes($entity['descr']);
+                       $entity['name'] = 
$this->functions->db_addslashes($entity['name']);
+                       $entity['descr'] = 
$this->functions->db_addslashes($entity['descr']);
 
                        $entity['id'] = $this->bocommon->next_id('fm_entity');
 
@@ -373,8 +374,8 @@
 
                function add_status($values,$entity_id,$cat_id)
                {
-                       $values['id'] = $this->db->db_addslashes($values['id']);
-                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
+                       $values['id'] = 
$this->functions->db_addslashes($values['id']);
+                       $values['descr'] = 
$this->functions->db_addslashes($values['descr']);
 
                        $values_insert= array(
                                $values['id'],
@@ -396,8 +397,8 @@
 
                function add_category($values)
                {
-                       $values['name'] = 
$this->db->db_addslashes($values['name']);
-                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
+                       $values['name'] = 
$this->functions->db_addslashes($values['name']);
+                       $values['descr'] = 
$this->functions->db_addslashes($values['descr']);
 
                        $values['id'] = 
$this->bocommon->next_id('fm_entity_category',array('entity_id'=>$values['entity_id']));
 
@@ -514,7 +515,7 @@
                {
                        $table  = 'fm_entity_'. $entity_id .'_'.$cat_id . 
'_status';
 
-                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
+                       $values['descr'] = 
$this->functions->db_addslashes($values['descr']);
 
                        $value_set=array(
                                'descr'                 => $values['descr'],
@@ -540,8 +541,8 @@
                        {
                                $table = 'fm_entity';
 
-                               $entity['name'] = 
$this->db->db_addslashes($entity['name']);
-                               $entity['descr'] = 
$this->db->db_addslashes($entity['descr']);
+                               $entity['name'] = 
$this->functions->db_addslashes($entity['name']);
+                               $entity['descr'] = 
$this->functions->db_addslashes($entity['descr']);
 
                                if(!$entity['location_form'])
                                {
@@ -615,8 +616,8 @@
                        {
                                $table = 'fm_entity_category';
 
-                               $entity['name'] = 
$this->db->db_addslashes($entity['name']);
-                               $entity['descr'] = 
$this->db->db_addslashes($entity['descr']);
+                               $entity['name'] = 
$this->functions->db_addslashes($entity['name']);
+                               $entity['descr'] = 
$this->functions->db_addslashes($entity['descr']);
 
                                $value_set=array(
                                        'descr'                 => 
$entity['descr'],
@@ -850,10 +851,10 @@
                function add_attrib($attrib)
                {
 
-                       $attrib['column_name'] = 
$this->db->db_addslashes($attrib['column_name']);
-                       $attrib['input_text'] = 
$this->db->db_addslashes($attrib['input_text']);
-                       $attrib['statustext'] = 
$this->db->db_addslashes($attrib['statustext']);
-                       $attrib['default'] = 
$this->db->db_addslashes($attrib['default']);
+                       $attrib['column_name'] = 
$this->functions->db_addslashes($attrib['column_name']);
+                       $attrib['input_text'] = 
$this->functions->db_addslashes($attrib['input_text']);
+                       $attrib['statustext'] = 
$this->functions->db_addslashes($attrib['statustext']);
+                       $attrib['default'] = 
$this->functions->db_addslashes($attrib['default']);
                        $attrib['id'] = 
$this->bocommon->next_id('fm_entity_attribute',array('entity_id'=>$attrib['entity_id'],'cat_id'=>$attrib['cat_id']));
 
                        $sql = "SELECT max(attrib_sort) as max_sort FROM 
fm_entity_attribute where entity_id=" . $attrib['entity_id'] . " AND cat_id=" . 
$attrib['cat_id'];
@@ -925,7 +926,7 @@
 
                function init_process()
                {
-                       $this->oProc                                            
= 
CreateObject('phpgwapi_schema_proc',$GLOBALS['phpgw_info']['server']['db_type']);
+                       $this->oProc                                            
= 
CreateObject('phpgwapi_schema_proc',$GLOBALS['phpgw_data']['server']['db_type']);
                        $this->oProc->m_odb                                     
= $this->db;
                        $this->oProc->m_odb->Halt_On_Error      = 'report';
                }
@@ -933,10 +934,10 @@
                function edit_attrib($attrib)
                {
 
-                       $attrib['column_name'] = 
$this->db->db_addslashes($attrib['column_name']);
-                       $attrib['input_text'] = 
$this->db->db_addslashes($attrib['input_text']);
-                       $attrib['statustext'] = 
$this->db->db_addslashes($attrib['statustext']);
-                       $attrib['default'] = 
$this->db->db_addslashes($attrib['default']);
+                       $attrib['column_name'] = 
$this->functions->db_addslashes($attrib['column_name']);
+                       $attrib['input_text'] = 
$this->functions->db_addslashes($attrib['input_text']);
+                       $attrib['statustext'] = 
$this->functions->db_addslashes($attrib['statustext']);
+                       $attrib['default'] = 
$this->functions->db_addslashes($attrib['default']);
 
                        $GLOBALS['phpgw']->db->Execute("SELECT column_name FROM 
fm_entity_attribute WHERE entity_id=" . $attrib['entity_id']. " AND cat_id=" . 
$attrib['cat_id']. " AND id='" . $attrib['id']. "'");
                        $OldColumnName          = 
$dbresult->fields['column_name'];