Dev: Fixed #09293: Quotation marks in email subjects part 2 : for ema…

…il sending too
LimeSurvey · Oct 9, 2014 · 57ec7f6 · 57ec7f6
1 parent 67f20e8
commit 57ec7f6
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/application/views/admin/token/email.php b/application/views/admin/token/email.php
@@ -68,25 +68,24 @@
 
                     <ul>
                         <li><label for='from_<?php echo $language; ?>'><?php $clang->eT("From"); ?>:</label>
-                            <input type='text' size='50' id='from_<?php echo $language; ?>' name='from_<?php echo $language; ?>' value="<?php echo htmlspecialchars($thissurvey[$baselang]['adminname'],ENT_QUOTES,'UTF-8')." <".htmlspecialchars($thissurvey[$baselang]['adminemail'],ENT_QUOTES,'UTF-8').">"; ?>" /></li>
+                            <?php echo CHtml::textField("from_{$language}",$thissurvey[$baselang]['adminname']." <".$thissurvey[$baselang]['adminemail'].">",array('size'=>50)); ?>
+                        </li>
                         <li><label for='subject_<?php echo $language; ?>'><?php $clang->eT("Subject"); ?>:</label>
-                            <input type='text' size='83' id='subject_<?php echo $language; ?>' name='subject_<?php echo $language; ?>' value="<?php echo $subject; ?>" /></li>
+                            <?php echo CHtml::textField("subject_{$language}",$subject,array('size'=>83)); ?>
+                        </li>
 
                         <li><label for='message_<?php echo $language; ?>'><?php $clang->eT("Message"); ?>:</label>
                             <div class="htmleditor">
-                            <textarea name='message_<?php echo $language; ?>' id='message_<?php echo $language; ?>' rows='20' cols='80'><?php echo htmlspecialchars($textarea); ?></textarea>
-                            <?php echo getEditor("email-inv", "message_$language", "[" . $clang->gT("Invitation email:", "js") . "](" . $language . ")", $surveyid, '', '', "tokens"); ?>
+                                <?php echo CHtml::textArea("message_{$language}",$textarea,array('cols'=>80,'rows'=>20)); ?>
+                                <?php echo getEditor("email-inv", "message_$language", "[" . $clang->gT("Invitation email:", "js") . "](" . $language . ")", $surveyid, '', '', "tokens"); ?>
                             </div>
                         </li>
                     </ul></div>
                 <?php } ?>
 
             <p>
                 <label for='bypassbademails'><?php $clang->eT("Bypass token with failing email addresses"); ?>:</label>
-                <select id='bypassbademails' name='bypassbademails'>
-                    <option value='Y'><?php $clang->eT("Yes"); ?></option>
-                    <option value='N'><?php $clang->eT("No"); ?></option>
-                </select>
+                <?php echo CHtml::dropDownList('bypassbademails', 'Y',array("Y"=>gT("Yes"),"N"=>gT("No"))); ?>
             </p>
             <p>
                 <input type='submit' value='<?php $clang->eT("Send Invitations"); ?>' />