summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/edit_folder.inc2
-rw-r--r--program/steps/settings/edit_response.inc3
-rw-r--r--program/steps/settings/folders.inc1
-rw-r--r--program/steps/settings/func.inc4
4 files changed, 5 insertions, 5 deletions
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 202578676..f34e3c550 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -298,6 +298,8 @@ function rcmail_folder_form($attrib)
function rcmail_get_form_part($form, $attrib = array())
{
+ global $RCMAIL;
+
$content = '';
if (is_array($form['content']) && !empty($form['content'])) {
diff --git a/program/steps/settings/edit_response.inc b/program/steps/settings/edit_response.inc
index 10dec1096..03a6878be 100644
--- a/program/steps/settings/edit_response.inc
+++ b/program/steps/settings/edit_response.inc
@@ -79,7 +79,7 @@ $OUTPUT->send('responseedit');
function rcube_response_form($attrib)
{
- global $RCMAIL, $OUTPUT, $RESPONSE_RECORD;
+ global $RCMAIL, $RESPONSE_RECORD;
// Set form tags and hidden fields
$disabled = !empty($RESPONSE_RECORD['static']);
@@ -91,7 +91,6 @@ function rcube_response_form($attrib)
$out = "$form_start\n";
$table = new html_table(array('cols' => 2));
- $label = $RCMAIL->gettext('responsename');
$table->add('title', html::label('ffname', rcube::Q($RCMAIL->gettext('responsename'))));
$table->add(null, rcube_output::get_edit_field('name', $RESPONSE_RECORD['name'],
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 14e41d607..6db0b17e8 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -269,7 +269,6 @@ function rcmail_subscription_form($attrib)
// create list of available folders
foreach ($list_folders as $i => $folder) {
- $idx = $i + 1;
$sub_key = array_search($folder['id'], $a_subscribed);
$subscribed = $sub_key !== false;
$protected = $protect_default && isset($special_folders[$folder['id']]);
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 0b2039a78..3ec318566 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -890,7 +890,7 @@ function rcmail_user_prefs($current = null)
$select_default_font->add('', '');
$fonts = rcmail::font_defs();
- foreach ($fonts as $fname => $font) {
+ foreach (array_keys($fonts) as $fname) {
$select_default_font->add($fname, $fname);
}
@@ -1360,7 +1360,7 @@ function rcmail_settings_tabs($attrib)
$tagname = $attrib['tagname'];
$tabs = array();
- foreach ($plugin['actions'] as $k => $action) {
+ foreach ($plugin['actions'] as $action) {
if (!$action['command'] && !$action['href'] && $action['action']) {
$action['href'] = $RCMAIL->url(array('_action' => $action['action']));
}