[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8198] bkbooking: nsf update mail text
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [8198] bkbooking: nsf update mail text |
Date: |
Fri, 25 Nov 2011 13:15:54 +0000 |
Revision: 8198
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8198
Author: kjell
Date: 2011-11-25 13:15:54 +0000 (Fri, 25 Nov 2011)
Log Message:
-----------
bkbooking: nsf update mail text
Modified Paths:
--------------
branches/dev-thomasez/booking/inc/class.boapplication.inc.php
branches/dev-thomasez/booking/inc/class.uievent.inc.php
branches/dev-thomasez/booking/templates/base/mail_settings.xsl
Modified: branches/dev-thomasez/booking/inc/class.boapplication.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.boapplication.inc.php
2011-11-25 08:10:24 UTC (rev 8197)
+++ branches/dev-thomasez/booking/inc/class.boapplication.inc.php
2011-11-25 13:15:54 UTC (rev 8198)
@@ -20,34 +20,43 @@
$from = isset($config->config_data['email_sender']) &&
$config->config_data['email_sender'] ? $config->config_data['email_sender'] :
"noreply<address@hidden'phpgw_info']['server']['hostname']}>";
$external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
+ $subject =
$config->config_data['application_mail_subject'];
+# $subject = 'Melding fra Bergen kommune - AktivBy';
- $subject = 'Melding fra Bergen kommune - AktivBy';
$link =
$external_site_address.'/bookingfrontend/?menuaction=bookingfrontend.uiapplication.show&id='.$application['id'].'&secret='.$application['secret'];
if ($created) {
- $body = '<p>Din søknad om leie/lån er
mottatt.</p>';
- $body .= '<p>Praktisk informasjon finner du i
dokumenter knyttet til bygget, ref. juridiske betingelser pk.8 i søknad.</p>';
- $body .= '<p>Klikk på linken under for å se på,
redigere eller ha dialog med saksbehandler om din søknad.</p>';
- $body .= '<p><a href="'.$link.'">Link til
AktivBy: søknad #'.$application['id'].'</a></p>';
+ $body =
"<pre>".$config->config_data['application_mail_created']."</pre>";
+# $body = '<p>Din søknad om leie/lån er
mottatt.</p>';
+# $body .= '<p>Praktisk informasjon finner du i
dokumenter knyttet til bygget, ref. juridiske betingelser pk.8 i søknad.</p>';
+# $body .= '<p>Klikk på linken under for å se på,
redigere eller ha dialog med saksbehandler om din søknad.</p>';
+ $body .= '<p><a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
} elseif ($application['status'] == 'PENDING') {
- $body = '<p>Din søknad i AktivBy? om leie/lån
er '.lang($application['status']).'.<br />Saksbehandler trenger ytterligere
informasjon, ber om at du klikker på linken under og gir nødvendig
tilbakemeldinger slik at saken kan ferdigbehandles.</p>';
- $body .= '<p><a href="'.$link.'">Link til
AktivBy: søknad #'.$application['id'].'</a></p>';
+ $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
+ $body .=
"<pre>".$config->config_data['application_mail_pending']."</pre>";
+# $body = '<p>Din søknad i AktivBy? om leie/lån
er '.lang($application['status']).'.<br />Saksbehandler trenger ytterligere
informasjon, ber om at du klikker på linken under og gir nødvendig
tilbakemeldinger slik at saken kan ferdigbehandles.</p>';
+ $body .= '<p><a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
} elseif ($application['status'] == 'ACCEPTED') {
- $body = '<p>Din søknad i AktivBy om leie/lån er
'.lang($application['status']).'.<br /> For å skrive ut en bekreftelse eller ha
dialog med saksbehandler bruk <a href="'.$link.'">Link til AktivBy: søknad
#'.$application['id'].'</a></p>';
+ $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
+ $body .=
'<pre>'.$config->config_data['application_mail_pending'].' <a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
+# $body = '<p>Din søknad i AktivBy om leie/lån er
'.lang($application['status']).'.<br /> For å skrive ut en bekreftelse eller ha
dialog med saksbehandler bruk <a href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
} elseif ($application['status'] == 'REJECTED') {
- $body = '<p>Din søknad i AktivBy om leie/lån er
'.lang($application['status']).'.<br />For ytterligere informasjon se <a
href="'.$link.'">Link til AktivBy: søknad #'.$application['id'].'</a></p>';
+ $body = "<p>Din søknad i
".$config->config_data['application_mail_systemname']." om leie/lån
er".lang($application['status']);
+ $body .=
'<pre>'.$config->config_data['application_mail_rejected'].'<a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></pre>';
+# $body = '<p>Din søknad i AktivBy om leie/lån er
'.lang($application['status']).'.<br />For ytterligere informasjon se <a
href="'.$link.'">Link til
'.$config->config_data['application_mail_systemname'].': søknad
#'.$application['id'].'</a></p>';
if ($application['comment'] != '') {
$body .= '<p>Kommentar fra
saksbehandler:<br />'.$application['comment'].'</p>';
}
}
- $body .= '<p>Med vennlig hilsen AktivBy - Bergen
Kommune</p>';
+ $body .=
"<p>".$config->config_data['application_mail_signature']."</p>";
+# $body .= '<p>Med vennlig hilsen AktivBy - Bergen
Kommune</p>';
try
{
Modified: branches/dev-thomasez/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uievent.inc.php 2011-11-25
08:10:24 UTC (rev 8197)
+++ branches/dev-thomasez/booking/inc/class.uievent.inc.php 2011-11-25
13:15:54 UTC (rev 8198)
@@ -480,6 +480,9 @@
$event['building_name'] = $building_info['name'];
$errors = array();
$customer = array();
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
if ($event['customer_identifier_type'])
{
$customer['customer_identifier_type'] =
$event['customer_identifier_type'];
@@ -591,7 +594,7 @@
} else {
$comment_text_log = $event['contact_name'];
}
-
$comment_text_log = $comment_text_log.' har fått innvilget et arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i',
strtotime($event['from_'])).".\nFor mer opplysinger slå opp i AktivBy.";
+
$comment_text_log = $comment_text_log.' har fått innvilget et arrangement i
'.$event['building_name'].' '.date('d-m-Y H:i',
strtotime($event['from_'])).".\nFor mer opplysinger slå opp
i".$config->config_data['application_mail_systemname'].".";
//
$comment_text_log = phpgw::get_var('mail', 'POST');
$sendt = 0;
$mail_sendt_to
= '';
Modified: branches/dev-thomasez/booking/templates/base/mail_settings.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/mail_settings.xsl
2011-11-25 08:10:24 UTC (rev 8197)
+++ branches/dev-thomasez/booking/templates/base/mail_settings.xsl
2011-11-25 13:15:54 UTC (rev 8198)
@@ -11,23 +11,41 @@
<form action="" method="POST">
<dl class="form-col">
- <dt><label for="field_user_can_delete"><xsl:value-of
select="php:function('lang', 'NSF site setup')"/></label></dt>
- <dd>
- <select id="field_nsf_setup" name="nsf_setup">
- <option value="no">
- <xsl:if test="config_data/nsf_setup='no'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang', 'No')" />
- </option>
- <option value="yes">
- <xsl:if test="config_data/nsf_setup='yes'">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang', 'Yes')" />
- </option>
- </select>
+ <dt><label for="field_application_mail_systemname"><xsl:value-of
select="php:function('lang', 'System name')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_systemname"
name="application_mail_systemname" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_systemname"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_application_mail_subject"><xsl:value-of
select="php:function('lang', 'Subject')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_subject"
name="application_mail_subject" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_subject"/></xsl:attribute>
+ </input>
+ </dd>
+ <dt><label for="field_application_mail_created"><xsl:value-of
select="php:function('lang', 'Mail text for application
created')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_created"
class="full-width settings" name="application_mail_created"
type="text"><xsl:value-of
select="config_data/application_mail_created"/></textarea>
</dd>
+ <dt><label for="field_application_mail_pending"><xsl:value-of
select="php:function('lang', 'Mail text for application
pending')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_pending"
class="full-width settings" name="application_mail_pending"
type="text"><xsl:value-of
select="config_data/application_mail_pending"/></textarea>
+ </dd>
+ <dt><label for="field_application_mail_accepted"><xsl:value-of
select="php:function('lang', 'Mail text for application
accepted')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_accepted"
class="full-width settings" name="application_mail_accepted"
type="text"><xsl:value-of
select="config_data/application_mail_accepted"/></textarea>
+ </dd>
+ <dt><label for="field_application_mail_rejected"><xsl:value-of
select="php:function('lang', 'Mail text for application
rejected')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_mail_rejected"
class="full-width settings" name="application_mail_rejected"
type="text"><xsl:value-of
select="config_data/application_mail_rejected"/></textarea>
+ </dd>
+ <dt><label for="field_application_mail_signature"><xsl:value-of
select="php:function('lang', 'Signature')"/></label></dt>
+ <dd>
+ <input id="field_application_mail_signature"
name="application_mail_signature" type="text" size="50">
+ <xsl:attribute
name="value"><xsl:value-of
select="config_data/application_mail_signature"/></xsl:attribute>
+ </input>
+ </dd>
+
</dl>
<div class="form-buttons">
<input type="submit">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8198] bkbooking: nsf update mail text,
Kjell Arne Espedal <=