From: <pdo...@us...> - 2007-02-07 23:19:38
|
Revision: 12241 http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12241&view=rev Author: pdontthink Date: 2007-02-07 15:19:21 -0800 (Wed, 07 Feb 2007) Log Message: ----------- Onclick handler should not be submitted as HTML but only as the onclick contents - fixed. Modified Paths: -------------- trunk/squirrelmail/src/read_body.php trunk/squirrelmail/templates/default/read_menubar_buttons.tpl trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl Modified: trunk/squirrelmail/src/read_body.php =================================================================== --- trunk/squirrelmail/src/read_body.php 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/src/read_body.php 2007-02-07 23:19:21 UTC (rev 12241) @@ -563,7 +563,7 @@ $compose_height = '550'; } if ( checkForJavascript() ) { - $on_click=' onclick="comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')"'; + $on_click='comp_in_new_form(\''.$comp_uri.'\', this, this.form,'. $compose_width .',' . $compose_height .')'; $comp_uri = 'javascript:void(0)'; $method='get'; $onsubmit = 'return false'; Modified: trunk/squirrelmail/templates/default/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/templates/default/read_menubar_buttons.tpl 2007-02-07 23:19:21 UTC (rev 12241) @@ -23,7 +23,7 @@ * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. - * $on_click - Onclick event string for all buttons + * $button_onclick - Onclick event string for all buttons * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments * has been enabled. * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for @@ -87,18 +87,18 @@ <?php if ($can_resume_draft) { ?> - <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } elseif ($can_edit_as_new) { ?> - <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } ?> - <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> /> - <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" /> + <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" onclick="<?php echo $button_onclick; ?>" /> | - <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php if ($forward_as_attachment_enabled) { ?> Modified: trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl =================================================================== --- trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-07 20:49:21 UTC (rev 12240) +++ trunk/squirrelmail/templates/default_advanced/read_menubar_buttons.tpl 2007-02-07 23:19:21 UTC (rev 12241) @@ -23,7 +23,7 @@ * $form_onsubmit - The value of the <form>'s onsubmit handler (optional, may be blank) * $compose_href - Base URL to forward, reply, etc. Note that a specific action * must also be given by the form or in this URL. - * $on_click - Onclick event string for all buttons + * $button_onclick - Onclick event string for all buttons * $forward_as_attachment_enabled - boolean TRUE if forwarding as attachments * has been enabled. * $can_resume_draft - boolean TRUE if the "resume draft" is legitimate for @@ -103,18 +103,18 @@ <?php if ($can_resume_draft) { ?> - <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_draft" value="<?php echo _("Resume Draft"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } elseif ($can_edit_as_new) { ?> - <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_edit_new" value="<?php echo _("Edit Message as New"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php } ?> - <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" <?php echo $button_onclick; ?> /> - <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_reply" value="<?php echo _("Reply"); ?>" onclick="<?php echo $button_onclick; ?>" /> + <input type="submit" name="smaction_reply_all" value="<?php echo _("Reply All"); ?>" onclick="<?php echo $button_onclick; ?>" /> | - <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" <?php echo $button_onclick; ?> /> + <input type="submit" name="smaction_forward" value="<?php echo _("Forward"); ?>" onclick="<?php echo $button_onclick; ?>" /> <?php if ($forward_as_attachment_enabled) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |