diff options
Diffstat (limited to 'program/steps/settings/func.inc')
| -rw-r--r-- | program/steps/settings/func.inc | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index 0b2039a78..486e679c9 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -94,9 +94,9 @@ function rcmail_identities_list($attrib) } // get identities list and define 'mail' column - $list = $RCMAIL->user->list_identities(); + $list = $RCMAIL->user->list_emails(); foreach ($list as $idx => $row) { - $list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_utils::idn_to_utf8($row['email']) .'>'); + $list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_utils::idn_to_utf8($row['email']) . '>'); } // get all identites from DB and define list of cols to be displayed @@ -334,13 +334,10 @@ function rcmail_user_prefs($current = null) $input = new html_radiobutton(array('name'=>'_skin')); foreach ($skins as $skin) { - $thumbnail = "./skins/$skin/thumbnail.png"; - if (!is_file($thumbnail)) - $thumbnail = './program/resources/blank.gif'; - + $thumbnail = "skins/$skin/thumbnail.png"; $skinname = ucfirst($skin); $author_link = $license_link = ''; - $meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true); + $meta = @json_decode(@file_get_contents(INSTALL_PATH . "skins/$skin/meta.json"), true); if (is_array($meta) && $meta['name']) { $skinname = $meta['name']; @@ -348,10 +345,19 @@ function rcmail_user_prefs($current = null) $license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank', 'tabindex' => '-1'), rcube::Q($meta['license'])) : rcube::Q($meta['license']); } + $img = html::img(array( + 'src' => $thumbnail, + 'class' => 'skinthumbnail', + 'alt' => $skin, + 'width' => 64, + 'height' => 64, + 'onerror' => "this.src = rcmail.assets_path('program/resources/blank.gif')", + )); + $skinnames[] = mb_strtolower($skinname); $blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'), html::span('skinitem', $input->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) . - html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) . + html::span('skinitem', $img) . html::span('skinitem', html::span('skinname', rcube::Q($skinname)) . html::br() . html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() . html::span('skinlicense', $license_link ? $RCMAIL->gettext('license').': ' . $license_link : '')) @@ -456,7 +462,7 @@ function rcmail_user_prefs($current = null) $select->add($RCMAIL->gettext('autosend'), 1); $select->add($RCMAIL->gettext('autosendknown'), 3); $select->add($RCMAIL->gettext('autosendknownignore'), 4); - $select->add($RCMAIL->gettext('ignore'), 2); + $select->add($RCMAIL->gettext('ignorerequest'), 2); $blocks['main']['options']['mdn_requests'] = array( 'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('mdnrequests'))), @@ -890,7 +896,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 +1366,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'])); } |