Code cleanup - unused variables

8 files changed, 11 insertions, 12 deletions

diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 2c22d5a47..008d20174 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -279,8 +279,8 @@ function rcmail_savedsearch_list($attrib)
 
     // Saved searches
     $sources = $RCMAIL->user->list_searches(rcube_user::SEARCH_ADDRESSBOOK);
-    foreach ($sources as $j => $source) {
-        $id = $source['id'];
+    foreach ($sources as $source) {
+        $id    = $source['id'];
         $js_id = rcube::JQ($id);
 
         // set class name(s)
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index 5dee5c06a..80bae662c 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -324,7 +324,7 @@ function rcmail_import_buttons($attrib)
 function rcmail_import_group_id($group_name, $CONTACTS, $create, &$import_groups)
 {
     $group_id = 0;
-    foreach ($import_groups as $key => $group) {
+    foreach ($import_groups as $group) {
         if (strtolower($group['name']) == strtolower($group_name)) {
             $group_id = $group['ID'];
             break;
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 56bc9fb9f..bfb2fac75 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1309,7 +1309,6 @@ function rcmail_write_forward_attachments()
         }
         else {
             $data = $storage->get_raw_body($message->uid);
-            $curr_mem += $message->size;
         }
 
         $attachment = array(
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 167e30927..e33e965bd 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -647,7 +647,7 @@ function rcmail_message_list_head($attrib, $a_show_cols)
  */
 function rcmail_messagecontent_frame($attrib)
 {
-    global $OUTPUT, $RCMAIL;
+    global $OUTPUT;
 
     if (empty($attrib['id']))
         $attrib['id'] = 'rcmailcontentwindow';
@@ -1138,7 +1138,7 @@ function rcmail_localized_priority($value)
 /**
  * return block to show full message headers
  */
-function rcmail_message_full_headers($attrib, $headers=NULL)
+function rcmail_message_full_headers($attrib)
 {
     global $OUTPUT, $RCMAIL;
 
@@ -2051,7 +2051,7 @@ function rcmail_search_filter($attrib)
     return $out;
 }
 
-function rcmail_message_error($uid=null)
+function rcmail_message_error()
 {
     global $RCMAIL;
 
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']));
         }