Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34

[civicrm-core.git] / CRM / Campaign / Page / AJAX.php

diff --git a/CRM/Campaign/Page/AJAX.php b/CRM/Campaign/Page/AJAX.php
index b8cf42de6d5eefeccd5809a8fa6629b2773cc4dc..79a47cc4defcf75f1e62156f0c081da450934c0a 100644 (file)
--- a/CRM/Campaign/Page/AJAX.php
+++ b/CRM/Campaign/Page/AJAX.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -158,7 +158,7 @@ class CRM_Campaign_Page_AJAX {
     //format multi-select group and contact types.
     foreach (array(
                'group',
-               'contact_type'
+               'contact_type',
              ) as $param) {
       $paramValue = CRM_Utils_Array::value($param, $params);
       if ($paramValue) {
@@ -174,7 +174,7 @@ class CRM_Campaign_Page_AJAX {
     foreach (array(
                'campaign_survey_id',
                'survey_interviewer_id',
-               'campaign_search_voter_for'
+               'campaign_search_voter_for',
              ) as $fld) {
       $voterClauseParams[$fld] = CRM_Utils_Array::value($fld, $params);
     }
@@ -360,6 +360,7 @@ class CRM_Campaign_Page_AJAX {
 
     $iFilteredTotal = $iTotal;
 
+    header('Content-Type: application/json');
     echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
     CRM_Utils_System::civiExit();
   }
@@ -499,7 +500,7 @@ class CRM_Campaign_Page_AJAX {
       array(
         'value' => '',
         'title' => ts('- select -'),
-      )
+      ),
     );
     foreach ($campaigns as $value => $title) {
       $class = NULL;
@@ -546,7 +547,7 @@ class CRM_Campaign_Page_AJAX {
       array(
         'value' => '',
         'title' => ts('- select -'),
-      )
+      ),
     );
     foreach ($campGroups as $grpId => $title) {
       $groups[] = array(
@@ -565,7 +566,7 @@ class CRM_Campaign_Page_AJAX {
   /**
    * Retrieve campaigns as for campaign dashboard.
    *
-   **/
+   */
   public function campaignList() {
     //get the search criteria params.
     $searchParams = explode(',', CRM_Utils_Array::value('searchCriteria', $_POST));
@@ -635,7 +636,7 @@ class CRM_Campaign_Page_AJAX {
                'sort',
                'offset',
                'rowCount',
-               'sortOrder'
+               'sortOrder',
              ) as $sortParam) {
       $params[$sortParam] = $$sortParam;
     }
@@ -659,6 +660,7 @@ class CRM_Campaign_Page_AJAX {
 
     $iFilteredTotal = $iTotal;
 
+    header('Content-Type: application/json');
     echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
     CRM_Utils_System::civiExit();
   }
@@ -666,7 +668,7 @@ class CRM_Campaign_Page_AJAX {
   /**
    * Retrieve survey for survey dashboard.
    *
-   **/
+   */
   public function surveyList() {
     //get the search criteria params.
     $searchParams = explode(',', CRM_Utils_Array::value('searchCriteria', $_POST));
@@ -738,7 +740,7 @@ class CRM_Campaign_Page_AJAX {
                'sort',
                'offset',
                'rowCount',
-               'sortOrder'
+               'sortOrder',
              ) as $sortParam) {
       $params[$sortParam] = $$sortParam;
     }
@@ -762,6 +764,7 @@ class CRM_Campaign_Page_AJAX {
 
     $iFilteredTotal = $iTotal;
 
+    header('Content-Type: application/json');
     echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
     CRM_Utils_System::civiExit();
   }
@@ -769,7 +772,7 @@ class CRM_Campaign_Page_AJAX {
   /**
    * Retrieve petitions for petition dashboard.
    *
-   **/
+   */
   public function petitionList() {
     //get the search criteria params.
     $searchParams = explode(',', CRM_Utils_Array::value('searchCriteria', $_POST));
@@ -836,7 +839,7 @@ class CRM_Campaign_Page_AJAX {
                'sort',
                'offset',
                'rowCount',
-               'sortOrder'
+               'sortOrder',
              ) as $sortParam) {
       $params[$sortParam] = $$sortParam;
     }
@@ -860,7 +863,9 @@ class CRM_Campaign_Page_AJAX {
 
     $iFilteredTotal = $iTotal;
 
+    header('Content-Type: application/json');
     echo CRM_Utils_JSON::encodeDataTableSelector($searchRows, $sEcho, $iTotal, $iFilteredTotal, $selectorElements);
     CRM_Utils_System::civiExit();
   }
+
 }