diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-05-06 12:07:05 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-05-06 12:08:13 +0200 |
| commit | 78c270c9f259c33b703cfb26b96b8dbb062db21e (patch) | |
| tree | 201579445599534a703482ae7fd65be9011f397c /program/steps/addressbook | |
| parent | e4f288c3fe8cba1e271d346ec393c02db0793773 (diff) | |
Fix bugs caught by static analysis
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/import.inc | 4 | ||||
| -rw-r--r-- | program/steps/addressbook/show.inc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 5f6a9671c..cd8182eea 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -167,7 +167,7 @@ function rcmail_set_sourcename($abook) // get address book name (for display) if ($abook && $_SESSION['addressbooks_count'] > 1) { $name = $abook->get_name(); - if (!$name && $source == 0) { + if (!$name) { $name = rcube_label('personaladrbook'); } $OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8')); diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc index 72da15078..915aac884 100644 --- a/program/steps/addressbook/import.inc +++ b/program/steps/addressbook/import.inc @@ -88,7 +88,7 @@ function rcmail_import_confirm($attrib) $content = html::p(null, rcube_label(array( 'name' => 'importconfirm', - 'nr' => $IMORT_STATS->inserted, + 'nr' => $IMPORT_STATS->inserted, 'vars' => $vars, )) . ($IMPORT_STATS->names ? ':' : '.')); @@ -98,7 +98,7 @@ function rcmail_import_confirm($attrib) if ($IMPORT_STATS->skipped) { $content .= html::p(null, rcube_label(array( 'name' => 'importconfirmskipped', - 'nr' => $IMORT_STATS->skipped, + 'nr' => $IMPORT_STATS->skipped, 'vars' => $vars, )) . ':'); $content .= html::p('em', join(', ', array_map('Q', $IMPORT_STATS->skipped_names))); diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 16be89f94..d583a6d36 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.inc @@ -223,7 +223,7 @@ function rcmail_contact_record_groups($contact_id) } $hiddenfields = new html_hiddenfield(array('name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC))); - $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID'])); + $hiddenfields->add(array('name' => '_cid', 'value' => $contact_id)); $form_start = $RCMAIL->output->request_form(array( 'name' => "form", 'method' => "post", |