[Phpgroupware-cvs] property/class.soadmin_location.php, 1.1.1.5

[nomail]

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

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

Log Message:
db_addslashes
=====================================================================
Index: property/class.soadmin_location.php
diff -u property/class.soadmin_location.php:1.1.1.4 
property/class.soadmin_location.php:1.1.1.5
--- property/class.soadmin_location.php:1.1.1.4 Sat Apr 24 19:39:54 2004
+++ property/class.soadmin_location.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;
 
@@ -209,8 +210,8 @@
                function add($standard)
                {
 
-                       $standard['name'] = 
$this->db->db_addslashes($standard['name']);
-                       $standard['descr'] = 
$this->db->db_addslashes($standard['descr']);
+                       $standard['name'] = 
$this->functions->db_addslashes($standard['name']);
+                       $standard['descr'] = 
$this->functions->db_addslashes($standard['descr']);
 
                        $standard['id'] = 
$this->bocommon->next_id('fm_location_type');
 
@@ -332,8 +333,8 @@
                        {
                                $table = 'fm_location_type';
 
-                               $standard['name'] = 
$this->db->db_addslashes($standard['name']);
-                               $standard['descr'] = 
$this->db->db_addslashes($standard['descr']);
+                               $standard['name'] = 
$this->functions->db_addslashes($standard['name']);
+                               $standard['descr'] = 
$this->functions->db_addslashes($standard['descr']);
 
                                $GLOBALS['phpgw']->db->Execute("UPDATE $table 
set descr='" . $standard['descr'] . "', name='". $standard['name']
                                        . "' WHERE id='" . $standard['id']. 
"'");
@@ -522,10 +523,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_location_attrib',array('type_id'=>$attrib['type_id']));
 
                        $sql = "SELECT max(attrib_sort) as max_sort FROM 
fm_location_attrib where type_id=" . $attrib['type_id'];
@@ -598,7 +599,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';
                }
@@ -652,10 +653,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']);
 
                        $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
column_name FROM fm_location_attrib WHERE id='" . $attrib['id']. "'");