diff options
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/edit_identity.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 18 | ||||
| -rw-r--r-- | program/steps/settings/manage_folders.inc | 18 |
3 files changed, 19 insertions, 19 deletions
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index 1ea8947b7..5fa531a11 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -127,7 +127,7 @@ function rcube_identity_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $attrib['id'], - rep_specialchars_output(rcube_label($label)), + Q(rcube_label($label)), $value); } diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 91f2f9080..e51f6838e 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -60,7 +60,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('language')), + Q(rcube_label('language')), $select_lang->show($sess_user_lang)); } @@ -106,7 +106,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('timezone')), + Q(rcube_label('timezone')), $select_timezone->show($CONFIG['timezone'])); } @@ -117,7 +117,7 @@ function rcmail_user_prefs_form($attrib) $input_dst = new checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1)); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('dstactive')), + Q(rcube_label('dstactive')), $input_dst->show($CONFIG['dst_active'])); } @@ -129,7 +129,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('pagesize')), + Q(rcube_label('pagesize')), $input_pagesize->show($CONFIG['pagesize'])); } @@ -141,7 +141,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('prettydate')), + Q(rcube_label('prettydate')), $input_prettydate->show($CONFIG['prettydate']?1:0)); } @@ -153,7 +153,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('preferhtml')), + Q(rcube_label('preferhtml')), $input_pagesize->show($CONFIG['prefer_html']?1:0)); } @@ -164,7 +164,7 @@ function rcmail_user_prefs_form($attrib) $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1)); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('htmleditor')), + Q(rcube_label('htmleditor')), $input_htmleditor->show($CONFIG['htmleditor']?1:0)); } @@ -175,7 +175,7 @@ function rcmail_user_prefs_form($attrib) $input_preview = new checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1)); $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('previewpane')), + Q(rcube_label('previewpane')), $input_preview->show($CONFIG['preview_pane']?1:0)); } @@ -189,7 +189,7 @@ function rcmail_user_prefs_form($attrib) $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", $field_id, - rep_specialchars_output(rcube_label('autosavedraft')), + Q(rcube_label('autosavedraft')), $select_autosave->show($CONFIG['draft_autosave'])); } diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index 5f2da4e7f..8abd2c3b6 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -52,8 +52,8 @@ else if ($_action=='create-folder') if ($create && $REMOTE_REQUEST) { $commands = sprintf("this.add_folder_row('%s','%s')", - rep_specialchars_output($create, 'js'), - rep_specialchars_output(rcube_charset_convert($create, 'UTF-7'), 'js')); + JQ($create), + JQ(rcube_charset_convert($create, 'UTF-7'))); rcube_remote_response($commands); } else if (!$create && $REMOTE_REQUEST) @@ -74,9 +74,9 @@ else if ($_action=='rename-folder') if ($rename && $REMOTE_REQUEST) { $commands = sprintf("this.replace_folder_row('%s','%s','%s');\n", - rep_specialchars_output(get_input_value('_folder_oldname', RCUBE_INPUT_GET), 'js'), - rep_specialchars_output($rename, 'js'), - rep_specialchars_output(rcube_charset_convert($rename, 'UTF-7'), 'js')); + JQ(get_input_value('_folder_oldname', RCUBE_INPUT_GET)), + JQ($rename), + JQ(rcube_charset_convert($rename, 'UTF-7'))); $commands .= "this.reset_folder_rename();\n"; @@ -100,7 +100,7 @@ else if ($_action=='delete-folder') if ($REMOTE_REQUEST && $deleted) { - $commands = sprintf("this.remove_folder_row('%s');\n", rep_specialchars_output(get_input_value('_mboxes', RCUBE_INPUT_GET), 'js')); + $commands = sprintf("this.remove_folder_row('%s');\n", JQ(get_input_value('_mboxes', RCUBE_INPUT_GET))); $commands .= show_message('folderdeleted', 'confirmation'); rcube_remote_response($commands); } @@ -165,8 +165,8 @@ function rcube_subscription_form($attrib) $subscribed = in_array($folder, $a_subscribed); $protected = ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders'])); $zebra_class = $i%2 ? 'even' : 'odd'; - $folder_js = rep_specialchars_output($folder, 'js'); - $folder_js_enc = rep_specialchars_output(rcube_charset_convert($folder, 'UTF-7'), 'js'); + $folder_js = JQ($folder); + $folder_js_enc = JQ(rcube_charset_convert($folder, 'UTF-7')); $folder_html = $CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders']) ? rcube_label(strtolower($folder)) : rcube_charset_convert($folder, 'UTF-7'); if (!$protected) @@ -175,7 +175,7 @@ function rcube_subscription_form($attrib) $out .= sprintf('<tr id="rcmrow%d" class="%s"><td>%s</td>', $i+1, $zebra_class, - rep_specialchars_output($folder_html, 'html', 'all')); + Q($folder_html)); if ($protected) $out .= '<td> '.($subscribed ? '•' : '-').'</td>'; |