[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.acl2.inc.php class.bocommon....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.acl2.inc.php class.bocommon.... |
|
Date: |
Mon, 18 Sep 2006 18:26:43 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/18 18:26:43
Modified files:
inc : class.acl2.inc.php class.bocommon.inc.php
class.botts.inc.php class.socommon.inc.php
class.sotts.inc.php class.uitts.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.acl2.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.socommon.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.39&r2=1.40
Patches:
Index: class.acl2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.acl2.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.acl2.inc.php 6 Sep 2006 07:18:35 -0000 1.12
+++ class.acl2.inc.php 18 Sep 2006 18:26:43 -0000 1.13
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.acl2.inc.php,v 1.12 2006/09/06 07:18:35 sigurdne
Exp $
+ * @version $Id: class.acl2.inc.php,v 1.13 2006/09/18 18:26:43 sigurdne
Exp $
*/
/**
@@ -224,7 +224,7 @@
$member_of[] = $account['account_id'];
}
- if($member_of)
+ if(isset($member_of) && is_array($member_of))
{
$this->memberships_sql = ',' .
@implode(",",$member_of);
}
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.bocommon.inc.php 18 Sep 2006 13:11:35 -0000 1.36
+++ class.bocommon.inc.php 18 Sep 2006 18:26:43 -0000 1.37
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.36 2006/09/18 13:11:35
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.37 2006/09/18 18:26:43
sigurdne Exp $
*/
/**
@@ -510,7 +510,7 @@
$users=$this->socommon->get_user_list_right($right,$acl_location);
- if (is_array($users_extra) && is_array($users))
+ if ((isset($users_extra) && is_array($users_extra)) &&
is_array($users))
{
foreach($users as $users_entry)
{
@@ -1221,7 +1221,7 @@
$socategory =
CreateObject($this->currentapp.'.socategory');
$categories=
$socategory->select_category_list(array('type'=>$data['type'],
-
'type_id'=>$data['type_id'],
+
'type_id'=>(isset($data['type_id'])?$data['type_id']:''),
'order' =>$data['order']));
return
$this->select_list($data['selected'],$categories);
Index: class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.botts.inc.php 15 Jun 2006 10:57:35 -0000 1.24
+++ class.botts.inc.php 18 Sep 2006 18:26:43 -0000 1.25
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.24 2006/06/15 10:57:35 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.25 2006/09/18 18:26:43 sigurdne
Exp $
*/
/**
@@ -177,10 +177,10 @@
break;
}
- $filters[0][id]='closed';
- $filters[0][name]=lang('Closed');
- $filters[1][id]='all';
- $filters[1][name]=lang('All');
+ $filters[0]['id']='closed';
+ $filters[0]['name']=lang('Closed');
+ $filters[1]['id']='all';
+ $filters[1]['name']=lang('All');
return $this->bocommon->select_list($selected,$filters);
}
@@ -188,10 +188,10 @@
function get_status_list($selected)
{
- $filters[0][id]='X';
- $filters[0][name]=lang('Closed');
- $filters[1][id]='O';
- $filters[1][name]=lang('Open');
+ $filters[0]['id']='X';
+ $filters[0]['name']=lang('Closed');
+ $filters[1]['id']='O';
+ $filters[1]['name']=lang('Open');
return $this->bocommon->select_list($selected,$filters);
}
@@ -261,17 +261,19 @@
$history_values =
$this->historylog->return_array(array(),array('X'),'history_timestamp','DESC',$tickets[$i]['id']);
$tickets[$i]['timestampclosed'] =
$GLOBALS['phpgw']->common->show_date($history_values[0]['datetime'],$this->dateformat);
}
- if ($tickets[$i]['new_ticket'])
+ if (isset($tickets[$i]['new_ticket']))
{
$tickets[$i]['new_ticket'] =
lang('New');
}
+ if(isset($entity) && is_array($entity))
+ {
for ($j=0;$j<count($entity);$j++)
{
- $tickets[$i]['child_date'][$j] =
$this->so->get_child_date($tickets[$i]['id'],$entity[$j]['type'],$entity[$j]['entity_id'],$entity[$j]['cat_id']);
+ $tickets[$i]['child_date'][$j]
=
$this->so->get_child_date($tickets[$i]['id'],$entity[$j]['type'],(isset($entity[$j]['entity_id'])?$entity[$j]['entity_id']:''),(isset($entity[$j]['cat_id'])?$entity[$j]['cat_id']:''));
+ }
}
}
-
//_debug_array($tickets);
return $tickets;
}
Index: class.socommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.socommon.inc.php 21 Apr 2006 19:09:20 -0000 1.23
+++ class.socommon.inc.php 18 Sep 2006 18:26:43 -0000 1.24
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.socommon.inc.php,v 1.23 2006/04/21 19:09:20
sigurdne Exp $
+ * @version $Id: class.socommon.inc.php,v 1.24 2006/09/18 18:26:43
sigurdne Exp $
*/
/**
@@ -109,11 +109,6 @@
$acl2 =
CreateObject($this->currentapp.'.acl2','##DEFAULT##','##DEFAULT##');
$myaccounts = CreateObject('phpgwapi.accounts');
- while($my_memberships && list($key,$group) =
each($my_memberships))
- {
- $security .= "," . $group['account_id'];
- }
-
$sql = "SELECT * FROM phpgw_accounts $this->join
fm_acl2 on phpgw_accounts.account_id=fm_acl2.acl_account WHERE account_status =
'A' AND acl_location $this->like '%$acl_location%' order by account_lastname
ASC";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
Index: class.sotts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.sotts.inc.php 17 Apr 2006 11:36:05 -0000 1.16
+++ class.sotts.inc.php 18 Sep 2006 18:26:43 -0000 1.17
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.sotts.inc.php,v 1.16 2006/04/17 11:36:05 sigurdne
Exp $
+ * @version $Id: class.sotts.inc.php,v 1.17 2006/09/18 18:26:43 sigurdne
Exp $
*/
/**
@@ -110,6 +110,7 @@
$where= 'AND';
*/
+ $filtermethod = '';
if ($filter == 'closed'):
{
$filtermethod .= " $where
fm_tts_tickets.status='X'";
@@ -146,6 +147,7 @@
$where= 'AND';
}
+ $querymethod = '';
if($query)
{
$query = str_replace(",",'.',$query);
@@ -182,9 +184,9 @@
$i = 0;
+ $tickets = array();
while ($this->db->next_record())
{
-
$tickets[$i]['id']
= $this->db->f('id');
$tickets[$i]['subject'] =
$this->db->f('subject');
$tickets[$i]['location_code'] =
$this->db->f('location_code');
@@ -258,6 +260,7 @@
$this->db->query($sql,__LINE__,__FILE__);
$i=0;
+ $date_info = array();
while ($this->db->next_record())
{
$date_info['date_info'][$i]['entry_date']=
$GLOBALS['phpgw']->common->show_date($this->db->f('entry_date'),$this->dateformat);
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- class.uitts.inc.php 18 Sep 2006 13:11:34 -0000 1.39
+++ class.uitts.inc.php 18 Sep 2006 18:26:43 -0000 1.40
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.39 2006/09/18 13:11:34 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.40 2006/09/18 18:26:43 sigurdne
Exp $
*/
/**
@@ -185,8 +185,8 @@
$second_display =
get_var('second_display',array('POST','GET'));
- $default_category =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district'];
- $default_status =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status'];
+ $default_category =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district']:'');
+ $default_status =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status']:'');
$start_date = urldecode($this->start_date);
$end_date = urldecode($this->end_date);
@@ -269,14 +269,14 @@
(
'id'
=> $ticket['id'],
'bgcolor'
=> $bgcolor[$ticket['priority']],
- 'new_ticket'
=> $ticket['new_ticket'],
+ 'new_ticket'
=> (isset($ticket['new_ticket'])?$ticket['new_ticket']:''),
'priostr'
=> str_repeat("||", $ticket['priority']),
'first'
=> $first,
'location_code'
=> $ticket['location_code'],
'address'
=> $ticket['address'],
'date'
=> $ticket['timestampopened'],
'finnish_date'
=> $ticket['finnish_date'],
- 'delay'
=> $ticket['delay'],
+ 'delay'
=> (isset($ticket['delay'])?$ticket['delay']:''),
'user'
=> $ticket['user'],
'assignedto'
=> $ticket['assignedto'],
'child_date'
=> $ticket['child_date'],
@@ -448,7 +448,8 @@
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,'');
$GLOBALS['phpgw']->preferences->read_repository();
- if
($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['refreshinterval'])
+ $autorefresh ='';
+ if
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['refreshinterval']))
{
$autorefresh =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['refreshinterval'].';
URL='.$GLOBALS['phpgw']->link('/index.php',$link_data);
}
@@ -485,8 +486,10 @@
'start' => $this->start
);
-
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'])
+ $pref_group_filters = '';
+
if(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters']))
{
+ $pref_group_filters = true;
$group_filters = 'select';
$GLOBALS['phpgw']->xslttpl->add_file(array('search_field_grouped'));
}
@@ -498,14 +501,14 @@
$data = array
(
- 'group_filters' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
+ 'group_filters' =>
$pref_group_filters,
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
'lang_excel_help' =>
lang('Download table to MS Excel'),
- 'start_date'
=>$start_date,
- 'end_date'
=>$end_date,
- 'lang_none'
=>lang('None'),
+ 'start_date' =>
$start_date,
+ 'end_date' =>
$end_date,
+ 'lang_none' =>
lang('None'),
'lang_date_search' =>
lang('Date search'),
'lang_date_search_help' =>
lang('Narrow the search by dates'),
'link_date_search' =>
$link_date_search,
@@ -538,7 +541,7 @@
'query' =>
$this->query,
'lang_search' =>
lang('search'),
'table_header' =>
$table_header,
- 'values' =>
$content,
+ 'values' =>
(isset($content)?$content:''),
'table_add' =>
$table_add,
'district_list' =>
$this->bocommon->select_district_list($group_filters,$this->district_id),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.acl2.inc.php class.bocommon....,
Sigurd Nes <=