githubFork/roundcubemail.git

			@@ -69,14 +69,23 @@
			*/
			function get_sequence_name($sequence)
			{
			global $CONFIG;

			// return table name if configured
			$config_key = 'db_sequence_'.$sequence;
			$opt = rcmail::get_instance()->config->get($config_key);

			if (strlen($CONFIG[$config_key]))
			return $CONFIG[$config_key];
			if (!empty($opt))
			{
			$db = &rcmail::get_instance()->db;

			if($db->db_provider=='pgsql') // just for sure
			{
			$db->db_handle->setOption('disable_smart_seqname', true);
			$db->db_handle->setOption('seqname_format', '%s');
			}

			return $CONFIG[$opt];
			}

			return $sequence;
			}

			@@ -270,7 +279,11 @@
			if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7')
			{
			$aliases['GB2312'] = 'GB18030';
			return iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
			$_iconv = iconv(($aliases[$from] ? $aliases[$from] : $from), ($aliases[$to] ? $aliases[$to] : $to) . "//IGNORE", $str);
			if ($_iconv !== false)
			{
			return $_iconv;
			}
			}

			// settings for mbstring module (by Tadashi Jokagi)
			@@ -602,7 +615,7 @@
			{
			$zebra_class = $c%2 ? 'even' : 'odd';

			$table .= sprintf('<tr id="rcmrow%d" class="contact '.$zebra_class.'">'."\n", $row_data[$id_col]);
			$table .= sprintf('<tr id="rcmrow%s" class="contact '.$zebra_class.'">'."\n", $row_data[$id_col]);

			// format each col
			foreach ($a_show_cols as $col)
			@@ -1135,7 +1148,7 @@
			$class_name = 'junk';

			$js_name = htmlspecialchars(JQ($folder['id']));
			$out .= sprintf('<li id="rcmli%s" class="mailbox %s %s%s%s"><a href="%s"'.
			$out .= sprintf('<li id="rcmli%s" class="mailbox %s %s%s"><a href="%s"'.
			' onclick="return %s.command(\'list\',\'%s\',this)"'.
			' onmouseover="return %s.focus_folder(\'%s\')"' .
			' onmouseout="return %s.unfocus_folder(\'%s\')"' .
			@@ -1143,7 +1156,6 @@
			$folder_id,
			$class_name,
			$zebra_class,
			$unread_count ? ' unread' : '',
			$folder['id']==$mbox_name ? ' selected' : '',
			Q(rcmail_url('', array('_mbox' => $folder['id']))),
			JS_OBJECT_NAME,