X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FPage%2FAJAX.php;h=a040bc14ce27e4deb98509eea770f9ef65a861df;hb=ef10e0b52408ba266239a859756d757a10348228;hp=593beb5f3cc3a4569db118827e07f68e6f77cfb3;hpb=24f8127938dec80960d388e50fd5b89aa450b494;p=civicrm-core.git

diff --git a/CRM/Core/Page/AJAX.php b/CRM/Core/Page/AJAX.php
index 593beb5f3c..a040bc14ce 100644
--- a/CRM/Core/Page/AJAX.php
+++ b/CRM/Core/Page/AJAX.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -39,12 +39,11 @@
 class CRM_Core_Page_AJAX {
 
   /**
-   * function to call generic ajax forms
+   * Call generic ajax forms
    *
    * @static
-   * @access public
    */
-  static function run() {
+  public static function run() {
     $className = CRM_Utils_Type::escape($_REQUEST['class_name'], 'String');
     $type = '';
     if (!empty($_REQUEST['type'])) {
@@ -90,12 +89,11 @@ class CRM_Core_Page_AJAX {
   }
 
   /**
-   * function to change is_quick_config priceSet to complex
+   * Change is_quick_config priceSet to complex
    *
    * @static
-   * @access public
    */
-  static function setIsQuickConfig() {
+  public static function setIsQuickConfig() {
     $id = $context = NULL;
     if (!empty($_REQUEST['id'])) {
       $id = CRM_Utils_Type::escape($_REQUEST['id'], 'Integer');
@@ -126,9 +124,7 @@ class CRM_Core_Page_AJAX {
     if (!$result) {
       $priceSetId = null;
     }
-    echo json_encode($priceSetId);
-
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output($priceSetId);
   }
 
   /**
@@ -140,7 +136,7 @@ class CRM_Core_Page_AJAX {
    *
    * @return bool
    */
-  static function checkAuthz($type, $className, $fnName = null) {
+  public static function checkAuthz($type, $className, $fnName = null) {
     switch ($type) {
       case 'method':
         if (!preg_match('/^CRM_[a-zA-Z0-9]+_Page_AJAX$/', $className)) {
@@ -169,7 +165,7 @@ class CRM_Core_Page_AJAX {
    * Outputs the CiviCRM standard json-formatted page/form response
    * @param array|string $response
    */
-  static function returnJsonResponse($response) {
+  public static function returnJsonResponse($response) {
     // Allow lazy callers to not wrap content in an array
     if (is_string($response)) {
       $response = array('content' => $response);
@@ -199,6 +195,17 @@ class CRM_Core_Page_AJAX {
     CRM_Utils_System::civiExit();
   }
 
+  /**
+   * Set headers appropriate for a js file
+   */
+  public static function setJsHeaders() {
+    // Encourage browsers to cache for a long time - 1 year
+    $year = 60*60*24*364;
+    header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + $year));
+    header('Content-Type:	application/javascript');
+    header("Cache-Control: max-age=$year, public");
+  }
+
   /**
    * Send autocomplete results to the client. Input can be a simple or nested array.
    * @param array $results - If nested array, also provide:
@@ -206,7 +213,7 @@ class CRM_Core_Page_AJAX {
    * @param string $key - array key to use as the key
    * @deprecated
    */
-  static function autocompleteResults($results, $val='label', $key='id') {
+  public static function autocompleteResults($results, $val='label', $key='id') {
     $output = array();
     if (is_array($results)) {
       foreach ($results as $k => $v) {
@@ -221,4 +228,3 @@ class CRM_Core_Page_AJAX {
     CRM_Utils_System::civiExit();
   }
 }
-