From fc536c349113694491a035fa400bd72e8fb99513 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@unhosted.org>
Date: Fri, 18 May 2012 16:00:17 +0200
Subject: add htmlentities() call into login form

---
 core/templates/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/templates/login.php b/core/templates/login.php
index a40bf5c330a..41d6ba41ef8 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,7 +1,7 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form action="index.php" method="post">
 	<fieldset>
-		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
+		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.htmlentities($_['redirect']).'" />'; } ?>
 		<?php if($_['error']): ?>
 			<a href="./core/lostpassword/"><?php echo $l->t('Lost your password?'); ?></a>
 		<?php endif; ?>
-- 
cgit v1.2.3


From ede89ee405c88af2eea3306d226cc8a349eb8a51 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 21 May 2012 09:35:31 +0200
Subject: oc-657: icons for M$ office file types

---
 core/img/filetypes/application-msexcel.png      | Bin 0 -> 566 bytes
 core/img/filetypes/application-mspowerpoint.png | Bin 0 -> 519 bytes
 core/img/filetypes/application-msword.png       | Bin 0 -> 28346 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 core/img/filetypes/application-msexcel.png
 create mode 100644 core/img/filetypes/application-mspowerpoint.png
 create mode 100644 core/img/filetypes/application-msword.png

(limited to 'core')

diff --git a/core/img/filetypes/application-msexcel.png b/core/img/filetypes/application-msexcel.png
new file mode 100644
index 00000000000..abcd93689a0
Binary files /dev/null and b/core/img/filetypes/application-msexcel.png differ
diff --git a/core/img/filetypes/application-mspowerpoint.png b/core/img/filetypes/application-mspowerpoint.png
new file mode 100644
index 00000000000..b4aaad9a45c
Binary files /dev/null and b/core/img/filetypes/application-mspowerpoint.png differ
diff --git a/core/img/filetypes/application-msword.png b/core/img/filetypes/application-msword.png
new file mode 100644
index 00000000000..6f7bb520f25
Binary files /dev/null and b/core/img/filetypes/application-msword.png differ
-- 
cgit v1.2.3