From 037af6890fe6fdb84a08d3c86083e847c90ec0ad Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 Oct 2013 08:17:26 -0400
Subject: [PATCH] Fix vulnerability in handling _session argument of utils/save-prefs (#1489382)
---
skins/classic/templates/message.html | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index 714540b..d1594ea 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -12,24 +12,30 @@
}
</style>
</head>
+<roundcube:if condition="env:extwin" />
+<body class="extwin" onload="rcube_init_mail_ui()">
+<roundcube:object name="message" id="message" />
+<roundcube:else />
<body onload="rcube_init_mail_ui()">
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
+<roundcube:endif />
+
<roundcube:include file="/includes/messagetoolbar.html" />
<div id="mainscreen">
+<roundcube:if condition="!env:extwin" />
<div id="mailleftcontainer">
<div id="mailboxlist-container">
<div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
<div class="boxlistcontent">
-<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
+ <roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" maxlength="25" />
</div>
-<div class="boxfooter">
- <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
+<div class="boxfooter"></div>
</div>
</div>
-</div>
+<roundcube:endif />
<div id="messageframe">
<div class="boxlistcontent" style="top:0; overflow-x:auto">
@@ -52,19 +58,12 @@
</div>
+<roundcube:if condition="!env:extwin" />
<script type="text/javascript">
var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
rcmail.add_onload('mailviewsplitv.init()');
</script>
-
-<div id="mailboxoptionsmenu" class="popupmenu">
- <ul>
- <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
- <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
- <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
- <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
- </ul>
-</div>
+<roundcube:endif />
</body>
</html>
--
Gitblit v1.9.1