[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.5 class.uitts.i
From: |
sigurdne |
Subject: |
[Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.5 class.uitts.inc.php, 1.9 class.sotts2.inc.php, 1.6 class.botts.inc.php, 1.5 |
Date: |
Thu, 24 Feb 2005 15:26:35 -0000 |
Update of property/inc
Modified Files:
Branch: MAIN
hook_settings.inc.php lines: +10 -2
class.uitts.inc.php lines: +11 -3
class.sotts2.inc.php lines: +2 -2
class.botts.inc.php lines: +3 -4
Log Message:
no message
====================================================
Index: property/inc/hook_settings.inc.php
diff -u property/inc/hook_settings.inc.php:1.4
property/inc/hook_settings.inc.php:1.5
--- property/inc/hook_settings.inc.php:1.4 Thu Jan 13 16:52:48 2005
+++ property/inc/hook_settings.inc.php Wed Feb 9 14:17:25 2005
@@ -78,6 +78,14 @@
unset($sotts);
create_select_box('Default TTS
categories','tts_category',$_categories_tts,'The default category for TTS');
+ $yes_and_no = array(
+ '1' => 'Yes',
+ '2' => 'No'
+ );
+
+ create_select_box('Send e-mail from
TTS','tts_user_mailnotification',$yes_and_no,'Send e-mail from TTS as default');
+ create_input_box('Refresh TTS every (seconds)','refreshinterval','The
intervall for Helpdesk refresh - cheking for new tickets');
+
create_select_box('Default Degree Request
safety','default_safety',$degree,'The degree of seriousness');
create_select_box('Default Degree Request
aesthetics','default_aesthetics',$degree);
create_select_box('Default Degree Request indoor
climate','default_climate',$degree);
@@ -85,7 +93,7 @@
create_select_box('Default Degree Request user
gratification','default_gratification',$degree);
create_select_box('Default Degree Request residential
environment','default_environment',$degree);
- create_input_box('Refresh TTS every (seconds)','refreshinterval','The
intervall for Helpdesk refresh - cheking for new tickets');
+
$default_start_page = array(
'location' => lang('Location'),
====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.8
property/inc/class.uitts.inc.php:1.9
--- property/inc/class.uitts.inc.php:1.8 Mon Jan 24 11:41:32 2005
+++ property/inc/class.uitts.inc.php Wed Feb 9 14:17:25 2005
@@ -705,7 +705,11 @@
'lang_town_statustext' =>
lang('Select the part of town the building belongs to. To do not use a part of
town - select NO PART OF TOWN'),
'lang_part_of_town'
=> lang('Part of town'),
'lang_no_part_of_town' =>
lang('No part of town'),
- 'cat_list'
=> $this->bo->select_category_list('select',$this->cat_id)
+ 'cat_list'
=> $this->bo->select_category_list('select',$this->cat_id),
+ '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'],
);
//_debug_array($data);
@@ -993,7 +997,11 @@
'lang_name'
=> lang('name'),
'lang_done'
=> lang('done'),
'lang_contact_phone' =>
lang('Contact phone'),
- 'contact_phone'
=> $ticket['contact_phone']
+ 'contact_phone'
=> $ticket['contact_phone'],
+ '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'],
);
$appname
= lang('helpdesk');
====================================================
Index: property/inc/class.sotts2.inc.php
diff -u property/inc/class.sotts2.inc.php:1.5
property/inc/class.sotts2.inc.php:1.6
--- property/inc/class.sotts2.inc.php:1.5 Mon Jan 24 10:30:56 2005
+++ property/inc/class.sotts2.inc.php Wed Feb 9 14:17:25 2005
@@ -273,7 +273,7 @@
{
$this->config->read_repository();
- if
($this->config->config_data['mailnotification'])
+ if
($this->config->config_data['mailnotification'] && $ticket['send_mail'])
{
$receipt=$this->bo->mail_ticket($id,$fields_updated,'',$location_code);
====================================================
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.4
property/inc/class.botts.inc.php:1.5
--- property/inc/class.botts.inc.php:1.4 Thu Jan 13 16:52:48 2005
+++ property/inc/class.botts.inc.php Wed Feb 9 14:17:25 2005
@@ -69,6 +69,7 @@
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->historylog =
CreateObject($this->currentapp.'.historylog','tts');
$this->config =
CreateObject('phpgwapi.config');
+ $this->config->read_repository();
$this->dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
if ($session)
@@ -573,10 +574,9 @@
$this->config->read_repository();
- if ($this->config->config_data['mailnotification'])
+ if ($this->config->config_data['mailnotification'] &&
$ticket['send_mail'])
{
$receipt =
$this->mail_ticket($receipt['id'],$fields_updated,$receipt,$ticket['location_code']);
-
}
return $receipt;
@@ -585,7 +585,6 @@
function
mail_ticket($id,$fields_updated,$receipt=0,$location_code='')
{
- $this->config->read_repository();
$this->send =
CreateObject('phpgwapi.send');
$members = array();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc hook_settings.inc.php, 1.5 class.uitts.inc.php, 1.9 class.sotts2.inc.php, 1.6 class.botts.inc.php, 1.5,
sigurdne <=