Changed codebase to PHP5 with autoloader + added some new classes from the devel-vnext branch

14 files changed, 59 insertions, 81 deletions

diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc
index 47db7197d..e3218a35e 100644
--- a/program/steps/addressbook/edit.inc
+++ b/program/steps/addressbook/edit.inc
@@ -89,7 +89,7 @@ function get_form_tags($attrib)
   $form_start = '';
   if (!strlen($EDIT_FORM))
     {
-    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
     $hiddenfields->add(array('name' => '_action', 'value' => 'save', 'source' => get_input_value('_source', RCUBE_INPUT_GPC)));
     
     if (($result = $CONTACTS->get_result()) && ($record = $result->first()))
@@ -114,8 +114,8 @@ function get_form_tags($attrib)
 
 
 if (!$CONTACTS->get_result() && template_exists('addcontact'))
-  parse_template('addcontact');
+  $OUTPUT->send('addcontact');
 
 // this will be executed if no template for addcontact exists
-parse_template('editcontact');
+$OUTPUT->send('editcontact');
 ?>
\ No newline at end of file
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index b916ad796..28b540ac8 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -19,9 +19,6 @@
 
 */
 
-require_once('include/rcube_contacts.inc');
-require_once('include/rcube_ldap.inc');
-
 // instantiate a contacts object according to the given source
 if (($source = get_input_value('_source', RCUBE_INPUT_GPC)) && isset($CONFIG['ldap_public'][$source]))
   $CONTACTS = new rcube_ldap($CONFIG['ldap_public'][$source]);
@@ -157,7 +154,7 @@ function rcmail_js_contacts_list($result, $prefix='')
     
     // format each col
     foreach ($a_show_cols as $col)
-      $a_row_cols[$col] = $row[$col];
+      $a_row_cols[$col] = Q($row[$col]);
     
     $OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols);
     }
@@ -231,7 +228,7 @@ $OUTPUT->add_handlers(array(
   'addresslist' => 'rcmail_contacts_list',
   'addressframe' => 'rcmail_contact_frame',
   'recordscountdisplay' => 'rcmail_rowcount_display',
-  'searchform' => 'rcmail_search_form'
+  'searchform' => array($OUTPUT, 'search_form')
 ));
 
 ?>
diff --git a/program/steps/error.inc b/program/steps/error.inc
index afe5a28a1..4a151d49c 100644
--- a/program/steps/error.inc
+++ b/program/steps/error.inc
@@ -101,7 +101,7 @@ if (template_exists('error'))
   {
   $OUTPUT->scripts = array();
   $OUTPUT->script_files = array();
-  parse_template('error');
+  $OUTPUT->send('error');
   }
 
 
diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc
index 2cf190358..0ad10313b 100644
--- a/program/steps/mail/addcontact.inc
+++ b/program/steps/mail/addcontact.inc
@@ -19,8 +19,6 @@
 
 */
 
-require_once('include/rcube_contacts.inc');
-
 $done = false;
 
 if (!empty($_POST['_address']))
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index fd3743e2a..aaeca24dd 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -19,9 +19,6 @@
 
 */
 
-require_once('Mail/mimeDecode.php');
-require_once('lib/html2text.inc');
-
 // define constants for message compose mode
 define('RCUBE_COMPOSE_REPLY', 0x0106);
 define('RCUBE_COMPOSE_FORWARD', 0x0107);
@@ -159,14 +156,14 @@ function rcmail_compose_headers($attrib)
       }
         
       $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'tabindex');
-      $field_type = 'textarea';            
+      $field_type = 'html_textarea';
       break;
 
     case 'replyto':
     case 'reply-to':
       $fname = '_replyto';
       $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
-      $field_type = 'textfield';
+      $field_type = 'html_inputfield';
       break;    
   }
  
@@ -231,7 +228,7 @@ function rcmail_compose_headers($attrib)
 
     // create teaxtarea object
     $input = new $field_type($field_attrib);
-    $out = $input->show($fvalue);    
+    $out = $input->show($fvalue);
   }
   
   if ($form_start)
@@ -285,7 +282,7 @@ function rcmail_compose_header_from($attrib)
     $a_signatures = array();
 
     $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
-    $select_from = new select($field_attrib);
+    $select_from = new html_select($field_attrib);
 
     while ($sql_arr = $DB->fetch_assoc($sql_result))
     {
@@ -327,7 +324,7 @@ function rcmail_compose_header_from($attrib)
   }
   else
   {
-    $input_from = new textfield($field_attrib);
+    $input_from = new html_inputfield($field_attrib);
     $out = $input_from->show($_POST['_from']);
   }
   
@@ -419,19 +416,19 @@ function rcmail_compose_body($attrib)
 
   $out = $form_start ? "$form_start\n" : '';
 
-  $saveid = new hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE['headers']->messageID) : ''));
+  $saveid = new html_hiddenfield(array('name' => '_draft_saveid', 'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'), "", $MESSAGE['headers']->messageID) : ''));
   $out .= $saveid->show();
 
-  $drafttoggle = new hiddenfield(array('name' => '_draft', 'value' => 'yes'));
+  $drafttoggle = new html_hiddenfield(array('name' => '_draft', 'value' => 'yes'));
   $out .= $drafttoggle->show();
 
-  $msgtype = new hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
+  $msgtype = new html_hiddenfield(array('name' => '_is_html', 'value' => ($isHtml?"1":"0")));
   $out .= $msgtype->show();
 
   // If desired, set this text area to be editable by TinyMCE
   if ($isHtml)
     $attrib['mce_editable'] = "true";
-  $textarea = new textarea($attrib);
+  $textarea = new html_textarea($attrib);
   $out .= $textarea->show($body);
   $out .= $form_end ? "\n$form_end" : '';
 
@@ -622,7 +619,7 @@ function rcmail_compose_subject($attrib)
   unset($attrib['form']);
   
   $attrib['name'] = '_subject';
-  $textfield = new textfield($attrib);
+  $textfield = new html_inputfield($attrib);
 
   $subject = '';
 
@@ -750,7 +747,7 @@ function rcmail_priority_selector($attrib)
   unset($attrib['form']);
   
   $attrib['name'] = '_priority';
-  $selector = new select($attrib);
+  $selector = new html_select($attrib);
 
   $selector->add(array(rcube_label('lowest'),
                        rcube_label('low'),
@@ -781,7 +778,7 @@ function rcmail_receipt_checkbox($attrib)
 
   $attrib['name'] = '_receipt';
   $attrib['value'] = '1';
-  $checkbox = new checkbox($attrib);
+  $checkbox = new html_checkbox($attrib);
 
   $out = $form_start ? "$form_start\n" : '';
   $out .= $checkbox->show($MESSAGE['headers']->mdn_to ? 1 : 0);
@@ -828,7 +825,7 @@ function rcmail_editor_selector($attrib)
       unset($attrib['checked']);
 
     $attrib['id'] = '_' . $value;
-    $rb = new radiobutton($attrib);
+    $rb = new html_radiobutton($attrib);
     $selector .= sprintf("%s<label for=\"%s\">%s</label>",
                          $rb->show($value),
                          $attrib['id'],
@@ -846,7 +843,7 @@ function get_form_tags($attrib)
   $form_start = '';
   if (!strlen($MESSAGE_FORM))
   {
-    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
     $hiddenfields->add(array('name' => '_action', 'value' => 'send'));
 
     $form_start = empty($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
@@ -862,7 +859,7 @@ function get_form_tags($attrib)
   
   $MESSAGE_FORM = $form_name;
 
-  return array($form_start, $form_end);  
+  return array($form_start, $form_end);
 }
 
 
@@ -881,9 +878,6 @@ $OUTPUT->add_handlers(array(
 
 /****** get contacts for this user and add them to client scripts ********/
 
-require_once('include/rcube_contacts.inc');
-require_once('include/rcube_ldap.inc'); 
-
 $CONTACTS = new rcube_contacts($DB, $USER->ID);
 $CONTACTS->set_pagesize(1000);
 
@@ -928,5 +922,5 @@ if ($a_contacts)
   { 
  	$OUTPUT->set_env('contacts', $a_contacts); 
   } 
-parse_template('compose');
+$OUTPUT->send('compose');
 ?>
\ No newline at end of file
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 393fcaa10..205db2f91 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -19,7 +19,6 @@
 
 */
 
-require_once('lib/html2text.inc');
 require_once('lib/enriched.inc');
 require_once('include/rcube_smtp.inc');
 
@@ -1541,7 +1540,7 @@ $OUTPUT->add_handlers(array(
   'messagecontentframe' => 'rcmail_messagecontent_frame',
   'messagepartframe' => 'rcmail_message_part_frame',
   'messagepartcontrols' => 'rcmail_message_part_controls',
-  'searchform' => 'rcmail_search_form'
+  'searchform' => array($OUTPUT, 'search_form'),
 ));
 
 ?>
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 6aca13101..06c22ec64 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -49,7 +49,7 @@ if ($_GET['_uid'])
 // show part page
 if ($_GET['_frame'])
   {
-  parse_template('messagepart');
+  $OUTPUT->send('messagepart');
   exit;
   }
 
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 5466d710c..2281a9773 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/sendmail.inc                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -21,11 +21,6 @@
 */
 
 
-//require_once('lib/smtp.inc');
-require_once('lib/html2text.inc');
-require_once('lib/rc_mail_mime.inc');
-
-
 if (!isset($_SESSION['compose']['id']))
   {
   rcmail_overwrite_action('list');
@@ -70,7 +65,7 @@ function rcmail_get_identity($id)
  */
 function rcmail_attach_emoticons(&$mime_message)
 {
-  global $CONFIG, $INSTALL_PATH;
+  global $CONFIG;
 
   $htmlContents = $mime_message->getHtmlBody();
 
@@ -100,7 +95,7 @@ function rcmail_attach_emoticons(&$mime_message)
     if (! in_array($image_name, $included_images))
       {
       // add the image to the MIME message
-      $img_file = $INSTALL_PATH . '/' . $searchstr . $image_name;
+      $img_file = INSTALL_PATH . '/' . $searchstr . $image_name;
       if(! $mime_message->addHTMLImage($img_file, 'image/gif', '', true, '_' . $image_name))
         $OUTPUT->show_message("emoticonerror", 'error');
 
@@ -237,7 +232,7 @@ $isHtmlVal = strtolower(get_input_value('_is_html', RCUBE_INPUT_POST));
 $isHtml = ($isHtmlVal == "1");
 
 // create extended PEAR::Mail_mime instance
-$MAIL_MIME = new rc_mail_mime(rcmail_header_delm());
+$MAIL_MIME = new rcube_mail_mime(rcmail_header_delm());
 
 // For HTML-formatted messages, construct the MIME message with both
 // the HTML part and the plain-text part
diff --git a/program/steps/mail/sendmdn.inc b/program/steps/mail/sendmdn.inc
index 530dcac4c..191f950c1 100644
--- a/program/steps/mail/sendmdn.inc
+++ b/program/steps/mail/sendmdn.inc
@@ -19,8 +19,6 @@
 
 */
 
-require_once('lib/rc_mail_mime.inc');
-
 
 if (!empty($_POST['_uid'])) {
   $sent = rcmail_send_mdn(get_input_value('_uid', RCUBE_INPUT_POST));
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 94e4c6105..cc167009f 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -19,9 +19,6 @@
 
 */
 
-require_once('Mail/mimeDecode.php');
-require_once('lib/rc_mail_mime.inc');
-
 $PRINT_MODE = $_action=='print' ? TRUE : FALSE;
 
 // similar code as in program/steps/mail/get.inc
@@ -39,7 +36,7 @@ if ($_GET['_uid'])
     {
     $OUTPUT->show_message('messageopenerror', 'error');
     if ($_action=='preview' && template_exists('messagepreview'))
-        parse_template('messagepreview');
+        $OUTPUT->send('messagepreview');
     else
       {
       $_action = 'list';
@@ -79,14 +76,14 @@ if ($_GET['_uid'])
 
   // mark message as read
   if (!$MESSAGE['headers']->seen)
+  {
+    $marked = $IMAP->set_flag($MESSAGE['UID'], 'SEEN');
+    if($_action == 'preview' && $marked != -1)
     {
-      $marked = $IMAP->set_flag($MESSAGE['UID'], 'SEEN');
-      if($_action == 'preview' && $marked != -1)
-	{
-	$OUTPUT->command('set_unread_count_from_preview', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
-	$OUTPUT->command('mark_as_read_from_preview', $MESSAGE['UID']);
-	}
+      $OUTPUT->command('set_unread_count_from_preview', $mbox_name, $IMAP->messagecount($mbox_name, 'UNSEEN'), ($mbox_name == 'INBOX'));
+      $OUTPUT->command('mark_as_read_from_preview', $MESSAGE['UID']);
     }
+  }
 
   // give message uid to the client
   $OUTPUT->set_env('uid', $MESSAGE['UID']);
@@ -207,9 +204,9 @@ $OUTPUT->add_handlers(array(
 
 
 if ($_action=='print' && template_exists('printmessage'))
-  parse_template('printmessage');
+  $OUTPUT->send('printmessage');
 else if ($_action=='preview' && template_exists('messagepreview'))
-    parse_template('messagepreview');
+    $OUTPUT->send('messagepreview');
 else
-  parse_template('message');
+  $OUTPUT->send('message');
 ?>
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 7497d8a66..7309d4b02 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -130,7 +130,7 @@ function rcube_identity_form($attrib)
 $OUTPUT->add_handler('identityform', 'rcube_identity_form');
 
 if ($_action=='add-identity' && template_exists('addidentity'))
-  parse_template('addidentity');
+  $OUTPUT->send('addidentity');
 
-parse_template('editidentity');
+$OUTPUT->send('editidentity');
 ?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 3edced4b3..81da0a29d 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -50,7 +50,7 @@ function rcmail_user_prefs_form($attrib)
     asort($a_lang);
   
     $field_id = 'rcmfd_lang';
-    $select_lang = new select(array('name' => '_language', 'id' => $field_id));
+    $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
     $select_lang->add(array_values($a_lang), array_keys($a_lang));
   
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
@@ -64,7 +64,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['timezone']))
     {
     $field_id = 'rcmfd_timezone';
-    $select_timezone = new select(array('name' => '_timezone', 'id' => $field_id));
+    $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id));
     $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
     $select_timezone->add('(GMT -10:00) Hawaii', '-10');
     $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
@@ -116,7 +116,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['dst_active']))
     {
     $field_id = 'rcmfd_dst';
-    $input_dst = new checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1));
+    $input_dst = new html_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,
                     Q(rcube_label('dstactive')),
@@ -127,7 +127,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['pagesize']))
     {
     $field_id = 'rcmfd_pgsize';
-    $input_pagesize = new textfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+    $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
 
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
@@ -139,7 +139,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['prettydate']))
     {
     $field_id = 'rcmfd_prettydate';
-    $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+    $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
 
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
@@ -151,7 +151,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['prefer_html']))
     {
     $field_id = 'rcmfd_htmlmsg';
-    $input_pagesize = new checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1));
+    $input_pagesize = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1));
 
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
@@ -163,7 +163,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['htmleditor']))
     {
     $field_id = 'rcmfd_htmleditor';
-    $input_htmleditor = new checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
+    $input_htmleditor = new html_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,
                     Q(rcube_label('htmleditor')),
@@ -174,7 +174,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['preview_pane']))
     {
     $field_id = 'rcmfd_preview';
-    $input_preview = new checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
+    $input_preview = new html_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,
                     Q(rcube_label('previewpane')),
@@ -184,7 +184,7 @@ function rcmail_user_prefs_form($attrib)
   if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['draft_autosave']))
     {
     $field_id = 'rcmfd_autosave';
-    $select_autosave = new select(array('name' => '_draft_autosave', 'id' => $field_id));
+    $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id));
     $select_autosave->add(rcube_label('never'), 0);
     foreach (array(3, 5, 10) as $i => $min)
       $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
@@ -199,7 +199,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['logout_purge']))
     {
     $field_id = 'rcmfd_logout_purge';
-    $input_purge = new checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
+    $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
                     Q(rcube_label('logoutclear')),
@@ -210,7 +210,7 @@ function rcmail_user_prefs_form($attrib)
   if (!isset($no_override['logout_expunge']))
     {
     $field_id = 'rcmfd_logout_expunge';
-    $input_expunge = new checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+    $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
     $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
                     Q(rcube_label('logoutcompact')),
@@ -254,7 +254,7 @@ function get_form_tags($attrib, $action, $add_hidden=array())
   $form_start = '';
   if (!strlen($EDIT_FORM))
     {
-    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
     $hiddenfields->add(array('name' => '_action', 'value' => $action));
     
     if ($add_hidden)
diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc
index 9284e525d..fe53ecc66 100644
--- a/program/steps/settings/identities.inc
+++ b/program/steps/settings/identities.inc
@@ -45,5 +45,5 @@ function rcmail_identity_frame($attrib)
 
 $OUTPUT->add_handler('identityframe', 'rcmail_identity_frame');
 
-parse_template('identities');
+$OUTPUT->send('identities');
 ?>
\ No newline at end of file
diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc
index 9cf188a41..4356c9f33 100644
--- a/program/steps/settings/manage_folders.inc
+++ b/program/steps/settings/manage_folders.inc
@@ -174,7 +174,7 @@ function rcube_subscription_form($attrib)
   $delimiter = $IMAP->get_hierarchy_delimiter();
   $a_js_folders = array();
  
-  $checkbox_subscribe = new checkbox(array('name' => '_subscribed[]', 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)"));
+  $checkbox_subscribe = new html_checkbox(array('name' => '_subscribed[]', 'onclick' => JS_OBJECT_NAME.".command(this.checked?'subscribe':'unsubscribe',this.value)"));
   
   if (!empty($attrib['deleteicon']))
     $del_button = sprintf('<img src="%s%s" alt="%s" border="0" />', $CONFIG['skin_path'], $attrib['deleteicon'], rcube_label('delete'));
@@ -251,12 +251,12 @@ function rcube_create_folder_form($attrib)
   // return the complete edit form as table
   $out = "$form_start\n";
 
-  $input = new textfield(array('name' => '_folder_name'));
+  $input = new html_inputfield(array('name' => '_folder_name'));
   $out .= $input->show();
   
   if (get_boolean($attrib['button']))
     {
-    $button = new input_field(array('type' => 'button',
+    $button = new html_inputfield(array('type' => 'button',
                                     'value' => rcube_label('create'),
                                     'onclick' => JS_OBJECT_NAME.".command('create-folder',this.form)"));
     $out .= $button->show();
@@ -278,7 +278,7 @@ function rcube_rename_folder_form($attrib)
   $out = "$form_start\n";
 
   $a_unsubscribed = $IMAP->list_unsubscribed();
-  $select_folder = new select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
+  $select_folder = new html_select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
 
   foreach ($a_unsubscribed as $i => $folder)
     {
@@ -291,12 +291,12 @@ function rcube_rename_folder_form($attrib)
   $out .= $select_folder->show();
 
   $out .= " to ";
-  $inputtwo = new textfield(array('name' => '_folder_newname'));
+  $inputtwo = new html_inputfield(array('name' => '_folder_newname'));
   $out .= $inputtwo->show();
 
   if (get_boolean($attrib['button']))
     {
-    $button = new input_field(array('type' => 'button',
+    $button = new html_inputfield(array('type' => 'button',
                                     'value' => rcube_label('rename'),
                                     'onclick' => JS_OBJECT_NAME.".command('rename-folder',this.form)"));
     $out .= $button->show();