[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.1
|
From: |
Jonathan Rivera <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.29, 1.36.2.15.2.30 |
|
Date: |
Tue, 04 Nov 2003 00:17:40 +0000 |
Update of /cvsroot/phpgroupware/addressbook/inc
In directory subversions:/tmp/cvs-serv11753/addressbook/inc
Modified Files:
Tag: Version-0_9_16-branch
class.uiaddressbook.inc.php
Log Message:
Bugfix #6240 and others minor fixes
Index: class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.36.2.15.2.29
retrieving revision 1.36.2.15.2.30
diff -C2 -d -r1.36.2.15.2.29 -r1.36.2.15.2.30
*** class.uiaddressbook.inc.php 3 Nov 2003 20:32:46 -0000 1.36.2.15.2.29
--- class.uiaddressbook.inc.php 4 Nov 2003 00:17:37 -0000 1.36.2.15.2.30
***************
*** 517,521 ****
$this->form_action =
'menuaction=addressbook.uiaddressbook.add_person';
$this->form_index =
'menuaction=addressbook.uiaddressbook.index§ion='.$this->section;
-
//get all vars which was send in post or get
$this->get_vars();
--- 517,520 ----
***************
*** 740,744 ****
$this->form_action =
'menuaction=addressbook.uiaddressbook.add_org';
$this->form_index =
'menuaction=addressbook.uiaddressbook.index§ion='.$this->section;
-
//get all vars which was send in post or get
$this->get_vars();
--- 739,742 ----
***************
*** 996,999 ****
--- 994,998 ----
$this->template->set_var('ab_id', $this->contact_id);
$this->template->set_var('owner', $this->owner);
+ $this->template->set_var('record_name',
$this->record_name);
switch ($form_tab)
***************
*** 1241,1245 ****
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Communication Data for ' . $fields['per_first_name']));
$types_data = array('data1' => array('type' => 'data',
--- 1240,1244 ----
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Communication Data for ' . $this->record_name));
$types_data = array('data1' => array('type' => 'data',
***************
*** 1287,1291 ****
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Address Data for ' . $fields['per_first_name']));
$this->template->set_var('current_id_name',
$key_addr_id_name);
--- 1286,1290 ----
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Address Data for ' . $this->record_name));
$this->template->set_var('current_id_name',
$key_addr_id_name);
***************
*** 1321,1330 ****
'key' =>
'key_addr_id',
'action'=>
'addr_edit_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id),
'link2' => array('type' => 'link',
'mode' =>
'delete',
'key' =>
'key_addr_id',
'action'=>
'addr_del_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id));
$this->array_data =
$this->read_tab_session('addr_data');
//var_export($fields);
--- 1320,1329 ----
'key' =>
'key_addr_id',
'action'=>
'addr_edit_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id.'&record_name='.$this->record_name),
'link2' => array('type' => 'link',
'mode' =>
'delete',
'key' =>
'key_addr_id',
'action'=>
'addr_del_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id.'&record_name='.$this->record_name));
$this->array_data =
$this->read_tab_session('addr_data');
//var_export($fields);
***************
*** 1368,1372 ****
//set values
! $this->template->set_var('lang_general_data',
lang('Other Data for ' . $fields['per_first_name']));
$this->template->set_var('current_id_name',
$key_other_id_name);
--- 1367,1371 ----
//set values
! $this->template->set_var('lang_general_data',
lang('Other Data for ' . $this->record_name));
$this->template->set_var('current_id_name',
$key_other_id_name);
***************
*** 1390,1394 ****
'key' =>
'key_other_id',
'action'=>
'other_del_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id));
//$this->array_data = $fields['others'];
$this->array_data =
$this->read_tab_session('others_data');
--- 1389,1393 ----
'key' =>
'key_other_id',
'action'=>
'other_del_row',
! 'extra' =>
'&owner='.$this->owner.'&ab_id='.$this->contact_id.'&record_name='.$this->record_name));
//$this->array_data = $fields['others'];
$this->array_data =
$this->read_tab_session('others_data');
***************
*** 1425,1429 ****
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Person extra fields for ' . $fields['per_first_name']));
$this->set_form_fields(array(1 => array('Suffix',
'entry[per_suffix]', $fields['per_suffix']),
--- 1424,1428 ----
$this->form_start();
! $this->template->set_var('lang_general_data',
lang('Person extra fields for ' . $this->record_name));
$this->set_form_fields(array(1 => array('Suffix',
'entry[per_suffix]', $fields['per_suffix']),
***************
*** 1447,1455 ****
function many_actions_form($option, $all_data_name,
$my_data_name, $defaul_data_name, $all_opts,
$my_opts, $my_opts_array, $selected,
$section, $fields)
! {
if($section == $this->tab_main_persons)
{
$owner_title = 'Person';
! $owner_value = $fields['per_first_name'];
}
--- 1446,1454 ----
function many_actions_form($option, $all_data_name,
$my_data_name, $defaul_data_name, $all_opts,
$my_opts, $my_opts_array, $selected,
$section, $fields)
! {
if($section == $this->tab_main_persons)
{
$owner_title = 'Person';
! $owner_value = $this->record_name;
}
***************
*** 1457,1461 ****
{
$owner_title = 'Org';
! $owner_value = $fields['org_name'];
}
--- 1456,1460 ----
{
$owner_title = 'Org';
! $owner_value = $this->record_name;
}
***************
*** 1478,1482 ****
$this->template->set_block('person_action',
'many_actions', 'many_actions');
! $this->template->set_var('lang_general_data',
lang('General Data'));
$this->template->set_var('lang_person',
lang($owner_title));
--- 1477,1481 ----
$this->template->set_block('person_action',
'many_actions', 'many_actions');
! $this->template->set_var('lang_general_data',
lang($option.' Data for '.$this->record_name));
$this->template->set_var('lang_person',
lang($owner_title));
***************
*** 1783,1786 ****
--- 1782,1786 ----
$this->owner = get_var('owner', array('post','get'));
$this->referer = get_var('referer',
array('post','get'));
+ $this->record_name = get_var('record_name',
array('post','get'));
}
***************
*** 1818,1821 ****
--- 1818,1822 ----
$entry['email'] = $comms['comm_data']['work
email'];
$entry['wphone'] = $comms['comm_data']['work
phone'];
+ //$this->record_name = $entry['per_full_name'];
break;
case $this->tab_orgs:
***************
*** 1884,1887 ****
--- 1885,1889 ----
$comms =
$this->read_tab_session($this->tab_comms);
$entry['wphone'] = $comms['comm_data']['work
phone'];
+ //$this->record_name = $entry['org_name'];
break;
case $this->tab_persons:
***************
*** 1984,1988 ****
. $entry['bday_day'] . '/'
. $entry['bday_year'];
!
//$entry_data =
$this->save_simple_array($entry);
$entry_data = $entry;
--- 1986,1993 ----
. $entry['bday_day'] . '/'
. $entry['bday_year'];
!
! $this->record_name = $entry['per_first_name'].
! ($entry['per_middle_name']?'
'.$entry['per_middle_name']:'').
! ($entry['per_last_name']?'
'.$entry['per_last_name']:'');
//$entry_data =
$this->save_simple_array($entry);
$entry_data = $entry;
***************
*** 2048,2051 ****
--- 2053,2057 ----
}
//$entry_data =
$this->save_simple_array($entry);
+ $this->record_name = $entry['org_name'];
$entry_data = $entry;
break;
***************
*** 2261,2269 ****
$this->entry['tmp_data']['addr'] =
$addr_data[$this->addr_edit_row];
unset($addr_data[$this->addr_edit_row]);
-
if($this->entry['tmp_data']['addr']['addr_preferred']=='Y')
{
! reset($addr_data);
! $addr_data[key($addr_data)]['addr_preferred'] =
'Y';
}
--- 2267,2277 ----
$this->entry['tmp_data']['addr'] =
$addr_data[$this->addr_edit_row];
unset($addr_data[$this->addr_edit_row]);
if($this->entry['tmp_data']['addr']['addr_preferred']=='Y')
{
! if(count($addr_data)>0)
! {
! reset($addr_data);
!
$addr_data[key($addr_data)]['addr_preferred'] = 'Y';
! }
}
***************
*** 2431,2434 ****
--- 2439,2446 ----
{
//var_export($this->$entry_data);
+ if(!is_array($this->$entry_data))
+ {
+ $this->$entry_data=array();
+ }
foreach($this->$entry_data as $key => $value)
{
***************
*** 2890,2894 ****
function get_persons($fields_to_search, $current_person)
{
! $persons = $this->bo->get_persons($fields_to_search);
if ($persons)
{
--- 2902,2907 ----
function get_persons($fields_to_search, $current_person)
{
! $criteria =
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'');
! $persons =
$this->bo->get_persons($fields_to_search,'','','','','',$criteria);
if ($persons)
{
***************
*** 2912,2916 ****
function get_orgs($fields_to_search, $current_orgs)
{
! $orgs = $this->bo->get_orgs($fields_to_search);
if ($orgs)
{
--- 2925,2930 ----
function get_orgs($fields_to_search, $current_orgs)
{
! $criteria =
$this->bo->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'');
! $orgs =
$this->bo->get_orgs($fields_to_search,'','','','','',$criteria);
if ($orgs)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.29, 1.36.2.15.2.30,
Jonathan Rivera <address@hidden> <=