[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: hr index.php,1.12,1.13
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: hr index.php,1.12,1.13 |
|
Date: |
Sun, 19 May 2002 21:41:53 -0400 |
Update of /cvsroot/phpgroupware/hr
In directory subversions:/tmp/cvs-serv20860
Modified Files:
index.php
Log Message:
don't get excited, just formatting...
Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/hr/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** index.php 4 Jan 2002 04:27:54 -0000 1.12
--- index.php 20 May 2002 01:41:51 -0000 1.13
***************
*** 19,24 ****
$GLOBALS['phpgw_info']['flags'] = Array(
! 'currentapp' => 'hr',
! 'enable_nextmatchs_class' => True
);
include('../header.inc.php');
--- 19,24 ----
$GLOBALS['phpgw_info']['flags'] = Array(
! 'currentapp' => 'hr',
! 'enable_nextmatchs_class' => True
);
include('../header.inc.php');
***************
*** 30,38 ****
<table border="0" width="80%">
<tr>
! <td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg'] ?>"
align="center">Users</td>
</tr>
<?php
$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts');
! while (list($null,$account) = each($account_info))
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
--- 30,38 ----
<table border="0" width="80%">
<tr>
! <td bgcolor="<?php echo $GLOBALS['phpgw_info']['theme']['th_bg'] ?>"
align="center">Users</td>
</tr>
<?php
$account_info = $GLOBALS['phpgw']->accounts->get_list('accounts');
! while(list($null,$account) = each($account_info))
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
***************
*** 52,56 ****
<?php
$group_info = $GLOBALS['phpgw']->accounts->get_list('groups');
! while (list($null,$group) = each($group_info))
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
--- 52,56 ----
<?php
$group_info = $GLOBALS['phpgw']->accounts->get_list('groups');
! while(list($null,$group) = each($group_info))
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
***************
*** 89,93 ****
}
! if ($groupid && !$userid)
{
$account = CreateObject('phpgwapi.accounts',$groupid,'g');
--- 89,93 ----
}
! if($groupid && !$userid)
{
$account = CreateObject('phpgwapi.accounts',$groupid,'g');
***************
*** 106,110 ****
echo $groupdata['account_id'];
! if (!$fields[0]['id']) {
$fields[0]['tid'] = 'p';
$fields[0]['lid'] = $groupdata['account_lid'];
--- 106,111 ----
echo $groupdata['account_id'];
! if(!$fields[0]['id'])
! {
$fields[0]['tid'] = 'p';
$fields[0]['lid'] = $groupdata['account_lid'];
***************
*** 116,124 ****
$contact_submit = 'submit';
$contact_button = lang('Add');
! } else {
$contact_link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'addressbook.uiaddressbook.view',
! 'ab_id' => $fields[0]['id']
)
);
--- 117,127 ----
$contact_submit = 'submit';
$contact_button = lang('Add');
! }
! else
! {
$contact_link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'addressbook.uiaddressbook.view',
! 'ab_id' => $fields[0]['id']
)
);
***************
*** 129,133 ****
$firstname = $fields[0]['n_given'];
! if (!$firstname)
{
$firstname = $groupdata['firstname'];
--- 132,136 ----
$firstname = $fields[0]['n_given'];
! if(!$firstname)
{
$firstname = $groupdata['firstname'];
***************
*** 135,139 ****
$lastname = $fields[0]['n_family'];
! if (!$lastname)
{
$lastname = $groupdata['lastname'];
--- 138,142 ----
$lastname = $fields[0]['n_family'];
! if(!$lastname)
{
$lastname = $groupdata['lastname'];
***************
*** 141,145 ****
$profile_comments =
$GLOBALS['phpgw']->strip_html(stripslashes($fields[0]['note']));
! if (!$profile_comments)
{
$profile_comments = ' ';
--- 144,148 ----
$profile_comments =
$GLOBALS['phpgw']->strip_html(stripslashes($fields[0]['note']));
! if(!$profile_comments)
{
$profile_comments = ' ';
***************
*** 147,151 ****
echo '<table border="0" width="80%">';
! echo '<tr><td colspan="2" bgcolor="' .
$phpgw_info['theme']['th_bg'] . '"> </td></tr>';
if($GLOBALS['phpgw_info']['user']['apps']['admin'])
--- 150,154 ----
echo '<table border="0" width="80%">';
! echo '<tr><td colspan="2" bgcolor="' .
$phpgw_info['theme']['th_bg'] . '"> </td></tr>';
if($GLOBALS['phpgw_info']['user']['apps']['admin'])
***************
*** 153,158 ****
$link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'admin.uiaccounts.edit_group',
! 'account_id' =>
$groupdata['account_id']
)
);
--- 156,161 ----
$link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'admin.uiaccounts.edit_group',
! 'account_id' => $groupdata['account_id']
)
);
***************
*** 179,183 ****
. '">Members of the following group:</td></tr>';
! for ($i=0;$i<count($membership); $i++) {
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
echo '<tr bgcolor="'.$GLOBALS['tr_color'].'"><td
colspan="2"><a href="'
--- 182,187 ----
. '">Members of the following group:</td></tr>';
! for($i=0;$i<count($membership); $i++)
! {
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
echo '<tr bgcolor="'.$GLOBALS['tr_color'].'"><td
colspan="2"><a href="'
***************
*** 187,191 ****
echo '</table>';
}
! elseif (!$groupid && $userid)
{
$account = CreateObject('phpgwapi.accounts',$userid,'u');
--- 191,195 ----
echo '</table>';
}
! elseif(!$groupid && $userid)
{
$account = CreateObject('phpgwapi.accounts',$userid,'u');
***************
*** 208,212 ****
$fields =
$contacts->read(0,0,$qcols,'','tid=p,lid='.$account_info['account_lid']);
! if(!$fields[0]['id']) {
$fields[0]['tid'] = 'p';
$fields[0]['lid'] = $account_info['account_lid'];
--- 212,217 ----
$fields =
$contacts->read(0,0,$qcols,'','tid=p,lid='.$account_info['account_lid']);
! if(!$fields[0]['id'])
! {
$fields[0]['tid'] = 'p';
$fields[0]['lid'] = $account_info['account_lid'];
***************
*** 219,227 ****
// $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']
)
);
--- 224,234 ----
// $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']
)
);
***************
*** 232,236 ****
$firstname = $fields[0]['n_given'];
! if (!$firstname)
{
$firstname = $account_info['firstname'];
--- 239,243 ----
$firstname = $fields[0]['n_given'];
! if(!$firstname)
{
$firstname = $account_info['firstname'];
***************
*** 238,249 ****
$lastname = $fields[0]['n_family'];
! if (!$lastname)
{
$lastname = $account_info['lastname'];
}
! if ($phpgw_info['user']['apps']['email'])
{
! if ($fields[0]['email'])
{
$profile_work_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email'])).'"
target="_new">';
--- 245,256 ----
$lastname = $fields[0]['n_family'];
! if(!$lastname)
{
$lastname = $account_info['lastname'];
}
! if($phpgw_info['user']['apps']['email'])
{
! if($fields[0]['email'])
{
$profile_work_email = '<a
href="'.$GLOBALS['phpgw']->link('/email/compose.php','to='.urlencode($fields[0]['email'])).'"
target="_new">';
***************
*** 256,263 ****
else
{
! if ($fields[0]['email']) {
$profile_work_email='<a href="mailto:'.
$fields[0]['email'] .'">';
}
! if ($fields[0]['email_home']) {
$profile_home_email='<a href="mailto:'.
$fields[0]['email_home'] .'">';
}
--- 263,272 ----
else
{
! if($fields[0]['email'])
! {
$profile_work_email='<a href="mailto:'.
$fields[0]['email'] .'">';
}
! if($fields[0]['email_home'])
! {
$profile_home_email='<a href="mailto:'.
$fields[0]['email_home'] .'">';
}
***************
*** 265,269 ****
$profile_comments =
$GLOBALS['phpgw']->strip_html(stripslashes($fields[0]['note']));
! if (!$profile_comments)
{
$profile_comments = ' ';
--- 274,278 ----
$profile_comments =
$GLOBALS['phpgw']->strip_html(stripslashes($fields[0]['note']));
! if(!$profile_comments)
{
$profile_comments = ' ';
***************
*** 271,275 ****
$profile_work_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_work']);
! if (!$profile_work_phone)
{
$profile_work_phone = ' ';
--- 280,284 ----
$profile_work_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_work']);
! if(!$profile_work_phone)
{
$profile_work_phone = ' ';
***************
*** 277,281 ****
$profile_home_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_home']);
! if (!$profile_home_phone)
{
$profile_home_phone = ' ';
--- 286,290 ----
$profile_home_phone =
$GLOBALS['phpgw']->strip_html($fields[0]['tel_home']);
! if(!$profile_home_phone)
{
$profile_home_phone = ' ';
***************
*** 283,287 ****
$profile_title =
$GLOBALS['phpgw']->strip_html($fields[0]['title']);
! if (!$profile_title)
{
$profile_title = ' ';
--- 292,296 ----
$profile_title =
$GLOBALS['phpgw']->strip_html($fields[0]['title']);
! if(!$profile_title)
{
$profile_title = ' ';
***************
*** 296,301 ****
$link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'admin.uiaccounts.edit_user',
! 'account_id' =>
$account_info['account_id']
)
);
--- 305,310 ----
$link = $GLOBALS['phpgw']->link('/index.php',
Array(
! 'menuaction' =>
'admin.uiaccounts.edit_user',
! 'account_id' =>
$account_info['account_id']
)
);
***************
*** 327,331 ****
. '">Member of the following groups</td></tr>';
! for ($i=0;$i<count($membership); $i++)
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
--- 336,340 ----
. '">Member of the following groups</td></tr>';
! for($i=0;$i<count($membership); $i++)
{
$GLOBALS['tr_color'] =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($GLOBALS['tr_color']);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: hr index.php,1.12,1.13,
Miles Lott <address@hidden> <=