[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.menu.inc.php, NONE, 1.1 class.boco
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.menu.inc.php, NONE, 1.1 class.bocommon.inc.php, 1.88, 1.89 class.soentity.inc.php, 1.6, 1.7 class.uientity.inc.php, 1.4, 1.5 class.soadmin_entity.inc.php, 1.8, 1.9 class.uiadmin_entity.inc.php, 1.7, 1.8 class.boadmin_entity.inc.php, 1.5, 1.6 class.boentity.inc.php, 1.3, 1.4 class.uitts.inc.php, 1.40, 1.41 class.soworkorder.inc.php, 1.31, 1.32 class.sotts.inc.php, 1.30, 1.31 class.soproject.inc.php, 1.42, 1.43 class.botts.inc.php, 1.21, 1.22 class.boadmin.inc.php, 1.17, 1.18 class.boworkorder.inc.php, 1.18, 1.19 class.uiworkorder.inc.php, 1.46, 1.47 class.uiproject.inc.php, 1.52, 1.53 class.boproject.inc.php, 1.18, 1.19 class.uilocation.inc.php, 1.32, 1.33 class.uiXport.inc.php, 1.33, 1.34 class.uiinvoice.inc.php, 1.38, 1.39 class.uidocument.inc.php, 1.18, 1.19 class.uireport.inc.php, 1.19, 1.20 class.uiequipment.inc.php, 1.35, 1.36 class.uistandard_entity.inc.php, 1.18, 1.19 class.sowo_hour.inc.php, 1.17, 1.18 class.uiwo_hour.inc.php, 1.38, 1.39 class.uiadmin_location.inc.php, 1.9, 1.10 class.uirequest.inc.php, 1.29, 1.30 class.socommon.inc.php, 1.37, 1.38 class.uigab.inc.php, 1.15, 1.16 class.botemplate.inc.php, 1.3, 1.4 class.sotemplate.inc.php, 1.7, 1.8 class.uidrawing.inc.php, 1.24, 1.25 class.uiinvestment.inc.php, 1.26, 1.27 class.uimeter.inc.php, 1.16, 1.17 class.uipricebook.inc.php, 1.18, 1.19 class.uitemplate.inc.php, 1.13, 1.14 class.uiowner.inc.php, 1.10, 1.11 class.uip_of_town.inc.php, 1.1, 1.2 class.uitenant.inc.php, 1.4, 1.5 |
|
Date: |
Tue, 28 Oct 2003 15:14:45 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv30636/inc
Modified Files:
class.bocommon.inc.php class.soentity.inc.php
class.uientity.inc.php class.soadmin_entity.inc.php
class.uiadmin_entity.inc.php class.boadmin_entity.inc.php
class.boentity.inc.php class.uitts.inc.php
class.soworkorder.inc.php class.sotts.inc.php
class.soproject.inc.php class.botts.inc.php
class.boadmin.inc.php class.boworkorder.inc.php
class.uiworkorder.inc.php class.uiproject.inc.php
class.boproject.inc.php class.uilocation.inc.php
class.uiXport.inc.php class.uiinvoice.inc.php
class.uidocument.inc.php class.uireport.inc.php
class.uiequipment.inc.php class.uistandard_entity.inc.php
class.sowo_hour.inc.php class.uiwo_hour.inc.php
class.uiadmin_location.inc.php class.uirequest.inc.php
class.socommon.inc.php class.uigab.inc.php
class.botemplate.inc.php class.sotemplate.inc.php
class.uidrawing.inc.php class.uiinvestment.inc.php
class.uimeter.inc.php class.uipricebook.inc.php
class.uitemplate.inc.php class.uiowner.inc.php
class.uip_of_town.inc.php class.uitenant.inc.php
Added Files:
class.menu.inc.php
Log Message:
no message
Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** class.uiadmin_location.inc.php 26 Sep 2003 18:57:11 -0000 1.9
--- class.uiadmin_location.inc.php 28 Oct 2003 15:14:41 -0000 1.10
***************
*** 37,40 ****
--- 37,41 ----
$this->bo =
CreateObject($this->currentapp.'.boadmin_location',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start =
$this->bo->start;
***************
*** 43,47 ****
$this->order =
$this->bo->order;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'admin_location');
}
--- 44,48 ----
$this->order =
$this->bo->order;
! $this->menu->sub
='admin_location';
}
***************
*** 67,71 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$standard_list = $this->bo->read();
--- 68,72 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$standard_list = $this->bo->read();
***************
*** 572,576 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$standard_list = $this->bo->read_config();
--- 573,577 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$standard_list = $this->bo->read_config();
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.uistandard_entity.inc.php 1 Oct 2003 19:26:45 -0000 1.18
--- class.uistandard_entity.inc.php 28 Oct 2003 15:14:41 -0000 1.19
***************
*** 36,39 ****
--- 36,40 ----
$this->bo =
CreateObject($this->currentapp.'.bostandard_entity',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start =
$this->bo->start;
***************
*** 64,68 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$standard_list = $this->bo->read($type);
--- 65,69 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$standard_list = $this->bo->read($type);
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** class.uiproject.inc.php 10 Oct 2003 21:57:13 -0000 1.52
--- class.uiproject.inc.php 28 Oct 2003 15:14:38 -0000 1.53
***************
*** 38,45 ****
$this->bo =
CreateObject($this->currentapp.'.boproject',True);
- $this->so =
CreateObject($this->currentapp.'.soproject');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->config =
CreateObject('phpgwapi.config');
! $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
--- 38,43 ----
$this->bo =
CreateObject($this->currentapp.'.boproject',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->menu =
CreateObject($this->currentapp.'.menu');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
***************
*** 58,62 ****
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
}
--- 56,60 ----
$this->status_id =
$this->bo->status_id;
! $this->menu->sub ='project';
}
***************
*** 146,150 ****
$end_date =
urldecode(get_var('end_date',array('POST','GET')));
! $links = $this->bocommon->menu();
$project_list = $this->bo->read($start_date,$end_date);
--- 144,148 ----
$end_date =
urldecode(get_var('end_date',array('POST','GET')));
! $links = $this->menu->links();
$project_list = $this->bo->read($start_date,$end_date);
***************
*** 491,494 ****
--- 489,494 ----
$add_request =
get_var('add_request',array('POST'));
+ $config =
CreateObject('phpgwapi.config');
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 552,556 ****
if($location_code)
{
! $values['location_data'] =
$this->bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'equipment_id'=>$equipment_id));
}
--- 552,556 ----
if($location_code)
{
! $values['location_data'] =
$bolocation->read_single($location_code,array('tenant_id'=>$tenant_id,'equipment_id'=>$equipment_id));
}
***************
*** 561,565 ****
//_debug_array($values);
! $this->config->read_repository();
if ($values['save'])
--- 561,565 ----
//_debug_array($values);
! $config->read_repository();
if ($values['save'])
***************
*** 635,639 ****
$message = lang(Project) . " "
. $values['project_id'] ." ". lang(needs_approval);
! $mail_method=
$this->config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
{
--- 635,639 ----
$message = lang(Project) . " "
. $values['project_id'] ." ". lang(needs_approval);
! $mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
{
***************
*** 664,668 ****
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$this->bolocation->read_single($location_code,$values['extra']);
}
}
--- 664,668 ----
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$bolocation->read_single($location_code,$values['extra']);
}
}
***************
*** 727,731 ****
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' => -1,
// calculated from location_types
--- 727,731 ----
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' => -1,
// calculated from location_types
***************
*** 761,765 ****
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
! $need_approval =
$this->config->config_data['workorder_approval'];
$project_status=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'];
--- 761,765 ----
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
! $need_approval =
$config->config_data['workorder_approval'];
$project_status=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'];
***************
*** 990,993 ****
--- 990,994 ----
$receipt =
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,'');
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
$id = get_var('id',array('POST','GET'));
***************
*** 995,1000 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('project'));
- $this->config->read_repository();
-
$values = $this->bo->read_single($id);
--- 996,999 ----
***************
*** 1024,1028 ****
}
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
--- 1023,1027 ----
}
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** class.uiworkorder.inc.php 10 Oct 2003 21:57:13 -0000 1.46
--- class.uiworkorder.inc.php 28 Oct 2003 15:14:38 -0000 1.47
***************
*** 38,46 ****
$this->bo =
CreateObject($this->currentapp.'.boworkorder',True);
- $this->boproject =
CreateObject($this->currentapp.'.boproject');
- $this->so =
CreateObject($this->currentapp.'.soworkorder');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->config =
CreateObject('phpgwapi.config');
! $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
$this->acl2_location = '.project';
--- 38,43 ----
$this->bo =
CreateObject($this->currentapp.'.boworkorder',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->menu =
CreateObject($this->currentapp.'.menu');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
$this->acl2_location = '.project';
***************
*** 59,64 ****
$this->search_vendor =
$this->bo->search_vendor;
!
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
}
--- 56,60 ----
$this->search_vendor =
$this->bo->search_vendor;
! $this->menu->sub ='project';
}
***************
*** 143,147 ****
'nextmatchs'));
! $links = $this->bocommon->menu();
$start_date =
urldecode(get_var('start_date',array('POST','GET')));
--- 139,143 ----
'nextmatchs'));
! $links = $this->menu->links();
$start_date =
urldecode(get_var('start_date',array('POST','GET')));
***************
*** 462,465 ****
--- 458,464 ----
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
}
+ $boproject =
CreateObject($this->currentapp.'.boproject');
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+ $config =
CreateObject('phpgwapi.config');
$id =
get_var('id',array('POST','GET'));
$project_id =
get_var('project_id',array('POST','GET'));
***************
*** 477,481 ****
$values['end_date'] =
get_var('end_date',array('POST'));
! $this->config->read_repository();
if ($values['save'])
--- 476,480 ----
$values['end_date'] =
get_var('end_date',array('POST'));
! $config->read_repository();
if ($values['save'])
***************
*** 536,540 ****
$message = lang('Workorder %1
needs approval',$values['workorder_id']);
! $mail_method=
$this->config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
{
--- 535,539 ----
$message = lang('Workorder %1
needs approval',$values['workorder_id']);
! $mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
{
***************
*** 571,575 ****
$values['project_id']=$project_id;
}
! $project =
$this->boproject->read_single_mini($values['project_id']);
if
(!$this->bocommon->check_perms($project['grants'],PHPGW_ACL_EDIT))
--- 570,574 ----
$values['project_id']=$project_id;
}
! $project =
$boproject->read_single_mini($values['project_id']);
if
(!$this->bocommon->check_perms($project['grants'],PHPGW_ACL_EDIT))
***************
*** 649,653 ****
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
--- 648,652 ----
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
***************
*** 685,689 ****
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
! $need_approval =
$this->config->config_data['workorder_approval'];
if ($supervisor_id && ($need_approval=='yes'))
--- 684,688 ----
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
! $need_approval =
$config->config_data['workorder_approval'];
if ($supervisor_id && ($need_approval=='yes'))
***************
*** 817,825 ****
'lang_status_statustext' =>
lang('What is the current status of this workorder ?'),
! 'branch_list'
=> $this->boproject->select_branch_p_list($project['project_id']),
'lang_branch'
=> lang('branch'),
'lang_branch_statustext' =>
lang('Select the branches for this project'),
! 'key_responsible_list'
=> $this->boproject->select_branch_list($project['key_responsible']),
'lang_key_responsible'
=> lang('key responsible'),
--- 816,824 ----
'lang_status_statustext' =>
lang('What is the current status of this workorder ?'),
! 'branch_list'
=> $boproject->select_branch_p_list($project['project_id']),
'lang_branch'
=> lang('branch'),
'lang_branch_statustext' =>
lang('Select the branches for this project'),
! 'key_responsible_list'
=> $boproject->select_branch_list($project['key_responsible']),
'lang_key_responsible'
=> lang('key responsible'),
***************
*** 935,938 ****
--- 934,940 ----
}
+ $boproject =
CreateObject($this->currentapp.'.boproject');
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$receipt =
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,'');
***************
*** 942,949 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder'));
- $this->config->read_repository();
-
$values = $this->bo->read_single($id);
! $project =
$this->boproject->read_single($values['project_id']);
//_debug_array($values);
--- 944,949 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder'));
$values = $this->bo->read_single($id);
! $project =
$boproject->read_single($values['project_id']);
//_debug_array($values);
***************
*** 972,976 ****
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
--- 972,976 ----
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** class.uiequipment.inc.php 1 Oct 2003 19:26:45 -0000 1.35
--- class.uiequipment.inc.php 28 Oct 2003 15:14:40 -0000 1.36
***************
*** 40,43 ****
--- 40,44 ----
$this->so =
CreateObject($this->currentapp.'.soequipment');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
***************
*** 58,62 ****
$this->district_id =
$this->bo->district_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'equipment');
}
--- 59,63 ----
$this->district_id =
$this->bo->district_id;
! $this->menu->sub ='equipment';
}
***************
*** 190,195 ****
'search_field'));
! $sub = get_var('sub',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
$equipment_list = $this->bo->read();
--- 191,195 ----
'search_field'));
! $links = $this->menu->links();
$equipment_list = $this->bo->read();
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** class.uireport.inc.php 1 Oct 2003 19:26:45 -0000 1.19
--- class.uireport.inc.php 28 Oct 2003 15:14:40 -0000 1.20
***************
*** 41,44 ****
--- 41,45 ----
$this->bo =
CreateObject($this->currentapp.'.boreport',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
***************
*** 61,65 ****
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'report');
}
--- 62,66 ----
$this->status_id =
$this->bo->status_id;
! $this->menu->sub ='report';
}
***************
*** 197,201 ****
'search_field'));
! $links = $this->bocommon->menu();
$start_date =
urldecode(get_var('start_date',array('POST','GET')));
--- 198,202 ----
'search_field'));
! $links = $this->menu->links();
$start_date =
urldecode(get_var('start_date',array('POST','GET')));
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** class.bocommon.inc.php 26 Oct 2003 20:33:01 -0000 1.88
--- class.bocommon.inc.php 28 Oct 2003 15:14:36 -0000 1.89
***************
*** 49,59 ****
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->socommon =
CreateObject($this->currentapp.'.socommon');
- $this->accounts =
CreateObject('phpgwapi.accounts');
- $this->acl2 =
CreateObject($this->currentapp.'.acl2');
- $this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
- $this->contacts =
CreateObject('phpgwapi.contacts');
$this->join = $this->socommon->join;
!
switch($GLOBALS['phpgw_info']['server']['db_type'])
--- 49,55 ----
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->join = $this->socommon->join;
! $this->left_join = $this->socommon->left_join;
switch($GLOBALS['phpgw_info']['server']['db_type'])
***************
*** 282,286 ****
}
! $users = $this->accounts->get_list('accounts', $start,
$sort, $order, $query);
if (is_array($users_extra) && is_array($users))
{
--- 278,284 ----
}
! $accounts = CreateObject('phpgwapi.accounts');
! $users = $accounts->get_list('accounts', $start, $sort,
$order, $query);
! unset($accounts);
if (is_array($users_extra) && is_array($users))
{
***************
*** 332,337 ****
}
! $users = $this->accounts->get_list('groups', $start,
$sort, $order, $query);
!
if (isSet($users) AND is_array($users))
{
--- 330,336 ----
}
! $accounts = CreateObject('phpgwapi.accounts');
! $users = $accounts->get_list('groups', $start, $sort,
$order, $query);
! unset($accounts);
if (isSet($users) AND is_array($users))
{
***************
*** 465,468 ****
--- 464,468 ----
{
//_debug_array($data);
+ $contacts =
CreateObject('phpgwapi.contacts');
if($data['type']=='view')
***************
*** 480,484 ****
if($data['vendor_id'] && !$data['vendor_name'])
{
! $vendor_data
=
$this->contacts->read_single_entry($data['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
$vendor['value_vendor_name'] =
$vendor_data[0]['org_name'];
}
--- 480,484 ----
if($data['vendor_id'] && !$data['vendor_name'])
{
! $vendor_data
=
$contacts->read_single_entry($data['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
$vendor['value_vendor_name'] =
$vendor_data[0]['org_name'];
}
***************
*** 489,492 ****
--- 489,493 ----
$vendor['lang_vendor_name']
= lang('Vendor Name');
+ unset($contacts);
//_debug_array($vendor);
return $vendor;
***************
*** 744,987 ****
}
-
- function menu($sub='')
- {
-
- $currentapp=$this->currentapp;
-
- if (!$sub)
- {
- $sub =
$GLOBALS['phpgw']->session->appsession('sub',$currentapp);
- }
-
- $previous_sub =
$GLOBALS['phpgw']->session->appsession('previous_sub',$currentapp);
-
- if($previous_sub==$sub)
- {
- $menu =
$GLOBALS['phpgw']->session->appsession('menu',$currentapp);
- }
- else
- {
- $previous_sub =
$GLOBALS['phpgw']->session->appsession('previous_sub',$currentapp,$sub);
-
- $i=0;
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id=1');
- $menu['module'][$i]['name'] =
lang('Property');
- $menu['module'][$i]['statustext'] =
lang('Property');
- $i++;
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
- $menu['module'][$i]['name'] =
lang('Equipment');
- $menu['module'][$i]['statustext'] =
lang('Equipment');
-
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index');
- $menu['module'][$i]['name']
= lang('Helpdesk');
- $menu['module'][$i]['statustext'] =
lang('Helpdesk');
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index');
- $menu['module'][$i]['name']
= lang('Project');
- $menu['module'][$i]['statustext'] =
lang('Project');
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
- $menu['module'][$i]['name']
= lang('Invoice');
- $menu['module'][$i]['statustext'] =
lang('Invoice');
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.index');
- $menu['module'][$i]['name']
= lang('Pricebook');
- $menu['module'][$i]['statustext'] =
lang('Pricebook');
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
- $menu['module'][$i]['name']
= lang('Documentation');
- $menu['module'][$i]['statustext'] =
lang('Documentation');
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uireport.index');
- $menu['module'][$i]['name']
= lang('Report');
- $menu['module'][$i]['statustext'] =
lang('Report');
-
- $entity =
CreateObject($this->currentapp.'.soadmin_entity');
- $entity_list =
$entity->read(array('allrows'=>True));
-
- if (isset($entity_list) AND
is_array($entity_list))
- {
- foreach($entity_list as $entry)
- {
- $i++;
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entry['id']);
- $menu['module'][$i]['name']
= $entry['name'];
-
$menu['module'][$i]['statustext'] = $entry['descr'];
- }
- }
-
- $i=0;
-
- $entity_id =
$GLOBALS['phpgw']->session->appsession('entity_id',$currentapp);
- if ($sub == 'entity_'.$entity_id)
- {
- $entity_category =
$entity->read_category(array('allrows'=>True,'entity_id'=>$entity_id));
- $k=count($entity_category);
- for ($j=0; $j<$k; $j++)
- {
- $i++;
- $menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entity_id .'&cat_id=' .$entity_category[$j]['id'] );
- $menu['sub_menu'][$i]['name'] =
$entity_category[$j]['name'];
-
$menu['sub_menu'][$i]['statustext'] = $entity_category[$j]['descr'];
- }
-
- }
- unset($entity);
-
- if ($sub == 'equipment')
- {
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
- $menu['sub_menu'][$i]['name']
= lang('Equipment');
- $menu['sub_menu'][$i]['statustext']
= lang('Equipment');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uimeter.index');
- $menu['sub_menu'][$i]['name']
= lang('Meter');
- $menu['sub_menu'][$i]['statustext']
= lang('Meter');
-
- if ($this->acl2->check('.equipment',16))
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uistandard_entity.index&type=equipment');
- $menu['sub_menu'][$i]['name']
= lang('Equipment type');
-
$menu['sub_menu'][$i]['statustext'] = lang('Equipment type');
- }
- }
-
- if ($sub == 'location')
- {
- $location =
$this->soadmin_location->select_location_type();
- $location_count=count($location);
- for ($j=0; $j<$location_count; $j++)
- {
- $i++;
- $menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id='
.$location[$j]['id'] );
- $menu['sub_menu'][$i]['name'] =
$location[$j]['name'];
-
$menu['sub_menu'][$i]['statustext'] = $location[$j]['descr'];
- }
-
- $config_tenant =
$this->soadmin_location->read_config_single('tenant_id');
-
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&lookup_tenant=1&type_id='
. $config_tenant);
- $menu['sub_menu'][$i]['name']
= lang('Tenant');
- $menu['sub_menu'][$i]['statustext']
= lang('Tenant');
-
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidrawing.index');
- $menu['sub_menu'][$i]['name']
= lang('Drawing');
- $menu['sub_menu'][$i]['statustext']
= lang('Drawing');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uigab.index');
- $menu['sub_menu'][$i]['name']
= lang('gabnr');
- $menu['sub_menu'][$i]['statustext']
= lang('gabnr');
- }
-
- if ($sub == 'invoice')
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
- $menu['sub_menu'][$i]['name']
= lang('Invoice');
- $menu['sub_menu'][$i]['statustext']
= lang('Invoice');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&paid=true');
- $menu['sub_menu'][$i]['name']
= lang('Paid');
- $menu['sub_menu'][$i]['statustext']
= lang('Paid');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume');
- $menu['sub_menu'][$i]['name']
= lang('consume');
- $menu['sub_menu'][$i]['statustext']
= lang('consume');
-
- if ($this->acl2->check('.invoice',16))
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
- $menu['sub_menu'][$i]['name']
= lang('Investment value');
-
$menu['sub_menu'][$i]['statustext'] = lang('Investment
value');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.import');
- $menu['sub_menu'][$i]['name']
= lang('Import invoice');
-
$menu['sub_menu'][$i]['statustext'] = lang('Import invoice');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
- $menu['sub_menu'][$i]['name']
= lang('Export invoice');
-
$menu['sub_menu'][$i]['statustext'] = lang('Export invoice');
-
-
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
-
$menu['sublang_invoice_investment_value']=lang('Investment value');
-
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.import');
-
$menu['sublang_invoice_import']=lang('Import invoice');
-
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
-
$menu['sublang_invoice_export']=lang('Export invoice');
- }
- }
-
- if ($sub == 'pricebook' &&
$this->acl2->check('.pricebook',16))
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.index');
- $menu['sub_menu'][$i]['name']
= lang('Per Vendor');
- $menu['sub_menu'][$i]['statustext']
= lang('Per Vendor');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.activity');
- $menu['sub_menu'][$i]['name']
= lang('Per Agreement');
- $menu['sub_menu'][$i]['statustext']
= lang('Per Agreement');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.agreement');
- $menu['sub_menu'][$i]['name']
= lang('Agreement');
- $menu['sub_menu'][$i]['statustext']
= lang('Agreement');
- }
-
- if ($sub == 'project')
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index');
- $menu['sub_menu'][$i]['name']
= lang('Project');
- $menu['sub_menu'][$i]['statustext']
= lang('Project');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
- $menu['sub_menu'][$i]['name']
= lang('Workorder');
- $menu['sub_menu'][$i]['statustext']
= lang('Workorder');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uirequest.index');
- $menu['sub_menu'][$i]['name']
= lang('Request');
- $menu['sub_menu'][$i]['statustext']
= lang('Request');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitemplate.index');
- $menu['sub_menu'][$i]['name']
= lang('template');
- $menu['sub_menu'][$i]['statustext']
= lang('Workorder template');
- }
-
- if ($sub == admin_location &&
$this->acl2->check('.location',16))
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.index');
- $menu['sub_menu'][$i]['name']
= lang('Location type');
- $menu['sub_menu'][$i]['statustext']
= lang('Location type');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.config');
- $menu['sub_menu'][$i]['name']
= lang('Config');
- $menu['sub_menu'][$i]['statustext']
= lang('Location Config');
- }
-
- if ($sub == 'document')
- {
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
- $menu['sub_menu'][$i]['name']
= lang('location');
- $menu['sub_menu'][$i]['statustext']
= lang('Documentation for locations');
- $i++;
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=equipment');
- $menu['sub_menu'][$i]['name']
= lang('Equipment');
- $menu['sub_menu'][$i]['statustext']
= lang('Documentation for equipment');
- }
-
- $menu =
$GLOBALS['phpgw']->session->appsession('menu',$currentapp,$menu);
- }
-
- return $menu;
- }
-
function add_leading_zero($num)
{
--- 745,748 ----
***************
*** 1015,1019 ****
function read_location_data($location_code)
{
! $location_types =
$this->soadmin_location->select_location_type();
return
$this->socommon->read_location_data($location_code,$location_types);
--- 776,783 ----
function read_location_data($location_code)
{
! $soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
!
! $location_types =
$soadmin_location->select_location_type();
! unset($soadmin_location);
return
$this->socommon->read_location_data($location_code,$location_types);
***************
*** 1058,1063 ****
! $location_types =
$this->soadmin_location->select_location_type();
! $config = $this->soadmin_location->read_config('');
--- 822,828 ----
! $soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
! $location_types =
$soadmin_location->select_location_type();
! $config = $soadmin_location->read_config('');
***************
*** 1072,1078 ****
$this->type_id = $type_id;
! $fm_location_cols =
$this->soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
!
for ($i=0; $i<$type_id; $i++)
--- 837,843 ----
$this->type_id = $type_id;
! $fm_location_cols =
$soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
+ unset($soadmin_location);
for ($i=0; $i<$type_id; $i++)
Index: class.uiadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_entity.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.uiadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.7
--- class.uiadmin_entity.inc.php 28 Oct 2003 15:14:37 -0000 1.8
***************
*** 39,42 ****
--- 39,43 ----
$this->bo =
CreateObject($this->currentapp.'.boadmin_entity',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start =
$this->bo->start;
***************
*** 48,52 ****
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'admin_entity');
}
--- 49,53 ----
$this->allrows =
$this->bo->allrows;
! $this->menu->sub ='admin_entity';
}
***************
*** 74,78 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$entity_list = $this->bo->read();
--- 75,79 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$entity_list = $this->bo->read();
***************
*** 191,195 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$list = $this->bo->read_status();
--- 192,196 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$list = $this->bo->read_status();
***************
*** 310,314 ****
'menu',
'search_field'));
! $links = $this->bocommon->menu();
$category_list = $this->bo->read_category($entity_id);
--- 311,315 ----
'menu',
'search_field'));
! $links = $this->menu->links();
$category_list = $this->bo->read_category($entity_id);
***************
*** 694,700 ****
$entity = $this->bo->read_single($entity_id,false);
-
- // $location_types =
$this->bocommon->soadmin_location->select_location_type();
- // $max_location_type=count($location_types);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
--- 695,698 ----
Index: class.boentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.boentity.inc.php 23 Oct 2003 16:52:14 -0000 1.3
--- class.boentity.inc.php 28 Oct 2003 15:14:37 -0000 1.4
***************
*** 353,357 ****
$values['date'] =
$this->bocommon->date_to_timestamp($values['date']);
-
for ($i=0;$i<count($values_attribute);$i++)
{
--- 353,356 ----
***************
*** 372,377 ****
if($values_attribute[$i]['datatype']=='D' &&
$values_attribute[$i]['value'])
{
-
- //_debug_array($values_attribute[$i]['value']);
$values_attribute[$i]['value'] =
date($this->bocommon->dateformat,$this->bocommon->date_to_timestamp($values_attribute[$i]['value']));
--- 371,374 ----
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** class.uiinvestment.inc.php 18 Jul 2003 09:34:54 -0000 1.26
--- class.uiinvestment.inc.php 28 Oct 2003 15:14:42 -0000 1.27
***************
*** 35,38 ****
--- 35,39 ----
$this->bo =
CreateObject($this->currentapp.'.boinvestment',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
***************
*** 52,56 ****
$this->allrows =
$this->bo->allrows;
$this->admin_invoice =
$this->acl2->check('.invoice',16);
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
}
--- 53,57 ----
$this->allrows =
$this->bo->allrows;
$this->admin_invoice =
$this->acl2->check('.invoice',16);
! $this->menu->sub ='invoice';
}
***************
*** 82,86 ****
'nextmatchs'));
! $links = $this->bocommon->menu($sub);
$preserve =
get_var('preserve',array('POST','GET'));
$values = get_var('values',array('POST'));
--- 83,87 ----
'nextmatchs'));
! $links = $this->menu->links();
$preserve =
get_var('preserve',array('POST','GET'));
$values = get_var('values',array('POST'));
***************
*** 310,315 ****
'nextmatchs'));
! $sub =
get_var('sub',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
$values =
get_var('values',array('POST'));
$date =
get_var('date',array('POST','GET'));
--- 311,315 ----
'nextmatchs'));
! $links = $this->menu->links();
$values =
get_var('values',array('POST'));
$date =
get_var('date',array('POST','GET'));
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** class.uiXport.inc.php 3 Oct 2003 16:01:26 -0000 1.33
--- class.uiXport.inc.php 28 Oct 2003 15:14:40 -0000 1.34
***************
*** 26,29 ****
--- 26,30 ----
$this->invoice =
CreateObject($this->currentapp.'.boinvoice');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->contacts =
CreateObject('phpgwapi.contacts');
***************
*** 43,47 ****
$this->filter = $this->bo->filter;
$this->cat_id = $this->bo->cat_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
}
--- 44,48 ----
$this->filter = $this->bo->filter;
$this->cat_id = $this->bo->cat_id;
! $this->menu->sub ='invoice';
}
***************
*** 87,91 ****
}
! $links = $this->bocommon->menu();
if ($cancel && $tsvfile)
--- 88,92 ----
}
! $links = $this->menu->links();
if ($cancel && $tsvfile)
***************
*** 474,478 ****
$date = get_var('date',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
if($values['submit'])
--- 475,479 ----
$date = get_var('date',array('POST','GET'));
! $links = $this->menu->links();
if($values['submit'])
***************
*** 557,561 ****
//_debug_array($values);
! $links = $this->bocommon->menu();
if($values['submit'])
--- 558,562 ----
//_debug_array($values);
! $links = $this->menu->links();
if($values['submit'])
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.boworkorder.inc.php 10 Oct 2003 21:57:14 -0000 1.18
--- class.boworkorder.inc.php 28 Oct 2003 15:14:38 -0000 1.19
***************
*** 29,37 ****
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->so =
CreateObject($this->currentapp.'.soworkorder');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
- $this->contacts =
CreateObject('phpgwapi.contacts');
- $this->solocation =
CreateObject($this->currentapp.'.solocation');
if ($session)
--- 29,33 ----
***************
*** 315,319 ****
$workorder[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
! /*
$location_data=$this->solocation->read_single($workorder[$i]['location_code']);
for ($j=0;$j<count($cols_extra);$j++)
{
--- 311,316 ----
$workorder[$i]['entry_date'] =
$GLOBALS['phpgw']->common->show_date($workorder[$i]['entry_date'],$dateformat);
! /* $solocation =
CreateObject($this->currentapp.'.solocation');
!
$location_data=$solocation->read_single($workorder[$i]['location_code']);
for ($j=0;$j<count($cols_extra);$j++)
{
***************
*** 328,336 ****
function read_single($workorder_id)
{
$workorder
= $this->so->read_single($workorder_id);
$dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$workorder['start_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
$workorder['end_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
! $vendor
=
$this->contacts->read_single_entry((int)$workorder['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
$workorder['vendor_name'] =
$vendor[0]['org_name'];
$workorder['vendor_email'] =
$vendor[0]['email'];
--- 325,334 ----
function read_single($workorder_id)
{
+ $contacts =
CreateObject('phpgwapi.contacts');
$workorder
= $this->so->read_single($workorder_id);
$dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$workorder['start_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['start_date'],$dateformat);
$workorder['end_date'] =
$GLOBALS['phpgw']->common->show_date($workorder['end_date'],$dateformat);
! $vendor
=
$contacts->read_single_entry((int)$workorder['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
$workorder['vendor_name'] =
$vendor[0]['org_name'];
$workorder['vendor_email'] =
$vendor[0]['email'];
***************
*** 346,350 ****
function read_record_history($id)
{
! $history_array =
$this->historylog->return_array(array('O'),array(),'','',$id);
$i=0;
while (is_array($history_array) && list(,$value) =
each($history_array))
--- 344,349 ----
function read_record_history($id)
{
! $historylog =
CreateObject($this->currentapp.'.historylog','workorder');
! $history_array =
$historylog->return_array(array('O'),array(),'','',$id);
$i=0;
while (is_array($history_array) && list(,$value) =
each($history_array))
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** class.uilocation.inc.php 10 Oct 2003 21:57:14 -0000 1.32
--- class.uilocation.inc.php 28 Oct 2003 15:14:39 -0000 1.33
***************
*** 37,40 ****
--- 37,41 ----
$this->bo =
CreateObject($this->currentapp.'.bolocation',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
***************
*** 55,59 ****
$this->district_id =
$this->bo->district_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
--- 56,60 ----
$this->district_id =
$this->bo->district_id;
! $this->menu->sub ='location';
}
***************
*** 161,165 ****
$GLOBALS['phpgw_info']['flags']['headonly']=true;
}
! $links = $this->bocommon->menu();
--- 162,166 ----
$GLOBALS['phpgw_info']['flags']['headonly']=true;
}
! $links = $this->menu->links();
***************
*** 1054,1058 ****
$right =
array(1=>'read',2=>'add',4=>'edit',8=>'delete',16=>'manage');
! $links = $this->bocommon->menu();
$GLOBALS['phpgw']->xslttpl->add_file(array('location','menu'));
--- 1055,1059 ----
$right =
array(1=>'read',2=>'add',4=>'edit',8=>'delete',16=>'manage');
! $links = $this->menu->links();
$GLOBALS['phpgw']->xslttpl->add_file(array('location','menu'));
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.boproject.inc.php 10 Oct 2003 21:57:14 -0000 1.18
--- class.boproject.inc.php 28 Oct 2003 15:14:39 -0000 1.19
***************
*** 30,35 ****
$this->so =
CreateObject($this->currentapp.'.soproject');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->historylog =
CreateObject($this->currentapp.'.historylog','project');
- $this->contacts =
CreateObject('phpgwapi.contacts');
$this->solocation =
CreateObject($this->currentapp.'.solocation');
--- 30,33 ----
***************
*** 319,322 ****
--- 317,321 ----
function read_single($project_id)
{
+ $contacts =
CreateObject('phpgwapi.contacts');
$config =
CreateObject('phpgwapi.config');
$config->read_repository();
***************
*** 336,340 ****
$project['workorder_budget'][$i]['budget']=number_format($workorder_data[$i]['budget'],
2, ',', ' ');
$project['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax,
2, ',', ' ');
! $vendor =
$this->contacts->read_single_entry((int)$workorder_data[$i]['vendor_id'],array('org_name'=>'org_name'));
$project['workorder_budget'][$i]['vendor_name']
= $vendor[0]['org_name'];
}
--- 335,339 ----
$project['workorder_budget'][$i]['budget']=number_format($workorder_data[$i]['budget'],
2, ',', ' ');
$project['workorder_budget'][$i]['calculation']=number_format($workorder_data[$i]['calculation']*$tax,
2, ',', ' ');
! $vendor =
$contacts->read_single_entry((int)$workorder_data[$i]['vendor_id'],array('org_name'=>'org_name'));
$project['workorder_budget'][$i]['vendor_name']
= $vendor[0]['org_name'];
}
***************
*** 417,421 ****
function read_record_history($id)
{
! $history_array =
$this->historylog->return_array(array('O'),array(),'','',$id);
$i=0;
while (is_array($history_array) && list(,$value) =
each($history_array))
--- 416,421 ----
function read_record_history($id)
{
! $historylog =
CreateObject($this->currentapp.'.historylog','project');
! $history_array =
$historylog->return_array(array('O'),array(),'','',$id);
$i=0;
while (is_array($history_array) && list(,$value) =
each($history_array))
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.uimeter.inc.php 18 Jul 2003 09:34:54 -0000 1.16
--- class.uimeter.inc.php 28 Oct 2003 15:14:42 -0000 1.17
***************
*** 37,40 ****
--- 37,41 ----
$this->bo =
CreateObject($this->currentapp.'.bometer');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
***************
*** 53,57 ****
$this->cat_id =
$this->bo->cat_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'equipment');
}
--- 54,58 ----
$this->cat_id =
$this->bo->cat_id;
! $this->menu->sub ='equipment';
}
***************
*** 82,86 ****
'search_field'));
! $links = $this->bocommon->menu();
$meter_list = $this->bo->read();
--- 83,87 ----
'search_field'));
! $links = $this->menu->links();
$meter_list = $this->bo->read();
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.uipricebook.inc.php 18 Jul 2003 09:34:54 -0000 1.18
--- class.uipricebook.inc.php 28 Oct 2003 15:14:42 -0000 1.19
***************
*** 40,43 ****
--- 40,44 ----
$this->bo =
CreateObject($this->currentapp.'.bopricebook',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->contacts =
CreateObject('phpgwapi.contacts');
***************
*** 58,62 ****
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'pricebook');
}
--- 59,63 ----
$this->allrows =
$this->bo->allrows;
! $this->menu->sub ='pricebook';
}
***************
*** 90,94 ****
'search_field'));
! $links = $this->bocommon->menu();
$values =
get_var('values',array('POST'));
--- 91,95 ----
'search_field'));
! $links = $this->menu->links();
$values =
get_var('values',array('POST'));
***************
*** 280,284 ****
'search_field'));
! $links = $this->bocommon->menu();
$agreement_list = $this->bo->read_agreement();
--- 281,285 ----
'search_field'));
! $links = $this->menu->links();
$agreement_list = $this->bo->read_agreement();
***************
*** 518,522 ****
function prizing()
{
-
if(!$this->acl_manage)
{
--- 519,522 ----
***************
*** 529,533 ****
'search_field'));
! $links = $this->bocommon->menu();
$cat_id =
get_var('cat_id',array('GET'));
--- 529,533 ----
'search_field'));
! $links = $this->menu->links();
$cat_id =
get_var('cat_id',array('GET'));
***************
*** 744,748 ****
'search_field'));
! $links = $this->bocommon->menu();
$pricebook_list =
$this->bo->read_activities_pr_aggreement();
--- 744,748 ----
'search_field'));
! $links = $this->menu->links();
$pricebook_list =
$this->bo->read_activities_pr_aggreement();
***************
*** 871,875 ****
'search_field'));
! $links = $this->bocommon->menu();
$activity_id =
get_var('activity_id',array('GET'));
--- 871,875 ----
'search_field'));
! $links = $this->menu->links();
$activity_id =
get_var('activity_id',array('GET'));
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** class.uidrawing.inc.php 18 Jul 2003 09:34:54 -0000 1.24
--- class.uidrawing.inc.php 28 Oct 2003 15:14:41 -0000 1.25
***************
*** 37,40 ****
--- 37,41 ----
$this->bo =
CreateObject($this->currentapp.'.bodrawing',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->config =
CreateObject('phpgwapi.config',$this->currentapp);
***************
*** 58,62 ****
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
--- 59,63 ----
$this->status_id =
$this->bo->status_id;
! $this->menu->sub ='location';
}
***************
*** 89,93 ****
'search_field'));
! $links = $this->bocommon->menu();
--- 90,94 ----
'search_field'));
! $links = $this->menu->links();
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** class.sotts.inc.php 22 Oct 2003 17:01:09 -0000 1.30
--- class.sotts.inc.php 28 Oct 2003 15:14:38 -0000 1.31
***************
*** 19,34 ****
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->join = $this->bocommon->join;
-
- $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp);
-
- if(!$this->grants)
- {
- $this->grants =
$this->acl2->get_grants($this->currentapp,'.ticket');
-
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp,$this->grants);
- }
-
}
--- 19,24 ----
***************
*** 78,81 ****
--- 68,81 ----
//_debug_array($data);
+
+ /* $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp);
+
+ if(!$this->grants)
+ {
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
+ $this->grants =
$this->acl2->get_grants($this->currentapp,'.ticket');
+
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp,$this->grants);
+ }
+ */
if ($order)
{
***************
*** 89,93 ****
$where= 'WHERE';
! $filtermethod = $where . ' ( fm_tts_tickets.user_id=' .
$this->account;
if (is_array($this->grants))
{
--- 89,93 ----
$where= 'WHERE';
! /* $filtermethod = $where . ' ( fm_tts_tickets.user_id=' .
$this->account;
if (is_array($this->grants))
{
***************
*** 103,106 ****
--- 103,107 ----
$where= 'AND';
+ */
if ($filter == 'closed'):
{
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** class.uitts.inc.php 23 Oct 2003 16:52:15 -0000 1.40
--- class.uitts.inc.php 28 Oct 2003 15:14:37 -0000 1.41
***************
*** 9,23 ****
class uitts
{
- var $grants;
- var $cat_id;
- var $start;
- var $query;
- var $sort;
- var $order;
- var $filter;
- var $part_of_town_id;
- var $sub;
- var $currentapp;
-
var $public_functions = array
(
--- 9,12 ----
***************
*** 35,41 ****
$this->bo =
CreateObject($this->currentapp.'.botts',True);
- $this->so2 =
CreateObject($this->currentapp.'.sotts2');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
--- 24,29 ----
$this->bo =
CreateObject($this->currentapp.'.botts',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->menu =
CreateObject($this->currentapp.'.menu');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
***************
*** 55,59 ****
$this->part_of_town_id =
$this->bo->part_of_town_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'ticket');
}
--- 43,47 ----
$this->part_of_town_id =
$this->bo->part_of_town_id;
! $this->menu->sub ='ticket';
}
***************
*** 84,89 ****
'search_field'));
! $links = $this->bocommon->menu();
!
$ticket_list = $this->bo->read();
--- 72,76 ----
'search_field'));
! $links = $this->menu->links();
$ticket_list = $this->bo->read();
***************
*** 249,252 ****
--- 236,241 ----
}
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$values = get_var('values',array('POST'));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 313,322 ****
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$this->bolocation->read_single($location_code,$values['extra']);
}
}
}
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' => -1,
// calculated from location_types
--- 302,311 ----
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$bolocation->read_single($location_code,$values['extra']);
}
}
}
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' => -1,
// calculated from location_types
***************
*** 408,411 ****
--- 397,402 ----
}
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$id = get_var('id',array('GET'));
$values = get_var('values',array('POST','GET'));
***************
*** 420,424 ****
}
! $receipt =
$this->so2->update_ticket($values,$id);
}
--- 411,416 ----
}
! $so2 =
CreateObject($this->currentapp.'.sotts2');
! $receipt = $so2->update_ticket($values,$id);
}
***************
*** 487,491 ****
//_debug_array($ticket['location_data']);
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$ticket['location_data'],
'type_id' =>
count(explode('-',$ticket['location_data']['location_code'])),
--- 479,483 ----
//_debug_array($ticket['location_data']);
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$ticket['location_data'],
'type_id' =>
count(explode('-',$ticket['location_data']['location_code'])),
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** class.uiinvoice.inc.php 3 Oct 2003 16:01:26 -0000 1.38
--- class.uiinvoice.inc.php 28 Oct 2003 15:14:40 -0000 1.39
***************
*** 39,42 ****
--- 39,43 ----
$this->bo =
CreateObject($this->currentapp.'.boinvoice',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
***************
*** 57,61 ****
$this->acl_delete =
$this->acl2->check('.invoice',8);
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'invoice');
}
--- 58,62 ----
$this->acl_delete =
$this->acl2->check('.invoice',8);
! $this->menu->sub ='invoice';
}
***************
*** 91,95 ****
'search_field'));
- $sub =
get_var('sub',array('POST','GET'));
$paid =
get_var('paid',array('POST','GET'));
$start_date =
get_var('start_date',array('POST','GET'));
--- 92,95 ----
***************
*** 109,113 ****
}
! $links = $this->bocommon->menu($sub);
$values = get_var('values',array('POST','GET'));
--- 109,113 ----
}
! $links = $this->menu->links();
$values = get_var('values',array('POST','GET'));
***************
*** 349,356 ****
'nextmatchs'));
- $sub = get_var('sub',array('POST','GET'));
$paid = get_var('paid',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
$values =
get_var('values',array('POST','GET'));
--- 349,355 ----
'nextmatchs'));
$paid = get_var('paid',array('POST','GET'));
! $links = $this->menu->links();
$values =
get_var('values',array('POST','GET'));
***************
*** 603,607 ****
'search_field'));
- $sub =
get_var('sub',array('POST','GET'));
$start_date =
get_var('start_date',array('POST','GET'));
$end_date =
get_var('end_date',array('POST','GET'));
--- 602,605 ----
***************
*** 621,625 ****
}
! $links = $this->bocommon->menu($sub);
--- 619,623 ----
}
! $links = $this->menu->links();
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** class.soadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.8
--- class.soadmin_entity.inc.php 28 Oct 2003 15:14:37 -0000 1.9
***************
*** 319,322 ****
--- 319,334 ----
. "VALUES ($values)",__LINE__,__FILE__);
+
+ $values_acl_location= array(
+ '.entity.' . $entity['id'],
+ $entity['name'],
+ 1
+ );
+
+ $values_acl_location =
$this->bocommon->validate_db_insert($values_acl_location);
+
+ $this->db->query("INSERT INTO fm_acl_location
(id,descr,allow_grant) "
+ . "VALUES
($values_acl_location)",__LINE__,__FILE__);
+
$receipt['id']= $entity['id'];
***************
*** 365,369 ****
$values['prefix'],
$values['lookup_vendor'],
! $values['location_level'],
);
--- 377,381 ----
$values['prefix'],
$values['lookup_vendor'],
! $values['location_level']
);
***************
*** 376,379 ****
--- 388,401 ----
. "VALUES ($values_insert)",__LINE__,__FILE__);
+ $values_acl_location= array(
+ '.entity.' . $values['entity_id'] . '.' .
$values['id'],
+ $values['name']
+ );
+
+ $values_acl_location =
$this->bocommon->validate_db_insert($values_acl_location);
+
+ $this->db->query("INSERT INTO fm_acl_location
(id,descr) "
+ . "VALUES
($values_acl_location)",__LINE__,__FILE__);
+
$receipt['id']= $values['id'];
***************
*** 491,494 ****
--- 513,524 ----
$this->db->query("UPDATE $table set $value_set
WHERE id=" . $entity['id'],__LINE__,__FILE__);
+ $value_set_acl=array(
+ 'descr' =>
$entity['name']
+ );
+
+ $value_set_acl =
$this->bocommon->validate_db_update($value_set_acl);
+
+ $this->db->query("UPDATE fm_acl_location set
$value_set_acl WHERE id='.entity." . $entity['id']. "'",__LINE__,__FILE__);
+
$receipt['message'][] = array('msg'=>
lang('entity has been edited'));
}
***************
*** 528,531 ****
--- 558,570 ----
$this->db->query("UPDATE $table set $value_set
WHERE entity_id=" . $entity['entity_id']. " AND id=" .
$entity['id'],__LINE__,__FILE__);
+ $value_set_acl=array(
+ 'descr' =>
$entity['name']
+ );
+
+ $value_set_acl =
$this->bocommon->validate_db_update($value_set_acl);
+
+ $this->db->query("UPDATE fm_acl_location set
$value_set_acl WHERE id='.entity." . $entity['entity_id']. "." . $entity['id'].
"'",__LINE__,__FILE__);
+
+
$receipt['message'][] = array('msg'=>
lang('entity has been edited'));
}
***************
*** 543,546 ****
--- 582,588 ----
$this->db->query("DELETE FROM fm_entity WHERE
id=$id",__LINE__,__FILE__);
$this->db->query("DELETE FROM fm_entity_category WHERE
entity_id=$id",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_entity_attribute WHERE
entity_id=$id",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_acl_location WHERE id
LIKE '.entity." . $id ."%'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_acl2 WHERE
acl_location LIKE '.entity." . $id ."%'",__LINE__,__FILE__);
if (isset($category_list) AND is_array($category_list))
{
***************
*** 561,564 ****
--- 603,609 ----
// $this->oProc->DropTable('fm_entity_' . $entity_id . '_'
. $id . '_' . 'status');
$this->db->query("DELETE FROM fm_entity_category WHERE
entity_id= $entity_id AND id= $id",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_entity_attribute WHERE
entity_id= $entity_id AND cat_id= $id",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_acl_location WHERE
id='.entity." . $entity_id . "." . $id ."'",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM fm_acl2 WHERE
acl_location='.entity." . $entity_id . "." . $id ."'",__LINE__,__FILE__);
}
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** class.soworkorder.inc.php 22 Oct 2003 17:01:10 -0000 1.31
--- class.soworkorder.inc.php 28 Oct 2003 15:14:37 -0000 1.32
***************
*** 17,30 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
! $this->join = $this->socommon->join;
! $this->left_join = $this->socommon->left_join;
$this->grants =
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp);
if(!$this->grants)
{
$this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp,$this->grants);
--- 17,28 ----
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->join = $this->bocommon->join;
! $this->left_join = $this->bocommon->left_join;
$this->grants =
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp);
if(!$this->grants)
{
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp,$this->grants);
***************
*** 472,475 ****
--- 470,474 ----
function add($workorder)
{
+ $historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
***************
*** 506,510 ****
{
$this->increment_workorder_id();
!
$this->historylog->add('SO',$workorder['workorder_id'],$workorder['status']);
$receipt['message'][] =
array('msg'=>lang('workorder %1 has been saved',$workorder['workorder_id']));
}
--- 505,509 ----
{
$this->increment_workorder_id();
!
$historylog->add('SO',$workorder['workorder_id'],$workorder['status']);
$receipt['message'][] =
array('msg'=>lang('workorder %1 has been saved',$workorder['workorder_id']));
}
***************
*** 518,521 ****
--- 517,521 ----
function edit($workorder)
{
+ $historylog =
CreateObject($this->currentapp.'.historylog','workorder');
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
***************
*** 554,562 ****
if ($old_status != $workorder['status'])
{
!
$this->historylog->add('S',$workorder['workorder_id'],$workorder['status']);
}
if ($old_budget != $workorder['budget'])
{
!
$this->historylog->add('B',$workorder['workorder_id'],$workorder['budget']);
}
--- 554,562 ----
if ($old_status != $workorder['status'])
{
!
$historylog->add('S',$workorder['workorder_id'],$workorder['status']);
}
if ($old_budget != $workorder['budget'])
{
!
$historylog->add('B',$workorder['workorder_id'],$workorder['budget']);
}
Index: class.soentity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soentity.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** class.soentity.inc.php 26 Oct 2003 20:33:01 -0000 1.6
--- class.soentity.inc.php 28 Oct 2003 15:14:37 -0000 1.7
***************
*** 16,20 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->join = $this->bocommon->join;
--- 16,19 ----
***************
*** 81,84 ****
--- 80,93 ----
}
+ $this->grants =
$GLOBALS['phpgw']->session->appsession('grants_entity_'.$entity_id.'_'.$cat_id,$this->currentapp);
+
+ if(!$this->grants)
+ {
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
+ $this->grants =
$this->acl2->get_grants($this->currentapp,'.entity.' . $entity_id . '.' .
$cat_id);
+
$GLOBALS['phpgw']->session->appsession('grants_entity_'.$entity_id.'_'.$cat_id,$this->currentapp,$this->grants);
+ }
+
+
$sql = $this->bocommon->fm_cache('sql_entity_' .
$entity_id . '_' . $cat_id);
***************
*** 129,132 ****
--- 138,143 ----
{
$user_columns=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['entity_columns_'.$entity_id.'_'.$cat_id];
+ //_debug_array($user_columns);
+
if (isset($user_columns) AND
is_array($user_columns) AND $user_columns[0])
{
***************
*** 176,180 ****
}
reset($public_user_list);
! $filtermethod = " $where
($entity_table.access='public' AND $entity_table.user_id IN(" .
implode(',',$public_user_list) . "))";
}
else
--- 187,191 ----
}
reset($public_user_list);
! $filtermethod = " $where (
$entity_table.user_id IN(" . implode(',',$public_user_list) . "))";
}
else
***************
*** 228,236 ****
$j=0;
while ($this->db->next_record())
{
! for ($i=0;$i<count($cols_return);$i++)
{
$entity_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
}
--- 239,249 ----
$j=0;
+ $k=count($cols_return);
while ($this->db->next_record())
{
! for ($i=0;$i<$k;$i++)
{
$entity_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $entity_list[$j]['grants'] =
(int)$this->grants[$this->db->f('user_id')];
}
***************
*** 251,266 ****
$ch= unserialize($value);
! for ($k=0;$k<count($ch);$k++)
{
! $sql="SELECT value FROM
fm_entity_choice where entity_id=$entity_id AND cat_id=$cat_id AND attrib_id="
.$cols_return_extra[$i]['attrib_id']. " AND id=" . $ch[$k];
! $this->db2->query($sql);
! while
($this->db2->next_record())
{
!
$ch_value[]=$this->db2->f('value');
}
}
-
-
$entity_list[$j][$cols_return_extra[$i]['name']] = @implode(",", $ch_value);
- unset($ch_value);
}
elseif($cols_return_extra[$i]['datatype']=='D' && $value):
--- 264,281 ----
$ch= unserialize($value);
! if (isset($ch) AND
is_array($ch))
{
! for
($k=0;$k<count($ch);$k++)
{
! $sql="SELECT
value FROM fm_entity_choice where entity_id=$entity_id AND cat_id=$cat_id AND
attrib_id=" .$cols_return_extra[$i]['attrib_id']. " AND id=" . $ch[$k];
!
$this->db2->query($sql);
! while
($this->db2->next_record())
! {
!
$ch_value[]=$this->db2->f('value');
! }
}
+
$entity_list[$j][$cols_return_extra[$i]['name']] = @implode(",", $ch_value);
+ unset($ch_value);
}
}
elseif($cols_return_extra[$i]['datatype']=='D' && $value):
Index: class.uitemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** class.uitemplate.inc.php 17 Jul 2003 18:15:50 -0000 1.13
--- class.uitemplate.inc.php 28 Oct 2003 15:14:42 -0000 1.14
***************
*** 36,40 ****
$this->bowo_hour =
CreateObject($this->currentapp.'.bowo_hour');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->bopricebook =
CreateObject($this->currentapp.'.bopricebook');
$this->start =
$this->bo->start;
--- 36,40 ----
$this->bowo_hour =
CreateObject($this->currentapp.'.bowo_hour');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start =
$this->bo->start;
***************
*** 47,51 ****
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
}
--- 47,51 ----
$this->allrows =
$this->bo->allrows;
! $this->menu->sub ='project';
}
***************
*** 76,80 ****
$lookup = get_var('lookup',array('POST','GET'));
! $links = $this->bocommon->menu();
$template_list = $this->bo->read();
--- 76,80 ----
$lookup = get_var('lookup',array('POST','GET'));
! $links = $this->menu->links();
$template_list = $this->bo->read();
***************
*** 244,248 ****
}
! $links = $this->bocommon->menu();
$template_list =
$this->bo->read_template_hour($template_id);
--- 244,248 ----
}
! $links = $this->menu->links();
$template_list =
$this->bo->read_template_hour($template_id);
***************
*** 535,538 ****
--- 535,540 ----
$values['ns3420_descr'] =
get_var('ns3420_descr',array('POST','GET'));
+ $bopricebook =
CreateObject($this->currentapp.'.bopricebook');
+
$GLOBALS['phpgw']->xslttpl->add_file(array('template'));
***************
*** 625,629 ****
'lang_dim_d'
=> lang('Dim D'),
! 'dim_d_list'
=> $this->bopricebook->get_dim_d_list($values['dim_d']),
'select_dim_d'
=> 'values[dim_d]',
'lang_no_dim_d'
=> lang('No Dim D'),
--- 627,631 ----
'lang_dim_d'
=> lang('Dim D'),
! 'dim_d_list'
=> $bopricebook->get_dim_d_list($values['dim_d']),
'select_dim_d'
=> 'values[dim_d]',
'lang_no_dim_d'
=> lang('No Dim D'),
***************
*** 631,635 ****
'lang_unit'
=> lang('Unit'),
! 'unit_list'
=> $this->bopricebook->get_unit_list($values['unit']),
'select_unit'
=> 'values[unit]',
'lang_no_unit'
=> lang('Select Unit'),
--- 633,637 ----
'lang_unit'
=> lang('Unit'),
! 'unit_list'
=> $bopricebook->get_unit_list($values['unit']),
'select_unit'
=> 'values[unit]',
'lang_no_unit'
=> lang('Select Unit'),
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** class.socommon.inc.php 18 Sep 2003 14:00:49 -0000 1.37
--- class.socommon.inc.php 28 Oct 2003 15:14:41 -0000 1.38
***************
*** 16,21 ****
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
-
if
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
--- 16,19 ----
***************
*** 62,65 ****
--- 60,64 ----
function get_user_list_right($right='',$acl_location='')
{
+ $acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$myaccounts = CreateObject('phpgwapi.accounts');
***************
*** 73,77 ****
while ($this->db->next_record())
{
!
if($this->acl2->check($acl_location,$right,$this->db->f('acl_account')))
{
if($this->db->f('account_type')=='g')
--- 72,76 ----
while ($this->db->next_record())
{
!
if($acl2->check($acl_location,$right,$this->db->f('acl_account')))
{
if($this->db->f('account_type')=='g')
***************
*** 99,103 ****
{
$i=0;
!
if(!$this->acl2->check($acl_location,$right,$account_id[0]))
{
unset($accounts[$account_id[0]]);
--- 98,102 ----
{
$i=0;
!
if(!$acl2->check($acl_location,$right,$account_id[0]))
{
unset($accounts[$account_id[0]]);
Index: class.uitenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitenant.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.uitenant.inc.php 1 Jul 2003 11:19:24 -0000 1.4
--- class.uitenant.inc.php 28 Oct 2003 15:14:42 -0000 1.5
***************
*** 35,38 ****
--- 35,39 ----
$this->bo =
CreateObject($this->currentapp.'.botenant',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start = $this->bo->start;
***************
*** 68,72 ****
'nextmatchs'));
! $links = $this->bocommon->menu();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','tenant_receipt');
--- 69,73 ----
'nextmatchs'));
! $links = $this->menu->links();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','tenant_receipt');
--- NEW FILE: class.menu.inc.php ---
<?php
/***************************************************************************\
* This program is free software; you can redistribute it and/or modify
it *
* under the terms of the GNU General Public License as published by the
*
* Free Software Foundation; either version 2 of the License, or (at
your *
* option) any later version.
*
\***************************************************************************/
/* $Id: class.menu.inc.php,v 1.1 2003/10/28 15:14:42 sigurdne Exp $ */
class menu
{
var $sub;
var $public_functions = array
(
'links' => True,
);
function menu($sub='')
{
$this->sub = $sub;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
}
function links()
{
$currentapp=$this->currentapp;
$sub = $this->sub;
$menu =
$GLOBALS['phpgw']->session->appsession('menu',$currentapp.$sub);
if(!$menu)
{
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
$i=0;
$menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id=1');
$menu['module'][$i]['name'] =
lang('Property');
$menu['module'][$i]['statustext'] =
lang('Property');
$i++;
$menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
$menu['module'][$i]['name'] =
lang('Equipment');
$menu['module'][$i]['statustext'] =
lang('Equipment');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index');
$menu['module'][$i]['name']
= lang('Helpdesk');
$menu['module'][$i]['statustext'] =
lang('Helpdesk');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index');
$menu['module'][$i]['name']
= lang('Project');
$menu['module'][$i]['statustext'] =
lang('Project');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
$menu['module'][$i]['name']
= lang('Invoice');
$menu['module'][$i]['statustext'] =
lang('Invoice');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.index');
$menu['module'][$i]['name']
= lang('Pricebook');
$menu['module'][$i]['statustext'] =
lang('Pricebook');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
$menu['module'][$i]['name']
= lang('Documentation');
$menu['module'][$i]['statustext'] =
lang('Documentation');
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uireport.index');
$menu['module'][$i]['name']
= lang('Report');
$menu['module'][$i]['statustext'] =
lang('Report');
$entity =
CreateObject($this->currentapp.'.soadmin_entity');
$entity_list =
$entity->read(array('allrows'=>True));
if (isset($entity_list) AND
is_array($entity_list))
{
foreach($entity_list as $entry)
{
$i++;
$menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entry['id']);
$menu['module'][$i]['name']
= $entry['name'];
$menu['module'][$i]['statustext'] = $entry['descr'];
}
}
$i=0;
$entity_id =
$GLOBALS['phpgw']->session->appsession('entity_id',$currentapp);
if ($sub == 'entity_'.$entity_id)
{
$entity_category =
$entity->read_category(array('allrows'=>True,'entity_id'=>$entity_id));
$k=count($entity_category);
for ($j=0; $j<$k; $j++)
{
$i++;
$menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientity.index&entity_id='
.$entity_id .'&cat_id=' .$entity_category[$j]['id'] );
$menu['sub_menu'][$i]['name'] =
$entity_category[$j]['name'];
$menu['sub_menu'][$i]['statustext'] = $entity_category[$j]['descr'];
}
}
unset($entity);
if ($sub == 'equipment')
{
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index');
$menu['sub_menu'][$i]['name']
= lang('Equipment');
$menu['sub_menu'][$i]['statustext']
= lang('Equipment');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uimeter.index');
$menu['sub_menu'][$i]['name']
= lang('Meter');
$menu['sub_menu'][$i]['statustext']
= lang('Meter');
if ($this->acl2->check('.equipment',16))
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uistandard_entity.index&type=equipment');
$menu['sub_menu'][$i]['name']
= lang('Equipment type');
$menu['sub_menu'][$i]['statustext'] = lang('Equipment type');
}
}
if ($sub == 'location')
{
$soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
$location =
$soadmin_location->select_location_type();
$location_count=count($location);
for ($j=0; $j<$location_count; $j++)
{
$i++;
$menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&type_id='
.$location[$j]['id'] );
$menu['sub_menu'][$i]['name'] =
$location[$j]['name'];
$menu['sub_menu'][$i]['statustext'] = $location[$j]['descr'];
}
$config_tenant =
$soadmin_location->read_config_single('tenant_id');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uilocation.index&lookup_tenant=1&type_id='
. $config_tenant);
$menu['sub_menu'][$i]['name']
= lang('Tenant');
$menu['sub_menu'][$i]['statustext']
= lang('Tenant');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidrawing.index');
$menu['sub_menu'][$i]['name']
= lang('Drawing');
$menu['sub_menu'][$i]['statustext']
= lang('Drawing');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uigab.index');
$menu['sub_menu'][$i]['name']
= lang('gabnr');
$menu['sub_menu'][$i]['statustext']
= lang('gabnr');
}
if ($sub == 'invoice')
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
$menu['sub_menu'][$i]['name']
= lang('Invoice');
$menu['sub_menu'][$i]['statustext']
= lang('Invoice');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&paid=true');
$menu['sub_menu'][$i]['name']
= lang('Paid');
$menu['sub_menu'][$i]['statustext']
= lang('Paid');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume');
$menu['sub_menu'][$i]['name']
= lang('consume');
$menu['sub_menu'][$i]['statustext']
= lang('consume');
if ($this->acl2->check('.invoice',16))
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
$menu['sub_menu'][$i]['name']
= lang('Investment value');
$menu['sub_menu'][$i]['statustext'] = lang('Investment
value');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.import');
$menu['sub_menu'][$i]['name']
= lang('Import invoice');
$menu['sub_menu'][$i]['statustext'] = lang('Import invoice');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
$menu['sub_menu'][$i]['name']
= lang('Export invoice');
$menu['sub_menu'][$i]['statustext'] = lang('Export invoice');
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
$menu['sublang_invoice_investment_value']=lang('Investment value');
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.import');
$menu['sublang_invoice_import']=lang('Import invoice');
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
$menu['sublang_invoice_export']=lang('Export invoice');
}
}
if ($sub == 'pricebook' &&
$this->acl2->check('.pricebook',16))
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.index');
$menu['sub_menu'][$i]['name']
= lang('Per Vendor');
$menu['sub_menu'][$i]['statustext']
= lang('Per Vendor');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.activity');
$menu['sub_menu'][$i]['name']
= lang('Per Agreement');
$menu['sub_menu'][$i]['statustext']
= lang('Per Agreement');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uipricebook.agreement');
$menu['sub_menu'][$i]['name']
= lang('Agreement');
$menu['sub_menu'][$i]['statustext']
= lang('Agreement');
}
if ($sub == 'project')
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproject.index');
$menu['sub_menu'][$i]['name']
= lang('Project');
$menu['sub_menu'][$i]['statustext']
= lang('Project');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiworkorder.index');
$menu['sub_menu'][$i]['name']
= lang('Workorder');
$menu['sub_menu'][$i]['statustext']
= lang('Workorder');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uirequest.index');
$menu['sub_menu'][$i]['name']
= lang('Request');
$menu['sub_menu'][$i]['statustext']
= lang('Request');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitemplate.index');
$menu['sub_menu'][$i]['name']
= lang('template');
$menu['sub_menu'][$i]['statustext']
= lang('Workorder template');
}
if ($sub == admin_location &&
$this->acl2->check('.location',16))
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.index');
$menu['sub_menu'][$i]['name']
= lang('Location type');
$menu['sub_menu'][$i]['statustext']
= lang('Location type');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiadmin_location.config');
$menu['sub_menu'][$i]['name']
= lang('Config');
$menu['sub_menu'][$i]['statustext']
= lang('Location Config');
}
if ($sub == 'document')
{
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=location');
$menu['sub_menu'][$i]['name']
= lang('location');
$menu['sub_menu'][$i]['statustext']
= lang('Documentation for locations');
$i++;
$menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uidocument.index&cat_id=equipment');
$menu['sub_menu'][$i]['name']
= lang('Equipment');
$menu['sub_menu'][$i]['statustext']
= lang('Documentation for equipment');
}
$menu =
$GLOBALS['phpgw']->session->appsession('menu',$currentapp.$sub,$menu);
}
return $menu;
}
}
?>
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** class.uiwo_hour.inc.php 24 Sep 2003 15:40:50 -0000 1.38
--- class.uiwo_hour.inc.php 28 Oct 2003 15:14:41 -0000 1.39
***************
*** 38,53 ****
$this->create_html =
CreateObject('phpgwapi.xslttemplates');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->bo =
CreateObject($this->currentapp.'.bowo_hour',True);
$this->boworkorder =
CreateObject($this->currentapp.'.boworkorder');
$this->boproject =
CreateObject($this->currentapp.'.boproject');
- $this->botemplate =
CreateObject($this->currentapp.'.botemplate');
$this->bopricebook =
CreateObject($this->currentapp.'.bopricebook');
- $this->historylog =
CreateObject($this->currentapp.'.historylog','workorder');
- $this->pdf =
CreateObject($this->currentapp.'.pdf');
- $this->so =
CreateObject($this->currentapp.'.sowo_hour',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->config =
CreateObject('phpgwapi.config');
--- 38,49 ----
$this->create_html =
CreateObject('phpgwapi.xslttemplates');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->bo =
CreateObject($this->currentapp.'.bowo_hour',True);
$this->boworkorder =
CreateObject($this->currentapp.'.boworkorder');
$this->boproject =
CreateObject($this->currentapp.'.boproject');
$this->bopricebook =
CreateObject($this->currentapp.'.bopricebook');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->config =
CreateObject('phpgwapi.config');
***************
*** 70,74 ****
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
}
--- 66,70 ----
$this->allrows =
$this->bo->allrows;
! $this->menu->sub ='project';
}
***************
*** 294,298 ****
$hour_id = get_var('hour_id',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
! $links = $this->bocommon->menu();
if($delete && $hour_id)
--- 290,294 ----
$hour_id = get_var('hour_id',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
! $links = $this->menu->links();
if($delete && $hour_id)
***************
*** 411,415 ****
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
--- 407,413 ----
$project =
$this->boproject->read_single($common_data['workorder']['project_id']);
! $bolocation =
CreateObject($this->currentapp.'.bolocation');
!
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
'type_id' =>
count(explode('-',$project['location_data']['location_code'])),
***************
*** 570,574 ****
if ($rcpt)
{
!
$this->historylog->add('M',$workorder_id,$to_email);
$receipt['message'][]=array('msg'=>lang('Workorder is sent by email!'));
}
--- 568,573 ----
if ($rcpt)
{
! $historylog =
CreateObject($this->currentapp.'.historylog','workorder');
!
$historylog->add('M',$workorder_id,$to_email);
$receipt['message'][]=array('msg'=>lang('Workorder is sent by email!'));
}
***************
*** 623,626 ****
--- 622,626 ----
function tender()
{
+ $pdf =
CreateObject($this->currentapp.'.pdf');
if(!$this->acl_read)
{
***************
*** 691,734 ****
error_reporting(E_ALL);
set_time_limit(1800);
! $this->pdf -> ezSetMargins(50,70,50,50);
! $this->pdf->selectFont(PHPGW_APP_INC .
'/pdf/fonts/Helvetica.afm');
// put a line top and bottom on all the pages
! $all = $this->pdf->openObject();
! $this->pdf->saveState();
! $this->pdf->setStrokeColor(0,0,0,1);
! $this->pdf->line(20,40,578,40);
! $this->pdf->line(20,822,578,822);
! $this->pdf->addText(50,823,6,lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] );
! $this->pdf->addText(50,34,6,'BBB');
! $this->pdf->addText(300,34,6,$date);
if($mark_draft)
{
! $this->pdf->setColor(1,0,0);
! // $this->pdf->setColor(66,66,99);
!
$this->pdf->addText(200,400,40,lang('DRAFT'),-10);
! $this->pdf->setColor(1,0,0);
}
! $this->pdf->restoreState();
! $this->pdf->closeObject();
// note that object can be told to appear on just odd
or even pages by changing 'all' to 'odd'
// or 'even'.
! $this->pdf->addObject($all,'all');
! $this->pdf->ezSetDy(-100);
!
$this->pdf->ezStartPageNumbers(500,28,10,'right','{PAGENUM} ' . lang('of') . '
{TOTALPAGENUM}',1);
! $this->pdf->ezText($project['name'],20);
! $this->pdf->ezText($project['descr'],14);
! $this->pdf->ezSetDy(-50);
! $this->pdf->ezText(lang('Order') . ': ' . $workorder_id
. ' ' .$common_data['workorder']['title'],14);
! $this->pdf->ezText(lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] ,14);
if(is_array($values_hour))
{
! $this->pdf->ezNewPage();
!
$this->pdf->ezTable($content,'',$project['name'],
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize'
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
,'cols'=>array(
--- 691,734 ----
error_reporting(E_ALL);
set_time_limit(1800);
! $pdf -> ezSetMargins(50,70,50,50);
! $pdf->selectFont(PHPGW_APP_INC .
'/pdf/fonts/Helvetica.afm');
// put a line top and bottom on all the pages
! $all = $pdf->openObject();
! $pdf->saveState();
! $pdf->setStrokeColor(0,0,0,1);
! $pdf->line(20,40,578,40);
! $pdf->line(20,822,578,822);
! $pdf->addText(50,823,6,lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] );
! $pdf->addText(50,34,6,'BBB');
! $pdf->addText(300,34,6,$date);
if($mark_draft)
{
! $pdf->setColor(1,0,0);
! // $pdf->setColor(66,66,99);
! $pdf->addText(200,400,40,lang('DRAFT'),-10);
! $pdf->setColor(1,0,0);
}
! $pdf->restoreState();
! $pdf->closeObject();
// note that object can be told to appear on just odd
or even pages by changing 'all' to 'odd'
// or 'even'.
! $pdf->addObject($all,'all');
! $pdf->ezSetDy(-100);
! $pdf->ezStartPageNumbers(500,28,10,'right','{PAGENUM} '
. lang('of') . ' {TOTALPAGENUM}',1);
! $pdf->ezText($project['name'],20);
! $pdf->ezText($project['descr'],14);
! $pdf->ezSetDy(-50);
! $pdf->ezText(lang('Order') . ': ' . $workorder_id . ' '
.$common_data['workorder']['title'],14);
! $pdf->ezText(lang('Chapter') . ' '
.$common_data['workorder']['chapter_id'] . ' ' .
$common_data['workorder']['chapter'] ,14);
if(is_array($values_hour))
{
! $pdf->ezNewPage();
! $pdf->ezTable($content,'',$project['name'],
array('xPos'=>70,'xOrientation'=>'right','width'=>500,0,'shaded'=>0,'fontSize'
=> 8,'showLines'=> 2,'titleFontSize' => 12,'outerLineThickness'=>2
,'cols'=>array(
***************
*** 741,746 ****
}
! // $this->pdf->ezStream();
! $document= $this->pdf->ezOutput();
$size=strlen($document);
--- 741,746 ----
}
! // $pdf->ezStream();
! $document= $pdf->ezOutput();
$size=strlen($document);
***************
*** 781,785 ****
}
! $links = $this->bocommon->menu();
$common_data=$this->common_data($workorder_id);
--- 781,785 ----
}
! $links = $this->menu->links();
$common_data=$this->common_data($workorder_id);
***************
*** 981,985 ****
}
! $links = $this->bocommon->menu();
$common_data=$this->common_data($workorder_id);
--- 981,985 ----
}
! $links = $this->menu->links();
$common_data=$this->common_data($workorder_id);
***************
*** 987,991 ****
$workorder = $common_data['workorder'];
! $template_list =
$this->botemplate->read_template_hour($template_id);
$i=0;
--- 987,992 ----
$workorder = $common_data['workorder'];
! $botemplate =
CreateObject($this->currentapp.'.botemplate');
! $template_list =
$botemplate->read_template_hour($template_id);
$i=0;
Index: class.uip_of_town.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uip_of_town.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.uip_of_town.inc.php 16 Jul 2003 08:12:24 -0000 1.1
--- class.uip_of_town.inc.php 28 Oct 2003 15:14:42 -0000 1.2
***************
*** 35,38 ****
--- 35,39 ----
$this->bo =
CreateObject($this->currentapp.'.bop_of_town',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start = $this->bo->start;
***************
*** 68,72 ****
'nextmatchs'));
! $links = $this->bocommon->menu();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','p_of_town_receipt');
--- 69,73 ----
'nextmatchs'));
! $links = $this->menu->links();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','p_of_town_receipt');
Index: class.botemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botemplate.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** class.botemplate.inc.php 4 Sep 2003 17:27:27 -0000 1.3
--- class.botemplate.inc.php 28 Oct 2003 15:14:41 -0000 1.4
***************
*** 29,33 ****
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->so =
CreateObject($this->currentapp.'.sotemplate');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
if ($session)
--- 29,32 ----
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.uidocument.inc.php 3 Oct 2003 16:01:26 -0000 1.18
--- class.uidocument.inc.php 28 Oct 2003 15:14:40 -0000 1.19
***************
*** 38,41 ****
--- 38,42 ----
$this->bo =
CreateObject($this->currentapp.'.bodocument',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->config =
CreateObject('phpgwapi.config',$this->currentapp);
***************
*** 59,63 ****
$this->equipment_type =
$this->bo->equipment_type;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'document');
}
--- 60,64 ----
$this->equipment_type =
$this->bo->equipment_type;
! $this->menu->sub ='document';
}
***************
*** 91,95 ****
// $lookup = get_var('lookup',array('POST','GET'));
! $links = $this->bocommon->menu();
$preserve =
get_var('preserve',array('POST','GET'));
--- 92,96 ----
// $lookup = get_var('lookup',array('POST','GET'));
! $links = $this->menu->links();
$preserve =
get_var('preserve',array('POST','GET'));
***************
*** 355,359 ****
$files_url = $this->config->config_data['files_url'];
! $links = $this->bocommon->menu();
$document_list =
$this->bo->read_at_location($location_code,$equipment_id);
--- 356,360 ----
$files_url = $this->config->config_data['files_url'];
! $links = $this->menu->links();
$document_list =
$this->bo->read_at_location($location_code,$equipment_id);
Index: class.sotemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotemplate.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** class.sotemplate.inc.php 4 Sep 2003 17:27:27 -0000 1.7
--- class.sotemplate.inc.php 28 Oct 2003 15:14:41 -0000 1.8
***************
*** 19,23 ****
$this->join = $this->socommon->join;
! $this->left_join =
$this->socommon->left_join;
}
--- 19,23 ----
$this->join = $this->socommon->join;
! $this->left_join = $this->socommon->left_join;
}
Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.boadmin.inc.php 12 Oct 2003 17:58:37 -0000 1.17
--- class.boadmin.inc.php 28 Oct 2003 15:14:38 -0000 1.18
***************
*** 133,137 ****
(
'id' => $loc['id'],
! 'descr' => $loc['id'],
'selected' => $sel_loc
);
--- 133,137 ----
(
'id' => $loc['id'],
! 'descr' => $loc['id'] . ' [' .
$loc['descr'] . ']',
'selected' => $sel_loc
);
Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.uiowner.inc.php 16 Jul 2003 10:38:31 -0000 1.10
--- class.uiowner.inc.php 28 Oct 2003 15:14:42 -0000 1.11
***************
*** 35,38 ****
--- 35,39 ----
$this->bo =
CreateObject($this->currentapp.'.boowner',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->start = $this->bo->start;
***************
*** 68,72 ****
'nextmatchs'));
! $links = $this->bocommon->menu();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','owner_receipt');
--- 69,73 ----
'nextmatchs'));
! $links = $this->menu->links();
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','owner_receipt');
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** class.uirequest.inc.php 26 Sep 2003 18:04:34 -0000 1.29
--- class.uirequest.inc.php 28 Oct 2003 15:14:41 -0000 1.30
***************
*** 38,41 ****
--- 38,42 ----
$this->boproject =
CreateObject($this->currentapp.'.boproject');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->config =
CreateObject('phpgwapi.config');
***************
*** 57,61 ****
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'project');
}
--- 58,62 ----
$this->status_id =
$this->bo->status_id;
! $this->menu->sub ='project';
}
***************
*** 93,97 ****
$lookup = True;
}
! $links = $this->bocommon->menu();
$request_list = $this->bo->read($project_id);
--- 94,98 ----
$lookup = True;
}
! $links = $this->menu->links();
$request_list = $this->bo->read($project_id);
Index: class.boadmin_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin_entity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** class.boadmin_entity.inc.php 26 Oct 2003 20:33:01 -0000 1.5
--- class.boadmin_entity.inc.php 28 Oct 2003 15:14:37 -0000 1.6
***************
*** 138,142 ****
{
! $location_types =
$this->bocommon->soadmin_location->select_location_type();
$max_location_type=count($location_types);
--- 138,143 ----
{
! $soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
! $location_types =
$soadmin_location->select_location_type();
$max_location_type=count($location_types);
***************
*** 144,148 ****
{
$location[$i][id] = $i;
! $location[$i][name] = $i;
}
--- 145,149 ----
{
$location[$i][id] = $i;
! $location[$i][name] = $i . '-' .
$location_types[($i-1)]['name'];
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** class.soproject.inc.php 22 Oct 2003 17:01:10 -0000 1.42
--- class.soproject.inc.php 28 Oct 2003 15:14:38 -0000 1.43
***************
*** 16,23 ****
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->historylog =
CreateObject($this->currentapp.'.historylog','project');
- $this->historylog_r =
CreateObject($this->currentapp.'.historylog','request');
$this->join = $this->bocommon->join;
--- 16,20 ----
***************
*** 27,30 ****
--- 24,28 ----
if(!$this->grants)
{
+ $this->acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$this->grants =
$this->acl2->get_grants($this->currentapp,'.project');
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp,$this->grants);
***************
*** 442,445 ****
--- 440,444 ----
function add($project)
{
+ $historylog =
CreateObject($this->currentapp.'.historylog','project');
while (is_array($project['location']) &&
list($input_name,$value) = each($project['location']))
***************
*** 543,549 ****
{
$this->increment_project_id();
!
$this->historylog->add('SO',$project['project_id'],$project['status']);
!
$this->historylog->add('TO',$project['project_id'],$project['cat_id']);
!
$this->historylog->add('CO',$project['project_id'],$project['coordinator']);
$receipt['message'][] =
array('msg'=>lang('project %1 has been saved',$project['project_id']));
--- 542,548 ----
{
$this->increment_project_id();
!
$historylog->add('SO',$project['project_id'],$project['status']);
!
$historylog->add('TO',$project['project_id'],$project['cat_id']);
!
$historylog->add('CO',$project['project_id'],$project['coordinator']);
$receipt['message'][] =
array('msg'=>lang('project %1 has been saved',$project['project_id']));
***************
*** 618,621 ****
--- 617,622 ----
function edit($project)
{
+ $historylog =
CreateObject($this->currentapp.'.historylog','project');
+
while (is_array($project['location']) &&
list($input_name,$value) = each($project['location']))
{
***************
*** 710,722 ****
if ($old_status != $project['status'])
{
!
$this->historylog->add('S',$project['project_id'],$project['status']);
}
if ($old_categroy != $project['cat_id'])
{
!
$this->historylog->add('T',$project['project_id'],$project['cat_id']);
}
if ($old_coordinator != $project['coordinator'])
{
!
$this->historylog->add('C',$project['project_id'],$project['coordinator']);
}
--- 711,723 ----
if ($old_status != $project['status'])
{
!
$historylog->add('S',$project['project_id'],$project['status']);
}
if ($old_categroy != $project['cat_id'])
{
!
$historylog->add('T',$project['project_id'],$project['cat_id']);
}
if ($old_coordinator != $project['coordinator'])
{
!
$historylog->add('C',$project['project_id'],$project['coordinator']);
}
***************
*** 742,745 ****
--- 743,748 ----
function
update_request_status($project_id='',$status='',$category=0,$coordinator=0)
{
+ $historylog_r =
CreateObject($this->currentapp.'.historylog','request');
+
$sql = "SELECT origin_id FROM fm_project_origin WHERE
project_id='$project_id' and origin ='request'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 762,776 ****
if ($old_status != $status)
{
!
$this->historylog_r->add('S',$request_id[$i],$status);
}
if ((int)$old_category != (int)$category)
{
!
$this->historylog_r->add('T',$request_id[$i],$category);
}
if ((int)$old_coordinator != (int)$coordinator)
{
!
$this->historylog_r->add('C',$request_id[$i],$coordinator);
}
--- 765,779 ----
if ($old_status != $status)
{
!
$historylog_r->add('S',$request_id[$i],$status);
}
if ((int)$old_category != (int)$category)
{
!
$historylog_r->add('T',$request_id[$i],$category);
}
if ((int)$old_coordinator != (int)$coordinator)
{
!
$historylog_r->add('C',$request_id[$i],$coordinator);
}
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** class.uigab.inc.php 18 Sep 2003 14:00:49 -0000 1.15
--- class.uigab.inc.php 28 Oct 2003 15:14:41 -0000 1.16
***************
*** 37,40 ****
--- 37,41 ----
$this->bo =
CreateObject($this->currentapp.'.bogab',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ $this->menu =
CreateObject($this->currentapp.'.menu');
$this->bolocation =
CreateObject($this->currentapp.'.bolocation');
***************
*** 57,61 ****
$this->gab_insert_level =
$this->bo->gab_insert_level;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
--- 58,62 ----
$this->gab_insert_level =
$this->bo->gab_insert_level;
! $this->menu->sub ='location';
}
***************
*** 102,106 ****
}
! $links = $this->bocommon->menu();
$gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr);
--- 103,107 ----
}
! $links = $this->menu->links();
$gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr);
***************
*** 284,288 ****
$gab_id =
get_var('gab_id',array('POST','GET'));
! $links = $this->bocommon->menu();
$gab_list = $this->bo->read_detail($gab_id);
--- 285,289 ----
$gab_id =
get_var('gab_id',array('POST','GET'));
! $links = $this->menu->links();
$gab_list = $this->bo->read_detail($gab_id);
Index: class.sowo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sowo_hour.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.sowo_hour.inc.php 29 Sep 2003 17:53:51 -0000 1.17
--- class.sowo_hour.inc.php 28 Oct 2003 15:14:41 -0000 1.18
***************
*** 16,20 ****
$this->db2 = $this->db;
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->soworkorder =
CreateObject($this->currentapp.'.soworkorder');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 16,19 ----
***************
*** 138,142 ****
$values['name'] =
$this->db->db_addslashes($values['name']);
! $workorder =
$this->soworkorder->read_single($workorder_id);
//_debug_array($workorder);
--- 137,142 ----
$values['name'] =
$this->db->db_addslashes($values['name']);
! $soworkorder =
CreateObject($this->currentapp.'.soworkorder');
! $workorder =
$soworkorder->read_single($workorder_id);
//_debug_array($workorder);
Index: class.uientity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** class.uientity.inc.php 26 Oct 2003 20:33:01 -0000 1.4
--- class.uientity.inc.php 28 Oct 2003 15:14:37 -0000 1.5
***************
*** 39,48 ****
$this->bo =
CreateObject($this->currentapp.'.boentity',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->boadmin_entity =
CreateObject($this->currentapp.'.boadmin_entity',True);
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
! $this->acl2_location = '.equipment';
$this->acl_read =
$this->acl2->check($this->acl2_location,1);
$this->acl_add =
$this->acl2->check($this->acl2_location,2);
--- 39,50 ----
$this->bo =
CreateObject($this->currentapp.'.boentity',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
! $this->menu =
CreateObject($this->currentapp.'.menu');
$this->boadmin_entity =
CreateObject($this->currentapp.'.boadmin_entity',True);
+ $this->entity_id =
$this->bo->entity_id;
+ $this->cat_id =
$this->bo->cat_id;
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
! $this->acl2_location = '.entity.' .
$this->entity_id . '.' . $this->cat_id;
$this->acl_read =
$this->acl2->check($this->acl2_location,1);
$this->acl_add =
$this->acl2->check($this->acl2_location,2);
***************
*** 55,65 ****
$this->order =
$this->bo->order;
$this->filter =
$this->bo->filter;
- $this->cat_id =
$this->bo->cat_id;
$this->part_of_town_id =
$this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
- $this->entity_id =
$this->bo->entity_id;
$this->status =
$this->bo->status;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'entity_'.$this->entity_id);
$GLOBALS['phpgw']->session->appsession('entity_id',$this->currentapp,$this->entity_id);
}
--- 57,65 ----
$this->order =
$this->bo->order;
$this->filter =
$this->bo->filter;
$this->part_of_town_id =
$this->bo->part_of_town_id;
$this->district_id =
$this->bo->district_id;
$this->status =
$this->bo->status;
! $this->menu->sub
='entity_'.$this->entity_id;
$GLOBALS['phpgw']->session->appsession('entity_id',$this->currentapp,$this->entity_id);
}
***************
*** 188,192 ****
function index()
{
! if(!$this->acl_read)
{
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
--- 188,192 ----
function index()
{
! if(!$this->acl_read && $this->cat_id)
{
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
***************
*** 198,202 ****
'search_field'));
! $links = $this->bocommon->menu($sub);
$entity_list = $this->bo->read();
--- 198,202 ----
'search_field'));
! $links = $this->menu->links();
$entity_list = $this->bo->read();
***************
*** 483,486 ****
--- 483,488 ----
}
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$id =
get_var('id',array('POST','GET'));
$values =
get_var('values',array('POST','GET'));
***************
*** 563,567 ****
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$this->bolocation->read_single($location_code);
}
}
--- 565,569 ----
{
$location_code=implode("-",
$values['location']);
! $values['location_data'] =
$bolocation->read_single($location_code);
}
}
***************
*** 599,603 ****
if($entity['location_form'])
{
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
$category['location_level'],
--- 601,605 ----
if($entity['location_form'])
{
!
$location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
$category['location_level'],
***************
*** 763,766 ****
--- 765,770 ----
}
+ $bolocation =
CreateObject($this->currentapp.'.bolocation');
+
$id = get_var('id',array('POST','GET'));
***************
*** 781,785 ****
!
$location_data=$this->bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
--- 785,789 ----
! $location_data=$bolocation->initiate_ui_location(array(
'values' =>
$values['location_data'],
'type_id' =>
count(explode('-',$values['location_data']['location_code'])),
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** class.botts.inc.php 10 Oct 2003 21:57:15 -0000 1.21
--- class.botts.inc.php 28 Oct 2003 15:14:38 -0000 1.22
***************
*** 49,55 ****
$this->so =
CreateObject($this->currentapp.'.sotts');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
- $this->solocation =
CreateObject($this->currentapp.'.solocation');
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
- $this->send =
CreateObject('phpgwapi.send');
$this->config =
CreateObject('phpgwapi.config');
--- 49,53 ----
***************
*** 339,343 ****
if($ticket['location_code'])
{
! $ticket['location_data'] =
$this->solocation->read_single($ticket['location_code']);
}
--- 337,342 ----
if($ticket['location_code'])
{
! $solocation =
CreateObject($this->currentapp.'.solocation');
! $ticket['location_data'] =
$solocation->read_single($ticket['location_code']);
}
***************
*** 515,518 ****
--- 514,518 ----
{
$this->config->read_repository();
+ $this->send =
CreateObject('phpgwapi.send');
$errorcount=count($receipt['error']);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.menu.inc.php, NONE, 1.1 class.bocommon.inc.php, 1.88, 1.89 class.soentity.inc.php, 1.6, 1.7 class.uientity.inc.php, 1.4, 1.5 class.soadmin_entity.inc.php, 1.8, 1.9 class.uiadmin_entity.inc.php, 1.7, 1.8 class.boadmin_entity.inc.php, 1.5, 1.6 class.boentity.inc.php, 1.3, 1.4 class.uitts.inc.php, 1.40, 1.41 class.soworkorder.inc.php, 1.31, 1.32 class.sotts.inc.php, 1.30, 1.31 class.soproject.inc.php, 1.42, 1.43 class.botts.inc.php, 1.21, 1.22 class.boadmin.inc.php, 1.17, 1.18 class.boworkorder.inc.php, 1.18, 1.19 class.uiworkorder.inc.php, 1.46, 1.47 class.uiproject.inc.php, 1.52, 1.53 class.boproject.inc.php, 1.18, 1.19 class.uilocation.inc.php, 1.32, 1.33 class.uiXport.inc.php, 1.33, 1.34 class.uiinvoice.inc.php, 1.38, 1.39 class.uidocument.inc.php, 1.18, 1.19 class.uireport.inc.php, 1.19, 1.20 class.uiequipment.inc.php, 1.35, 1.36 class.uistandard_entity.inc.php, 1.18, 1.19 class.sowo_hour.inc.php, 1.17, 1.18 class.uiwo_hour.inc.php, 1.38, 1.39 class.uiadmin_location.inc.php, 1.9, 1.10 class.uirequest.inc.php, 1.29, 1.30 class.socommon.inc.php, 1.37, 1.38 class.uigab.inc.php, 1.15, 1.16 class.botemplate.inc.php, 1.3, 1.4 class.sotemplate.inc.php, 1.7, 1.8 class.uidrawing.inc.php, 1.24, 1.25 class.uiinvestment.inc.php, 1.26, 1.27 class.uimeter.inc.php, 1.16, 1.17 class.uipricebook.inc.php, 1.18, 1.19 class.uitemplate.inc.php, 1.13, 1.14 class.uiowner.inc.php, 1.10, 1.11 class.uip_of_town.inc.php, 1.1, 1.2 class.uitenant.inc.php, 1.4, 1.5,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default wo_hour.xsl, 1.17, 1.18 template.xsl, 1.3, 1.4
- Next by Date:
[Phpgroupware-cvs] setup/templates/default config.tpl, 1.3.2.4, 1.3.2.5
- Previous by thread:
[Phpgroupware-cvs] property/templates/default wo_hour.xsl, 1.17, 1.18 template.xsl, 1.3, 1.4
- Next by thread:
[Phpgroupware-cvs] setup/templates/default config.tpl, 1.3.2.4, 1.3.2.5
- Index(es):