|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7588] property: email validating |
| Date: | Wed, 14 Sep 2011 14:19:43 +0000 |
Revision: 7588
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7588
Author: sigurdne
Date: 2011-09-14 14:19:43 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
property: email validating
Modified Paths:
--------------
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/templates/base/wo_hour.xsl
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2011-09-14 14:19:14 UTC
(rev 7587)
+++ trunk/property/inc/class.boworkorder.inc.php 2011-09-14 14:19:43 UTC
(rev 7588)
@@ -601,7 +601,7 @@
case 'P': $type = lang('Priority changed');
break;
case 'M':
$type = lang('Sent by email to');
- $_order_sent_adress = explode('
',$value['new_value']);
+ $_order_sent_adress =
explode('::',$value['new_value']);
$this->order_sent_adress =
$_order_sent_adress[0]; // in case we want to resend the order as an reminder
unset($_order_sent_adress);
break;
Modified: trunk/property/inc/class.uiwo_hour.inc.php
===================================================================
--- trunk/property/inc/class.uiwo_hour.inc.php 2011-09-14 14:19:14 UTC (rev
7587)
+++ trunk/property/inc/class.uiwo_hour.inc.php 2011-09-14 14:19:43 UTC (rev
7588)
@@ -1190,7 +1190,7 @@
$show_cost = phpgw::get_var('show_cost',
'bool');
$show_details = true;//phpgw::get_var('show_details',
'bool');
- $to_email = phpgw::get_var('to_email',
'email');
+ $to_email = phpgw::get_var('to_email',
'string');
$update_email = phpgw::get_var('update_email',
'bool');
$send_order = phpgw::get_var('send_order',
'bool');
$no_email = phpgw::get_var('no_email',
'bool');
@@ -1555,8 +1555,9 @@
if ($rcpt)
{
+ $_attachment_log = $attachment_log ?
"::$attachment_log" : '';
$historylog =
CreateObject('property.historylog','workorder');
-
$historylog->add('M',$workorder_id,"{$to_email} {$attachment_log}");
+
$historylog->add('M',$workorder_id,"{$to_email}{$_attachment_log}");
$receipt['message'][]=array('msg'=>lang('Workorder is sent by email!'));
if($attachment_log)
{
@@ -1610,6 +1611,7 @@
}
else
{
+ //FIXME
$email_list =
$this->bo->get_email($to_email,$workorder['vendor_id']);
if(count($email_list)==1)
{
Modified: trunk/property/templates/base/wo_hour.xsl
===================================================================
--- trunk/property/templates/base/wo_hour.xsl 2011-09-14 14:19:14 UTC (rev
7587)
+++ trunk/property/templates/base/wo_hour.xsl 2011-09-14 14:19:43 UTC (rev
7588)
@@ -429,28 +429,30 @@
</tr>
<tr>
<td class="th_text" align="left">
-
<xsl:value-of select="php:function('lang', 'request an
email receipt')" />
+
<xsl:value-of select="lang_update_email"/>
</td>
<td align="left">
-
<input type="checkbox" name="email_receipt"
value="true">
+
<input type="checkbox" name="update_email" value="true"
onMouseout="window.status='';return true;">
<xsl:attribute name="title">
-
<xsl:value-of
select="php:function('lang', 'request a confirmation email when your email is
opened by the recipient')" />
+
<xsl:value-of
select="lang_update_email_statustext"/>
</xsl:attribute>
-
<xsl:if test="requst_email_receipt != 0">
-
<xsl:attribute name="checked"
value="checked" />
-
</xsl:if>
</input>
</td>
</tr>
+
</xsl:otherwise>
+
</xsl:choose>
<tr>
<td class="th_text" align="left">
-
<xsl:value-of select="lang_update_email"/>
+
<xsl:value-of select="php:function('lang', 'request an
email receipt')" />
</td>
<td align="left">
-
<input type="checkbox" name="update_email" value="true"
onMouseout="window.status='';return true;">
+
<input type="checkbox" name="email_receipt"
value="true">
<xsl:attribute name="title">
-
<xsl:value-of
select="lang_update_email_statustext"/>
+
<xsl:value-of
select="php:function('lang', 'request a confirmation email when your email is
opened by the recipient')" />
</xsl:attribute>
+
<xsl:if test="requst_email_receipt != 0">
+
<xsl:attribute name="checked"
value="checked" />
+
</xsl:if>
</input>
</td>
</tr>
@@ -509,8 +511,7 @@
</input>
</td>
</tr>
-
</xsl:otherwise>
-
</xsl:choose>
+
</table></td></tr>
</xsl:when>
</xsl:choose>
| [Prev in Thread] | Current Thread | [Next in Thread] |