From 3b6b91ad1e6ba80b28617cbf1e328cc8ed28b265 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 15 Jun 2008 05:25:19 -0400
Subject: [PATCH] - lost files from r1539 

---
 program/steps/settings/func.inc |  419 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 302 insertions(+), 117 deletions(-)

diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 4e1e345..4921906 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -5,7 +5,7 @@
  | program/steps/settings/func.inc                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -19,140 +19,299 @@
 
 */
 
-
-// get user record
-$sql_result = $DB->query(sprintf("SELECT username, mail_host FROM %s
-                                  WHERE  user_id=%d",
-                                 get_table_name('users'),
-                                 $_SESSION['user_id']));
-                                 
-if ($USER_DATA = $DB->fetch_assoc($sql_result))
-  $PAGE_TITLE = sprintf('%s %s@%s', rcube_label('settingsfor'), $USER_DATA['username'], $USER_DATA['mail_host']);
-
+if (!$OUTPUT->ajax_call)
+  $OUTPUT->set_pagetitle(rcube_label('preferences'));
 
 
 function rcmail_user_prefs_form($attrib)
   {
-  global $DB, $CONFIG, $sess_user_lang;
+  global $RCMAIL;
+  $config = $RCMAIL->config->all();
 
+  $no_override = is_array($config['dont_override']) ? array_flip($config['dont_override']) : array();
+
+  // add some labels to client
+  rcube_add_label('nopagesizewarning');
+  
   list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');
   unset($attrib['form']);
 
   // allow the following attributes to be added to the <table> tag
   $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
 
-  // return the complete edit form as table
-  $out = "$form_start<table" . $attrib_str . ">\n\n";
+  // return the complete edit form as tables
+  $out = "$form_start<fieldset><legend>" . Q(rcube_label('uisettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
 
-  $a_show_cols = array('language'   => array('type' => 'text'),
-                       'pagesize'   => array('type' => 'text'),
-                       'timezone'   => array('type' => 'text'),
-                       'prettydate' => array('type' => 'text'));
-                       
   // show language selection
-  $field_id = 'rcmfd_lang';
-  $select_lang = new select(array('name' => '_language', 'id' => $field_id));
-  // $select_lang->add('Czech', 'cs');
-  $select_lang->add('Dansk', 'da');
-  $select_lang->add('Deutsch', 'de');
-  $select_lang->add('English', 'en');
-  $select_lang->add('Espanol', 'es');
-  $select_lang->add('Fran&ccedil;ais', 'fr');
-  $select_lang->add('Italiano', 'it');
-  $select_lang->add('Nederlands', 'nl');
-
-  $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')),
-                  $select_lang->show($sess_user_lang));
+  if (!isset($no_override['language']))
+    {
+    $a_lang = $RCMAIL->list_languages();
+    asort($a_lang);
+  
+    $field_id = 'rcmfd_lang';
+    $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",
+                    $field_id,
+                    Q(rcube_label('language')),
+                    $select_lang->show($_SESSION['language']));
+    }
 
 
   // show page size selection
-  $field_id = 'rcmfd_timezone';
-  $select_timezone = new 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:00) Alaska', '-9');
-  $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
-  $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
-  $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
-  $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
-  $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), Caracas, La Paz', '-4');
-  $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
-  $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
-  $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
-  $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
-  $select_timezone->add('(GMT +1:00) Central European Time', '1');
-  $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
-  $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
-  $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
-  $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
-  $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
-  $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
-  $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
-  $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
-  $select_timezone->add('(GMT +10:00) EAST/AEST: Guam, Vladivostok', '10');
-  $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
-  $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
-  $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
-  $select_timezone->add('(GMT +14:00) Kiribati', '14');
+  if (!isset($no_override['timezone']))
+    {
+    $field_id = 'rcmfd_timezone';
+    $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');
+    $select_timezone->add('(GMT -9:00) Alaska', '-9');
+    $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
+    $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
+    $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
+    $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
+    $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
+    $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
+    $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
+    $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+    $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
+    $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
+    $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
+    $select_timezone->add('(GMT +1:00) Central European Time', '1');
+    $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
+    $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
+    $select_timezone->add('(GMT +3:30) Tehran', '3.5');
+    $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
+    $select_timezone->add('(GMT +4:30) Kabul', '4.5');
+    $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
+    $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
+    $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
+    $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
+    $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
+    $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
+    $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
+    $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
+    $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
+    $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
+    $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
+    $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
+    $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
+    $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
+    $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
+    $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
+    $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
+    $select_timezone->add('(GMT +14:00) Kiribati', '14');
   
-  
-  $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')),
-                  $select_timezone->show($CONFIG['timezone']));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('timezone')),
+                    $select_timezone->show((string)$config['timezone']));
+    }
 
-
-  // show page size selection
-  $field_id = 'rcmfd_pgsize';
-  $input_pagesize = new textfield(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,
-                  rep_specialchars_output(rcube_label('pagesize')),
-                  $input_pagesize->show($CONFIG['pagesize']));
-
-  // show checkbox for HTML/plaintext messages
-  $field_id = 'rcmfd_htmlmsg';
-  $input_pagesize = new 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,
-                  rep_specialchars_output(rcube_label('preferhtml')),
-                  $input_pagesize->show($CONFIG['prefer_html']?1:0));
+  // daylight savings
+  if (!isset($no_override['dst_active']))
+    {
+    $field_id = 'rcmfd_dst';
+    $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')),
+                    $input_dst->show($config['dst_active']));
+    }
 
   // MM: Show checkbox for toggling 'pretty dates' 
-  $field_id = 'rcmfd_prettydate';
-  $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+  if (!isset($no_override['prettydate']))
+    {
+    $field_id = 'rcmfd_prettydate';
+    $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,
-                  rep_specialchars_output(rcube_label('prettydate')),
-                  $input_prettydate->show($CONFIG['prettydate']?1:0));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('prettydate')),
+                    $input_prettydate->show($config['prettydate']?1:0));
+    }
 
+  // show page size selection
+  if (!isset($no_override['pagesize']))
+    {
+    $field_id = 'rcmfd_pgsize';
+    $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
 
-  $out .= "\n</table>$form_end";
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('pagesize')),
+                    $input_pagesize->show($config['pagesize']));
+    }
+
+  // show drop-down for available skins
+  if (!isset($no_override['skin']))
+    {
+    $skins = rcmail_get_skins();
+
+    if (count($skins) > 1)
+      {
+      $field_id = 'rcmfd_skin';
+      $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
+      
+      foreach($skins as $skin)
+        $input_skin->add($skin, $skin);
+
+      $out .= sprintf("<tr><td class=\"title\"><lable for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+		    $field_id,
+		    Q(rcube_label('skin')),
+		    $input_skin->show($config['skin']));
+      }
+    }
+
+  $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('mailboxview')) . "</legend>\n<table" . $attrib_str . ">\n\n";
+
+  // show config parameter for preview pane
+  if (!isset($no_override['preview_pane']))
+    {
+    $field_id = 'rcmfd_preview';
+    $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')),
+                    $input_preview->show($config['preview_pane']?1:0));
+    }
+
+  if (!isset($no_override['mdn_requests']))
+    {
+    $field_id = 'rcmfd_mdn_requests';
+    $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
+    $select_mdn_requests->add(rcube_label('askuser'), 0);
+    $select_mdn_requests->add(rcube_label('autosend'), 1);
+    $select_mdn_requests->add(rcube_label('ignore'), 2);
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('mdnrequests')),
+                    $select_mdn_requests->show($config['mdn_requests']));
+    }
+
+  $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('messagesdisplaying')) . "</legend>\n<table" . $attrib_str . ">\n\n";
+
+  // show checkbox for HTML/plaintext messages
+  if (!isset($no_override['prefer_html']))
+    {
+    $field_id = 'rcmfd_htmlmsg';
+    $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
+	'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('preferhtml')),
+                    $input_preferhtml->show($config['prefer_html']?1:0));
+    }
+
+  // show checkbox for displaying images from people in the addressbook
+  if (!isset($no_override['addrbook_show_images']))
+    {
+    $field_id = 'rcmfd_addrbook_show_images';
+    $input_addrbook_show_images = new html_checkbox(array('name' => '_addrbook_show_images', 'id' => $field_id, 
+	'value' => 1, 'disabled' => $config['prefer_html']?0:1));
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('showknownimages')),
+                    $input_addrbook_show_images->show($config['addrbook_show_images']?1:0));
+    }
+
+  if (!isset($no_override['inline_images']))
+    {
+    $field_id = 'rcmfd_inline_images';
+    $input_inline_images = new html_checkbox(array('name' => '_inline_images', '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('showinlineimages')),
+                    $input_inline_images->show($config['inline_images']?1:0));
+    }
+
+  $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('messagescomposition')) . "</legend>\n<table" . $attrib_str . ">\n\n";
+
+  // Show checkbox for HTML Editor
+  if (!isset($no_override['htmleditor']))
+    {
+    $field_id = 'rcmfd_htmleditor';
+    $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')),
+                    $input_htmleditor->show($config['htmleditor']?1:0));
+    }
+                  
+  if (!empty($config['drafts_mbox']) && !isset($no_override['draft_autosave']))
+    {
+    $field_id = 'rcmfd_autosave';
+    $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);
+
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('autosavedraft')),
+                    $select_autosave->show($config['draft_autosave']));
+    }
+
+  $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
+
+  if (!isset($no_override['read_when_deleted']))
+    {
+    $field_id = 'rcmfd_read_deleted';
+    $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', '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('readwhendeleted')),
+                    $input_readdeleted->show($config['read_when_deleted']?1:0));
+    }
+
+  if (!isset($no_override['flag_for_deletion']))
+    {
+    $field_id = 'rcmfd_flag_for_deletion';
+    $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', '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('flagfordeletion')),
+                    $input_flagfordeletion->show($config['flag_for_deletion']?1:0));
+    }
+
+  // Trash purging on logout
+  if (!isset($no_override['logout_purge']))
+    {
+    $field_id = 'rcmfd_logout_purge';
+    $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')),
+                    $input_purge->show($config['logout_purge']?1:0));
+    }
+
+  // INBOX compacting on logout
+  if (!isset($no_override['logout_expunge']))
+    {
+    $field_id = 'rcmfd_logout_expunge';
+    $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')),
+                    $input_expunge->show($config['logout_expunge']?1:0));
+    }
+
+  $out .= "\n</table></fieldset>$form_end";
 
   return $out;  
   }
 
 
 
-
 function rcmail_identities_list($attrib)
   {
-  global $DB, $CONFIG, $OUTPUT, $JS_OBJECT_NAME;
-
-
-  // get contacts from DB
-  $sql_result = $DB->query(sprintf("SELECT * FROM %s
-                                    WHERE  del!='1'
-                                    AND    user_id=%d
-                                    ORDER BY `default` DESC, name ASC",
-                                   get_table_name('identities'),
-                                   $_SESSION['user_id']));
-
+  global $OUTPUT, $USER;
 
   // add id to message list table if not specified
   if (!strlen($attrib['id']))
@@ -162,11 +321,10 @@
   $a_show_cols = array('name', 'email', 'organization', 'reply-to');
 
   // create XHTML table  
-  $out = rcube_table_output($attrib, $sql_result, $a_show_cols, 'identity_id');
+  $out = rcube_table_output($attrib, $USER->list_identities(), $a_show_cols, 'identity_id');
   
   // set client env
-  $javascript = sprintf("%s.gui_object('identitieslist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
-  $OUTPUT->add_script($javascript);    
+  $OUTPUT->add_gui_object('identitieslist', $attrib['id']);
 
   return $out;
   }
@@ -176,22 +334,18 @@
 // similar function as in /steps/addressbook/edit.inc
 function get_form_tags($attrib, $action, $add_hidden=array())
   {
-  global $OUTPUT, $JS_OBJECT_NAME, $EDIT_FORM, $SESS_HIDDEN_FIELD;  
+  global $EDIT_FORM, $RCMAIL;
 
   $form_start = '';
   if (!strlen($EDIT_FORM))
     {
-    $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task']));
+    $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
     $hiddenfields->add(array('name' => '_action', 'value' => $action));
     
     if ($add_hidden)
       $hiddenfields->add($add_hidden);
     
-    if ($_GET['_framed'] || $_POST['_framed'])
-      $hiddenfields->add(array('name' => '_framed', 'value' => 1));
-    
-    $form_start = !strlen($attrib['form']) ? '<form name="form" action="./" method="post">' : '';
-    $form_start .= "\n$SESS_HIDDEN_FIELD\n";
+    $form_start = !strlen($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
     $form_start .= $hiddenfields->show();
     }
     
@@ -199,12 +353,43 @@
   $form_name = strlen($attrib['form']) ? $attrib['form'] : 'form';
 
   if (!strlen($EDIT_FORM))
-    $OUTPUT->add_script("$JS_OBJECT_NAME.gui_object('editform', '$form_name');");
+    $RCMAIL->output->add_gui_object('editform', $form_name);
   
   $EDIT_FORM = $form_name;
 
-  return array($form_start, $form_end);  
+  return array($form_start, $form_end);
+  }
+
+function rcmail_get_skins()
+  {
+  $path = 'skins';
+  $skins = array();
+
+  $dir = opendir($path);
+  
+  if (!$dir)
+	return false;
+  
+  while (($file = readdir($dir)) !== false)
+    {
+    $filename = $path.'/'.$file;
+    if (is_dir($filename) && is_readable($filename) 
+	&& !in_array($file, array('.', '..', '.svn')))
+      $skins[] = $file;
+    }
+
+  closedir($dir);
+
+  return $skins;
   }
 
 
-?>
\ No newline at end of file
+// register UI objects
+$OUTPUT->add_handlers(array(
+  'userprefs' => 'rcmail_user_prefs_form',
+  'identitieslist' => 'rcmail_identities_list',
+  'itentitieslist' => 'rcmail_identities_list'  // keep this for backward compatibility
+));
+
+
+?>

--
Gitblit v1.9.1