[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc/class.contacts_sql.inc.php, 1.17.2.2.2.6
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc/class.contacts_sql.inc.php, 1.17.2.2.2.69.2.2 |
|
Date: |
Thu, 30 Dec 2004 05:51:47 +0100 |
Update of /phpgwapi/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.contacts_sql.inc.php
date: 2004/12/30 04:51:47; author: skwashd; state: Exp; lines: +17 -17
Log Message:
switch to ADOdb
=====================================================================
Index: phpgwapi/inc/class.contacts_sql.inc.php
diff -u phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.69.2.1
phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.69.2.2
--- phpgwapi/inc/class.contacts_sql.inc.php:1.17.2.2.2.69.2.1 Fri Dec 10
10:00:02 2004
+++ phpgwapi/inc/class.contacts_sql.inc.php Thu Dec 30 04:51:47 2004
@@ -1094,7 +1094,7 @@
$this->total_records = $this->db->num_rows();
while ($this->db->next_record())
{
- $persons[] = $this->db->Record;
+ $persons[] = $this->db->resultSet->fetchRow();
}
return $persons;
}
@@ -1219,7 +1219,7 @@
$this->total_records = $this->db->num_rows();
while ($this->db->next_record())
{
- $orgs[] = $this->db->Record;
+ $orgs[] = $this->db->resultSet->fetchRow();
}
return $orgs;
@@ -1844,7 +1844,7 @@
while ($this->db->next_record())
{
- $record = $this->db->Record;
+ $record = $this->db->resultSet->fetchRow();
$contact['contact_id'] =
$record['contact_id'];
$contact['access'] =
$record['access'];
$contact['owner'] =
$record['owner'];
@@ -2904,7 +2904,7 @@
$this->execute_query($this->get_sql(),$line,$file);
while ($this->db->next_record())
{
- $record[] = $this->db->Record;
+ $record[] = $this->db->resultSet->fetchRow();
}
return $record;
}
@@ -2988,7 +2988,7 @@
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
- $orgs = &$this->db->Record;
+ $orgs = &$this->db->resultSet->fetchRow();
}
return $orgs;
}
@@ -3033,7 +3033,7 @@
$this->db->query($this->get_sql(), __LINE__, __FILE__);
while ($this->db->next_record())
{
- $cats[] = $this->db->Record;
+ $cats[] = $this->db->resultSet->fetchRow();
}
return $cats;
@@ -3328,7 +3328,7 @@
$this->db->query($query,__LINE__, __FILE__);
while($this->db->next_record())
{
- $contact = $this->db->Record;
+ $contact = $this->db->resultSet->fetchRow();
$contact['account_id'] =
$GLOBALS['phpgw']->accounts->search_person($contact['contact_id']);
$contacts[] = $contact;
}
@@ -4330,13 +4330,13 @@
$ret['contact_id'] = $cid;
$this->edit_contact($cid, $contact,
PHPGW_SQL_RUN_SQL);
- if ($GLOBALS['phpgw']->db->Error)
+ if ($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret['edit_contact'] = false;
else
$ret['edit_contact'] = true;
$this->edit_person($cid, $contact,
PHPGW_SQL_RUN_SQL);
- if ($GLOBALS['phpgw']->db->Error)
+ if ($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret['edit_person'] = false;
else
$ret['edit_person'] = true;
@@ -4364,7 +4364,7 @@
{
//
replace old comm data
$this->edit_comms($key_comm_id, $comm, PHPGW_SQL_RUN_SQL);
- if
($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_comm['edit_comms'][$key_comm_id] = false;
else
$ret_comm['edit_comms'][$key_comm_id] = true;
@@ -4380,7 +4380,7 @@
{
// delete old
comm data
$this->delete_specified_comm($key_comm_id, PHPGW_SQL_RUN_SQL);
- if
($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_comm[$key_comm_id]['delete_specified_comm'] = false;
else
$ret_comm[$key_comm_id]['delete_specified_comm'] = true;
@@ -4392,7 +4392,7 @@
{
$this->add_communication_media($comm, $cid, PHPGW_SQL_RUN_SQL);
$this->unlock_table();
- if
($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_comm['add_communication_media'][] = false;
else
$ret_comm['add_communication_media'][] = true;
@@ -4407,7 +4407,7 @@
{
// 1. delete old locs
$this->delete_locations($cid);
- if ($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_loc['delete_locations'] =
false;
else
$ret_loc['delete_locations'] =
true;
@@ -4419,7 +4419,7 @@
{
$this->add_location($loc, $cid,
PHPGW_SQL_RUN_SQL);
$this->unlock_table();
- if
($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_loc['add_location'][] = false;
else
$ret_loc['add_location'][] = true;
@@ -4438,7 +4438,7 @@
$ret['other'] = $old_others;
// 1. delete old others
$this->delete_others($cid);
- if ($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_other['delete_others'] =
false;
else
$ret_other['delete_others'] =
true;
@@ -4450,7 +4450,7 @@
{
$this->add_others($other, $cid,
PHPGW_SQL_RUN_SQL);
$this->unlock_table();
- if
($GLOBALS['phpgw']->db->Error)
+ if
($GLOBALS['phpgw']->db->adodb->ErrorMsg())
$ret_other['add_other'][] = false;
else
$ret_other['add_other'][] = true;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc/class.contacts_sql.inc.php, 1.17.2.2.2.69.2.2,
nomail <=