Changeset e2c610e in github

Timestamp:

Sep 21, 2008 3:33:38 AM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

95fcc33

Parents:

f5d3769

Message:

• use more 'html' class

Location:

program/steps

Files:

• addressbook/func.inc (modified) (3 diffs)
• mail/compose.inc (modified) (1 diff)
• mail/func.inc (modified) (3 diffs)
• settings/identities.inc (modified) (1 diff)

program/steps/addressbook/func.inc

@@ -153 +153 @@
     
   $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);
   }
 
@@ -170 +170 @@
   $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());
   }
 
@@ -204 +198 @@
   }
 
+
 $OUTPUT->set_pagetitle(rcube_label('addressbook'));
   

program/steps/mail/compose.inc

@@ -766 +766 @@
 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();
 }
 

program/steps/mail/func.inc

@@ -404 +404 @@
     $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'];
-
-  $out = sprintf('<iframe name="%s"%s></iframe>'."\n",
-         $framename,
-         $attrib_str);
-
-  $OUTPUT->set_env('contentframe', $framename);
+  $attrib['name'] = $attrib['id'];
+
+  $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);
   }
 
@@ -431 +425 @@
   $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());
   }
 
@@ -1141 +1128 @@
   $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);
   }
 

program/steps/settings/identities.inc

@@ -37 +37 @@
   $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);
   }