githubFork/roundcubemail.git

			@@ -471,7 +471,7 @@
			$OUTPUT->set_env('contentframe', $attrib['id']);
			$OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/resources/blank.gif');

			return html::iframe($attrib);
			return $OUTPUT->frame($attrib, true);
			}


			@@ -1247,7 +1247,7 @@

			if ($part->filename
			&& preg_match('/^application\/octet-stream$/i', $part->mimetype)
			&& preg_match('/\.([^.])$/i', $part->filename, $m)
			&& preg_match('/\.([^.]+)$/i', $part->filename, $m)
			&& ($extension = strtolower($m[1]))
			&& isset($types[$extension])
			) {
			@@ -1294,7 +1294,7 @@

			// modify HTML links to open a new window if clicked
			$GLOBALS['rcmail_html_container_id'] = $container_id;
			$body = preg_replace_callback('/<(a\|link)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
			$body = preg_replace_callback('/<(a\|link\|area)\s+([^>]+)>/Ui', 'rcmail_alter_html_link', $body);
			unset($GLOBALS['rcmail_html_container_id']);

			$body = preg_replace(array(
			@@ -1407,7 +1407,11 @@
			$attrib['target'] = '_blank';
			}

			return "<$tag" . html::attrib_string($attrib, array('href','name','target','onclick','id','class','style','title','rel','type','media')) . $end;
			// allowed attributes for a\|link\|area tags
			$allow = array('href','name','target','onclick','id','class','style','title',
			'rel','type','media','alt','coords','nohref','hreflang','shape');

			return "<$tag" . html::attrib_string($attrib, $allow) . $end;
			}


			@@ -1806,6 +1810,7 @@

			// register action aliases
			$RCMAIL->register_action_map(array(
			'refresh' => 'check_recent.inc',
			'preview' => 'show.inc',
			'print' => 'show.inc',
			'moveto' => 'move_del.inc',