[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hr index.php,1.12.2.1.2.1,1.12.2.1.2.2
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] hr index.php,1.12.2.1.2.1,1.12.2.1.2.2 |
|
Date: |
Sun, 05 Oct 2003 23:06:45 +0000 |
Update of /cvsroot/phpgroupware/hr
In directory subversions:/tmp/cvs-serv18009
Modified Files:
Tag: Version-0_9_16-branch
index.php
Log Message:
fixes for contacts backend
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/hr/index.php,v
retrieving revision 1.12.2.1.2.1
retrieving revision 1.12.2.1.2.2
diff -C2 -d -r1.12.2.1.2.1 -r1.12.2.1.2.2
*** index.php 5 Oct 2003 11:32:28 -0000 1.12.2.1.2.1
--- index.php 5 Oct 2003 23:06:43 -0000 1.12.2.1.2.2
***************
*** 30,34 ****
<table border="0" width="80%">
<tr>
! <td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg'] ?>"
align="center">Users</td>
</tr>
<?php
--- 30,36 ----
<table border="0" width="80%">
<tr>
! <td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg'] ?>"
align="center">
! <b><?php echo lang('users'); ?></b>
! </td>
</tr>
<?php
***************
*** 49,53 ****
<tr>
<td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg']; ?>"
align="center">
! <?php echo lang('groups'); ?>
</td>
</tr>
--- 51,55 ----
<tr>
<td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg']; ?>"
align="center">
! <b><?php echo lang('groups'); ?></b>
</td>
</tr>
***************
*** 129,148 ****
$link = '';
}
! display_line(lang('group name') .
':',$groupdata['account_lid'],$link);
!
!
! $link = '<form method="POST" action="' .
$contact_link . '">' . "\n"
! . '<input type="submit" name="' .
$contact_submit
! . '" value="'.$contact_button.'">' .
"\n"
! . '<input type="hidden" name="entry"
value="'.$sfields.'">' . "\n"
! . '</form>' . "\n";
!
! display_line(lang('Firstname') . ':',$firstname);
! display_line(lang('Lastname') . ':',$lastname);
echo '<tr><td colspan="2"> </td></tr>';
echo '<tr><td colspan="2" align="left" bgcolor="' .
$phpgw_info['theme']['th_bg']
! . '">' . lang('Members of the group') . ':</td></tr>';
for ($i=0;$i<count($membership); $i++)
--- 131,142 ----
$link = '';
}
! display_line(lang('group login') .
':',$groupdata['account_lid'],$link);
! display_line(lang('first name') . ':',$firstname);
! display_line(lang('last name') . ':',$lastname);
echo '<tr><td colspan="2"> </td></tr>';
echo '<tr><td colspan="2" align="left" bgcolor="' .
$phpgw_info['theme']['th_bg']
! . '"><b>' . lang('members of the group') .
':</b></td></tr>';
for ($i=0;$i<count($membership); $i++)
***************
*** 173,217 ****
'email' => 'email',
'email_home' => 'email_home',
- //'note' => 'note'
);
! $fields =
$contacts->are_users($contacts->is_contact($account_info['account_id']),
$qcols);
! if(!$fields[0]['id']) {
! $fields[0]['tid'] = 'p';
! $fields[0]['lid'] = $account_info['account_lid'];
! $fields[0]['firstname'] = $account_info['firstname'];
! $fields[0]['lastname'] = $account_info['lastname'];
$sfields = rawurlencode(serialize($fields[0]));
- $contact_link =
$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.add');
- $contact_hidden = '<form
submit=True&profile=True&entry='.$sfields;
- $contact_submit = 'submit';
- // $contact_submit = 'Add';
- $contact_button = lang('Add');
- } else {
$contact_link = $GLOBALS['phpgw']->link('/index.php',
! Array(
! 'menuaction' =>
'addressbook.uiaddressbook.view',
! 'ab_id' => $fields[0]['id']
)
);
! $contact_submit = 'view';
! $contact_button = lang('View');
! $contact_num = '#'.$fields[0]['id'];
! }
!
! $firstname = $fields[0]['n_given'];
! if (!$firstname)
! {
! $firstname = $account_info['firstname'];
}
!
! $lastname = $fields[0]['n_family'];
! if (!$lastname)
{
! $lastname = $account_info['lastname'];
}
! if ($phpgw_info['user']['apps']['email'])
{
if ($fields[0]['email'])
--- 167,202 ----
'email' => 'email',
'email_home' => 'email_home',
);
! $fields = $contacts->are_users($account_info['person_id'],
$qcols);
! if(!$account_info['person_id'] &&
$GLOBALS['phpgw_info']['user']['apps']['admin'])
! {
$sfields = rawurlencode(serialize($fields[0]));
$contact_link = $GLOBALS['phpgw']->link('/index.php',
! array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.add_person',
! 'entry' => $fields,
)
);
! $contact_text = lang('add');
}
! else
{
! $contact_link = $GLOBALS['phpgw']->link('/index.php',
! array
! (
! 'menuaction' =>
'addressbook.uiaddressbook.view_person',
! 'ab_id' => $fields[0]['id']
! )
! );
! $contact_text = lang('view');
}
! $firstname = $account_info['firstname'];
! $lastname = $account_info['lastname'];
!
! if ($GLOBALS['phpgw_info']['user']['apps']['email'])
{
if ($fields[0]['email'])
***************
*** 219,223 ****
$profile_work_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email'])).'"
target="_new">'.$fields[0]['email'].'</a>';
}
! if ($fields[0]["email_home"])
{
$profile_home_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email_home'])).'"
target="_new">'.$fields[0]['email_home'].'</a>';
--- 204,208 ----
$profile_work_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email'])).'"
target="_new">'.$fields[0]['email'].'</a>';
}
! if ($fields[0]['email_home'])
{
$profile_home_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email_home'])).'"
target="_new">'.$fields[0]['email_home'].'</a>';
***************
*** 226,243 ****
else
{
! if ($fields[0]['email']) {
$profile_work_email='<a href="mailto:'.
$fields[0]['email'] .'">'.$fields[0]['email'].'</a>';
}
! if ($fields[0]['email_home']) {
$profile_home_email='<a href="mailto:'.
$fields[0]['email_home'] .'">'.$fields[0]['email_home'].'</a>';
}
}
- $profile_comments =
$GLOBALS['phpgw']->strip_html(stripslashes($fields[0]['note']));
- if (!$profile_comments)
- {
- $profile_comments = ' ';
- }
-
$profile_work_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_work']);
if (!$profile_work_phone)
--- 211,224 ----
else
{
! if ($fields[0]['email'])
! {
$profile_work_email='<a href="mailto:'.
$fields[0]['email'] .'">'.$fields[0]['email'].'</a>';
}
! if ($fields[0]['email_home'])
! {
$profile_home_email='<a href="mailto:'.
$fields[0]['email_home'] .'">'.$fields[0]['email_home'].'</a>';
}
}
$profile_work_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_work']);
if (!$profile_work_phone)
***************
*** 252,260 ****
}
! $profile_title =
$GLOBALS['phpgw']->strip_html($fields[0]['title']);
! if (!$profile_title)
! {
! $profile_title = ' ';
! }
echo '<table border="0" width="80%">';
--- 233,237 ----
}
! $profile_title =
$GLOBALS['phpgw']->strip_html($fields[0]['title']);
echo '<table border="0" width="80%">';
***************
*** 265,269 ****
{
$link = $GLOBALS['phpgw']->link('/index.php',
! Array(
'menuaction' =>
'admin.uiaccounts.edit_user',
'account_id' =>
$account_info['account_id']
--- 242,246 ----
{
$link = $GLOBALS['phpgw']->link('/index.php',
! array(
'menuaction' =>
'admin.uiaccounts.edit_user',
'account_id' =>
$account_info['account_id']
***************
*** 275,299 ****
$link = '';
}
! display_line('Account LID:',$account_info['account_lid'],$link);
!
! $link = '<form method="POST" action="' . $contact_link . '">' .
"\n"
! . '<input type="submit" name="' . $contact_submit . '"
value="'.$contact_button.'">' . "\n"
! . '<input type="hidden" name="entry"
value="'.$sfields.'">' . "\n"
! . '</form>' . "\n";
! display_line('Profile ID: '.$contact_num,$link,'','
valign="center"');
!
! display_line('Firstname:',$firstname);
! display_line('Lastname:',$lastname);
! display_line('Title:',$profile_title);
! display_line('Work Phone:',$profile_work_phone);
! display_line('Home Phone:',$profile_home_phone);
! display_line('Work Email:',$profile_work_email);
! display_line('Home Email:',$profile_home_email);
! display_line('Comments:',$profile_comments);
display_line(' ','<img src="' .
$GLOBALS['phpgw']->link('/hr/view_image.php','con='.$account_info['account_id']).'"
width="100" height="120">');
echo '<tr><td colspan="2"> </td></tr>';
echo '<tr><td colspan="2" align="left" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg']
! . '">Member of the following groups</td></tr>';
for ($i=0;$i<count($membership); $i++)
--- 252,269 ----
$link = '';
}
! display_line(lang('account login') . ':',
$account_info['account_lid'], $link);
! display_line(lang('profile') . ':',$contact_text,$contact_link);
! display_line(lang('first name') . ':',$firstname);
! display_line(lang('last name') .':',$lastname);
! display_line(lang('title') . ':',$profile_title);
! display_line(lang('work phone') . ':',$profile_work_phone);
! display_line(lang('home phone') .':',$profile_home_phone);
! display_line(lang('work email') . ':',$profile_work_email);
! display_line(lang('home email') . ':',$profile_home_email);
display_line(' ','<img src="' .
$GLOBALS['phpgw']->link('/hr/view_image.php','con='.$account_info['account_id']).'"
width="100" height="120">');
echo '<tr><td colspan="2"> </td></tr>';
echo '<tr><td colspan="2" align="left" bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg']
! . '"><b>' . lang('member of the following groups') .
':<b></td></tr>';
for ($i=0;$i<count($membership); $i++)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hr index.php,1.12.2.1.2.1,1.12.2.1.2.2,
Dave Hall <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default columns.xsl, NONE, 1.1 date_search.xsl, NONE, 1.1
- Next by Date:
[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.17, 1.17.2.2.2.18
- Previous by thread:
[Phpgroupware-cvs] property/templates/default columns.xsl, NONE, 1.1 date_search.xsl, NONE, 1.1
- Next by thread:
[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php, 1.17.2.2.2.17, 1.17.2.2.2.18
- Index(es):