From 07a641c79f1d6fa6b327d1752a6c2ab76b4e07f6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 16 Nov 2014 08:39:51 -0500
Subject: [PATCH] Code cleanup - unused variables
---
program/steps/settings/edit_folder.inc | 2 ++
program/steps/addressbook/import.inc | 2 +-
program/steps/settings/folders.inc | 1 -
program/steps/mail/compose.inc | 1 -
program/steps/addressbook/func.inc | 4 ++--
program/steps/mail/func.inc | 6 +++---
program/steps/settings/func.inc | 4 ++--
program/steps/settings/edit_response.inc | 3 +--
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 2c22d5a..008d201 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -279,8 +279,8 @@
// 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 5dee5c0..80bae66 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -324,7 +324,7 @@
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 56bc9fb..bfb2fac 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1309,7 +1309,6 @@
}
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 167e309..e33e965 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -647,7 +647,7 @@
*/
function rcmail_messagecontent_frame($attrib)
{
- global $OUTPUT, $RCMAIL;
+ global $OUTPUT;
if (empty($attrib['id']))
$attrib['id'] = 'rcmailcontentwindow';
@@ -1138,7 +1138,7 @@
/**
* 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 @@
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 2025786..f34e3c5 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -298,6 +298,8 @@
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 10dec10..03a6878 100644
--- a/program/steps/settings/edit_response.inc
+++ b/program/steps/settings/edit_response.inc
@@ -79,7 +79,7 @@
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 @@
$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 14e41d6..6db0b17 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -269,7 +269,6 @@
// 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 0b2039a..3ec3185 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -890,7 +890,7 @@
$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 @@
$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']));
}
--
Gitblit v1.9.1