[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.4,1.5 functions.in
From: |
Sigurd Nes <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.4,1.5 functions.inc.php,1.3,1.4 class.fm_wo_activities.inc.php,1.1.1.1,1.2 class.fm_wrkorder.inc.php,1.1.1.1,1.2 |
Date: |
Tue, 03 Sep 2002 18:15:40 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv30475/inc
Modified Files:
header.inc.php functions.inc.php
class.fm_wo_activities.inc.php class.fm_wrkorder.inc.php
Log Message:
no message
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** header.inc.php 2 Sep 2002 23:25:32 -0000 1.4
--- header.inc.php 3 Sep 2002 22:15:38 -0000 1.5
***************
*** 70,86 ****
if ($sub == p_equipment)
{
!
$t->set_var('link_equipment_type',$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sub=p_equipment'));
$t->set_var('sublang_equipment_type',lang('Equipment type'));
!
$t->set_var('link_equipment_type_attribute',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','sub=p_equipment'));
! $t->set_var('sublang_equipment_type_attribute',lang('Equipment
type attribute'));
$admin_info = lang('equipment');
}
else
{
! $t->set_var('link_equipment_type','');
$t->set_var('sublang_equipment_type','');
! $t->set_var('link_equipment_type_attribute','');
! $t->set_var('sublang_equipment_type_attribute','');
!
}
--- 70,85 ----
if ($sub == p_equipment)
{
!
$t->set_var('sublink_equipment_type',$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sub=p_equipment'));
$t->set_var('sublang_equipment_type',lang('Equipment type'));
!
$t->set_var('sublink_equipment',$GLOBALS['phpgw']->link('/property/list_equipment.php','sub=p_equipment'));
! $t->set_var('sublang_equipment',lang('Equipment'));
$admin_info = lang('equipment');
}
else
{
! $t->set_var('sublink_equipment_type','');
$t->set_var('sublang_equipment_type','');
! $t->set_var('sublink_equipment','');
! $t->set_var('sublang_equipment','');
}
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/functions.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** functions.inc.php 2 Sep 2002 22:54:31 -0000 1.3
--- functions.inc.php 3 Sep 2002 22:15:38 -0000 1.4
***************
*** 465,474 ****
//----remote smtp ----
! $rc = $GLOBALS['phpgw']->send->msg('email', $to,
$subject, stripslashes($body), '', $cc, $bcc);
//----remote smtp ----
//----Via sendmail ----
! // $rc= mail($to,$subject,stripslashes($body),
$headers);
//----Via sendmail ----
--- 465,474 ----
//----remote smtp ----
! // $rc = $GLOBALS['phpgw']->send->msg('email', $to,
$subject, stripslashes($body), '', $cc, $bcc);
//----remote smtp ----
//----Via sendmail ----
! $rc= mail($to,$subject,stripslashes($body),
$headers);
//----Via sendmail ----
***************
*** 555,571 ****
! function select_coordinator_list($account_id = '',$account_lid = '',
$sub='')
{
- // global $GLOBALS['phpgw'],$GLOBALS['phpgw_info'];
-
$join = join_statement();
! if ($account_id)
{
! $selected = $account_id;
}
else
{
! $selected = $account_lid;
}
--- 555,569 ----
! function select_coordinator_list($type = '',$selected = '', $sub='')
{
$join = join_statement();
! if ($type=='account_id')
{
! $id_field='account_id';
}
else
{
! $id_field='account_lid';
}
***************
*** 580,590 ****
$coordinator_list .= '>' .lang('All'). '</option>' . "\n";
-
while ($GLOBALS['phpgw']->db->next_record())
{
! $coordinator_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('account_lid') . '"';
for ($i=0;$i<count($selected);$i++)
{
! if($selected ==
$GLOBALS['phpgw']->db->f('account_lid'))
{
$coordinator_list .= '
selected';
--- 578,587 ----
$coordinator_list .= '>' .lang('All'). '</option>' . "\n";
while ($GLOBALS['phpgw']->db->next_record())
{
! $coordinator_list .= '<option value="' .
$GLOBALS['phpgw']->db->f($id_field) . '"';
for ($i=0;$i<count($selected);$i++)
{
! if($selected ==
$GLOBALS['phpgw']->db->f($id_field))
{
$coordinator_list .= '
selected';
***************
*** 629,633 ****
{
$selected = $district;
! echo 'selected: '.$selected .'<BR>';
$district_list .= '<option value="all"';
--- 626,630 ----
{
$selected = $district;
! // echo 'selected: '.$selected .'<BR>';
$district_list .= '<option value="all"';
Index: class.fm_wo_activities.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wo_activities.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.fm_wo_activities.inc.php 28 Aug 2002 16:43:16 -0000 1.1.1.1
--- class.fm_wo_activities.inc.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 596,633 ****
}
- //--------------------------cooridinator list---------------------------
-
- function select_coordinator_list($coordinator_id = '')
- {
- // global $GLOBALS['phpgw'],$GLOBALS['phpgw_info'];
- $selected = $coordinator_id;
-
- $this->db->query("SELECT account_id, account_firstname ,
account_lastname from phpgw_accounts where account_type ='u' order by
account_lastname asc");
- $coordinator_list .= '<option value="all"';
- if($selected == 'all')
- {
- $coordinator_list .= ' selected';
- }
- $coordinator_list .= '>' .lang('All'). '</option>' . "\n";
-
-
- while ($this->db->next_record())
-
- {
- $coordinator_list .= '<option value="' .
$this->db->f('account_id') . '"';
- for ($i=0;$i<count($selected);$i++)
- {
- if($selected ==
$this->db->f('account_id'))
- {
- $coordinator_list .= '
selected';
- }
- }
- $coordinator_list .= '>' .
$this->db->f('account_lastname') . ' , ' . $this->db->f('account_firstname');
-
-
- $coordinator_list .= '</option>' . "\n";
- }
- return $coordinator_list;
- }
//----------------------------Request status list ----------------------
--- 596,599 ----
Index: class.fm_wrkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wrkorder.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** class.fm_wrkorder.inc.php 28 Aug 2002 16:43:16 -0000 1.1.1.1
--- class.fm_wrkorder.inc.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 1049,1086 ****
}
- //--------------------------cooridinator list---------------------------
-
- function select_coordinator_list($coordinator_id = '')
- {
- // global $GLOBALS['phpgw'],$GLOBALS['phpgw_info'];
- $selected = $coordinator_id;
-
- $this->db->query("SELECT account_id, account_firstname ,
account_lastname from phpgw_accounts where account_type ='u' order by
account_lastname asc");
- $coordinator_list .= '<option value="all"';
- if($selected == 'all')
- {
- $coordinator_list .= ' selected';
- }
- $coordinator_list .= '>' .lang('All'). '</option>' . "\n";
-
-
- while ($this->db->next_record())
-
- {
- $coordinator_list .= '<option value="' .
$this->db->f('account_id') . '"';
- for ($i=0;$i<count($selected);$i++)
- {
- if($selected ==
$this->db->f('account_id'))
- {
- $coordinator_list .= '
selected';
- }
- }
- $coordinator_list .= '>' .
$this->db->f('account_lastname') . ' , ' . $this->db->f('account_firstname');
-
-
- $coordinator_list .= '</option>' . "\n";
- }
- return $coordinator_list;
- }
//----------------------------Request status list ----------------------
--- 1049,1052 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc header.inc.php,1.4,1.5 functions.inc.php,1.3,1.4 class.fm_wo_activities.inc.php,1.1.1.1,1.2 class.fm_wrkorder.inc.php,1.1.1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.3,1.4 setup.inc.php,1.2,1.3 tables_update.inc.php,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.2,1.3 form_equipment_attribute.tpl,1.1.1.1,1.2 formequipment.tpl,1.1.1.1,1.2 formequipment_type.tpl,1.1.1.1,1.2 formequipment_type_attribute.tpl,1.1.1.1,1.2 list_equipment_type.tpl,1.1.1.1,1.2 list_equipment_type_attribute.tpl,1.1.1.1,1.2 list_workorder.tpl,1.1.1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.3,1.4 setup.inc.php,1.2,1.3 tables_update.inc.php,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.2,1.3 form_equipment_attribute.tpl,1.1.1.1,1.2 formequipment.tpl,1.1.1.1,1.2 formequipment_type.tpl,1.1.1.1,1.2 formequipment_type_attribute.tpl,1.1.1.1,1.2 list_equipment_type.tpl,1.1.1.1,1.2 list_equipment_type_attribute.tpl,1.1.1.1,1.2 list_workorder.tpl,1.1.1.1,1.2
- Index(es):