From 6d5dbae53cd4b4b97da0b0c558292a7f1062a524 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 25 Jul 2008 11:13:15 -0400
Subject: [PATCH] Prefer File_Info over mime_content_type + detect mime type when uploading + some code style
---
program/steps/mail/rss.inc | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/steps/mail/rss.inc b/program/steps/mail/rss.inc
index 062a292..0d7d3c4 100644
--- a/program/steps/mail/rss.inc
+++ b/program/steps/mail/rss.inc
@@ -5,7 +5,7 @@
| program/steps/mail/rss.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -42,7 +42,7 @@
if (dirname($_SERVER['SCRIPT_NAME']) != '/')
$webmail_url .= dirname($_SERVER['SCRIPT_NAME']).'/';
-$auth_webmail_url = $webmail_url.'?_auth='.$GLOBALS['sess_auth'];
+$webmail_url .= '?_task=mail';
$messagecount_unread = $IMAP->messagecount('INBOX', 'UNSEEN', TRUE);
$messagecount = $IMAP->messagecount();
@@ -68,7 +68,7 @@
<ttl>5</ttl>
<docs>http://blogs.law.harvard.edu/tech/rss</docs>
<description>INBOX contains '.$messagecount.' messages, of which '.$messagecount_unread.' unread</description>
- <link>'.rss_encode($auth_webmail_url, 'xml') .'</link>
+ <link>'.rss_encode($webmail_url, 'xml') .'</link>
<title>webmail for '.rss_encode($_SESSION['username'].' @ '.$_SESSION['imap_host']).'</title>
<generator>'.rss_encode($CONFIG['useragent'], 'xml').' (RSS extension by Sjon Hortensius)</generator>
<image>
@@ -79,7 +79,7 @@
// Check if the user wants to override the default sortingmethode
if (isset($_GET['_sort']))
- list($sort_col, $sort_order) = explode('_', $_GET['_sort']);
+ list($sort_col, $sort_order) = explode('_', get_input_value('_sort', RCUBE_INPUT_GET));
// Add message to output
if ($messagecount > 0)
@@ -92,7 +92,7 @@
if (strstr($item->from, '<'))
$item->from = preg_replace('~"?([^"]*)"? <([^>]*)>~', '\2 (\1)', $item->from);
- $item->link = $auth_webmail_url.'&_task=mail&_action=show&_uid='.$item->uid.'&_mbox=INBOX';
+ $item->link = $webmail_url.'&_task=mail&_action=show&_uid='.$item->uid.'&_mbox=INBOX';
$item->body = $IMAP->get_body($item->uid);
@@ -114,4 +114,4 @@
</rss>';
exit;
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1