Removing changes for CRM-17033

[civicrm-core.git] / CRM / Utils / ICalendar.php

diff --git a/CRM/Utils/ICalendar.php b/CRM/Utils/ICalendar.php
index 120bfbb138c2a9cf54bc3dbfc4e20a84df5cdc9e..ea56475451ab0c9e6560a3daded8591911ec00e8 100644 (file)
--- a/CRM/Utils/ICalendar.php
+++ b/CRM/Utils/ICalendar.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -43,12 +43,13 @@
 class CRM_Utils_ICalendar {
 
   /**
-   * Escape text elements for safe ICalendar use
-   *
-   * @param $text Text to escape
+   * Escape text elements for safe ICalendar use.
    *
-   * @return  Escaped text
+   * @param $text
+   *   Text to escape.
    *
+   * @return string
+   *   Escaped text
    */
   public static function formatText($text) {
     $text = strip_tags($text);
@@ -62,13 +63,15 @@ class CRM_Utils_ICalendar {
   }
 
   /**
-   * Escape date elements for safe ICalendar use
+   * Escape date elements for safe ICalendar use.
    *
-   * @param $date Date to escape
+   * @param $date
+   *   Date to escape.
    *
    * @param bool $gdata
    *
-   * @return  Escaped date
+   * @return string
+   *   Escaped date
    */
   public static function formatDate($date, $gdata = FALSE) {
 
@@ -91,29 +94,33 @@ class CRM_Utils_ICalendar {
    * - 'text/xml'      : used for gData or rss formatted feeds
    *
    *
-   * @param string $calendar The calendar data to be published.
+   * @param string $calendar
+   *   The calendar data to be published.
    * @param string $content_type
-   * @param string $charset The character set to use, defaults to 'us-ascii'.
-   * @param string $fileName The file name (for downloads)
-   * @param string $disposition How the file should be sent ('attachment' for downloads)
+   * @param string $charset
+   *   The character set to use, defaults to 'us-ascii'.
+   * @param string $fileName
+   *   The file name (for downloads).
+   * @param string $disposition
+   *   How the file should be sent ('attachment' for downloads).
    *
    * @return void
    */
   public static function send($calendar, $content_type = 'text/calendar', $charset = 'us-ascii', $fileName = NULL, $disposition = NULL) {
     $config = CRM_Core_Config::singleton();
     $lang = $config->lcMessages;
-    header("Content-Language: $lang");
-    // header( "Content-Type: $content_type; charset=$charset; profile=\"ICalendar\"" );
-    header("Content-Type: $content_type; charset=$charset");
+    CRM_Utils_System::setHttpHeader("Content-Language", $lang);
+    CRM_Utils_System::setHttpHeader("Content-Type", "$content_type; charset=$charset");
 
     if ($content_type == 'text/calendar') {
-      header('Content-Length: ' . strlen($calendar));
-      header("Content-Disposition: $disposition; filename=\"$fileName\"");
-      header("Pragma: no-cache");
-      header("Expires: 0");
-      header("Cache-Control: no-cache, must-revalidate");
+      CRM_Utils_System::setHttpHeader('Content-Length', strlen($calendar));
+      CRM_Utils_System::setHttpHeader("Content-Disposition", "$disposition; filename=\"$fileName\"");
+      CRM_Utils_System::setHttpHeader("Pragma", "no-cache");
+      CRM_Utils_System::setHttpHeader("Expires", "0");
+      CRM_Utils_System::setHttpHeader("Cache-Control", "no-cache, must-revalidate");
     }
 
     echo $calendar;
   }
+
 }