Merge pull request #4609 from colemanw/CRM-15618

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

diff --git a/CRM/Campaign/Page/AJAX.php b/CRM/Campaign/Page/AJAX.php
index b0d26d2a5b1672e9da3f687eaf5f28242d4a43ff..3512bc1c4d74316d11bb60aec81a9600cf8440c9 100644 (file)
--- a/CRM/Campaign/Page/AJAX.php
+++ b/CRM/Campaign/Page/AJAX.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  *
  */
 
@@ -64,8 +64,7 @@ class CRM_Campaign_Page_AJAX {
       }
     }
 
-    if (isset($_POST['field']) &&
-      CRM_Utils_Array::value($voterId, $_POST['field']) &&
+    if (isset($_POST['field']) && !empty($_POST['field'][$voterId]) &&
       is_array($_POST['field'][$voterId])
     ) {
       foreach ($_POST['field'][$voterId] as $fieldKey => $value) {
@@ -93,8 +92,7 @@ class CRM_Campaign_Page_AJAX {
     $errors = CRM_Core_BAO_CustomField::validateCustomData($params);
     if (is_array($errors) && !empty($errors)) {
       $result['errors'] = $errors;
-      echo json_encode($result);
-      CRM_Utils_System::civiExit();
+      CRM_Utils_JSON::output($result);
     }
 
     //process the response/interview data.
@@ -103,9 +101,7 @@ class CRM_Campaign_Page_AJAX {
       $result['status'] = 'success';
     }
 
-    echo json_encode($result);
-
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output($result);
   }
 
   static function loadOptionGroupDetails() {
@@ -145,8 +141,7 @@ class CRM_Campaign_Page_AJAX {
       'result' => $opValues,
     );
 
-    echo json_encode($result);
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output($result);
   }
 
   function voterList() {
@@ -155,7 +150,7 @@ class CRM_Campaign_Page_AJAX {
 
     $params = $searchRows = array();
     foreach ($searchParams as $param) {
-      if (CRM_Utils_Array::value($param, $_POST)) {
+      if (!empty($_POST[$param])) {
         $params[$param] = $_POST[$param];
       }
     }
@@ -182,7 +177,7 @@ class CRM_Campaign_Page_AJAX {
     $interviewerId = $surveyTypeId = $surveyId = NULL;
     $searchVoterFor = $params['campaign_search_voter_for'];
     if ($searchVoterFor == 'reserve') {
-      if (CRM_Utils_Array::value('campaign_survey_id', $params)) {
+      if (!empty($params['campaign_survey_id'])) {
         $survey = new CRM_Campaign_DAO_Survey();
         $survey->id = $surveyId = $params['campaign_survey_id'];
         $survey->selectAdd('campaign_id, activity_type_id');
@@ -258,7 +253,7 @@ class CRM_Campaign_Page_AJAX {
     );
     foreach ($dataTableParams as $pName => $pValues) {
       $$pName = $pValues['default'];
-      if (CRM_Utils_Array::value($pValues['name'], $_POST)) {
+      if (!empty($_POST[$pValues['name']])) {
         $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']);
         if ($pName == 'sort')$$pName = $selectorCols[$$pName];
       }
@@ -375,7 +370,7 @@ class CRM_Campaign_Page_AJAX {
     elseif ($operation == 'reserve') {
       $activityId = NULL;
       $createActivity = TRUE;
-      if (CRM_Utils_Array::value('activity_id', $_POST)) {
+      if (!empty($_POST['activity_id'])) {
         $activityId = CRM_Utils_Type::escape($_POST['activity_id'], 'Integer');
         if ($activityId) {
           $createActivity = FALSE;
@@ -481,8 +476,7 @@ class CRM_Campaign_Page_AJAX {
       }
     }
 
-    echo json_encode(array('status' => $status));
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output(array('status' => $status));
   }
 
   function allActiveCampaigns() {
@@ -513,9 +507,7 @@ class CRM_Campaign_Page_AJAX {
       'campaigns' => $options,
     );
 
-    echo json_encode($results);
-
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output($results);
   }
 
   function campaignGroups() {
@@ -550,9 +542,7 @@ class CRM_Campaign_Page_AJAX {
       'groups' => $groups,
     );
 
-    echo json_encode($results);
-
-    CRM_Utils_System::civiExit();
+    CRM_Utils_JSON::output($results);
   }
 
   /**
@@ -565,7 +555,7 @@ class CRM_Campaign_Page_AJAX {
 
     $params = $searchRows = array();
     foreach ($searchParams as $param) {
-      if (CRM_Utils_Array::value($param, $_POST)) {
+      if (!empty($_POST[$param])) {
         $params[$param] = $_POST[$param];
       }
     }
@@ -616,7 +606,7 @@ class CRM_Campaign_Page_AJAX {
     );
     foreach ($dataTableParams as $pName => $pValues) {
       $$pName = $pValues['default'];
-      if (CRM_Utils_Array::value($pValues['name'], $_POST)) {
+      if (!empty($_POST[$pValues['name']])) {
         $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']);
         if ($pName == 'sort') {
           $$pName = $selectorCols[$$pName];
@@ -661,7 +651,7 @@ class CRM_Campaign_Page_AJAX {
 
     $params = $searchRows = array();
     foreach ($searchParams as $param) {
-      if (CRM_Utils_Array::value($param, $_POST)) {
+      if (!empty($_POST[$param])) {
         $params[$param] = $_POST[$param];
       }
     }
@@ -714,7 +704,7 @@ class CRM_Campaign_Page_AJAX {
     );
     foreach ($dataTableParams as $pName => $pValues) {
       $$pName = $pValues['default'];
-      if (CRM_Utils_Array::value($pValues['name'], $_POST)) {
+      if (!empty($_POST[$pValues['name']])) {
         $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']);
         if ($pName == 'sort') {
           $$pName = $selectorCols[$$pName];
@@ -759,7 +749,7 @@ class CRM_Campaign_Page_AJAX {
 
     $params = $searchRows = array();
     foreach ($searchParams as $param) {
-      if (CRM_Utils_Array::value($param, $_POST)) {
+      if (!empty($_POST[$param])) {
         $params[$param] = $_POST[$param];
       }
     }
@@ -807,7 +797,7 @@ class CRM_Campaign_Page_AJAX {
     );
     foreach ($dataTableParams as $pName => $pValues) {
       $$pName = $pValues['default'];
-      if (CRM_Utils_Array::value($pValues['name'], $_POST)) {
+      if (!empty($_POST[$pValues['name']])) {
         $$pName = CRM_Utils_Type::escape($_POST[$pValues['name']], $pValues['type']);
         if ($pName == 'sort') {
           $$pName = $selectorCols[$$pName];