From 47124c2279382714afd8dbe4a867a867ea179199 Mon Sep 17 00:00:00 2001 From: thomascube Date: Sat, 12 Apr 2008 13:54:45 +0000 Subject: Changed codebase to PHP5 with autoloader + added some new classes from the devel-vnext branch --- program/steps/settings/edit_identity.inc | 4 ++-- program/steps/settings/func.inc | 24 ++++++++++++------------ program/steps/settings/identities.inc | 2 +- program/steps/settings/manage_folders.inc | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'program/steps/settings') 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("%s\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("%s\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("%s\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("%s\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("%s\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("%s\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("%s\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("%s\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("%s\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('%s', $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(); -- cgit v1.2.3