From 7cc412d337245b5ffbbb94b5c503e6afd989a3ed Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 13 Sep 2011 09:51:01 -0400
Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation
 processing

Fixing improperly nested template logic inside HTML tags in
messaging preferences include.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../en/includes/messaging-preference-form.inc | 68 +++++++++++++++----
 1 file changed, 55 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
index 7ece6801cd..577f19ac80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
@@ -54,15 +54,29 @@
       [% IF ( messaging_preference.transport_sms ) %]
       [% IF ( SMSSendDriver ) %]<td>
           [% IF ( messaging_form_inactive ) %]
+              [% IF ( messaging_preference.transports_sms ) %]
                  <input type="checkbox"
                  id="sms[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="sms"   [% messaging_preference.transport_sms %] disabled="disabled" />
+                 value="sms" checked="checked" disabled="disabled" />
+              [% ELSE %]
+                 <input type="checkbox"
+                 id="sms[% messaging_preference.message_attribute_id %]"
+                 name="[% messaging_preference.message_attribute_id %]"
+                 value="sms" disabled="disabled" />
+              [% END %]
           [% ELSE %]
+              [% IF ( messaging_preference.transports_sms ) %]
+                 <input type="checkbox"
+                 id="sms[% messaging_preference.message_attribute_id %]"
+                 name="[% messaging_preference.message_attribute_id %]"
+                 value="sms" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% ELSE %]
                  <input type="checkbox"
                  id="sms[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="sms"   [% messaging_preference.transport_sms %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+                 value="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% END %]
           [% END %]
       </td>[% END %]
       [% ELSE %]
@@ -72,15 +86,29 @@
       [% IF ( messaging_preference.transport_email ) %]
       <td>
           [% IF ( messaging_form_inactive ) %]
+              [% IF ( messaging_preference.transports_email ) %]
+                <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" checked="checked" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox"
+                   id="email[% messaging_preference.message_attribute_id %]"
+                   name="[% messaging_preference.message_attribute_id %]"
+                   value="email" disabled="disabled" />
+              [% END %]
+          [% ELSE %]
+              [% IF ( messaging_preference.transports_email ) %]
             <input type="checkbox"
                  id="email[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="email"   [% messaging_preference.transport_email %] disabled="disabled" />
-          [% ELSE %]
+                 value="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% ELSE %]
             <input type="checkbox"
                  id="email[% messaging_preference.message_attribute_id %]"
                  name="[% messaging_preference.message_attribute_id %]"
-                 value="email"   [% messaging_preference.transport_email %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+                 value="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% END %]
           [% END %]
       </td>
       [% ELSE %]
@@ -90,15 +118,29 @@
       [% IF ( messaging_preference.has_digest ) %]
       <td>
           [% IF ( messaging_form_inactive ) %]
-            <input type="checkbox"
-                 id="digest[% messaging_preference.message_attribute_id %]"
-                 value="[% messaging_preference.message_attribute_id %]"
-                 name="digest"   [% messaging_preference.digest %] disabled="disabled" />
+              [% IF ( messaging_preference.digest ) %]
+                <input type="checkbox"
+                     id="digest[% messaging_preference.message_attribute_id %]"
+                     value="[% messaging_preference.message_attribute_id %]"
+                     name="digest" checked="checked" disabled="disabled" />
+              [% ELSE %]
+                <input type="checkbox"
+                     id="digest[% messaging_preference.message_attribute_id %]"
+                     value="[% messaging_preference.message_attribute_id %]"
+                     name="digest" disabled="disabled" />
+              [% END %]
           [% ELSE %]
-            <input type="checkbox"
-                 id="digest[% messaging_preference.message_attribute_id %]"
-                 value="[% messaging_preference.message_attribute_id %]"
-                 name="digest"   [% messaging_preference.digest %] onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% IF ( messaging_preference.digest ) %]
+                <input type="checkbox"
+                     id="digest[% messaging_preference.message_attribute_id %]"
+                     value="[% messaging_preference.message_attribute_id %]"
+                     name="digest" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% ELSE %]
+                <input type="checkbox"
+                     id="digest[% messaging_preference.message_attribute_id %]"
+                     value="[% messaging_preference.message_attribute_id %]"
+                     name="digest" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" />
+              [% END %]
           [% END %]
       </td>
       [% ELSE %]
-- 
2.39.5