Fixed issue #09293: Quotation marks in email subjects are stripped wh…

…en saved to the database including all following text Dev: use of Yii CHTML
LimeSurvey · Oct 9, 2014 · 67f20e8 · 67f20e8
1 parent a3aca58
commit 67f20e8
Showing 1 changed file with 8 additions and 29 deletions.
diff --git a/application/views/admin/emailtemplates/email_language_template_tab.php b/application/views/admin/emailtemplates/email_language_template_tab.php
@@ -3,37 +3,16 @@
 <ul>
     <li>
         <label for='email_<?php echo $tab; ?>_subj_<?php echo $grouplang; ?>'><?php echo $details['subject'] ?></label>
-
-        <input type='text' size='80' name='<?php echo "email_{$tab}_subj_$grouplang"; ?>' id='<?php echo "email_{$tab}_subj_{$grouplang}"; ?>' value="<?php echo $esrow->{$details['field']['subject']}; ?>" />
-
-        <input 
-            type='button' 
-            value='<?php $clang->eT("Reset"); ?>' 
-            class="fillin"
-            data-target="<?php echo "email_{$tab}_subj_{$grouplang}"; ?>"
-            data-value="<?php echo $details['default']['subject']; ?>"
-        />  
+        <?php echo CHtml::textField("email_{$tab}_subj_{$grouplang}",$esrow->$details['field']['subject'],array('size'=>80)); ?>
+        <?php echo CHtml::button(gT("Reset"),array('class'=>'fillin','data-target'=>"email_{$tab}_subj_{$grouplang}",'data-value'=>$details['default']['subject'])); ?>
     </li>
     <li><label for='email_<?php echo $tab; ?>_<?php echo $grouplang; ?>'><?php echo $details['body']; ?></label>
-        <textarea cols='80' rows='20' name='email_<?php echo $tab; ?>_<?php echo $grouplang; ?>' id='<?php echo "email_{$tab}_{$grouplang}"; ?>'><?php echo htmlspecialchars($esrow->{$details['field']['body']}); ?></textarea>
-       <?php 
-       echo getEditor("email-$tab","email_{$tab}_$grouplang", $details['body'].'('.$grouplang.')',$surveyid,'','','editemailtemplates'); 
-       ?>
-        <input 
-            type='button' 
-            value='<?php $clang->eT("Reset"); ?>' 
-            class="fillin"
-            data-target="<?php echo "email_{$tab}_{$grouplang}"; ?>"
-            data-value="<?php 
-            if ($tab=='admin_detailed_notification'){
-                echo htmlspecialchars($details['default']['body'],ENT_QUOTES); 
-            }
-            else
-            {
-                echo htmlspecialchars(conditionalNewlineToBreak($details['default']['body'],$ishtml),ENT_QUOTES); 
-            }
-            ?>"
-        />
+        <?php echo CHtml::textArea("email_{$tab}_{$grouplang}",$esrow->$details['field']['body'],array('cols'=>80,'rows'=>20)); ?>
+        <?php echo getEditor("email-$tab","email_{$tab}_$grouplang", $details['body'].'('.$grouplang.')',$surveyid,'','','editemailtemplates'); ?>
+        <?php 
+            $details['default']['body']=($tab=='admin_detailed_notification') ? $details['default']['body'] : conditionalNewlineToBreak($details['default']['body'],$ishtml) ;
+            echo CHtml::button(gT("Reset"),array('class'=>'fillin','data-target'=>"email_{$tab}_{$grouplang}",'data-value'=>$details['default']['body']));
+        ?>
     </li>
     <li>
         <label for="attachments_<?php echo "{$grouplang}-{$tab}"; ?>"><?php echo $details['attachments']; ?></label>