- some code improvements for r2959 change

alecpl

2009-09-17 cbeea3d4d092f6ae2310175a57fe15b43d608b33

 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:                                                              |
@@ -19,8 +19,6 @@

*/

require_once('Mail/mimeDecode.php');


function rss_encode($string){
   $string = rep_specialchars_output($string, 'xml');
@@ -28,12 +26,11 @@
}



$REMOTE_REQUEST = TRUE;
$OUTPUT_TYPE = 'rss';

$webmail_url = 'http';
if (strstr('HTTPS', $_SERVER['SERVER_PROTOCOL'] )!== FALSE)
if (strstr('HTTPS', $_SERVER['SERVER_PROTOCOL'] )!== FALSE || $RCMAIL->config->get('use_https'))
  $webmail_url .= 's';
$webmail_url .= '://'.$_SERVER['SERVER_NAME'];
if ($_SERVER['SERVER_PORT'] != '80')
@@ -52,7 +49,7 @@

// Send global XML output
header('Content-type: text/xml');
echo '<?xml version="1.0" encoding="UTF-8"?>
echo '<?xml version="1.0" encoding="'.RCMAIL_CHARSET.'"?>
   <rss version="2.0"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
@@ -79,7 +76,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)
@@ -114,4 +111,4 @@
</rss>';

exit;
?>
?>