[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.sotts2.inc.php class.uitts.i...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] property/inc class.sotts2.inc.php class.uitts.i... |
Date: |
Fri, 06 Oct 2006 08:56:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/06 08:56:22
Modified files:
inc : class.sotts2.inc.php class.uitts.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts2.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45
Patches:
Index: class.sotts2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.sotts2.inc.php 26 Sep 2006 13:46:01 -0000 1.13
+++ class.sotts2.inc.php 6 Oct 2006 08:56:22 -0000 1.14
@@ -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.13 2006/09/26 13:46:01
sigurdne Exp $
+ * @version $Id: class.sotts2.inc.php,v 1.14 2006/10/06 08:56:22
sigurdne Exp $
*/
/**
@@ -83,7 +83,7 @@
{
$this->config->read_repository();
- if
($this->config->config_data['mailnotification'])
+ if
(isset($this->config->config_data['mailnotification']) &&
$this->config->config_data['mailnotification'])
{
$receipt=$this->bo->mail_ticket($id,$fields_updated,'',$location_code);
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- class.uitts.inc.php 5 Oct 2006 11:33:53 -0000 1.44
+++ class.uitts.inc.php 6 Oct 2006 08:56:22 -0000 1.45
@@ -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.44 2006/10/05 11:33:53 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.45 2006/10/06 08:56:22 sigurdne
Exp $
*/
/**
@@ -608,7 +608,10 @@
$values['street_name'] =
$_POST['street_name'];
$values['street_number'] =
$_POST['street_number'];
+ if(isset($values['location']) &&
$values['location'])
+ {
$values['location_name'] = $_POST['loc'
. (count($values['location'])).'_name']; // if not address - get the parent
name as address
+ }
/* if(!$values['subject'])
{
@@ -625,17 +628,17 @@
$receipt['error'][]=array('msg'=>lang('Please select a category !'));
}
-/* if(!$values['details'])
+ if(!isset($values['details']) ||
!$values['details'])
{
$receipt['error'][]=array('msg'=>lang('Please give som details !'));
}
-*/
- if(!$values['location']['loc1'] &&
!$values['extra']['p_num'])
+
+ if((!isset($values['location']['loc1']) ||
!$values['location']['loc1']) && (!isset($values['extra']['p_num']) ||
!$values['extra']['p_num']))
{
$receipt['error'][]=array('msg'=>lang('Please select a location - or an
entity!'));
}
- if(!$receipt['error'])
+ if(!isset($receipt['error']))
{
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
@@ -644,12 +647,12 @@
}
else
{
- if($values['location'])
+ if(isset($values['location']) &&
$values['location'])
{
$location_code=implode("-",
$values['location']);
- $values['location_data'] =
$bolocation->read_single($location_code,$values['extra']);
+ $values['location_data'] =
$bolocation->read_single($location_code,(isset($values['extra'])?$values['extra']:false));
}
- if($values['extra']['p_num'])
+ if(isset($values['extra']['p_num']) &&
$values['extra']['p_num'])
{
$values['p'][$values['extra']['p_entity_id']]['p_num']=$values['extra']['p_num'];
$values['p'][$values['extra']['p_entity_id']]['p_entity_id']=$values['extra']['p_entity_id'];
@@ -688,6 +691,10 @@
{
$this->cat_id =
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_category']:'');
}
+ else
+ {
+ $this->cat_id = $values['cat_id'];
+ }
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
$sep = '/';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.sotts2.inc.php class.uitts.i...,
Sigurd Nes <=