[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.contact_note.inc.php, 1.1.2.3, 1.
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.contact_note.inc.php, 1.1.2.3, 1.1.2.4 class.contact_accounts.inc.php, 1.1.2.4, 1.1.2.5 class.contact_note_type.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm_type.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm.inc.php, 1.1.2.4, 1.1.2.5 class.sql_builder.inc.php, 1.1.2.11, 1.1.2.12 class.contacts_sql.inc.php, 1.17.2.2.2.21, 1.17.2.2.2.22 class.contact_comm_descr.inc.php, 1.1.2.3, 1.1.2.4 class.contact_central.inc.php, 1.1.2.4, 1.1.2.5 |
|
Date: |
Tue, 14 Oct 2003 10:36:37 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv978
Modified Files:
Tag: Version-0_9_16-branch
class.contact_note.inc.php class.contact_accounts.inc.php
class.contact_note_type.inc.php
class.contact_comm_type.inc.php class.contact_comm.inc.php
class.sql_builder.inc.php class.contacts_sql.inc.php
class.contact_comm_descr.inc.php class.contact_central.inc.php
Log Message:
various fixes from eald
Index: class.contact_comm_descr.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm_descr.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_comm_descr.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
--- class.contact_comm_descr.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.4
***************
*** 48,53 ****
$this->add_criteria($criteria);
}
! $this->set_elinks('comm_descr_id',
'phpgwapi.contact_comm','comm_descr');
! $this->set_ilinks('comm_type',
'phpgwapi.contact_comm_type','comm_type_id');
}
--- 48,53 ----
$this->add_criteria($criteria);
}
! $this->set_ilinks('comm_descr_id',
'phpgwapi.contact_comm','comm_descr');
! $this->set_elinks('comm_type',
'phpgwapi.contact_comm_type','comm_type_id');
}
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.21
retrieving revision 1.17.2.2.2.22
diff -C2 -d -r1.17.2.2.2.21 -r1.17.2.2.2.22
*** class.contacts_sql.inc.php 14 Oct 2003 06:24:57 -0000 1.17.2.2.2.21
--- class.contacts_sql.inc.php 14 Oct 2003 10:36:34 -0000 1.17.2.2.2.22
***************
*** 473,478 ****
'addr_country',
'addr_preferred',
! 'comm_descr',
! 'comm_type',
'comm_data',
'key_note_id',
--- 473,478 ----
'addr_country',
'addr_preferred',
! 'comm_description',
! 'comm_type_description',
'comm_data',
'key_note_id',
***************
*** 764,768 ****
$this->execute_query($sql, $line, $file);
! while ($this->db_next_record())
{
$record = $this->db->Record;
--- 764,769 ----
$this->execute_query($sql, $line, $file);
!
! while ($this->db->next_record())
{
$record = $this->db->Record;
***************
*** 788,810 ****
// Locations info
$loc_id
= $record['key_addr_id'];
! $contact['locations'][$loc_id]['type']
= $record['addr_description'];
! $contact['locations'][$loc_id]['add1']
= $record['addr_add1'];
! $contact['locations'][$loc_id]['add2']
= $record['addr_add2'];
! $contact['locations'][$loc_id]['add3']
= $record['addr_add3'];
! $contact['locations'][$loc_id]['address']
= $record['addr_address'];
! $contact['locations'][$loc_id]['city']
= $record['addr_city'];
! $contact['locations'][$loc_id]['state']
= $record['addr_state'];
! $contact['locations'][$loc_id]['postal_code']
= $record['addr_postal_code'];
! $contact['locations'][$loc_id]['country']
= $record['addr_country'];
! $contact['locations'][$loc_id]['preferred']
= $record['addr_preferred'];
// Notes
$note_id
= $record['key_note_id'];
! $contact['notes'][$note_id]['text']
= $record['note_text'];
! $contact['notes'][$note_id]['type']
= $record['note_description'];
// Communcation media fields
! $contact[$record['comm_descr']]
= $record['comm_data'];
! $contact['comm_type'][$record['comm_descr']]
= $record['comm_type'];
// Other fields
! $contact[$record['other_name']]
= $record['other_value'];
}
return $contact;
--- 789,824 ----
// Locations info
$loc_id
= $record['key_addr_id'];
! if($loc_id)
! {
! $contact['locations'][$loc_id]['type']
= $record['addr_description'];
! $contact['locations'][$loc_id]['add1']
= $record['addr_add1'];
! $contact['locations'][$loc_id]['add2']
= $record['addr_add2'];
! $contact['locations'][$loc_id]['add3']
= $record['addr_add3'];
!
$contact['locations'][$loc_id]['address'] = $record['addr_address'];
! $contact['locations'][$loc_id]['city']
= $record['addr_city'];
! $contact['locations'][$loc_id]['state']
= $record['addr_state'];
!
$contact['locations'][$loc_id]['postal_code'] = $record['addr_postal_code'];
!
$contact['locations'][$loc_id]['country'] = $record['addr_country'];
!
$contact['locations'][$loc_id]['preferred'] = $record['addr_preferred'];
! }
// Notes
$note_id
= $record['key_note_id'];
! if($note_id)
! {
! $contact['notes'][$note_id]['text']
= $record['note_text'];
! $contact['notes'][$note_id]['type']
= $record['note_description'];
! }
// Communcation media fields
! if($record['comm_data'])
! {
! $comm_descr
= $record['comm_description'];
! $contact[$comm_descr]
= $record['comm_data'];
! $contact['comm_type'][$comm_descr]
= $record['comm_type_description'];
! }
// Other fields
! if($record['other_value'])
! {
! $contact[$record['other_name']]
= $record['other_value'];
! }
}
return $contact;
Index: class.contact_central.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_central.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.contact_central.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
--- class.contact_central.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.5
***************
*** 82,86 ****
$this->set_ilinks('contact_type',
'phpgwapi.contact_types','contact_type_id');
! $this->set_ilinks('owner',
'phpgwapi.contact_accounts','account_id');
//$this->set_ilinks('cat_id',
'contact_categories','key_cat_id');
}
--- 82,86 ----
$this->set_ilinks('contact_type',
'phpgwapi.contact_types','contact_type_id');
! // $this->set_ilinks('owner',
'phpgwapi.contact_accounts','account_id');
//$this->set_ilinks('cat_id',
'contact_categories','key_cat_id');
}
Index: class.contact_comm.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.contact_comm.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.4
--- class.contact_comm.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.5
***************
*** 225,229 ****
}
$this->set_ilinks('comm_contact_id',
'phpgwapi.contact_central','contact_id');
! $this->set_ilinks('comm_descr',
'phpgwapi.contact_comm_descr','comm_descr_id');
}
--- 225,229 ----
}
$this->set_ilinks('comm_contact_id',
'phpgwapi.contact_central','contact_id');
! $this->set_elinks('comm_descr',
'phpgwapi.contact_comm_descr','comm_descr_id');
}
Index: class.contact_note_type.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_note_type.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_note_type.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
--- class.contact_note_type.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.4
***************
*** 33,37 ****
$this->add_criteria($criteria);
}
! $this->set_elinks('note_type_id',
'phpgwapi.contact_note','note_type');
}
--- 33,37 ----
$this->add_criteria($criteria);
}
! $this->set_ilinks('note_type_id',
'phpgwapi.contact_note','note_type');
}
Index: class.contact_note.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_note.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_note.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
--- class.contact_note.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.4
***************
*** 91,95 ****
}
$this->set_ilinks('note_contact_id',
'phpgwapi.contact_central','contact_id');
! $this->set_ilinks('note_type',
'phpgwapi.contact_note_type','note_type_id');
}
}
--- 91,95 ----
}
$this->set_ilinks('note_contact_id',
'phpgwapi.contact_central','contact_id');
! $this->set_elinks('note_type',
'phpgwapi.contact_note_type','note_type_id');
}
}
Index: class.contact_comm_type.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_comm_type.inc.php,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** class.contact_comm_type.inc.php 3 Oct 2003 00:24:37 -0000 1.1.2.3
--- class.contact_comm_type.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.4
***************
*** 51,55 ****
}
! $this->set_elinks('comm_type_id',
'phpgwapi.contact_comm_descr','comm_type');
}
}
--- 51,55 ----
}
! $this->set_ilinks('comm_type_id',
'phpgwapi.contact_comm_descr','comm_type');
}
}
Index: class.sql_builder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.sql_builder.inc.php,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** class.sql_builder.inc.php 14 Oct 2003 06:24:57 -0000 1.1.2.11
--- class.sql_builder.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.12
***************
*** 213,221 ****
$this->ldebug('sort_by_distances',
array('Distance2' => $entity_distance,'Name' => $entity_far_away));
$this->add_path($entity_far_away, TRUE);
- $this->merge_paths();
- $this->ldebug('sort_by_distances',
- array('Path'
=> array_keys($this->path)), 'dump');
$this->entity_to_center($entity_far_away,
$entity_distance, TRUE);
}
}
--- 213,221 ----
$this->ldebug('sort_by_distances',
array('Distance2' => $entity_distance,'Name' => $entity_far_away));
$this->add_path($entity_far_away, TRUE);
$this->entity_to_center($entity_far_away,
$entity_distance, TRUE);
+ $this->ldebug('sort_by_distances',
+ array('Path'
=> array_keys($this->path)), 'dump');
+ $this->merge_paths();
}
}
***************
*** 1192,1197 ****
function ldebug($myfoo, $data, $type = 'string', $err = '')
{
! // if (!((($myfoo != 'sort_by_distances') xor
! // ($myfoo != 'entity_to_center')) xor
// ($myfoo == 'add_path')) xor
// ($myfoo == ''))
--- 1192,1197 ----
function ldebug($myfoo, $data, $type = 'string', $err = '')
{
! // if (!((($myfoo != 'get_join') xor
! // ($myfoo != '')) xor
// ($myfoo == 'add_path')) xor
// ($myfoo == ''))
***************
*** 1224,1227 ****
--- 1224,1228 ----
$output .= " -$vari = ";
$output .= var_dump($value)."\n<br>";
+ //$output .= var_export($value,
True)."\n<br>";
}
break;
Index: class.contact_accounts.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/inc/Attic/class.contact_accounts.inc.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** class.contact_accounts.inc.php 4 Oct 2003 23:42:36 -0000 1.1.2.4
--- class.contact_accounts.inc.php 14 Oct 2003 10:36:34 -0000 1.1.2.5
***************
*** 35,39 ****
$this->add_criteria($criteria);
}
! $this->set_elinks('account_id',
'phpgwapi.contact_central','owner');
$this->set_ilinks('account_person_id',
'phpgwapi.contact_person','person_id', PHPGW_SQL_LAZY_KEY);
}
--- 35,39 ----
$this->add_criteria($criteria);
}
! // $this->set_elinks('account_id',
'phpgwapi.contact_central','owner');
$this->set_ilinks('account_person_id',
'phpgwapi.contact_person','person_id', PHPGW_SQL_LAZY_KEY);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.contact_note.inc.php, 1.1.2.3, 1.1.2.4 class.contact_accounts.inc.php, 1.1.2.4, 1.1.2.5 class.contact_note_type.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm_type.inc.php, 1.1.2.3, 1.1.2.4 class.contact_comm.inc.php, 1.1.2.4, 1.1.2.5 class.sql_builder.inc.php, 1.1.2.11, 1.1.2.12 class.contacts_sql.inc.php, 1.17.2.2.2.21, 1.17.2.2.2.22 class.contact_comm_descr.inc.php, 1.1.2.3, 1.1.2.4 class.contact_central.inc.php, 1.1.2.4, 1.1.2.5,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.20, 1.17.2.2.2.21 class.contact_person.inc.php, 1.1.2.7, 1.1.2.8 class.sql_builder.inc.php, 1.1.2.10, 1.1.2.11
- Next by Date:
[Phpgroupware-cvs] todo/templates/default form.tpl, 1.15.2.1, 1.15.2.1.2.1 list.tpl, 1.13.2.4, 1.13.2.4.2.1 view.tpl, 1.1, 1.1.4.1
- Previous by thread:
[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.20, 1.17.2.2.2.21 class.contact_person.inc.php, 1.1.2.7, 1.1.2.8 class.sql_builder.inc.php, 1.1.2.10, 1.1.2.11
- Next by thread:
[Phpgroupware-cvs] todo/templates/default form.tpl, 1.15.2.1, 1.15.2.1.2.1 list.tpl, 1.13.2.4, 1.13.2.4.2.1 view.tpl, 1.1, 1.1.4.1
- Index(es):