[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook inc/class.boaddressbook.inc.php inc...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] addressbook inc/class.boaddressbook.inc.php inc... |
|
Date: |
Wed, 16 Aug 2006 15:00:46 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: addressbook
Changes by: Dave Hall <skwashd> 06/08/16 15:00:46
Modified files:
inc : class.boaddressbook.inc.php
class.uiaddressbook.inc.php
setup : phpgw_en.lang setup.inc.php
Added files:
templates/desktop/images: navbar.png
Log message:
patch #4890
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.boaddressbook.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/addressbook/inc/class.uiaddressbook.inc.php?cvsroot=phpgroupware&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/addressbook/setup/phpgw_en.lang?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/addressbook/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/addressbook/templates/desktop/images/navbar.png?cvsroot=phpgroupware&rev=1.1
Patches:
Index: inc/class.boaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.boaddressbook.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.boaddressbook.inc.php 15 May 2005 13:34:29 -0000 1.28
+++ inc/class.boaddressbook.inc.php 16 Aug 2006 15:00:45 -0000 1.29
@@ -17,7 +17,7 @@
* option) any later version. *
\**************************************************************************/
-/* $Id: class.boaddressbook.inc.php,v 1.28 2005/05/15 13:34:29 skwashd Exp $ */
+/* $Id: class.boaddressbook.inc.php,v 1.29 2006/08/16 15:00:45 skwashd Exp $ */
class boaddressbook
{
@@ -192,12 +192,21 @@
{
$entry =
$this->so->get_principal_persons_data($person_id, $get_org);
+ $entry[0]['org_link'] =
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction'
=> 'addressbook.uiaddressbook.view_org',
+ 'ab_id'
=> $entry[0]['org_id']
+ )
+ );
+
$entry[0]['tab_cats']['my_cats'] = explode(",",
$entry[0]['cat_id']);
$entry[0]['tab_extra']['per_suffix'] =
$entry[0]['per_suffix'];
$entry[0]['tab_extra']['per_sound'] =
$entry[0]['per_sound'];
$entry[0]['tab_extra']['per_initials'] =
$entry[0]['per_initials'];
$entry[0]['tab_extra']['per_pubkey'] =
$entry[0]['per_pubkey'];
+ unset($entry[0]['org_id']);
unset($entry[0]['cat_id']);
unset($entry[0]['per_suffix']);
unset($entry[0]['per_sound']);
@@ -516,6 +525,12 @@
'per_sound',
'per_active');
break;
+ case 'person_first':
+ $fields = array('per_first_name');
+ break;
+ case 'person_last':
+ $fields = array('per_last_name');
+ break;
case 'org':
$fields = array('org_name');
break;
Index: inc/class.uiaddressbook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/inc/class.uiaddressbook.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- inc/class.uiaddressbook.inc.php 21 Jul 2006 13:12:21 -0000 1.64
+++ inc/class.uiaddressbook.inc.php 16 Aug 2006 15:00:45 -0000 1.65
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiaddressbook.inc.php,v 1.64 2006/07/21 13:12:21 skwashd Exp $
*/
+ /* $Id: class.uiaddressbook.inc.php,v 1.65 2006/08/16 15:00:45 skwashd Exp $
*/
class uiaddressbook
@@ -252,7 +252,9 @@
'per_department'=>'department',
'per_title'=> 'title',
'addr_add1'=>'address1',
- 'addr_city'=>'city');
+ 'addr_city'=>'city',
+ 'org_name' => 'org_name'
+ );
}
$this->edit_mode = 'edit_person';
$this->view_mode = 'view_person';
@@ -264,6 +266,9 @@
$search_obj=array('query' => $this->query,
'search_obj' => array(
array('person',
'Person Data'),
+ array('org',
'Organization Data'),
+ array('person_last',
'person - last name'),
+ array('person_first',
'person - first name'),
array('comms',
'Communications Data'),
array('location',
'Locations Data'),
array('other', 'Other
Data'),
@@ -468,7 +473,27 @@
{
$ref = $data='';
$coldata = $entry[$column[key]];
- if(in_array($column[key],
$fields_comms))
+ // jecinc marker
+ if( $column[key]=='org_name' )
+ {
+ if($get_data_function ==
'get_persons')
+ {
+ $org_data =
$this->bo->get_orgs_person_data($myid);
+ $ref = '<a href="' .
$GLOBALS['phpgw']->link("/index.php",
+
"menuaction=addressbook.uiaddressbook.view_org") .
+
"&ab_id=" . $org_data[0]['my_org_id'] . '">' ;
+ }
+ else
+ {
+ $ref = '<a href="' .
$GLOBALS['phpgw']->link("/index.php",
+
"menuaction=addressbook.uiaddressbook.view_org") .
+
"&ab_id=" . $myid . '">' ;
+ }
+ $data =
htmlentities($coldata) . '</a>';
+ }
+ elseif(in_array($column[key],
$fields_comms))
+ // jecinc marker
+ // if(in_array($column[key],
$fields_comms))
{
$data =
$this->get_comm_value($myid, $column[key]);
$data = htmlentities($data);
@@ -2751,11 +2776,31 @@
if($userformat != $this->bo->bday_internformat)
{
$datetime =
CreateObject("phpgwapi.datetime");
+
+ $contacts['org_name'] = '<a href="' .
$contacts['org_link'] . '">'
+ .
htmlentities($contacts['org_name']) . '</a>';
+ unset($contacts['org_link']);
+
+ $cat_link_url =
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'addressbook.uiaddressbook.index',
+
'section' => 'Persons'
+ )
+ );
+
$contacts['per_birthday'] =
$datetime->convertDate($contacts['per_birthday'], $this->bo->bday_internformat,
$userformat);
}
}
elseif($contact_type == $this->tab_main_organizations)
{
+ $cat_link_url =
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'addressbook.uiaddressbook.index',
+
'section' => 'Organizations'
+ )
+ );
$type = 'org';
$contacts =
$this->bo->get_principal_organizations_data($contact_id);
}
@@ -2784,14 +2829,18 @@
));
}
+ $tmp_cats = array();
foreach($cats as $key => $cat_id)
{
if($cat_id)
{
$catinfo =
$this->cat->return_single(intval($cat_id));
- $catname .= $catinfo[0]['name'] . '; ';
+ $tmp_cats[] = '<a href="' .
$cat_link_url . '&fcat_id=' . $cat_id . '">'
+ . $catinfo[0]['name'] .
'</a>';
}
}
+ $catname = implode(', ', $tmp_cats);
+ unset($tmp_cats);
unset($contacts['contact_id']);
unset($contacts['cat_id']);
@@ -2850,7 +2899,11 @@
foreach($contacts as $field => $data)
{
+ if($field!='org_name')
+ {
$data = htmlentities($data);
+ }
+
$ref='';
if(!is_numeric($field) && $data!='')
{
@@ -2893,6 +2946,36 @@
$this->template->parse('cols','view_row',True);
}
}
+
+ if($contact_type == $this->tab_main_organizations)
+ {
+ $persons =
$this->bo->get_person_orgs_data($contact_id);
+ if($persons && is_array($persons))
+ {
+ $per_link =
$GLOBALS['phpgw']->link('/index.php',
+ array('menuaction'
=> 'addressbook.uiaddressbook.view_person'));
+
+ $ppl = array();
+
+ foreach($persons as $per)
+ {
+ if($per['per_first_name'] ||
$per['per_last_name'])
+ {
+ $ppl[] = '<a
href="'.$per_link.'&ab_id='.$per['my_person_id'].'">'
+ .
$per['per_first_name'] . ' ' . $per['per_last_name']
+ . '</a>';
+ }
+ }
+ $tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+
+ $this->template->set_var('th_bg',
$tr_color);
+ $this->template->set_var('display_col',
lang('contacts'));
+ $this->template->set_var('ref_data',
implode('<br />', $ppl));
+
+ $this->template->parse('cols',
'view_row', True);
+ }
+ }
+
/* Following cleans up view_row, since we were only
using it to fill {cols} */
$this->template->set_var('view_row','');
Index: setup/phpgw_en.lang
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/setup/phpgw_en.lang,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- setup/phpgw_en.lang 15 May 2005 13:34:30 -0000 1.29
+++ setup/phpgw_en.lang 16 Aug 2006 15:00:45 -0000 1.30
@@ -17,7 +17,7 @@
address line 2 addressbook en Address Line 2
address line 3 addressbook en Address Line 3
address type addressbook en Address Type
-addressbook common en Addressbook
+addressbook common en Contacts
addressbook preferences addressbook en Addressbook preferences
addressbook-fieldname addressbook en Addressbook-Fieldname
addvcard addressbook en Add VCard
Index: setup/setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/addressbook/setup/setup.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- setup/setup.inc.php 11 Mar 2006 23:20:49 -0000 1.37
+++ setup/setup.inc.php 16 Aug 2006 15:00:45 -0000 1.38
@@ -9,11 +9,10 @@
* option) any later version.
*
\**************************************************************************/
- /* $Id: setup.inc.php,v 1.37 2006/03/11 23:20:49 skwashd Exp $ */
+ /* $Id: setup.inc.php,v 1.38 2006/08/16 15:00:45 skwashd Exp $ */
/* Basic information about this app */
$setup_info['addressbook']['name'] = 'addressbook';
- $setup_info['addressbook']['title'] = 'Addressbook';
$setup_info['addressbook']['version'] = '0.9.17.500';
$setup_info['addressbook']['app_order'] = 4;
$setup_info['addressbook']['enable'] = 1;
Index: templates/desktop/images/navbar.png
===================================================================
RCS file: templates/desktop/images/navbar.png
diff -N templates/desktop/images/navbar.png
Binary files /dev/null and /tmp/cvsZ0T6cY differ
- [Phpgroupware-cvs] addressbook inc/class.boaddressbook.inc.php inc...,
Dave Hall <=