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/larry/templates/settings.html |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/skins/larry/templates/settings.html b/skins/larry/templates/settings.html
index 15592a2..427e0a4 100644
--- a/skins/larry/templates/settings.html
+++ b/skins/larry/templates/settings.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<roundcube:object name="doctype" value="html5" />
+<html>
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
+<body class="noscroll">
 
 <roundcube:include file="/includes/header.html" />
 
@@ -12,18 +12,26 @@
 
 <roundcube:include file="/includes/settingstabs.html" />
 
+<div id="settings-right">
+
 <div id="sectionslist" class="uibox listbox">
 <div class="scroller">
-	<roundcube:object name="sectionslist" id="sections-table" class="listing" cellspacing="0" />
+	<roundcube:object name="sectionslist" id="sections-table" class="listing" />
 </div>
 </div>
 
 <div id="preferences-box" class="uibox contentbox">
-<roundcube:object name="prefsframe" id="preferences-frame" width="100%" height="97%" frameborder="0" src="about:blank" />
-<roundcube:object name="message" id="message" class="statusbar" />
+	<div class="iframebox">
+		<roundcube:object name="prefsframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
+	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
 
 </div>
 
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
 </body>
 </html>

--
Gitblit v1.9.1