githubFork/roundcubemail.git

			@@ -94,9 +94,9 @@
			}

			// 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
			@@ -220,7 +220,7 @@
			foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
			try {
			$tz = new DateTimeZone($tzs);
			$date = new DateTime('2012-12-21', $tz);
			$date = new DateTime(date('Y') . '-12-21', $tz);
			$offset = $date->format('Z') + 45000;
			$sortkey = sprintf('%06d.%s', $offset, $tzs);
			$zones[$sortkey] = array($tzs, $date->format('P'));
			@@ -334,13 +334,10 @@
			$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 @@
			$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 @@
			$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 @@
			$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);
			}

			@@ -915,6 +921,20 @@
			$blocks['main']['options']['reply_all_mode'] = array(
			'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('replyallmode'))),
			'content' => $select->show(intval($config['reply_all_mode'])),
			);
			}

			if (!isset($no_override['compose_save_localstorage'])) {
			if (!$current) {
			continue 2;
			}

			$field_id = 'rcmfd_compose_save_localstorage';
			$input = new html_checkbox(array('name' => '_compose_save_localstorage', 'id' => $field_id, 'value' => 1));

			$blocks['advanced']['options']['compose_save_localstorage'] = array(
			'title' => html::label($field_id, rcube::Q($RCMAIL->gettext('savelocalstorage'))),
			'content' => $input->show($config['compose_save_localstorage']?1:0),
			);
			}

			@@ -1302,23 +1322,20 @@
			$protect_folders = $RCMAIL->config->get('protect_default_folders');
			$storage = $RCMAIL->get_storage();
			$delimiter = $storage->get_hierarchy_delimiter();
			$name_utf8 = rcube_charset::convert($name, 'UTF7-IMAP');
			$protected = $protect_folders && $storage->is_special_folder($name);

			$name_utf8 = rcube_charset::convert($name, 'UTF7-IMAP');
			$protected = $protect_folders && $storage->is_special_folder($name);
			$foldersplit = explode($delimiter, $storage->mod_folder($name));
			$level = count($foldersplit) - 1;
			$display_name = str_repeat('    ', $level)
			. rcube::Q($protected ? $RCMAIL->localize_foldername($name) : rcube_charset::convert($foldersplit[$level], 'UTF7-IMAP'));

			$class_name = trim($class_name . ' listitem');
			$display_name = $protected ? $RCMAIL->localize_foldername($name) : rcube_charset::convert($foldersplit[$level], 'UTF7-IMAP');
			$class_name = trim($class_name . ' mailbox');

			if ($oldname === null) {
			$OUTPUT->command('add_folder_row', $name_utf8, $display_name, $protected, $subscribe,
			false, $class_name);
			$OUTPUT->command('add_folder_row', $name, $name_utf8, $display_name, $protected, $subscribe,
			$class_name);
			}
			else {
			$OUTPUT->command('replace_folder_row', rcube_charset::convert($oldname, 'UTF7-IMAP'),
			$name_utf8, $display_name, $protected, $class_name);
			$OUTPUT->command('replace_folder_row', $oldname, $name, $name_utf8, $display_name, $protected, $class_name);
			}
			}

			@@ -1349,7 +1366,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']));
			}