[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.boloc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.boloc... |
|
Date: |
Tue, 26 Sep 2006 13:46:01 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/26 13:46:01
Modified files:
inc : class.bocommon.inc.php class.bolocation.inc.php
class.botts.inc.php
class.soadmin_custom.inc.php
class.sotts2.inc.php class.uitts.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_custom.inc.php?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts2.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42
Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- class.bocommon.inc.php 18 Sep 2006 18:26:43 -0000 1.37
+++ class.bocommon.inc.php 26 Sep 2006 13:46:01 -0000 1.38
@@ -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.37 2006/09/18 18:26:43
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.38 2006/09/26 13:46:01
sigurdne Exp $
*/
/**
@@ -1320,8 +1320,8 @@
function excel($list,$name,$descr,$input_type='')
{
- $GLOBALS['phpgw_info']['flags'][noheader] = True;
- $GLOBALS['phpgw_info']['flags'][nofooter] = True;
+ $GLOBALS['phpgw_info']['flags']['noheader'] = True;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
$GLOBALS['phpgw_info']['flags']['xslt_app'] = False;
$filename=
$GLOBALS['phpgw_info']['user']['account_lid'].'.xls';
Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.bolocation.inc.php 18 Sep 2006 09:08:04 -0000 1.19
+++ class.bolocation.inc.php 26 Sep 2006 13:46:01 -0000 1.20
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage location
- * @version $Id: class.bolocation.inc.php,v 1.19 2006/09/18 09:08:04
sigurdne Exp $
+ * @version $Id: class.bolocation.inc.php,v 1.20 2006/09/26 13:46:01
sigurdne Exp $
*/
/**
@@ -145,7 +145,7 @@
$this->district_id = $data['district_id'];
$this->status = $data['status'];
$this->type_id = $data['type_id'];
- $this->allrows = $data['allrows'];
+ // $this->allrows = $data['allrows'];
}
function save_sessiondata($data)
@@ -254,7 +254,7 @@
$insert_record['location'][]
= $location['location'][$i]['input_name'];
$location['location'][$i]['size']
= 5;
$location['location'][$i]['name']
= $location_types[($i)]['name'];
- $location['location'][$i]['value']
= $data['values']['loc' . ($i+1)];
+ $location['location'][$i]['value']
= (isset($data['values']['loc' .
($i+1)])?$data['values']['loc' . ($i+1)]:'');
$location['location'][$i]['statustext']
= lang('Klick this link to select') . ' ' .
$location_types[($i)]['name'];
if($i==0)
@@ -264,7 +264,7 @@
$location['location'][$i]['extra'][0]['input_type'] = 'text';
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
-
$location['location'][$i]['extra'][0]['value'] =
$data['values']['loc' . ($i+1).'_name'];
+
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['loc' . ($i+1).'_name'])?$data['values']['loc' .
($i+1).'_name']:'');
}
else
{
@@ -273,7 +273,7 @@
$location['location'][$i]['extra'][0]['input_type'] = 'text';
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
-
$location['location'][$i]['extra'][0]['value'] =
$data['values']['loc' . ($i+1).'_name'];
+
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['loc' . ($i+1).'_name'])?$data['values']['loc' .
($i+1).'_name']:'');
}
$location['location'][$i]['lookup_function_call'] =
'lookup_loc' . ($i+1) . '()';
@@ -343,7 +343,7 @@
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$config[$j]['location_type'] . '()';
$location['location'][$i]['name'] = lang('address');
$location['location'][$i]['input_type'] = 'hidden';
-
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
+
$location['location'][$i]['value'] =
(isset($data['values'][$config[$j]['column_name']])?$data['values'][$config[$j]['column_name']]:'');
$location['location'][$i]['extra'][0]['input_type'] = 'text';
$location['location'][$i]['extra'][0]['input_name'] = 'street_name';
@@ -351,7 +351,7 @@
$input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
-
$location['location'][$i]['extra'][0]['value'] =
$data['values']['street_name'];
+
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['street_name'])?$data['values']['street_name']:'');
$location['location'][$i]['extra'][1]['input_type'] = 'text';
$location['location'][$i]['extra'][1]['input_name'] = 'street_number';
@@ -359,7 +359,7 @@
$input_name[]
= $location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size'] = 6;
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
-
$location['location'][$i]['extra'][1]['value'] =
$data['values']['street_number'];
+
$location['location'][$i]['extra'][1]['value'] =
(isset($data['values']['street_number'])?$data['values']['street_number']:'');
}
elseif($config[$j]['column_name']=='tenant_id' && $data['tenant']):
{
@@ -373,7 +373,7 @@
$location['location'][$i]['input_type'] = 'hidden';
$location['location'][$i]['input_name'] = 'tenant_id';
$input_name[]
= $location['location'][$i]['input_name'];
-
$location['location'][$i]['value'] =
$data['values'][$config[$j]['column_name']];
+
$location['location'][$i]['value'] =
(isset($data['values'][$config[$j]['column_name']])?$data['values'][$config[$j]['column_name']]:'');
$location['location'][$i]['lookup_function_call'] =
$lookup_functions[$m]['name'];
$location['location'][$i]['statustext'] = lang('tenant');
$insert_record['extra']['tenant_id'] = 'tenant_id';
@@ -384,7 +384,7 @@
$input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size'] = 15;
$location['location'][$i]['extra'][0]['lookup_function_call'] =
$lookup_functions[$m]['name'];
-
$location['location'][$i]['extra'][0]['value'] =
$data['values']['last_name'];
+
$location['location'][$i]['extra'][0]['value'] =
(isset($data['values']['last_name'])?$data['values']['last_name']:'');
$location['location'][$i]['extra'][0]['statustext'] = lang('last name');
$location['location'][$i]['extra'][1]['input_type'] = 'text';
@@ -393,7 +393,7 @@
$input_name[]
= $location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size'] = 15;
$location['location'][$i]['extra'][1]['lookup_function_call'] =
$lookup_functions[$m]['name'];
-
$location['location'][$i]['extra'][1]['value'] =
$data['values']['first_name'];
+
$location['location'][$i]['extra'][1]['value'] =
(isset($data['values']['first_name'])?$data['values']['first_name']:'');
$location['location'][$i]['extra'][1]['statustext'] = lang('first name');
$i++;
$location['location'][$i]['input_type'] = 'text';
@@ -403,7 +403,7 @@
$location['location'][$i]['size'] = 12;
$location['location'][$i]['lookup_function_call'] =
'';//$lookup_functions[$m]['name'];
$insert_record['extra']['contact_phone'] = 'contact_phone';
-
$location['location'][$i]['value'] =
$data['values']['contact_phone'];
+
$location['location'][$i]['value'] =
(isset($data['values']['contact_phone'])?$data['values']['contact_phone']:'');
$location['location'][$i]['statustext'] = lang('contact phone');
}
elseif($config[$j]['column_name']!='tenant_id' &&
$config[$j]['column_name']!='street_id'):
Index: class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- class.botts.inc.php 19 Sep 2006 21:09:48 -0000 1.26
+++ class.botts.inc.php 26 Sep 2006 13:46:01 -0000 1.27
@@ -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.26 2006/09/19 21:09:48 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.27 2006/09/26 13:46:01 sigurdne
Exp $
*/
/**
@@ -199,7 +199,7 @@
function get_priority_list($selected='')
{
- if(!$selected)
+ if(!$selected &&
isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['prioritydefault']))
{
$selected =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['prioritydefault'];
}
@@ -460,7 +460,7 @@
$i++;
}
- return $record_history;
+ return (isset($record_history)?$record_history:'');
}
function add($ticket)
Index: class.soadmin_custom.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_custom.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- class.soadmin_custom.inc.php 3 Mar 2006 17:48:03 -0000 1.2
+++ class.soadmin_custom.inc.php 26 Sep 2006 13:46:01 -0000 1.3
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin_custom.inc.php,v 1.2 2006/03/03 17:48:03
sigurdne Exp $
+ * @version $Id: class.soadmin_custom.inc.php,v 1.3 2006/09/26 13:46:01
sigurdne Exp $
*/
/**
@@ -34,14 +34,7 @@
{
if(is_array($data))
{
- if ($data['start'])
- {
- $start=$data['start'];
- }
- else
- {
- $start=0;
- }
+ $query =
(isset($data['start'])?$data['start']:0);
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
@@ -69,6 +62,7 @@
$where = 'AND';
}
+ $querymethod = '';
if($query)
{
$query = ereg_replace("'",'',$query);
@@ -104,7 +98,7 @@
'active' =>
$this->db->f('active')
);
}
- return $custom_function;
+ return (isset($custom_function)?$custom_function:'');
}
Index: class.sotts2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.sotts2.inc.php 19 Sep 2006 21:09:48 -0000 1.12
+++ class.sotts2.inc.php 26 Sep 2006 13:46:01 -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 helpdesk
- * @version $Id: class.sotts2.inc.php,v 1.12 2006/09/19 21:09:48
sigurdne Exp $
+ * @version $Id: class.sotts2.inc.php,v 1.13 2006/09/26 13:46:01
sigurdne Exp $
*/
/**
@@ -262,7 +262,7 @@
$this->db->transaction_commit();
- if ($fields_updated)
+ if (isset($fields_updated))
{
$this->config->read_repository();
@@ -287,9 +287,7 @@
}
}
-
- return $receipt;
+ return (isset($receipt)?$receipt:'');
}
-
}
?>
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- class.uitts.inc.php 19 Sep 2006 21:09:48 -0000 1.41
+++ class.uitts.inc.php 26 Sep 2006 13:46:01 -0000 1.42
@@ -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.41 2006/09/19 21:09:48 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.42 2006/09/26 13:46:01 sigurdne
Exp $
*/
/**
@@ -585,7 +585,7 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
//_debug_array($insert_record);
- if ($values['save'])
+ if (isset($values['save']))
{
for ($i=0;
$i<count($insert_record['location']); $i++)
{
@@ -657,13 +657,13 @@
}
$location_data=$bolocation->initiate_ui_location(array(
- 'values' =>
$values['location_data'],
+ 'values' =>
(isset($values['location_data'])?$values['location_data']:''),
'type_id' => -1, //
calculated from location_types
'no_link' => False, //
disable lookup links for location type less than type_id
'tenant' => True,
'lookup_type' => 'form',
'lookup_entity' =>
$this->bocommon->get_lookup_entity('ticket'),
- 'entity_data' => $values['p']
+ 'entity_data' =>
(isset($values['p'])?$values['p']:'')
));
@@ -672,18 +672,18 @@
'menuaction' =>
$this->currentapp.'.uitts.add'
);
- if(!$values['assignedto'])
+ if(!isset($values['assignedto']))
{
- $values['assignedto']=
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault'];
+ $values['assignedto']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault']:'');
}
- if(!$values['group_id'])
+ if(!isset($values['group_id']))
{
- $values['group_id']=
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault'];
+ $values['group_id']=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['groupdefault']:'');
}
- if(!$values['cat_id'])
+ if(!isset($values['cat_id']))
{
- $this->cat_id =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category'];
+ $this->cat_id =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category']:'');
}
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
@@ -715,7 +715,7 @@
}
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $msgbox_data =
(isset($receipt)?$this->bocommon->msgbox_data($receipt):'');
$data = array
(
@@ -740,7 +740,7 @@
'lang_priority' =>
lang('Priority'),
'lang_priority_statustext' =>
lang('Select the priority the selection belongs to.'),
'select_priority_name' =>
'values[priority]',
- 'priority_list' =>
$this->bo->get_priority_list($values['priority']),
+ 'priority_list' =>
$this->bo->get_priority_list((isset($values['priority'])?$values['priority']:'')),
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitts.index')),
@@ -752,11 +752,11 @@
'lang_category' =>
lang('category'),
'lang_save' =>
lang('save'),
'lang_done' =>
lang('done'),
- 'value_details' =>
$values['details'],
- 'value_subject' =>
$values['subject'],
+ 'value_details' =>
(isset($values['details'])?$values['details']:''),
+ 'value_subject' =>
(isset($values['subject'])?$values['subject']:''),
'lang_finnish_date' =>
lang('finnish date'),
- 'value_finnish_date' =>
$values['finnish_date'],
+ 'value_finnish_date' =>
(isset($values['finnish_date'])?$values['finnish_date']:''),
'lang_done_statustext' =>
lang('Back to the ticket list'),
'lang_save_statustext' =>
lang('Save the ticket'),
@@ -768,10 +768,10 @@
'lang_no_part_of_town' =>
lang('No part of town'),
'cat_list' =>
$this->bocommon->select_category_list(array('format'=>'select','selected' =>
$this->cat_id,'type' =>'ticket','order'=>'descr')),
- 'mailnotification' =>
$this->bo->config->config_data['mailnotification'],
+ 'mailnotification' =>
(isset($this->bo->config->config_data['mailnotification'])?$this->bo->config->config_data['mailnotification']:''),
'lang_mailnotification' =>
lang('Send e-mail'),
'lang_mailnotification_statustext' =>
lang('Choose to send mailnotification'),
- 'pref_send_mail' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification'],
+ 'pref_send_mail' =>
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification']:''),
);
//_debug_array($data);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.boloc...,
Sigurd Nes <=