diff options
| -rw-r--r-- | program/steps/addressbook/func.inc | 13 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 9 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 26 | ||||
| -rw-r--r-- | program/steps/settings/identities.inc | 5 |
4 files changed, 14 insertions, 39 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 98cf29f10..2172f9783 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -152,11 +152,11 @@ function rcmail_contact_frame($attrib) $attrib['id'] = 'rcmcontactframe'; $attrib['name'] = $attrib['id']; - $attrib_str = create_attrib_string($attrib, array('name', 'id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); $OUTPUT->set_env('contentframe', $attrib['name']); $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); - return '<iframe'. $attrib_str . '></iframe>'; + + return html::tag('iframe', $attrib); } @@ -169,13 +169,7 @@ function rcmail_rowcount_display($attrib) $OUTPUT->add_gui_object('countdisplay', $attrib['id']); - // allow the following attributes to be added to the <span> tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id')); - - $out = '<span' . $attrib_str . '>'; - $out .= rcmail_get_rowcount_text(); - $out .= '</span>'; - return $out; + return html::span($attrib, rcmail_get_rowcount_text()); } @@ -203,6 +197,7 @@ function rcmail_get_rowcount_text() return $out; } + $OUTPUT->set_pagetitle(rcube_label('addressbook')); // register UI objects diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 9ff4190ab..830168c24 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -765,11 +765,10 @@ function rcmail_compose_attachment_form($attrib) function rcmail_compose_attachment_field($attrib) { - // allow the following attributes to be added to the <input> tag - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'size')); - - $out = '<input type="file" name="_attachments[]"'. $attrib_str . " />"; - return $out; + $attrib['type'] = 'file'; + $attrib['name'] = '_attachments[]'; + $field = new html_inputfield($attrib); + return $field->show(); } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 3f8114801..446984066 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -403,18 +403,12 @@ function rcmail_messagecontent_frame($attrib) if (empty($attrib['id'])) $attrib['id'] = 'rcmailcontentwindow'; - // allow the following attributes to be added to the <iframe> tag - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); - $framename = $attrib['id']; + $attrib['name'] = $attrib['id']; - $out = sprintf('<iframe name="%s"%s></iframe>'."\n", - $framename, - $attrib_str); - - $OUTPUT->set_env('contentframe', $framename); + $OUTPUT->set_env('contentframe', $attrib['id']); $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif'); - return $out; + return html::tag('iframe', $attrib); } @@ -430,14 +424,7 @@ function rcmail_messagecount_display($attrib) $OUTPUT->add_gui_object('countdisplay', $attrib['id']); - // allow the following attributes to be added to the <span> tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id')); - - - $out = '<span' . $attrib_str . '>'; - $out .= rcmail_get_messagecount_text(); - $out .= '</span>'; - return $out; + return html::span($attrib, rcmail_get_messagecount_text()); } @@ -1140,10 +1127,7 @@ function rcmail_message_part_frame($attrib) $attrib['src'] = Q('./?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING'])); - $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height')); - $out = '<iframe '. $attrib_str . "></iframe>"; - - return $out; + return html::tag('iframe', $attrib); } diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc index e24a5c4a9..9d5af7b22 100644 --- a/program/steps/settings/identities.inc +++ b/program/steps/settings/identities.inc @@ -36,10 +36,7 @@ function rcmail_identity_frame($attrib) $OUTPUT->set_env('contentframe', $attrib['name']); - $attrib_str = create_attrib_string($attrib, array('name', 'id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); - $out = '<iframe'. $attrib_str . '></iframe>'; - - return $out; + return html::tag('iframe', $attrib); } $OUTPUT->add_handler('identityframe', 'rcmail_identity_frame'); |