[Fmsystem-commits] [11329] bkbooking: stavanger bugfix/update

[Kjell Arne Espedal]

Revision: 11329
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11329
Author:   kjell
Date:     2013-09-26 10:40:54 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
bkbooking: stavanger bugfix/update

Modified Paths:
--------------
    branches/stavangerkommune/booking/inc/class.uievent.inc.php
    branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl

Modified: branches/stavangerkommune/booking/inc/class.uievent.inc.php
===================================================================
--- branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-09-26 
08:10:23 UTC (rev 11328)
+++ branches/stavangerkommune/booking/inc/class.uievent.inc.php 2013-09-26 
10:40:54 UTC (rev 11329)
@@ -610,11 +610,9 @@
                                                        }
                                                        
if(phpgw::get_var('sendtocontact', 'POST'))
                                                        {
-                                $subject = 
$config->config_data['event_conflict_mail_subject'];
-                                $body = 
'<p>'.$config->config_data['event_mail_contact_active_collision']."<br 
/>\n".phpgw::get_var('mail', 'POST');
+                                $subject = 
$config->config_data['event_change_mail_subject'];
+                                $body = 
"<p>".$config->config_data['event_change_mail']."\n".phpgw::get_var('mail', 
'POST');
                                 $body .= '<br /><a href="'.$link.'">Link til 
'.$config->config_data['application_mail_systemname'].'</a></p>';
-                                $body .= 
"<p>".$config->config_data['application_mail_signature']."</p>";
-                                                               
$comment_text_log = phpgw::get_var('mail', 'POST');
                                                                
$this->send_mailnotification($event['contact_email'], $subject, $body);
                                                                $comment = 
$comment_text_log.'<br />Denne er sendt til '.$event['contact_email'];
                                                                
$this->add_comment($event,$comment);                    
@@ -680,13 +678,9 @@
                                                                        
$this->add_comment($event,$comment);                    
                                                                }
                                                        }
-                                               } else {
-                            $subject = 
$config->config_data['event_change_mail_subject'];
-                            $body = 
$config->config_data['event_change_mail']."\n".phpgw::get_var('mail', 'POST');
-                                                       
$this->add_comment($event, phpgw::get_var('mail', 'POST'));
-                                                       
$this->send_mailnotification($event['contact_email'], $subject, $body);
-                                               }
+                                               } 
                                        } elseif (!phpgw::get_var('active', 
'POST')) {
+
                         $subject = 
$config->config_data['event_canceled_mail_subject'];
                         $body = 
$config->config_data['event_canceled_mail']."\n".phpgw::get_var('mail', 'POST');
                                                

Modified: 
branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl    
2013-09-26 08:10:23 UTC (rev 11328)
+++ branches/stavangerkommune/booking/templates/base/event_mail_settings.xsl    
2013-09-26 10:40:54 UTC (rev 11329)
@@ -31,11 +31,6 @@
                                        <xsl:attribute 
name="value"><xsl:value-of 
select="config_data/event_conflict_mail_subject"/></xsl:attribute>
                                </input>
             </dd>
-
-            <dt><label 
for="field_event_mail_contact_active_collision"><xsl:value-of 
select="php:function('lang', 'Mail text to event contact when 
collision')"/></label></dt>
-                       <dd class="yui-skin-sam">
-                               <textarea 
id="field_event_mail_contact_active_collision" class="full-width settings" 
name="event_mail_contact_active_collision" type="text"><xsl:value-of 
select="config_data/event_mail_contact_active_collision"/></textarea>
-                       </dd>
             <dt><label 
for="field_event_mail_conflict_contact_active_collision"><xsl:value-of 
select="php:function('lang', 'Mail text to conflicting event contact when 
collision')"/></label></dt>
                        <dd class="yui-skin-sam">
                                <textarea 
id="field_event_mail_conflict_contact_active_collision" class="full-width 
settings" name="event_mail_conflict_contact_active_collision" 
type="text"><xsl:value-of 
select="config_data/event_mail_conflict_contact_active_collision"/></textarea>