Changeset 5b821526 in github

Timestamp:

May 1, 2008 8:59:39 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:

7ec922f

Parents:

e090a1a

Message:

• fixed saving preferences after r1344

File:

• program/steps/settings/func.inc (modified) (11 diffs)

program/steps/settings/func.inc

@@ -28 +28 @@
 function rcmail_user_prefs_form($attrib)
   {
-  global $DB, $CONFIG;
-
-  $no_override = is_array($CONFIG['dont_override']) ? array_flip($CONFIG['dont_override']) : array();
+  global $RCMAIL;
+  $config = $RCMAIL->config->all();
+
+  $no_override = is_array($config['dont_override']) ? array_flip($config['dont_override']) : array();
 
   // add some labels to client
@@ -110 +111 @@
                     $field_id,
                     Q(rcube_label('timezone')),
-                    $select_timezone->show((string)$CONFIG['timezone']));
+                    $select_timezone->show((string)$config['timezone']));
     }
 
@@ -121 +122 @@
                     $field_id,
                     Q(rcube_label('dstactive')),
-                    $input_dst->show($CONFIG['dst_active']));
+                    $input_dst->show($config['dst_active']));
     }
 
@@ -133 +134 @@
                     $field_id,
                     Q(rcube_label('pagesize')),
-                    $input_pagesize->show($CONFIG['pagesize']));
+                    $input_pagesize->show($config['pagesize']));
     }
 
@@ -145 +146 @@
                     $field_id,
                     Q(rcube_label('prettydate')),
-                    $input_prettydate->show($CONFIG['prettydate']?1:0));
+                    $input_prettydate->show($config['prettydate']?1:0));
     }
 
@@ -157 +158 @@
                     $field_id,
                     Q(rcube_label('preferhtml')),
-                    $input_pagesize->show($CONFIG['prefer_html']?1:0));
+                    $input_pagesize->show($config['prefer_html']?1:0));
     }
 
@@ -168 +169 @@
                     $field_id,
                     Q(rcube_label('htmleditor')),
-                    $input_htmleditor->show($CONFIG['htmleditor']?1:0));
+                    $input_htmleditor->show($config['htmleditor']?1:0));
     }
 
@@ -179 +180 @@
                     $field_id,
                     Q(rcube_label('previewpane')),
-                    $input_preview->show($CONFIG['preview_pane']?1:0));
+                    $input_preview->show($config['preview_pane']?1:0));
     }
 
   $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
                   
-  if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['draft_autosave']))
+  if (!empty($config['drafts_mbox']) && !isset($no_override['draft_autosave']))
     {
     $field_id = 'rcmfd_autosave';
@@ -195 +196 @@
                     $field_id,
                     Q(rcube_label('autosavedraft')),
-                    $select_autosave->show($CONFIG['draft_autosave']));
+                    $select_autosave->show($config['draft_autosave']));
     }
 
@@ -206 +207 @@
                     $field_id,
                     Q(rcube_label('logoutclear')),
-                    $input_purge->show($CONFIG['logout_purge']?1:0));
+                    $input_purge->show($config['logout_purge']?1:0));
     }
 
@@ -217 +218 @@
                     $field_id,
                     Q(rcube_label('logoutcompact')),
-                    $input_expunge->show($CONFIG['logout_expunge']?1:0));
+                    $input_expunge->show($config['logout_expunge']?1:0));
     }